merge stable into master (#34398)

2025-01-12 18:49:02 +01:00
parent 7b8d51ceb4 ccff52a72f
commit e830ccebe5
3 changed files with 14 additions and 3 deletions
--- 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
--- 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