From 6134c987391811db9d4eb75b03bf70c89e4e613e Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Fri, 29 Nov 2024 00:30:25 -0800 Subject: [PATCH 1/2] Fix popup on handcuffing for person being handcuffed --- Content.Shared/Cuffs/SharedCuffableSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index 21d09c744cd6..9939c68dfb77 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -528,7 +528,7 @@ public bool TryCuffing(EntityUid user, EntityUid target, EntityUid handcuff, Han { _popup.PopupClient(Loc.GetString("handcuff-component-start-cuffing-target-message", ("targetName", Identity.Name(target, EntityManager, user))), user, user); - _popup.PopupClient(Loc.GetString("handcuff-component-start-cuffing-by-other-message", + _popup.PopupEntity(Loc.GetString("handcuff-component-start-cuffing-by-other-message", ("otherName", Identity.Name(user, EntityManager, target))), target, target); } @@ -649,7 +649,7 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove { _popup.PopupClient(Loc.GetString("cuffable-component-start-uncuffing-target-message", ("targetName", Identity.Name(target, EntityManager, user))), user, user); - _popup.PopupClient(Loc.GetString("cuffable-component-start-uncuffing-by-other-message", + _popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-by-other-message", ("otherName", Identity.Name(user, EntityManager, target))), target, target); } From 2a23c929032da0a822640f2916e040e39f53b455 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Fri, 29 Nov 2024 00:39:09 -0800 Subject: [PATCH 2/2] wrap onto newlines to appease the style gods --- Content.Shared/Cuffs/SharedCuffableSystem.cs | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index 9939c68dfb77..aed85e19ad76 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -636,10 +636,14 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove _adminLog.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(user)} is trying to uncuff {ToPrettyString(target)}"); - _popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-observer", - ("user", Identity.Name(user, EntityManager)), ("target", Identity.Name(target, EntityManager))), - target, Filter.Pvs(target, entityManager: EntityManager) - .RemoveWhere(e => e.AttachedEntity == target || e.AttachedEntity == user), true); + _popup.PopupEntity( + Loc.GetString("cuffable-component-start-uncuffing-observer", + ("user", Identity.Name(user, EntityManager)), + ("target", Identity.Name(target, EntityManager))), + target, + Filter.Pvs(target, entityManager: EntityManager) + .RemoveWhere(e => e.AttachedEntity == target || e.AttachedEntity == user), + true); if (target == user) { @@ -648,9 +652,13 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove else { _popup.PopupClient(Loc.GetString("cuffable-component-start-uncuffing-target-message", - ("targetName", Identity.Name(target, EntityManager, user))), user, user); + ("targetName", Identity.Name(target, EntityManager, user))), + user, + user); _popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-by-other-message", - ("otherName", Identity.Name(user, EntityManager, target))), target, target); + ("otherName", Identity.Name(user, EntityManager, target))), + target, + target); } _audio.PlayPredicted(isOwner ? cuff.StartBreakoutSound : cuff.StartUncuffSound, target, user);