Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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.Server/Crayon/CrayonSystem.cs
View File

@@ -51,7 +51,7 @@ public sealed class CrayonSystem : SharedCrayonSystem
if (component.DeleteEmpty)
UseUpCrayon(uid, args.User);
else
_popup.PopupEntity(Loc.GetString("crayon-interact-not-enough-left-text"), uid, Filter.Entities(args.User));
_popup.PopupEntity(Loc.GetString("crayon-interact-not-enough-left-text"), uid, args.User);
args.Handled = true;
return;
@@ -59,7 +59,7 @@ public sealed class CrayonSystem : SharedCrayonSystem
if (!args.ClickLocation.IsValid(EntityManager))
{
_popup.PopupEntity(Loc.GetString("crayon-interact-invalid-location"), uid, Filter.Entities(args.User));
_popup.PopupEntity(Loc.GetString("crayon-interact-invalid-location"), uid, args.User);
args.Handled = true;
return;
}
@@ -139,7 +139,7 @@ public sealed class CrayonSystem : SharedCrayonSystem
private void UseUpCrayon(EntityUid uid, EntityUid user)
{
_popup.PopupEntity(Loc.GetString("crayon-interact-used-up-text", ("owner", uid)), user, Filter.Entities(user));
_popup.PopupEntity(Loc.GetString("crayon-interact-used-up-text", ("owner", uid)), user, user);
EntityManager.QueueDeleteEntity(uid);
}
}