tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ArkiveDev
2024-06-22 01:19:40 -04:00
committed by GitHub
parent bb61f44d92
commit b5f6aa0c9d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/CombatMode/Pacification/PacificationSystem.cs
View File

@@ -54,7 +54,8 @@ public sealed class PacificationSystem : EntitySystem
&& !(_timing.CurTime > user.Comp.NextPopupTime)) && !(_timing.CurTime > user.Comp.NextPopupTime))
return; 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.NextPopupTime = _timing.CurTime + user.Comp.PopupCooldown;
user.Comp.LastAttackedEntity = target; user.Comp.LastAttackedEntity = target;
} }