From 8f4c49a41a4c4519b3dc8ad00faf5f918a6c4471 Mon Sep 17 00:00:00 2001
From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Sun, 12 Jan 2025 16:46:36 +0100
Subject: [PATCH 1/2] HOTFIX Tweaked air alarm default settings for nitrogen
 breathing crew (#34198)

air alarm default settings modified for anaerobic crew
---
 Resources/Prototypes/Atmospherics/thresholds.yml      | 11 +++++++++++
 .../Structures/Specific/Atmospherics/sensor.yml       |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Atmospherics/thresholds.yml b/Resources/Prototypes/Atmospherics/thresholds.yml
index 260fadbe71..29904e6f24 100644
--- a/Resources/Prototypes/Atmospherics/thresholds.yml
+++ b/Resources/Prototypes/Atmospherics/thresholds.yml
@@ -33,6 +33,17 @@
 # For gas concentrations, threshold=0.1 means 10%
 - type: alarmThreshold
   id: stationOxygen
+  lowerBound: !type:AlarmThresholdSetting
+    threshold: 0.10
+  upperBound: !type:AlarmThresholdSetting
+    threshold: 0.3
+  lowerWarnAround: !type:AlarmThresholdSetting
+    threshold: 1.5
+  upperWarnAround: !type:AlarmThresholdSetting
+    threshold: 0.8
+
+- type: alarmThreshold
+  id: stationNitrogen
   lowerBound: !type:AlarmThresholdSetting
     threshold: 0.10
   lowerWarnAround: !type:AlarmThresholdSetting
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
index b118b85c4d..57ba3432ba 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
@@ -17,7 +17,7 @@
       pressureThresholdId: stationPressure
       gasThresholdPrototypes:
         Oxygen: stationOxygen
-        Nitrogen: ignore
+        Nitrogen: stationNitrogen
         CarbonDioxide: stationCO2
         Plasma: stationPlasma
         Tritium: stationTritium

From ccff52a72f06b369f8c4545dd54e343fd47af23b Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Sun, 12 Jan 2025 17:19:58 +0000
Subject: [PATCH 2/2] [HOTFIX] fix holopads with multiple ai cores dying
 (#34289)

change return to continue

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Content.Server/Silicons/StationAi/StationAiSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Silicons/StationAi/StationAiSystem.cs b/Content.Server/Silicons/StationAi/StationAiSystem.cs
index 9c15112b30..054712059e 100644
--- a/Content.Server/Silicons/StationAi/StationAiSystem.cs
+++ b/Content.Server/Silicons/StationAi/StationAiSystem.cs
@@ -43,10 +43,10 @@ public sealed class StationAiSystem : SharedStationAiSystem
             var stationAiCore = new Entity<StationAiCoreComponent>(ent, entStationAiCore);
 
             if (!TryGetInsertedAI(stationAiCore, out var insertedAi) || !TryComp(insertedAi, out ActorComponent? actor))
-                return;
+                continue;
 
             if (stationAiCore.Comp.RemoteEntity == null || stationAiCore.Comp.Remote)
-                return;
+                continue;
 
             var xform = Transform(stationAiCore.Comp.RemoteEntity.Value);