diff --git a/Content.Client/Administration/Managers/ClientAdminManager.cs b/Content.Client/Administration/Managers/ClientAdminManager.cs index d2c3aff9ce..37ad8aa7e0 100644 --- a/Content.Client/Administration/Managers/ClientAdminManager.cs +++ b/Content.Client/Administration/Managers/ClientAdminManager.cs @@ -38,7 +38,7 @@ namespace Content.Client.Administration.Managers public bool CanViewVar() { - return _adminData?.CanViewVar() ?? false; + return CanCommand("vv"); } public bool CanAdminPlace() diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs index d6b4783f62..9b506f09c4 100644 --- a/Content.Server/Administration/Managers/AdminManager.cs +++ b/Content.Server/Administration/Managers/AdminManager.cs @@ -443,7 +443,7 @@ namespace Content.Server.Administration.Managers public bool CanViewVar(IPlayerSession session) { - return GetAdminData(session)?.CanViewVar() ?? false; + return CanCommand(session, "vv"); } public bool CanAdminPlace(IPlayerSession session) diff --git a/Content.Shared/Administration/AdminData.cs b/Content.Shared/Administration/AdminData.cs index 947617fe82..5b5873bce3 100644 --- a/Content.Shared/Administration/AdminData.cs +++ b/Content.Shared/Administration/AdminData.cs @@ -32,14 +32,6 @@ namespace Content.Shared.Administration return Active && (Flags & flag) == flag; } - /// - /// Check if this admin can open the VV menu. - /// - public bool CanViewVar() - { - return HasFlag(AdminFlags.VarEdit); - } - /// /// Check if this admin can spawn stuff in with the entity/tile spawn panel. /// diff --git a/Resources/engineCommandPerms.yml b/Resources/engineCommandPerms.yml index 8f91d0d8dd..b2e9946ddc 100644 --- a/Resources/engineCommandPerms.yml +++ b/Resources/engineCommandPerms.yml @@ -4,12 +4,36 @@ - help - list - quit + - hardquit + - cvar + - svbind + - bind + - exec # macro moment + - clear + - vram + - monitor + - setmonitor + - keyinfo + - setclipboard + - getclipboard + - gcf + - net_graph + - net_watchent + - net_draw_interp + - devwindow + - fill + - dumpentities + - getcomponentregistration + - fuck - Flags: VAREDIT Commands: - addcomp + - addcompc - rmcomp + - rmcompc - vv + - scale - Flags: DEBUG Commands: @@ -23,13 +47,47 @@ - netaudit - querymappaused - physics + - showislands - showtime + - showspritebb + - cldbglyr - togglefov - togglehardfov - togglelight + - togglelightbuf - toggleshadows - testbed + - lightbb - vv + - szr_stats + - addview + - removeview + - hwid + - showpos + - showray + - showchunkbb + - entfo + - sggcell + - ldrsc + - rldrsc + - rldshader + - rldloc + - guidump + - uitest + - chunkinfo + - showanchored + - dmetamem + - launchauth + - lsmonitor + - monitorinfo + - watch + - sendgarbage + - setinputcontext + - showvelocities + - tilelookup + - net_entityreport + - scene + - Flags: MAPPING Commands: @@ -44,6 +102,7 @@ - savebp - savemap - tpgrid + - gridtc - Flags: ADMIN Commands: @@ -65,6 +124,7 @@ - Flags: SPAWN Commands: - spawn + - cspawn - Flags: HOST Commands: @@ -74,6 +134,9 @@ - saveconfig - testlog - sudo + - scsi + - csi + - lsasm - Flags: QUERY Commands: