From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Tue, 7 Jan 2025 19:31:54 +0000 (+0100) Subject: [HOTFIX] Fix chameleon PDAs renaming IDs (#34249) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3238c2e144c36c1386fac7697a1495051dbf245e;p=space-station-14.git [HOTFIX] Fix chameleon PDAs renaming IDs (#34249) Fix chameleon PDA --- diff --git a/Content.Shared/Access/Systems/SharedIdCardSystem.cs b/Content.Shared/Access/Systems/SharedIdCardSystem.cs index a5a37eecbd..db7d9b38c8 100644 --- a/Content.Shared/Access/Systems/SharedIdCardSystem.cs +++ b/Content.Shared/Access/Systems/SharedIdCardSystem.cs @@ -33,7 +33,8 @@ public abstract class SharedIdCardSystem : EntitySystem // When a player gets renamed their id card is renamed as well to match. // Unfortunately since TryFindIdCard will succeed if the entity is also a card this means that the card will // keep renaming itself unless we 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 (TryFindIdCard(ev.Uid, out var idCard))