diff --git a/Content.Server/Power/EntitySystems/ApcSystem.cs b/Content.Server/Power/EntitySystems/ApcSystem.cs index 87143b82a82..dbeb69910a2 100644 --- a/Content.Server/Power/EntitySystems/ApcSystem.cs +++ b/Content.Server/Power/EntitySystems/ApcSystem.cs @@ -12,6 +12,7 @@ using Robust.Shared.Audio; using Robust.Shared.Timing; using Content.Shared.Tools.Components; +using Content.Shared.Emp; namespace Content.Server.Power.EntitySystems; @@ -204,6 +205,9 @@ private void OnEmpPulse(EntityUid uid, ApcComponent component, ref EmpPulseEvent private void OnToolUseAttempt(EntityUid uid, ApcComponent component, ToolUseAttemptEvent args) { + if (!HasComp(uid)) + return; + // prevent reconstruct exploit to skip cooldowns if (!component.MainBreakerEnabled) args.Cancel(); diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs index 9c87b26dec2..9741010f054 100644 --- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs +++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs @@ -494,6 +494,9 @@ private void OnEmpPulse(EntityUid uid, ShuttleConsoleComponent component, ref Em private void OnToolUseAttempt(EntityUid uid, ShuttleConsoleComponent component, ToolUseAttemptEvent args) { + if (!HasComp(uid)) + return; + // prevent reconstruct exploit to skip cooldowns if (!component.MainBreakerEnabled) args.Cancel();