From db1dfc8958bac75d36d742cf61e23ff4a90dae8a Mon Sep 17 00:00:00 2001 From: Kara Date: Wed, 14 Sep 2022 17:02:38 -0700 Subject: [PATCH] Command perm modifications (#11273) * Command perm modifications * actually not this one * string --- .../Administration/Commands/AddBodyPartCommand.cs | 2 +- .../Commands/AddEntityStorageCommand.cs | 2 +- .../Commands/AddMechanismCommand.cs | 2 +- .../Administration/Commands/AddReagent.cs | 2 +- .../Administration/Commands/DeleteComponent.cs | 2 +- .../Commands/DeleteEntitiesWithComponent.cs | 2 +- .../Commands/RemoveBodyPartCommand.cs | 2 +- .../Commands/RemoveEntityStorageCommand.cs | 2 +- .../Commands/RemoveMechanismCommand.cs | 2 +- .../AlertLevel/Commands/SetAlertLevelCommand.cs | 2 +- .../Mind/Commands/MakeSentientCommand.cs | 2 +- Content.Server/Power/SetBatteryPercentCommand.cs | 2 +- Content.Server/Roles/AddRoleCommand.cs | 2 +- Content.Server/Roles/ListRolesCommand.cs | 2 +- Content.Server/Roles/RemoveRoleCommand.cs | 2 +- .../Traitor/Uplink/Commands/AddUplinkCommand.cs | 2 +- Content.Shared/Administration/AdminFlags.cs | 1 + Resources/clientCommandPerms.yml | 15 +++++---------- 18 files changed, 22 insertions(+), 26 deletions(-) diff --git a/Content.Server/Administration/Commands/AddBodyPartCommand.cs b/Content.Server/Administration/Commands/AddBodyPartCommand.cs index 3fa18c04c7..e32e8060cb 100644 --- a/Content.Server/Administration/Commands/AddBodyPartCommand.cs +++ b/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"; diff --git a/Content.Server/Administration/Commands/AddEntityStorageCommand.cs b/Content.Server/Administration/Commands/AddEntityStorageCommand.cs index f41b40bf9c..c91ed6512e 100644 --- a/Content.Server/Administration/Commands/AddEntityStorageCommand.cs +++ b/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"; diff --git a/Content.Server/Administration/Commands/AddMechanismCommand.cs b/Content.Server/Administration/Commands/AddMechanismCommand.cs index d4c0bd6652..cbc66bddeb 100644 --- a/Content.Server/Administration/Commands/AddMechanismCommand.cs +++ b/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"; diff --git a/Content.Server/Administration/Commands/AddReagent.cs b/Content.Server/Administration/Commands/AddReagent.cs index 8520816b19..aef7f04d46 100644 --- a/Content.Server/Administration/Commands/AddReagent.cs +++ b/Content.Server/Administration/Commands/AddReagent.cs @@ -11,7 +11,7 @@ namespace Content.Server.Administration.Commands /// /// Command that allows you to edit an existing solution by adding (or removing) reagents. /// - [AdminCommand(AdminFlags.Fun)] + [AdminCommand(AdminFlags.Admin)] public sealed class AddReagent : IConsoleCommand { public string Command => "addreagent"; diff --git a/Content.Server/Administration/Commands/DeleteComponent.cs b/Content.Server/Administration/Commands/DeleteComponent.cs index 8b1d08ea67..e2018c84ae 100644 --- a/Content.Server/Administration/Commands/DeleteComponent.cs +++ b/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"; diff --git a/Content.Server/Administration/Commands/DeleteEntitiesWithComponent.cs b/Content.Server/Administration/Commands/DeleteEntitiesWithComponent.cs index 6a3fe50c01..9983ca36d9 100644 --- a/Content.Server/Administration/Commands/DeleteEntitiesWithComponent.cs +++ b/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"; diff --git a/Content.Server/Administration/Commands/RemoveBodyPartCommand.cs b/Content.Server/Administration/Commands/RemoveBodyPartCommand.cs index 28488a18b4..6b2197ce83 100644 --- a/Content.Server/Administration/Commands/RemoveBodyPartCommand.cs +++ b/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"; diff --git a/Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs b/Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs index 3213572cb2..990fc1dd0e 100644 --- a/Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs +++ b/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"; diff --git a/Content.Server/Administration/Commands/RemoveMechanismCommand.cs b/Content.Server/Administration/Commands/RemoveMechanismCommand.cs index 7438f10d87..99e9b61f79 100644 --- a/Content.Server/Administration/Commands/RemoveMechanismCommand.cs +++ b/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"; diff --git a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs index c377059bea..009a8b5f23 100644 --- a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs +++ b/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"; diff --git a/Content.Server/Mind/Commands/MakeSentientCommand.cs b/Content.Server/Mind/Commands/MakeSentientCommand.cs index 9b8cef2e34..472d2f9499 100644 --- a/Content.Server/Mind/Commands/MakeSentientCommand.cs +++ b/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"; diff --git a/Content.Server/Power/SetBatteryPercentCommand.cs b/Content.Server/Power/SetBatteryPercentCommand.cs index 18e3bc044c..5fd39ceb67 100644 --- a/Content.Server/Power/SetBatteryPercentCommand.cs +++ b/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"; diff --git a/Content.Server/Roles/AddRoleCommand.cs b/Content.Server/Roles/AddRoleCommand.cs index 4584e4055c..de53b7d152 100644 --- a/Content.Server/Roles/AddRoleCommand.cs +++ b/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"; diff --git a/Content.Server/Roles/ListRolesCommand.cs b/Content.Server/Roles/ListRolesCommand.cs index f8522d5bb2..41f6704249 100644 --- a/Content.Server/Roles/ListRolesCommand.cs +++ b/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"; diff --git a/Content.Server/Roles/RemoveRoleCommand.cs b/Content.Server/Roles/RemoveRoleCommand.cs index 021375aaad..ae0a0f8f4a 100644 --- a/Content.Server/Roles/RemoveRoleCommand.cs +++ b/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!; diff --git a/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs b/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs index 5145c2d99d..23408c01d4 100644 --- a/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs +++ b/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"; diff --git a/Content.Shared/Administration/AdminFlags.cs b/Content.Shared/Administration/AdminFlags.cs index 527053747a..05b7a45a46 100644 --- a/Content.Shared/Administration/AdminFlags.cs +++ b/Content.Shared/Administration/AdminFlags.cs @@ -25,6 +25,7 @@ /// /// !!FUN!! + /// This is stuff that trial administrators shouldn't quite have access to yet, e.g. for running events. /// Fun = 1 << 3, diff --git a/Resources/clientCommandPerms.yml b/Resources/clientCommandPerms.yml index c92e77f93e..bd83884f01 100644 --- a/Resources/clientCommandPerms.yml +++ b/Resources/clientCommandPerms.yml @@ -46,22 +46,17 @@ - showambient - showemergencyshuttle - zoom - -- Flags: MAPPING - Commands: - - showmarkers - showsubfloor - showsubfloorforever - - mapping - - toggleautosave - - toggledecals + - showmarkers - nodevis - nodevisfilter -- Flags: ADMIN +- Flags: MAPPING Commands: - - togglehealthoverlay - - togglelight + - mapping + - toggleautosave + - toggledecals - Flags: QUERY Commands: