]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
DNA scrambler examine fixes (#34920)
author12rabbits <53499656+12rabbits@users.noreply.github.com>
Thu, 6 Feb 2025 19:09:59 +0000 (11:09 -0800)
committerGitHub <noreply@github.com>
Thu, 6 Feb 2025 19:09:59 +0000 (11:09 -0800)
* 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
Content.Server/Implants/SubdermalImplantSystem.cs

index ff6901f5a92e107db6248d04ec7ea180c8daa21d..d90bf6021df6d1762b1eaa3bc22ce7a5a377c2a2 100644 (file)
@@ -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))
index 9d074cec745c70fbc533f963064efbfb18bd068d..cb41e55ba55138dd9b9ae7bf40c29e814b33becd 100644 (file)
@@ -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<DetailExaminableComponent>(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);
         }