diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs index 8b638c179a..8da4dc7b95 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs @@ -181,7 +181,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems private void OnPacketRecv(EntityUid uid, GasVentPumpComponent component, DeviceNetworkPacketEvent args) { if (!EntityManager.TryGetComponent(uid, out DeviceNetworkComponent? netConn) - || !EntityManager.TryGetComponent(uid, out AtmosAlarmableComponent? alarmable) || !args.Data.TryGetValue(DeviceNetworkConstants.Command, out var cmd)) return; @@ -202,7 +201,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems component.FromAirAlarmData(setData); UpdateState(uid, component); - alarmable.IgnoreAlarms = setData.IgnoreAlarms; payload.Add(DeviceNetworkConstants.Command, AirAlarmSystem.AirAlarmSetDataStatus); payload.Add(AirAlarmSystem.AirAlarmSetDataStatus, true); diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs index 89521f6f41..f1ff71ca64 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs @@ -147,7 +147,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems private void OnPacketRecv(EntityUid uid, GasVentScrubberComponent component, DeviceNetworkPacketEvent args) { if (!EntityManager.TryGetComponent(uid, out DeviceNetworkComponent? netConn) - || !EntityManager.TryGetComponent(uid, out AtmosAlarmableComponent? alarmable) || !args.Data.TryGetValue(DeviceNetworkConstants.Command, out var cmd)) return; @@ -168,7 +167,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems component.FromAirAlarmData(setData); UpdateState(uid, component); - alarmable.IgnoreAlarms = setData.IgnoreAlarms; payload.Add(DeviceNetworkConstants.Command, AirAlarmSystem.AirAlarmSetDataStatus); payload.Add(AirAlarmSystem.AirAlarmSetDataStatus, true); diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index de129b0959..7ed0aa21af 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml @@ -107,9 +107,6 @@ receiveFrequencyId: AtmosMonitor transmitFrequencyId: AtmosMonitor prefix: device-address-prefix-scrubber - - type: AtmosAlarmable - alarmedBy: - - AirAlarm - type: Sprite netsync: false drawdepth: FloorObjects