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

Fixes bug with criminal records (#24954)

Browse Source
This commit is contained in:
AJCM-git
2024-02-04 20:12:07 -04:00
committed by GitHub
parent 683591ab04
commit a8c9af1227
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
View File

@@ -104,6 +104,12 @@ public sealed class CriminalRecordsConsoleSystem : EntitySystem
if (_idCard.TryFindIdCard(mob.Value, out var id) && id.Comp.FullName is {} fullName)
officer = fullName;
(string, object)[] args;
if (reason != null)
args = new (string, object)[] { ("name", name), ("officer", officer), ("reason", reason) };
else
args = new (string, object)[] { ("name", name), ("officer", officer) };
// figure out which radio message to send depending on transition
var statusString = (oldStatus, msg.Status) switch
{
@@ -118,9 +124,7 @@ public sealed class CriminalRecordsConsoleSystem : EntitySystem
// this is impossible
_ => "not-wanted"
};
var message = Loc.GetString($"criminal-records-console-{statusString}", ("name", name), ("officer", officer),
reason != null ? ("reason", reason) : default!);
_radio.SendRadioMessage(ent, message, ent.Comp.SecurityChannel, ent);
_radio.SendRadioMessage(ent, Loc.GetString($"criminal-records-console-{statusString}", args), ent.Comp.SecurityChannel, ent);
UpdateUserInterface(ent);
}