diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 873d8321a8d..901dd8754d7 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -262,5 +262,4 @@ proc/tg_list2text(list/list, glue=",") if(rights & R_REJUVINATE) . += "+REJUVINATE" if(rights & R_VAREDIT) . += "+VAREDIT" if(rights & R_SOUNDS) . += "+SOUND" - if(rights & R_ADVDEBUG) . += "+ADVDEBUG" return . \ No newline at end of file diff --git a/code/global.dm b/code/global.dm index f3afdbc88e6..2827d003de7 100644 --- a/code/global.dm +++ b/code/global.dm @@ -221,7 +221,6 @@ var/fileaccess_timer = 1800 //Cannot access files by ftp until the game is finis #define R_REJUVINATE 512 #define R_VAREDIT 1024 #define R_SOUNDS 2048 -#define R_ADVDEBUG 4096 #define R_MAXPERMISSION 4096 //This holds the maximum value for a permission. It is used in iteration, so keep it updated. diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 97ee77edeca..73985dc0a5f 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -39,7 +39,6 @@ var/list/admin_ranks = list() //list of all ranks with associated rights if("varedit") rights |= R_VAREDIT if("everything","host","all") rights |= R_HOST if("sound","sounds") rights |= R_SOUNDS - if("advdebug") rights |= R_ADVDEBUG admin_ranks[rank] = rights previous_rights = rights diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 1d7b74d9b47..961897cd72e 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -102,8 +102,7 @@ var/list/admin_verbs_server = list( /datum/admins/proc/toggleoocdead, /datum/admins/proc/adrev, /datum/admins/proc/adspawn, - /datum/admins/proc/adjump, - /client/proc/reload_admins + /datum/admins/proc/adjump ) var/list/admin_verbs_debug = list( /client/proc/restart_controller, @@ -117,8 +116,7 @@ var/list/admin_verbs_debug = list( /client/proc/cmd_debug_del_all, /client/proc/cmd_debug_tog_aliens, /client/proc/air_report, - ) -var/list/admin_verbs_advdebug = list( + /client/proc/reload_admins, /client/proc/restart_controller, /client/proc/enable_debug_verbs ) @@ -229,7 +227,6 @@ var/list/admin_verbs_hideable = list( if(rights & R_STEALTH) verbs += /client/proc/stealth if(rights & R_REJUVINATE) verbs += admin_verbs_rejuv if(rights & R_SOUNDS) verbs += admin_verbs_sounds - if(rights & R_ADVDEBUG) verbs += admin_verbs_advdebug /client/proc/remove_admin_verbs() if(holder) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 99fc530e69a..aedb786105f 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -29,7 +29,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that set category = "Debug" set name = "Advanced ProcCall" - if(!check_rights(R_ADVDEBUG)) return + if(!check_rights(R_DEBUG)) return spawn(0) var/target = null diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index febd1d0dcc3..ddc6e224ff9 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -128,7 +128,7 @@ var/intercom_range_display_status = 0 set category = "Debug" set name = "Debug verbs" - if(!check_rights(R_ADVDEBUG)) return + if(!check_rights(R_DEBUG)) return src.verbs += /client/proc/do_not_use_these //-errorage src.verbs += /client/proc/camera_view //-errorage diff --git a/code/modules/admin/verbs/ticklag.dm b/code/modules/admin/verbs/ticklag.dm index 6a94b12282f..928ba733caa 100644 --- a/code/modules/admin/verbs/ticklag.dm +++ b/code/modules/admin/verbs/ticklag.dm @@ -5,7 +5,7 @@ set name = "Set Ticklag" set desc = "Sets a new tick lag. Recommend you don't mess with this too much! Stable, time-tested ticklag value is 0.9" - if(!check_rights(R_ADVDEBUG)) return + if(!check_rights(R_DEBUG)) return var/newtick = input("Sets a new tick lag. Please don't mess with this too much! The stable, time-tested ticklag value is 0.9","Lag of Tick", world.tick_lag) as num|null //I've used ticks of 2 before to help with serious singulo lags diff --git a/config/admin_ranks.txt b/config/admin_ranks.txt index 8b77f75ef20..bc65b912b89 100644 --- a/config/admin_ranks.txt +++ b/config/admin_ranks.txt @@ -20,8 +20,7 @@ # +REJUV (or +REJUVINATE) = the ability to heal, respawn, modify damage and use godmode # +BUILD (or +BUILDMODE) = the ability to use buildmode # +SERVER = higher-risk admin verbs and abilities, such as those which affect the server configuration. -# +DEBUG = debug tools used for diagnosing and fixing problems. The use of these requires some technical know-how, but can generally be used by trusted admins. -# +ADVDEBUG = advanced debug tools, which can destroy the game if used improperly. Only suitable for coders. +# +DEBUG = debug tools used for diagnosing and fixing problems. It's useful to give this to coders so they can investigate problems on a live server. # +VAREDIT = everyone may view viewvars/debugvars/whatever you call it. This keyword allows you to actually EDIT those variables. # +RIGHTS (or +PERMISSIONS) = allows you to promote and/or demote people. # +SOUND (or +SOUNDS) = allows you to upload and play sounds @@ -37,4 +36,4 @@ Game Master +EVERYTHING Host +EVERYTHING -Coder +DEBUG +VAREDIT +SERVER +ADVDEBUG \ No newline at end of file +Coder +DEBUG +VAREDIT +SERVER \ No newline at end of file