From ff9d9ab75c21bb063c5e90e246c484f4d528fe1f Mon Sep 17 00:00:00 2001 From: vulppine Date: Mon, 22 Aug 2022 16:11:32 -0700 Subject: [PATCH] Revert "ResetAll no longer clears the alarm state for an atmos monitor" This reverts commit d774741121761da3c5d7fa0ccd4dfa4dac1ca210. --- Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs index c346a6280e..2b9b36656b 100644 --- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs @@ -99,6 +99,10 @@ namespace Content.Server.Atmos.Monitor.Systems case AtmosDeviceNetworkSystem.RegisterDevice: component.RegisteredDevices.Add(args.SenderAddress); break; + case AtmosAlarmableSystem.ResetAll: + Reset(uid); + // Don't clear alarm states here. + break; case AtmosMonitorSetThresholdCmd: if (args.Data.TryGetValue(AtmosMonitorThresholdData, out AtmosAlarmThreshold? thresholdData) && args.Data.TryGetValue(AtmosMonitorThresholdDataType, out AtmosMonitorThresholdType? thresholdType))