Skip to content

Commit

Permalink
LOOC Fixes (#2246)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
See changelog
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
LOOC is used fairly frequently here, so I might as well keep it up to
scratch with normal OOC at least.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: You can now configure LOOC and mentorsay in chat tabs
fix: (Un)Muting LOOC now actually works.
admin: You can now change the global LOOC colour. Because, why not?
admin: LOOC now shows up in the OOC tab of the logging panel for players
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
MarkSuckerberg authored Aug 18, 2023
1 parent 5e2577a commit 158d192
Show file tree
Hide file tree
Showing 18 changed files with 125 additions and 74 deletions.
3 changes: 2 additions & 1 deletion code/__DEFINES/chat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
#define MESSAGE_TYPE_WARNING "warning"
#define MESSAGE_TYPE_DEADCHAT "deadchat"
#define MESSAGE_TYPE_OOC "ooc"
#define MESSAGE_TYPE_LOOC "looc"
#define MESSAGE_TYPE_ADMINPM "adminpm"
#define MESSAGE_TYPE_COMBAT "combat"
#define MESSAGE_TYPE_ADMINCHAT "adminchat"
#define MESSAGE_TYPE_MODCHAT "modchat"
#define MESSAGE_TYPE_MENTORCHAT "mentorchat"
#define MESSAGE_TYPE_EVENTCHAT "eventchat"
#define MESSAGE_TYPE_ADMINLOG "adminlog"
#define MESSAGE_TYPE_ATTACKLOG "attacklog"
Expand Down
3 changes: 1 addition & 2 deletions code/__DEFINES/logging.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
#define INDIVIDUAL_SAY_LOG (LOG_SAY | LOG_WHISPER | LOG_DSAY)
#define INDIVIDUAL_EMOTE_LOG (LOG_EMOTE | LOG_SUBTLER)
#define INDIVIDUAL_COMMS_LOG (LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS)
#define INDIVIDUAL_OOC_LOG (LOG_OOC | LOG_ADMIN | LOG_MSAY)
#define INDIVIDUAL_LOOC_LOG (LOG_LOOC | LOG_ADMIN)
#define INDIVIDUAL_OOC_LOG (LOG_OOC | LOG_ADMIN | LOG_MSAY | LOG_LOOC)
#define INDIVIDUAL_OWNERSHIP_LOG (LOG_OWNERSHIP)
#define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME | LOG_ADMIN_PRIVATE | LOG_ASAY | LOG_MSAY | LOG_MECHA | LOG_VIRUS | LOG_CLONING | LOG_SHUTTLE | LOG_ECON | LOG_LOOC)

Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,4 @@

//Used in visible_message_flags, audible_message_flags and runechat_flags
#define EMOTE_MESSAGE (1<<0)
#define LOOC_MESSAGE (1<<1)
2 changes: 0 additions & 2 deletions code/__HELPERS/_logging.dm
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,9 @@
if (CONFIG_GET(flag/log_ooc))
WRITE_LOG(GLOB.world_game_log, "OOC: [text]")

//BeginWS Edit
/proc/log_looc(text)
if (CONFIG_GET(flag/log_ooc))
WRITE_LOG(GLOB.world_game_log, "LOOC: [text]")
//EndWS Edit

/proc/log_whisper(text)
if (CONFIG_GET(flag/log_whisper))
Expand Down
2 changes: 1 addition & 1 deletion code/_globalvars/configuration.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GLOBAL_VAR_INIT(changelog_hash, "")
GLOBAL_VAR_INIT(hub_visibility, FALSE)

GLOBAL_VAR_INIT(ooc_allowed, TRUE) // used with admin verbs to disable ooc - not a config option apparently
GLOBAL_VAR_INIT(looc_allowed, TRUE) //WS Edit
GLOBAL_VAR_INIT(looc_allowed, TRUE)
GLOBAL_VAR_INIT(dooc_allowed, TRUE)
GLOBAL_VAR_INIT(enter_allowed, TRUE)
GLOBAL_VAR_INIT(shuttle_frozen, FALSE)
Expand Down
13 changes: 11 additions & 2 deletions code/datums/chatmessage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,16 @@
else if ("emote" in extra_classes)
var/image/r_icon = image('icons/UI_Icons/chat/chat_icons.dmi', icon_state = "emote")
text = "\icon[r_icon]&nbsp;[text]"
else if("looc" in extra_classes)
var/image/r_icon = image('icons/UI_Icons/chat/chat_icons.dmi', icon_state = "looc")
text = "\icon[r_icon]&nbsp;[text]"

// We dim italicized text to make it more distinguishable from regular text
var/tgt_color = ("italics" in extra_classes) ? target.chat_color_darkened : target.chat_color
var/tgt_color = target.chat_color
if("looc" in extra_classes)
tgt_color = GLOB.LOOC_COLOR || GLOB.normal_looc_colour
else if("italics" in extra_classes)
// We dim italicized text to make it more distinguishable from regular text
tgt_color = target.chat_color_darkened

// Approximate text height
var/complete_text = "<span class='center maptext [extra_classes.Join(" ")]' style='color: [tgt_color]'>[target.say_emphasis(text)]</span>"
Expand Down Expand Up @@ -222,6 +229,8 @@
// Display visual above source
if(runechat_flags & EMOTE_MESSAGE)
new /datum/chatmessage(raw_message, speaker, src, list("emote", "italics"))
else if(runechat_flags & LOOC_MESSAGE)
new /datum/chatmessage(raw_message, speaker, src, list("looc", "italics"))
else
new /datum/chatmessage(lang_treat(speaker, message_language, raw_message, spans, null, TRUE), speaker, src, spans)

Expand Down
6 changes: 6 additions & 0 deletions code/game/atoms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1367,6 +1367,12 @@
log_shuttle(log_text)
if(LOG_RADIO_EMOTE)
log_radio_emote(log_text)
if(LOG_MSAY)
log_mentor(log_text)
if(LOG_LOOC)
log_looc(log_text)
if(LOG_SUBTLER)
log_subtler(log_text)
else
stack_trace("Invalid individual logging type: [message_type]. Defaulting to [LOG_GAME] (LOG_GAME).")
log_game(log_text)
Expand Down
2 changes: 0 additions & 2 deletions code/modules/admin/admin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,6 @@
SSredbot.send_discord_message("ooc", "**OOC has been [GLOB.ooc_allowed ? "enabled" : "disabled"] on the server.**")
SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle OOC", "[GLOB.ooc_allowed ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

//BeginWS Edit
/datum/admins/proc/toggleooclocal()
set category = "Server"
set desc="Toggle dat bitch"
Expand All @@ -581,7 +580,6 @@
log_admin("[key_name(usr)] toggled LOOC.")
message_admins("[key_name_admin(usr)] toggled LOOC.")
SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Local OOC", "[GLOB.looc_allowed ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
//EndWS Edit

/datum/admins/proc/toggleoocdead()
set category = "Server"
Expand Down
2 changes: 0 additions & 2 deletions code/modules/client/preferences_toggles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_ooc)()
/datum/verbs/menu/Settings/listen_ooc/Get_checked(client/C)
return C.prefs.chat_toggles & CHAT_OOC

//BeginWS Edit
TOGGLE_CHECKBOX(/datum/verbs/menu/settings, listen_looc)()
set name = "Show/Hide LOOC"
set category = "Preferences"
Expand All @@ -294,7 +293,6 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings, listen_looc)()
SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Seeing LOOC", "[usr.client.prefs.chat_toggles & CHAT_LOOC ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/verbs/menu/Settings/listen_looc/Get_checked(client/C)
return C.prefs.chat_toggles & CHAT_LOOC
//EndWS Edit

TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, chat_ghostckey)()
set name = "Show/Hide ckey in deadchat"
Expand Down
112 changes: 77 additions & 35 deletions code/modules/client/verbs/looc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,70 +7,112 @@ GLOBAL_VAR_INIT(normal_looc_colour, "#6699CC")
set category = "OOC"

if(GLOB.say_disabled) //This is here to try to identify lag problems
to_chat(usr, "<span class='danger'> Speech is currently admin-disabled.</span>")
to_chat(usr, span_danger("Speech is currently admin-disabled"))
return

if(!mob)
return

if(!holder)
if(!GLOB.looc_allowed)
to_chat(src, span_danger("LOOC is globally muted."))
return
if(prefs.muted & MUTE_OOC)
to_chat(src, span_danger("You cannot use LOOC (muted)."))
return
if(is_banned_from(ckey, "OOC"))
to_chat(src, span_danger("You have been banned from OOC."))
return
if(QDELETED(src))
return

msg = copytext_char(sanitize(msg), 1, MAX_MESSAGE_LEN)
var/raw_msg = msg

if(!msg)
return

if(!(prefs.toggles & CHAT_OOC))
to_chat(src, "<span class='danger'> You have OOC muted.</span>")
return
if(is_banned_from(ckey, "OOC"))
to_chat(src, "<span class='danger'>You have been banned from OOC.</span>")
return
msg = emoji_parse(msg)

if(!holder)
if(!GLOB.looc_allowed)
to_chat(src, "<span class='danger'> LOOC is globally muted</span>")
return
if(prefs.muted & MUTE_OOC)
to_chat(src, "<span class='danger'> You cannot use OOC (muted).</span>")
if((msg[1] in list(".",";",":","#")) || findtext_char(msg, "say", 1, 5))
if(alert("Your message \"[raw_msg]\" looks like it was meant for in game communication, say it in LOOC?", "Meant for LOOC?", "Yes", "No") != "Yes")
return

if(!holder)
if(handle_spam_prevention(msg,MUTE_OOC))
return
if(findtext(msg, "byond://"))
to_chat(src, "<B>Advertising other servers is not allowed.</B>")
to_chat(src, span_bold("Advertising other servers is not allowed."))
log_admin("[key_name(src)] has attempted to advertise in LOOC: [msg]")
message_admins("[key_name_admin(src)] has attempted to advertise in LOOC: [msg]")
return
if(mob.stat)
to_chat(src, "<span class='danger'>You cannot salt in LOOC while unconscious or dead.</span>")
to_chat(src, span_danger("You cannot use LOOC while unconscious or dead."))
return
if(istype(mob, /mob/dead))
to_chat(src, "<span class='danger'>You cannot use LOOC while ghosting.</span>")
to_chat(src, span_danger("You cannot use LOOC while ghosting."))
return

msg = emoji_parse(msg)
if(!(prefs.chat_toggles & CHAT_LOOC))
to_chat(src, span_danger("You have OOC muted."))
return

mob.log_talk(msg,LOG_OOC, tag="(LOOC)")
mob.log_talk(raw_msg, LOG_LOOC, tag = "(LOOC)")

var/list/heard = get_hearers_in_view(7, get_top_level_mob(src.mob))
for(var/mob/M in heard)
if(!M.client)
continue
var/client/C = M.client
if (C in GLOB.admins)
continue //they are handled after that

if (isobserver(M))
continue //Also handled later.
if(key in C.prefs.ignoring)
continue

if(holder?.fakekey in C.prefs.ignoring)
continue

if(!(C.prefs.chat_toggles & CHAT_LOOC))
continue

//Handled before admins so that they see this if they're in range anyways
if(C.prefs.chat_on_map && mob.invisibility <= M.see_invisible)
M.create_chat_message(mob, null, "\[LOOC: [raw_msg]\]", null, LOOC_MESSAGE)

if(C in GLOB.admins)
continue //handled in the next loop

if(C.prefs.toggles & CHAT_OOC)
if(GLOB.LOOC_COLOR)
to_chat(C, "<font color='[GLOB.LOOC_COLOR]'><b><span class='prefix'>LOOC:</span> <EM>[src.mob.name]:</EM> <span class='message'>[msg]</span></b></font>")
else
to_chat(C, "<span class='looc'><span class='prefix'>LOOC:</span> <EM>[src.mob.name]:</EM> <span class='message'>[msg]</span></span>")
if(GLOB.LOOC_COLOR)
to_chat(C, "<span class='loocplain'><font color='[GLOB.LOOC_COLOR]'><b><span class='prefix'>LOOC:</span> <EM>[src.mob.name]:</EM> <span class='message'>[msg]</span></b></font></span>", MESSAGE_TYPE_LOOC)
else
to_chat(C, "<span class='looc'><span class='prefix'>LOOC:</span> <EM>[src.mob.name]:</EM> <span class='message'>[msg]</span></span>", MESSAGE_TYPE_LOOC)

for(var/client/C in GLOB.admins)
if(C.prefs.toggles & CHAT_OOC)
var/prefix = "(R)LOOC"
if (C.mob in heard)
prefix = "LOOC"
if(GLOB.LOOC_COLOR)
to_chat(C, "<font color='[GLOB.LOOC_COLOR]'><b>[ADMIN_FLW(usr)] <span class='prefix'>[prefix]:</span> <EM>[src.key]/[src.mob.name]:</EM> <span class='message'>[msg]</span></b></font>")
else
to_chat(C, "<span class='looc'>[ADMIN_FLW(usr)] <span class='prefix'>[prefix]:</span> <EM>[src.key]/[src.mob.name]:</EM> <span class='message'>[msg]</span></span>")
if(key in C.prefs.ignoring)
continue

if(holder?.fakekey in C.prefs.ignoring)
continue

if(!(C.prefs.chat_toggles & CHAT_LOOC))
continue

var/prefix = "(R)LOOC"
if (C.mob in heard)
prefix = "LOOC"
if(GLOB.LOOC_COLOR)
to_chat(C, "<span class='loocplain'><font color='[GLOB.LOOC_COLOR]'><b>[ADMIN_FLW(usr)] <span class='prefix'>[prefix]:</span> <EM>[src.key]/[src.mob.name]:</EM> <span class='message'>[msg]</span></b></font></span>", MESSAGE_TYPE_LOOC)
else
to_chat(C, "<span class='looc'>[ADMIN_FLW(usr)] <span class='prefix'>[prefix]:</span> <EM>[src.key]/[src.mob.name]:</EM> <span class='message'>[msg]</span></span>", MESSAGE_TYPE_LOOC)

/proc/toggle_looc(toggle = null)
if(toggle == null)
GLOB.looc_allowed = !GLOB.looc_allowed
return
if(toggle != GLOB.looc_allowed)
GLOB.looc_allowed = toggle

/client/proc/set_looc(newColor as color)
set name = "Set Player LOOC Color"
set desc = "Modifies player LOOC Color"
set category = "Server"
GLOB.LOOC_COLOR = sanitize_ooccolor(newColor)
29 changes: 9 additions & 20 deletions code/modules/client/verbs/ooc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,23 +69,23 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
if(holder)
if(!holder.fakekey || C.holder)
if(check_rights_for(src, R_ADMIN))
to_chat(C, "<span class='adminooc'>[CONFIG_GET(flag/allow_admin_ooccolor) && prefs.ooccolor ? "<font color=[prefs.ooccolor]>" :"" ]<span class='prefix'>OOC:</span> <EM>[keyname][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message linkify'>[msg]</span></span></font>")
to_chat(C, "<span class='adminooc'>[CONFIG_GET(flag/allow_admin_ooccolor) && prefs.ooccolor ? "<font color=[prefs.ooccolor]>" :"" ]<span class='prefix'>OOC:</span> <EM>[keyname][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message linkify'>[msg]</span></span></font>", MESSAGE_TYPE_OOC)
else
to_chat(C, "<span class='adminobserverooc'><span class='prefix'>OOC:</span> <EM>[keyname][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message linkify'>[msg]</span></span>")
to_chat(C, "<span class='adminobserverooc'><span class='prefix'>OOC:</span> <EM>[keyname][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message linkify'>[msg]</span></span>", MESSAGE_TYPE_OOC)
else
if(GLOB.OOC_COLOR)
to_chat(C, "<font color='[GLOB.OOC_COLOR]'><b><span class='prefix'>OOC:</span> <EM>[holder.fakekey ? holder.fakekey : key]:</EM> <span class='message linkify'>[msg]</span></b></font>")
to_chat(C, "<span class='oocplain'><font color='[GLOB.OOC_COLOR]'><b><span class='prefix'>OOC:</span> <EM>[holder.fakekey ? holder.fakekey : key]:</EM> <span class='message linkify'>[msg]</span></b></font></span>", MESSAGE_TYPE_OOC)
else
to_chat(C, "<span class='ooc'><span class='prefix'>OOC:</span> <EM>[holder.fakekey ? holder.fakekey : key]:</EM> <span class='message linkify'>[msg]</span></span>")
to_chat(C, "<span class='ooc'><span class='prefix'>OOC:</span> <EM>[holder.fakekey ? holder.fakekey : key]:</EM> <span class='message linkify'>[msg]</span></span>", MESSAGE_TYPE_OOC)

else if(!(key in C.prefs.ignoring))
if(GLOB.OOC_COLOR)
if(check_mentor())
to_chat(C, "<font color='["#00b40f"]'><b><span class='prefix'>OOC:</span> <EM>[keyname]:</EM> <span class='message linkify'>[msg]</span></b></font>")
to_chat(C, "<span class='oocplain'><font color='["#00b40f"]'><b><span class='prefix'>OOC:</span> <EM>[keyname]:</EM> <span class='message linkify'>[msg]</span></b></font></span>", MESSAGE_TYPE_OOC)
else
to_chat(C, "<font color='[GLOB.OOC_COLOR]'><b><span class='prefix'>OOC:</span> <EM>[keyname]:</EM> <span class='message linkify'>[msg]</span></b></font>")
to_chat(C, "<span class='oocplain'><font color='[GLOB.OOC_COLOR]'><b><span class='prefix'>OOC:</span> <EM>[keyname]:</EM> <span class='message linkify'>[msg]</span></b></font></span>", MESSAGE_TYPE_OOC)
else
to_chat(C, "<span class='ooc'><span class='prefix'>OOC:</span> <EM>[keyname]:</EM> <span class='message linkify'>[msg]</span></span>")
to_chat(C, "<span class='ooc'><span class='prefix'>OOC:</span> <EM>[keyname]:</EM> <span class='message linkify'>[msg]</span></span>", MESSAGE_TYPE_OOC)

/proc/toggle_ooc(toggle = null)
if(toggle != null) //if we're specifically en/disabling ooc
Expand All @@ -97,17 +97,6 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
GLOB.ooc_allowed = !GLOB.ooc_allowed
to_chat(world, "<B>The OOC channel has been globally [GLOB.ooc_allowed ? "enabled" : "disabled"].</B>")

//BeginWS Edit
/proc/toggle_looc(toggle = null)
if(toggle != null)
if(toggle != GLOB.looc_allowed)
GLOB.looc_allowed = toggle
else
return
else
GLOB.looc_allowed = !GLOB.looc_allowed
//EndWS Edit

/proc/toggle_dooc(toggle = null)
if(toggle != null)
if(toggle != GLOB.dooc_allowed)
Expand Down Expand Up @@ -153,8 +142,8 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
if(!is_content_unlocked())
return

prefs.ooccolor = initial(prefs.ooccolor)
prefs.save_preferences()
prefs.ooccolor = initial(prefs.ooccolor)
prefs.save_preferences()

//Checks admin notice
/client/verb/admin_notice()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mentor/verbs/mentorsay.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

msg = "<span class='[check_rights(R_ADMIN, 0) ? "mentoradmin" : "mentor"]'><span class='boldnotice'>MENTOR:</span> <EM>[key_name(usr, 0, 0)]</EM>: <span class='message'>[msg]</span></span>"
to_chat(GLOB.mentors,
type = MESSAGE_TYPE_MODCHAT,
html = msg,
msg,
MESSAGE_TYPE_MENTORCHAT,
confidential = TRUE)

SSblackbox.record_feedback("tally", "mentor_verb", 1, "Msay") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/say_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@


/*
SUBTLER //WS - Subtle emotes
SUBTLER
*/

/datum/emote/living/subtler
Expand Down
Binary file modified icons/UI_Icons/chat/chat_icons.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions interface/stylesheet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ em {font-style: normal; font-weight: bold;}
.prefix { font-weight: bold;}

.ooc { font-weight: bold;}
.looc { font-weight: bold;}
.adminobserverooc {color: #0099cc; font-weight: bold;}
.adminooc {color: #700038; font-weight: bold;}

Expand Down
15 changes: 11 additions & 4 deletions tgui/packages/tgui-panel/chat/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ export const MESSAGE_TYPE_INFO = 'info';
export const MESSAGE_TYPE_WARNING = 'warning';
export const MESSAGE_TYPE_DEADCHAT = 'deadchat';
export const MESSAGE_TYPE_OOC = 'ooc';
export const MESSAGE_TYPE_LOOC = 'looc';
export const MESSAGE_TYPE_ADMINPM = 'adminpm';
export const MESSAGE_TYPE_COMBAT = 'combat';
export const MESSAGE_TYPE_ADMINCHAT = 'adminchat';
export const MESSAGE_TYPE_MODCHAT = 'modchat';
export const MESSAGE_TYPE_MENTORCHAT = 'mentorchat';
export const MESSAGE_TYPE_PRAYER = 'prayer';
export const MESSAGE_TYPE_EVENTCHAT = 'eventchat';
export const MESSAGE_TYPE_ADMINLOG = 'adminlog';
Expand Down Expand Up @@ -88,6 +89,12 @@ export const MESSAGE_TYPES = [
description: 'The bluewall of global OOC messages',
selector: '.ooc, .adminooc, .adminobserverooc, .oocplain',
},
{
type: MESSAGE_TYPE_LOOC,
name: 'LOOC',
description: 'The bluewall of local LOOC messages',
selector: '.looc, .loocplain',
},
{
type: MESSAGE_TYPE_ADMINPM,
name: 'Admin PMs',
Expand All @@ -114,10 +121,10 @@ export const MESSAGE_TYPES = [
admin: true,
},
{
type: MESSAGE_TYPE_MODCHAT,
name: 'Mod Chat',
type: MESSAGE_TYPE_MENTORCHAT,
name: 'Mentor Chat',
description: 'MSAY messages',
selector: '.mod_channel',
selector: '.mentor, .mentoradmin',
admin: true,
},
{
Expand Down
Loading

0 comments on commit 158d192

Please sign in to comment.