tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change forensic pad to use label isntead of name changing (#31842)

Browse Source 
change name change to label
This commit is contained in:
lzk
2024-09-12 02:52:19 +02:00
committed by GitHub
parent 0df531970b
commit 5b88b0b0ba
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Forensics/Systems/ForensicPadSystem.cs
View File

@@ -1,10 +1,11 @@
using Content.Shared.Examine; using Content.Server.Labels;
using Content.Shared.Interaction;
using Content.Shared.Inventory;
using Content.Server.Popups; using Content.Server.Popups;
using Content.Shared.DoAfter; using Content.Shared.DoAfter;
using Content.Shared.Examine;
using Content.Shared.Forensics; using Content.Shared.Forensics;
using Content.Shared.IdentityManagement; using Content.Shared.IdentityManagement;
using Content.Shared.Interaction;
using Content.Shared.Inventory;
namespace Content.Server.Forensics namespace Content.Server.Forensics
{ {
@@ -17,6 +18,7 @@ namespace Content.Server.Forensics
[Dependency] private readonly InventorySystem _inventory = default!; [Dependency] private readonly InventorySystem _inventory = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly MetaDataSystem _metaData = default!;
[Dependency] private readonly LabelSystem _label = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -99,10 +101,8 @@ namespace Content.Server.Forensics
if (args.Args.Target != null) if (args.Args.Target != null)
{ {
var name = HasComp<FingerprintComponent>(args.Args.Target) string label = Identity.Name(args.Args.Target.Value, EntityManager);
? "forensic-pad-fingerprint-name" _label.Label(uid, label);
: "forensic-pad-gloves-name";
_metaData.SetEntityName(uid, Loc.GetString(name, ("entity", args.Args.Target)));
} }
padComponent.Sample = args.Sample; padComponent.Sample = args.Sample;

3
Resources/Locale/en-US/forensics/forensics.ftl
View File

@@ -20,9 +20,6 @@ forensic-scanner-printer-not-ready = Printer is not ready yet.
forensic-scanner-verb-text = Scan forensic-scanner-verb-text = Scan
forensic-scanner-verb-message = Perform a forensic 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-dna-unknown = unknown DNA
forensics-verb-text = Remove evidence forensics-verb-text = Remove evidence