From 8d0c7039dfef7e7d9d8307f6f293d5e2930efdcd Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Sat, 13 Jun 2015 16:43:23 +0100 Subject: [PATCH] Changes to dsay - Adds dsay to list of +DEBUG verbs - Changes dsay to use holder rank rather than trying to guess from rights --- code/modules/admin/admin_verbs.dm | 3 ++- code/modules/admin/verbs/deadsay.dm | 11 +---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 6d8abad3cb8..a07b05dec2b 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -165,7 +165,8 @@ var/list/admin_verbs_debug = list( /client/proc/SDQL2_query, /client/proc/Jump, /client/proc/jumptomob, - /client/proc/jumptocoord + /client/proc/jumptocoord, + /client/proc/dsay ) var/list/admin_verbs_paranoid_debug = list( diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index bb66843c163..1a68f3016bf 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -18,16 +18,7 @@ if (src.handle_spam_prevention(msg,MUTE_DEADCHAT)) return - var/stafftype = null - - if (src.holder.rights & R_MOD) - stafftype = "MOD" - - if (src.holder.rights & R_MENTOR) - stafftype = "MENTOR" - - if (src.holder.rights & R_ADMIN) - stafftype = "ADMIN" + var/stafftype = uppertext(holder.rank) msg = sanitize(copytext(msg, 1, MAX_MESSAGE_LEN)) log_admin("[key_name(src)] : [msg]")