From 4801a0bcc19f6adb28c38373d0abc22145aa4c1c Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Wed, 1 Jan 2025 05:11:30 +0300 Subject: [PATCH 1/4] Update ShuttleSystem.FasterThanLight.cs --- .../Shuttles/Systems/ShuttleSystem.FasterThanLight.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) From f7230df4ebe340f40e0025a7992c1a3a1f5bc269 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Wed, 1 Jan 2025 05:13:32 +0300 Subject: [PATCH 2/4] mehmehmeh --- .../FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Content.Server/_CorvaxNext/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs diff --git a/Content.Server/_CorvaxNext/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs b/Content.Server/_CorvaxNext/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs new file mode 100644 index 00000000000..fceeec69670 --- /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; From 2ebbf79ba1310fbbc955134e992525b9eaa2846d Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Wed, 1 Jan 2025 05:15:02 +0300 Subject: [PATCH 3/4] Update diona.yml --- Resources/Prototypes/Entities/Mobs/Species/diona.yml | 1 + 1 file changed, 1 insertion(+) 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 From 47f61dc4db5abb54378104635f5f9e1b0f3bba73 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Wed, 1 Jan 2025 08:07:30 +0300 Subject: [PATCH 4/4] Update Content.Server/_CorvaxNext/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs Co-authored-by: FN <37689533+FireNameFN@users.noreply.github.com> --- .../FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/_CorvaxNext/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs b/Content.Server/_CorvaxNext/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs index fceeec69670..57a83f55be2 100644 --- a/Content.Server/_CorvaxNext/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs +++ b/Content.Server/_CorvaxNext/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs @@ -1,7 +1,7 @@ namespace Content.Server._CorvaxNext.FTLKnockdownImmune; /// -/// Denotes an entity as being immune from knockdown on FTL +/// Denotes an entity as being immune from knockdown on FTL /// [RegisterComponent] public sealed partial class FTLKnockdownImmuneComponent : Component;