From 2319adf1ec2de0ffd16ccd51ce956b92c5733f4a Mon Sep 17 00:00:00 2001 From: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Date: Tue, 7 Jan 2025 12:27:03 +0100 Subject: [PATCH 1/6] Prevent piloting of debris etc --- .../Prototypes/_NF/Entities/World/Debris/base_debris.yml | 8 +++++--- .../_NF/Events/nf_bluespace_dungeons_events.yml | 3 ++- .../Prototypes/_NF/Events/nf_bluespace_grids_events.yml | 3 +++ .../Prototypes/_NF/Events/nf_bluespace_salvage_events.yml | 3 +++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml b/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml index fe24ffd6c0a..5e41a5187d7 100644 --- a/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml +++ b/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml @@ -4,7 +4,9 @@ components: - type: OwnedDebris - type: LocalityLoader - - type: GCAbleObject - queue: SpaceDebris +# - type: GCAbleObject # Frontier +# queue: SpaceDebris # Frontier - type: ProtectedGrid - preventArtifactTriggers: true \ No newline at end of file + preventArtifactTriggers: true + - type: PreventPilot + - type: LinkedLifecycleGridParent diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml index fbaf8d45ee7..9f227d94ac3 100644 --- a/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml +++ b/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml @@ -38,9 +38,10 @@ - type: Shuttle angularDamping: 999999 linearDamping: 999999 - - type: LinkedLifecycleGridParent - type: ProtectedGrid preventArtifactTriggers: true + - type: PreventPilot + - type: LinkedLifecycleGridParent protos: - NFVGRoidBasalt diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml index 9ff65d1e4bf..95d5e708fc9 100644 --- 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: diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml index bd126439dfc..64609585209 100644 --- 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 From 0e978fae25c3db4ad1cad03abe90a46887348b23 Mon Sep 17 00:00:00 2001 From: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Date: Tue, 7 Jan 2025 13:21:49 +0100 Subject: [PATCH 2/6] Fix unparenting --- Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs | 2 +- .../StationEvents/EventSystems/LinkedLifecycleGridSystem.cs | 4 ++-- .../Prototypes/_NF/Entities/World/Debris/base_debris.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs b/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs index 742b9687bfc..9a16ef7a4db 100644 --- 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 index d663831a4f1..e7f869d3efc 100644 --- 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 index 5e41a5187d7..48584f8955a 100644 --- a/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml +++ b/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml @@ -4,8 +4,8 @@ components: - type: OwnedDebris - type: LocalityLoader -# - type: GCAbleObject # Frontier -# queue: SpaceDebris # Frontier + - type: GCAbleObject + queue: SpaceDebris - type: ProtectedGrid preventArtifactTriggers: true - type: PreventPilot From 5b3151ee1f1c9824c99b0ea5587699b8a3261a90 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 7 Jan 2025 15:20:13 +0200 Subject: [PATCH 3/6] Update nf_bluespace_grids_events.yml --- .../_NF/Events/nf_bluespace_grids_events.yml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml index 95d5e708fc9..6b849df3af1 100644 --- a/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml +++ b/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml @@ -74,6 +74,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/vault.yml rewardAccounts: @@ -114,6 +117,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/vaultsmall.yml rewardAccounts: @@ -152,6 +158,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/syndieftlintercept.yml @@ -188,6 +197,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/wizardprobealt.yml @@ -224,6 +236,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/bloodmoon.yml @@ -258,6 +273,9 @@ angularDamping: 999999 linearDamping: 999999 - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/cave.yml @@ -289,5 +307,8 @@ addComponents: - type: IFF - type: LinkedLifecycleGridParent + - type: ProtectedGrid + preventArtifactTriggers: true + - type: PreventPilot paths: - /Maps/_NF/Bluespace/mcevent.yml From f2518de36969066c70e25cc58b250b760e443f2a Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 7 Jan 2025 15:22:02 +0200 Subject: [PATCH 4/6] Update nf_bluespace_dungeons_events.yml --- .../Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml index 9f227d94ac3..17c3307cc18 100644 --- a/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml +++ b/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml @@ -40,8 +40,8 @@ linearDamping: 999999 - type: ProtectedGrid preventArtifactTriggers: true - - type: PreventPilot - type: LinkedLifecycleGridParent + - type: PreventPilot protos: - NFVGRoidBasalt From 262cb47356162b6146b921d5556b10cff19983d7 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 7 Jan 2025 15:28:09 +0200 Subject: [PATCH 5/6] Update nf_bluespace_dungeons_events.yml --- .../Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml index 17c3307cc18..4abd96077dd 100644 --- a/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml +++ b/Resources/Prototypes/_NF/Events/nf_bluespace_dungeons_events.yml @@ -38,9 +38,9 @@ - type: Shuttle angularDamping: 999999 linearDamping: 999999 + - type: LinkedLifecycleGridParent - type: ProtectedGrid preventArtifactTriggers: true - - type: LinkedLifecycleGridParent - type: PreventPilot protos: - NFVGRoidBasalt From 1316ec956b0c9fcbcc6f6c30e5e30256105fbe46 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 7 Jan 2025 15:28:50 +0200 Subject: [PATCH 6/6] Update base_debris.yml --- Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml b/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml index 48584f8955a..06273f90cfa 100644 --- a/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml +++ b/Resources/Prototypes/_NF/Entities/World/Debris/base_debris.yml @@ -6,7 +6,7 @@ - type: LocalityLoader - type: GCAbleObject queue: SpaceDebris + - type: LinkedLifecycleGridParent - type: ProtectedGrid preventArtifactTriggers: true - type: PreventPilot - - type: LinkedLifecycleGridParent