Server maint subsystem (#16518)

* upports server maint subsystem

* fix runtime in admin z narrate

* .

* sorts them verbs

* .

* .

* Update code/controllers/subsystems/statpanel.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/controllers/subsystems/server_maint.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

---------

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

code/modules/admin/verbs/SDQL2/SDQL_2.dm

@@ -188,7 +188,7 @@ Example: USING PROCCALL = BLOCKING, SELECT = FORCE_NULLS, PRIORITY = HIGH SELECT
 		CRASH("SDQL2 fatal error");};
 
 /client/proc/SDQL2_query(query_text as message)
-	set category = "Debug"
+	set category = "Debug.Misc"
 	if(!check_rights(R_DEBUG))  //Shouldn't happen... but just to be safe.
 		message_admins(span_danger("ERROR: Non-admin [key_name(usr)] attempted to execute a SDQL query!"))
 		log_admin("Non-admin [key_name(usr)] attempted to execute a SDQL query!")

code/modules/admin/verbs/adminhelp.dm

@@ -639,7 +639,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 //admin proc
 /client/proc/cmd_admin_ticket_panel()
 	set name = "Show Ticket List"
-	set category = "Admin"
+	set category = "Admin.Misc"
 
 	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT, TRUE))
 		return

code/modules/admin/verbs/adminjump.dm

@@ -7,7 +7,7 @@
 /client/proc/Jump(areaname as null|anything in return_sorted_areas())
 	set name = "Jump to Area"
 	set desc = "Area to jump to"
-	set category = "Admin"
+	set category = "Admin.Game"
 	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT))
 		return
 
@@ -33,7 +33,7 @@
 
 /client/proc/jumptoturf(var/turf/T in world)
 	set name = "Jump to Turf"
-	set category = "Admin"
+	set category = "Admin.Game"
 	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT))
 		return
 	if(CONFIG_GET(flag/allow_admin_jump))
@@ -48,7 +48,7 @@
 
 /// Verb wrapper around do_jumptomob()
 /client/proc/jumptomob(mob as null|anything in mob_list)
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Jump to Mob"
 	set popup_menu = FALSE //VOREStation Edit - Declutter.
 
@@ -80,7 +80,7 @@
 		to_chat(A, span_filter_adminlog("This mob is not located in the game world."))
 
 /client/proc/jumptocoord(tx as num, ty as num, tz as num)
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Jump to Coordinate"
 
 	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT))
@@ -102,7 +102,7 @@
 		tgui_alert_async(usr, "Admin jumping disabled")
 
 /client/proc/jumptokey()
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Jump to Key"
 
 	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT))
@@ -125,7 +125,7 @@
 		tgui_alert_async(usr, "Admin jumping disabled")
 
 /client/proc/Getmob(mob/living/M as null|anything in mob_list)	//VOREStation Edit
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Get Mob"
 	set desc = "Mob to teleport"
 	set popup_menu = TRUE	//VOREStation Edit
@@ -148,7 +148,7 @@
 		tgui_alert_async(usr, "Admin jumping disabled")
 
 /client/proc/Getkey()
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Get Key"
 	set desc = "Key to teleport"
 
@@ -178,7 +178,7 @@
 		tgui_alert_async(usr, "Admin jumping disabled")
 
 /client/proc/sendmob()
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Send Mob"
 	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT))
 		return
@@ -202,7 +202,7 @@
 		tgui_alert_async(usr, "Admin jumping disabled")
 
 /client/proc/cmd_admin_move_atom(var/atom/movable/AM, tx as num, ty as num, tz as num)
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Move Atom to Coordinate"
 
 	if(!check_rights(R_ADMIN|R_DEBUG|R_EVENT))

code/modules/admin/verbs/adminsay.dm

@@ -1,5 +1,5 @@
 /client/proc/cmd_admin_say(msg as text)
-	set category = "Special Verbs"
+	set category = "Admin.Chat"
 	set name = "Asay" //Gave this shit a shorter name so you only have to time out "asay" rather than "admin say" to use it --NeoFite
 	set hidden = 1
 	if(!check_rights(R_ADMIN)) //VOREStation Edit
@@ -18,7 +18,7 @@
 	feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_mod_say(msg as text)
-	set category = "Special Verbs"
+	set category = "Admin.Chat"
 	set name = "Msay"
 	set hidden = 1
 
@@ -41,7 +41,7 @@
 	feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_event_say(msg as text)
-	set category = "Special Verbs"
+	set category = "Admin.Chat"
 	set name = "Esay"
 	set hidden = 1
 

code/modules/admin/verbs/antag-ooc.dm

@@ -1,5 +1,5 @@
 /client/proc/aooc(msg as text)
-	set category = "OOC"
+	set category = "OOC.Chat"
 	set name = "AOOC"
 	set desc = "Antagonist OOC"
 

code/modules/admin/verbs/change_appearance.dm

@@ -1,7 +1,7 @@
 /client/proc/change_human_appearance_admin()
 	set name = "Change Mob Appearance - Admin"
 	set desc = "Allows you to change the mob appearance"
-	set category = "Admin"
+	set category = "Admin.Events"
 
 	if(!check_rights(R_FUN)) return
 
@@ -15,7 +15,7 @@
 /client/proc/change_human_appearance_self()
 	set name = "Change Mob Appearance - Self"
 	set desc = "Allows the mob to change its appearance"
-	set category = "Admin"
+	set category = "Admin.Events"
 
 	if(!check_rights(R_FUN)) return
 
@@ -37,7 +37,7 @@
 
 /client/proc/editappear()
 	set name = "Edit Appearance"
-	set category = "Fun"
+	set category = "Fun.Event Kit"
 
 	if(!check_rights(R_FUN))	return
 

code/modules/admin/verbs/check_customitem_activity.dm

@@ -2,7 +2,7 @@ var/checked_for_inactives = 0
 var/inactive_keys = "None<br>"
 
 /client/proc/check_customitem_activity()
-	set category = "Admin"
+	set category = "Admin.Investigate"
 	set name = "Check activity of players with custom items"
 
 	var/dat = span_bold("Inactive players with custom items") + "<br>"

code/modules/admin/verbs/cinematic.dm

@@ -1,6 +1,6 @@
 /client/proc/cinematic(var/cinematic as anything in list("explosion",null))
 	set name = "Cinematic"
-	set category = "Fun"
+	set category = "Fun.Do Not"
 	set desc = "Shows a cinematic."	// Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted.
 
 	if(!check_rights(R_FUN))

code/modules/admin/verbs/custom_event.dm

@@ -1,6 +1,6 @@
 // verb for admins to set custom event
 /client/proc/cmd_admin_change_custom_event()
-	set category = "Fun"
+	set category = "Fun.Event Kit"
 	set name = "Change Custom Event"
 
 	if(!holder)
@@ -33,7 +33,7 @@
 
 // normal verb for players to view info
 /client/verb/cmd_view_custom_event()
-	set category = "OOC"
+	set category = "OOC.Game"
 	set name = "Custom Event Info"
 
 	if(!custom_event_msg || custom_event_msg == "")

code/modules/admin/verbs/deadsay.dm

@@ -1,5 +1,5 @@
 /client/proc/dsay(msg as text)
-	set category = "Special Verbs"
+	set category = "Admin.Chat"
 	set name = "Dsay" //Gave this shit a shorter name so you only have to time out "dsay" rather than "dead say" to use it --NeoFite
 	set hidden = 1
 	if(!src.holder)

code/modules/admin/verbs/debug.dm

@@ -1,5 +1,5 @@
 /client/proc/Debug2()
-	set category = "Debug"
+	set category = "Debug.Investigate"
 	set name = "Debug-Game"
 	if(!check_rights(R_DEBUG))	return
 
@@ -18,7 +18,7 @@
 
 /client/proc/simple_DPS()
 	set name = "Simple DPS"
-	set category = "Debug"
+	set category = "Debug.Investigate"
 	set desc = "Gives a really basic idea of how much hurt something in-hand does."
 
 	var/obj/item/I = null
@@ -73,7 +73,7 @@
 		return
 
 /client/proc/Cell()
-	set category = "Debug"
+	set category = "Debug.Investigate"
 	set name = "Cell"
 	if(!mob)
 		return
@@ -94,7 +94,7 @@
 	feedback_add_details("admin_verb","ASL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_robotize(var/mob/M in mob_list)
-	set category = "Fun"
+	set category = "Fun.Event Kit"
 	set name = "Make Robot"
 
 	if(!ticker)
@@ -109,7 +109,7 @@
 		tgui_alert_async(usr, "Invalid mob")
 
 /client/proc/cmd_admin_animalize(var/mob/M in mob_list)
-	set category = "Fun"
+	set category = "Fun.Event Kit"
 	set name = "Make Simple Animal"
 
 	if(!ticker)
@@ -130,7 +130,7 @@
 
 
 /client/proc/makepAI()
-	set category = "Fun"
+	set category = "Fun.Event Kit"
 	set name = "Make pAI"
 	set desc = "Spawn someone in as a pAI!"
 	if(!check_rights(R_ADMIN|R_EVENT|R_DEBUG))
@@ -161,7 +161,7 @@
 	feedback_add_details("admin_verb","MPAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_alienize(var/mob/M in mob_list)
-	set category = "Fun"
+	set category = "Fun.Event Kit"
 	set name = "Make Alien"
 
 	if(!ticker)
@@ -180,7 +180,7 @@
 
 //TODO: merge the vievars version into this or something maybe mayhaps
 /client/proc/cmd_debug_del_all()
-	set category = "Debug"
+	set category = "Debug.Dangerous"
 	set name = "Del-All"
 
 	// to prevent REALLY stupid deletions
@@ -195,7 +195,7 @@
 	feedback_add_details("admin_verb","DELA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_debug_make_powernets()
-	set category = "Debug"
+	set category = "Debug.Dangerous"
 	set name = "Make Powernets"
 	SSmachines.makepowernets()
 	log_admin("[key_name(src)] has remade the powernet. SSmachines.makepowernets() called.")
@@ -203,7 +203,7 @@
 	feedback_add_details("admin_verb","MPWN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_debug_tog_aliens()
-	set category = "Server"
+	set category = "Server.Game"
 	set name = "Toggle Aliens"
 
 	CONFIG_SET(flag/aliens_allowed, !CONFIG_GET(flag/aliens_allowed))
@@ -212,7 +212,7 @@
 	feedback_add_details("admin_verb","TAL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_display_del_log()
-	set category = "Debug"
+	set category = "Debug.Investigate"
 	set name = "Display del() Log"
 	set desc = "Display del's log of everything that's passed through it."
 
@@ -242,7 +242,7 @@
 	usr << browse(dellog.Join(), "window=dellog")
 
 /client/proc/cmd_display_init_log()
-	set category = "Debug"
+	set category = "Debug.Investigate"
 	set name = "Display Initialize() Log"
 	set desc = "Displays a list of things that didn't handle Initialize() properly"
 
@@ -251,7 +251,7 @@
 
 /*
 /client/proc/cmd_display_overlay_log()
-	set category = "Debug"
+	set category = "Debug.Investigate"
 	set name = "Display overlay Log"
 	set desc = "Display SSoverlays log of everything that's passed through it."
 
@@ -273,7 +273,7 @@
 		. = lines.Join("\n")
 
 /client/proc/cmd_admin_grantfullaccess(var/mob/M in mob_list)
-	set category = "Admin"
+	set category = "Admin.Events"
 	set name = "Grant Full Access"
 
 	if (!ticker)
@@ -304,7 +304,7 @@
 	message_admins(span_blue("[key_name_admin(usr)] has granted [M.key] full access."), 1)
 
 /client/proc/cmd_assume_direct_control(var/mob/M in mob_list)
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Assume direct control"
 	set desc = "Direct intervention"
 
@@ -325,7 +325,7 @@
 
 /client/proc/take_picture(var/atom/A in world)
 	set name = "Save PNG"
-	set category = "Debug"
+	set category = "Debug.Misc"
 	set desc = "Opens a dialog to save a PNG of any object in the game."
 
 	if(!check_rights(R_DEBUG))
@@ -422,7 +422,7 @@
 		to_world("* [areatype]")
 
 /datum/admins/proc/cmd_admin_dress(input in getmobs())
-	set category = "Fun"
+	set category = "Fun.Event Kit"
 	set name = "Select equipment"
 
 	if(!check_rights(R_FUN))
@@ -454,7 +454,7 @@
 
 /client/proc/startSinglo()
 
-	set category = "Debug"
+	set category = "Debug.Game"
 	set name = "Start Singularity"
 	set desc = "Sets up the singularity and all machines to get power flowing through the station"
 
@@ -498,7 +498,7 @@
 				Rad.toggle_power()
 
 /client/proc/setup_supermatter_engine()
-	set category = "Debug"
+	set category = "Debug.Game"
 	set name = "Setup supermatter"
 	set desc = "Sets up the supermatter engine"
 
@@ -581,7 +581,7 @@
 
 
 /client/proc/cmd_debug_mob_lists()
-	set category = "Debug"
+	set category = "Debug.Investigate"
 	set name = "Debug Mob Lists"
 	set desc = "For when you just gotta know"
 
@@ -600,7 +600,7 @@
 			to_chat(usr, span_filter_debuglogs(jointext(GLOB.clients,",")))
 
 /client/proc/cmd_debug_using_map()
-	set category = "Debug"
+	set category = "Debug.Investigate"
 	set name = "Debug Map Datum"
 	set desc = "Debug the map metadata about the currently compiled in map."
 
@@ -625,7 +625,7 @@
 		tgui_alert_async(usr, "Invalid mob")
 
 /datum/admins/proc/view_runtimes()
-	set category = "Debug"
+	set category = "Debug.Investigate"
 	set name = "View Runtimes"
 	set desc = "Open the Runtime Viewer"
 
@@ -635,7 +635,7 @@
 	error_cache.showTo(usr)
 
 /datum/admins/proc/change_weather()
-	set category = "Debug"
+	set category = "Debug.Events"
 	set name = "Change Weather"
 	set desc = "Changes the current weather."
 
@@ -653,7 +653,7 @@
 			log_admin(log)
 
 /datum/admins/proc/toggle_firework_override()
-	set category = "Fun"
+	set category = "Fun.Event Kit"
 	set name = "Toggle Weather Firework Override"
 	set desc = "Toggles ability for weather fireworks to affect weather on planet of choice."
 
@@ -668,7 +668,7 @@
 		log_admin(log)
 
 /datum/admins/proc/change_time()
-	set category = "Debug"
+	set category = "Debug.Events"
 	set name = "Change Planet Time"
 	set desc = "Changes the time of a planet."
 

code/modules/admin/verbs/debug_vr.dm

@@ -1,5 +1,5 @@
 /datum/admins/proc/quick_nif()
-	set category = "Fun"
+	set category = "Fun.Add Nif"
 	set name = "Quick NIF"
 	set desc = "Spawns a NIF into someone in quick-implant mode."
 

code/modules/admin/verbs/diagnostics.dm

@@ -1,5 +1,5 @@
 /client/proc/air_report()
-	set category = "Debug"
+	set category = "Debug.Investigate"
 	set name = "Show Air Report"
 
 	if(!master_controller || !air_master)
@@ -42,7 +42,7 @@
 	usr << browse(output,"window=airreport")
 
 /client/proc/fix_next_move()
-	set category = "Debug"
+	set category = "Debug.Game"
 	set name = "Unfreeze Everyone"
 	var/largest_move_time = 0
 	var/largest_click_time = 0
@@ -73,7 +73,7 @@
 	return
 
 /client/proc/radio_report()
-	set category = "Debug"
+	set category = "Debug.Game"
 	set name = "Radio report"
 
 	var/output = "<b>Radio Report</b><hr>"
@@ -100,7 +100,7 @@
 
 /client/proc/reload_admins()
 	set name = "Reload Admins"
-	set category = "Debug"
+	set category = "Debug.Server"
 
 	if(!check_rights(R_SERVER))	return
 
@@ -110,7 +110,7 @@
 
 /client/proc/reload_eventMs()
 	set name = "Reload Event Managers"
-	set category = "Debug"
+	set category = "Debug.Server"
 
 	if(!check_rights(R_SERVER)) return
 
@@ -121,7 +121,7 @@
 //todo:
 /client/proc/jump_to_dead_group()
 	set name = "Jump to dead group"
-	set category = "Debug"
+	set category = "Debug.Game"
 		/*
 	if(!holder)
 		to_chat(src, "Only administrators may use this command.")
@@ -143,7 +143,7 @@
 /client/proc/kill_airgroup()
 	set name = "Kill Local Airgroup"
 	set desc = "Use this to allow manual manupliation of atmospherics."
-	set category = "Debug"
+	set category = "Debug.Dangerous"
 	/*
 	if(!holder)
 		to_chat(src, "Only administrators may use this command.")
@@ -166,7 +166,7 @@
 /client/proc/print_jobban_old()
 	set name = "Print Jobban Log"
 	set desc = "This spams all the active jobban entries for the current round to standard output."
-	set category = "Debug"
+	set category = "Debug.Investigate"
 
 	to_chat(usr, span_bold("Jobbans active in this round."))
 	for(var/t in jobban_keylist)
@@ -175,7 +175,7 @@
 /client/proc/print_jobban_old_filter()
 	set name = "Search Jobban Log"
 	set desc = "This searches all the active jobban entries for the current round and outputs the results to standard output."
-	set category = "Debug"
+	set category = "Debug.Investigate"
 
 	var/job_filter = tgui_input_text(usr, "Contains what?","Job Filter")
 	if(!job_filter)

code/modules/admin/verbs/dice.dm

@@ -1,5 +1,5 @@
 /client/proc/roll_dices()
-	set category = "Fun"
+	set category = "Fun.Event Kit"
 	set name = "Roll Dice"
 	if(!check_rights(R_FUN))
 		return
@@ -21,4 +21,4 @@
 	if(tgui_alert(usr, "Do you want to inform the world about the result?","Show world?",list("Yes", "No")) == "Yes")
 		to_world("<h2 style=\"color:#A50400\">Gods rolled [dice], result is [result]</h2>")
 
-	message_admins("[key_name_admin(src)] rolled dice [dice], result is [result]", 1)
+	message_admins("[key_name_admin(src)] rolled dice [dice], result is [result]", 1)

code/modules/admin/verbs/entity_narrate.dm

@@ -27,7 +27,7 @@
 /client/proc/add_mob_for_narration(E as obj|mob|turf in orange(world.view))
 	set name = "Narrate Entity (Add ref)"
 	set desc = "Saves a reference of target mob to be called when narrating."
-	set category = "Fun"
+	set category = "Fun.Narrate"
 
 	if(!check_rights(R_FUN)) return
 
@@ -77,7 +77,7 @@
 /client/proc/remove_mob_for_narration()
 	set name = "Narrate Entity (Remove ref)"
 	set desc = "Remove mobs you're no longer narrating from your list for easier work."
-	set category = "Fun"
+	set category = "Fun.Narrate"
 
 	if(!check_rights(R_FUN)) return
 
@@ -107,7 +107,7 @@
 /client/proc/narrate_mob()
 	set name = "Narrate Entity (Interface)"
 	set desc = "Send either a visible or audiable message through your chosen entities using an interface"
-	set category = "Fun"
+	set category = "Fun.Narrate"
 
 	if(!check_rights(R_FUN)) return
 
@@ -138,7 +138,7 @@
 /client/proc/narrate_mob_args(name as text, mode as text, message as text)
 	set name = "Narrate Entity"
 	set desc = "Narrate entities using positional arguments. Name should be as saved in ref list, mode should be Speak or Emote, follow with message"
-	set category = "Fun"
+	set category = "Fun.Narrate"
 
 
 

code/modules/admin/verbs/event_triggers.dm

@@ -4,7 +4,7 @@ Eventkit verb to be used to spawn the obj/effect/landmarks defined under code\ga
 /client/proc/manage_event_triggers()
 	set name = "Manage Event Triggers"
 	set desc = "Open dialogue to create or delete narration/notification triggers"
-	set category = "EventKit"
+	set category = "Fun.Event Kit"
 
 	if(!check_rights(R_FUN)) return
 

code/modules/admin/verbs/fps.dm

@@ -1,7 +1,7 @@
 //Merged Doohl's and the existing ticklag as they both had good elements about them ~
 //Replaces the old Ticklag verb, fps is easier to understand
 /client/proc/set_server_fps()
-	set category = "Debug"
+	set category = "Debug.Server"
 	set name = "Set Server FPS"
 	set desc = "Sets game speed in frames-per-second. Can potentially break the game"
 

code/modules/admin/verbs/get_player_status.dm

@@ -6,7 +6,7 @@
 /client/proc/getPlayerStatus()
 	set name = "Report Player Status"
 	set desc = "Get information on all active players in-game."
-	set category = "EventKit"
+	set category = "Fun.Event Kit"
 
 	if(!check_rights(R_FUN)) return
 

code/modules/admin/verbs/getlogs.dm

@@ -81,7 +81,7 @@
 
 //Shows today's server log
 /datum/admins/proc/view_txt_log()
-	set category = "Admin"
+	set category = "Admin.Logs"
 	set name = "Show Server Log"
 	set desc = "Shows today's server log."
 
@@ -96,7 +96,7 @@
 
 //Shows today's attack log
 /datum/admins/proc/view_atk_log()
-	set category = "Admin"
+	set category = "Admin.Logs"
 	set name = "Show Server Attack Log"
 	set desc = "Shows today's server attack log."
 

code/modules/admin/verbs/grief_fixers.dm

@@ -1,5 +1,5 @@
 /client/proc/fixatmos()
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Fix Atmospherics Grief"
 
 	if(!check_rights(R_ADMIN|R_DEBUG|R_EVENT)) return

code/modules/admin/verbs/lightning_strike.dm

@@ -1,7 +1,7 @@
 /client/proc/admin_lightning_strike()
 	set name = "Lightning Strike"
 	set desc = "Causes lightning to strike on your tile. This can be made to hurt things on or nearby it severely."
-	set category = "Fun"
+	set category = "Fun.Do Not"
 
 	if(!check_rights(R_FUN))
 		return

code/modules/admin/verbs/map_template_loadverb.dm

@@ -1,5 +1,5 @@
 /client/proc/map_template_load()
-	set category = "Debug"
+	set category = "Debug.Events"
 	set name = "Map template - Place At Loc"
 
 	var/datum/map_template/template
@@ -32,7 +32,7 @@
 		usr.client.images -= preview
 
 /client/proc/map_template_load_on_new_z()
-	set category = "Debug"
+	set category = "Debug.Events"
 	set name = "Map template - New Z"
 
 	var/datum/map_template/template
@@ -55,7 +55,7 @@
 
 
 /client/proc/map_template_upload()
-	set category = "Debug"
+	set category = "Debug.Events"
 	set name = "Map Template - Upload"
 
 	var/map = input(usr, "Choose a Map Template to upload to template storage","Upload Map Template") as null|file

code/modules/admin/verbs/mapping.dm

@@ -167,7 +167,7 @@ var/list/debug_verbs = list (
 
 
 /client/proc/enable_debug_verbs()
-	set category = "Debug"
+	set category = "Debug.Misc"
 	set name = "Debug verbs"
 
 	if(!check_rights(R_DEBUG)) return
@@ -177,7 +177,7 @@ var/list/debug_verbs = list (
 	feedback_add_details("admin_verb","mDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/hide_debug_verbs()
-	set category = "Debug"
+	set category = "Debug.Misc"
 	set name = "Hide Debug verbs"
 
 	if(!check_rights(R_DEBUG)) return
@@ -209,7 +209,7 @@ var/list/debug_verbs = list (
 
 
 /client/proc/testZAScolors()
-	set category = "ZAS"
+	set category = "Mapping.ZAS"
 	set name = "Check ZAS connections"
 
 	if(!check_rights(R_DEBUG)) return
@@ -258,7 +258,7 @@ var/list/debug_verbs = list (
 		testZAScolors_turfs += T
 
 /client/proc/testZAScolors_remove()
-	set category = "ZAS"
+	set category = "Mapping.ZAS"
 	set name = "Remove ZAS connection colors"
 
 	testZAScolors_turfs.Cut()
@@ -270,7 +270,7 @@ var/list/debug_verbs = list (
 				images.Remove(i)
 
 /client/proc/rebootAirMaster()
-	set category = "ZAS"
+	set category = "Mapping.ZAS"
 	set name = "Reboot ZAS"
 
 	if(tgui_alert(usr, "This will destroy and remake all zone geometry on the whole map.","Reboot ZAS",list("Reboot ZAS","Nevermind")) == "Reboot ZAS")

code/modules/admin/verbs/modify_robot.dm

@@ -2,7 +2,7 @@
 /client/proc/modify_robot(var/mob/living/silicon/robot/target in silicon_mob_list)
 	set name = "Modify Robot Module"
 	set desc = "Allows to add or remove modules to/from robots."
-	set category = "Admin"
+	set category = "Admin.Silicon"
 	if(!check_rights(R_ADMIN|R_FUN|R_VAREDIT|R_EVENT))
 		return
 
@@ -90,8 +90,8 @@
 						robot.module.contents.Remove(add_item)
 						target.module.modules.Add(add_item)
 						target.module.contents.Add(add_item)
-						spawn(0) //ChompEDIT Must be after to allow the movement to finish
-							SEND_SIGNAL(add_item, COMSIG_OBSERVER_MOVED)//ChompEDIT - report the movement since setting loc doesn't call Move or Moved
+						spawn(0) Must be after to allow the movement to finish
+							SEND_SIGNAL(add_item, COMSIG_OBSERVER_MOVED)
 						target.hud_used.update_robot_modules_display()
 						to_chat(usr, span_danger("You added \"[add_item]\" to [target]."))
 						if(istype(add_item, /obj/item/stack/))

code/modules/admin/verbs/panicbunker.dm

@@ -1,5 +1,5 @@
 /client/proc/panicbunker()
-	set category = "Server"
+	set category = "Server.Config"
 	set name = "Toggle Panic Bunker"
 
 	if(!check_rights(R_ADMIN))
@@ -17,7 +17,7 @@
 	feedback_add_details("admin_verb","PANIC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/paranoia_logging()
-	set category = "Server"
+	set category = "Server.Config"
 	set name = "New Player Warnings"
 
 	if(!check_rights(R_ADMIN))
@@ -31,7 +31,7 @@
 	feedback_add_details("admin_verb","PARLOG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/ip_reputation()
-	set category = "Server"
+	set category = "Server.Config"
 	set name = "Toggle IP Rep Checks"
 
 	if(!check_rights(R_ADMIN))

code/modules/admin/verbs/playsound.dm

@@ -6,7 +6,7 @@
 var/list/sounds_cache = list()
 
 /client/proc/play_sound(S as sound)
-	set category = "Fun"
+	set category = "Fun.Sounds"
 	set name = "Play Global Sound"
 	if(!check_rights(R_SOUNDS))
 		return
@@ -50,7 +50,7 @@ var/list/sounds_cache = list()
 	feedback_add_details("admin_verb", "Play Global Sound")
 
 /client/proc/play_local_sound(S as sound)
-	set category = "Fun"
+	set category = "Fun.Sounds"
 	set name = "Play Local Sound"
 	if(!check_rights(R_SOUNDS))
 		return
@@ -61,7 +61,7 @@ var/list/sounds_cache = list()
 	feedback_add_details("admin_verb", "Play Local Sound")
 
 /client/proc/play_direct_mob_sound(S as sound, mob/M)
-	set category = "Fun"
+	set category = "Fun.Sounds"
 	set name = "Play Direct Mob Sound"
 	if(!check_rights(R_SOUNDS))
 		return
@@ -76,7 +76,7 @@ var/list/sounds_cache = list()
 	feedback_add_details("admin_verb", "Play Direct Mob Sound")
 
 /client/proc/play_z_sound(S as sound)
-	set category = "Fun"
+	set category = "Fun.Sounds"
 	set name = "Play Z Sound"
 	if(!check_rights(R_SOUNDS))	return
 	var/target_z = mob.z
@@ -98,7 +98,7 @@ var/list/sounds_cache = list()
 
 
 /client/proc/play_server_sound()
-	set category = "Fun"
+	set category = "Fun.Sounds"
 	set name = "Play Server Sound"
 	if(!check_rights(R_SOUNDS))
 		return
@@ -215,7 +215,7 @@ var/list/sounds_cache = list()
 	feedback_add_details("admin_verb", "Play Internet Sound")
 
 /client/proc/play_web_sound()
-	set category = "Fun"
+	set category = "Fun.Sounds"
 	set name = "Play Internet Sound"
 	if(!check_rights(R_SOUNDS))
 		return
@@ -243,7 +243,7 @@ var/list/sounds_cache = list()
 		web_sound(usr, null)
 
 /client/proc/stop_sounds()
-	set category = "Debug"
+	set category = "Debug.Dangerous"
 	set name = "Stop All Playing Sounds"
 	if(!src.holder)
 		return
@@ -264,8 +264,8 @@ var/list/sounds_cache = list()
 #undef SHELLEO_STDERR
 
 /*
-/client/proc/cuban_pete()
-	set category = "Fun"
+/client/proc/cuban_pete()"
+	set category = "Fun.Sounds"
 	set name = "Cuban Pete Time"
 
 	message_admins("[key_name_admin(usr)] has declared Cuban Pete Time!", 1)
@@ -280,8 +280,8 @@ var/list/sounds_cache = list()
 			CP.gib()
 
 
-/client/proc/bananaphone()
-	set category = "Fun"
+/client/proc/bananaphone()"
+	set category = "Fun.Sounds"
 	set name = "Banana Phone"
 
 	message_admins("[key_name_admin(usr)] has activated Banana Phone!", 1)
@@ -291,8 +291,8 @@ var/list/sounds_cache = list()
 				M << 'bananaphone.ogg'
 
 
-/client/proc/space_asshole()
-	set category = "Fun"
+/client/proc/space_asshole()"
+	set category = "Fun.Sounds"
 	set name = "Space Asshole"
 
 	message_admins("[key_name_admin(usr)] has played the Space Asshole Hymn.", 1)
@@ -302,8 +302,8 @@ var/list/sounds_cache = list()
 				M << 'sound/music/space_asshole.ogg'
 
 
-/client/proc/honk_theme()
-	set category = "Fun"
+/client/proc/honk_theme()"
+	set category = "Fun.Sounds"
 	set name = "Honk"
 
 	message_admins("[key_name_admin(usr)] has creeped everyone out with Blackest Honks.", 1)

code/modules/admin/verbs/pray.dm

@@ -1,5 +1,5 @@
 /mob/verb/pray()
-	set category = "IC"
+	set category = "IC.Game"
 	set name = "Pray"
 
 	if(say_disabled)	//This is here to try to identify lag problems

code/modules/admin/verbs/randomverbs.dm

@@ -18,7 +18,7 @@
 	feedback_add_details("admin_verb","DEVR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_prison(mob/M as mob in mob_list)
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Prison"
 	if(!holder)
 		return
@@ -46,7 +46,7 @@
 
 //Allows staff to determine who the newer players are.
 /client/proc/cmd_check_new_players()
-	set category = "Admin"
+	set category = "Admin.Investigate"
 	set name = "Check new Players"
 	if(!holder)
 		return
@@ -80,7 +80,7 @@
 		to_chat(src, "No matches for that age range found.")
 
 /client/proc/cmd_admin_subtle_message(mob/M as mob in mob_list)
-	set category = "Special Verbs"
+	set category = "Admin"
 	set name = "Subtle Message"
 
 	if(!ismob(M))	return
@@ -107,7 +107,7 @@
 	feedback_add_details("admin_verb","SMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_world_narrate() // Allows administrators to fluff events a little easier -- TLE
-	set category = "Special Verbs"
+	set category = "Fun.Narrate"
 	set name = "Global Narrate"
 
 	if (!holder)
@@ -128,7 +128,7 @@
 	feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_direct_narrate(var/mob/M)	// Targetted narrate -- TLE
-	set category = "Special Verbs"
+	set category = "Fun.Narrate"
 	set name = "Direct Narrate"
 
 	if(!holder)
@@ -155,7 +155,7 @@
 	feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_godmode(mob/M as mob in mob_list)
-	set category = "Special Verbs"
+	set category = "Admin.Game"
 	set name = "Godmode"
 
 	if(!holder)
@@ -225,7 +225,7 @@
 	feedback_add_details("admin_verb","MUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_add_random_ai_law()
-	set category = "Fun"
+	set category = "Fun.Silicon"
 	set name = "Add Random AI Law"
 
 	if(!holder)
@@ -276,7 +276,7 @@ Ccomp's first proc.
 
 
 /client/proc/allow_character_respawn()
-	set category = "Special Verbs"
+	set category = "Admin.Game"
 	set name = "Allow player to respawn"
 	set desc = "Let a player bypass the wait to respawn or allow them to re-enter their corpse."
 
@@ -313,7 +313,7 @@ Ccomp's first proc.
 
 
 /client/proc/toggle_antagHUD_use()
-	set category = "Server"
+	set category = "Server.Game"
 	set name = "Toggle antagHUD usage"
 	set desc = "Toggles antagHUD usage for observers"
 
@@ -348,7 +348,7 @@ Ccomp's first proc.
 
 
 /client/proc/toggle_antagHUD_restrictions()
-	set category = "Server"
+	set category = "Server.Game"
 	set name = "Toggle antagHUD Restrictions"
 	set desc = "Restricts players that have used antagHUD from being able to join this round."
 
@@ -381,7 +381,7 @@ Works kind of like entering the game with a new character. Character receives a
 Traitors and the like can also be revived with the previous role mostly intact.
 /N */
 /client/proc/respawn_character()
-	set category = "Special Verbs"
+	set category = "Fun.Event Kit"
 	set name = "Spawn Character"
 	set desc = "(Re)Spawn a client's loaded character."
 
@@ -594,7 +594,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	return new_character
 
 /client/proc/cmd_admin_add_freeform_ai_law()
-	set category = "Fun"
+	set category = "Fun.Silicon"
 	set name = "Add Custom AI law"
 
 	if(!holder)
@@ -623,7 +623,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	feedback_add_details("admin_verb","IONC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_rejuvenate(mob/living/M as mob in mob_list)
-	set category = "Special Verbs"
+	set category = "Admin.Game"
 	set name = "Rejuvenate"
 
 	if(!holder)
@@ -646,7 +646,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	feedback_add_details("admin_verb","REJU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_create_centcom_report()
-	set category = "Special Verbs"
+	set category = "Fun.Event Kit"
 	set name = "Create Command Report"
 
 	if(!holder)
@@ -674,7 +674,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_delete(atom/O as obj|mob|turf in _validate_atom(O)) // I don't understand precisely how this fixes the string matching against a substring, but it does - Ater
-	set category = "Admin"
+	set category = "Admin.Game"
 	set name = "Delete"
 
 	if (!holder)
@@ -683,7 +683,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	admin_delete(O)
 
 /client/proc/cmd_admin_list_open_jobs()
-	set category = "Admin"
+	set category = "Admin.Investigate"
 	set name = "List free slots"
 
 	if (!holder)
@@ -695,7 +695,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	feedback_add_details("admin_verb","LFS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in world)
-	set category = "Special Verbs"
+	set category = "Fun.Do Not"
 	set name = "Explosion"
 
 	if(!check_rights(R_DEBUG|R_FUN))	return //VOREStation Edit
@@ -723,7 +723,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		return
 
 /client/proc/cmd_admin_emp(atom/O as obj|mob|turf in world)
-	set category = "Special Verbs"
+	set category = "Fun.Do Not"
 	set name = "EM Pulse"
 
 	if(!check_rights(R_DEBUG|R_FUN))	return //VOREStation Edit
@@ -749,7 +749,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		return
 
 /client/proc/cmd_admin_gib(mob/M as mob in mob_list)
-	set category = "Special Verbs"
+	set category = "Fun.Do Not"
 	set name = "Gib"
 
 	if(!check_rights(R_ADMIN|R_FUN))	return //VOREStation Edit
@@ -771,7 +771,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 /client/proc/cmd_admin_gib_self()
 	set name = "Gibself"
-	set category = "Fun"
+	set category = "Fun.Do Not"
 
 	if(!holder)
 		return
@@ -791,7 +791,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 /*
 /client/proc/cmd_manual_ban()
 	set name = "Manual Ban"
-	set category = "Special Verbs"
+	set category = "Admin.Moderation"
 	if(!authenticated || !holder)
 		to_chat(src, "Only administrators may use this command.")
 		return
@@ -851,7 +851,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	return
 
 /client/proc/cmd_admin_check_contents(mob/living/M as mob in mob_list)
-	set category = "Special Verbs"
+	set category = "Admin.Investigate"
 	set name = "Check Contents"
 	set popup_menu = FALSE //VOREStation Edit - Declutter.
 
@@ -865,7 +865,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 /* This proc is DEFERRED. Does not do anything.
 /client/proc/cmd_admin_remove_phoron()
-	set category = "Debug"
+	set category = "Debug.Game"
 	set name = "Stabilize Atmos."
 	if(!holder)
 		to_chat(src, "Only administrators may use this command.")
@@ -895,7 +895,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 */
 
 /client/proc/toggle_view_range()
-	set category = "Special Verbs"
+	set category = "Admin.Game"
 	set name = "Change View Range"
 	set desc = "switches between 1x and custom views"
 
@@ -915,7 +915,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	feedback_add_details("admin_verb","CVRA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/admin_call_shuttle()
-	set category = "Admin"
+	set category = "Admin.Events"
 	set name = "Call Shuttle"
 
 	if ((!( ticker ) || !emergency_shuttle.location()))
@@ -947,7 +947,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	return
 
 /client/proc/admin_cancel_shuttle()
-	set category = "Admin"
+	set category = "Admin.Events"
 	set name = "Cancel Shuttle"
 
 	if(!check_rights(R_ADMIN))	return //VOREStation Edit
@@ -965,7 +965,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	return
 
 /client/proc/admin_deny_shuttle()
-	set category = "Admin"
+	set category = "Admin.Events"
 	set name = "Toggle Deny Shuttle"
 
 	if (!ticker)
@@ -979,7 +979,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	message_admins("[key_name_admin(usr)] has [emergency_shuttle.deny_shuttle ? "denied" : "allowed"] the shuttle to be called.")
 
 /client/proc/cmd_admin_attack_log(mob/M as mob in mob_list)
-	set category = "Special Verbs"
+	set category = "Admin.Logs"
 	set name = "Attack Log"
 
 	to_chat(usr, span_red(span_bold("Attack Log for [mob]")))
@@ -989,7 +989,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 
 /client/proc/everyone_random()
-	set category = "Fun"
+	set category = "Fun.Do Not"
 	set name = "Make Everyone Random"
 	set desc = "Make everyone have a random appearance. You can only use this before rounds!"
 
@@ -1023,7 +1023,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 
 /client/proc/toggle_random_events()
-	set category = "Server"
+	set category = "Server.Game"
 	set name = "Toggle random events on/off"
 	set desc = "Toggles random events such as meteors, black holes, blob (but not space dust) on/off"
 
@@ -1041,7 +1041,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 /client/proc/despawn_player(var/mob/M in living_mob_list)
 	set name = "Cryo Player"
-	set category = "Admin"
+	set category = "Admin.Game"
 	set desc = "Removes a player from the round as if they'd cryo'd."
 	set popup_menu = FALSE
 
@@ -1104,7 +1104,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 /client/proc/cmd_admin_droppod_spawn(var/object as text)
 	set name = "Drop Pod Atom"
 	set desc = "Spawn a new atom/movable in a drop pod where you are."
-	set category = "Fun"
+	set category = "Fun.Drop Pod"
 
 	if(!check_rights(R_SPAWN))
 		return
@@ -1146,7 +1146,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 /client/proc/cmd_admin_droppod_deploy()
 	set name = "Drop Pod Deploy"
 	set desc = "Drop an existing mob where you are in a drop pod."
-	set category = "Fun"
+	set category = "Fun.Drop Pod"
 
 	if(!check_rights(R_SPAWN))
 		return

code/modules/admin/verbs/randomverbs_vr.dm

@@ -1,5 +1,5 @@
 /client/proc/spawn_character_mob()
-	set category = "Special Verbs"
+	set category = "Fun.Event Kit"
 	set name = "Spawn Character As Mob"
 	set desc = "Spawn a specified ckey as a chosen mob."
 
@@ -76,7 +76,7 @@
 	return new_mob
 
 /client/proc/cmd_admin_z_narrate() // Allows administrators to fluff events a little easier -- TLE
-	set category = "Special Verbs"
+	set category = "Fun.Narrate"
 	set name = "Z Narrate"
 	set desc = "Narrates to your Z level."
 
@@ -84,6 +84,10 @@
 		return
 
 	var/msg = tgui_input_text(usr, "Message:", text("Enter the text you wish to appear to everyone:"))
+
+	if (!msg)
+		return
+
 	if(!(msg[1] == "<" && msg[length(msg)] == ">")) //You can use HTML but only if the whole thing is HTML. Tries to prevent admin 'accidents'.
 		msg = sanitize(msg)
 
@@ -101,7 +105,7 @@
 	feedback_add_details("admin_verb","GLNA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/toggle_vantag_hud(var/mob/target as mob)
-	set category = "Fun"
+	set category = "Fun.Event Kit"
 	set name = "Give/Remove Event HUD"
 	set desc = "Give a mob the event hud, which shows them other people's event preferences, or remove it from them"
 

code/modules/admin/verbs/resize.dm

@@ -1,7 +1,7 @@
 /client/proc/resize(var/mob/living/L in mob_list)
     set name = "Resize"
     set desc = "Resizes any living mob without any restrictions on size."
-    set category = "Fun"
+    set category = "Fun.Event Kit"
     if(!check_rights(R_ADMIN|R_FUN|R_VAREDIT))
         return
 

code/modules/admin/verbs/smite.dm

@@ -1,7 +1,7 @@
 /client/proc/smite(var/mob/living/carbon/human/target in player_list)
 	set name = "Smite"
 	set desc = "Abuse a player with various 'special treatments' from a list."
-	set category = "Fun"
+	set category = "Fun.Do Not"
 	if(!check_rights(R_FUN))
 		return
 

code/modules/admin/verbs/striketeam.dm

@@ -2,7 +2,7 @@
 var/const/commandos_possible = 6 //if more Commandos are needed in the future
 
 /client/proc/strike_team()
-	set category = "Fun"
+	set category = "Fun.Event Kit"
 	set name = "Spawn Strike Team"
 	set desc = "Spawns a strike team if you want to run an admin event."
 

code/modules/admin/verbs/tripAI.dm

@@ -1,5 +1,5 @@
 /client/proc/triple_ai()
-	set category = "Fun"
+	set category = "Fun.Event Kit"
 	set name = "Create AI Triumvirate"
 
 	if(ticker.current_state > GAME_STATE_PREGAME)