diff --git a/Content.Client/Research/ResearchSystem.cs b/Content.Client/Research/ResearchSystem.cs index 55d95352729..7086fc928bc 100644 --- a/Content.Client/Research/ResearchSystem.cs +++ b/Content.Client/Research/ResearchSystem.cs @@ -1,8 +1,5 @@ -using Content.Shared.Research.Systems; +using Content.Shared.Research.Systems; namespace Content.Client.Research; -public sealed class ResearchSystem : SharedResearchSystem -{ - -} +public sealed class ResearchSystem : SharedResearchSystem; diff --git a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs index 2895ada61fb..d5202eea5db 100644 --- a/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs +++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs @@ -7,23 +7,22 @@ using Robust.Shared.Prototypes; namespace Content.Client.Research.UI; [UsedImplicitly] -public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface +public sealed class ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey) { [ViewVariables] private ResearchConsoleMenu? _consoleMenu; - public ResearchConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) - { - } - protected override void Open() { base.Open(); - var owner = Owner; - _consoleMenu = this.CreateWindow(); - _consoleMenu.SetEntity(owner); + _consoleMenu.SetEntity(Owner); + + _consoleMenu.OnTechnologyRediscoverPressed += () => + { + SendMessage(new ConsoleRediscoverTechnologyMessage()); + }; _consoleMenu.OnTechnologyCardPressed += id => { @@ -56,6 +55,7 @@ public sealed class ResearchConsoleBoundUserInterface : BoundUserInterface if (state is not ResearchConsoleBoundInterfaceState castState) return; + _consoleMenu?.UpdatePanels(castState); _consoleMenu?.UpdateInformationPanel(castState); } diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml b/Content.Client/Research/UI/ResearchConsoleMenu.xaml index 8de9827c0c1..8e3a74f9330 100644 --- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml +++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml @@ -1,4 +1,4 @@ -