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

6
Content.Shared/Movement/Systems/SharedJetpackSystem.cs
View File

@@ -55,7 +55,7 @@ public abstract class SharedJetpackSystem : EntitySystem
jetpackQuery.TryGetComponent(user.Jetpack, out var jetpack))
{
if (_timing.IsFirstTimePredicted)
_popups.PopupEntity(Loc.GetString("jetpack-to-grid"), user.Jetpack, Filter.Entities(user.Owner));
_popups.PopupEntity(Loc.GetString("jetpack-to-grid"), user.Jetpack, user.Owner);
SetEnabled(jetpack, false, user.Owner);
}
@@ -94,7 +94,7 @@ public abstract class SharedJetpackSystem : EntitySystem
SetEnabled(jetpack, false, uid);
if (_timing.IsFirstTimePredicted && _network.IsClient)
_popups.PopupEntity(Loc.GetString("jetpack-to-grid"), uid, Filter.Entities(uid));
_popups.PopupEntity(Loc.GetString("jetpack-to-grid"), uid, uid);
}
}
@@ -120,7 +120,7 @@ public abstract class SharedJetpackSystem : EntitySystem
if (TryComp<TransformComponent>(uid, out var xform) && !CanEnableOnGrid(xform.GridUid))
{
if (_timing.IsFirstTimePredicted)
_popups.PopupEntity(Loc.GetString("jetpack-no-station"), uid, Filter.Entities(args.Performer));
_popups.PopupEntity(Loc.GetString("jetpack-no-station"), uid, args.Performer);
return;
}