Merge branch 'master' of https://github.com/space-wizards/space-station-14 into toolshed-eng-pr

2025-02-16 23:43:27 +13:00
parent 7554a075a2 2bd7bb17f2
commit a556f03808
1884 changed files with 576954 additions and 258369 deletions
--- a/Content.Server/Administration/Systems/AdminVerbSystem.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs
@@ -370,7 +370,7 @@ namespace Content.Server.Administration.Systems

                }

-                if (lawBoundComponent != null && target != null)
+                if (lawBoundComponent != null && target != null && _adminManager.HasAdminFlag(player, AdminFlags.Moderator))
                {
                    args.Verbs.Add(new Verb()
                    {