From 9f40c381a43423e9563bb88f195930004604a392 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 20 Jun 2017 01:25:48 -0500 Subject: [PATCH 1/3] fixes looc --- code/modules/client/verbs/looc.dm | 21 ++++++++++--------- .../browserassets/css/browserOutput.css | 1 + interface/stylesheet.dm | 1 + 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/code/modules/client/verbs/looc.dm b/code/modules/client/verbs/looc.dm index 5b9066faae..902d309f10 100644 --- a/code/modules/client/verbs/looc.dm +++ b/code/modules/client/verbs/looc.dm @@ -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 << " Speech is currently admin-disabled." 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 << " You have OOC muted." return if(!holder) if(!GLOB.ooc_allowed) - src << "\red OOC is globally muted" + src << " OOC is globally muted" return if(!GLOB.dooc_allowed && (mob.stat == DEAD)) - usr << "\red OOC for dead mobs has been turned off." + usr << " OOC for dead mobs has been turned off." return if(prefs.muted & MUTE_OOC) - src << "\red You cannot use OOC (muted)." + src << " You cannot use OOC (muted)." 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 << "LOOC: [src.mob.name]: [msg]" + to_chat(C,"LOOC: [src.mob.name]: [msg]") 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 << "[prefix]: [src.key]/[src.mob.name]: [msg]" + to_chat(C,"[prefix]: [src.key]/[src.mob.name]: [msg]") - 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 << "[prefix]: [src.key]/[src.mob.name]: [msg]" + to_chat(C,"[prefix]: [src.key]/[src.mob.name]: [msg]")*/ diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css index 8532e3f6cf..93dd2e47fe 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput.css +++ b/code/modules/goonchat/browserassets/css/browserOutput.css @@ -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;} diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 74d1eaa3ef..c4d8174960 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -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;} From 4775f0b9c54a2d40bbaa1784db06e306ec222886 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 20 Jun 2017 01:27:05 -0500 Subject: [PATCH 2/3] Update looc.dm --- code/modules/client/verbs/looc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/verbs/looc.dm b/code/modules/client/verbs/looc.dm index 902d309f10..312f68acdc 100644 --- a/code/modules/client/verbs/looc.dm +++ b/code/modules/client/verbs/looc.dm @@ -17,7 +17,7 @@ return if(!(prefs.toggles & CHAT_OOC)) - src << " You have OOC muted." + src << " You have OOC muted." return if(!holder) From b28677414eadbbe51516afe3f033d5d2a70b2d94 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 20 Jun 2017 01:47:52 -0500 Subject: [PATCH 3/3] Update looc.dm --- code/modules/client/verbs/looc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/verbs/looc.dm b/code/modules/client/verbs/looc.dm index 312f68acdc..42c20a2dc6 100644 --- a/code/modules/client/verbs/looc.dm +++ b/code/modules/client/verbs/looc.dm @@ -17,7 +17,7 @@ return if(!(prefs.toggles & CHAT_OOC)) - src << " You have OOC muted." + src << " You have OOC muted." return if(!holder)