Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Diona immune to FTL Knockdown #2630

Merged
merged 4 commits into from
Dec 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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);
dvir001 marked this conversation as resolved.
Show resolved Hide resolved

// If the guy we knocked down is on a spaced tile, throw them too
if (grid != null)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;

namespace Content.Server._NF.Shuttles.Components;

/// <summary>
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Mobs/Species/diona.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
state: jumpsuit-female
- type: Carriable # Carrying system from nyanotrasen.
- type: ProtectedFromStepTriggers # Frontier
- type: FTLKnockdownImmune # Frontier

- type: entity
parent: BaseSpeciesDummy
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Guidebook/species.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
39 changes: 39 additions & 0 deletions Resources/ServerInfo/_NF/Guidebook/Mobs/Diona.xml
Original file line number Diff line number Diff line change
@@ -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>
Loading