From 0195b1ebb02cafe36c9cc9ad661a2919c36798b2 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Wed, 12 Dec 2012 09:17:46 +0000 Subject: [PATCH] - yearly admin verb cleanup: moved the rejuvenate verb to debug verbs due to lack of use and using sorting code in determining which mobs have it. Moved the 'show traitor panel' to debug verbs. Still accessible from 'show player panel', so it's just one click away. Completely removed 'sendmob' due to using two separate sorting functions to determine what it's tied to. This should remove the half second delay that admins experience whenever they right click. The delay goes up as server load increases. I couldn't test this on an empty server tho, obviously. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5299 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/admin/admin.dm | 2 +- code/modules/admin/admin_verbs.dm | 5 ++--- code/modules/admin/verbs/adminjump.dm | 2 +- code/modules/admin/verbs/mapping.dm | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index b801ebd1091..8e4766e0280 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -791,7 +791,7 @@ var/global/floorIsLava = 0 feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/admins/proc/show_traitor_panel(var/mob/M in sortmobs()) +/datum/admins/proc/show_traitor_panel(var/mob/M in mob_list) set category = "Admin" set desc = "Edit mobs's memory and role" set name = "Show Traitor Panel" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index b0cb1a373df..0cfccd5cd89 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -24,7 +24,7 @@ var/list/admin_verbs_admin = list( /client/proc/player_panel, /*shows an interface for all players, with links to various panels (old style)*/ /client/proc/player_panel_new, /*shows an interface for all players, with links to various panels*/ /client/proc/invisimin, /*allows our mob to go invisible/visible*/ - /datum/admins/proc/show_traitor_panel, /*interface which shows a mob's mind*/ +// /datum/admins/proc/show_traitor_panel, /*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage /datum/admins/proc/toggleenter, /*toggles whether people can join the current game*/ /datum/admins/proc/toggleguests, /*toggles whether guests can join the current game*/ /datum/admins/proc/announce, /*priority announce something to all clients.*/ @@ -44,7 +44,7 @@ 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*/ +// /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/Jump, /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*/ @@ -131,7 +131,6 @@ var/list/admin_verbs_permissions = list( /client/proc/edit_admin_permissions ) var/list/admin_verbs_rejuv = list( - /client/proc/cmd_admin_rejuvenate, /client/proc/respawn_character ) diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index c6f675a3a66..c11b9aadf7d 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -95,7 +95,7 @@ else alert("Admin jumping disabled") -/client/proc/Getmob(var/mob/M in sortmobs()) +/client/proc/Getmob(var/mob/M in mob_list) set category = "Admin" set name = "Get Mob" set desc = "Mob to teleport" diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index ddc6e224ff9..e0f8e007dbe 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -148,6 +148,8 @@ var/intercom_range_display_status = 0 src.verbs += /client/proc/kaboom src.verbs += /client/proc/splash src.verbs += /client/proc/cmd_admin_areatest + src.verbs += /client/proc/cmd_admin_rejuvenate + src.verbs += /datum/admins/proc/show_traitor_panel //src.verbs += /client/proc/cmd_admin_rejuvenate feedback_add_details("admin_verb","mDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!