diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs index 0e2e140cab..d4ce72e789 100644 --- a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs +++ b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs @@ -36,7 +36,7 @@ public sealed partial class SensorInfo : BoxContainer var label = new Label(); label.Text = Loc.GetString("air-alarm-ui-gases", ("gas", $"{gas}"), ("amount", $"{amount:0.####}"), - ("percentage", $"{(amount / data.TotalMoles):0.##}")); + ("percentage", $"{(100 * amount / data.TotalMoles):0.##}")); GasContainer.AddChild(label); _gasLabels.Add(gas, label); } @@ -87,7 +87,7 @@ public sealed partial class SensorInfo : BoxContainer label.Text = Loc.GetString("air-alarm-ui-gases", ("gas", $"{gas}"), ("amount", $"{amount:0.####}"), - ("percentage", $"{(amount / data.TotalMoles):0.##}")); + ("percentage", $"{(100 * amount / data.TotalMoles):0.##}")); } _pressureThreshold.UpdateThresholdData(data.PressureThreshold); diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs index ec3da21305..0df260c392 100644 --- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs @@ -298,9 +298,9 @@ public sealed class AirAlarmSystem : EntitySystem if (args.AlarmType == AtmosAlarmType.Danger) { - SetMode(uid, addr, AirAlarmMode.None, true, false); + SetMode(uid, addr, AirAlarmMode.Panic, true, false); } - else if (args.AlarmType == AtmosAlarmType.Normal) + else if (args.AlarmType == AtmosAlarmType.Normal || args.AlarmType == AtmosAlarmType.Warning) { SetMode(uid, addr, AirAlarmMode.Filtering, true, false); } diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs index a836ad8c2d..085ec19a2a 100644 --- a/Content.Server/Doors/Systems/FirelockSystem.cs +++ b/Content.Server/Doors/Systems/FirelockSystem.cs @@ -91,7 +91,7 @@ namespace Content.Server.Doors.Systems { if (!TryComp(uid, out var doorComponent)) return; - if (args.AlarmType == AtmosAlarmType.Normal) + if (args.AlarmType == AtmosAlarmType.Normal || args.AlarmType == AtmosAlarmType.Warning) { if (doorComponent.State == DoorState.Closed) _doorSystem.TryOpen(uid); diff --git a/Resources/Prototypes/Atmospherics/thresholds.yml b/Resources/Prototypes/Atmospherics/thresholds.yml index ec3466f52c..a68e5021ae 100644 --- a/Resources/Prototypes/Atmospherics/thresholds.yml +++ b/Resources/Prototypes/Atmospherics/thresholds.yml @@ -1,8 +1,8 @@ - type: alarmThreshold id: stationTemperature - upperBound: 1465.75 # T20C * 5 + upperBound: 393.15 # T20C + 200 lowerBound: 193.15 # T20C - 100 - upperWarnAround: 0.25 + upperWarnAround: 0.7 lowerWarnAround: 1.1 - type: alarmThreshold @@ -14,7 +14,7 @@ - type: alarmThreshold id: stationOxygen - lowerBound: 0.0010 + lowerBound: 0.10 lowerWarnAround: 1.5 - type: alarmThreshold @@ -22,6 +22,16 @@ upperBound: 0.0025 upperWarnAround: 0.5 +- type: alarmThreshold + id: stationNO + upperBound: 0.0025 + upperWarnAround: 0.5 + +- type: alarmThreshold + id: stationMiasma + upperBound: 0.0025 + upperWarnAround: 0.5 + - type: alarmThreshold id: ignore # just ignore nitrogen??? ??? ??? ignore: true diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml index 0d2a1f8780..2e9bf03450 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml @@ -45,8 +45,8 @@ Plasma: danger # everything below is usually bad Tritium: danger WaterVapor: danger - Miasma: danger - NitrousOxide: danger + Miasma: stationMiasma + NitrousOxide: stationNO Frezon: danger - type: Tag tags: @@ -134,8 +134,8 @@ Plasma: danger # everything below is usually bad Tritium: danger WaterVapor: danger - Miasma: danger - NitrousOxide: danger + Miasma: stationMiasma + NitrousOxide: stationNO Frezon: danger - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml index 5453fb71e7..6ac3a23db9 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml @@ -52,8 +52,8 @@ Plasma: danger # everything below is usually bad Tritium: danger WaterVapor: danger - Miasma: danger - NitrousOxide: danger + Miasma: stationMiasma + NitrousOxide: stationNO Frezon: danger - type: Tag tags: