From 1ec286254a488268402737bc60a0c264143e962d Mon Sep 17 00:00:00 2001
From: Jamie D <993128+JamieD1@users.noreply.github.com>
Date: Sun, 26 Jun 2022 15:35:26 +0100
Subject: [PATCH 1/3] Moves Around a few Admin Verbs

---
 code/controllers/subsystem/events.dm                   |  2 +-
 code/modules/admin/verbs/randomverbs.dm                | 10 +++++-----
 yogstation/code/modules/admin/admin_verbs.dm           |  2 +-
 .../code/modules/admin/verbs/spawnfloorcluwne.dm       |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm
index 798b6233dcb6..b2b90319c8cc 100644
--- a/code/controllers/subsystem/events.dm
+++ b/code/controllers/subsystem/events.dm
@@ -100,7 +100,7 @@ SUBSYSTEM_DEF(events)
 // REEEEEEEEE
 /client/proc/forceEvent()
 	set name = "Trigger Event"
-	set category = "Misc"
+	set category = "Admin.Round Interaction"
 
 	if(!holder ||!check_rights(R_FUN))
 		return
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 2c87b06a4b87..da7e09e1e456 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -512,7 +512,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 = "Misc"
+	set category = "Admin.Round Interaction"
 	set name = "Add Custom AI law"
 
 	if(!check_rights(R_ADMIN))
@@ -874,7 +874,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 /client/proc/toggle_nuke(obj/machinery/nuclearbomb/N in GLOB.nuke_list)
 	set name = "Toggle Nuke"
-	set category = "Misc"
+	set category = "Admin.End Round"
 	set popup_menu = FALSE
 	if(!check_rights(R_DEBUG))
 		return
@@ -950,7 +950,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Run Weather")
 
 /client/proc/mass_zombie_infection()
-	set category = "Misc"
+	set category = "Admin.Round Interaction"
 	set name = "Mass Zombie Infection"
 	set desc = "Infects all humans with a latent organ that will zombify \
 		them on death."
@@ -970,7 +970,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Mass Zombie Infection")
 
 /client/proc/mass_zombie_cure()
-	set category = "Misc"
+	set category = "Admin.Round Interaction"
 	set name = "Mass Zombie Cure"
 	set desc = "Removes the zombie infection from all humans, returning them to normal."
 	if(!check_rights(R_ADMIN))
@@ -988,7 +988,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Mass Zombie Cure")
 
 /client/proc/polymorph_all()
-	set category = "Misc"
+	set category = "Admin.End Round"
 	set name = "Polymorph All"
 	set desc = "Applies the effects of the bolt of change to every single mob."
 
diff --git a/yogstation/code/modules/admin/admin_verbs.dm b/yogstation/code/modules/admin/admin_verbs.dm
index cf610cff3d07..d0c818f19b36 100644
--- a/yogstation/code/modules/admin/admin_verbs.dm
+++ b/yogstation/code/modules/admin/admin_verbs.dm
@@ -1,6 +1,6 @@
 /client/proc/rejuv_all()
 	set name = "Revive All"
-	set category = "Misc"
+	set category = "Admin.End Round"
 	set desc = "Rejuvinate every mob/living."
 
 	if(!check_rights(R_ADMIN))
diff --git a/yogstation/code/modules/admin/verbs/spawnfloorcluwne.dm b/yogstation/code/modules/admin/verbs/spawnfloorcluwne.dm
index b31671de708e..d834a14d223a 100644
--- a/yogstation/code/modules/admin/verbs/spawnfloorcluwne.dm
+++ b/yogstation/code/modules/admin/verbs/spawnfloorcluwne.dm
@@ -1,5 +1,5 @@
 /client/proc/spawn_floor_cluwne()
-	set category = "Misc"
+	set category = "Admin.Round Interaction"
 	set name = "Unleash Floor Cluwne"
 	set desc = "Pick a specific target or just let it select randomly and spawn the floor cluwne mob on the station. Be warned: spawning more than one may cause issues!"
 	var/target
@@ -19,7 +19,7 @@
 	message_admins("[key_name(usr)] spawned floor cluwne.")
 
 /client/proc/nerf_or_nothing() // Thank you Groudon, very cool
-	set category = "Misc"
+	set category = "Admin.End Round"
 	set name = "Begin Nerf War"
 	set desc = "Gives all living PC humans a nerf gun, and alerts that a Nerf War has begun."
 

From 201cc8f36acae66084c1fdb37bfdbe9d2ebb11da Mon Sep 17 00:00:00 2001
From: Jamie D <993128+JamieD1@users.noreply.github.com>
Date: Sat, 9 Jul 2022 17:23:05 +0100
Subject: [PATCH 2/3] Verbs

---
 code/modules/admin/admin_verbs.dm             |  8 +++----
 code/modules/admin/verbs/debug.dm             | 16 +++++++-------
 code/modules/admin/verbs/randomverbs.dm       | 22 +++++++++----------
 code/modules/admin/verbs/tripAI.dm            |  2 +-
 code/modules/cargo/centcom_podlauncher.dm     |  2 +-
 code/modules/client/verbs/ooc.dm              |  4 ++--
 .../code/modules/admin/verbs/adminvox.dm      |  2 +-
 7 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 983612f5065f..28435a297b61 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -495,7 +495,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Stealth Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/drop_bomb()
-	set category = "Misc"
+	set category = "Admin.Round Interaction"
 	set name = "Drop Bomb"
 	set desc = "Cause an explosion of varying strength at your location."
 
@@ -584,7 +584,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 	message_admins("[key_name_admin(usr)] has  modified Dynamic Explosion Scale: [ex_scale]")
 
 /client/proc/give_spell(mob/T in GLOB.mob_list)
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	set name = "Give Spell"
 	set desc = "Gives a spell to a mob."
 
@@ -608,7 +608,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 		message_admins(span_danger("Spells given to mindless mobs will not be transferred in mindswap or cloning!"))
 
 /client/proc/remove_spell(mob/T in GLOB.mob_list)
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	set name = "Remove Spell"
 	set desc = "Remove a spell from the selected mob."
 
@@ -621,7 +621,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 			SSblackbox.record_feedback("tally", "admin_verb", 1, "Remove Spell") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/give_disease(mob/living/T in GLOB.mob_living_list)
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	set name = "Give Disease"
 	set desc = "Gives a Disease to a mob."
 	if(!istype(T))
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index db9da7e4ba93..a22bf4158d65 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -236,7 +236,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Air Status In Location") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_robotize(mob/M in GLOB.mob_list)
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	set name = "Make Robot"
 
 	if(!SSticker.HasRoundStarted())
@@ -252,7 +252,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 		alert("Invalid mob")
 
 /client/proc/cmd_admin_blobize(mob/M in GLOB.mob_list)
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	set name = "Make Blob"
 
 	if(!SSticker.HasRoundStarted())
@@ -267,7 +267,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 
 
 /client/proc/cmd_admin_animalize(mob/M in GLOB.mob_list)
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	set name = "Make Simple Animal"
 
 	if(!SSticker.HasRoundStarted())
@@ -288,7 +288,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 
 
 /client/proc/makepAI(turf/T in GLOB.mob_list)
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	set name = "Make pAI"
 	set desc = "Specify a location to spawn a pAI device, then specify a key to play that pAI"
 
@@ -315,7 +315,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Make pAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_alienize(mob/M in GLOB.mob_list)
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	set name = "Make Alien"
 
 	if(!SSticker.HasRoundStarted())
@@ -330,7 +330,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 		alert("Invalid mob")
 
 /client/proc/cmd_admin_slimeize(mob/M in GLOB.mob_list)
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	set name = "Make slime"
 
 	if(!SSticker.HasRoundStarted())
@@ -345,7 +345,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 		alert("Invalid mob")
 
 /client/proc/cmd_admin_pacmanize(mob/M in GLOB.mob_list)
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	set name = "Make pacman"
 
 	if(!SSticker.HasRoundStarted())
@@ -732,7 +732,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
 	cmd_admin_areatest(FALSE)
 
 /client/proc/cmd_admin_dress(mob/M in GLOB.mob_list)
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	set name = "Select equipment"
 
 	if(!check_rights(R_SPAWN))
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index da7e09e1e456..133907809b1d 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -196,7 +196,7 @@
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Local Narrate") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_godmode(mob/M in GLOB.mob_list)
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	set name = "Godmode"
 	if(!check_rights(R_ADMIN))
 		return
@@ -582,7 +582,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Create Command Report") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_change_command_name()
-	set category = "Misc"
+	set category = "Admin.Round Interaction"
 	set name = "Change Command Name"
 
 	if(!check_rights(R_ADMIN))
@@ -639,7 +639,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Manage Job Slots") //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 = "Misc"
+	set category = "Admin.Round Interaction"
 	set name = "Explosion"
 
 	if(!check_rights(R_ADMIN))
@@ -675,7 +675,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 = "Misc"
+	set category = "Admin.Round Interaction"
 	set name = "EM Pulse"
 
 	if(!check_rights(R_ADMIN))
@@ -700,7 +700,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		return
 
 /client/proc/cmd_admin_gib(mob/M in GLOB.mob_list)
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	set name = "Gib"
 
 	if(!check_rights(R_ADMIN))
@@ -727,7 +727,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 = "Misc"
+	set category = "Admin.Player Interaction"
 
 	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
 	if(confirm == "Yes")
@@ -809,7 +809,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	return
 
 /client/proc/everyone_random()
-	set category = "Misc"
+	set category = "Admin.Round Interaction"
 	set name = "Make Everyone Random"
 	set desc = "Make everyone have a random appearance. You can only use this before rounds!"
 
@@ -927,7 +927,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 
 /client/proc/run_weather()
-	set category = "Misc"
+	set category = "Admin.Round Interaction"
 	set name = "Run Weather"
 	set desc = "Triggers a weather on the z-level you choose."
 
@@ -1080,7 +1080,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 /client/proc/smite(mob/living/target as mob)
 	set name = "Smite"
-	set category = "Misc"
+	set category = "Admin.Player Interaction"
 	if(!check_rights(R_ADMIN) || !check_rights(R_FUN))
 		return
 
@@ -1418,7 +1418,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		return
 
 /datum/admins/proc/cmd_create_centcom()
-	set category = "Misc"
+	set category = "Admin.Round Interaction"
 	set name = "Spawn on Centcom"
 	if(!check_rights(R_ADMIN))
 		return
@@ -1486,7 +1486,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	sleep(4 SECONDS)
 
 /datum/admins/proc/cmd_create_wiki()
-	set category = "Misc"
+	set category = "OOC"
 	set name = "Go to Wiki Room"
 	if(!check_rights(R_ADMIN))
 		return
diff --git a/code/modules/admin/verbs/tripAI.dm b/code/modules/admin/verbs/tripAI.dm
index 74c60a79bbf7..3df5b51c4bb9 100644
--- a/code/modules/admin/verbs/tripAI.dm
+++ b/code/modules/admin/verbs/tripAI.dm
@@ -1,5 +1,5 @@
 /client/proc/triple_ai()
-	set category = "Misc"
+	set category = "Admin.Round Interaction"
 	set name = "Toggle AI Triumvirate"
 
 	if(SSticker.current_state > GAME_STATE_PREGAME)
diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm
index e6ddb506fab5..a5d96a18bfc5 100644
--- a/code/modules/cargo/centcom_podlauncher.dm
+++ b/code/modules/cargo/centcom_podlauncher.dm
@@ -19,7 +19,7 @@
 /client/proc/centcom_podlauncher() //Creates a verb for admins to open up the ui
 	set name = "Config/Launch Supplypod"
 	set desc = "Configure and launch a CentCom supplypod full of whatever your heart desires!"
-	set category = "Misc"
+	set category = "Admin.Round Interaction"
 	if(!check_rights(R_FUN))
 		return
 	new /datum/centcom_podlauncher(usr)//create the datum
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index ca443b34711a..ce4e3a36620b 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -175,13 +175,13 @@ GLOBAL_VAR_INIT(mentor_ooc_colour, YOGS_MENTOR_OOC_COLOUR) // yogs - mentor ooc
 /client/proc/set_ooc(newColor as color)
 	set name = "Set Player OOC Color"
 	set desc = "Modifies player OOC Color"
-	set category = "Misc"
+	set category = "Server"
 	GLOB.OOC_COLOR = sanitize_ooccolor(newColor)
 
 /client/proc/reset_ooc()
 	set name = "Reset Player OOC Color"
 	set desc = "Returns player OOC Color to default"
-	set category = "Misc"
+	set category = "Server"
 	GLOB.OOC_COLOR = null
 
 /client/verb/colorooc()
diff --git a/yogstation/code/modules/admin/verbs/adminvox.dm b/yogstation/code/modules/admin/verbs/adminvox.dm
index 140b1964c108..6a62412741b0 100644
--- a/yogstation/code/modules/admin/verbs/adminvox.dm
+++ b/yogstation/code/modules/admin/verbs/adminvox.dm
@@ -1,7 +1,7 @@
 /client/proc/admin_vox()
 	//This proc is a slightly-rewritten clone of /mob/living/silicon/ai/proc/announcement()
 	//Check over there to see what's different, if this ever breaks.
-	set category = "Misc"
+	set category = "Admin.Round Interaction"
 	set name = "Force AI Vox"
 	set hidden = 0
 

From d4df1df05e0c6a1ab279b38b9bfc7449f8c6a4d0 Mon Sep 17 00:00:00 2001
From: Jamie D <993128+JamieD1@users.noreply.github.com>
Date: Sun, 10 Jul 2022 23:54:33 +0100
Subject: [PATCH 3/3] e

---
 code/modules/admin/verbs/randomverbs.dm                 | 4 ++--
 yogstation/code/modules/admin/admin_verbs.dm            | 2 +-
 yogstation/code/modules/admin/verbs/spawnfloorcluwne.dm | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 133907809b1d..55454aa8d3de 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -874,7 +874,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 /client/proc/toggle_nuke(obj/machinery/nuclearbomb/N in GLOB.nuke_list)
 	set name = "Toggle Nuke"
-	set category = "Admin.End Round"
+	set category = "Admin.Round End"
 	set popup_menu = FALSE
 	if(!check_rights(R_DEBUG))
 		return
@@ -988,7 +988,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Mass Zombie Cure")
 
 /client/proc/polymorph_all()
-	set category = "Admin.End Round"
+	set category = "Admin.Round End"
 	set name = "Polymorph All"
 	set desc = "Applies the effects of the bolt of change to every single mob."
 
diff --git a/yogstation/code/modules/admin/admin_verbs.dm b/yogstation/code/modules/admin/admin_verbs.dm
index d0c818f19b36..dce41f6ee272 100644
--- a/yogstation/code/modules/admin/admin_verbs.dm
+++ b/yogstation/code/modules/admin/admin_verbs.dm
@@ -1,6 +1,6 @@
 /client/proc/rejuv_all()
 	set name = "Revive All"
-	set category = "Admin.End Round"
+	set category = "Admin.Round End"
 	set desc = "Rejuvinate every mob/living."
 
 	if(!check_rights(R_ADMIN))
diff --git a/yogstation/code/modules/admin/verbs/spawnfloorcluwne.dm b/yogstation/code/modules/admin/verbs/spawnfloorcluwne.dm
index d834a14d223a..2352e7d415ef 100644
--- a/yogstation/code/modules/admin/verbs/spawnfloorcluwne.dm
+++ b/yogstation/code/modules/admin/verbs/spawnfloorcluwne.dm
@@ -19,7 +19,7 @@
 	message_admins("[key_name(usr)] spawned floor cluwne.")
 
 /client/proc/nerf_or_nothing() // Thank you Groudon, very cool
-	set category = "Admin.End Round"
+	set category = "Admin.Round End"
 	set name = "Begin Nerf War"
 	set desc = "Gives all living PC humans a nerf gun, and alerts that a Nerf War has begun."