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

Дионы теперь не падают при БСС #211

Merged
merged 4 commits into from
Jan 1, 2025
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,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;
Expand Down Expand Up @@ -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<FTLKnockdownImmuneComponent>(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)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace Content.Server._CorvaxNext.FTLKnockdownImmune;

/// <summary>
/// Denotes an entity as being immune from knockdown on FTL
/// </summary>
[RegisterComponent]
public sealed partial class FTLKnockdownImmuneComponent : Component;
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 @@ -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
Expand Down
Loading