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

Fix electrocution displaying real name of disguised players (#20603)

Browse Source
This commit is contained in:
Kacper Urbańczyk
2023-09-29 17:01:19 +02:00
committed by GitHub
parent 1dc1c8f64b
commit 4313a6ee66
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Electrocution/ElectrocutionSystem.cs
View File

@@ -12,6 +12,7 @@ using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes; using Content.Shared.Damage.Prototypes;
using Content.Shared.Database; using Content.Shared.Database;
using Content.Shared.Electrocution; using Content.Shared.Electrocution;
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Inventory; using Content.Shared.Inventory;
using Content.Shared.Jittering; using Content.Shared.Jittering;
@@ -432,17 +433,18 @@ public sealed class ElectrocutionSystem : SharedElectrocutionSystem
var filter = Filter.PvsExcept(uid, entityManager: EntityManager); var filter = Filter.PvsExcept(uid, entityManager: EntityManager);
var identifiedUid = Identity.Entity(uid, ent: EntityManager);
// TODO: Allow being able to pass EntityUid to Loc... // TODO: Allow being able to pass EntityUid to Loc...
if (sourceUid != null) if (sourceUid != null)
{ {
_popup.PopupEntity(Loc.GetString("electrocuted-component-mob-shocked-by-source-popup-others", _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); PlayElectrocutionSound(uid, sourceUid.Value);
} }
else else
{ {
_popup.PopupEntity(Loc.GetString("electrocuted-component-mob-shocked-popup-others", _popup.PopupEntity(Loc.GetString("electrocuted-component-mob-shocked-popup-others",
("mob", uid)), uid, filter, true); ("mob", identifiedUid)), uid, filter, true);
} }
return true; return true;