Merge pull request #8598 from FreeStylaLT/sneaky_mins

Prevents mentors from seeing stealthed admins
This commit is contained in:
tigercat2000
2018-01-25 23:22:31 -08:00
committed by GitHub
2 changed files with 10 additions and 4 deletions
+3 -3
View File
@@ -60,7 +60,7 @@ var/global/admin_ooc_colour = "#b82e00"
for(var/client/C in clients)
if(C.prefs.toggles & CHAT_OOC)
var/display_name = src.key
var/display_name = key
if(prefs.unlock_content)
if(prefs.toggles & MEMBER_PUBLIC)
@@ -74,8 +74,8 @@ var/global/admin_ooc_colour = "#b82e00"
if(holder)
if(holder.fakekey)
if(C.holder)
display_name = "[holder.fakekey]/([src.key])"
if(C.holder && C.holder.rights & R_ADMIN)
display_name = "[holder.fakekey]/([key])"
else
display_name = holder.fakekey
+7 -1
View File
@@ -32,7 +32,13 @@
for(var/client/C in admins)
if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, C.mob))
to_chat(C, "<span class='[check_rights(R_ADMIN, 0) ? "mentor_channel_admin" : "mentor_channel"]'>MENTOR: <span class='name'>[key_name(usr, 1)]</span> ([admin_jump_link(mob)]): <span class='message'>[msg]</span></span>")
var/display_name = key
if(holder.fakekey)
if(C.holder && C.holder.rights & R_ADMIN)
display_name = "[holder.fakekey]/([key])"
else
display_name = holder.fakekey
to_chat(C, "<span class='[check_rights(R_ADMIN, 0) ? "mentor_channel_admin" : "mentor_channel"]'>MENTOR: <span class='name'>[display_name]</span> ([admin_jump_link(mob)]): <span class='message'>[msg]</span></span>")
feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!