diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 4eba07f447..e96bc3b4da 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -7,7 +7,7 @@ var/list/Lines = list() - if(holder) + if(holder && (R_ADMIN & holder.rights || R_MOD & holder.rights)) for(var/client/C in clients) var/entry = "\t[C.key]" if(C.holder && C.holder.fakekey) @@ -52,7 +52,11 @@ var/num_admins_online = 0 if(holder) for(var/client/C in admins) - if(R_ADMIN & C.holder.rights || (!R_MOD & C.holder.rights && !R_MENTOR & C.holder.rights)) + if(R_ADMIN & C.holder.rights || (!R_MOD & C.holder.rights && !R_MENTOR & C.holder.rights)) //Used to determine who shows up in admin rows + + if(C.holder.fakekey && (!R_ADMIN & holder.rights && !R_MOD & holder.rights)) //Mentors can't see stealthmins + continue + msg += "\t[C] is a [C.holder.rank]" if(C.holder.fakekey) @@ -70,7 +74,7 @@ msg += "\n" num_admins_online++ - else if(R_MOD & C.holder.rights || R_MENTOR & C.holder.rights) + else if(R_MOD & C.holder.rights || R_MENTOR & C.holder.rights) //Who shows up in mod/mentor rows. modmsg += "\t[C] is a [C.holder.rank]" if(isobserver(C.mob)) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 73d4c58754..f58445ca3f 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -6,7 +6,7 @@ var/list/admin_verbs_default = list( /client/proc/hide_verbs, /*hides all our adminverbs*/ /client/proc/hide_most_verbs, /*hides all our hideable adminverbs*/ /client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/ - /client/proc/check_antagonists, /*shows all antags*/ +// /client/proc/check_antagonists, /*shows all antags*/ /client/proc/cmd_mentor_check_new_players // /client/proc/deadchat /*toggles deadchat on/off*/ ) @@ -47,6 +47,7 @@ var/list/admin_verbs_admin = list( /client/proc/cmd_admin_create_centcom_report, /client/proc/check_words, /*displays cult-words*/ /client/proc/check_ai_laws, /*shows AI and borg laws*/ + /client/proc/check_antagonists, /client/proc/admin_memo, /*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/ /client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/ /client/proc/toggleprayers, /*toggles prayers on/off*/ @@ -144,6 +145,7 @@ var/list/admin_verbs_debug = list( /client/proc/cmd_debug_tog_aliens, /client/proc/air_report, /client/proc/reload_admins, + /client/proc/reload_mentors, /client/proc/restart_controller, /client/proc/enable_debug_verbs, /client/proc/callproc, @@ -246,6 +248,7 @@ var/list/admin_verbs_mod = list( /client/proc/dsay, /datum/admins/proc/show_skills, /datum/admins/proc/show_player_panel, + /client/proc/check_antagonists, /client/proc/jobbans, /client/proc/cmd_admin_subtle_message /*send an message to somebody as a 'voice in their head'*/ ) diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index a602a2eb71..ebef50f5ae 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -140,6 +140,16 @@ load_admins() feedback_add_details("admin_verb","RLDA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! +/client/proc/reload_mentors() + set name = "Reload Mentors" + set category = "Debug" + + if(!check_rights(R_SERVER)) return + + message_admins("[usr] manually reloaded Mentors") + world.load_mods() + + //todo: /client/proc/jump_to_dead_group() set name = "Jump to dead group"