juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reapply "Remove some BUI boilerplate" (#30214) (#30219)

Browse Source 
* Reapply "Remove some BUI boilerplate" (#30214)

This reverts commit cb0ba66be3.

* Fix gas tank

* Fix PA

* Fix microwave

* Comms console underwrap

* Fix rcd

* log wehs
This commit is contained in:
metalgearsloth
2024-07-21 14:48:13 +10:00
committed by GitHub
parent 87e52e50b4
commit edb05e36bb
137 changed files with 1102 additions and 1757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
View File

@@ -3,6 +3,7 @@ using Content.Shared.Shuttles.BUIStates;
using Content.Shared.Shuttles.Events;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Client.UserInterface;
namespace Content.Client.Shuttles.BUI;
@@ -20,8 +21,7 @@ public sealed class IFFConsoleBoundUserInterface : BoundUserInterface
{
base.Open();
_window = new IFFConsoleWindow();
_window.OnClose += Close;
_window = this.CreateWindow<IFFConsoleWindow>();
_window.ShowIFF += SendIFFMessage;
_window.ShowVessel += SendVesselMessage;
_window.OpenCenteredLeft();

14
Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs
View File

@@ -2,6 +2,7 @@ using Content.Client.Shuttles.UI;
using Content.Shared.Shuttles.BUIStates;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Client.UserInterface;
using RadarConsoleWindow = Content.Client.Shuttles.UI.RadarConsoleWindow;
namespace Content.Client.Shuttles.BUI;
@@ -20,18 +21,7 @@ public sealed class RadarConsoleBoundUserInterface : BoundUserInterface
{
base.Open();
_window = new RadarConsoleWindow();
_window.OnClose += Close;
_window.OpenCentered();
}
protected override void Dispose(bool disposing)
{
base.Dispose(disposing);
if (disposing)
{
_window?.Dispose();
}
_window = this.CreateWindow<RadarConsoleWindow>();
}
protected override void UpdateState(BoundUserInterfaceState state)

5
Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
View File

@@ -2,6 +2,7 @@ using Content.Client.Shuttles.UI;
using Content.Shared.Shuttles.BUIStates;
using Content.Shared.Shuttles.Events;
using JetBrains.Annotations;
using Robust.Client.UserInterface;
using Robust.Shared.Map;
namespace Content.Client.Shuttles.BUI;
@@ -19,9 +20,7 @@ public sealed class ShuttleConsoleBoundUserInterface : BoundUserInterface
protected override void Open()
{
base.Open();
_window = new ShuttleConsoleWindow();
_window.OpenCentered();
_window.OnClose += Close;
_window = this.CreateWindow<ShuttleConsoleWindow>();
_window.RequestFTL += OnFTLRequest;
_window.RequestBeaconFTL += OnFTLBeaconRequest;