diff --git a/Content.Server/Borer/ServerBorerSystem.cs b/Content.Server/Borer/ServerBorerSystem.cs index 7eee27f477..5d1aa21acb 100644 --- a/Content.Server/Borer/ServerBorerSystem.cs +++ b/Content.Server/Borer/ServerBorerSystem.cs @@ -3,6 +3,7 @@ using Content.Server.Body.Components; using Content.Server.Body.Systems; using Content.Server.Chat.Managers; using Content.Server.Chemistry.Containers.EntitySystems; +using Content.Server.Damage.Systems; using Content.Server.Medical; using Content.Server.Popups; using Content.Server.Stunnable; @@ -13,6 +14,7 @@ using Content.Shared.Chat; using Content.Shared.Chemistry; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Damage; using Content.Shared.DoAfter; using Content.Shared.FixedPoint; using Content.Shared.Humanoid; @@ -55,6 +57,10 @@ public sealed class ServerBorerSystem : EntitySystem [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private readonly DamageableSystem _damageableSystem = default!; + + [Dependency] private readonly GodmodeSystem _godmodeSystem = default!; + public override void Initialize() { @@ -79,6 +85,7 @@ public sealed class ServerBorerSystem : EntitySystem SubscribeLocalEvent(OnReproduce); SubscribeLocalEvent(OnReproduceAfter); SubscribeLocalEvent(OnResistAfterControl); + } private void OnReproduceAfter(EntityUid uid, BorerHostComponent component, BorerReproduceAfterEvent args) @@ -336,6 +343,8 @@ public sealed class ServerBorerSystem : EntitySystem infestedComponent.Points = component.Points; Dirty(uid, infestedComponent); + _godmodeSystem.EnableGodmode(uid); + RemComp(uid); } @@ -501,6 +510,8 @@ public sealed class ServerBorerSystem : EntitySystem borerComponent.Points = component.Points; Dirty(uid, borerComponent); + _godmodeSystem.DisableGodmode(uid); + RemComp(uid); _action.SetCooldown(borerComponent.ActionStunEntity, _timing.CurTime, _timing.CurTime+TimeSpan.FromSeconds(20)); _action.SetCooldown(borerComponent.ActionInfestEntity, _timing.CurTime, _timing.CurTime+TimeSpan.FromSeconds(20)); diff --git a/Content.Shared/Borer/Components/InfestedBorerComponent.cs b/Content.Shared/Borer/Components/InfestedBorerComponent.cs index 6d0e2cb88d..c48c5bb17e 100644 --- a/Content.Shared/Borer/Components/InfestedBorerComponent.cs +++ b/Content.Shared/Borer/Components/InfestedBorerComponent.cs @@ -73,6 +73,7 @@ public sealed partial class InfestedBorerComponent : Component { "Kelotane", 30 }, { "Dylovene", 30 }, { "Dexalin", 30 }, + { "Ephedrine", 50 }, { "SpaceDrugs", 75 }, { "Leporazine", 75 } };