Merge pull request #758 from CeladonSS13/upstream-pr-3076

[MIRROR] reverts enabling debug some extra verbs by default

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

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
 		))
 

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("<span class='adminnotice'>[key_name_admin(usr)] has granted [M.key] full access.</span>")
 
 /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))

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))

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"
 

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

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)