diff --git a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs index 510b6e98d0df..ae454b4ee078 100644 --- a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs +++ b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs @@ -5,13 +5,12 @@ using Content.Shared.Containers.ItemSlots; using Content.Shared.CrewManifest; using Content.Shared.Roles; +using Content.Shared.StatusIcon; using Robust.Shared.Configuration; using Robust.Shared.Prototypes; using static Content.Shared.Access.Components.IdCardConsoleComponent; -// Starlight-edit: Start using Robust.Client.UserInterface; using Content.Shared._Starlight.Access; -// Starlight-edit: End namespace Content.Client.Access.UI { @@ -39,8 +38,10 @@ protected override void Open() { base.Open(); // Starlight-edit: Start + var requiredTags = EntMan.GetComponent(Owner).RequiredTags; + _window = this.CreateWindow(); - _window.Initialize(this); + _window.Initialize(this, requiredTags); _window.Title = EntMan.GetComponent(Owner).EntityName; // Starlight-edit: End _window.CrewManifestButton.OnPressed += _ => SendMessage(new CrewManifestOpenUiMessage()); @@ -66,8 +67,8 @@ protected override void UpdateState(BoundUserInterfaceState state) var castState = (IdCardConsoleBoundUserInterfaceState) state; _window?.UpdateState(castState); } - - public void SubmitData(string newFullName, string newJobTitle, List> newAccessList, ProtoId? newJobPrototype) // Starlight: Nullable newJobPrototype + // Starlight-edit: Start + public void SubmitData(string newFullName, string newJobTitle, List> newAccessList, ProtoId? newJobPrototype, ProtoId? newJobIcon) // Starlight: Nullable newJobPrototype, newJobIcon { if (newFullName.Length > _maxNameLength) newFullName = newFullName[.._maxNameLength]; @@ -79,14 +80,14 @@ public void SubmitData(string newFullName, string newJobTitle, List group) { SendMessage(new IdCardConsoleComponent.AccessGroupSelectedMessage(group)); // Starlight-edit } - // Starlight-edit: End } } diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml b/Content.Client/Access/UI/IdCardConsoleWindow.xaml index 513f39dc56bc..edab0da91f7a 100644 --- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml +++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml @@ -1,6 +1,6 @@ + MinSize="650 340"> @@ -29,6 +29,12 @@