shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1686 from Citadel-Station-13/LOOCFix

Browse Source 
fixes LOOC
This commit is contained in:
LetterJay
2017-06-20 02:01:32 -05:00
committed by GitHub
parent 62e4580fd2 b28677414e
commit cd590e7fb1
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/verbs/looc.dm
+11 -10
View File
@@ -4,7 +4,7 @@
set category = "OOC"
if(GLOB.say_disabled) //This is here to try to identify lag problems
usr << "\red Speech is currently admin-disabled."
usr << "<span class='danger'> Speech is currently admin-disabled.</span>"
return
if(!mob) return
@@ -13,21 +13,22 @@
return
msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
if(!msg) return
if(!msg)
return
if(!(prefs.toggles & CHAT_OOC))
src << "\red You have OOC muted."
src << "<span class='danger'> You have OOC muted.</span>"
return
if(!holder)
if(!GLOB.ooc_allowed)
src << "\red OOC is globally muted"
src << "<span class='danger'> OOC is globally muted</span>"
return
if(!GLOB.dooc_allowed && (mob.stat == DEAD))
usr << "\red OOC for dead mobs has been turned off."
usr << "<span class='danger'> OOC for dead mobs has been turned off.</span>"
return
if(prefs.muted & MUTE_OOC)
src << "\red You cannot use OOC (muted)."
src << "<span class='danger'> You cannot use OOC (muted).</span>"
return
if(handle_spam_prevention(msg,MUTE_OOC))
return
@@ -58,16 +59,16 @@
// display_name = "[holder.fakekey]/([src.key])"
// else
// display_name = holder.fakekey
C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>LOOC:</span> <EM>[src.mob.name]:</EM> <span class='message'>[msg]</span></span></font>"
to_chat(C,"<font color='#6699CC'><span class='ooc'><span class='prefix'>LOOC:</span> <EM>[src.mob.name]:</EM> <span class='message'>[msg]</span></span></font>")
for(var/client/C in GLOB.admins)
if(C.prefs.toggles & CHAT_OOC)
var/prefix = "(R)LOOC"
if (C.mob in heard)
prefix = "LOOC"
C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[src.key]/[src.mob.name]:</EM> <span class='message'>[msg]</span></span></font>"
to_chat(C,"<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[src.key]/[src.mob.name]:</EM> <span class='message'>[msg]</span></span></font>")
for(var/mob/dead/observer/G in world)
/*for(var/mob/dead/observer/G in world)
if(!G.client)
continue
var/client/C = G.client
@@ -77,4 +78,4 @@
var/prefix = "(G)LOOC"
if (C.mob in heard)
prefix = "LOOC"
C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[src.key]/[src.mob.name]:</EM> <span class='message'>[msg]</span></span></font>"
to_chat(C,"<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[src.key]/[src.mob.name]:</EM> <span class='message'>[msg]</span></span></font>")*/
code/modules/goonchat/browserassets/css/browserOutput.css
+1
View File
@@ -234,6 +234,7 @@ em {font-style: normal; font-weight: bold;}
.ooc { font-weight: bold;}
.adminobserverooc {color: #0099cc; font-weight: bold;}
.adminooc {color: #700038; font-weight: bold;}
.looc { font-weight: bold;}
.adminobserver {color: #996600; font-weight: bold;}
.admin {color: #386aff; font-weight: bold;}
interface/stylesheet.dm
+1
View File
@@ -28,6 +28,7 @@ em {font-style: normal; font-weight: bold;}
.ooc { font-weight: bold;}
.adminobserverooc {color: #0099cc; font-weight: bold;}
.adminooc {color: #700038; font-weight: bold;}
.looc { font-weight: bold;}
.adminobserver {color: #996600; font-weight: bold;}
.admin {color: #386aff; font-weight: bold;}