merge stable into master (#34398)

space-wizards · Jan 12, 2025 · e830cce · e830cce
2 parents 7b8d51c + ccff52a
commit e830cce
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/Content.Server/Silicons/StationAi/StationAiSystem.cs b/Content.Server/Silicons/StationAi/StationAiSystem.cs
@@ -43,10 +43,10 @@ private void OnExpandICChatRecipients(ExpandICChatRecipientsEvent ev)
             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);
 

diff --git 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
@@ -17,7 +17,7 @@
       pressureThresholdId: stationPressure
       gasThresholdPrototypes:
         Oxygen: stationOxygen
-        Nitrogen: ignore
+        Nitrogen: stationNitrogen
         CarbonDioxide: stationCO2
         Plasma: stationPlasma
         Tritium: stationTritium