diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 5f957e88dd..9205f03f12 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -49,7 +49,6 @@ var/list/admin_verbs_admin = list( /client/proc/jumptocoord, /*we ghost and jump to a coordinate*/ /client/proc/Getmob, /*teleports a mob to our location*/ /client/proc/Getkey, /*teleports a mob with a certain ckey to our location*/ -// /client/proc/sendmob, /*sends a mob somewhere*/ -Removed due to it needing two sorting procs to work, which were executed every time an admin right-clicked. ~Errorage /client/proc/jumptoarea, /client/proc/jumptokey, /*allows us to jump to the location of a mob with a certain ckey*/ /client/proc/jumptomob, /*allows us to jump to a specific mob*/ @@ -81,7 +80,6 @@ var/list/admin_verbs_sounds = list( var/list/admin_verbs_fun = list( /client/proc/cmd_admin_dress, /client/proc/cmd_admin_gib_self, - /client/proc/drop_bomb, /client/proc/cinematic, /client/proc/one_click_antag, /client/proc/send_space_ninja, @@ -94,12 +92,16 @@ var/list/admin_verbs_fun = list( /client/proc/forceEvent, /client/proc/bluespace_artillery, /client/proc/admin_change_sec_level, + /client/proc/show_tip, /client/proc/toggle_nuke, + /client/proc/reset_latejoin_spawns, /client/proc/mass_zombie_infection, /client/proc/mass_zombie_cure, /client/proc/polymorph_all, - /client/proc/show_tip + /client/proc/everyone_random, + /client/proc/drop_bomb ) + var/list/admin_verbs_spawn = list( /datum/admins/proc/spawn_atom, /*allows us to spawn instances*/ /client/proc/respawn_character @@ -111,7 +113,6 @@ var/list/admin_verbs_server = list( /datum/admins/proc/delay, /datum/admins/proc/toggleaban, /client/proc/toggle_log_hrefs, - /client/proc/everyone_random, /datum/admins/proc/toggleAI, /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ /client/proc/cmd_debug_del_all, @@ -143,7 +144,6 @@ var/list/admin_verbs_debug = list( /proc/machine_upgrade, /client/proc/populate_world, /client/proc/cmd_display_del_log, - /client/proc/reset_latejoin_spawns, /client/proc/create_outfits, /client/proc/debug_huds, /client/proc/map_template_load, diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 86f5b9de57..eadf662ebc 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -441,7 +441,7 @@ Traitors and the like can also be revived with the previous role mostly intact. var/datum/round_event/ion_storm/ion = new(0, announce_ion_laws, input) ion.start() - + 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 in mob_list) @@ -521,7 +521,7 @@ Traitors and the like can also be revived with the previous role mostly intact. feedback_add_details("admin_verb","MFS") //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 = "Abusive" set name = "Explosion" if (!holder) @@ -689,7 +689,7 @@ Traitors and the like can also be revived with the previous role mostly intact. /client/proc/everyone_random() - set category = "Fun" + set category = "Abusive" set name = "Make Everyone Random" set desc = "Make everyone have a random appearance. You can only use this before rounds!" @@ -754,7 +754,7 @@ Traitors and the like can also be revived with the previous role mostly intact. /client/proc/toggle_nuke(obj/machinery/nuclearbomb/N in nuke_list) set name = "Toggle Nuke" - set category = "Fun" + set category = "Abusive" set popup_menu = 0 if(!check_rights(R_DEBUG)) return @@ -772,7 +772,7 @@ Traitors and the like can also be revived with the previous role mostly intact. feedback_add_details("admin_verb","TN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/reset_latejoin_spawns() - set category = "Debug" + set category = "Abusive" set name = "Remove Latejoin Spawns" if(!check_rights(R_DEBUG)) @@ -994,7 +994,7 @@ var/list/datum/outfit/custom_outfits = list() //Admin created outfits M.ui_interact(usr) /client/proc/mass_zombie_infection() - set category = "Fun" + set category = "Abusive" set name = "Mass Zombie Infection" set desc = "Infects all humans with a latent organ that will zombify \ them on death." @@ -1014,7 +1014,7 @@ var/list/datum/outfit/custom_outfits = list() //Admin created outfits feedback_add_details("admin_verb","MZI") /client/proc/mass_zombie_cure() - set category = "Fun" + set category = "Abusive" set name = "Mass Zombie Cure" set desc = "Removes the zombie infection from all humans, returning them to normal." if(!holder) @@ -1032,7 +1032,7 @@ var/list/datum/outfit/custom_outfits = list() //Admin created outfits feedback_add_details("admin_verb","MZC") /client/proc/polymorph_all() - set category = "Fun" + set category = "Abusive" set name = "Polymorph All" set desc = "Applies the effects of the bolt of change to every single mob."