From b6ccbef14758c3b0e345f37dd95b0515de322a6c Mon Sep 17 00:00:00 2001 From: 12rabbits <53499656+12rabbits@users.noreply.github.com> Date: Thu, 6 Feb 2025 11:09:59 -0800 Subject: [PATCH] DNA scrambler examine fixes (#34920) * Remove custom character description after using DNA scrambler * Mark grammar as dirty when updating identity * Update Content.Server/Implants/SubdermalImplantSystem.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Content.Server/IdentityManagement/IdentitySystem.cs | 2 ++ Content.Server/Implants/SubdermalImplantSystem.cs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Content.Server/IdentityManagement/IdentitySystem.cs b/Content.Server/IdentityManagement/IdentitySystem.cs index ff6901f5a9..d90bf6021d 100644 --- a/Content.Server/IdentityManagement/IdentitySystem.cs +++ b/Content.Server/IdentityManagement/IdentitySystem.cs @@ -103,6 +103,8 @@ public sealed class IdentitySystem : SharedIdentitySystem // If presumed name is null and we're using that, we set proper noun to be false ("the old woman") if (name != representation.TrueName && representation.PresumedName == null) identityGrammar.ProperNoun = false; + + Dirty(ident, identityGrammar); } if (name == Name(ident)) diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs index 9d074cec74..cb41e55ba5 100644 --- a/Content.Server/Implants/SubdermalImplantSystem.cs +++ b/Content.Server/Implants/SubdermalImplantSystem.cs @@ -22,6 +22,7 @@ using System.Numerics; using Content.Shared.Movement.Pulling.Components; using Content.Shared.Movement.Pulling.Systems; using Content.Server.IdentityManagement; +using Content.Server.DetailExaminable; using Content.Shared.Store.Components; using Robust.Shared.Collections; using Robust.Shared.Map.Components; @@ -225,6 +226,7 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem { fingerprint.Fingerprint = _forensicsSystem.GenerateFingerprint(); } + RemComp(ent); // remove MRP+ custom description if one exists _identity.QueueIdentityUpdate(ent); // manually queue identity update since we don't raise the event _popup.PopupEntity(Loc.GetString("scramble-implant-activated-popup"), ent, ent); } -- 2.51.2