From 786bddff0af1fd19be1efa9e8c69f57d278865b2 Mon Sep 17 00:00:00 2001
From: vulppine <vulppine@gmail.com>
Date: Mon, 22 Aug 2022 09:19:02 -0700
Subject: [PATCH] resetall now affects atmos monitor alerts

---
 .../Atmos/Monitor/Systems/AirAlarmSystem.cs   | 15 ------
 .../Monitor/Systems/AtmosMonitoringSystem.cs  | 48 ++-----------------
 2 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
index b52a85ca08..366ca50b0d 100644
--- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
@@ -105,21 +105,6 @@ namespace Content.Server.Atmos.Monitor.Systems
             }
         }
 
-        /// <summary>
-        ///     Reset a single sensor's state.
-        /// </summary>
-        /// <param name="uid"></param>
-        /// <param name="address"></param>
-        private void ResetSensor(EntityUid uid, string address)
-        {
-            var payload = new NetworkPayload
-            {
-                [DeviceNetworkConstants.Command] = AtmosMonitorSystem.AtmosMonitorAlarmResetCmd,
-            };
-
-            _deviceNet.QueuePacket(uid, address, payload);
-        }
-
         private void SetThreshold(EntityUid uid, string address, AtmosMonitorThresholdType type,
             AtmosAlarmThreshold threshold, Gas? gas = null)
         {
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index f0113e6039..8fd43fe745 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -26,40 +26,14 @@ namespace Content.Server.Atmos.Monitor.Systems
         [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
         [Dependency] private readonly AtmosDeviceSystem _atmosDeviceSystem = default!;
         [Dependency] private readonly DeviceNetworkSystem _deviceNetSystem = default!;
-        [Dependency] private readonly TransformSystem _transformSystem = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         // Commands
-        /// <summary>
-        ///     Command to alarm the network that something has happened.
-        /// </summary>
-        public const string AtmosMonitorAlarmCmd = "atmos_monitor_alarm_update";
-
-        /// <summary>
-        ///     Command to sync this monitor's alarm state with the rest of the network.
-        /// </summary>
-        public const string AtmosMonitorAlarmSyncCmd = "atmos_monitor_alarm_sync";
-
-        /// <summary>
-        ///     Command to reset a single alarm.
-        /// </summary>
-        public const string AtmosMonitorAlarmResetCmd = "atmos_monitor_alarm_reset";
-
-        /// <summary>
-        ///     Command to reset all alarms on a network.
-        /// </summary>
-        public const string AtmosMonitorAlarmResetAllCmd = "atmos_monitor_alarm_reset_all";
-
         public const string AtmosMonitorSetThresholdCmd = "atmos_monitor_set_threshold";
 
 
         // Packet data
 
-        /// <summary>
-        ///     Data response that contains the source of an atmos alarm.
-        /// </summary>
-        public const string AtmosMonitorAlarmSrc = "atmos_monitor_alarm_source";
-
         public const string AtmosMonitorThresholdData = "atmos_monitor_threshold_data";
 
         public const string AtmosMonitorThresholdDataType = "atmos_monitor_threshold_type";
@@ -124,7 +98,7 @@ namespace Content.Server.Atmos.Monitor.Systems
                 case AtmosDeviceNetworkSystem.RegisterDevice:
                     component.RegisteredDevices.Add(args.SenderAddress);
                     break;
-                case AtmosMonitorAlarmResetCmd:
+                case AtmosAlarmableSystem.ResetAll:
                     Reset(uid);
                     // Don't clear alarm states here.
                     break;
@@ -307,17 +281,9 @@ namespace Content.Server.Atmos.Monitor.Systems
         /// <summary>
         ///     Resets a single monitor's alarm.
         /// </summary>
-        public void Reset(EntityUid uid) =>
-            Alert(uid, AtmosMonitorAlarmType.Normal);
-
-        /// <summary>
-        ///     Resets a network's alarms, using this monitor as a source.
-        /// </summary>
-        /// <remarks>
-        ///     The resulting packet will have this monitor set as the source, using its prototype ID if it has one - otherwise just sending an empty string.
-        /// </remarks>
-        public void ResetAll(EntityUid uid, AtmosMonitorComponent? monitor = null)
+        private void Reset(EntityUid uid)
         {
+            Alert(uid, AtmosMonitorAlarmType.Normal);
         }
 
         /// <summary>
@@ -342,14 +308,6 @@ namespace Content.Server.Atmos.Monitor.Systems
                 return;
             }
 
-
-            /*
-            string source = string.Empty;
-            if (alarms == null) alarms = new List<AtmosMonitorThresholdType>();
-            var prototype = Prototype(monitor.Owner);
-            if (prototype != null) source = prototype.ID;
-            */
-
             var payload = new NetworkPayload
             {
                 [DeviceNetworkConstants.Command] = AtmosAlarmableSystem.AlertCmd,