From 7ff294be07d28aba31bd39dfadee557cb55abb64 Mon Sep 17 00:00:00 2001 From: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com> Date: Sun, 12 May 2024 07:25:10 -0700 Subject: [PATCH] [MIRROR] seperate LOOC and OOC mute (#8377) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: CHOMPStation2 --- code/__defines/admin.dm | 7 ++++--- code/modules/admin/admin.dm | 1 + code/modules/admin/verbs/randomverbs.dm | 1 + code/modules/client/verbs/ooc.dm | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/__defines/admin.dm b/code/__defines/admin.dm index 33a79557d5..38af783088 100644 --- a/code/__defines/admin.dm +++ b/code/__defines/admin.dm @@ -3,9 +3,10 @@ // Therefore there needs to be a gap between the flags for the automute flags. #define MUTE_IC 0x1 #define MUTE_OOC 0x2 -#define MUTE_PRAY 0x4 -#define MUTE_ADMINHELP 0x8 -#define MUTE_DEADCHAT 0x10 +#define MUTE_LOOC 0x4 +#define MUTE_PRAY 0x8 +#define MUTE_ADMINHELP 0x10 +#define MUTE_DEADCHAT 0x20 #define MUTE_ALL 0xFFFF // Number of identical messages required to get the spam-prevention auto-mute thing to trigger warnings and automutes. diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index efc29151bc..738b11e2b2 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -84,6 +84,7 @@ var/global/floorIsLava = 0 body += {"
Mute: \[IC | OOC | + LOOC | PRAY | ADMINHELP | DEADCHAT\] diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 2ca0f7a81b..496856e9f2 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -195,6 +195,7 @@ switch(mute_type) if(MUTE_IC) mute_string = "IC (say and emote)" if(MUTE_OOC) mute_string = "OOC" + if(MUTE_LOOC) mute_string = "LOOC" if(MUTE_PRAY) mute_string = "pray" if(MUTE_ADMINHELP) mute_string = "adminhelp, admin PM and ASAY" if(MUTE_DEADCHAT) mute_string = "deadchat and DSAY" diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 84dbdf37c8..69ad2b3f74 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -112,7 +112,7 @@ if(!CONFIG_GET(flag/dooc_allowed) && (mob.stat == DEAD)) // CHOMPEdit to_chat(usr, "OOC for dead mobs has been turned off.") return - if(prefs.muted & MUTE_OOC) + if(prefs.muted & MUTE_LOOC) to_chat(src, "You cannot use OOC (muted).") return if(findtext(msg, "byond://") && !CONFIG_GET(flag/allow_byond_links)) // CHOMPEdit @@ -134,7 +134,7 @@ log_looc(msg,src) if(msg) - handle_spam_prevention(MUTE_OOC) + handle_spam_prevention(MUTE_LOOC) var/mob/source = mob.get_looc_source() var/turf/T = get_turf(source)