From 5b88b0b0badbc54c26c6d59b8c64edacfdd3ceed Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 12 Sep 2024 02:52:19 +0200 Subject: [PATCH] Change forensic pad to use label isntead of name changing (#31842) change name change to label --- .../Forensics/Systems/ForensicPadSystem.cs | 14 +++++++------- Resources/Locale/en-US/forensics/forensics.ftl | 3 --- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Content.Server/Forensics/Systems/ForensicPadSystem.cs b/Content.Server/Forensics/Systems/ForensicPadSystem.cs index 42512cb1fd..a3f5627cdb 100644 --- a/Content.Server/Forensics/Systems/ForensicPadSystem.cs +++ b/Content.Server/Forensics/Systems/ForensicPadSystem.cs @@ -1,10 +1,11 @@ -using Content.Shared.Examine; -using Content.Shared.Interaction; -using Content.Shared.Inventory; +using Content.Server.Labels; using Content.Server.Popups; using Content.Shared.DoAfter; +using Content.Shared.Examine; using Content.Shared.Forensics; using Content.Shared.IdentityManagement; +using Content.Shared.Interaction; +using Content.Shared.Inventory; namespace Content.Server.Forensics { @@ -17,6 +18,7 @@ namespace Content.Server.Forensics [Dependency] private readonly InventorySystem _inventory = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private readonly LabelSystem _label = default!; public override void Initialize() { @@ -99,10 +101,8 @@ namespace Content.Server.Forensics if (args.Args.Target != null) { - var name = HasComp(args.Args.Target) - ? "forensic-pad-fingerprint-name" - : "forensic-pad-gloves-name"; - _metaData.SetEntityName(uid, Loc.GetString(name, ("entity", args.Args.Target))); + string label = Identity.Name(args.Args.Target.Value, EntityManager); + _label.Label(uid, label); } padComponent.Sample = args.Sample; diff --git a/Resources/Locale/en-US/forensics/forensics.ftl b/Resources/Locale/en-US/forensics/forensics.ftl index 712e8511bb..80eea069fa 100644 --- a/Resources/Locale/en-US/forensics/forensics.ftl +++ b/Resources/Locale/en-US/forensics/forensics.ftl @@ -20,9 +20,6 @@ forensic-scanner-printer-not-ready = Printer is not ready yet. forensic-scanner-verb-text = Scan forensic-scanner-verb-message = Perform a forensic scan -forensic-pad-fingerprint-name = {$entity}'s fingerprints -forensic-pad-gloves-name = fibers from {$entity} - forensics-dna-unknown = unknown DNA forensics-verb-text = Remove evidence