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

Merge pull request #1866 from Markolie/fuckingglass

Browse Source 
Fix admins not seeing LOOC
This commit is contained in:
Fox-McCloud
2015-08-26 22:14:14 -04:00
parent a00b878779 01c919b5b0
commit dd21928a66
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/verbs/ooc.dm
+4 -21
View File
@@ -40,7 +40,7 @@ var/global/normal_ooc_colour = "#002eb8"
var/display_colour = normal_ooc_colour
if(holder && !holder.fakekey)
display_colour = "#0099cc" //light blue
if(holder.rights & R_MOD && !(holder.rights & R_ADMIN))
if(check_rights(R_MOD,0) && !check_rights(R_ADMIN,0))
display_colour = "#184880" //dark blue
else if(holder.rights & R_ADMIN)
if(config.allow_admin_ooccolor)
@@ -59,22 +59,6 @@ var/global/normal_ooc_colour = "#002eb8"
display_name = holder.fakekey
C << "<font color='[display_colour]'><span class='ooc'><span class='prefix'>OOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
/*
if(holder)
if(!holder.fakekey || C.holder)
if(holder.rights & R_ADMIN)
C << "<font color=[config.allow_admin_ooccolor ? src.prefs.ooccolor :"#b82e00" ]><b><span class='prefix'>OOC:</span> <EM>[key][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></b></font>"
else if(holder.rights & R_MOD)
C << "<font color=#184880><b><span class='prefix'>OOC:</span> <EM>[src.key][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></b></font>"
else
C << "<font color='[normal_ooc_colour]'><span class='ooc'><span class='prefix'>OOC:</span> <EM>[src.key]:</EM> <span class='message'>[msg]</span></span></font>"
else
C << "<font color='[normal_ooc_colour]'><span class='ooc'><span class='prefix'>OOC:</span> <EM>[holder.fakekey ? holder.fakekey : src.key]:</EM> <span class='message'>[msg]</span></span></font>"
else
C << "<font color='[normal_ooc_colour]'><span class='ooc'><span class='prefix'>OOC:</span> <EM>[src.key]:</EM> <span class='message'>[msg]</span></span></font>"
*/
/proc/toggle_ooc()
ooc_allowed = !( ooc_allowed )
if (ooc_allowed)
@@ -92,7 +76,6 @@ var/global/normal_ooc_colour = "#002eb8"
set category = "Server"
normal_ooc_colour = newColor
/client/verb/looc(msg as text)
set name = "LOOC" //Gave this shit a shorter name so you only have to time out "ooc" rather than "ooc message" to use it --NeoFite
set desc = "Local OOC, seen only by those in view."
@@ -110,7 +93,7 @@ var/global/normal_ooc_colour = "#002eb8"
src << "\red You have LOOC muted."
return
if(!(holder && holder.rights && (holder.rights & R_MOD)))
if(!check_rights(R_MOD,0))
if(!ooc_allowed)
src << "\red LOOC is globally muted"
return
@@ -141,7 +124,7 @@ var/global/normal_ooc_colour = "#002eb8"
if(!M.client)
continue
var/client/C = M.client
if(check_rights(R_MENTOR,0))
if(check_rights(R_MOD,0))
continue //they are handled after that
if(C.prefs.toggles & CHAT_LOOC)
@@ -159,7 +142,7 @@ var/global/normal_ooc_colour = "#002eb8"
display_name = "[S.name]/([S.key])"
for(var/client/C in admins)
if(check_rights(R_MENTOR,0))
if(check_rights(R_MOD,0))
if(C.prefs.toggles & CHAT_LOOC)
var/prefix = "(R)LOOC"
if (C.mob in heard)