]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix GhostRoleRadio icons (#30650)
authorPlykiya <58439124+Plykiya@users.noreply.github.com>
Mon, 5 Aug 2024 01:24:40 +0000 (18:24 -0700)
committerGitHub <noreply@github.com>
Mon, 5 Aug 2024 01:24:40 +0000 (21:24 -0400)
Co-authored-by: plykiya <plykiya@protonmail.com>
Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs
Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs

index 33944973b51f97ccaf2e937746f8cfed1ac0c3ee..52ea835f4a86022ed6aacaef9b76743cb34ec2c8 100644 (file)
@@ -22,7 +22,7 @@ public sealed class GhostRoleRadioBoundUserInterface : BoundUserInterface
         _ghostRoleRadioMenu.SendGhostRoleRadioMessageAction += SendGhostRoleRadioMessage;
     }
 
-    public void SendGhostRoleRadioMessage(ProtoId<GhostRolePrototype> protoId)
+    private void SendGhostRoleRadioMessage(ProtoId<GhostRolePrototype> protoId)
     {
         SendMessage(new GhostRoleRadioMessage(protoId));
     }
index b05ac3fbddded0b45da62533fe29eab29a867d18..3897b1b949ca8e571aba583d7f80daec633c0483 100644 (file)
@@ -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<RadialContainer>("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);