tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AirAlarms fixes (#11062)

Browse Source 
* modify airalarm thresholds

* display percentage, not ratio

* reopen doors on normal/warning state

* panic mode on danger state
This commit is contained in:
corentt
2022-09-06 02:54:26 +02:00
committed by GitHub
parent eaa5df4ad3
commit 6301ac5147
6 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs
View File

@@ -36,7 +36,7 @@ public sealed partial class SensorInfo : BoxContainer
var label = new Label(); var label = new Label();
label.Text = Loc.GetString("air-alarm-ui-gases", ("gas", $"{gas}"), label.Text = Loc.GetString("air-alarm-ui-gases", ("gas", $"{gas}"),
("amount", $"{amount:0.####}"), ("amount", $"{amount:0.####}"),
("percentage", $"{(amount / data.TotalMoles):0.##}")); ("percentage", $"{(100 * amount / data.TotalMoles):0.##}"));
GasContainer.AddChild(label); GasContainer.AddChild(label);
_gasLabels.Add(gas, 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}"), label.Text = Loc.GetString("air-alarm-ui-gases", ("gas", $"{gas}"),
("amount", $"{amount:0.####}"), ("amount", $"{amount:0.####}"),
("percentage", $"{(amount / data.TotalMoles):0.##}")); ("percentage", $"{(100 * amount / data.TotalMoles):0.##}"));
} }
_pressureThreshold.UpdateThresholdData(data.PressureThreshold); _pressureThreshold.UpdateThresholdData(data.PressureThreshold);

4
Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs
View File

@@ -298,9 +298,9 @@ public sealed class AirAlarmSystem : EntitySystem
if (args.AlarmType == AtmosAlarmType.Danger) 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); SetMode(uid, addr, AirAlarmMode.Filtering, true, false);
} }

2
Content.Server/Doors/Systems/FirelockSystem.cs
View File

@@ -91,7 +91,7 @@ namespace Content.Server.Doors.Systems
{ {
if (!TryComp<DoorComponent>(uid, out var doorComponent)) return; if (!TryComp<DoorComponent>(uid, out var doorComponent)) return;
if (args.AlarmType == AtmosAlarmType.Normal) if (args.AlarmType == AtmosAlarmType.Normal || args.AlarmType == AtmosAlarmType.Warning)
{ {
if (doorComponent.State == DoorState.Closed) if (doorComponent.State == DoorState.Closed)
_doorSystem.TryOpen(uid); _doorSystem.TryOpen(uid);

16
Resources/Prototypes/Atmospherics/thresholds.yml
View File

@@ -1,8 +1,8 @@
- type: alarmThreshold - type: alarmThreshold
id: stationTemperature id: stationTemperature
upperBound: 1465.75 # T20C * 5 upperBound: 393.15 # T20C + 200
lowerBound: 193.15 # T20C - 100 lowerBound: 193.15 # T20C - 100
upperWarnAround: 0.25 upperWarnAround: 0.7
lowerWarnAround: 1.1 lowerWarnAround: 1.1
- type: alarmThreshold - type: alarmThreshold
@@ -14,7 +14,7 @@
- type: alarmThreshold - type: alarmThreshold
id: stationOxygen id: stationOxygen
lowerBound: 0.0010 lowerBound: 0.10
lowerWarnAround: 1.5 lowerWarnAround: 1.5
- type: alarmThreshold - type: alarmThreshold
@@ -22,6 +22,16 @@
upperBound: 0.0025 upperBound: 0.0025
upperWarnAround: 0.5 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 - type: alarmThreshold
id: ignore # just ignore nitrogen??? ??? ??? id: ignore # just ignore nitrogen??? ??? ???
ignore: true ignore: true

8
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
View File

@@ -45,8 +45,8 @@
Plasma: danger # everything below is usually bad Plasma: danger # everything below is usually bad
Tritium: danger Tritium: danger
WaterVapor: danger WaterVapor: danger
Miasma: danger Miasma: stationMiasma
NitrousOxide: danger NitrousOxide: stationNO
Frezon: danger Frezon: danger
- type: Tag - type: Tag
tags: tags:
@@ -134,8 +134,8 @@
Plasma: danger # everything below is usually bad Plasma: danger # everything below is usually bad
Tritium: danger Tritium: danger
WaterVapor: danger WaterVapor: danger
Miasma: danger Miasma: stationMiasma
NitrousOxide: danger NitrousOxide: stationNO
Frezon: danger Frezon: danger
- type: Tag - type: Tag
tags: tags:

4
Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
View File

@@ -52,8 +52,8 @@
Plasma: danger # everything below is usually bad Plasma: danger # everything below is usually bad
Tritium: danger Tritium: danger
WaterVapor: danger WaterVapor: danger
Miasma: danger Miasma: stationMiasma
NitrousOxide: danger NitrousOxide: stationNO
Frezon: danger Frezon: danger
- type: Tag - type: Tag
tags: tags: