From d87d9c467626fab1d8f33da5949b16e9e8d120eb Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Sun, 4 Aug 2024 18:24:40 -0700 Subject: [PATCH] Fix GhostRoleRadio icons (#30650) Co-authored-by: plykiya --- Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs | 2 +- Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs b/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs index 33944973b5..52ea835f4a 100644 --- a/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs +++ b/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs @@ -22,7 +22,7 @@ public sealed class GhostRoleRadioBoundUserInterface : BoundUserInterface _ghostRoleRadioMenu.SendGhostRoleRadioMessageAction += SendGhostRoleRadioMessage; } - public void SendGhostRoleRadioMessage(ProtoId protoId) + private void SendGhostRoleRadioMessage(ProtoId protoId) { SendMessage(new GhostRoleRadioMessage(protoId)); } diff --git a/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs b/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs index b05ac3fbdd..3897b1b949 100644 --- a/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs +++ b/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs @@ -1,7 +1,6 @@ using Content.Client.UserInterface.Controls; using Content.Shared.Ghost.Roles; using Content.Shared.Ghost.Roles.Components; -using Robust.Client.GameObjects; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; @@ -33,7 +32,7 @@ public sealed partial class GhostRoleRadioMenu : RadialMenu private void RefreshUI() { - // The main control that will contain all of the clickable options + // The main control that will contain all the clickable options var main = FindControl("Main"); // The purpose of this radial UI is for ghost role radios that allow you to select @@ -70,7 +69,7 @@ public sealed partial class GhostRoleRadioMenu : RadialMenu if (_prototypeManager.TryIndex(ghostRoleProto.IconPrototype, out var iconProto)) entProtoView.SetPrototype(iconProto); else - entProtoView.SetPrototype(comp.Prototype); + entProtoView.SetPrototype(ghostRoleProto.EntityPrototype); button.AddChild(entProtoView); main.AddChild(button);