diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 5bb5c0d4157..eddaf6e2cc5 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -121,11 +121,11 @@ return FALSE switch(user.stat) if(SOFT_CRIT) - to_chat(user, "You cannot [key] while in a critical condition.") + to_chat(user, "You cannot [key] while in a critical condition!") if(UNCONSCIOUS) - to_chat(user, "You cannot [key] while unconscious.") + to_chat(user, "You cannot [key] while unconscious!") if(DEAD) - to_chat(user, "You cannot [key] while dead.") + to_chat(user, "You cannot [key] while dead!") return FALSE if(restraint_check) if(isliving(user)) @@ -133,12 +133,12 @@ if(L.IsParalyzed() || L.IsStun()) if(!intentional) return FALSE - to_chat(user, "You cannot [key] while stunned.") + to_chat(user, "You cannot [key] while stunned!") return FALSE if(restraint_check && user.restrained()) if(!intentional) return FALSE - to_chat(user, "You cannot [key] while restrained.") + to_chat(user, "You cannot [key] while restrained!") return FALSE if(isliving(user)) diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index 4c2c4e76a17..6c3a93e8b86 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -155,11 +155,11 @@ if (A && D) if (get_dist(A, D) > 1) - to_chat(A, "[D] is too far away!") + to_chat(A, "[D] is too far away!") return 0 if (!isturf(A.loc) || !isturf(D.loc)) - to_chat(A, "You can't throw [D] from here!") + to_chat(A, "You can't throw [D] from here!") return 0 A.setDir(turn(A.dir, 90)) @@ -177,11 +177,11 @@ // These are necessary because of the sleep call. if (get_dist(A, D) > 1) - to_chat(A, "[D] is too far away!") + to_chat(A, "[D] is too far away!") return 0 if (!isturf(A.loc) || !isturf(D.loc)) - to_chat(A, "You can't throw [D] from here!") + to_chat(A, "You can't throw [D] from here!") return 0 D.forceMove(A.loc) // Maybe this will help with the wallthrowing bug. @@ -208,7 +208,7 @@ if(!D) return if(!A.pulling || A.pulling != D) - to_chat(A, "You need to have [D] in a cinch!") + to_chat(A, "You need to have [D] in a cinch!") return D.forceMove(A.loc) A.setDir(get_dir(A, D)) @@ -236,7 +236,7 @@ D.pixel_x = A.pixel_x + 8 if (get_dist(A, D) > 1) - to_chat(A, "[D] is too far away!") + to_chat(A, "[D] is too far away!") A.pixel_x = 0 A.pixel_y = 0 D.pixel_x = 0 @@ -244,7 +244,7 @@ return 0 if (!isturf(A.loc) || !isturf(D.loc)) - to_chat(A, "You can't slam [D] here!") + to_chat(A, "You can't slam [D] here!") A.pixel_x = 0 A.pixel_y = 0 D.pixel_x = 0 @@ -268,11 +268,11 @@ D.pixel_y = 0 if (get_dist(A, D) > 1) - to_chat(A, "[D] is too far away!") + to_chat(A, "[D] is too far away!") return 0 if (!isturf(A.loc) || !isturf(D.loc)) - to_chat(A, "You can't slam [D] here!") + to_chat(A, "You can't slam [D] here!") return 0 D.forceMove(A.loc) @@ -386,12 +386,12 @@ A.visible_message("...and dives head-first into the ground, ouch!") A.adjustBruteLoss(rand(10,20)) A.Paralyze(60) - to_chat(A, "[D] is too far away!") + to_chat(A, "[D] is too far away!") return 0 if (!isturf(A.loc) || !isturf(D.loc)) A.pixel_y = 0 - to_chat(A, "You can't drop onto [D] from here!") + to_chat(A, "You can't drop onto [D] from here!") return 0 if(A) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 782f795e45e..9e777db3f4a 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -41,9 +41,9 @@ if(affecting.heal_damage(brute, burn)) C.update_damage_overlays() return TRUE - to_chat(user, "[C]'s [affecting.name] can not be healed with \the [src].") + to_chat(user, "[C]'s [affecting.name] can not be healed with \the [src]!") return - to_chat(user, "\The [src] won't work on a robotic limb!") + to_chat(user, "\The [src] won't work on a robotic limb!") /obj/item/stack/medical/bruise_pack name = "bruise pack" @@ -58,12 +58,12 @@ /obj/item/stack/medical/bruise_pack/heal(mob/living/M, mob/user) if(M.stat == DEAD) - to_chat(user, " [M] is dead. You can not help [M.p_them()]!") + to_chat(user, " [M] is dead! You can not help [M.p_them()].") return if(isanimal(M)) var/mob/living/simple_animal/critter = M if (!(critter.healable)) - to_chat(user, " You cannot use \the [src] on [M]!") + to_chat(user, " You cannot use \the [src] on [M]!") return FALSE else if (critter.health == critter.maxHealth) to_chat(user, " [M] is at full health.") @@ -73,7 +73,7 @@ return TRUE if(iscarbon(M)) return heal_carbon(M, user, heal_brute, 0) - to_chat(user, "You can't heal [M] with the \the [src]!") + to_chat(user, "You can't heal [M] with the \the [src]!") /obj/item/stack/medical/bruise_pack/suicide_act(mob/user) user.visible_message("[user] is bludgeoning [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") @@ -96,7 +96,7 @@ H.suppress_bloodloss(stop_bleeding) to_chat(user, "You stop the bleeding of [M]!") return TRUE - to_chat(user, "You can not use \the [src] on [M]!") + to_chat(user, "You can not use \the [src] on [M]!") /obj/item/stack/medical/gauze/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_WIRECUTTER || I.is_sharp()) @@ -140,11 +140,11 @@ /obj/item/stack/medical/ointment/heal(mob/living/M, mob/user) if(M.stat == DEAD) - to_chat(user, " [M] is dead. You can not help [M.p_them()]!") + to_chat(user, " [M] is dead! You can not help [M.p_them()].") return if(iscarbon(M)) return heal_carbon(M, user, 0, heal_burn) - to_chat(user, "You can't heal [M] with the \the [src]!") + to_chat(user, "You can't heal [M] with the \the [src]!") /obj/item/stack/medical/ointment/suicide_act(mob/living/user) user.visible_message("[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?") diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 92c730fbcf6..86a2f3d0bd1 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -54,10 +54,10 @@ //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/twohanded/ctf/attack_hand(mob/living/user) if(!is_ctf_target(user) && !anyonecanpickup) - to_chat(user, "Non players shouldn't be moving the flag!") + to_chat(user, "Non-players shouldn't be moving the flag!") return if(team in user.faction) - to_chat(user, "You can't move your own flag!") + to_chat(user, "You can't move your own flag!") return if(loc == user) if(!user.dropItemToGround(src)) @@ -227,7 +227,7 @@ return if(user.ckey in team_members) if(user.ckey in recently_dead_ckeys) - to_chat(user, "It must be more than [DisplayTimeText(respawn_cooldown)] from your last death to respawn!") + to_chat(user, "It must be more than [DisplayTimeText(respawn_cooldown)] from your last death to respawn!") return var/client/new_team_member = user.client if(user.mind && user.mind.current) @@ -239,10 +239,10 @@ if(CTF == src || CTF.ctf_enabled == FALSE) continue if(user.ckey in CTF.team_members) - to_chat(user, "No switching teams while the round is going!") + to_chat(user, "No switching teams while the round is going!") return if(CTF.team_members.len < src.team_members.len) - to_chat(user, "[src.team] has more team members than [CTF.team]. Try joining [CTF.team] team to even things up.") + to_chat(user, "[src.team] has more team members than [CTF.team]! Try joining [CTF.team] team to even things up.") return team_members |= user.ckey var/client/new_team_member = user.client diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm index e08e9c0e483..7f7c7eeaba7 100644 --- a/code/modules/client/verbs/suicide.dm +++ b/code/modules/client/verbs/suicide.dm @@ -241,17 +241,17 @@ if(CONSCIOUS) return TRUE if(SOFT_CRIT) - to_chat(src, "You can't commit suicide while in a critical condition!") + to_chat(src, "You can't commit suicide while in a critical condition!") if(UNCONSCIOUS) - to_chat(src, "You need to be conscious to commit suicide!") + to_chat(src, "You need to be conscious to commit suicide!") if(DEAD) - to_chat(src, "You're already dead!") + to_chat(src, "You're already dead!") return /mob/living/carbon/canSuicide() if(!..()) return if(!(mobility_flags & MOBILITY_USE)) //just while I finish up the new 'fun' suiciding verb. This is to prevent metagaming via suicide - to_chat(src, "You can't commit suicide whilst immobile! ((You can type Ghost instead however.))") + to_chat(src, "You can't commit suicide whilst immobile! ((You can type Ghost instead however.))") return return TRUE diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm index bc4d133a70e..09cc3705872 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -9,19 +9,19 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list( if(!ventcrawler || !Adjacent(A)) return if(stat) - to_chat(src, "You must be conscious to do this!") + to_chat(src, "You must be conscious to do this!") return if(IsStun() || IsParalyzed()) - to_chat(src, "You can't vent crawl while you're stunned!") + to_chat(src, "You can't vent crawl while you're stunned!") return if(restrained()) - to_chat(src, "You can't vent crawl while you're restrained!") + to_chat(src, "You can't vent crawl while you're restrained!") return if(has_buckled_mobs()) - to_chat(src, "You can't vent crawl with other creatures on you!") + to_chat(src, "You can't vent crawl with other creatures on you!") return if(buckled) - to_chat(src, "You can't vent crawl while buckled!") + to_chat(src, "You can't vent crawl while buckled!") return var/obj/machinery/atmospherics/components/unary/vent_found @@ -123,4 +123,3 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list( . = new_loc remove_ventcrawl() add_ventcrawl(.) - diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index efdfd7f3acf..eae53b6e1a5 100755 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -369,9 +369,9 @@ if(istype(I,/obj/item/pestle)) if(grinded) if(user.getStaminaLoss() > 50) - to_chat(user, "You are too tired to work!") + to_chat(user, "You are too tired to work!") return - to_chat(user, "You start grinding...") + to_chat(user, "You start grinding...") if((do_after(user, 25, target = src)) && grinded) user.adjustStaminaLoss(40) if(grinded.reagents) //food and pills @@ -379,28 +379,28 @@ if(grinded.juice_results) //prioritize juicing grinded.on_juice() reagents.add_reagent_list(grinded.juice_results) - to_chat(user, "You juice [grinded] into a fine liquid.") + to_chat(user, "You juice [grinded] into a fine liquid.") QDEL_NULL(grinded) return grinded.on_grind() reagents.add_reagent_list(grinded.grind_results) - to_chat(user, "You break [grinded] into powder.") + to_chat(user, "You break [grinded] into powder.") QDEL_NULL(grinded) return return else - to_chat(user, "There is nothing to grind!") + to_chat(user, "There is nothing to grind!") return if(grinded) - to_chat(user, "There is something inside already!") + to_chat(user, "There is something inside already!") return if(I.juice_results || I.grind_results) I.forceMove(src) grinded = I return - to_chat(user, "You can't grind this!") + to_chat(user, "You can't grind this!") /obj/item/reagent_containers/glass/saline name = "saline canister" volume = 5000 - list_reagents = list(/datum/reagent/medicine/salglu_solution = 5000) \ No newline at end of file + list_reagents = list(/datum/reagent/medicine/salglu_solution = 5000) diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 333801c398c..71cba60e546 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -89,9 +89,9 @@ new shell_type(get_turf(src), species, user) qdel(src) else - to_chat(user, "You need at least ten sheets to finish a golem.") + to_chat(user, "You need at least ten sheets to finish a golem!") else - to_chat(user, "You can't build a golem out of this kind of material.") + to_chat(user, "You can't build a golem out of this kind of material!") //made with xenobiology, the golem obeys its creator /obj/item/golem_shell/servant @@ -135,7 +135,7 @@ outfit = /datum/outfit/lavaland_syndicate/comms /obj/effect/mob_spawn/human/lavaland_syndicate/comms/space - flavour_text = "You are a syndicate agent, assigned to a small listening post station situated near your hated enemy's top secret research facility: Space Station 13. Monitor enemy activity as best you can, and try to keep a low profile. DO NOT abandon the base. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!" + flavour_text = "You are a syndicate agent, assigned to a small listening post station situated near your hated enemy's top secret research facility: Space Station 13. Monitor enemy activity as best you can, and try to keep a low profile. DO NOT abandon the base. Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!" /obj/effect/mob_spawn/human/lavaland_syndicate/comms/space/Initialize() . = ..() diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index 534f6a3f614..ca6034f8ca6 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -157,7 +157,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th var/turf/T = get_turf(user) if(is_centcom_level(T.z) && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel - to_chat(user, "You can't cast this spell here.") + to_chat(user, "You can't cast this spell here!") return FALSE if(!skipcharge) @@ -165,7 +165,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th return FALSE if(user.stat && !stat_allowed) - to_chat(user, "Not when you're incapacitated.") + to_chat(user, "Not when you're incapacitated!") return FALSE if(!antimagic_allowed) @@ -174,11 +174,11 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th if(isitem(antimagic)) to_chat(user, "[antimagic] is interfering with your magic.") else - to_chat(user, "Magic seems to flee from you, you can't gather enough power to cast this spell.") + to_chat(user, "Magic seems to flee from you, you can't gather enough power to cast this spell.") return FALSE if(!phase_allowed && istype(user.loc, /obj/effect/dummy)) - to_chat(user, "[name] cannot be cast unless you are completely manifested in the material plane.") + to_chat(user, "[name] cannot be cast unless you are completely manifested in the material plane!") return FALSE if(ishuman(user)) @@ -186,7 +186,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th var/mob/living/carbon/human/H = user if((invocation_type == "whisper" || invocation_type == "shout") && !H.can_speak_vocal()) - to_chat(user, "You can't get the words out!") + to_chat(user, "You can't get the words out!") return FALSE var/list/casting_clothes = typecacheof(list(/obj/item/clothing/suit/wizrobe, @@ -198,24 +198,24 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th if(clothes_req) //clothes check if(!is_type_in_typecache(H.wear_suit, casting_clothes)) - to_chat(H, "I don't feel strong enough without my robe.") + to_chat(H, "You don't feel strong enough without your robe!") return FALSE if(!is_type_in_typecache(H.head, casting_clothes)) - to_chat(H, "I don't feel strong enough without my hat.") + to_chat(H, "You don't feel strong enough without your hat!") return FALSE if(cult_req) //CULT_REQ CLOTHES CHECK if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/cult)) - to_chat(H, "I don't feel strong enough without my armor.") + to_chat(H, "You don't feel strong enough without your armor.") return FALSE if(!istype(H.head, /obj/item/clothing/head/magus) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/cult)) - to_chat(H, "I don't feel strong enough without my helmet.") + to_chat(H, "You don't feel strong enough without your helmet.") return FALSE else if(clothes_req || human_req) - to_chat(user, "This spell can only be cast by humans!") + to_chat(user, "This spell can only be cast by humans!") return FALSE if(nonabstract_req && (isbrain(user) || ispAI(user))) - to_chat(user, "This spell can only be cast by physical beings!") + to_chat(user, "This spell can only be cast by physical beings!") return FALSE @@ -241,7 +241,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th if("charges") if(!charge_counter) if(!silent) - to_chat(user, "[name] has no charges left.") + to_chat(user, "[name] has no charges left!") return FALSE return TRUE @@ -267,7 +267,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th . = ..() START_PROCESSING(SSfastprocess, src) - still_recharging_msg = "[name] is still recharging." + still_recharging_msg = "[name] is still recharging!" charge_counter = charge_max /obj/effect/proc_holder/spell/Destroy() diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index 927bef94ba3..860bd3a80fc 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -54,7 +54,7 @@ if(!proximity || target == user || !ismob(target) || !iscarbon(user) || !(user.mobility_flags & MOBILITY_USE)) //exploding after touching yourself would be bad return if(!user.can_speak_vocal()) - to_chat(user, "You can't get the words out!") + to_chat(user, "You can't get the words out!") return var/mob/M = target do_sparks(4, FALSE, M.loc) @@ -96,7 +96,7 @@ to_chat(user, "You can't reach out!") return if(!user.can_speak_vocal()) - to_chat(user, "You can't get the words out!") + to_chat(user, "You can't get the words out!") return var/mob/living/M = target if(M.anti_magic_check())