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

Merge branch 'master' into air-alarm-fixup

Browse Source
This commit is contained in:
Flipp Syder
2022-08-23 13:21:05 -07:00
committed by GitHub
parent a8eb929d3c c4d0cddeda
commit f00a5cb17a
498 changed files with 21068 additions and 52226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Atmos/Monitor/UI/AirAlarmBoundUserInterface.cs
View File

@@ -18,9 +18,9 @@ public sealed class AirAlarmBoundUserInterface : BoundUserInterface
protected override void Open()
{
base.Open();
_window = new AirAlarmWindow();
if (State != null) UpdateState(State);
_window.OpenCentered();

2
Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs
View File

@@ -6,7 +6,7 @@ namespace Content.Client.Atmos.UI
{
public sealed class GasAnalyzerBoundUserInterface : BoundUserInterface
{
public GasAnalyzerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
public GasAnalyzerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
{
}

2
Content.Client/Atmos/UI/GasCanisterBoundUserInterface.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Client.Atmos.UI
private GasCanisterWindow? _window;
public GasCanisterBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
public GasCanisterBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
{
}

2
Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Client.Atmos.UI
private GasFilterWindow? _window;
private const float MaxTransferRate = Atmospherics.MaxTransferRate;
public GasFilterBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
public GasFilterBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
{
}

2
Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Client.Atmos.UI
private GasMixerWindow? _window;
private const float MaxPressure = Atmospherics.MaxOutputPressure;
public GasMixerBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
public GasMixerBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
{
}

2
Content.Client/Atmos/UI/GasPressurePumpBoundUserInterface.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Client.Atmos.UI
private GasPressurePumpWindow? _window;
private const float MaxPressure = Atmospherics.MaxOutputPressure;
public GasPressurePumpBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
public GasPressurePumpBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
{
}

2
Content.Client/Atmos/UI/GasThermomachineBoundUserInterface.cs
View File

@@ -18,7 +18,7 @@ namespace Content.Client.Atmos.UI
private float _minTemp = 0.0f;
private float _maxTemp = 0.0f;
public GasThermomachineBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
public GasThermomachineBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
{
}

2
Content.Client/Atmos/UI/GasVolumePumpBoundUserInterface.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Client.Atmos.UI
private GasVolumePumpWindow? _window;
private const float MaxTransferRate = Atmospherics.MaxTransferRate;
public GasVolumePumpBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
public GasVolumePumpBoundUserInterface(ClientUserInterfaceComponent owner, Enum uiKey) : base(owner, uiKey)
{
}