merge stable into master (#34398)

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);
 

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

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