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

air alarm window changes, firelock alarmable

Browse Source
This commit is contained in:
vulppine
2022-08-18 07:52:21 -07:00
parent b444c0bbbe
commit 35ba20de17
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
View File

@@ -28,10 +28,6 @@
</BoxContainer>
<!-- Gas/Device Data -->
<TabContainer Name="CTabContainer" VerticalExpand="True" Margin="0 0 0 2">
<!-- Gas readout -->
<ScrollContainer VerticalExpand="True">
<BoxContainer Name="CGasContainer" Orientation="Vertical" VerticalExpand="True" Margin="2 2 2 2" />
</ScrollContainer>
<!-- Vent devices -->
<ScrollContainer VerticalExpand="True">
<BoxContainer Name="CVentContainer" Orientation="Vertical"/>

13
Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml.cs
View File

@@ -23,6 +23,7 @@ namespace Content.Client.Atmos.Monitor.UI
public event Action<AirAlarmMode>? AirAlarmModeChanged;
public event Action<string>? ResyncDeviceRequested;
public event Action? ResyncAllRequested;
public event Action<AirAlarmTab>? AirAlarmTabChange;
private Label _address => CDeviceAddress;
private Label _deviceTotal => CDeviceTotal;
@@ -67,10 +68,14 @@ namespace Content.Client.Atmos.Monitor.UI
_gasLabels.Add(gas, gasLabel);
}
_tabContainer.SetTabTitle(0, Loc.GetString("air-alarm-ui-window-tab-gas"));
_tabContainer.SetTabTitle(1, Loc.GetString("air-alarm-ui-window-tab-vents"));
_tabContainer.SetTabTitle(2, Loc.GetString("air-alarm-ui-window-tab-scrubbers"));
_tabContainer.SetTabTitle(3, Loc.GetString("air-alarm-ui-window-tab-thresholds"));
_tabContainer.SetTabTitle(0, Loc.GetString("air-alarm-ui-window-tab-vents"));
_tabContainer.SetTabTitle(1, Loc.GetString("air-alarm-ui-window-tab-scrubbers"));
_tabContainer.SetTabTitle(2, Loc.GetString("air-alarm-ui-window-tab-sensors"));
_tabContainer.OnTabChanged += idx =>
{
AirAlarmTabChange!((AirAlarmTab) idx);
};
_resyncDevices.OnPressed += _ =>
{

2
Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
View File

@@ -7,7 +7,7 @@
- type: AtmosAlarmable
alarmedBy:
- FireAlarm
- AirAlarm
- GasVentPump # TODO: No
- type: ApcPowerReceiver
- type: ExtensionCableReceiver
- type: DeviceNetwork