From ab72f682ceb9d504cd4b842d8be92e7378ae4889 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Tue, 11 Mar 2025 14:52:38 +0100 Subject: [PATCH] Fix Chameleon PDAs renaming the user in station records (#35782) --- Content.Server/StationRecords/Systems/StationRecordsSystem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs index a5332022ee..5957b98cd7 100644 --- a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs +++ b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs @@ -64,7 +64,8 @@ public sealed class StationRecordsSystem : SharedStationRecordsSystem // Unfortunately this means that an event is called for it as well, and since TryFindIdCard will succeed if the // given entity is a card and the card itself is the key the record will be mistakenly renamed to the card's name // if we don't return early. - if (HasComp(ev.Uid)) + // We also do not include the PDA itself being renamed, as that triggers the same event (e.g. for chameleon PDAs). + if (HasComp(ev.Uid) || HasComp(ev.Uid)) return; if (_idCard.TryFindIdCard(ev.Uid, out var idCard)) -- 2.51.2