Diona immune to FTL Knockdown (#2630)

* Cleanup * Diona guidebook changes to mention FTL jump effect --------- Co-authored-by: Whatstone <[email protected]>
new-frontiers-14 · Dec 28, 2024 · ac704ca · ac704ca
1 parent 63df41f
commit ac704ca
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 10 deletions.
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
-using Content.Server._NF.Shuttles.Components; // Frontier: NPC knockdown immunity
+using Content.Server._NF.Shuttles.Components; // Frontier: FTL knockdown immunity
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
 using Content.Server.Station.Events;
@@ -637,11 +637,9 @@ private void DoTheDinosaur(TransformComponent xform)
             {
                 if (!_statusQuery.TryGetComponent(child, out var status))
                     continue;
-
-                if (HasComp<FTLKnockdownImmuneComponent>(child)) // Frontier: NPC knockdown immunity
-                    continue; // Frontier: NPC knockdown immunity
 
-                _stuns.TryParalyze(child, _hyperspaceKnockdownTime, true, status);
+                if (!HasComp<FTLKnockdownImmuneComponent>(child)) // Frontier: FTL knockdown immunity
+                    _stuns.TryParalyze(child, _hyperspaceKnockdownTime, true, status);
 
                 // If the guy we knocked down is on a spaced tile, throw them too
                 if (grid != null)

diff --git a/Content.Server/_NF/Shuttles/Components/FTLKnockdownImmuneComponent.cs b/Content.Server/_NF/Shuttles/Components/FTLKnockdownImmuneComponent.cs
@@ -1,6 +1,3 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
 namespace Content.Server._NF.Shuttles.Components;
 
 /// <summary>

diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -111,6 +111,7 @@
             state: jumpsuit-female
   - type: Carriable # Carrying system from nyanotrasen.
   - type: ProtectedFromStepTriggers # Frontier
+  - type: FTLKnockdownImmune # Frontier
 
 - type: entity
   parent: BaseSpeciesDummy

diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml
@@ -4,7 +4,7 @@
   text: "/ServerInfo/Guidebook/Mobs/Species.xml"
   children:
     - Arachnid
-    - Diona
+    - Diona # Note: Frontier changes inside
     - Dwarf # Note: Frontier changes inside
     - Human
     - Moth
@@ -26,7 +26,7 @@
 - type: guideEntry
   id: Diona
   name: species-name-diona
-  text: "/ServerInfo/Guidebook/Mobs/Diona.xml"
+  text: "/ServerInfo/_NF/Guidebook/Mobs/Diona.xml" # Frontier: moved to _NF folder
 
 - type: guideEntry
   id: Dwarf

diff --git a/Resources/ServerInfo/_NF/Guidebook/Mobs/Diona.xml b/Resources/ServerInfo/_NF/Guidebook/Mobs/Diona.xml
@@ -0,0 +1,39 @@
+<Document>
+  # Diona
+
+  <Box>
+    <GuideEntityEmbed Entity="MobDiona" Caption=""/>
+  </Box>
+
+  They can't wear shoes, but are not slowed by Kudzu.
+  They get hungry and thirsty slower.
+  Being so sturdy, they can withstand the shock from FTL jumps without falling to the ground.
+  Their "blood" is tree sap and can't be metabolised from Iron.
+  Being plants, Weed Killer poisons them, while Robust Harvest heals them (but not without risk when overused!)
+
+  They take [color=#1e90ff]30% less Blunt damage and 20% less Slash damage[/color];
+  but [color=#ffa500]50% more Heat damage, 20% more Shock damage, and they can easily
+  catch on fire when receiving enough Heat damage from *any* source.[/color]
+
+  ## Make Like A Tree And Leave
+  <Box>
+    <GuideEntityEmbed Entity="FloraTree06" Caption=""/>
+  </Box>
+  Being exposed to too much Robust Harvest will cause a Diona to grow out of control, turning into an immobile tree (dropping all their equipment).
+  Cutting down the tree will "restore" the Diona to their mobile state.
+
+  ## Diona Nymphs
+  <Box>
+    <GuideEntityEmbed Entity="MobDionaNymph" Caption=""/>
+    <GuideEntityEmbed Entity="MobDionaNymph" Caption=""/>
+    <GuideEntityEmbed Entity="MobDionaNymph" Caption=""/>
+  </Box>
+  After death, a Diona can voluntarily destroy their own body, releasing their "internal organs" as three Nymphs,
+  with the player taking control of the Brain Nymph.
+  It can talk but has no hands or inventory, and can't do much.
+
+  After 10 minutes, a Nymph can reform into a whole Diona. This will be a new randomised body with a random name,
+  and there will be little to no evidence beyond their word about who they were before.
+
+
+</Document>