From f7c2685122e283ea1340f2a0c51d37222da30422 Mon Sep 17 00:00:00 2001 From: Markolie Date: Wed, 30 Sep 2015 00:21:55 +0200 Subject: [PATCH] Admin PM fix --- code/modules/admin/verbs/adminpm.dm | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 8277b49081d..93cff752e0b 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -214,37 +214,22 @@ */ log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]") - - - var/list/modholders = list() - var/list/banholders = list() - var/list/adminholders = list() - for(var/client/X in admins) - if(check_rights(R_MOD|R_MENTOR, 0, X.mob)) - modholders += X - if(check_rights(R_ADMIN, 0, X.mob)) - adminholders += X - if(check_rights(R_BAN, 0, X.mob)) - banholders += X - //we don't use message_admins here because the sender/receiver might get it too for(var/client/X in admins) //check client/X is an admin and isn't the sender or recipient if(X == C || X == src) continue - if(X.key!=key && X.key!=C.key) + if(X.key != key && X.key != C.key) switch(type) if("Question") - if(check_rights(R_MOD|R_MENTOR, 0, X.mob)) - X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: \blue [msg]" //inform X - else if(!modholders.len && check_rights(R_ADMIN, 0, X.mob)) - X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: \blue [msg]" //Any admins in backup of mod question + if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, X.mob)) + X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: \blue [msg]" if("Player Complaint") - if(check_rights(R_BAN, 0, X.mob)) - X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: \blue [msg]" //There should always be at least 1 person with +BAN on + if(check_rights(R_ADMIN|R_MOD, 0, X.mob)) + X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: \blue [msg]" else if(check_rights(R_ADMIN|R_MOD, 0, X.mob)) - X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: \blue [msg]" //If there's no type, send to all admins. + X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: \blue [msg]" /client/proc/cmd_admin_irc_pm() if(prefs.muted & MUTE_ADMINHELP)