Merge branch 'mech-changes' of github.com:Coolsurf6/starlight-14 into mech-changes

Author: Coolsurf6

Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs

@@ -32,8 +32,12 @@ public override void DoLunge(EntityUid user, EntityUid weapon, Angle angle, Vect
         if (localPos == Vector2.Zero || animation == null)
             return;
 
-        if (!_xformQuery.TryGetComponent(user, out var userXform) || userXform.MapID == MapId.Nullspace)
+        // Starlight Begin - Mech wideswing
+        var originEntity = GetOriginEntity(user);
+
+        if (!_xformQuery.TryGetComponent(originEntity, out var userXform) || userXform.MapID == MapId.Nullspace)
             return;
+        // Starlight End
 
         var animationUid = Spawn(animation, userXform.Coordinates);
 

Content.Client/Weapons/Melee/MeleeWeaponSystem.cs

@@ -232,9 +232,11 @@ private void ClientHeavyAttack(EntityUid user, EntityCoordinates coordinates, En
         var direction = targetMap.Position - userPos;
         var distance = MathF.Min(component.Range, direction.Length());
 
+        var ignoreUid = GetOriginEntity(user); // Starlight - Mech wideswing handling
+
         // This should really be improved. GetEntitiesInArc uses pos instead of bounding boxes.
         // Server will validate it with InRangeUnobstructed.
-        var entities = GetNetEntityList(ArcRayCast(userPos, direction.ToWorldAngle(), component.Angle, distance, userXform.MapID, user).ToList());
+        var entities = GetNetEntityList(ArcRayCast(userPos, direction.ToWorldAngle(), component.Angle, distance, userXform.MapID, ignoreUid).ToList()); // Starlight
         RaisePredictiveEvent(new HeavyAttackEvent(GetNetEntity(meleeUid), entities.GetRange(0, Math.Min(MaxTargets, entities.Count)), GetNetCoordinates(coordinates)));
     }
 

Content.IntegrationTests/Tests/_StarLight/Power/GridPowerTests.cs

@@ -53,6 +53,7 @@ public sealed class GridPowerTests
         new("/Maps/_Starlight/Shuttles/ShuttleEvent/UnknownShuttleFireResponse.yml"),
         new("/Maps/_Starlight/Shuttles/ShuttleEvent/abductor_shuttle.yml"),
         new("/Maps/_Starlight/Shuttles/ShuttleEvent/syndie_evacpod.yml"),
+        new("/Maps/_Starlight/Shuttles/ShuttleEvent/incorporation.yml"),
         new("/Maps/_Starlight/Shuttles/Signaleer.yml"),
         new("/Maps/_Starlight/Shuttles/VoxATS.yml"),
         new("/Maps/_Starlight/Shuttles/blackhorse.yml"),

Content.Shared/Mech/EntitySystems/SharedMechSystem.cs

@@ -33,6 +33,7 @@
 using Content.Shared.Power.Components;
 using Content.Shared.Power.EntitySystems;
 using Content.Shared._Starlight.Mech;
+using Content.Shared._Starlight.Weapons.Melee.Events;
 #endregion
 
 namespace Content.Shared.Mech.EntitySystems;
@@ -72,6 +73,7 @@ public override void Initialize()
         SubscribeLocalEvent<MechComponent, CanDropTargetEvent>(OnCanDragDrop);
         SubscribeLocalEvent<MechComponent, GotEmaggedEvent>(OnEmagged);
 
+        SubscribeLocalEvent<MechPilotComponent, GetMeleeOriginEvent>(OnGetMeleeOrigin); // Starlight
         SubscribeLocalEvent<MechPilotComponent, GetMeleeWeaponEvent>(OnGetMeleeWeapon);
         SubscribeLocalEvent<MechPilotComponent, CanAttackFromContainerEvent>(OnCanAttackFromContainer);
         SubscribeLocalEvent<MechPilotComponent, AttackAttemptEvent>(OnAttackAttempt);
@@ -618,6 +620,20 @@ private void OnPilotRemoved(EntityUid uid, MechPilotComponent component, EntGotR
             UpdateAppearance(component.Mech, mechComp);
     }
 
+    #region Starlight
+    private void OnGetMeleeOrigin(EntityUid uid, MechPilotComponent component, GetMeleeOriginEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        if (!HasComp<MechComponent>(component.Mech))
+            return;
+
+        args.OriginEntity = component.Mech;
+        args.Handled = true;
+    }
+    #endregion
+
     private void OnGetMeleeWeapon(EntityUid uid, MechPilotComponent component, GetMeleeWeaponEvent args)
     {
         if (args.Handled)

Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs

@@ -994,9 +994,13 @@ private bool DoDisarm(EntityUid user, DisarmAttackEvent ev, EntityUid meleeUid,
 
     private void DoLungeAnimation(EntityUid user, EntityUid weapon, Angle angle, MapCoordinates coordinates, float length, string? animation)
     {
+        // Starlight Begin - mech wideswing handling
+        var originEntity = GetOriginEntity(user);
+
         // TODO: Assert that offset eyes are still okay.
-        if (!TryComp(user, out TransformComponent? userXform))
+        if (!TryComp(originEntity, out TransformComponent? userXform))
             return;
+        // Starlight End
 
         var invMatrix = TransformSystem.GetInvWorldMatrix(userXform);
         var localPos = Vector2.Transform(coordinates.Position, invMatrix);
@@ -1123,4 +1127,20 @@ private void DoScreenshake(EntityUid weapon, DamageSpecifier damage, EntityUid a
         _shake.Screenshake(attacker, null, userRotation);
     }
     //Starlight end
+
+    // Starlight begin - mech wideswing
+    /// <summary>
+    /// Get the apparent origin entity for transforms (e.g. when the entity is piloting a mech)
+    /// returns the user if none are found
+    /// </summary>
+    protected EntityUid GetOriginEntity(EntityUid user)
+    {
+        var originEntity = user;
+        var originEv = new GetMeleeOriginEvent();
+        RaiseLocalEvent(user, originEv);
+        if (originEv.Handled && originEv.OriginEntity.HasValue)
+            originEntity = originEv.OriginEntity.Value;
+        return originEntity;
+    }
+    // Starlight end
 }

Content.Shared/_Starlight/Weapons/Melee/Events/GetMeleeOriginEvent.cs

@@ -0,0 +1,7 @@
+namespace Content.Shared._Starlight.Weapons.Melee.Events;
+
+// Allows for a melee attack to be treated as originating from another entity
+public sealed class GetMeleeOriginEvent : HandledEntityEventArgs
+{
+    public EntityUid? OriginEntity = null;
+}

Resources/Changelog/ChangelogStarlight.yml

@@ -36226,5 +36226,84 @@ Entries:
   id: 398801
   time: '2026-03-29T09:43:08.000000+00:00'
   url: https://github.com/ss14Starlight/space-station-14/pull/3988
+- author: wonderfulnewworld
+  changes:
+  - message: HoP can give Mail Access now.
+    type: Fix
+  id: 402801
+  time: '2026-04-05T18:32:53.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/4028
+- author: redmushie
+  changes:
+  - message: Added Blackstar PDA, ID card, job icon and access.
+    type: Add
+  - message: Added doors with Communist, Wizard and Blackstar access for mapping use
+      (such as for shuttles).
+    type: Add
+  - message: Blackstar radio now works without telecomms server.
+    type: Tweak
+  - message: Renamed Commie access level to Communist.
+    type: Tweak
+  - message: Soviet ID card now actually has Communist access.
+    type: Fix
+  id: 398601
+  time: '2026-04-05T19:45:27.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/3986
+- author: Conflee
+  changes:
+  - message: Added the NanoMed Security vending machine, to be mapped in Brig Medical
+      and has Medical and Security access. Contains the normal medical supplies, plus
+      body bags and small bottles of basic chems to give Brigmed a decent starting
+      supply for basic treatments until Chem is up and stocked.
+    type: Add
+  id: 399001
+  time: '2026-04-05T19:57:36.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/3990
+- author: CawsForConcern
+  changes:
+  - message: (Lobster) Security doors leading towards GenPop corrected to Brig access
+      (for IAAs, Magistrates).
+    type: Fix
+  - message: (Serpentcrest) Security doors leading towards GenPop corrected to Brig
+      access (for IAAs, Magistrates).
+    type: Fix
+  id: 398701
+  time: '2026-04-05T20:13:50.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/3987
+- author: neurovermi
+  changes:
+  - message: Mech wideswing and melee sprite issues.
+    type: Fix
+  id: 401901
+  time: '2026-04-05T20:25:55.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/4019
+- author: CawsForConcern
+  changes:
+  - message: (Sepultum) NCT Office front is not locked.
+    type: Tweak
+  id: 402101
+  time: '2026-04-05T20:36:56.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/4021
+- author: CawsForConcern
+  changes:
+  - message: Overloaded APCs on the "NT Incorporation" visitor shuttle have been fixed.
+    type: Fix
+  id: 402201
+  time: '2026-04-05T20:44:24.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/4022
+- author: Tess the Evil
+  changes:
+  - message: Filled n2o tanks.
+    type: Tweak
+  id: 399301
+  time: '2026-04-05T20:51:46.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/3993
+- author: neurovermi
+  changes:
+  - message: Mechs now throw when punching with no equipment.
+    type: Add
+  id: 402001
+  time: '2026-04-05T21:01:24.000000+00:00'
+  url: https://github.com/ss14Starlight/space-station-14/pull/4020
 Order: -1
 

Resources/Locale/en-US/_Starlight/job/job.ftl

@@ -22,6 +22,8 @@ job-title-borgi = Borgi
 job-title-tsf-Phantom = Phantom Marine
 job-title-tsf-MARSOC = MARSOC Marine
 
+job-name-blackstar = Blackstar Mercenary
+
 job-greet-information-rules = {$jobRules}
 
 role-type-corporate-aligned-name = Corporate Aligned

Resources/Locale/en-US/_Starlight/prototypes/access/accesses.ftl

@@ -20,7 +20,7 @@ id-card-access-level-debug3 = Debug3
 id-card-access-level-debug4 = Debug4
 id-card-access-level-debug5 = Debug5
 
-id-card-access-level-commie = Commie
+id-card-access-level-communist = Communist
 
 id-card-access-level-salvagelead = Salvage Lead
 id-card-access-level-mining = Mining
@@ -29,3 +29,4 @@ id-card-access-level-mail = Mail
 id-card-access-level-solgov = SolGov
 
 id-card-access-level-pirate = Pirate
+id-card-access-level-blackstar = Blackstar