From 9236e9e5b98554f0e6bb858711ee9a2ababf1118 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 --- Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs | 1 + Resources/Prototypes/Entities/Structures/Machines/nuke.yml | 1 + 2 files changed, 2 insertions(+) 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 ec9e5bdfa5..7fdd80bd2b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml @@ -110,6 +110,7 @@ - type: WarpPoint follow: true location: nuclear bomb + - type: FTLSmashImmune - type: entity parent: NuclearBomb -- 2.51.2