Merge branch 'master' into MercfabRecipes

new-frontiers-14 · Jan 7, 2025 · cdf5638 · cdf5638
2 parents 68b6b01 + b0ebcca
commit cdf5638
Show file tree

Hide file tree

Showing 9 changed files with 322 additions and 177 deletions.
diff --git a/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs b/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs
@@ -88,7 +88,7 @@ private void OnDebrisDespawn(EntityUid entity, SpaceDebrisComponent component, E
             }
 
             // Do not delete the grid, it is being deleted.
-            _linkedLifecycleGrid.UnparentPlayersFromGrid(entity, false);
+            _linkedLifecycleGrid.UnparentPlayersFromGrid(grid: entity, deleteGrid: false, ignoreLifeStage: true);
         }
     }
     // Frontier

diff --git a/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs b/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs
@@ -130,9 +130,9 @@ private void OnMasterRemoved(EntityUid uid, LinkedLifecycleGridParentComponent c
     }
 
     // Deletes a grid, reparenting every humanoid and player character that's on it.
-    public void UnparentPlayersFromGrid(EntityUid grid, bool deleteGrid)
+    public void UnparentPlayersFromGrid(EntityUid grid, bool deleteGrid, bool ignoreLifeStage = false)
     {
-        if (MetaData(grid).EntityLifeStage >= EntityLifeStage.Terminating)
+        if (!ignoreLifeStage && MetaData(grid).EntityLifeStage >= EntityLifeStage.Terminating)
             return;
 
         var reparentEntities = GetEntitiesToReparent(grid);

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -6268,3 +6268,17 @@ Entries:
         them.
   id: 5635
   time: '2025-01-06T21:21:18.0000000+00:00'
+- author: Tych0theSynth
+  changes:
+    - type: Add
+      message: 'Updated the SBB Tyne. '
+  id: 5636
+  time: '2025-01-07T15:34:09.0000000+00:00'
+- author: GreaseMonk
+  changes:
+    - type: Fix
+      message: Fix player bodies despawning on debris
+    - type: Tweak
+      message: No longer possible to fly debris, wrecks, and salvage
+  id: 5637
+  time: '2025-01-07T16:01:29.0000000+00:00'