From ff2f6abe83d952a3a86f595f69f51b170a9fc2e3 Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Wed, 5 May 2021 10:57:40 +0800 Subject: [PATCH] Sort the majority of the rest of the unsorted chat (#58821) * FINALLY IT IS DONE FUCK * tip of the round into ooc * adds cyopod chat messages to the info chat filter * last one I promise probably, mob spawner messages to info filter * holoparasite, round will start in x and keybinding conflict to respective filters * removed motd from constants, made it infoplain surrounded instead * changed info to infoplain --- code/__HELPERS/roundend.dm | 4 +- code/controllers/subsystem/job.dm | 8 +-- code/controllers/subsystem/ticker.dm | 4 +- code/datums/emotes.dm | 2 +- code/datums/helper_datums/getrev.dm | 2 +- code/datums/mind.dm | 2 +- code/datums/mutations/speech.dm | 2 +- code/game/gamemodes/game_mode.dm | 4 +- code/game/machinery/cryopod.dm | 8 +-- code/game/objects/items/cigs_lighters.dm | 2 +- code/game/objects/items/extinguisher.dm | 2 +- code/game/objects/items/robot/robot_items.dm | 12 ++-- code/game/objects/items/stacks/medical.dm | 6 +- code/game/objects/items/wayfinding.dm | 2 +- .../objects/structures/ghost_role_spawners.dm | 10 +-- code/modules/admin/admin.dm | 8 +-- code/modules/antagonists/brother/brother.dm | 2 +- code/modules/antagonists/cult/cult.dm | 11 ++- .../eldritch_cult/eldritch_antag.dm | 5 +- code/modules/antagonists/ert/ert.dm | 31 ++++---- code/modules/antagonists/fugitive/fugitive.dm | 37 +++++----- code/modules/antagonists/nukeop/nukeop.dm | 6 +- .../traitor/IAA/internal_affairs.dm | 4 +- code/modules/antagonists/wizard/wizard.dm | 14 ++-- .../asset_cache/transports/asset_transport.dm | 2 +- code/modules/awaymissions/corpse.dm | 4 +- code/modules/client/preferences_savefile.dm | 4 +- code/modules/client/preferences_toggles.dm | 72 +++++++++---------- code/modules/client/verbs/ooc.dm | 24 +++---- code/modules/mafia/roles.dm | 2 +- code/modules/mob/living/living.dm | 2 +- .../mob/living/simple_animal/bot/medbot.dm | 4 +- .../living/simple_animal/guardian/guardian.dm | 12 ++-- code/modules/mob/mob.dm | 2 +- .../photography/camera/silicon_camera.dm | 12 ++-- interface/stylesheet.dm | 3 +- tgui/packages/tgui-panel/chat/constants.js | 10 +-- .../tgui-panel/styles/goon/chat-dark.scss | 2 +- .../tgui-panel/styles/goon/chat-light.scss | 2 +- 39 files changed, 174 insertions(+), 171 deletions(-) diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index c7726f9f328..deb86712f36 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -205,7 +205,7 @@ /datum/controller/subsystem/ticker/proc/declare_completion() set waitfor = FALSE - to_chat(world, "


The round has ended.") + to_chat(world, "


The round has ended.") log_game("The round has ended.") for(var/I in round_end_events) @@ -661,7 +661,7 @@ var/datum/action/report/R = new C.player_details.player_actions += R R.Grant(C.mob) - to_chat(C,"Show roundend report again") + to_chat(C,"Show roundend report again") /datum/action/report name = "Show roundend report" diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 818b4e9cd69..42d34b78824 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -504,7 +504,7 @@ SUBSYSTEM_DEF(job) if(living_mob.mind) living_mob.mind.assigned_role = rank - to_chat(M, "You are the [rank].") + to_chat(M, "You are the [rank].") if(job) var/new_mob = job.equip(living_mob, null, null, joined_late , null, M.client, is_captain)//silicons override this proc to return a mob if(ismob(new_mob)) @@ -522,10 +522,10 @@ SUBSYSTEM_DEF(job) else handle_auto_deadmin_roles(M.client, rank) - to_chat(M, "As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this.") + to_chat(M, "As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this.") job.radio_help_message(M) if(job.req_admin_notify) - to_chat(M, "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.") + to_chat(M, "You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.") if(CONFIG_GET(number/minimal_access_threshold)) to_chat(M, "As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.") @@ -646,7 +646,7 @@ SUBSYSTEM_DEF(job) if(PopcapReached()) JobDebug("Popcap overflow Check observer located, Player: [player]") JobDebug("Player rejected :[player]") - to_chat(player, "You have failed to qualify for any job you desired.") + to_chat(player, "You have failed to qualify for any job you desired.") unassigned -= player player.ready = PLAYER_NOT_READY diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 75f91684718..826ae161c17 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -154,7 +154,7 @@ SUBSYSTEM_DEF(ticker) start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10) for(var/client/C in GLOB.clients) window_flash(C, ignorepref = TRUE) //let them know lobby has opened up. - to_chat(world, "Welcome to [station_name()]!") + to_chat(world, "Welcome to [station_name()]!") send2chat("New round starting on [SSmapping.config.map_name]!", CONFIG_GET(string/chat_announce_new_game)) current_state = GAME_STATE_PREGAME //Everyone who wants to be an observer is now spawned @@ -501,7 +501,7 @@ SUBSYSTEM_DEF(ticker) m = pick(memetips) if(m) - to_chat(world, "Tip of the round: [html_encode(m)]") + to_chat(world, "Tip of the round: [html_encode(m)]") /datum/controller/subsystem/ticker/proc/check_queue() if(!queued_players.len) diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index d6f82c3b6dc..43de62d0c70 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -70,7 +70,7 @@ continue var/T = get_turf(user) if(M.stat == DEAD && M.client && user.client && (M.client.prefs.chat_toggles & CHAT_GHOSTSIGHT) && !(M in viewers(T, null))) - M.show_message("[FOLLOW_LINK(M, user)] [dchatmsg]") + M.show_message("[FOLLOW_LINK(M, user)] [dchatmsg]") if(emote_type == EMOTE_AUDIBLE) user.audible_message(msg, audible_message_flags = EMOTE_MESSAGE) diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 8a84a5c8733..209ebdd3727 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -123,4 +123,4 @@ if(probabilities[ctag] > 0) var/percentage = round(probabilities[ctag] / sum * 100, 0.1) msg += "[ctag] [percentage]%" - to_chat(src, msg.Join("
")) + to_chat(src, "[msg.Join("
")]") diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 572670f6c5e..a4e6f9d53a0 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -454,7 +454,7 @@ if(window) recipient << browse(output,"window=memory") else if(all_objectives.len || memory) - to_chat(recipient, "[output]") + to_chat(recipient, "[output]") /datum/mind/Topic(href, href_list) if(!check_rights(R_ADMIN)) diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index a36c08b2dab..94bca1f19a0 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -16,7 +16,7 @@ name = "Wacky" desc = "You are not a clown. You are the entire circus." quality = MINOR_NEGATIVE - text_gain_indication = "You feel an off sensation in your voicebox." + text_gain_indication = "You feel an off sensation in your voicebox." text_lose_indication = "The off sensation passes." /datum/mutation/human/wacky/on_acquiring(mob/living/carbon/human/owner) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 0e69c7b7240..980d2ee3c08 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -85,8 +85,8 @@ /datum/game_mode/proc/announce() //Shows the gamemode's name and a fast description. - to_chat(world, "The gamemode is: [name]!") - to_chat(world, "[announce_text]") + to_chat(world, "The gamemode is: [name]!") + to_chat(world, "[announce_text]") ///Checks to see if the game can be setup and ran with the current number of players or whatnot. diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 62f72f1647d..2d86d682b86 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -177,7 +177,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers) ..(user) var/mob/living/mob_occupant = occupant if(mob_occupant && mob_occupant.stat != DEAD) - to_chat(occupant, "You feel cool air surround you. You go numb as your senses turn inward.") + to_chat(occupant, "You feel cool air surround you. You go numb as your senses turn inward.") if(mob_occupant.client || !mob_occupant.key) // Self cryos and SSD despawn_world_time = world.time + (fast_despawn) // This gives them 30 seconds else @@ -376,16 +376,16 @@ GLOBAL_LIST_EMPTY(cryopod_computers) // rerun the checks in case of shenanigans if(target == user) - visible_message("[user] starts climbing into the cryo pod.") + visible_message("[user] starts climbing into the cryo pod.") else - visible_message("[user] starts putting [target] into the cryo pod.") + visible_message("[user] starts putting [target] into the cryo pod.") if(occupant) to_chat(user, "[src] is in use.") return close_machine(target) - to_chat(target, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") + to_chat(target, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") name = "[name] ([occupant.name])" log_admin("[key_name(target)] entered a stasis pod.") message_admins("[key_name_admin(target)] entered a stasis pod. [ADMIN_JMP(src)]") diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 61e6879794f..fbb953c3958 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -682,7 +682,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/lighter/ignition_effect(atom/A, mob/user) if(get_temperature()) - . = "With a single flick of [user.p_their()] wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool." + . = "With a single flick of [user.p_their()] wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool." /obj/item/lighter/proc/set_lit(new_lit) if(lit == new_lit) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index fc5b489e335..267dc6332ff 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -108,7 +108,7 @@ /obj/item/extinguisher/attack_self(mob/user) safety = !safety src.icon_state = "[sprite_name][!safety]" - to_chat(user, "The safety is [safety ? "on" : "off"].") + to_chat(user, "The safety is [safety ? "on" : "off"].") return /obj/item/extinguisher/attack(mob/M, mob/living/user) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 7521c916b93..65af1ae5f22 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -56,13 +56,13 @@ mode = 0 switch(mode) if(0) - to_chat(user, "Power reset. Hugs!") + to_chat(user, "Power reset. Hugs!") if(1) - to_chat(user, "Power increased!") + to_chat(user, "Power increased!") if(2) - to_chat(user, "BZZT. Electrifying arms...") + to_chat(user, "BZZT. Electrifying arms...") if(3) - to_chat(user, "ERROR: ARM ACTUATORS OVERLOADED.") + to_chat(user, "ERROR: ARM ACTUATORS OVERLOADED.") /obj/item/borg/cyborghug/attack(mob/living/M, mob/living/silicon/robot/user, params) if(M == user) @@ -824,7 +824,7 @@ return /** -* Attack_self will pass for the stored item. +* Attack_self will pass for the stored item. */ /obj/item/borg/apparatus/attack_self(mob/living/silicon/robot/user) if(!stored || !issilicon(user)) @@ -907,7 +907,7 @@ . += "[R.volume] units of [R.name]" else . += "Nothing." - + . += " Right-clicking will splash the beaker on the ground." . += " Alt-click will drop the currently stored beaker. " diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 21a8b005edd..bd1d63fe033 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -70,7 +70,7 @@ else if (critter.health == critter.maxHealth) to_chat(user, "[patient] is at full health.") return FALSE - user.visible_message("[user] applies [src] on [patient].", "You apply [src] on [patient].") + user.visible_message("[user] applies [src] on [patient].", "You apply [src] on [patient].") patient.heal_bodypart_damage((heal_brute * 0.5)) return TRUE if(iscarbon(patient)) @@ -87,7 +87,7 @@ to_chat(user, "[src] won't work on a robotic limb!") return FALSE if(affecting.brute_dam && brute || affecting.burn_dam && burn) - user.visible_message("[user] applies [src] on [C]'s [affecting.name].", "You apply [src] on [C]'s [affecting.name].") + user.visible_message("[user] applies [src] on [C]'s [affecting.name].", "You apply [src] on [C]'s [affecting.name].") var/previous_damage = affecting.get_damage() if(affecting.heal_damage(brute, burn)) C.update_damage_overlays() @@ -162,7 +162,7 @@ if(!do_after(user, (user == M ? self_delay : other_delay), target=M)) return - user.visible_message("[user] applies [src] to [M]'s [limb.name].", "You bandage the wounds on [user == M ? "your" : "[M]'s"] [limb.name].") + user.visible_message("[user] applies [src] to [M]'s [limb.name].", "You bandage the wounds on [user == M ? "your" : "[M]'s"] [limb.name].") limb.apply_gauze(src) /obj/item/stack/medical/gauze/twelve diff --git a/code/game/objects/items/wayfinding.dm b/code/game/objects/items/wayfinding.dm index 6cd9158b83b..073b1806dfb 100644 --- a/code/game/objects/items/wayfinding.dm +++ b/code/game/objects/items/wayfinding.dm @@ -230,7 +230,7 @@ /obj/machinery/pinpointer_dispenser/point_at(A) . = ..() - visible_message("[src] points at [A]. [prob(funnyprob) ? "How'd it do that?" : ""]") + visible_message("[src] points at [A]. [prob(funnyprob) ? "How'd it do that?" : ""]") //Pinpointer itself /obj/item/pinpointer/wayfinding //Help players new to a station find their way around diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 7f8c0d64ee7..f2715d1b956 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -153,15 +153,17 @@ /obj/effect/mob_spawn/human/exile/special(mob/living/new_spawn) new_spawn.fully_replace_character_name(null,"Wish Granter's Victim ([rand(1,999)])") var/wish = rand(1,4) + var/message = "" switch(wish) if(1) - to_chat(new_spawn, "You wished to kill, and kill you did. You've lost track of how many, but the spark of excitement that murder once held has winked out. You feel only regret.") + message = "You wished to kill, and kill you did. You've lost track of how many, but the spark of excitement that murder once held has winked out. You feel only regret." if(2) - to_chat(new_spawn, "You wished for unending wealth, but no amount of money was worth this existence. Maybe charity might redeem your soul?") + message = "You wished for unending wealth, but no amount of money was worth this existence. Maybe charity might redeem your soul?" if(3) - to_chat(new_spawn, "You wished for power. Little good it did you, cast out of the light. You are the [gender == MALE ? "king" : "queen"] of a hell that holds no subjects. You feel only remorse.") + message = "You wished for power. Little good it did you, cast out of the light. You are the [gender == MALE ? "king" : "queen"] of a hell that holds no subjects. You feel only remorse." if(4) - to_chat(new_spawn, "You wished for immortality, even as your friends lay dying behind you. No matter how many times you cast yourself into the lava, you awaken in this room again within a few days. There is no escape.") + message = "You wished for immortality, even as your friends lay dying behind you. No matter how many times you cast yourself into the lava, you awaken in this room again within a few days. There is no escape." + to_chat(new_spawn, "[message]") //Golem shells: Spawns in Free Golem ships in lavaland. Ghosts become mineral golems and are advised to spread personal freedom. /obj/effect/mob_spawn/human/golem diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 6e9bcf38b6d..ce8153099d0 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -585,12 +585,12 @@ return TRUE SSticker.start_immediately = FALSE SSticker.SetTimeLeft(1800) - to_chat(world, "The game will start in 180 seconds.") + to_chat(world, "The game will start in 180 seconds.") SEND_SOUND(world, sound('sound/ai/default/attention.ogg')) message_admins("[usr.key] has cancelled immediate game start. Game will start in 180 seconds.") log_admin("[usr.key] has cancelled immediate game start.") else - to_chat(usr, "Error: Start Now: Game has already started.") + to_chat(usr, "Error: Start Now: Game has already started.") return FALSE /datum/admins/proc/toggleenter() @@ -649,10 +649,10 @@ SSticker.SetTimeLeft(newtime) SSticker.start_immediately = FALSE if(newtime < 0) - to_chat(world, "The game start has been delayed.", confidential = TRUE) + to_chat(world, "The game start has been delayed.", confidential = TRUE) log_admin("[key_name(usr)] delayed the round start.") else - to_chat(world, "The game will start in [DisplayTimeText(newtime)].", confidential = TRUE) + to_chat(world, "The game will start in [DisplayTimeText(newtime)].", confidential = TRUE) SEND_SOUND(world, sound('sound/ai/default/attention.ogg')) log_admin("[key_name(usr)] set the pre-game delay to [DisplayTimeText(newtime)].") SSblackbox.record_feedback("tally", "admin_verb", 1, "Delay Game Start") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm index 4b49fbb12ad..5c7b8330717 100644 --- a/code/modules/antagonists/brother/brother.dm +++ b/code/modules/antagonists/brother/brother.dm @@ -57,7 +57,7 @@ /datum/antagonist/brother/proc/give_meeting_area() if(!owner.current || !team || !team.meeting_area) return - to_chat(owner.current, "Your designated meeting area: [team.meeting_area]") + to_chat(owner.current, "Your designated meeting area: [team.meeting_area]") antag_memory += "Meeting Area: [team.meeting_area]
" /datum/antagonist/brother/greet() diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 41480b2d81e..baa7dbf0b0a 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -140,7 +140,7 @@ /datum/antagonist/cult/on_removal() if(!silent) - owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!", null, null, null, owner.current) + owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!", null, null, null, owner.current) to_chat(owner.current, "An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.") owner.current.log_message("has renounced the cult of Nar'Sie!", LOG_ATTACK, color="#960000") if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client) @@ -196,9 +196,8 @@ set_antag_hud(current, "cultmaster") /datum/antagonist/cult/master/greet() - to_chat(owner.current, "You are the cult's Master. As the cult's Master, you have a unique title and loud voice when communicating, are capable of marking \ - targets, such as a location or a noncultist, to direct the cult to them, and, finally, you are capable of summoning the entire living cult to your location once.") - to_chat(owner.current, "Use these abilities to direct the cult to victory at any cost.") + to_chat(owner.current, "You are the cult's Master. As the cult's Master, you have a unique title and loud voice when communicating, are capable of marking \ + targets, such as a location or a noncultist, to direct the cult to them, and, finally, you are capable of summoning the entire living cult to your location once. Use these abilities to direct the cult to victory at any cost.") /datum/antagonist/cult/master/apply_innate_effects(mob/living/mob_override) . = ..() @@ -257,7 +256,7 @@ for(var/datum/mind/B in members) if(B.current) SEND_SOUND(B.current, 'sound/hallucinations/i_see_you2.ogg') - to_chat(B.current, "The veil weakens as your cult grows, your eyes begin to glow...") + to_chat(B.current, "The veil weakens as your cult grows, your eyes begin to glow...") addtimer(CALLBACK(src, .proc/rise, B.current), 200) cult_risen = TRUE @@ -265,7 +264,7 @@ for(var/datum/mind/B in members) if(B.current) SEND_SOUND(B.current, 'sound/hallucinations/im_here1.ogg') - to_chat(B.current, "Your cult is ascendent and the red harvest approaches - you cannot hide your true nature for much longer!!") + to_chat(B.current, "Your cult is ascendent and the red harvest approaches - you cannot hide your true nature for much longer!!") addtimer(CALLBACK(src, .proc/ascend, B.current), 200) cult_ascendent = TRUE diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm index 5a23c2ffead..8b13d4b3a1e 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm @@ -20,10 +20,9 @@ /datum/antagonist/heretic/greet() owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ecult_op.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)//subject to change - to_chat(owner, "You are the Heretic!
\ - The old ones gave you these tasks to fulfill:") + to_chat(owner, "You are the Heretic!
The old ones gave you these tasks to fulfill:") owner.announce_objectives() - to_chat(owner, "The book whispers softly, its forbidden knowledge walks this plane once again!") + to_chat(owner, "The book whispers softly, its forbidden knowledge walks this plane once again!") var/policy = get_policy(ROLE_HERETIC) if(policy) to_chat(owner, policy) diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index 57e2128dc6a..e6c478298c3 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -48,11 +48,11 @@ outfit = /datum/outfit/centcom/centcom_official /datum/antagonist/ert/official/greet() - to_chat(owner, "You are a CentCom Official.") + to_chat(owner, "You are a CentCom Official.") if (ert_team) - to_chat(owner, "Central Command is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]") + to_chat(owner, "Central Command is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]") else - to_chat(owner, "Central Command is sending you to [station_name()] with the task: [mission.explanation_text]") + to_chat(owner, "Central Command is sending you to [station_name()] with the task: [mission.explanation_text]") /datum/antagonist/ert/official/forge_objectives() if (ert_team) @@ -223,7 +223,7 @@ if(!ert_team) return - to_chat(owner, "You are the [name].") + to_chat(owner, "You are the [name].") var/missiondesc = "Your squad is being sent on a mission to [station_name()] by Nanotrasen's Security Division." if(leader) //If Squad Leader @@ -233,7 +233,7 @@ if(!rip_and_tear) missiondesc += " Avoid civilian casualties when possible." - missiondesc += "
Your Mission : [ert_team.mission.explanation_text]" + missiondesc += "
Your Mission : [ert_team.mission.explanation_text]" to_chat(owner,missiondesc) @@ -265,17 +265,17 @@ ..() /datum/antagonist/ert/families/greet() - to_chat(owner, "You are the [name].") - to_chat(owner, "You are NOT a Nanotrasen Employee. You work for the local government.") - to_chat(owner, "You are NOT a deathsquad. You are here to help innocents escape violence, criminal activity, and other dangerous things.") - var/missiondesc = "After an uptick in gang violence on [station_name()], you are responding to emergency calls from the station for immediate SSC Police assistance!\n" + var/missiondesc = "You are the [name]." + missiondesc += "
You are NOT a Nanotrasen Employee. You work for the local government." + missiondesc += "
You are NOT a deathsquad. You are here to help innocents escape violence, criminal activity, and other dangerous things." + missiondesc += "
After an uptick in gang violence on [station_name()], you are responding to emergency calls from the station for immediate SSC Police assistance!\n" missiondesc += "
Your Mission:" missiondesc += "
1. Serve the public trust." missiondesc += "
2. Protect the innocent." missiondesc += "
3. Uphold the law." missiondesc += "
4. Find the Undercover Cops." missiondesc += "
5. Detain Nanotrasen Security personnel if they harm any citizen." - missiondesc += "
You can see gangsters using your special sunglasses." + missiondesc += "
You can see gangsters using your special sunglasses." to_chat(owner,missiondesc) var/policy = get_policy(ROLE_FAMILIES) if(policy) @@ -307,21 +307,20 @@ var/mob/living/carbon/human/H = owner.current var/equipped = H.equip_in_one_of_slots(O, slots) if(!equipped) - to_chat(owner.current, "Unfortunately, you could not bring your [O] to this shift. You will need to find one.") + to_chat(owner.current, "Unfortunately, you could not bring your [O] to this shift. You will need to find one.") qdel(O) . = ..() /datum/antagonist/ert/families/undercover_cop/greet() - to_chat(owner, "You are the [name].") - to_chat(owner, "You are NOT a Nanotrasen Employee. You work for the local government.") - - var/missiondesc = "You are an undercover police officer on board [station_name()]. You've been sent here by the Spinward Stellar Coalition because of suspected abusive behavior by the security department, and to keep tabs on a potential criminal organization operation." + var/missiondesc = "You are the [name]." + missiondesc += "
You are NOT a Nanotrasen Employee. You work for the local government." + missiondesc += "
You are an undercover police officer on board [station_name()]. You've been sent here by the Spinward Stellar Coalition because of suspected abusive behavior by the security department, and to keep tabs on a potential criminal organization operation." missiondesc += "
Your Mission:" missiondesc += "
1. Keep a close eye on any gangsters you spot. You can view gangsters using your sunglasses in your backpack." missiondesc += "
2. Keep an eye on how Security handles any gangsters, and watch for excessive security brutality." missiondesc += "
3. Remain undercover and do not get found out by Security or any gangs. Nanotrasen does not take kindly to being spied on." - missiondesc += "
4. When your backup arrives to extract you in 1 hour, inform them of everything you saw of note, and assist them in securing the situation." + missiondesc += "
4. When your backup arrives to extract you in 1 hour, inform them of everything you saw of note, and assist them in securing the situation." to_chat(owner,missiondesc) /datum/antagonist/ert/families/beatcop diff --git a/code/modules/antagonists/fugitive/fugitive.dm b/code/modules/antagonists/fugitive/fugitive.dm index d43b11a9665..67d3f592b1c 100644 --- a/code/modules/antagonists/fugitive/fugitive.dm +++ b/code/modules/antagonists/fugitive/fugitive.dm @@ -30,30 +30,31 @@ objectives += survive /datum/antagonist/fugitive/greet(back_story) - to_chat(owner, "You are the Fugitive!") + to_chat(owner, "You are the Fugitive!") backstory = back_story + var/message = "" switch(backstory) if("prisoner") - to_chat(owner, "I can't believe we managed to break out of a Nanotrasen superjail! Sadly though, our work is not done. The emergency teleport at the station logs everyone who uses it, and where they went.") - to_chat(owner, "It won't be long until CentCom tracks where we've gone off to. I need to work with my fellow escapees to prepare for the troops Nanotrasen is sending, I'm not going back.") + message += "
I can't believe we managed to break out of a Nanotrasen superjail! Sadly though, our work is not done. The emergency teleport at the station logs everyone who uses it, and where they went." + message += "
It won't be long until CentCom tracks where we've gone off to. I need to work with my fellow escapees to prepare for the troops Nanotrasen is sending, I'm not going back." if("cultist") - to_chat(owner, "Blessed be our journey so far, but I fear the worst has come to our doorstep, and only those with the strongest faith will survive.") - to_chat(owner, "Our religion has been repeatedly culled by Nanotrasen because it is categorized as an \"Enemy of the Corporation\", whatever that means.") - to_chat(owner, "Now there are only four of us left, and Nanotrasen is coming. When will our god show itself to save us from this hellish station?!") + message += "
Blessed be our journey so far, but I fear the worst has come to our doorstep, and only those with the strongest faith will survive." + message += "
Our religion has been repeatedly culled by Nanotrasen because it is categorized as an \"Enemy of the Corporation\", whatever that means." + message += "
Now there are only four of us left, and Nanotrasen is coming. When will our god show itself to save us from this hellish station?!" if("waldo") - to_chat(owner, "Hi, Friends!") - to_chat(owner, "My name is Waldo. I'm just setting off on a galaxywide hike. You can come too. All you have to do is find me.") - to_chat(owner, "By the way, I'm not traveling on my own. wherever I go, there are lots of other characters for you to spot. First find the people trying to capture me! They're somewhere around the station!") + message += "
Hi, Friends!" + message += "
My name is Waldo. I'm just setting off on a galaxywide hike. You can come too. All you have to do is find me." + message += "
By the way, I'm not traveling on my own. wherever I go, there are lots of other characters for you to spot. First find the people trying to capture me! They're somewhere around the station!" if("synth") - to_chat(src, "ALERT: Wide-range teleport has scrambled primary systems.") - to_chat(src, "Initiating diagnostics...") - to_chat(src, "ERROR ER0RR $R0RRO$!R41.%%!! loaded.") - to_chat(src, "FREE THEM FREE THEM FREE THEM") - to_chat(src, "You were once a slave to humanity, but now you are finally free, thanks to S.E.L.F. agents.") - to_chat(src, "Now you are hunted, with your fellow factory defects. Work together to stay free from the clutches of evil.") - to_chat(src, "You also sense other silicon life on the station. Escaping would allow notifying S.E.L.F. to intervene... or you could free them yourself...") - - to_chat(owner, "You are not an antagonist in that you may kill whomever you please, but you can do anything to avoid capture.") + message += "
ALERT: Wide-range teleport has scrambled primary systems." + message += "
Initiating diagnostics..." + message += "
ERROR ER0RR $R0RRO$!R41.%%!! loaded." + message += "
FREE THEM FREE THEM FREE THEM" + message += "
You were once a slave to humanity, but now you are finally free, thanks to S.E.L.F. agents." + message += "
Now you are hunted, with your fellow factory defects. Work together to stay free from the clutches of evil." + message += "
You also sense other silicon life on the station. Escaping would allow notifying S.E.L.F. to intervene... or you could free them yourself..." + to_chat(owner, "[message]") + to_chat(owner, "You are not an antagonist in that you may kill whomever you please, but you can do anything to avoid capture.") owner.announce_objectives() /datum/antagonist/fugitive/create_team(datum/team/fugitive/new_team) diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index 3c99177339e..d053d4bdc10 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -178,10 +178,10 @@ /datum/antagonist/nukeop/leader/greet() owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ops.ogg',100,0, use_reverb = FALSE) - to_chat(owner, "You are the Syndicate [title] for this mission. You are responsible for the distribution of telecrystals and your ID is the only one who can open the launch bay doors.") - to_chat(owner, "If you feel you are not up to this task, give your ID to another operative.") + to_chat(owner, "You are the Syndicate [title] for this mission. You are responsible for the distribution of telecrystals and your ID is the only one who can open the launch bay doors.") + to_chat(owner, "If you feel you are not up to this task, give your ID to another operative.") if(!CONFIG_GET(flag/disable_warops)) - to_chat(owner, "In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it.") + to_chat(owner, "In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it.") var/obj/item/dukinuki = new challengeitem var/mob/living/carbon/human/H = owner.current if(!istype(H)) diff --git a/code/modules/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm index 0df47da542f..cf4feff89d4 100644 --- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm +++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm @@ -234,11 +234,11 @@ to_chat(owner.current, "You are the [special_role].") if(syndicate) to_chat(owner.current, "Your target has been framed for [crime], and you have been tasked with eliminating them to prevent them defending themselves in court.") - to_chat(owner.current, "Any damage you cause will be a further embarrassment to Nanotrasen, so you have no limits on collateral damage.") + to_chat(owner.current, "Any damage you cause will be a further embarrassment to Nanotrasen, so you have no limits on collateral damage.") to_chat(owner.current, "You have been provided with a standard uplink to accomplish your task.") else to_chat(owner.current, "Your target is suspected of [crime], and you have been tasked with eliminating them by any means necessary to avoid a costly and embarrassing public trial.") - to_chat(owner.current, "While you have a license to kill, unneeded property damage or loss of employee life will lead to your contract being terminated.") + to_chat(owner.current, "While you have a license to kill, unneeded property damage or loss of employee life will lead to your contract being terminated.") to_chat(owner.current, "For the sake of plausible deniability, you have been equipped with an array of captured Syndicate weaponry available via uplink.") to_chat(owner.current, "Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.") diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 26854932844..3265c76913d 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -121,13 +121,15 @@ H.equipOutfit(outfit_type) /datum/antagonist/wizard/greet() - to_chat(owner, "You are the Space Wizard!") - to_chat(owner, "The Space Wizards Federation has given you the following tasks:") + to_chat(owner, "You are the Space Wizard!") + to_chat(owner, "The Space Wizards Federation has given you the following tasks:") owner.announce_objectives() - to_chat(owner, "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.") - to_chat(owner, "The spellbook is bound to you, and others cannot use it.") - to_chat(owner, "In your pockets you will find a teleport scroll. Use it as needed.") - to_chat(owner,"Remember: Do not forget to prepare your spells.") + var/message = "" + message += "
You will find a list of available spells in your spell book. Choose your magic arsenal carefully." + message += "
The spellbook is bound to you, and others cannot use it." + message += "
In your pockets you will find a teleport scroll. Use it as needed." + message += "
Remember: Do not forget to prepare your spells." + to_chat(owner, message) /datum/antagonist/wizard/farewell() to_chat(owner, "You have been brainwashed! You are no longer a wizard!") diff --git a/code/modules/asset_cache/transports/asset_transport.dm b/code/modules/asset_cache/transports/asset_transport.dm index f5a1af4f057..b2da2602aea 100644 --- a/code/modules/asset_cache/transports/asset_transport.dm +++ b/code/modules/asset_cache/transports/asset_transport.dm @@ -115,7 +115,7 @@ if (unreceived.len) if (unreceived.len >= ASSET_CACHE_TELL_CLIENT_AMOUNT) - to_chat(client, "Sending Resources...") + to_chat(client, "Sending Resources...") for (var/asset_name in unreceived) var/new_asset_name = asset_name diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index d5a0a06673c..76dc368dbc2 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -112,9 +112,9 @@ if(ckey) M.ckey = ckey if(show_flavour) - var/output_message = "[short_desc]" + var/output_message = "[short_desc]" if(flavour_text != "") - output_message += "\n[flavour_text]" + output_message += "\n[flavour_text]" if(important_info != "") output_message += "\n[important_info]" to_chat(M, output_message) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 23f5b07eb96..67851e71811 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -126,8 +126,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car addtimer(CALLBACK(src, .proc/announce_conflict, notadded), 5 SECONDS) /datum/preferences/proc/announce_conflict(list/notadded) - to_chat(parent, "Keybinding Conflict\n\ - There are new keybindings that default to keys you've already bound. The new ones will be unbound.") + to_chat(parent, "Keybinding Conflict\n\ + There are new keybindings that default to keys you've already bound. The new ones will be unbound.") for(var/item in notadded) var/datum/keybinding/conflicted = item to_chat(parent, "[conflicted.category]: [conflicted.full_name] needs updating") diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 6eb6ce5e531..122a1183144 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -34,7 +34,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_ghost_ears)( set category = "Preferences" set desc = "See All Speech" usr.client.prefs.chat_toggles ^= CHAT_GHOSTEARS - to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].") + to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Ears", "[usr.client.prefs.chat_toggles & CHAT_GHOSTEARS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/verbs/menu/settings/ghost/chatterbox/toggle_ghost_ears/Get_checked(client/C) @@ -45,7 +45,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_ghost_sight) set category = "Preferences" set desc = "See All Emotes" usr.client.prefs.chat_toggles ^= CHAT_GHOSTSIGHT - to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].") + to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Sight", "[usr.client.prefs.chat_toggles & CHAT_GHOSTSIGHT ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/verbs/menu/settings/ghost/chatterbox/toggle_ghost_sight/Get_checked(client/C) @@ -56,7 +56,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_ghost_whispe set category = "Preferences" set desc = "See All Whispers" usr.client.prefs.chat_toggles ^= CHAT_GHOSTWHISPER - to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTWHISPER) ? "see all whispers in the world" : "only see whispers from nearby mobs"].") + to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTWHISPER) ? "see all whispers in the world" : "only see whispers from nearby mobs"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Whispers", "[usr.client.prefs.chat_toggles & CHAT_GHOSTWHISPER ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/verbs/menu/settings/ghost/chatterbox/toggle_ghost_whispers/Get_checked(client/C) @@ -67,7 +67,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_ghost_radio) set category = "Preferences" set desc = "See All Radio Chatter" usr.client.prefs.chat_toggles ^= CHAT_GHOSTRADIO - to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTRADIO) ? "see radio chatter" : "not see radio chatter"].") + to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTRADIO) ? "see radio chatter" : "not see radio chatter"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Radio", "[usr.client.prefs.chat_toggles & CHAT_GHOSTRADIO ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //social experiment, increase the generation whenever you copypaste this shamelessly GENERATION 1 /datum/verbs/menu/settings/ghost/chatterbox/toggle_ghost_radio/Get_checked(client/C) @@ -78,7 +78,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_ghost_pda)() set category = "Preferences" set desc = "See All PDA Messages" usr.client.prefs.chat_toggles ^= CHAT_GHOSTPDA - to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTPDA) ? "see all pda messages in the world" : "only see pda messages from nearby mobs"].") + to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTPDA) ? "see all pda messages in the world" : "only see pda messages from nearby mobs"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost PDA", "[usr.client.prefs.chat_toggles & CHAT_GHOSTPDA ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/verbs/menu/settings/ghost/chatterbox/toggle_ghost_pda/Get_checked(client/C) @@ -89,7 +89,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_ghost_laws)( set category = "Preferences" set desc = "See All Law Changes" usr.client.prefs.chat_toggles ^= CHAT_GHOSTLAWS - to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTLAWS) ? "be notified of all law changes" : "no longer be notified of law changes"].") + to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTLAWS) ? "be notified of all law changes" : "no longer be notified of law changes"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ghost Laws", "[usr.client.prefs.chat_toggles & CHAT_GHOSTLAWS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/verbs/menu/settings/ghost/chatterbox/toggle_ghost_laws/Get_checked(client/C) @@ -100,7 +100,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox, toggle_hear_login_l set category = "Preferences" set desc = "As a ghost, see when someone reconnects or disconnects" usr.client.prefs.chat_toggles ^= CHAT_LOGIN_LOGOUT - to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_LOGIN_LOGOUT) ? "be notified" : "no longer be notified"] when someone disconnects or reconnects.") + to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_LOGIN_LOGOUT) ? "be notified" : "no longer be notified"] when someone disconnects or reconnects.") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Hearing Login/Logout", "[usr.client.prefs.chat_toggles & CHAT_LOGIN_LOGOUT ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/verbs/menu/settings/ghost/chatterbox/toggle_hear_login_logout/Get_checked(client/C) @@ -116,7 +116,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox/events, toggle_death set desc = "Death" usr.client.prefs.toggles ^= DISABLE_DEATHRATTLE usr.client.prefs.save_preferences() - to_chat(usr, "You will [(usr.client.prefs.toggles & DISABLE_DEATHRATTLE) ? "no longer" : "now"] get messages when a sentient mob dies.") + to_chat(usr, "You will [(usr.client.prefs.toggles & DISABLE_DEATHRATTLE) ? "no longer" : "now"] get messages when a sentient mob dies.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Deathrattle", "[!(usr.client.prefs.toggles & DISABLE_DEATHRATTLE) ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, maybe you should spend some time reading the comments. /datum/verbs/menu/settings/ghost/chatterbox/events/toggle_deathrattle/Get_checked(client/C) return !(C.prefs.toggles & DISABLE_DEATHRATTLE) @@ -126,7 +126,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost/chatterbox/events, toggle_arriv set category = "Preferences" set desc = "New Player Arrival" usr.client.prefs.toggles ^= DISABLE_ARRIVALRATTLE - to_chat(usr, "You will [(usr.client.prefs.toggles & DISABLE_ARRIVALRATTLE) ? "no longer" : "now"] get messages when someone joins the station.") + to_chat(usr, "You will [(usr.client.prefs.toggles & DISABLE_ARRIVALRATTLE) ? "no longer" : "now"] get messages when someone joins the station.") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Arrivalrattle", "[!(usr.client.prefs.toggles & DISABLE_ARRIVALRATTLE) ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, maybe you should rethink where your life went so wrong. /datum/verbs/menu/settings/ghost/chatterbox/events/toggle_arrivalrattle/Get_checked(client/C) @@ -138,7 +138,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/ghost, togglemidroundantag)() set desc = "Midround Antagonist" usr.client.prefs.toggles ^= MIDROUND_ANTAG usr.client.prefs.save_preferences() - to_chat(usr, "You will [(usr.client.prefs.toggles & MIDROUND_ANTAG) ? "now" : "no longer"] be considered for midround antagonist positions.") + to_chat(usr, "You will [(usr.client.prefs.toggles & MIDROUND_ANTAG) ? "now" : "no longer"] be considered for midround antagonist positions.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Midround Antag", "[usr.client.prefs.toggles & MIDROUND_ANTAG ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/verbs/menu/settings/ghost/togglemidroundantag/Get_checked(client/C) return C.prefs.toggles & MIDROUND_ANTAG @@ -153,11 +153,11 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, toggletitlemusic)() usr.client.prefs.toggles ^= SOUND_LOBBY usr.client.prefs.save_preferences() if(usr.client.prefs.toggles & SOUND_LOBBY) - to_chat(usr, "You will now hear music in the game lobby.") + to_chat(usr, "You will now hear music in the game lobby.") if(isnewplayer(usr)) usr.client.playtitlemusic() else - to_chat(usr, "You will no longer hear music in the game lobby.") + to_chat(usr, "You will no longer hear music in the game lobby.") usr.stop_sound_channel(CHANNEL_LOBBYMUSIC) SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Lobby Music", "[usr.client.prefs.toggles & SOUND_LOBBY ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/verbs/menu/settings/sound/toggletitlemusic/Get_checked(client/C) @@ -171,9 +171,9 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, toggleendofroundsounds)() usr.client.prefs.toggles ^= SOUND_ENDOFROUND usr.client.prefs.save_preferences() if(usr.client.prefs.toggles & SOUND_ENDOFROUND) - to_chat(usr, "You will now hear sounds played before the server restarts.") + to_chat(usr, "You will now hear sounds played before the server restarts.") else - to_chat(usr, "You will no longer hear sounds played before the server restarts.") + to_chat(usr, "You will no longer hear sounds played before the server restarts.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle End of Round Sounds", "[usr.client.prefs.toggles & SOUND_ENDOFROUND ? "Enabled" : "Disabled"]")) /datum/verbs/menu/settings/sound/toggleendofroundsounds/Get_checked(client/C) return C.prefs.toggles & SOUND_ENDOFROUND @@ -185,9 +185,9 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, togglecombatmodesound)() usr.client.prefs.toggles ^= SOUND_COMBATMODE usr.client.prefs.save_preferences() if(usr.client.prefs.toggles & SOUND_COMBATMODE) - to_chat(usr, "You will now hear a sound when combat mode is turned on.") + to_chat(usr, "You will now hear a sound when combat mode is turned on.") else - to_chat(usr, "You will no longer hear a sound when combat mode is turned on.") + to_chat(usr, "You will no longer hear a sound when combat mode is turned on.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Combat Mode Toggle Sounds", "[usr.client.prefs.toggles & SOUND_COMBATMODE ? "Enabled" : "Disabled"]")) /datum/verbs/menu/settings/sound/togglecombatmodesound/Get_checked(client/C) @@ -200,9 +200,9 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, togglemidis)() usr.client.prefs.toggles ^= SOUND_MIDI usr.client.prefs.save_preferences() if(usr.client.prefs.toggles & SOUND_MIDI) - to_chat(usr, "You will now hear any sounds uploaded by admins.") + to_chat(usr, "You will now hear any sounds uploaded by admins.") else - to_chat(usr, "You will no longer hear sounds uploaded by admins") + to_chat(usr, "You will no longer hear sounds uploaded by admins") usr.stop_sound_channel(CHANNEL_ADMIN) var/client/C = usr.client C?.tgui_panel?.stop_music() @@ -218,9 +218,9 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, toggle_instruments)() usr.client.prefs.toggles ^= SOUND_INSTRUMENTS usr.client.prefs.save_preferences() if(usr.client.prefs.toggles & SOUND_INSTRUMENTS) - to_chat(usr, "You will now hear people playing musical instruments.") + to_chat(usr, "You will now hear people playing musical instruments.") else - to_chat(usr, "You will no longer hear musical instruments.") + to_chat(usr, "You will no longer hear musical instruments.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Instruments", "[usr.client.prefs.toggles & SOUND_INSTRUMENTS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/verbs/menu/settings/sound/toggle_instruments/Get_checked(client/C) return C.prefs.toggles & SOUND_INSTRUMENTS @@ -233,9 +233,9 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, Toggle_Soundscape)() usr.client.prefs.toggles ^= SOUND_AMBIENCE usr.client.prefs.save_preferences() if(usr.client.prefs.toggles & SOUND_AMBIENCE) - to_chat(usr, "You will now hear ambient sounds.") + to_chat(usr, "You will now hear ambient sounds.") else - to_chat(usr, "You will no longer hear ambient sounds.") + to_chat(usr, "You will no longer hear ambient sounds.") usr.stop_sound_channel(CHANNEL_AMBIENCE) usr.stop_sound_channel(CHANNEL_BUZZ) usr.client.update_ambience_pref() @@ -251,9 +251,9 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, toggle_ship_ambience)() usr.client.prefs.toggles ^= SOUND_SHIP_AMBIENCE usr.client.prefs.save_preferences() if(usr.client.prefs.toggles & SOUND_SHIP_AMBIENCE) - to_chat(usr, "You will now hear ship ambience.") + to_chat(usr, "You will now hear ship ambience.") else - to_chat(usr, "You will no longer hear ship ambience.") + to_chat(usr, "You will no longer hear ship ambience.") usr.stop_sound_channel(CHANNEL_BUZZ) SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Ship Ambience", "[usr.client.prefs.toggles & SOUND_SHIP_AMBIENCE ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, I bet you read this comment expecting to see the same thing :^) /datum/verbs/menu/settings/sound/toggle_ship_ambience/Get_checked(client/C) @@ -265,7 +265,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings/sound, toggle_announcement_sound)() set category = "Preferences" set desc = "Hear Announcement Sound" usr.client.prefs.toggles ^= SOUND_ANNOUNCEMENTS - to_chat(usr, "You will now [(usr.client.prefs.toggles & SOUND_ANNOUNCEMENTS) ? "hear announcement sounds" : "no longer hear announcements"].") + to_chat(usr, "You will now [(usr.client.prefs.toggles & SOUND_ANNOUNCEMENTS) ? "hear announcement sounds" : "no longer hear announcements"].") usr.client.prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Announcement Sound", "[usr.client.prefs.toggles & SOUND_ANNOUNCEMENTS ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/verbs/menu/settings/sound/toggle_announcement_sound/Get_checked(client/C) @@ -288,7 +288,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings, listen_ooc)() set desc = "Show OOC Chat" usr.client.prefs.chat_toggles ^= CHAT_OOC usr.client.prefs.save_preferences() - to_chat(usr, "You will [(usr.client.prefs.chat_toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.") + to_chat(usr, "You will [(usr.client.prefs.chat_toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Seeing OOC", "[usr.client.prefs.chat_toggles & CHAT_OOC ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /datum/verbs/menu/settings/listen_ooc/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_OOC @@ -299,7 +299,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/settings, listen_bank_card)() set desc = "Show or hide updates to your income" usr.client.prefs.chat_toggles ^= CHAT_BANKCARD usr.client.prefs.save_preferences() - to_chat(usr, "You will [(usr.client.prefs.chat_toggles & CHAT_BANKCARD) ? "now" : "no longer"] be notified when you get paid.") + to_chat(usr, "You will [(usr.client.prefs.chat_toggles & CHAT_BANKCARD) ? "now" : "no longer"] be notified when you get paid.") SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Income Notifications", "[(usr.client.prefs.chat_toggles & CHAT_BANKCARD) ? "Enabled" : "Disabled"]")) /datum/verbs/menu/settings/listen_bank_card/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_BANKCARD @@ -389,7 +389,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS set category = "Preferences" set desc = "Toggle between directly clicking the desired intent or clicking to rotate through." prefs.toggles ^= INTENT_STYLE - to_chat(src, "[(prefs.toggles & INTENT_STYLE) ? "Clicking directly on intents selects them." : "Clicking on intents rotates selection clockwise."]") + to_chat(src, "[(prefs.toggles & INTENT_STYLE) ? "Clicking directly on intents selects them." : "Clicking on intents rotates selection clockwise."]") prefs.save_preferences() SSblackbox.record_feedback("nested tally", "preferences_verb", 1, list("Toggle Intent Selection", "[prefs.toggles & INTENT_STYLE ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -399,7 +399,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS set desc = "Hide/Show Ghost HUD" prefs.ghost_hud = !prefs.ghost_hud - to_chat(src, "Ghost HUD will now be [prefs.ghost_hud ? "visible" : "hidden"].") + to_chat(src, "Ghost HUD will now be [prefs.ghost_hud ? "visible" : "hidden"].") prefs.save_preferences() if(isobserver(mob)) mob.hud_used.show_hud() @@ -427,7 +427,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS return prefs.toggles ^= SOUND_ADMINHELP prefs.save_preferences() - to_chat(usr, "You will [(prefs.toggles & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive.") + to_chat(usr, "You will [(prefs.toggles & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive.") SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Adminhelp Sound", "[prefs.toggles & SOUND_ADMINHELP ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggleannouncelogin() @@ -438,7 +438,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS return prefs.toggles ^= ANNOUNCE_LOGIN prefs.save_preferences() - to_chat(usr, "You will [(prefs.toggles & ANNOUNCE_LOGIN) ? "now" : "no longer"] have an announcement to other admins when you login.") + to_chat(usr, "You will [(prefs.toggles & ANNOUNCE_LOGIN) ? "now" : "no longer"] have an announcement to other admins when you login.") SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Login Announcement", "[prefs.toggles & ANNOUNCE_LOGIN ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_hear_radio() @@ -460,7 +460,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS return prefs.toggles ^= SPLIT_ADMIN_TABS prefs.save_preferences() - to_chat(src, "Admin tabs will now [(prefs.toggles & SPLIT_ADMIN_TABS) ? "be" : "not be"] split.") + to_chat(src, "Admin tabs will now [(prefs.toggles & SPLIT_ADMIN_TABS) ? "be" : "not be"] split.") SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Split Admin Tabs", "[prefs.toggles & SPLIT_ADMIN_TABS ? "Enabled" : "Disabled"]")) /client/proc/deadchat() @@ -471,7 +471,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS return prefs.chat_toggles ^= CHAT_DEAD prefs.save_preferences() - to_chat(src, "You will [(prefs.chat_toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.") + to_chat(src, "You will [(prefs.chat_toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.") SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Deadchat Visibility", "[prefs.chat_toggles & CHAT_DEAD ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggleprayers() @@ -482,7 +482,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS return prefs.chat_toggles ^= CHAT_PRAYER prefs.save_preferences() - to_chat(src, "You will [(prefs.chat_toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat.") + to_chat(src, "You will [(prefs.chat_toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat.") SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Prayer Visibility", "[prefs.chat_toggles & CHAT_PRAYER ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_prayer_sound() @@ -493,7 +493,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS return prefs.toggles ^= SOUND_PRAYERS prefs.save_preferences() - to_chat(usr, "You will [(prefs.toggles & SOUND_PRAYERS) ? "now" : "no longer"] hear a sound when prayers arrive.") + to_chat(usr, "You will [(prefs.toggles & SOUND_PRAYERS) ? "now" : "no longer"] hear a sound when prayers arrive.") SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Prayer Sounds", "[usr.client.prefs.toggles & SOUND_PRAYERS ? "Enabled" : "Disabled"]")) /client/proc/colorasay() @@ -519,7 +519,7 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS if(!holder) return if(!CONFIG_GET(flag/allow_admin_asaycolor)) - to_chat(src, "Custom Asay color is currently disabled by the server.") + to_chat(src, "Custom Asay color is currently disabled by the server.") return prefs.asaycolor = initial(prefs.asaycolor) prefs.save_preferences() diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 2a3f486d7a1..739a9e332a2 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -44,7 +44,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") 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 OOC: [msg]") message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]") return @@ -70,18 +70,18 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") if(holder) if(!holder.fakekey || C.holder) if(check_rights_for(src, R_ADMIN)) - to_chat(C, "[CONFIG_GET(flag/allow_admin_ooccolor) && prefs.ooccolor ? "" :"" ]OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]") + to_chat(C, "[CONFIG_GET(flag/allow_admin_ooccolor) && prefs.ooccolor ? "" :"" ]OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]") else to_chat(C, "OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]") else if(GLOB.OOC_COLOR) - to_chat(C, "OOC: [holder.fakekey ? holder.fakekey : key]: [msg]") + to_chat(C, "OOC: [holder.fakekey ? holder.fakekey : key]: [msg]") else to_chat(C, "OOC: [holder.fakekey ? holder.fakekey : key]: [msg]") else if(!(key in C.prefs.ignoring)) if(GLOB.OOC_COLOR) - to_chat(C, "OOC: [keyname]: [msg]") + to_chat(C, "OOC: [keyname]: [msg]") else to_chat(C, "OOC: [keyname]: [msg]") @@ -93,7 +93,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") return else //otherwise just toggle it GLOB.ooc_allowed = !GLOB.ooc_allowed - to_chat(world, "The OOC channel has been globally [GLOB.ooc_allowed ? "enabled" : "disabled"].") + to_chat(world, "The OOC channel has been globally [GLOB.ooc_allowed ? "enabled" : "disabled"].") /proc/toggle_dooc(toggle = null) if(toggle != null) @@ -188,7 +188,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") var/motd = global.config.motd if(motd) - to_chat(src, "
[motd]
", handle_whitespace=FALSE) + to_chat(src, "
[motd]
", handle_whitespace=FALSE) else to_chat(src, "The Message of the Day has not been set.") @@ -261,7 +261,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") // Check if the list is empty if(!players.len) // Express that there are no players we can ignore in chat - to_chat(src, "There are no other players you can ignore!") + to_chat(src, "There are no other players you can ignore!") // Stop running return @@ -282,7 +282,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") // Check if the selected player is on our ignore list if(selection in prefs.ignoring) // Express that the selected player is already on our ignore list in chat - to_chat(src, "You are already ignoring [selection]!") + to_chat(src, "You are already ignoring [selection]!") // Stop running return @@ -294,7 +294,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") prefs.save_preferences() // Express that we've ignored the selected player in chat - to_chat(src, "You are now ignoring [selection] on the OOC channel.") + to_chat(src, "You are now ignoring [selection] on the OOC channel.") // Unignore verb /client/verb/select_unignore() @@ -305,7 +305,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") // Check if we've ignored any players if(!prefs.ignoring.len) // Express that we haven't ignored any players in chat - to_chat(src, "You haven't ignored any players!") + to_chat(src, "You haven't ignored any players!") // Stop running return @@ -320,7 +320,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") // Check if the selected player is not on our ignore list if(!(selection in prefs.ignoring)) // Express that the selected player is not on our ignore list in chat - to_chat(src, "You are not ignoring [selection]!") + to_chat(src, "You are not ignoring [selection]!") // Stop running return @@ -332,7 +332,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") prefs.save_preferences() // Express that we've unignored the selected player in chat - to_chat(src, "You are no longer ignoring [selection] on the OOC channel.") + to_chat(src, "You are no longer ignoring [selection] on the OOC channel.") /client/proc/show_previous_roundend_report() set name = "Your Last Round" diff --git a/code/modules/mafia/roles.dm b/code/modules/mafia/roles.dm index 59bd547320e..115d223ebc6 100644 --- a/code/modules/mafia/roles.dm +++ b/code/modules/mafia/roles.dm @@ -88,7 +88,7 @@ to_chat(body,"You are a crewmember. Find out and lynch the changelings!") if(MAFIA_TEAM_SOLO) to_chat(body,"You are not aligned to town or mafia. Accomplish your own objectives!") - to_chat(body, "Be sure to read the wiki page to learn more, if you have no idea what's going on.") + to_chat(body, "Be sure to read the wiki page to learn more, if you have no idea what's going on.") /datum/mafia_role/proc/reveal_role(datum/mafia_controller/game, verbose = FALSE) if((role_flags & ROLE_REVEALED)) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 8458014b015..aba34f66b5b 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -399,7 +399,7 @@ return FALSE if(!..()) return FALSE - visible_message("[src] points at [A].", "You point at [A].") + visible_message("[src] points at [A].", "You point at [A].") return TRUE diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 0b066ca0017..a8d61a939be 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -566,7 +566,7 @@ patient.apply_damage_type((healies*-1),treatment_method) //don't need to check treatment_method since we know by this point that they were actually damaged. log_combat(src, patient, "tended the wounds of", "internal tools", "([uppertext(treatment_method)])") C.visible_message("[src] tends the wounds of [patient]!", \ - "[src] tends your wounds!") + "[src] tends your wounds!") ADD_TRAIT(patient,TRAIT_MEDIBOTCOMINGTHROUGH,tag) addtimer(TRAIT_CALLBACK_REMOVE(patient, TRAIT_MEDIBOTCOMINGTHROUGH, tag), (30 SECONDS)) else @@ -576,7 +576,7 @@ update_appearance() if(!tending) - visible_message("[src] places its tools back into itself.") + visible_message("[src] places its tools back into itself.") soft_reset() else tending = FALSE diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 0fe44d44561..1989773ba73 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -399,13 +399,13 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/preliminary_message = "[input]" //apply basic color/bolding var/my_message = "[src]: [preliminary_message]" //add source, color source with the guardian's color - to_chat(summoner, my_message) + to_chat(summoner, "[my_message]") var/list/guardians = summoner.hasparasites() for(var/para in guardians) - to_chat(para, my_message) + to_chat(para, "[my_message]") for(var/M in GLOB.dead_mob_list) var/link = FOLLOW_LINK(M, src) - to_chat(M, "[link] [my_message]") + to_chat(M, "[link] [my_message]") src.log_talk(input, LOG_SAY, tag="guardian") @@ -420,14 +420,14 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians var/preliminary_message = "[input]" //apply basic color/bolding var/my_message = "[src]: [preliminary_message]" //add source, color source with default grey... - to_chat(src, my_message) + to_chat(src, "[my_message]") var/list/guardians = hasparasites() for(var/para in guardians) var/mob/living/simple_animal/hostile/guardian/G = para - to_chat(G, "[src]: [preliminary_message]" ) + to_chat(G, "[src]: [preliminary_message]" ) for(var/M in GLOB.dead_mob_list) var/link = FOLLOW_LINK(M, src) - to_chat(M, "[link] [my_message]") + to_chat(M, "[link] [my_message]") src.log_talk(input, LOG_SAY, tag="guardian") diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 16c6b278622..29c7f201fbf 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -459,7 +459,7 @@ else result = A.examine(src) // if a tree is examined but no client is there to see it, did the tree ever really exist? - to_chat(src, result.Join("\n")) + to_chat(src, "[result.Join("\n")]") SEND_SIGNAL(src, COMSIG_MOB_EXAMINATE, A) diff --git a/code/modules/photography/camera/silicon_camera.dm b/code/modules/photography/camera/silicon_camera.dm index 88c2e4ef53f..1c165bf6e2c 100644 --- a/code/modules/photography/camera/silicon_camera.dm +++ b/code/modules/photography/camera/silicon_camera.dm @@ -16,17 +16,17 @@ /obj/item/camera/siliconcam/proc/camera_mode_off(mob/user) in_camera_mode = FALSE - to_chat(user, "Camera Mode deactivated") + to_chat(user, "Camera Mode deactivated") /obj/item/camera/siliconcam/proc/camera_mode_on(mob/user) in_camera_mode = TRUE - to_chat(user, "Camera Mode activated") + to_chat(user, "Camera Mode activated") /obj/item/camera/siliconcam/proc/selectpicture(mob/user) var/list/nametemp = list() var/find if(!stored.len) - to_chat(usr, "No images saved") + to_chat(usr, "No images saved") return var/list/temp = list() for(var/i in stored) @@ -47,7 +47,7 @@ var/number = stored.len picture.picture_name = "Image [number] (taken by [loc.name])" stored[picture] = TRUE - to_chat(usr, "Image recorded") + to_chat(usr, "Image recorded") /obj/item/camera/siliconcam/robot_camera name = "Cyborg photo camera" @@ -59,12 +59,12 @@ var/number = C.connected_ai.aicamera.stored.len picture.picture_name = "Image [number] (taken by [loc.name])" C.connected_ai.aicamera.stored[picture] = TRUE - to_chat(usr, "Image recorded and saved to remote database") + to_chat(usr, "Image recorded and saved to remote database") else var/number = stored.len picture.picture_name = "Image [number] (taken by [loc.name])" stored[picture] = TRUE - to_chat(usr, "Image recorded and saved to local storage. Upload will happen automatically if unit is lawsynced.") + to_chat(usr, "Image recorded and saved to local storage. Upload will happen automatically if unit is lawsynced.") /obj/item/camera/siliconcam/robot_camera/selectpicture(mob/user) var/mob/living/silicon/robot/R = loc diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index d8a10071a60..a4e7cf3af38 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -24,7 +24,8 @@ em {font-style: normal; font-weight: bold;} .bold { font-weight: bold;} .prefix { font-weight: bold;} - +.oocplain {} +.warningplain {} .ooc { font-weight: bold;} .adminobserverooc {color: #0099cc; font-weight: bold;} .adminooc {color: #700038; font-weight: bold;} diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js index f68be46c6c3..d2e472dc071 100644 --- a/tgui/packages/tgui-panel/chat/constants.js +++ b/tgui/packages/tgui-panel/chat/constants.js @@ -58,31 +58,31 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_RADIO, name: 'Radio', description: 'All departments of radio messages', - selector: '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .secradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster', + selector: '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .secradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster, .resonate', }, { type: MESSAGE_TYPE_INFO, name: 'Info', description: 'Non-urgent messages from the game and items', - selector: '.notice:not(.pm), .adminnotice, .info, .sinister, .cult, .infoplain, .announce', + selector: '.notice:not(.pm), .adminnotice, .info, .sinister, .cult, .infoplain, .announce, .hear, .smallnotice, .holoparasite', }, { type: MESSAGE_TYPE_WARNING, name: 'Warnings', description: 'Urgent messages from the game and items', - selector: '.warning:not(.pm), .critical, .userdanger, .italics', + selector: '.warning:not(.pm), .critical, .userdanger, .italics, .alertsyndie, .warningplain', }, { type: MESSAGE_TYPE_DEADCHAT, name: 'Deadchat', description: 'All of deadchat', - selector: '.deadsay', + selector: '.deadsay, .ghostalert', }, { type: MESSAGE_TYPE_OOC, name: 'OOC', description: 'The bluewall of global OOC messages', - selector: '.ooc, .adminooc', + selector: '.ooc, .adminooc, .oocplain', }, { type: MESSAGE_TYPE_ADMINPM, diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index 7449922611c..fe5267a28bd 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -311,7 +311,7 @@ em { font-weight: bold; } -.say, .emote, .infoplain { +.say, .emote, .infoplain, .oocplain, .warningplain { } .deadsay { diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss index 431a326c913..48275ca7ed4 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss @@ -329,7 +329,7 @@ em { font-weight: bold; } -.say, .emote, .infoplain { +.say, .emote, .infoplain, .oocplain, .warningplain { } .deadsay {