From b768f0741cd7767a42059e522333ea3e18514f6b Mon Sep 17 00:00:00 2001 From: Pancake Date: Tue, 22 Mar 2022 18:47:48 -0700 Subject: [PATCH] Fix Research Server (#7237) --- .../Research/UI/ResearchClientServerSelectionMenu.xaml.cs | 2 +- .../Prototypes/Entities/Structures/Machines/research.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs index fad907d769..755e277b7f 100644 --- a/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs +++ b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.xaml.cs @@ -56,7 +56,7 @@ namespace Content.Client.Research.UI Servers.AddItem(Loc.GetString("research-client-server-selection-menu-server-entry-text", ("id", id), ("serverName", _serverNames[i]))); if (id == _selectedServerId) { - Servers[id].Selected = true; + Servers[i].Selected = true; } } diff --git a/Resources/Prototypes/Entities/Structures/Machines/research.yml b/Resources/Prototypes/Entities/Structures/Machines/research.yml index df5125c468..3fd5759bc7 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/research.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/research.yml @@ -34,6 +34,7 @@ range: 5 sound: path: /Audio/Ambience/Objects/server_fans.ogg + - type: entity id: BaseResearchAndDevelopmentPointSource parent: BaseMachinePowered @@ -54,6 +55,9 @@ radius: 1.5 energy: 1.6 color: "#3db83b" + - type: ActivatableUI + key: enum.ResearchClientUiKey.Key + - type: ActivatableUIRequiresPower - type: UserInterface interfaces: - key: enum.ResearchClientUiKey.Key