diff --git a/code/datums/components/ducttape.dm b/code/datums/components/ducttape.dm index b41066d375d..06a882dbcf7 100644 --- a/code/datums/components/ducttape.dm +++ b/code/datums/components/ducttape.dm @@ -55,7 +55,7 @@ var/target_direction = get_dir(source_turf, target_turf)//The direction we clicked // Snowflake diagonal handling if(target_direction in GLOB.diagonals) - to_chat(user, "You cant reach [target_turf].") + to_chat(user, "You can't reach [target_turf].") return if(target_direction & EAST) x_offset = 16 diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index cab6ac01ce3..6562784552f 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -35,7 +35,7 @@ RSF ..() if(istype(W, /obj/item/rcd_ammo)) if((matter + 10) > 30) - to_chat(user, "The RSF cant hold any more matter.") + to_chat(user, "The RSF can't hold any more matter.") return qdel(W) matter += 10 diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 340ce0b64f8..9aa0eeb4789 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -191,7 +191,7 @@ LIGHTERS ARE IN LIGHTERS.DM /obj/item/clothing/mask/cigarette/attack_self(mob/user) if(lit) - user.visible_message("[user] calmly drops and treads on the lit [src], putting it out instantly.") + user.visible_message("[user] calmly drops and treads on [src], putting it out instantly.") die() return ..() diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 0fe0e010739..c312d7d1175 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -37,7 +37,7 @@ /obj/effect/spresent/relaymove(mob/user as mob) if(user.stat) return - to_chat(user, "You cant move.") + to_chat(user, "You can't move.") /obj/effect/spresent/attackby(obj/item/W as obj, mob/user as mob, params) ..() diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm index 4ee485302db..ea48b203009 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm @@ -134,7 +134,7 @@ else if(istype(O,/obj/item/grab)) return special_attack(O, user) else - to_chat(user, "You have no idea what you can cook with this [O].") + to_chat(user, "You have no idea what you can cook with [O].") return 1 updateUsrDialog() diff --git a/code/modules/maze_generation/maze_helper_atoms.dm b/code/modules/maze_generation/maze_helper_atoms.dm index 3e4c4dfd02f..4ea9777bd76 100644 --- a/code/modules/maze_generation/maze_helper_atoms.dm +++ b/code/modules/maze_generation/maze_helper_atoms.dm @@ -8,7 +8,7 @@ // Windows which cant be taken apart. Thes are subtypes of windows so you can have atoms you can walk in at some dirs bit not others /obj/structure/window/reinforced/mazeglass name = "maze glass" - desc = "You cant take this down. Looks like you have to solve the maze." + desc = "You can't take this down. Looks like you have to solve the maze." resistance_flags = INDESTRUCTIBLE // No taking apart diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 6e1aca60d49..d1662652fd8 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -1,6 +1,6 @@ //goat /mob/living/simple_animal/hostile/retaliate/goat - name = "goat" + name = "\improper goat" desc = "Not known for their pleasant disposition." icon_state = "goat" icon_living = "goat" @@ -109,7 +109,7 @@ //cow /mob/living/simple_animal/cow - name = "cow" + name = "\improper cow" desc = "Known for their milk, just don't tip them over." icon_state = "cow" icon_living = "cow" @@ -123,9 +123,9 @@ turns_per_move = 5 see_in_dark = 6 butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 6) - response_help = "pets the" - response_disarm = "gently pushes aside the" - response_harm = "kicks the" + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "kicks" attacktext = "kicks" attack_sound = 'sound/weapons/punch1.ogg' health = 50 @@ -204,9 +204,9 @@ speak_chance = 2 turns_per_move = 2 butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1) - response_help = "pets the" - response_disarm = "gently pushes aside the" - response_harm = "kicks the" + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "kicks" attacktext = "kicks" health = 3 maxHealth = 3 @@ -259,9 +259,9 @@ GLOBAL_VAR_INIT(chicken_count, 0) butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 2) var/egg_type = /obj/item/reagent_containers/food/snacks/egg var/food_type = /obj/item/reagent_containers/food/snacks/grown/wheat - response_help = "pets the" - response_disarm = "gently pushes aside the" - response_harm = "kicks the" + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "kicks" attacktext = "kicks" health = 15 maxHealth = 15 @@ -370,7 +370,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) return FALSE /mob/living/simple_animal/pig - name = "pig" + name = "\improper pig" desc = "Oink oink." icon_state = "pig" icon_living = "pig" @@ -383,9 +383,9 @@ GLOBAL_VAR_INIT(chicken_count, 0) turns_per_move = 5 see_in_dark = 6 butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/ham = 6) - response_help = "pets the" - response_disarm = "gently pushes aside the" - response_harm = "kicks the" + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "kicks" attacktext = "kicks" health = 50 maxHealth = 50 @@ -396,7 +396,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) footstep_type = FOOTSTEP_MOB_SHOE /mob/living/simple_animal/turkey - name = "turkey" + name = "\improper turkey" desc = "Benjamin Franklin would be proud." icon_state = "turkey" icon_living = "turkey" @@ -409,9 +409,9 @@ GLOBAL_VAR_INIT(chicken_count, 0) turns_per_move = 5 see_in_dark = 6 butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 4) - response_help = "pets the" - response_disarm = "gently pushes aside the" - response_harm = "kicks the" + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "kicks" attacktext = "pecks" health = 50 maxHealth = 50 @@ -421,7 +421,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) footstep_type = FOOTSTEP_MOB_CLAW /mob/living/simple_animal/goose - name = "goose" + name = "\improper goose" desc = "A pretty goose. Would make a nice comforter." icon_state = "goose" icon_living = "goose" @@ -434,9 +434,9 @@ GLOBAL_VAR_INIT(chicken_count, 0) turns_per_move = 5 see_in_dark = 6 butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 6) - response_help = "pets the" - response_disarm = "gently pushes aside the" - response_harm = "kicks the" + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "kicks" attacktext = "kicks" health = 50 maxHealth = 50 @@ -446,7 +446,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) footstep_type = FOOTSTEP_MOB_CLAW /mob/living/simple_animal/seal - name = "seal" + name = "\improper seal" desc = "A beautiful white seal." icon_state = "seal" icon_living = "seal" @@ -459,9 +459,9 @@ GLOBAL_VAR_INIT(chicken_count, 0) turns_per_move = 5 see_in_dark = 6 butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 6) - response_help = "pets the" - response_disarm = "gently pushes aside the" - response_harm = "kicks the" + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "kicks" attacktext = "kicks" health = 50 maxHealth = 50 @@ -471,7 +471,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) blood_volume = BLOOD_VOLUME_NORMAL /mob/living/simple_animal/walrus - name = "walrus" + name = "\improper walrus" desc = "A big brown walrus." icon_state = "walrus" icon_living = "walrus" @@ -484,9 +484,9 @@ GLOBAL_VAR_INIT(chicken_count, 0) turns_per_move = 5 see_in_dark = 6 butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 6) - response_help = "pets the" - response_disarm = "gently pushes aside the" - response_harm = "kicks the" + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "kicks" attacktext = "kicks" health = 50 maxHealth = 50 diff --git a/code/modules/mob/living/simple_animal/hostile/bat.dm b/code/modules/mob/living/simple_animal/hostile/bat.dm index dd2529f3f69..ff57b4758ad 100644 --- a/code/modules/mob/living/simple_animal/hostile/bat.dm +++ b/code/modules/mob/living/simple_animal/hostile/bat.dm @@ -1,5 +1,5 @@ /mob/living/simple_animal/hostile/scarybat - name = "space bats" + name = "\improper space bats" desc = "A swarm of cute little blood sucking bats that looks pretty pissed." icon = 'icons/mob/bats.dmi' icon_state = "bat" @@ -10,9 +10,9 @@ speak_chance = 0 turns_per_move = 3 butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1) - response_help = "pets the" - response_disarm = "gently pushes aside the" - response_harm = "hits the" + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "hits" speed = 4 maxHealth = 20 health = 20 diff --git a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm index 212f2d48b6b..dbce788147f 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm @@ -3,7 +3,7 @@ //*********// /mob/living/simple_animal/hostile/panther - name = "panther" + name = "\improper panther" desc = "A long sleek, black cat with sharp teeth and claws." icon = 'icons/mob/alienqueen.dmi' icon_state = "panther" diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm index c0fd9d23cec..d40f38ee267 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm @@ -1,6 +1,6 @@ /mob/living/simple_animal/hostile/retaliate/carp - name = "sea carp" + name = "\improper sea carp" desc = "A large fish bearing similarities to a certain space-faring menace." icon = 'icons/mob/carp.dmi' icon_state = "carp" @@ -9,9 +9,9 @@ speak_chance = 0 turns_per_move = 5 butcher_results = list(/obj/item/reagent_containers/food/snacks/carpmeat = 1) - response_help = "pets the" - response_disarm = "gently pushes aside the" - response_harm = "hits the" + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "hits" speed = 0 maxHealth = 25 health = 25 diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 985ffc7308a..2c748e1c625 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -81,7 +81,7 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message("[user] starts patching the damaged vein in [target]'s [affected.name] with \the [tool]." , \ "You start patching the damaged vein in [target]'s [affected.name] with \the [tool].") - target.custom_pain("The pain in [affected.name] is unbearable!") + target.custom_pain("The pain in your [affected.name] is unbearable!") ..() /datum/surgery_step/fix_vein/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) diff --git a/code/modules/tgui/modules/law_manager.dm b/code/modules/tgui/modules/law_manager.dm index 9f9be381d6e..25c7758c844 100644 --- a/code/modules/tgui/modules/law_manager.dm +++ b/code/modules/tgui/modules/law_manager.dm @@ -98,7 +98,7 @@ var/datum/ai_law/AL = locate(params["edit_law"]) in owner.laws.all_laws() // Dont allow non-admins to edit their own malf laws if(istype(AL, /datum/ai_law/zero) && (!check_rights(R_ADMIN))) - to_chat(usr, "You cant edit that law.") + to_chat(usr, "You can't edit that law.") return if(AL) var/new_law = sanitize(input(usr, "Enter new law. Leaving the field blank will cancel the edit.", "Edit Law", AL.law)) @@ -111,7 +111,7 @@ var/datum/ai_law/AL = locate(params["delete_law"]) in owner.laws.all_laws() // Dont allow non-admins to delete their own malf laws if(istype(AL, /datum/ai_law/zero) && (!check_rights(R_ADMIN))) - to_chat(usr, "You cant delete that law.") + to_chat(usr, "You can't delete that law.") return if(AL && is_malf(usr)) owner.delete_law(AL)