Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/controllers/subsystem/events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions code/modules/admin/admin_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."

Expand Down Expand Up @@ -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."

Expand All @@ -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."

Expand All @@ -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))
Expand Down
16 changes: 8 additions & 8 deletions code/modules/admin/verbs/debug.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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())
Expand All @@ -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())
Expand All @@ -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"

Expand All @@ -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())
Expand All @@ -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())
Expand All @@ -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())
Expand Down Expand Up @@ -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))
Expand Down
32 changes: 16 additions & 16 deletions code/modules/admin/verbs/randomverbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand All @@ -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))
Expand All @@ -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")
Expand Down Expand Up @@ -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!"

Expand Down Expand Up @@ -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.Round End"
set popup_menu = FALSE
if(!check_rights(R_DEBUG))
return
Expand Down Expand Up @@ -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."

Expand All @@ -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."
Expand All @@ -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))
Expand All @@ -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.Round End"
set name = "Polymorph All"
set desc = "Applies the effects of the bolt of change to every single mob."

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/tripAI.dm
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/centcom_podlauncher.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/client/verbs/ooc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion yogstation/code/modules/admin/admin_verbs.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/client/proc/rejuv_all()
set name = "Revive All"
set category = "Misc"
set category = "Admin.Round End"
set desc = "Rejuvinate every mob/living."

if(!check_rights(R_ADMIN))
Expand Down
2 changes: 1 addition & 1 deletion yogstation/code/modules/admin/verbs/adminvox.dm
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions yogstation/code/modules/admin/verbs/spawnfloorcluwne.dm
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.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."

Expand Down