From 4313a6ee664e4ee988da061337790a30041b9874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Urba=C5=84czyk?= Date: Fri, 29 Sep 2023 17:01:19 +0200 Subject: [PATCH] Fix electrocution displaying real name of disguised players (#20603) --- Content.Server/Electrocution/ElectrocutionSystem.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs index 63517c9962..844d526c58 100644 --- a/Content.Server/Electrocution/ElectrocutionSystem.cs +++ b/Content.Server/Electrocution/ElectrocutionSystem.cs @@ -12,6 +12,7 @@ using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; using Content.Shared.Database; using Content.Shared.Electrocution; +using Content.Shared.IdentityManagement; using Content.Shared.Interaction; using Content.Shared.Inventory; using Content.Shared.Jittering; @@ -432,17 +433,18 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem var filter = Filter.PvsExcept(uid, entityManager: EntityManager); + var identifiedUid = Identity.Entity(uid, ent: EntityManager); // TODO: Allow being able to pass EntityUid to Loc... if (sourceUid != null) { _popup.PopupEntity(Loc.GetString("electrocuted-component-mob-shocked-by-source-popup-others", - ("mob", uid), ("source", (sourceUid.Value))), uid, filter, true); + ("mob", identifiedUid), ("source", (sourceUid.Value))), uid, filter, true); PlayElectrocutionSound(uid, sourceUid.Value); } else { _popup.PopupEntity(Loc.GetString("electrocuted-component-mob-shocked-popup-others", - ("mob", uid)), uid, filter, true); + ("mob", identifiedUid)), uid, filter, true); } return true;