From 39ca7ad1fa93377b08b520c9dc8f54c28d1e51cc Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Fri, 7 May 2021 09:32:09 +0800 Subject: [PATCH] Sorts the majority of the rest of the Skyrat specific unsorted chat (#5378) * yay * forgot to commit this * Update tgui/packages/tgui-panel/chat/constants.js Co-authored-by: Gandalf --- code/datums/emotes.dm | 4 ++-- modular_skyrat/modules/admin/code/aooc.dm | 4 ++-- modular_skyrat/modules/admin/code/sooc.dm | 4 ++-- .../combat_indicator/code/combat_indicator.dm | 2 +- .../objects/structures/ghost_role_spawners.dm | 4 ++-- .../code/datum/gunpoint/gunpoint_datum.dm | 6 +++--- .../modules/mob/hostile/true_changeling.dm | 8 ++++---- .../modules/mentor/code/mentorhelp.dm | 4 ++-- .../modules/mentor/code/mentorpm.dm | 20 +++++++++---------- .../modules/mentor/code/mentorsay.dm | 4 ++-- .../modules/mentor/code/mentorwho.dm | 2 +- .../modules/client/preferences_toggles.dm | 2 +- .../verbs/code/modules/client/verbs/looc.dm | 4 ++-- tgui/packages/tgui-panel/chat/constants.js | 2 +- 14 files changed, 35 insertions(+), 35 deletions(-) diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index c2083d2d543..9d3d324900b 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -82,10 +82,10 @@ if(emote_type == EMOTE_AUDIBLE) //SKYRAT EDIT CHANGE BEGIN //user.audible_message(msg, audible_message_flags = EMOTE_MESSAGE) - SKYRAT EDIT - ORIGINAL - user.audible_message(msg, deaf_message = "You see how [user] [msg]", audible_message_flags = EMOTE_MESSAGE) + user.audible_message(msg, deaf_message = "You see how [user] [msg]", audible_message_flags = EMOTE_MESSAGE) else //user.visible_message(msg, visible_message_flags = EMOTE_MESSAGE) - SKYRAT EDIT - ORIGINAL - user.visible_message(msg, blind_message = "You hear how [user] [msg]", visible_message_flags = EMOTE_MESSAGE) + user.visible_message(msg, blind_message = "You hear how [user] [msg]", visible_message_flags = EMOTE_MESSAGE) //SKYRAT EDIT CHANGE END /// For handling emote cooldown, return true to allow the emote to happen diff --git a/modular_skyrat/modules/admin/code/aooc.dm b/modular_skyrat/modules/admin/code/aooc.dm index d5e3ed7c4a5..f4948c3d31d 100644 --- a/modular_skyrat/modules/admin/code/aooc.dm +++ b/modular_skyrat/modules/admin/code/aooc.dm @@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(ckey_to_aooc_name) var/mode = listeners[c] var/color = (!anon && CONFIG_GET(flag/allow_admin_ooccolor) && C.prefs.ooccolor) ? C.prefs.ooccolor : GLOB.AOOC_COLOR var/name = (mode == AOOC_LISTEN_ADMIN && anon) ? "([key])[keyname]" : keyname - to_chat(C, "AOOC: [name]: [msg]") + to_chat(C, "AOOC: [name]: [msg]") #undef AOOC_LISTEN_PLAYER #undef AOOC_LISTEN_ADMIN @@ -101,7 +101,7 @@ GLOBAL_LIST_EMPTY(ckey_to_aooc_name) listeners[M.client] = TRUE for(var/c in listeners) var/client/C = c - to_chat(C, "The AOOC channel has been globally [GLOB.aooc_allowed ? "enabled" : "disabled"].") + to_chat(C, "The AOOC channel has been globally [GLOB.aooc_allowed ? "enabled" : "disabled"].") /datum/admins/proc/toggleaooc() set category = "Server" diff --git a/modular_skyrat/modules/admin/code/sooc.dm b/modular_skyrat/modules/admin/code/sooc.dm index adabbf95378..016050087a9 100644 --- a/modular_skyrat/modules/admin/code/sooc.dm +++ b/modular_skyrat/modules/admin/code/sooc.dm @@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(ckey_to_sooc_name) var/mode = listeners[c] var/color = (!anon && CONFIG_GET(flag/allow_admin_ooccolor) && C.prefs.ooccolor) ? C.prefs.ooccolor : GLOB.SOOC_COLOR var/name = (mode == SOOC_LISTEN_ADMIN && anon) ? "([key])[keyname]" : keyname - to_chat(C, "SOOC: [name]: [msg]") + to_chat(C, "SOOC: [name]: [msg]") #undef SOOC_LISTEN_PLAYER #undef SOOC_LISTEN_ADMIN @@ -101,7 +101,7 @@ GLOBAL_LIST_EMPTY(ckey_to_sooc_name) listeners[M.client] = TRUE for(var/c in listeners) var/client/C = c - to_chat(C, "The SOOC channel has been globally [GLOB.sooc_allowed ? "enabled" : "disabled"].") + to_chat(C, "The SOOC channel has been globally [GLOB.sooc_allowed ? "enabled" : "disabled"].") /datum/admins/proc/togglesooc() set category = "Server" diff --git a/modular_skyrat/modules/combat_indicator/code/combat_indicator.dm b/modular_skyrat/modules/combat_indicator/code/combat_indicator.dm index d2edccab722..c05dcfabbc8 100644 --- a/modular_skyrat/modules/combat_indicator/code/combat_indicator.dm +++ b/modular_skyrat/modules/combat_indicator/code/combat_indicator.dm @@ -30,7 +30,7 @@ GLOBAL_VAR_INIT(combat_indicator_overlay, GenerateCombatOverlay()) nextcombatpopup = world.time + COMBAT_NOTICE_COOLDOWN playsound(src, 'sound/machines/chime.ogg', 10, ignore_walls = FALSE) flick_emote_popup_on_mob("combat", 20) - visible_message("[src] gets ready for combat!") + visible_message("[src] gets ready for combat!") add_overlay(GLOB.combat_indicator_overlay) combat_indicator = TRUE src.log_message("has turned ON the combat indicator!", INDIVIDUAL_ATTACK_LOG) diff --git a/modular_skyrat/modules/ghostcafe/code/game/objects/structures/ghost_role_spawners.dm b/modular_skyrat/modules/ghostcafe/code/game/objects/structures/ghost_role_spawners.dm index 08568c4328f..91208c41cd3 100644 --- a/modular_skyrat/modules/ghostcafe/code/game/objects/structures/ghost_role_spawners.dm +++ b/modular_skyrat/modules/ghostcafe/code/game/objects/structures/ghost_role_spawners.dm @@ -34,7 +34,7 @@ /area/centcom/holding/cafebuild, /area/centcom/holding/cafevox, /area/centcom/holding/cafedorms, /area/centcom/holding/cafepark, /area/centcom/holding/cafeplumbing)) ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT) ADD_TRAIT(new_spawn, TRAIT_FREE_GHOST, GHOSTROLE_TRAIT) - to_chat(new_spawn,"Ghosting is free!") + to_chat(new_spawn,"Ghosting is free!") var/datum/action/toggle_dead_chat_mob/D = new(new_spawn) D.Grant(new_spawn) @@ -64,7 +64,7 @@ /area/centcom/holding/cafebuild, /area/centcom/holding/cafevox, /area/centcom/holding/cafedorms, /area/centcom/holding/cafepark, /area/centcom/holding/cafeplumbing)) ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT) ADD_TRAIT(new_spawn, TRAIT_FREE_GHOST, GHOSTROLE_TRAIT) - to_chat(new_spawn,"Ghosting is free!") + to_chat(new_spawn,"Ghosting is free!") //to_chat(new_spawn,"Be warned: People who opt out of EORG will come here. Do not make the area uninhabitable and do NOT commit EORG. This is a safe-zone. If you attack people in EORG, you will be banned for griefing.") var/datum/action/toggle_dead_chat_mob/D = new(new_spawn) D.Grant(new_spawn) diff --git a/modular_skyrat/modules/gunpoint/code/datum/gunpoint/gunpoint_datum.dm b/modular_skyrat/modules/gunpoint/code/datum/gunpoint/gunpoint_datum.dm index e702e801257..b914d7b91e6 100644 --- a/modular_skyrat/modules/gunpoint/code/datum/gunpoint/gunpoint_datum.dm +++ b/modular_skyrat/modules/gunpoint/code/datum/gunpoint/gunpoint_datum.dm @@ -92,8 +92,8 @@ locked = TRUE log_combat(target, source, "locked onto with aiming") playsound(get_turf(source), 'modular_skyrat/modules/gunpoint/sound/targeton.ogg', 50,1) - to_chat(source, "You lock onto [target.name]!") - target.visible_message("[source.name] holds [target.name] at gunpoint with the [aimed_gun.name]!", "[source.name] holds you at gunpoint with the [aimed_gun.name]!") + to_chat(source, "You lock onto [target.name]!") + target.visible_message("[source.name] holds [target.name] at gunpoint with the [aimed_gun.name]!", "[source.name] holds you at gunpoint with the [aimed_gun.name]!") if(target.gunpointed.len == 1)//First case to_chat(target, "You'll get shot if you use radio, move or interact with items!") to_chat(target, "You can however take items out, toss harmless items or drop them.") @@ -131,7 +131,7 @@ source.gunpointing = null if(locked) QDEL_NULL(gunpoint_gui) - target.visible_message("[source.name] no longer holds [target.name] at gunpoint.", "[source.name] no longer holds you at gunpoint.") + target.visible_message("[source.name] no longer holds [target.name] at gunpoint.", "[source.name] no longer holds you at gunpoint.") source = null target = null aimed_gun = null diff --git a/modular_skyrat/modules/horrorform/code/modules/mob/hostile/true_changeling.dm b/modular_skyrat/modules/horrorform/code/modules/mob/hostile/true_changeling.dm index cfa4b15e5b0..6361d155af7 100644 --- a/modular_skyrat/modules/horrorform/code/modules/mob/hostile/true_changeling.dm +++ b/modular_skyrat/modules/horrorform/code/modules/mob/hostile/true_changeling.dm @@ -38,9 +38,9 @@ var/datum/action/innate/turn_to_human var/datum/action/innate/devour var/transformed_time = 0 - var/playstyle_string = "We have entered our true form! We are unbelievably powerful, and regenerate life at a steady rate. However, most of \ + var/playstyle_string = "We have entered our true form! We are unbelievably powerful, and regenerate life at a steady rate. However, most of \ our abilities are useless in this form, and we must utilise the abilities that we have gained as a result of our transformation. Currently, we are incapable of returning to a human. \ - After several minutes, we will once again be able to revert into a human. Taking too much damage will cause us to reach equilibrium and our cells will combust into a shower of gore, watch out!" + After several minutes, we will once again be able to revert into a human. Taking too much damage will cause us to reach equilibrium and our cells will combust into a shower of gore, watch out!" var/mob/living/carbon/human/stored_changeling = null //The changeling that transformed var/devouring = FALSE //If the true changeling is currently devouring a human @@ -71,7 +71,7 @@ if(stat) return if(act == "scream") - message = "[src] makes a loud, bone-chilling roar!" + message = "[src] makes a loud, bone-chilling roar!" act = "me" scream(message) return @@ -79,7 +79,7 @@ /mob/living/simple_animal/hostile/true_changeling/proc/scream(message) if(!message) - message = "[src] makes a loud, bone-chilling roar!" + message = "[src] makes a loud, bone-chilling roar!" var/frequency = get_rand_frequency() //so sound frequency is consistent for(var/mob/M in range(35, src)) //You can hear the scream 7 screens away // Double check for client diff --git a/modular_skyrat/modules/mentor/code/mentorhelp.dm b/modular_skyrat/modules/mentor/code/mentorhelp.dm index 9e1d3e8a01d..77862499537 100644 --- a/modular_skyrat/modules/mentor/code/mentorhelp.dm +++ b/modular_skyrat/modules/mentor/code/mentorhelp.dm @@ -15,7 +15,7 @@ return var/show_char = CONFIG_GET(flag/mentors_mobname_only) - var/mentor_msg = "MENTORHELP: [key_name_mentor(src, 1, 0, 1, show_char)]: [msg]" + var/mentor_msg = "MENTORHELP: [key_name_mentor(src, 1, 0, 1, show_char)]: [msg]" log_mentor("MENTORHELP: [key_name_mentor(src, 0, 0, 0, 0)]: [msg]") for(var/it in GLOB.mentors) @@ -23,7 +23,7 @@ SEND_SOUND(X, 'sound/items/bikehorn.ogg') to_chat(X, mentor_msg) - to_chat(src, "PM to-Mentors: [msg]") + to_chat(src, "PM to-Mentors: [msg]") return /proc/get_mentor_counts() diff --git a/modular_skyrat/modules/mentor/code/mentorpm.dm b/modular_skyrat/modules/mentor/code/mentorpm.dm index fce7c475287..7e6684ce2ee 100644 --- a/modular_skyrat/modules/mentor/code/mentorpm.dm +++ b/modular_skyrat/modules/mentor/code/mentorpm.dm @@ -32,7 +32,7 @@ return if(is_mentor(whom)) - to_chat(GLOB.mentors, "[src] has started replying to [whom]'s mhelp.") + to_chat(GLOB.mentors, "[src] has started replying to [whom]'s mhelp.") //get message text, limit it's length.and clean/escape html if(!msg) @@ -40,7 +40,7 @@ if(!msg) if (is_mentor(whom)) - to_chat(GLOB.mentors, "[src] has stopped their reply to [whom]'s mhelp.") + to_chat(GLOB.mentors, "[src] has stopped their reply to [whom]'s mhelp.") return if(!C) @@ -57,7 +57,7 @@ msg = sanitize(copytext_char(msg, 1, MAX_MESSAGE_LEN)) if(!msg) if (is_mentor(whom)) - to_chat(GLOB.mentors, "[src] has stopped their reply to [whom]'s mhelp.") + to_chat(GLOB.mentors, "[src] has stopped their reply to [whom]'s mhelp.") return log_mentor("Mentor PM: [key_name(src)]->[key_name(C)]: [msg]") @@ -66,17 +66,17 @@ var/show_char = CONFIG_GET(flag/mentors_mobname_only) if(C.is_mentor()) if(is_mentor())//both are mentors - to_chat(C, "Mentor PM from-[key_name_mentor(src, C, 1, 0, 0)]: [msg]") - to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, 0)]: [msg]") + to_chat(C, "Mentor PM from-[key_name_mentor(src, C, 1, 0, 0)]: [msg]") + to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, 0)]: [msg]") else //recipient is a mentor but sender is not - to_chat(C, "Reply PM from-[key_name_mentor(src, C, 1, 0, show_char)]: [msg]") - to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, 0)]: [msg]") + to_chat(C, "Reply PM from-[key_name_mentor(src, C, 1, 0, show_char)]: [msg]") + to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, 0)]: [msg]") else if(is_mentor()) //sender is a mentor but recipient is not. - to_chat(C, "Mentor PM from-[key_name_mentor(src, C, 1, 0, 0)]: [msg]") - to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, show_char)]: [msg]") + to_chat(C, "Mentor PM from-[key_name_mentor(src, C, 1, 0, 0)]: [msg]") + to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, show_char)]: [msg]") //we don't use message_Mentors here because the sender/receiver might get it too var/show_char_sender = !is_mentor() && CONFIG_GET(flag/mentors_mobname_only) @@ -84,4 +84,4 @@ for(var/it in GLOB.mentors) var/client/X = it if(X.key!=key && X.key!=C.key) //check client/X is an Mentor and isn't the sender or recipient - to_chat(X, "Mentor PM: [key_name_mentor(src, X, 0, 0, show_char_sender)]->[key_name_mentor(C, X, 0, 0, show_char_recip)]: [msg]") //inform X + to_chat(X, "Mentor PM: [key_name_mentor(src, X, 0, 0, show_char_sender)]->[key_name_mentor(C, X, 0, 0, show_char_recip)]: [msg]") //inform X diff --git a/modular_skyrat/modules/mentor/code/mentorsay.dm b/modular_skyrat/modules/mentor/code/mentorsay.dm index b69ce29047d..080bad4a871 100644 --- a/modular_skyrat/modules/mentor/code/mentorsay.dm +++ b/modular_skyrat/modules/mentor/code/mentorsay.dm @@ -13,7 +13,7 @@ log_mentor("MSAY: [key_name(src)] : [msg]") if(check_rights_for(src, R_ADMIN,0)) - msg = "MENTOR: [key_name(src, 0, 0)]: [msg]" + msg = "MENTOR: [key_name(src, 0, 0)]: [msg]" else - msg = "MENTOR: [key_name(src, 0, 0)]: [msg]" + msg = "MENTOR: [key_name(src, 0, 0)]: [msg]" to_chat(GLOB.admins | GLOB.mentors, msg) diff --git a/modular_skyrat/modules/mentor/code/mentorwho.dm b/modular_skyrat/modules/mentor/code/mentorwho.dm index b374a078232..500a5587bb2 100644 --- a/modular_skyrat/modules/mentor/code/mentorwho.dm +++ b/modular_skyrat/modules/mentor/code/mentorwho.dm @@ -18,5 +18,5 @@ if(C.is_afk()) suffix += " (AFK)" - msg += "\t[C][suffix]\n" + msg += "\t[C][suffix]\n" to_chat(src, msg) diff --git a/modular_skyrat/modules/verbs/code/modules/client/preferences_toggles.dm b/modular_skyrat/modules/verbs/code/modules/client/preferences_toggles.dm index 7f0b441b23b..cc2abd1a36d 100644 --- a/modular_skyrat/modules/verbs/code/modules/client/preferences_toggles.dm +++ b/modular_skyrat/modules/verbs/code/modules/client/preferences_toggles.dm @@ -5,5 +5,5 @@ set desc = "Toggles seeing LocalOutOfCharacter chat" usr.client.prefs.skyrat_toggles ^= CHAT_LOOC usr.client.prefs.save_preferences() - to_chat(usr, "You will [(usr.client.prefs.skyrat_toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.") + to_chat(usr, "You will [(usr.client.prefs.skyrat_toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Seeing LOOC", "[usr.client.prefs.skyrat_toggles & CHAT_LOOC ? "Enabled" : "Disabled"]")) diff --git a/modular_skyrat/modules/verbs/code/modules/client/verbs/looc.dm b/modular_skyrat/modules/verbs/code/modules/client/verbs/looc.dm index 6c0f7f64989..91a2a9ee1c5 100644 --- a/modular_skyrat/modules/verbs/code/modules/client/verbs/looc.dm +++ b/modular_skyrat/modules/verbs/code/modules/client/verbs/looc.dm @@ -21,7 +21,7 @@ if(handle_spam_prevention(msg,MUTE_OOC)) return if(findtext(msg, "byond://")) - to_chat(src, "Advertising other servers is not allowed.") + to_chat(src, "Advertising other servers is not allowed.") log_admin("[key_name(src)] has attempted to advertise in LOOC: [msg]") return if(mob.stat) @@ -65,5 +65,5 @@ return prefs.skyrat_toggles ^= CHAT_LOOC_ADMIN prefs.save_preferences() - to_chat(usr, "You will [(prefs.skyrat_toggles & CHAT_LOOC_ADMIN) ? "now" : "no longer"] hear LOOC globally.") + to_chat(usr, "You will [(prefs.skyrat_toggles & CHAT_LOOC_ADMIN) ? "now" : "no longer"] hear LOOC globally.") SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Togle Admin LOOC", "[usr.client.prefs.skyrat_toggles & CHAT_LOOC_ADMIN ? "Enabled" : "Disabled"]")) diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js index 3719c8618bd..9ee44791473 100644 --- a/tgui/packages/tgui-panel/chat/constants.js +++ b/tgui/packages/tgui-panel/chat/constants.js @@ -82,7 +82,7 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_OOC, name: 'OOC', description: 'The bluewall of global OOC messages', - selector: '.ooc, .adminooc, .oocplain, .looc', + selector: '.ooc, .adminooc, .oocplain, .looc, .rlooc', }, { type: MESSAGE_TYPE_ADMINPM,