From 35ba20de17357a5b1ba44920e2befddaf23eedd6 Mon Sep 17 00:00:00 2001
From: vulppine <vulppine@gmail.com>
Date: Thu, 18 Aug 2022 07:52:21 -0700
Subject: [PATCH] air alarm window changes, firelock alarmable

---
 Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml |  4 ----
 .../Atmos/Monitor/UI/AirAlarmWindow.xaml.cs         | 13 +++++++++----
 .../Structures/Doors/Firelocks/firelock.yml         |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
index 734fd74de0..8e8e959e65 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
@@ -28,10 +28,6 @@
         </BoxContainer>
         <!-- Gas/Device Data -->
         <TabContainer Name="CTabContainer" VerticalExpand="True" Margin="0 0 0 2">
-            <!-- Gas readout -->
-            <ScrollContainer VerticalExpand="True">
-                <BoxContainer Name="CGasContainer" Orientation="Vertical" VerticalExpand="True" Margin="2 2 2 2" />
-            </ScrollContainer>
             <!-- Vent devices -->
             <ScrollContainer VerticalExpand="True">
                 <BoxContainer Name="CVentContainer" Orientation="Vertical"/>
diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
index 135f80b3cd..56dc363d38 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
@@ -23,6 +23,7 @@ namespace Content.Client.Atmos.Monitor.UI
         public event Action<AirAlarmMode>? AirAlarmModeChanged;
         public event Action<string>? ResyncDeviceRequested;
         public event Action? ResyncAllRequested;
+        public event Action<AirAlarmTab>? AirAlarmTabChange;
 
         private Label _address => CDeviceAddress;
         private Label _deviceTotal => CDeviceTotal;
@@ -67,10 +68,14 @@ namespace Content.Client.Atmos.Monitor.UI
                 _gasLabels.Add(gas, gasLabel);
             }
 
-            _tabContainer.SetTabTitle(0, Loc.GetString("air-alarm-ui-window-tab-gas"));
-            _tabContainer.SetTabTitle(1, Loc.GetString("air-alarm-ui-window-tab-vents"));
-            _tabContainer.SetTabTitle(2, Loc.GetString("air-alarm-ui-window-tab-scrubbers"));
-            _tabContainer.SetTabTitle(3, Loc.GetString("air-alarm-ui-window-tab-thresholds"));
+            _tabContainer.SetTabTitle(0, Loc.GetString("air-alarm-ui-window-tab-vents"));
+            _tabContainer.SetTabTitle(1, Loc.GetString("air-alarm-ui-window-tab-scrubbers"));
+            _tabContainer.SetTabTitle(2, Loc.GetString("air-alarm-ui-window-tab-sensors"));
+
+            _tabContainer.OnTabChanged += idx =>
+            {
+                AirAlarmTabChange!((AirAlarmTab) idx);
+            };
 
             _resyncDevices.OnPressed += _ =>
             {
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index 3e63d5e4b2..4312a31f46 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -7,7 +7,7 @@
     - type: AtmosAlarmable
       alarmedBy:
       - FireAlarm
-      - AirAlarm
+      - GasVentPump # TODO: No
     - type: ApcPowerReceiver
     - type: ExtensionCableReceiver
     - type: DeviceNetwork