diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs index c3ae246074..1eeedf069c 100644 --- a/Content.Server/Electrocution/ElectrocutionSystem.cs +++ b/Content.Server/Electrocution/ElectrocutionSystem.cs @@ -25,6 +25,7 @@ using Content.Shared.StatusEffect; using Content.Shared.Stunnable; using Content.Shared.Tag; using Content.Shared.Weapons.Melee.Events; +using Content.Shared.Wires; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Map; @@ -213,6 +214,10 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem TryDoElectrifiedAct(uid, args.User, siemens, electrified); } + private bool IsPanelClosed(EntityUid uid) // WD + { + return TryComp(uid, out WiresPanelComponent? panel) && !panel.Open; + } public bool TryDoElectrifiedAct(EntityUid uid, EntityUid targetUid, float siemens = 1, @@ -226,6 +231,9 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem if (!IsPowered(uid, electrified, transform)) return false; + if (IsPanelClosed(uid)) // WD + return false; + EnsureComp(uid); _appearance.SetData(uid, ElectrifiedVisuals.IsPowered, true);