Pacifist messages use target's identity name instead of entity name (#…

…29325)
space-wizards · Jun 22, 2024 · b5f6aa0 · b5f6aa0
1 parent bb61f44
commit b5f6aa0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs
@@ -54,7 +54,8 @@ private void ShowPopup(Entity<PacifiedComponent> user, EntityUid target, string
             && !(_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;
     }