Merge pull request #738 from fospas/buff_diona

buff diona
fospas · Jan 4, 2025 · 3b30d2f · 3b30d2f
2 parents 2700e43 + 54254a7
commit 3b30d2f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git 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<FTLKnockdownImmuneComponent>(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
@@ -0,0 +1,7 @@
+namespace Content.Server._Cats.FTLKnockdownImmune;
+
+/// <summary>
+/// Denotes an entity as being immune from knockdown on FTL
+/// </summary>
+[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
@@ -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