diff --git a/code/__DEFINES/~skyrat_defines/banning.dm b/code/__DEFINES/~skyrat_defines/banning.dm index 1b25b67f568..c28ff41b411 100644 --- a/code/__DEFINES/~skyrat_defines/banning.dm +++ b/code/__DEFINES/~skyrat_defines/banning.dm @@ -7,3 +7,4 @@ #define BAN_EORG "EORG ban" #define BAN_ANTAGONIST "General antagonist ban" #define BAN_OPFOR "OPFOR ban" +#define BAN_LOOC "LOOC" diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index 7f696b5c90d..eb4bddbb7c6 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -406,6 +406,7 @@ BAN_EORG, BAN_ANTAGONIST, BAN_OPFOR, + BAN_LOOC, //SKYRAT ADDITION - LOOC muting again ),//SKYRAT EDIT ADDITION - EXTRA_BANS ) for(var/department in long_job_lists) diff --git a/code/modules/admin/verbs/admin.dm b/code/modules/admin/verbs/admin.dm index baad1f49a76..b6c5583d43f 100644 --- a/code/modules/admin/verbs/admin.dm +++ b/code/modules/admin/verbs/admin.dm @@ -208,6 +208,11 @@ if(MUTE_DEADCHAT) mute_string = "deadchat and DSAY" feedback_string = "Deadchat" + //Skyrat Addition Begin - LOOC muting again. + if(MUTE_LOOC) + mute_string = "LOOC" + feedback_string = "LOOC" + //Skyrat Addition End - LOOC muting again. if(MUTE_ALL) mute_string = "everything" feedback_string = "Everything" diff --git a/code/modules/admin/verbs/admingame.dm b/code/modules/admin/verbs/admingame.dm index ff9cfff3689..5bbfeb84baf 100644 --- a/code/modules/admin/verbs/admingame.dm +++ b/code/modules/admin/verbs/admingame.dm @@ -84,7 +84,10 @@ body += "OOC | " body += "PRAY | " body += "ADMINHELP | " - body += "DEADCHAT\]" + //Skyrat Addition Begin - LOOC muting again. + body += "DEADCHAT | " + body += "LOOC\]" + //Skyrat Addition End - LOOC muting again. body += "(toggle all)" body += "

" diff --git a/modular_skyrat/modules/verbs/code/looc.dm b/modular_skyrat/modules/verbs/code/looc.dm index ccefd9bd26e..dfcc67f96ee 100644 --- a/modular_skyrat/modules/verbs/code/looc.dm +++ b/modular_skyrat/modules/verbs/code/looc.dm @@ -39,6 +39,9 @@ if(prefs.muted & MUTE_LOOC) to_chat(src, span_danger("You cannot use LOOC (muted).")) return + if(is_banned_from(ckey, BAN_LOOC)) + to_chat(src, span_warning("You are LOOC banned!")) + return if(mob.stat) to_chat(src, span_danger("You cannot use LOOC while unconscious or dead.")) return