Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix electrocution

Browse Source
This commit is contained in:
Aviu00
2024-01-20 07:42:00 +03:00
parent d23eacc7d5
commit f9abd6d0d3
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Electrocution/ElectrocutionSystem.cs
View File

@@ -25,6 +25,7 @@ using Content.Shared.StatusEffect;
using Content.Shared.Stunnable; using Content.Shared.Stunnable;
using Content.Shared.Tag; using Content.Shared.Tag;
using Content.Shared.Weapons.Melee.Events; using Content.Shared.Weapons.Melee.Events;
using Content.Shared.Wires;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems; using Robust.Shared.Audio.Systems;
using Robust.Shared.Map; using Robust.Shared.Map;
@@ -213,6 +214,10 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
TryDoElectrifiedAct(uid, args.User, siemens, electrified); 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, public bool TryDoElectrifiedAct(EntityUid uid, EntityUid targetUid,
float siemens = 1, float siemens = 1,
@@ -226,6 +231,9 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
if (!IsPowered(uid, electrified, transform)) if (!IsPowered(uid, electrified, transform))
return false; return false;
if (IsPanelClosed(uid)) // WD
return false;
EnsureComp<ActivatedElectrifiedComponent>(uid); EnsureComp<ActivatedElectrifiedComponent>(uid);
_appearance.SetData(uid, ElectrifiedVisuals.IsPowered, true); _appearance.SetData(uid, ElectrifiedVisuals.IsPowered, true);