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

4
Content.Server/Climbing/ClimbSystem.cs
View File

@@ -79,7 +79,7 @@ public sealed class ClimbSystem : SharedClimbSystem
: CanVault(component, args.User, args.Dragged, args.Target, out reason);
if (!canVault)
_popupSystem.PopupEntity(reason, args.User, Filter.Entities(args.User));
_popupSystem.PopupEntity(reason, args.User, args.User);
args.CanDrop = canVault;
args.Handled = true;
@@ -368,7 +368,7 @@ public sealed class ClimbSystem : SharedClimbSystem
// Not shown to the user, since they already get a 'you climb on the glass table' popup
_popupSystem.PopupEntity(
Loc.GetString("glass-table-shattered-others", ("table", uid), ("climber", Identity.Entity(args.Climber, EntityManager))), args.Climber,
Filter.Pvs(uid).RemoveWhereAttachedEntity(puid => puid == args.Climber));
Filter.PvsExcept(args.Climber), true);
}
/// <summary>