From 83cac4de1e014ace78236d8676bd4fecf77ee8a1 Mon Sep 17 00:00:00 2001 From: vulppine Date: Mon, 22 Aug 2022 18:41:24 -0700 Subject: [PATCH] vv for tripped thresholds, device list update event for air alarms --- .../Atmos/Monitor/Components/AtmosMonitorComponent.cs | 2 +- Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs index 3aa4f6a801..993d8ed7cc 100644 --- a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs +++ b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs @@ -59,7 +59,7 @@ namespace Content.Server.Atmos.Monitor.Components [ViewVariables] public AtmosMonitorAlarmType LastAlarmState = AtmosMonitorAlarmType.Normal; - public HashSet TrippedThresholds = new(); + [ViewVariables] public HashSet TrippedThresholds = new(); /// /// Registered devices in this atmos monitor. Alerts will be sent directly diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs index 366ca50b0d..5b26a6fd59 100644 --- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs @@ -159,11 +159,17 @@ namespace Content.Server.Atmos.Monitor.Systems SubscribeLocalEvent(OnUpdateThreshold); SubscribeLocalEvent(OnUpdateDeviceData); SubscribeLocalEvent(OnTabChange); + SubscribeLocalEvent(OnDeviceListUpdate); SubscribeLocalEvent(OnClose); SubscribeLocalEvent(OnShutdown); SubscribeLocalEvent(OnInteract); } + private void OnDeviceListUpdate(EntityUid uid, AirAlarmComponent component, DeviceListUpdateEvent args) + { + SyncRegisterAllDevices(uid); + } + private void OnTabChange(EntityUid uid, AirAlarmComponent component, AirAlarmTabSetMessage msg) { component.CurrentTab = msg.Tab;