From a70d58d377e9bdec52777bfb116d5103ccbe9a8a Mon Sep 17 00:00:00 2001 From: CrimeMoot Date: Sat, 4 Jan 2025 09:31:58 +0500 Subject: [PATCH 1/2] buff diona --- .../Shuttles/Systems/ShuttleSystem.FasterThanLight.cs | 6 +++++- .../FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs | 7 +++++++ Resources/Prototypes/Entities/Mobs/Species/diona.yml | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Content.Server/_Cats/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs index 14b6d8717d0..902ac0c7dc2 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._Cats.FTLKnockdownImmune; using Content.Server.Shuttles.Components; using Content.Server.Shuttles.Events; using Content.Server.Station.Events; @@ -621,7 +622,10 @@ private void DoTheDinosaur(TransformComponent xform) if (!_statusQuery.TryGetComponent(child, out var status)) continue; - _stuns.TryParalyze(child, _hyperspaceKnockdownTime, true, status); + // Cats edit diona start + if (!HasComp(child)) + _stuns.TryParalyze(child, _hyperspaceKnockdownTime, true, status); + // Cats edit diona end // If the guy we knocked down is on a spaced tile, throw them too if (grid != null) diff --git a/Content.Server/_Cats/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs b/Content.Server/_Cats/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs new file mode 100644 index 00000000000..71b43619bb4 --- /dev/null +++ b/Content.Server/_Cats/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs @@ -0,0 +1,7 @@ +namespace Content.Server._Cats.FTLKnockdownImmune; + +/// +/// Denotes an entity as being immune from knockdown on FTL +/// +[RegisterComponent] +public sealed partial class FTLKnockdownImmuneComponent : Component; \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index 9b2a05c92e8..410335955e7 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -72,6 +72,7 @@ visualType: Large messages: [ "diona-hurt-by-herbicide-popup" ] probability: 0.66 + - type: NoSlip - type: Fixtures fixtures: fix1: @@ -124,6 +125,7 @@ understands: - TauCetiBasic - RootSpeak + - type: FTLKnockdownImmune # Cats edit - type: entity parent: BaseSpeciesDummy From 54254a7167b88427f998c9d1bc052e9af25bcdd6 Mon Sep 17 00:00:00 2001 From: CrimeMoot Date: Sat, 4 Jan 2025 09:33:19 +0500 Subject: [PATCH 2/2] fix clrf --- .../FTLKnockdownImmuneComponent.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Content.Server/_Cats/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs b/Content.Server/_Cats/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs index 71b43619bb4..1a446ec6cef 100644 --- a/Content.Server/_Cats/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs +++ b/Content.Server/_Cats/FTLKnockdownImmune/FTLKnockdownImmuneComponent.cs @@ -1,7 +1,7 @@ -namespace Content.Server._Cats.FTLKnockdownImmune; - -/// -/// Denotes an entity as being immune from knockdown on FTL -/// -[RegisterComponent] +namespace Content.Server._Cats.FTLKnockdownImmune; + +/// +/// Denotes an entity as being immune from knockdown on FTL +/// +[RegisterComponent] public sealed partial class FTLKnockdownImmuneComponent : Component; \ No newline at end of file