Merge pull request #32 from Corvax-Frontier/Zekins3366-patch-1

ХотФикс багов и неисправностей
Corvax-Frontier · Apr 15, 2024 · 89d0718 · 89d0718
2 parents dafe087 + 7c9e322
commit 89d0718
Show file tree

Hide file tree

Showing 25 changed files with 888 additions and 819 deletions.
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml b/Content.Client/Lathe/UI/LatheMenu.xaml
@@ -124,9 +124,7 @@
             <BoxContainer
             VerticalExpand="True"
             HorizontalExpand="True"
-            Orientation="Vertical"
-            MinHeight="225"
-            >
+            Orientation="Vertical">
             <Label Text="{Loc 'lathe-menu-materials-title'}" Margin="5 5 5 5" HorizontalAlignment="Center"/>
             <BoxContainer
                 Orientation="Vertical"

diff --git a/Content.Server/Administration/Commands/AdminWhoCommand.cs b/Content.Server/Administration/Commands/AdminWhoCommand.cs
@@ -7,7 +7,7 @@
 
 namespace Content.Server.Administration.Commands;
 
-[AdminCommand(AdminFlags.Admin)]
+[AnyCommand] // Corvax: Allow use to everyone
 public sealed class AdminWhoCommand : IConsoleCommand
 {
     public string Command => "adminwho";
@@ -19,6 +19,14 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)
         var adminMgr = IoCManager.Resolve<IAdminManager>();
         var afk = IoCManager.Resolve<IAfkManager>();
 
+        var seeStealth = true;
+
+        // If null it (hopefully) means it is being called from the console.
+        if (shell.Player != null)
+        {
+            var playerData = adminMgr.GetAdminData(shell.Player);
+        }
+
         var sb = new StringBuilder();
         var first = true;
         foreach (var admin in adminMgr.ActiveAdmins)