Merge branch 'master' into GoodbyeResearch

Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs

@@ -1,13 +1,14 @@
 using System.Numerics;
 using Content.Server.StationEvents.Components;
-using Content.Shared.Buckle.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Mech.Components;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs.Components;
+using Content.Shared.Silicons.Borgs.Components;
 using Content.Shared.Vehicle.Components;
 using Robust.Shared.Map;
+using Robust.Shared.Player;
 
 namespace Content.Server.StationEvents.Events;
 
@@ -106,6 +107,20 @@ private void OnMasterRemoved(EntityUid uid, LinkedLifecycleGridParentComponent c
             reparentEntities.Add(((targetUid, targetXform), targetXform.MapUid!.Value, _transform.GetWorldPosition(targetXform)));
         }
 
+        // Get silicon
+        var borgQuery = AllEntityQuery<BorgChassisComponent, ActorComponent, TransformComponent>();
+        while (borgQuery.MoveNext(out var borgUid, out _, out _, out var xform))
+        {
+            handledEntities.Add(borgUid);
+
+            if (xform.GridUid == null || xform.MapUid == null || xform.GridUid != grid)
+                continue;
+
+            var (targetUid, targetXform) = GetParentToReparent(borgUid, xform);
+
+            reparentEntities.Add(((targetUid, targetXform), targetXform.MapUid!.Value, _transform.GetWorldPosition(targetXform)));
+        }
+
         // Get occupied MindContainers
         var mindQuery = AllEntityQuery<MindContainerComponent, TransformComponent>();
         while (mindQuery.MoveNext(out var mobUid, out var mindContainer, out var xform))

Resources/Changelog/Frontier.yml

@@ -6328,3 +6328,25 @@ Entries:
       message: Added monkey and kobold cubes to loadout under tools.
   id: 5645
   time: '2025-01-10T21:50:07.0000000+00:00'
+- author: Alkheemist
+  changes:
+    - type: Fix
+      message: >-
+        Trade mall has had a new solar array fitted, power should be more
+        consistent now.
+  id: 5646
+  time: '2025-01-11T08:22:27.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Fix
+      message: >-
+        Player controlled borgs no longer get deleted on event grids when they
+        end.
+  id: 5647
+  time: '2025-01-11T15:50:26.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Fix
+      message: Paladin NFSD Shuttle locker isn't locked to detective only anymore.
+  id: 5648
+  time: '2025-01-11T16:10:51.0000000+00:00'