diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index b550db93ed6..7a48d2b74af 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs @@ -1,6 +1,7 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Numerics; +using Content.Server._CorvaxNext.FTLKnockdownImmune; using Content.Server.Shuttles.Components; using Content.Server.Shuttles.Events; using Content.Server.Station.Events; @@ -631,7 +632,10 @@ private void DoTheDinosaur(TransformComponent xform) if (!_statusQuery.TryGetComponent(child, out var status)) continue; - _stuns.TryParalyze(child, _hyperspaceKnockdownTime, true, status); + // Corvax-Next-FTLImmune-Start + if (!HasComp(child)) + _stuns.TryParalyze(child, _hyperspaceKnockdownTime, true, status); + // Corvax-Next-FTLImmune-End // If the guy we knocked down is on a spaced tile, throw them too if (grid != null) diff --git a/Content.Server/_CorvaxNext/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs b/Content.Server/_CorvaxNext/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs new file mode 100644 index 00000000000..57a83f55be2 --- /dev/null +++ b/Content.Server/_CorvaxNext/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs @@ -0,0 +1,7 @@ +namespace Content.Server._CorvaxNext.FTLKnockdownImmune; + +/// +/// Denotes an entity as being immune from knockdown on FTL +/// +[RegisterComponent] +public sealed partial class FTLKnockdownImmuneComponent : Component; diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index bfbb90ee972..a25440110b0 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -114,6 +114,7 @@ - type: FootprintVisualizer # Corvax-Next-Footprints leftBarePrint: "footprint-left-bare-diona" rightBarePrint: "footprint-right-bare-diona" + - type: FTLKnockdownImmune # Corvax-Next-FTLImmune - type: entity parent: BaseSpeciesDummy