Prevent player despawning on salvage and other debris (#2661)

* Prevent piloting of debris etc * Fix unparenting * Update nf_bluespace_grids_events.yml * Update nf_bluespace_dungeons_events.yml * Update nf_bluespace_dungeons_events.yml * Update base_debris.yml --------- Co-authored-by: Dvir <[email protected]>
new-frontiers-14 · Jan 7, 2025 · e5a6625 · e5a6625
1 parent eab733a
commit e5a6625
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 4 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/Prototypes/_NF/Entities/World/Debris/base_debris.yml b/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml
@@ -6,5 +6,7 @@
   - type: LocalityLoader
   - type: GCAbleObject
     queue: SpaceDebris
+  - type: LinkedLifecycleGridParent
   - type: ProtectedGrid
-    preventArtifactTriggers: true
+    preventArtifactTriggers: true
+  - type: PreventPilot
diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml
@@ -41,6 +41,7 @@
         - type: LinkedLifecycleGridParent
         - type: ProtectedGrid
           preventArtifactTriggers: true
+        - type: PreventPilot
         protos:
         - NFVGRoidBasalt
 

diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml
@@ -32,6 +32,9 @@
           angularDamping: 999999
           linearDamping: 999999
         - type: LinkedLifecycleGridParent
+        - type: ProtectedGrid
+          preventArtifactTriggers: true
+        - type: PreventPilot
         paths:
         - /Maps/_NF/Bluespace/cache.yml
     rewardAccounts:
@@ -71,6 +74,9 @@
           angularDamping: 999999
           linearDamping: 999999
         - type: LinkedLifecycleGridParent
+        - type: ProtectedGrid
+          preventArtifactTriggers: true
+        - type: PreventPilot
         paths:
         - /Maps/_NF/Bluespace/vault.yml
     rewardAccounts:
@@ -111,6 +117,9 @@
           angularDamping: 999999
           linearDamping: 999999
         - type: LinkedLifecycleGridParent
+        - type: ProtectedGrid
+          preventArtifactTriggers: true
+        - type: PreventPilot
         paths:
         - /Maps/_NF/Bluespace/vaultsmall.yml
     rewardAccounts:
@@ -149,6 +158,9 @@
           angularDamping: 999999
           linearDamping: 999999
         - type: LinkedLifecycleGridParent
+        - type: ProtectedGrid
+          preventArtifactTriggers: true
+        - type: PreventPilot
         paths:
         - /Maps/_NF/Bluespace/syndieftlintercept.yml
 
@@ -185,6 +197,9 @@
           angularDamping: 999999
           linearDamping: 999999
         - type: LinkedLifecycleGridParent
+        - type: ProtectedGrid
+          preventArtifactTriggers: true
+        - type: PreventPilot
         paths:
         - /Maps/_NF/Bluespace/wizardprobealt.yml
 
@@ -221,6 +236,9 @@
           angularDamping: 999999
           linearDamping: 999999
         - type: LinkedLifecycleGridParent
+        - type: ProtectedGrid
+          preventArtifactTriggers: true
+        - type: PreventPilot
         paths:
         - /Maps/_NF/Bluespace/bloodmoon.yml
 
@@ -255,6 +273,9 @@
           angularDamping: 999999
           linearDamping: 999999
         - type: LinkedLifecycleGridParent
+        - type: ProtectedGrid
+          preventArtifactTriggers: true
+        - type: PreventPilot
         paths:
         - /Maps/_NF/Bluespace/cave.yml
 
@@ -286,5 +307,8 @@
         addComponents:
         - type: IFF
         - type: LinkedLifecycleGridParent
+        - type: ProtectedGrid
+          preventArtifactTriggers: true
+        - type: PreventPilot
         paths:
         - /Maps/_NF/Bluespace/mcevent.yml
diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml
@@ -27,6 +27,9 @@
         - type: IFF
           color: "#AAAAAA"
         - type: LinkedLifecycleGridParent
+        - type: ProtectedGrid
+          preventArtifactTriggers: true
+        - type: PreventPilot
         paths:
         - /Maps/_NF/Shuttles/Scrap/bison.yml
 #        - /Maps/_NF/Shuttles/Scrap/canister.yml # Too small