From b5f6aa0c9d2b3264199a4160ba86f5282c11a316 Mon Sep 17 00:00:00 2001
From: ArkiveDev <95712736+ArkiveDev@users.noreply.github.com>
Date: Sat, 22 Jun 2024 01:19:40 -0400
Subject: [PATCH] Pacifist messages use target's identity name instead of
 entity name (#29325)

---
 Content.Shared/CombatMode/Pacification/PacificationSystem.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
index a927e1a697..14507ce1f5 100644
--- a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
+++ b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
@@ -54,7 +54,8 @@ public sealed class PacificationSystem : EntitySystem
             && !(_timing.CurTime > user.Comp.NextPopupTime))
             return;
 
-        _popup.PopupClient(Loc.GetString(reason, ("entity", target)), user, user);
+        var targetName = Identity.Entity(target, EntityManager);
+        _popup.PopupClient(Loc.GetString(reason, ("entity", targetName)), user, user);
         user.Comp.NextPopupTime = _timing.CurTime + user.Comp.PopupCooldown;
         user.Comp.LastAttackedEntity = target;
     }
-- 
2.51.2