From 9983eb6e7298d7dd8cc81448134532ddadba1e03 Mon Sep 17 00:00:00 2001 From: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> Date: Tue, 18 Jun 2024 21:30:05 -0500 Subject: [PATCH] reverts enabling debug some extra verbs by default (#3076) ## About The Pull Request after feedback from admins, they clog the context menu too much. ## Why It's Good For The Game I was not fully considering the context menu and it does bloat it yea. ## Changelog :cl: admin: reverted filling admin context menus with alot of not useful stuff by rehiding it behind a toggle. /:cl: --------- Co-authored-by: Sun-Soaked <45698967+Sun-Soaked@users.noreply.github.com> --- code/modules/admin/admin.dm | 2 +- code/modules/admin/admin_verbs.dm | 17 ++++------------- code/modules/admin/verbs/debug.dm | 12 ++++++------ code/modules/admin/verbs/diagnostics.dm | 2 +- code/modules/admin/verbs/fps.dm | 2 +- code/modules/admin/verbs/manipulate_organs.dm | 2 +- code/modules/admin/verbs/mapping.dm | 9 +++++++++ 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 7b147385c556c..82e75d63b30ec 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -731,7 +731,7 @@ /datum/admins/proc/podspawn_atom(object as text) set category = "Event.Spawning" set desc = "(atom path) Spawn an atom via supply drop" - set name = "Supply drop spawn" + set name = "Podspawn" if(!check_rights(R_SPAWN)) return diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index f4913b6be1e84..9c4f15b9d4605 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -171,13 +171,10 @@ GLOBAL_PROTECT(admin_verbs_debug) /client/proc/cmd_display_del_log, /client/proc/cmd_display_init_log, /client/proc/cmd_display_overlay_log, - /client/proc/cmd_admin_grantfullaccess, - /client/proc/cmd_assume_direct_control, //-errorage - /client/proc/cmd_give_direct_control, /client/proc/getserverlogs, /*for accessing server logs*/ /client/proc/getcurrentlogs, /*for accessing server logs for the current round*/ /client/proc/restart_controller, - /client/proc/disable_debug_verbs, + /client/proc/enable_debug_verbs, /client/proc/callproc, /client/proc/callproc_datum, /client/proc/SDQL2_query, @@ -214,12 +211,6 @@ GLOBAL_PROTECT(admin_verbs_debug) /datum/admins/proc/overmap_view, /* Opens HTML overmap viewer UI */ /client/proc/toggle_AI_interact, /*toggle admin ability to interact with machines as an AI*/ /client/proc/toggle_cdn, - /client/proc/check_timer_sources, - /client/proc/air_status, //Air things - /client/proc/air_status_loc, //More air things - /client/proc/manipulate_organs, - /client/proc/set_server_fps, //allows you to set the ticklag. - /client/proc/start_singlo, ) GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release)) GLOBAL_PROTECT(admin_verbs_possess) @@ -280,7 +271,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list( /client/proc/cmd_debug_make_powernets, /client/proc/cmd_debug_mob_lists, /client/proc/cmd_debug_del_all, - /client/proc/disable_debug_verbs, + /client/proc/enable_debug_verbs, /proc/possess, /proc/release, /client/proc/reload_admins, @@ -313,7 +304,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) if(rights & R_SERVER) add_verb(src, GLOB.admin_verbs_server) if(rights & R_DEBUG) - add_verb(src, list(GLOB.admin_verbs_debug, GLOB.admin_verbs_debug_extra)) + add_verb(src, GLOB.admin_verbs_debug) if(rights & R_POSSESS) add_verb(src, GLOB.admin_verbs_possess) if(rights & R_PERMISSIONS) @@ -347,7 +338,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) GLOB.admin_verbs_spawn, /*Debug verbs added by "show debug verbs"*/ GLOB.admin_verbs_debug_extra, - /client/proc/disable_debug_verbs, + /client/proc/enable_debug_verbs, /client/proc/readmin )) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index ae039c216120d..9a226bbcb6175 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -27,7 +27,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that */ /client/proc/air_status_loc() - set category = "Debug" + set category = "Debug.Debug" set name = "Air Status in Location" if(!mob) return @@ -185,7 +185,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that SSblackbox.record_feedback("tally", "admin_verb", 1, "Make Powernets") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_grantfullaccess(mob/M in GLOB.mob_list) - set category = "Debug" + set category = "Debug.Debug" set name = "Grant Full Access" if(!SSticker.HasRoundStarted()) @@ -228,7 +228,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that message_admins("[key_name_admin(usr)] has granted [M.key] full access.") /client/proc/cmd_assume_direct_control(mob/M in GLOB.mob_list) - set category = "Debug" + set category = "Debug.Debug" set name = "Assume direct control" set desc = "Direct intervention" @@ -249,7 +249,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that SSblackbox.record_feedback("tally", "admin_verb", 1, "Assume Direct Control") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_give_direct_control(mob/M in GLOB.mob_list) - set category = "Debug" + set category = "Debug.Debug" set name = "Give direct control" if(!M) @@ -530,7 +530,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that return dresscode /client/proc/start_singlo() - set category = "Debug" + set category = "Debug.Debug" set name = "Start Singularity" set desc = "Sets up the singularity and all machines to get power flowing through the station" @@ -797,7 +797,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that /// A debug verb to check the sources of currently running timers /client/proc/check_timer_sources() - set category = "Debug" + set category = "Debug.Debug" set name = "Check Timer Sources" set desc = "Checks the sources of the running timers" if (!check_rights(R_DEBUG)) diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 7e89d542eb2ba..469c0cda08f3e 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -1,5 +1,5 @@ /client/proc/air_status(turf/target) - set category = "Debug" + set category = "Debug.Debug" set name = "Display Air Status" if(!isturf(target)) diff --git a/code/modules/admin/verbs/fps.dm b/code/modules/admin/verbs/fps.dm index a3e7c5f5df0bd..8ac8d6b91d44d 100644 --- a/code/modules/admin/verbs/fps.dm +++ b/code/modules/admin/verbs/fps.dm @@ -1,6 +1,6 @@ //replaces the old Ticklag verb, fps is easier to understand /client/proc/set_server_fps() - set category = "Debug" + set category = "Debug.Debug" set name = "Set Server FPS" set desc = "Sets game speed in frames-per-second. Can potentially break the game" diff --git a/code/modules/admin/verbs/manipulate_organs.dm b/code/modules/admin/verbs/manipulate_organs.dm index 0695777a68974..42873241b71b3 100644 --- a/code/modules/admin/verbs/manipulate_organs.dm +++ b/code/modules/admin/verbs/manipulate_organs.dm @@ -1,6 +1,6 @@ /client/proc/manipulate_organs(mob/living/carbon/C in world) set name = "Manipulate Organs" - set category = "Debug" + set category = "Debug.Debug" var/operation = input("Select organ operation.", "Organ Manipulation", "cancel") as null|anything in list("add organ", "add implant", "drop organ/implant", "remove organ/implant", "cancel") if (!operation) return diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 6d8bac8adcfc8..8f1b69bc831d4 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -43,6 +43,15 @@ GLOBAL_LIST_INIT(admin_verbs_debug_extra, list( /client/proc/show_line_profiling, /client/proc/start_line_profiling, /client/proc/stop_line_profiling, + /client/proc/check_timer_sources, + /client/proc/air_status, //Air things + /client/proc/air_status_loc, //More air things + /client/proc/manipulate_organs, + /client/proc/set_server_fps, //allows you to set the ticklag. + /client/proc/start_singlo, + /client/proc/cmd_admin_grantfullaccess, + /client/proc/cmd_assume_direct_control, //-errorage + /client/proc/cmd_give_direct_control, )) GLOBAL_PROTECT(admin_verbs_debug_extra)