diff --git a/Content.Server/Administration/Commands/LoadGameMapCommand.cs b/Content.Server/Administration/Commands/LoadGameMapCommand.cs
index 8b055cd390..b3713d4723 100644
--- a/Content.Server/Administration/Commands/LoadGameMapCommand.cs
+++ b/Content.Server/Administration/Commands/LoadGameMapCommand.cs
@@ -13,7 +13,7 @@ using Robust.Shared.Prototypes;
namespace Content.Server.Administration.Commands
{
- [AdminCommand(AdminFlags.Fun)]
+ [AdminCommand(AdminFlags.Round | AdminFlags.Spawn)]
public sealed class LoadGameMapCommand : IConsoleCommand
{
public string Command => "loadgamemap";
diff --git a/Content.Server/Administration/Commands/ReadyAll.cs b/Content.Server/Administration/Commands/ReadyAll.cs
index 7415fd5c7e..38eeecd8fe 100644
--- a/Content.Server/Administration/Commands/ReadyAll.cs
+++ b/Content.Server/Administration/Commands/ReadyAll.cs
@@ -8,7 +8,7 @@ using Robust.Shared.IoC;
namespace Content.Server.Administration.Commands
{
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
public class ReadyAll : IConsoleCommand
{
public string Command => "readyall";
diff --git a/Content.Server/Administration/Commands/ShuttleCommands.cs b/Content.Server/Administration/Commands/ShuttleCommands.cs
index f7db205586..6241ab1b89 100644
--- a/Content.Server/Administration/Commands/ShuttleCommands.cs
+++ b/Content.Server/Administration/Commands/ShuttleCommands.cs
@@ -9,7 +9,7 @@ using Robust.Shared.Localization;
namespace Content.Server.Administration.Commands
{
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
public class CallShuttleCommand : IConsoleCommand
{
public string Command => "callshuttle";
@@ -36,7 +36,7 @@ namespace Content.Server.Administration.Commands
}
}
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
public class RecallShuttleCommand : IConsoleCommand
{
public string Command => "recallshuttle";
diff --git a/Content.Server/Administration/Commands/Station/AdjustStationJobCommand.cs b/Content.Server/Administration/Commands/Station/AdjustStationJobCommand.cs
index 2a697cab2e..1cd957eb14 100644
--- a/Content.Server/Administration/Commands/Station/AdjustStationJobCommand.cs
+++ b/Content.Server/Administration/Commands/Station/AdjustStationJobCommand.cs
@@ -10,7 +10,7 @@ using Robust.Shared.Prototypes;
namespace Content.Server.Administration.Commands.Station;
-[AdminCommand(AdminFlags.Spawn)]
+[AdminCommand(AdminFlags.Round)]
public class AdjustStationJobCommand : IConsoleCommand
{
public string Command => "adjstationjob";
diff --git a/Content.Server/GameTicking/Commands/DelayStartCommand.cs b/Content.Server/GameTicking/Commands/DelayStartCommand.cs
index 33bf53fe8f..b679f2eb7f 100644
--- a/Content.Server/GameTicking/Commands/DelayStartCommand.cs
+++ b/Content.Server/GameTicking/Commands/DelayStartCommand.cs
@@ -7,7 +7,7 @@ using Robust.Shared.IoC;
namespace Content.Server.GameTicking.Commands
{
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
class DelayStartCommand : IConsoleCommand
{
public string Command => "delaystart";
diff --git a/Content.Server/GameTicking/Commands/EndRoundCommand.cs b/Content.Server/GameTicking/Commands/EndRoundCommand.cs
index 2a8d257cdf..fa66c8e44a 100644
--- a/Content.Server/GameTicking/Commands/EndRoundCommand.cs
+++ b/Content.Server/GameTicking/Commands/EndRoundCommand.cs
@@ -7,7 +7,7 @@ using Robust.Shared.IoC;
namespace Content.Server.GameTicking.Commands
{
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
class EndRoundCommand : IConsoleCommand
{
public string Command => "endround";
diff --git a/Content.Server/GameTicking/Commands/ForceMapCommand.cs b/Content.Server/GameTicking/Commands/ForceMapCommand.cs
index 96776c8a76..e3f94a257b 100644
--- a/Content.Server/GameTicking/Commands/ForceMapCommand.cs
+++ b/Content.Server/GameTicking/Commands/ForceMapCommand.cs
@@ -10,7 +10,7 @@ using Robust.Shared.Localization;
namespace Content.Server.GameTicking.Commands
{
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
class ForceMapCommand : IConsoleCommand
{
public string Command => "forcemap";
diff --git a/Content.Server/GameTicking/Commands/ForcePresetCommand.cs b/Content.Server/GameTicking/Commands/ForcePresetCommand.cs
index f9e037882c..60d73a4060 100644
--- a/Content.Server/GameTicking/Commands/ForcePresetCommand.cs
+++ b/Content.Server/GameTicking/Commands/ForcePresetCommand.cs
@@ -6,7 +6,7 @@ using Robust.Shared.IoC;
namespace Content.Server.GameTicking.Commands
{
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
class ForcePresetCommand : IConsoleCommand
{
public string Command => "forcepreset";
diff --git a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
index 0ae970f0dc..28aaeb5d1d 100644
--- a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
+++ b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
@@ -10,7 +10,7 @@ using Robust.Shared.IoC;
namespace Content.Server.GameTicking.Commands
{
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
public class GoLobbyCommand : IConsoleCommand
{
public string Command => "golobby";
diff --git a/Content.Server/GameTicking/Commands/RestartRoundCommand.cs b/Content.Server/GameTicking/Commands/RestartRoundCommand.cs
index c5b63cf10d..63a6610b26 100644
--- a/Content.Server/GameTicking/Commands/RestartRoundCommand.cs
+++ b/Content.Server/GameTicking/Commands/RestartRoundCommand.cs
@@ -8,7 +8,7 @@ using Robust.Shared.IoC;
namespace Content.Server.GameTicking.Commands
{
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
public class RestartRoundCommand : IConsoleCommand
{
public string Command => "restartround";
@@ -29,7 +29,7 @@ namespace Content.Server.GameTicking.Commands
}
}
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
public class RestartRoundNowCommand : IConsoleCommand
{
public string Command => "restartroundnow";
diff --git a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
index d75493c28e..6c8a313f79 100644
--- a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
+++ b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
@@ -6,7 +6,7 @@ using Robust.Shared.IoC;
namespace Content.Server.GameTicking.Commands
{
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
class SetGamePresetCommand : IConsoleCommand
{
public string Command => "setgamepreset";
diff --git a/Content.Server/GameTicking/Commands/StartRoundCommand.cs b/Content.Server/GameTicking/Commands/StartRoundCommand.cs
index facb9595f6..7e436608e7 100644
--- a/Content.Server/GameTicking/Commands/StartRoundCommand.cs
+++ b/Content.Server/GameTicking/Commands/StartRoundCommand.cs
@@ -7,7 +7,7 @@ using Robust.Shared.IoC;
namespace Content.Server.GameTicking.Commands
{
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
class StartRoundCommand : IConsoleCommand
{
public string Command => "startround";
diff --git a/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs b/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs
index 106456b3a9..2695fa6a8a 100644
--- a/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs
+++ b/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs
@@ -8,7 +8,7 @@ using Robust.Shared.IoC;
namespace Content.Server.GameTicking.Commands
{
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
class ToggleDisallowLateJoinCommand : IConsoleCommand
{
public string Command => "toggledisallowlatejoin";
diff --git a/Content.Server/StationEvents/StationEventCommand.cs b/Content.Server/StationEvents/StationEventCommand.cs
index e126f50083..1ab2e36e24 100644
--- a/Content.Server/StationEvents/StationEventCommand.cs
+++ b/Content.Server/StationEvents/StationEventCommand.cs
@@ -8,7 +8,7 @@ using System.Linq;
namespace Content.Server.StationEvents
{
- [AdminCommand(AdminFlags.Server)]
+ [AdminCommand(AdminFlags.Round)]
public sealed class StationEventCommand : IConsoleCommand
{
public string Command => "events";
diff --git a/Content.Shared/Administration/AdminFlags.cs b/Content.Shared/Administration/AdminFlags.cs
index 30690c8a43..bd56aff3f5 100644
--- a/Content.Shared/Administration/AdminFlags.cs
+++ b/Content.Shared/Administration/AdminFlags.cs
@@ -65,6 +65,16 @@ namespace Content.Shared.Administration
///
Logs = 1 << 9,
+ ///
+ /// Lets you modify the round (forcemap, loadgamemap, etc)
+ ///
+ Round = 1 << 10,
+
+ ///
+ /// Lets you use BQL queries.
+ ///
+ Query = 1 << 11,
+
///
/// Dangerous host permissions like scsi.
///
diff --git a/Resources/engineCommandPerms.yml b/Resources/engineCommandPerms.yml
index 1d02e29c9e..55a5240792 100644
--- a/Resources/engineCommandPerms.yml
+++ b/Resources/engineCommandPerms.yml
@@ -50,7 +50,6 @@
- tp
- tpto
- respawn
- - forall
- Flags: SERVER
Commands:
@@ -72,3 +71,7 @@
- saveconfig
- testlog
- sudo
+
+- Flags: QUERY
+ Commands:
+ - forall