Command perm modifications (#11273)

* Command perm modifications

* actually not this one

* string

Content.Server/Administration/Commands/AddBodyPartCommand.cs

@@ -4,7 +4,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.Fun)]
+    [AdminCommand(AdminFlags.Admin)]
     public sealed class AddBodyPartCommand : IConsoleCommand
     {
         public string Command => "addbodypart";

Content.Server/Administration/Commands/AddEntityStorageCommand.cs

@@ -5,7 +5,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.Fun)]
+    [AdminCommand(AdminFlags.Admin)]
     public sealed class AddEntityStorageCommand : IConsoleCommand
     {
         public string Command => "addstorage";

Content.Server/Administration/Commands/AddMechanismCommand.cs

@@ -5,7 +5,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.Fun)]
+    [AdminCommand(AdminFlags.Admin)]
     public sealed class AddMechanismCommand : IConsoleCommand
     {
         public string Command => "addmechanism";

Content.Server/Administration/Commands/AddReagent.cs

@@ -11,7 +11,7 @@ namespace Content.Server.Administration.Commands
     /// <summary>
     ///     Command that allows you to edit an existing solution by adding (or removing) reagents.
     /// </summary>
-    [AdminCommand(AdminFlags.Fun)]
+    [AdminCommand(AdminFlags.Admin)]
     public sealed class AddReagent : IConsoleCommand
     {
         public string Command => "addreagent";

Content.Server/Administration/Commands/DeleteComponent.cs

@@ -3,7 +3,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.VarEdit)]
+    [AdminCommand(AdminFlags.Spawn)]
     public sealed class DeleteComponent : IConsoleCommand
     {
         public string Command => "deletecomponent";

Content.Server/Administration/Commands/DeleteEntitiesWithComponent.cs

@@ -4,7 +4,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.VarEdit)]
+    [AdminCommand(AdminFlags.Spawn)]
     sealed class DeleteEntitiesWithComponent : IConsoleCommand
     {
         public string Command => "deleteewc";

Content.Server/Administration/Commands/RemoveBodyPartCommand.cs

@@ -4,7 +4,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.Fun)]
+    [AdminCommand(AdminFlags.Admin)]
     public sealed class RemoveBodyPartCommand : IConsoleCommand
     {
         public string Command => "rmbodypart";

Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs

@@ -5,7 +5,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.Fun)]
+    [AdminCommand(AdminFlags.Admin)]
     public sealed class RemoveEntityStorageCommand : IConsoleCommand
     {
         public string Command => "rmstorage";

Content.Server/Administration/Commands/RemoveMechanismCommand.cs

@@ -5,7 +5,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Administration.Commands
 {
-    [AdminCommand(AdminFlags.Fun)]
+    [AdminCommand(AdminFlags.Admin)]
     public sealed class RemoveMechanismCommand : IConsoleCommand
     {
         public string Command => "rmmechanism";

Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs

@@ -9,7 +9,7 @@ using Robust.Shared.Console;
 namespace Content.Server.AlertLevel.Commands
 {
     [UsedImplicitly]
-    [AdminCommand(AdminFlags.Fun)]
+    [AdminCommand(AdminFlags.Admin)]
     public sealed class SetAlertLevelCommand : IConsoleCommand
     {
         public string Command => "setalertlevel";

Content.Server/Mind/Commands/MakeSentientCommand.cs

@@ -10,7 +10,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Mind.Commands
 {
-    [AdminCommand(AdminFlags.Fun)]
+    [AdminCommand(AdminFlags.Admin)]
     public sealed class MakeSentientCommand : IConsoleCommand
     {
         public string Command => "makesentient";

Content.Server/Power/SetBatteryPercentCommand.cs

@@ -5,7 +5,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Power
 {
-    [AdminCommand(AdminFlags.Admin)]
+    [AdminCommand(AdminFlags.Debug)]
     public sealed class SetBatteryPercentCommand : IConsoleCommand
     {
         public string Command => "setbatterypercent";

Content.Server/Roles/AddRoleCommand.cs

@@ -9,7 +9,7 @@ using System.Linq;
 
 namespace Content.Server.Roles
 {
-    [AdminCommand(AdminFlags.Fun)]
+    [AdminCommand(AdminFlags.Admin)]
     public sealed class AddRoleCommand : IConsoleCommand
     {
         public string Command => "addrole";

Content.Server/Roles/ListRolesCommand.cs

@@ -6,7 +6,7 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Server.Roles
 {
-    [AdminCommand(AdminFlags.Fun)]
+    [AdminCommand(AdminFlags.Admin)]
     public sealed class ListRolesCommand : IConsoleCommand
     {
         public string Command => "listroles";

Content.Server/Roles/RemoveRoleCommand.cs

@@ -8,7 +8,7 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Server.Roles
 {
-    [AdminCommand(AdminFlags.Fun)]
+    [AdminCommand(AdminFlags.Admin)]
     public sealed class RemoveRoleCommand : IConsoleCommand
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;

Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs

@@ -8,7 +8,7 @@ using Robust.Shared.Console;
 
 namespace Content.Server.Traitor.Uplink.Commands
 {
-    [AdminCommand(AdminFlags.Fun)]
+    [AdminCommand(AdminFlags.Admin)]
     public sealed class AddUplinkCommand : IConsoleCommand
     {
         public string Command => "adduplink";

Content.Shared/Administration/AdminFlags.cs

@@ -25,6 +25,7 @@
 
         /// <summary>
         ///     !!FUN!!
+        ///     This is stuff that trial administrators shouldn't quite have access to yet, e.g. for running events.
         /// </summary>
         Fun = 1 << 3,
 

Resources/clientCommandPerms.yml

@@ -46,22 +46,17 @@
     - showambient
     - showemergencyshuttle
     - zoom
-
-- Flags: MAPPING
-  Commands:
-    - showmarkers
     - showsubfloor
     - showsubfloorforever
-    - mapping
+    - showmarkers
-    - toggleautosave
-    - toggledecals
     - nodevis
     - nodevisfilter
 
-- Flags: ADMIN
+- Flags: MAPPING
   Commands:
-    - togglehealthoverlay
+    - mapping
-    - togglelight
+    - toggleautosave
+    - toggledecals
 
 - Flags: QUERY
   Commands: