From 365cb96766b4825ea9ab172d298c73b087f5f251 Mon Sep 17 00:00:00 2001 From: Mervill Date: Thu, 22 Sep 2022 12:04:01 -0700 Subject: [PATCH] the agent id card interface now remembers the previous fake name and title (#11427) --- .../Access/Systems/AgentIDCardSystem.cs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs index 45e1bc7a87..678c92f0d0 100644 --- a/Content.Server/Access/Systems/AgentIDCardSystem.cs +++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs @@ -3,7 +3,9 @@ using Content.Server.Access.Components; using Content.Shared.Access.Systems; using Content.Shared.Interaction; using Content.Server.Popups; +using Content.Server.UserInterface; using Robust.Shared.Player; +using Robust.Server.GameObjects; namespace Content.Server.Access.Systems { @@ -11,15 +13,16 @@ namespace Content.Server.Access.Systems { [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly IdCardSystem _cardSystem = default!; + [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnAfterInteract); // BUI + SubscribeLocalEvent(AfterUIOpen); SubscribeLocalEvent(OnNameChanged); SubscribeLocalEvent (OnJobChanged); - } private void OnAfterInteract(EntityUid uid, AgentIDCardComponent component, AfterInteractEvent args) @@ -47,6 +50,18 @@ namespace Content.Server.Access.Systems _popupSystem.PopupEntity(Loc.GetString("agent-id-new", ("number", addedLength), ("card", args.Target)), args.Target.Value, Filter.Entities(args.User)); } + private void AfterUIOpen(EntityUid uid, AgentIDCardComponent component, AfterActivatableUIOpenEvent args) + { + if (!_uiSystem.TryGetUi(component.Owner, AgentIDCardUiKey.Key, out var ui)) + return; + + if (!TryComp(uid, out var idCard)) + return; + + var state = new AgentIDCardBoundUserInterfaceState(idCard.FullName ?? "", idCard.JobTitle ?? ""); + ui.SetState(state, args.Session); + } + private void OnJobChanged(EntityUid uid, AgentIDCardComponent comp, AgentIDCardJobChangedMessage args) { if (!TryComp(uid, out var idCard))