Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

sensor info is now wider, air alarm now actually updates the networked device state

Browse Source
This commit is contained in:
vulppine
2022-08-19 05:23:25 -07:00
parent 6dcbfcaaae
commit 9b3df8740f
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
<BoxContainer xmlns="https://spacestation14.io"> <BoxContainer xmlns="https://spacestation14.io" HorizontalExpand="True">
<Collapsible Orientation="Vertical"> <Collapsible Orientation="Vertical">
<CollapsibleHeading Name="SensorAddress" /> <CollapsibleHeading Name="SensorAddress" />
<CollapsibleBody Margin="2"> <CollapsibleBody Margin="2">

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

@@ -344,20 +344,11 @@ namespace Content.Server.Atmos.Monitor.Systems
if (args.HighestNetworkType == AtmosMonitorAlarmType.Danger) if (args.HighestNetworkType == AtmosMonitorAlarmType.Danger)
{ {
SetMode(uid, addr, AirAlarmMode.None, true); SetMode(uid, addr, AirAlarmMode.None, true, false);
// set mode to off to mimic the vents/scrubbers being turned off
// update UI
//
// no, the mode isn't processed here - it's literally just
// set to what mimics 'off'
} }
else if (args.HighestNetworkType == AtmosMonitorAlarmType.Normal) else if (args.HighestNetworkType == AtmosMonitorAlarmType.Normal)
{ {
// if the mode is still set to off, set it to filtering instead SetMode(uid, addr, AirAlarmMode.Filtering, true, false);
// alternatively, set it to the last saved mode
//
// no, this still doesn't execute the mode
SetMode(uid, addr, AirAlarmMode.Filtering, true);
} }
UpdateUI(uid, component); UpdateUI(uid, component);