From eb45cadd294e01a8ef30d42acdb33ba5deb7c776 Mon Sep 17 00:00:00 2001 From: Gansu <68031780+GansuLalan@users.noreply.github.com> Date: Sat, 30 Nov 2024 02:48:04 +0000 Subject: [PATCH] Fix for arrivals deleting nuke (#33659) Adds FTLSmashImmune to nuke prototype to stop it from arrival smashing Adds a comment in FasterThanLight to indicate where the FTLSmashImmuneComponent is checked Co-authored-by: aa5g21 --- .../Shuttles/Systems/ShuttleSystem.FasterThanLight.cs | 1 + .../Prototypes/Entities/Structures/Machines/nuke.yml | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index c02d2564a9..b550db93ed 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -1002,6 +1002,7 @@ public sealed partial class ShuttleSystem continue; } + // If it has the FTLSmashImmuneComponent ignore it. if (_immuneQuery.HasComponent(ent)) { continue; diff --git a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml index d974632b75..dff6864363 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml @@ -119,8 +119,14 @@ - type: ContainerContainer containers: Nuke: !type:ContainerSlot - - type: Construction + - type: Construction # DeltaV: Plutonium core extraction node: nuke + - type: StealTarget + stealGroup: NuclearBomb + - type: WarpPoint + follow: true + location: nuclear bomb + - type: FTLSmashImmune - type: entity parent: NuclearBomb