diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index f082c4971c..aeb1a7fdcf 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -9,9 +9,19 @@ if(!mob) return - if(IsGuestKey(key)) - to_chat(src, "Guests may not use OOC.") - return + if(!holder) + if(!GLOB.ooc_allowed) + to_chat(src, "OOC is globally muted.") + return + if(!GLOB.dooc_allowed && (mob.stat == DEAD)) + to_chat(usr, "OOC for dead mobs has been turned off.") + return + if(prefs.muted & MUTE_OOC) + to_chat(src, "You cannot use OOC (muted).") + return + if(jobban_isbanned(src.mob, "OOC")) + to_chat(src, "You have been banned from OOC.") + return msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN) var/raw_msg = msg @@ -25,24 +35,7 @@ if(alert("Your message \"[raw_msg]\" looks like it was meant for in game communication, say it in OOC?", "Meant for OOC?", "No", "Yes") != "Yes") return - if(!(prefs.chat_toggles & CHAT_OOC)) - to_chat(src, "You have OOC muted.") - return - if(!holder) - if(!GLOB.ooc_allowed) - to_chat(src, "OOC is globally muted.") - return - if(!GLOB.dooc_allowed && (mob.stat == DEAD)) - to_chat(usr, "OOC for dead mobs has been turned off.") - return - if(prefs.muted & MUTE_OOC) - to_chat(src, "You cannot use OOC (muted).") - return - if(src.mob) - if(jobban_isbanned(src.mob, "OOC")) - to_chat(src, "You have been banned from OOC.") - return if(handle_spam_prevention(msg,MUTE_OOC)) return if(findtext(msg, "byond://")) @@ -51,6 +44,11 @@ message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]") return + if(!(prefs.chat_toggles & CHAT_OOC)) + to_chat(src, "You have OOC muted.") + return + + log_talk(mob,"[key_name(src)] : [raw_msg]",LOGOOC) mob.log_message("[key]: [raw_msg]", INDIVIDUAL_OOC_LOG)