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

Content update for UI prediction (#27214)

Browse Source 
* Content update for UI refactor

* Big update

* Sharing

* Remaining content updates

* First big update

* Prototype updates

* AUGH

* Fix UI comp ref

* Cleanup

- Fix predicted message, fix item slots, fix interaction range check.

* Fix regressions

* Make this predictive

idk why it wasn't.

* Fix slime merge

* Merge conflict

* Fix merge
This commit is contained in:
metalgearsloth
2024-04-26 18:16:24 +10:00
committed by GitHub
parent 32b81de8c5
commit 5896e68752
279 changed files with 1308 additions and 1582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
View File

@@ -136,13 +136,12 @@ public sealed partial class ShuttleConsoleSystem : SharedShuttleConsoleSystem
/// </summary>
private void OnConsoleUIClose(EntityUid uid, ShuttleConsoleComponent component, BoundUIClosedEvent args)
{
if ((ShuttleConsoleUiKey) args.UiKey != ShuttleConsoleUiKey.Key ||
args.Session.AttachedEntity is not { } user)
if ((ShuttleConsoleUiKey) args.UiKey != ShuttleConsoleUiKey.Key)
{
return;
}
RemovePilot(user);
RemovePilot(args.Actor);
}
private void OnConsoleUIOpenAttempt(EntityUid uid, ShuttleConsoleComponent component,
@@ -265,9 +264,9 @@ public sealed partial class ShuttleConsoleSystem : SharedShuttleConsoleSystem
new List<ShuttleExclusionObject>());
}
if (_ui.TryGetUi(consoleUid, ShuttleConsoleUiKey.Key, out var bui))
if (_ui.HasUi(consoleUid, ShuttleConsoleUiKey.Key))
{
_ui.SetUiState(bui, new ShuttleBoundUserInterfaceState(navState, mapState, dockState));
_ui.SetUiState(consoleUid, ShuttleConsoleUiKey.Key, new ShuttleBoundUserInterfaceState(navState, mapState, dockState));
}
}