From dd01189a6e286811a9768c199c5e967989a7208e Mon Sep 17 00:00:00 2001
From: vulppine <vulppine@gmail.com>
Date: Tue, 23 Aug 2022 14:47:09 -0700
Subject: [PATCH] changes how the emag function works in fire alarms

---
 .../Atmos/Monitor/Systems/FireAlarmSystem.cs          | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs
index c419d80fe2..e2e2341a3f 100644
--- a/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs
@@ -55,14 +55,11 @@ public sealed class FireAlarmSystem : EntitySystem
 
     private void OnEmagged(EntityUid uid, FireAlarmComponent component, GotEmaggedEvent args)
     {
-        if (TryComp<AtmosMonitorComponent>(uid, out var atmosMonitor))
+        if (TryComp<AtmosAlarmableComponent>(uid, out var alarmable))
         {
-            if (atmosMonitor?.MonitorFire == true)
-            {
-                atmosMonitor.MonitorFire = false;
-                _atmosAlarmable.ForceAlert(uid, AtmosMonitorAlarmType.Emagged);
-                args.Handled = true;
-            }
+            // Remove the atmos alarmable component permanently from this device.
+            _atmosAlarmable.ForceAlert(uid, AtmosMonitorAlarmType.Emagged, alarmable);
+            RemCompDeferred<AtmosAlarmableComponent>(uid);
         }
     }
 }