From 07bc0bb754585f4985c8132df00e4e04b3a626d0 Mon Sep 17 00:00:00 2001
From: rhailrake <49613070+rhailrake@users.noreply.github.com>
Date: Fri, 28 Apr 2023 04:44:00 +0600
Subject: [PATCH] Asay for Meaty Ores

---
 Content.Server/Chat/Managers/ChatManager.cs | 6 ++++--
 Content.Server/Chat/Systems/ChatSystem.cs   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
index 7324ec31fb..8c8fd20f97 100644
--- a/Content.Server/Chat/Managers/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -293,13 +293,15 @@ namespace Content.Server.Chat.Managers
 
         private void SendAdminChat(ICommonSession player, string message)
         {
-            if (!_adminManager.IsAdmin(player))
+            if (!_adminManager.HasAdminFlag(player, AdminFlags.Admin))
             {
                 _adminLogger.Add(LogType.Chat, LogImpact.Extreme, $"{player:Player} attempted to send admin message but was not admin");
                 return;
             }
 
-            var clients = _adminManager.ActiveAdmins.Select(p => p.Channel);
+            var clients = _adminManager.ActiveAdmins
+                .Where(p => _adminManager.HasAdminFlag(p, AdminFlags.Admin))
+                .Select(p => p.Channel);
             var wrappedMessage = Loc.GetString("chat-manager-send-admin-chat-wrap-message",
                                             ("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")),
                                             ("playerName", player.Name), ("message", FormattedMessage.EscapeText(message)));
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 8f7ea4b1f5..5c5aa2966f 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -10,6 +10,7 @@ using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Server.UtkaIntegration;
 using Content.Shared.ActionBlocker;
+using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Database;
@@ -605,7 +606,7 @@ public sealed partial class ChatSystem : SharedChatSystem
     {
         var name = FormattedMessage.EscapeText(Identity.Name(source, EntityManager));
 
-        if (_adminManager.IsAdmin(player))
+        if (_adminManager.HasAdminFlag(player, AdminFlags.Admin))
         {
             if (!AdminLoocEnabled)
                 return;