cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Made sure +MENTOR didn't see global LOOC

Browse Source
This commit is contained in:
ZomgPonies
2015-02-17 11:52:39 -05:00
parent 4f2ee19b11
commit 575beed24e
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/verbs/ooc.dm
+13 -11
View File
@@ -120,18 +120,19 @@ var/global/normal_ooc_colour = "#002eb8"
log_ooc("(LOCAL) [mob.name]/[key] : [msg]")
var/list/heard = get_mobs_in_view(7, src.mob)
var/mob/S = src.mob
var/display_name = S.key
if(S.stat != DEAD)
display_name = S.name
// Handle non-admins
for(var/mob/M in heard)
if(!M.client)
continue
var/client/C = M.client
if (C in admins)
continue //they are handled after that
if(C in admins)
if(C.holder.rights | R_MENTOR)
continue //they are handled after that
if(C.prefs.toggles & CHAT_LOOC)
if(holder)
@@ -141,15 +142,16 @@ var/global/normal_ooc_colour = "#002eb8"
else
display_name = holder.fakekey
C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>LOOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
// Now handle admins
display_name = S.key
if(S.stat != DEAD)
display_name = "[S.name]/([S.key])"
for(var/client/C in admins)
if(C.prefs.toggles & CHAT_LOOC)
var/prefix = "(R)LOOC"
if (C.mob in heard)
prefix = "LOOC"
C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
if(C.holder.rights | R_MENTOR)
if(C.prefs.toggles & CHAT_LOOC)
var/prefix = "(R)LOOC"
if (C.mob in heard)
prefix = "LOOC"
C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"