Added Comp EMP test

new-frontiers-14 · Nov 5, 2023 · 68b5eaf · 68b5eaf
1 parent 2715bba
commit 68b5eaf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git 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<EmpDisabledComponent>(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
@@ -494,6 +494,9 @@ private void OnEmpPulse(EntityUid uid, ShuttleConsoleComponent component, ref Em
 
     private void OnToolUseAttempt(EntityUid uid, ShuttleConsoleComponent component, ToolUseAttemptEvent args)
     {
+        if (!HasComp<EmpDisabledComponent>(uid))
+            return;
+
         // prevent reconstruct exploit to skip cooldowns
         if (!component.MainBreakerEnabled)
             args.Cancel();