From a2eaebb7a70943590be5fd1ffe1ce885ea59c772 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 8 Apr 2021 15:17:11 +0200 Subject: [PATCH] [MIRROR] Reduces the amount of unsorted chat messages (#4742) * Reduces the amount of unsorted chat messages (#58192) * Reduces the amount of unsorted chat messages Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com> --- code/controllers/subsystem/vote.dm | 4 ++-- code/game/objects/items/devices/PDA/PDA.dm | 2 +- code/modules/assembly/bomb.dm | 2 +- code/modules/assembly/health.dm | 2 +- code/modules/assembly/infrared.dm | 2 +- code/modules/assembly/proximity.dm | 2 +- code/modules/assembly/signaler.dm | 2 +- code/modules/assembly/timer.dm | 2 +- code/modules/vehicles/mecha/_mecha.dm | 2 +- tgui/packages/tgui-panel/chat/constants.js | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index ac81950c002..db256efd10c 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -109,7 +109,7 @@ SUBSYSTEM_DEF(vote) text += "Vote Result: Inconclusive - No Votes!" log_vote(text) remove_action_buttons() - to_chat(world, "\n[text]") + to_chat(world, "\n[text]") return . /datum/controller/subsystem/vote/proc/result() @@ -232,7 +232,7 @@ SUBSYSTEM_DEF(vote) text += "\n[question]" log_vote(text) var/vp = CONFIG_GET(number/vote_period) - to_chat(world, "\n[text]\nType vote or click here to place your votes.\nYou have [DisplayTimeText(vp)] to vote.") + to_chat(world, "\n[text]\nType vote or click here to place your votes.\nYou have [DisplayTimeText(vp)] to vote.") time_remaining = round(vp/10) for(var/c in GLOB.clients) var/client/C = c diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index de7d283e202..bcaddee5da8 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -798,7 +798,7 @@ GLOBAL_LIST_EMPTY(PDAs) playsound(src, pick('sound/machines/twobeep_voice1.ogg', 'sound/machines/twobeep_voice2.ogg'), 50, TRUE) else playsound(src, 'sound/machines/twobeep_high.ogg', 50, TRUE) - audible_message("[icon2html(src, hearers(src))] *[ttone]*", null, 3) + audible_message("[icon2html(src, hearers(src))] *[ttone]*", null, 3) //Search for holder of the PDA. var/mob/living/L = null if(loc && isliving(loc)) diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index eaeef57dd5f..b89b2a2a776 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -69,7 +69,7 @@ return /obj/item/onetankbomb/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here. - audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*") + audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*") playsound(src, 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) sleep(10) if(QDELETED(src)) diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm index d2bc2036bd7..d50808971b0 100644 --- a/code/modules/assembly/health.dm +++ b/code/modules/assembly/health.dm @@ -53,7 +53,7 @@ health_scan = M.health if(health_scan <= alarm_health) pulse() - audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*") + audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*") playsound(src, 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) toggle_scan() return diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index edc0fdb7a9d..a31ccd97a4d 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -152,7 +152,7 @@ if(!secured || !on || next_activate > world.time) return FALSE pulse(FALSE) - audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) + audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) for(var/CHM in get_hearers_in_view(hearing_range, src)) if(ismob(CHM)) var/mob/LM = CHM diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 60a9b2618c8..1f751475a68 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -65,7 +65,7 @@ if(!scanning || !secured || next_activate > world.time) return FALSE pulse(FALSE) - audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) + audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) for(var/CHM in get_hearers_in_view(hearing_range, src)) if(ismob(CHM)) var/mob/LM = CHM diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 1a2a9243b84..2361bf4b2fb 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -151,7 +151,7 @@ last_receive_signal_log = istype(holder, /obj/item/transfer_valve) ? signal.logging_data : null pulse(TRUE) - audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) + audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) for(var/CHM in get_hearers_in_view(hearing_range, src)) if(ismob(CHM)) var/mob/LM = CHM diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index d860e0a1d47..093550b7825 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -57,7 +57,7 @@ if(!secured || next_activate > world.time) return FALSE pulse(FALSE) - audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) + audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*", null, hearing_range) for(var/CHM in get_hearers_in_view(hearing_range, src)) if(ismob(CHM)) var/mob/LM = CHM diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index 366b8e58572..91627efdaba 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -863,7 +863,7 @@ AI.cancel_camera() AI.controlled_mech = src AI.remote_control = src - to_chat(AI, AI.can_dominate_mechs ? "Takeover of [name] complete! You are now loaded onto the onboard computer. Do not attempt to leave the station sector!" :\ + to_chat(AI, AI.can_dominate_mechs ? "Takeover of [name] complete! You are now loaded onto the onboard computer. Do not attempt to leave the station sector!" :\ "You have been uploaded to a mech's onboard computer.") to_chat(AI, "Use Middle-Mouse to activate mech functions and equipment. Click normally for AI interactions.") diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js index fd6db1d5f77..456f1f21f84 100644 --- a/tgui/packages/tgui-panel/chat/constants.js +++ b/tgui/packages/tgui-panel/chat/constants.js @@ -64,7 +64,7 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_INFO, name: 'Info', description: 'Non-urgent messages from the game and items', - selector: '.notice:not(.pm), .adminnotice, .info, .sinister, .cult, .infoplain', + selector: '.notice:not(.pm), .adminnotice, .info, .sinister, .cult, .infoplain, .announce', }, { type: MESSAGE_TYPE_WARNING,