diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index e8cfce100d..11c3980db4 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1114,7 +1114,7 @@ var/global/floorIsLava = 0
return 1
return 0
-/proc/get_options_bar(whom, detail = 2, name = 0, link = 1)
+/proc/get_options_bar(whom, detail = 2, name = 0, link = 1, highlight_special = 1)
if(!whom)
return "(*null*)"
var/mob/M
@@ -1129,12 +1129,12 @@ var/global/floorIsLava = 0
return "(*not an mob*)"
switch(detail)
if(0)
- return "[key_name(C, link, name)]"
+ return "[key_name(C, link, name, highlight_special)]"
if(1)
- return "[key_name(C, link, name)](?)"
+ return "[key_name(C, link, name, highlight_special)](?)"
if(2)
var/ref_mob = "\ref[M]"
- return "[key_name(C, link, name)](?) (PP) (VV) (SM) (JMP) (CA)"
+ return "[key_name(C, link, name, highlight_special)](?) (PP) (VV) (SM) (JMP) (CA)"
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 63b9db599b..073ad330fa 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -91,8 +91,8 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
if(!mob) return //this doesn't happen
var/ref_mob = "\ref[mob]"
+ var/mentor_msg = "\blue HELP: [get_options_bar(mob, 2, 1, 1, 0)][ai_found ? " (CL)" : ""]: [msg]"
msg = "\blue HELP: [get_options_bar(mob, 2, 1, 1)][ai_found ? " (CL)" : ""]: [msg]"
-
//send this msg to all admins
var/admin_number_afk = 0
for(var/client/X in admins)
@@ -101,7 +101,10 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
admin_number_afk++
if(X.prefs.toggles & SOUND_ADMINHELP)
X << 'sound/effects/adminhelp.ogg'
- X << msg
+ if(X.holder.rights == R_MENTOR)
+ X << mentor_msg // Mentors won't see coloring of names on people with special_roles (Antags, etc.)
+ else
+ X << msg
//show it to the person adminhelping too
src << "PM to-Admins: [original_msg]"
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 70fcdbf444..a312416ccc 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -37,5 +37,7 @@
if(config.mods_are_mentors)
channel = "MENTOR:"
for(var/client/C in admins)
- if((R_ADMIN|R_MOD|R_MENTOR) & C.holder.rights)
+ if((R_ADMIN|R_MOD) & C.holder.rights)
C << "[channel] [key_name(src,1)] (JMP): [msg]"
+ else // Mentors get same message without fancy coloring of name if special_role.
+ C << "[channel] [key_name(src,1,1,0)] (JMP): [msg]"