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

PopupSystem public methods rejig (#12830)

Browse Source
This commit is contained in:
Leon Friedrich
2022-12-19 10:41:47 +13:00
committed by GitHub
parent e459452333
commit 881a2b2ece
164 changed files with 721 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,17 +71,13 @@ namespace Content.Server.Shuttles.Systems
if (HasComp<FTLComponent>(xform.GridUid))
{
if (args.Session.AttachedEntity != null)
_popup.PopupCursor(Loc.GetString("shuttle-console-in-ftl"), Filter.Entities(args.Session.AttachedEntity.Value));
_popup.PopupCursor(Loc.GetString("shuttle-console-in-ftl"), args.Session);
return;
}
if (!_shuttle.CanFTL(shuttle.Owner, out var reason))
{
if (args.Session.AttachedEntity != null)
_popup.PopupCursor(reason, Filter.Entities(args.Session.AttachedEntity.Value));
_popup.PopupCursor(reason, args.Session);
return;
}