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(uid, out var atmosMonitor)) + if (TryComp(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(uid); } } }