From 9b3df8740f07f1c16747865a9240df3a165d0133 Mon Sep 17 00:00:00 2001 From: vulppine Date: Fri, 19 Aug 2022 05:23:25 -0700 Subject: [PATCH] sensor info is now wider, air alarm now actually updates the networked device state --- .../Atmos/Monitor/UI/Widgets/SensorInfo.xaml | 2 +- .../Atmos/Monitor/Systems/AirAlarmSystem.cs | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml index 51b388136f..f0760dc47d 100644 --- a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml +++ b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml @@ -1,4 +1,4 @@ - + diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs index 2a3e7e285d..c8ad762469 100644 --- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs @@ -344,20 +344,11 @@ namespace Content.Server.Atmos.Monitor.Systems if (args.HighestNetworkType == AtmosMonitorAlarmType.Danger) { - SetMode(uid, addr, AirAlarmMode.None, true); - // set mode to off to mimic the vents/scrubbers being turned off - // update UI - // - // no, the mode isn't processed here - it's literally just - // set to what mimics 'off' + SetMode(uid, addr, AirAlarmMode.None, true, false); } else if (args.HighestNetworkType == AtmosMonitorAlarmType.Normal) { - // if the mode is still set to off, set it to filtering instead - // alternatively, set it to the last saved mode - // - // no, this still doesn't execute the mode - SetMode(uid, addr, AirAlarmMode.Filtering, true); + SetMode(uid, addr, AirAlarmMode.Filtering, true, false); } UpdateUI(uid, component);