From 3304ffa45fa1e2c4e7b996fba9e666a349a63e98 Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Sun, 19 Apr 2015 13:45:16 +0300 Subject: [PATCH] span fixes --- code/game/gamemodes/cult/ritual.dm | 4 ++-- code/game/machinery/bots/bots.dm | 4 ++-- code/game/machinery/bots/secbot.dm | 4 ++-- code/game/machinery/iv_drip.dm | 2 +- code/game/objects/items/devices/pizza_bomb.dm | 2 +- code/game/objects/items/stacks/rods.dm | 2 +- .../objects/items/stacks/tiles/tile_types.dm | 10 ++++---- .../objects/items/weapons/cigs_lighters.dm | 13 +++++----- .../game/objects/items/weapons/clown_items.dm | 6 ++--- code/game/objects/items/weapons/cosmetics.dm | 24 +++++++++---------- code/game/objects/items/weapons/dice.dm | 4 ++-- code/modules/mob/living/carbon/human/human.dm | 8 +++---- .../modules/mob/living/silicon/robot/robot.dm | 3 ++- .../friendly/drone/interaction.dm | 16 ++++++------- code/modules/paperwork/photocopier.dm | 8 +++---- code/modules/power/apc.dm | 20 ++++++++-------- code/modules/power/cable.dm | 4 ++-- .../projectiles/guns/projectile/revolver.dm | 4 ++-- .../reagents/reagent_containers/pill.dm | 2 +- 19 files changed, 70 insertions(+), 70 deletions(-) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 0c8b13767d2..fcaa66cacd3 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -42,7 +42,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return if(ishuman(usr) || ismonkey(usr)) //Damage only applies to humans and monkeys, to allow constructs to communicate - usr.visible_message("[usr.name] starts clawing at his arms like a mad man!") + usr.visible_message("[usr.name] starts clawing at his arms like a mad man!", "You start clawing at his arms like a mad man!") apply_damage(25,BRUTE, "l_arm") apply_damage(25,BRUTE, "r_arm") sleep(50) @@ -55,7 +55,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", apply_damage(15,BRUTE, "r_arm") if(usr.incapacitated()) return - usr.visible_message("[usr.name] paints strange symbols with their own blood") + usr.visible_message("[usr.name] paints strange symbols with their own blood.", "You paint strange symbols with your own blood.") sleep(20) usr.say("O bidai nabora se[pick("'","`")]sma!") diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 0f11d3feee4..9e33f0731db 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -142,9 +142,9 @@ ..() if (health < maxhealth) if (health > maxhealth/3) - user << "[src]'s parts look loose." + user << "[src]'s parts look loose." else - user << "[src]'s parts look very loose." + user << "[src]'s parts look very loose!" else user << "[src] is in pristine condition." diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 357258087c5..b8a0114fc33 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -395,10 +395,10 @@ Auto Patrol: []"}, return if(!helmetCam) //I am so sorry for this. I could not think of a less terrible (and lazy) way. - user << "[src] needs to have a camera attached first." + user << "[src] needs to have a camera attached first!" return if(F) //Has a flashlight. Player must remove it, else it will be lost forever. - user << "The mounted flashlight is in the way, remove it first." + user << "The mounted flashlight is in the way, remove it first!" return if(S.secured) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 675ab8b78be..2255f1c0017 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -64,7 +64,7 @@ if(Adjacent(target) && usr.Adjacent(target)) if(beaker) - visible_message("[usr] attaches \the [src] to \the [target].") + usr.visible_message("[usr] attaches \the [src] to \the [target].", "You attach \the [src] to \the [target].") attached = target SSmachine.processing.Add(src) update_icon() diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index d02930dfa65..cbf2bb7d193 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -67,7 +67,7 @@ user.visible_message("[user] cuts the [chosen_wire] wire!", "You cut the [chosen_wire] wire!") sleep(5) if(chosen_wire == correct_wire) - src.audible_message("\icon[src] \The [src] suddenly stops beeping and seems lifeless.") + src.audible_message("\icon[src] \The [src] suddenly stops beeping and seems lifeless.") user << "You did it!" icon_state = "pizzabox_bomb_[correct_wire]" name = "pizza bomb" diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index e8fc2e9fe91..272c99697d4 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -44,7 +44,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ if(WT.remove_fuel(0,user)) var/obj/item/stack/sheet/metal/new_item = new(usr.loc) new_item.add_to_stacks(usr) - user.visible_message("[user.name] shaped [src] into metal with the welding tool.", \ + user.visible_message("[user.name] shaped [src] into metal with the welding tool.", \ "You shape [src] into metal with the welding tool.", \ "You hear welding.") var/obj/item/stack/rods/R = src diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 2c8cea91a59..2c64baf8224 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -33,7 +33,7 @@ if(mineralType == "plasma") atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 5) - user.visible_message("[user.name] set the plasma tiles on fire!", \ + user.visible_message("[user.name] sets the plasma tiles on fire!", \ "You set the plasma tiles on fire!") qdel(src) return @@ -41,9 +41,9 @@ if (mineralType == "metal") var/obj/item/stack/sheet/metal/new_item = new(user.loc) new_item.add_to_stacks(user) - user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \ + user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \ "You shaped [src] into metal with the weldingtool.", \ - "You hear welding.") + "You hear welding.") var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_hand()==R) @@ -55,9 +55,9 @@ var/sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineralType]") var/obj/item/stack/sheet/mineral/new_item = new sheet_type(user.loc) new_item.add_to_stacks(user) - user.visible_message("[user.name] shaped [src] into a sheet with the weldingtool.", \ + user.visible_message("[user.name] shaped [src] into a sheet with the weldingtool.", \ "You shaped [src] into a sheet with the weldingtool.", \ - "You hear welding.") + "You hear welding.") var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_hand()==R) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index ed350724205..230226e315b 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -479,16 +479,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM force = 5 damtype = "fire" hitsound = 'sound/items/welder.ogg' - attack_verb = list("burnt", "singed") + attack_verb = list("burnt", "signed") if(istype(src, /obj/item/weapon/lighter/zippo) ) - user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.") + user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.", "Without even breaking stride, you flip open and lights [src] in one smooth movement.") else if(prob(75)) - user.visible_message("After a few attempts, [user] manages to light [src].") + user.visible_message("After a few attempts, [user] manages to light [src].", "After a few attempts, you manage to light [src].") else - user << "You burn yourself while lighting the lighter." user.adjustFireLoss(5) - user.visible_message("After a few attempts, [user] manages to light [src], they however burn their finger in the process.") + user.visible_message("After a few attempts, [user] manages to light [src] - they however burn their finger in the process.", "You burn yourself while lighting the lighter!") user.AddLuminosity(1) SSobj.processing |= src @@ -499,9 +498,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM force = 0 attack_verb = null //human_defense.dm takes care of it if(istype(src, /obj/item/weapon/lighter/zippo) ) - user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing. Wow.") + user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing. Wow.", "You quietly shut off [src] without even looking at what you're doing. Wow.") else - user.visible_message("[user] quietly shuts off [src].") + user.visible_message("[user] quietly shuts off [src].", "You quietly shut off [src].") user.AddLuminosity(-1) SSobj.processing.Remove(src) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 542df146349..f67f6013119 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -48,15 +48,15 @@ if(user.client && (target in user.client.screen)) user << "You need to take that [target.name] off before cleaning it!" else if(istype(target,/obj/effect/decal/cleanable)) - user.visible_message("[user] begins to scrub \the [target.name] out with [src].") + user.visible_message("[user] begins to scrub \the [target.name] out with [src].", "You begin to scrub \the [target.name] out with [src]...") if(do_after(user, src.cleanspeed)) user << "You scrub \the [target.name] out." qdel(target) else if(ishuman(target) && user.zone_sel && user.zone_sel.selecting == "mouth") - user.visible_message("\the [user] washes \the [target]'s mouth out with [src.name]!") //washes mouth out with soap sounds better than 'the soap' here + user.visible_message("\the [user] washes \the [target]'s mouth out with [src.name]!", "You wash \the [target]'s mouth out with [src.name]!") //washes mouth out with soap sounds better than 'the soap' here return else - user.visible_message("[user] begins to clean \the [target.name] with [src]...") + user.visible_message("[user] begins to clean \the [target.name] with [src]...", "You begin to clean \the [target.name] with [src]...") if(do_after(user, src.cleanspeed)) user << "You clean \the [target.name]." var/obj/effect/decal/cleanable/C = locate() in target diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 19b2efef887..bd7c7c6f8bc 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -64,15 +64,15 @@ H.update_body() else user.visible_message("[user] begins to do [H]'s lips with \the [src].", \ - "You begin to apply \the [src]...") + "You begin to apply \the [src] on [H]'s lips...") if(do_after(user, 20) && do_after(H, 20, 5, 0)) //user needs to keep their active hand, H does not. - user.visible_message("[user] does [H]'s lips with \the [src].", \ - "You apply \the [src].") + user.visible_message("[user] does [H]'s lips with \the [src].", \ + "You apply \the [src] on [H]'s lips.") H.lip_style = "lipstick" H.lip_color = colour H.update_body() else - user << "Where are the lips on that?" + user << "Where are the lips on that?" //you can wipe off lipstick with paper! /obj/item/weapon/paper/attack(mob/M, mob/user) @@ -90,7 +90,7 @@ user.visible_message("[user] begins to wipe [H]'s lipstick off with \the [src].", \ "You begin to wipe off [H]'s lipstick...") if(do_after(user, 10) && do_after(H, 10, 5, 0)) //user needs to keep their active hand, H does not. - user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \ + user.visible_message("[user] wipes [H]'s lipstick off with \the [src].", \ "You wipe off [H]'s lipstick.") H.lip_style = null H.update_body() @@ -124,17 +124,17 @@ var/location = user.zone_sel.selecting if(location == "mouth") if(!get_location_accessible(H, location)) - user << "The mask is in the way." + user << "The mask is in the way!" return if(H.facial_hair_style == "Shaved") - user << "Already clean-shaven." + user << "Already clean-shaven!" return if(H == user) //shaving yourself - user.visible_message("[user] starts to shave their facial hair with [src].", \ + user.visible_message("[user] starts to shave their facial hair with [src].", \ "You take a moment to shave your facial hair with [src]...") if(do_after(user, 50)) - user.visible_message("[user] shaves his facial hair clean with [src].", \ + user.visible_message("[user] shaves his facial hair clean with [src].", \ "You finish shaving with [src]. Fast and clean!") shave(H, location) else @@ -149,17 +149,17 @@ else if(location == "head") if(!get_location_accessible(H, location)) - user << "The headgear is in the way." + user << "The headgear is in the way!" return if(H.hair_style == "Bald" || H.hair_style == "Balding Hair" || H.hair_style == "Skinhead") user << "There is not enough hair left to shave!" return if(H == user) //shaving yourself - user.visible_message("[user] starts to shave their head with [src].", \ + user.visible_message("[user] starts to shave their head with [src].", \ "You start to shave your head with [src]...") if(do_after(user, 50)) - user.visible_message("[user] shaves his head with [src].", \ + user.visible_message("[user] shaves his head with [src].", \ "You finish shaving with [src].") shave(H, location) else diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 81c98702773..0f6da959109 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -72,9 +72,9 @@ if(initial(icon_state) == "d00") result = (result - 1)*10 if(user != null) //Dice was rolled in someone's hand - user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \ + user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \ "You throw [src]. It lands on [result]. [comment]", \ - "You hear [src] landing on [result]. [comment]") + "You hear [src] rolling.") else if(src.throwing == 0) //Dice was thrown and is coming to rest visible_message("[src] rolls to a stop, landing on [result]. [comment]") diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3efd48b22c6..0f8f8d366ae 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -678,7 +678,7 @@ if(health >= 0) if(src == M) visible_message( \ - "[src] examines \himself.", \ + "[src] examines \himself.", \ "You check yourself for injuries.") for(var/obj/item/organ/limb/org in organs) @@ -734,10 +734,10 @@ src << "[C.name] is dead!" return if(is_mouth_covered()) - src << "Remove your mask!" + src << "Remove your mask first!" return 0 if(C.is_mouth_covered()) - src << "Remove their mask!" + src << "Remove their mask first!" return 0 if(C.cpr_time < world.time + 30) @@ -753,7 +753,7 @@ var/suff = min(C.getOxyLoss(), 7) C.adjustOxyLoss(-suff) C.updatehealth() - visible_message("[src] performs CPR on [C.name]!") + src.visible_message("[src] performs CPR on [C.name]!", "You perform CPR on [C.name].") C << "You feel a breath of fresh air enter your lungs... It feels good..." diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index fd755e9e700..c9b817fa344 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -454,7 +454,7 @@ if (wiresexposed) wires.Interact(user) else - user << "You can't reach the wiring." + user << "You can't reach the wiring!" else if(istype(W, /obj/item/weapon/screwdriver) && opened && !cell) // haxing wiresexposed = !wiresexposed @@ -475,6 +475,7 @@ return else playsound(src, 'sound/items/Ratchet.ogg', 50, 1) + user << "You start to unfasten [src]'s securing bolts..." if(do_after(user, 50) && !cell) user.visible_message("[user] deconstructs [src]!", "You unfasten the securing bolts, and [src] falls to pieces!") deconstruct() diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm index 1a0561a41f5..61ffbe0eecf 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm @@ -32,14 +32,14 @@ D << "You can't seem to find the [pick(faux_gadgets)]! Without it, [src] [pick(faux_problems)]." return - D.visible_message("[D] begins to reactivate [src].") + D.visible_message("[D] begins to reactivate [src].", "You begin to reactivate [src]...") if(do_after(user,30,needhand = 1)) health = health_repair_max stat = CONSCIOUS icon_state = icon_living dead_mob_list -= src living_mob_list += src - D.visible_message("[D] reactivates [src]!") + D.visible_message("[D] reactivates [src]!", "You reactivate [src].") alert_drones(DRONE_NET_CONNECT) if(G) G << "DRONE NETWORK: You were reactivated by [D]!" @@ -48,9 +48,9 @@ if("Cannibalize") if(D.health < D.maxHealth) - D.visible_message("[D] begins to cannibalize parts from [src].") + D.visible_message("[D] begins to cannibalize parts from [src].", "You begin to cannibalize parts from [src]...") if(do_after(D, 60,5,0)) - D.visible_message("[D] repairs itself using [src]'s remains!") + D.visible_message("[D] repairs itself using [src]'s remains!", "You repair yourself using [src]'s remains.") D.adjustBruteLoss(-src.maxHealth) new /obj/effect/decal/cleanable/oil/streak(get_turf(src)) qdel(src) @@ -69,9 +69,9 @@ ..() return if(user.get_active_hand()) - user << "Your hands are full." + user << "Your hands are full!" return - src << "[user] is trying to pick you up!" + src << "[user] is trying to pick you up!" if(buckled) user << "[src] is buckled to the [buckled.name] and cannot be picked up!" return @@ -96,11 +96,11 @@ if(do_after(user,80)) var/repair = health_repair_max - health adjustBruteLoss(-repair) - visible_message("[user] tightens [src == user ? "their" : "[src]'s"] loose screws!") + visible_message("[user] tightens [src == user ? "their" : "[src]'s"] loose screws!", "You tighten [src == user ? "their" : "[src]'s"] loose screws.") else user << "You need to remain still to tighten [src]'s screws!" else - user << "[src]'s screws can't get any tighter!" + user << "[src]'s screws can't get any tighter!" else ..() diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index e86a9c23b13..8cf5b05510b 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -302,18 +302,18 @@ return src.add_fingerprint(user) if(target == user) - visible_message("[user] starts climbing onto the photocopier!") + user.visible_message("[user] starts climbing onto the photocopier!", "You start climbing onto the photocopier...") else - visible_message("[user] starts putting [target] onto the photocopier!") + user.visible_message("[user] starts putting [target] onto the photocopier!", "You start putting [target] onto the photocopier...") if(do_after(user, 20)) if(!target || target.gc_destroyed || gc_destroyed || !Adjacent(target)) //check if the photocopier/target still exists. return if(target == user) - visible_message("[user] climbs onto the photocopier!") + user.visible_message("[user] climbs onto the photocopier!", "You climb onto the photocopier.") else - visible_message("[user] puts [target] onto the photocopier!") + user.visible_message("[user] puts [target] onto the photocopier!", "You put [target] onto the photocopier.") target.loc = get_turf(src) ass = target diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 9e1b34522ca..62c0b2dbcfb 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -386,13 +386,13 @@ has_electronics = 0 if ((stat & BROKEN) || malfhack) user.visible_message(\ - "[user.name] has broken the power control board inside [src.name]!",\ + "[user.name] has broken the power control board inside [src.name]!",\ "You break the charred power control board and remove the remains.", "You hear a crack!") //ticker.mode:apcs-- //XSI said no and I agreed. -rastaf0 else user.visible_message(\ - "[user.name] has removed the power control board from [src.name]!",\ + "[user.name] has removed the power control board from [src.name]!",\ "You remove the power control board.") new /obj/item/weapon/module/power_control(loc) else if (opened!=2) //cover isn't removed @@ -472,7 +472,7 @@ if(C.get_amount() < 10) user << "You need ten lengths of cable for APC!" return - user.visible_message("[user.name] adds cables to the APC frame.", \ + user.visible_message("[user.name] adds cables to the APC frame.", \ "You start adding cables to the APC frame...") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) @@ -492,7 +492,7 @@ terminal.dismantle(user) else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack)) - user.visible_message("[user.name] inserts the power control board into [src].", \ + user.visible_message("[user.name] inserts the power control board into [src].", \ "You start to insert the power control board into the frame...") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 10)) @@ -508,7 +508,7 @@ if (WT.get_fuel() < 3) user << "You need more welding fuel to complete this task!" return - user.visible_message("[user.name] welds [src].", \ + user.visible_message("[user.name] welds [src].", \ "You start welding the APC frame...", \ "You hear welding.") playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) @@ -517,12 +517,12 @@ if (emagged || malfhack || (stat & BROKEN) || opened==2) new /obj/item/stack/sheet/metal(loc) user.visible_message(\ - "[user.name] has cut [src] apart with [W].",\ + "[user.name] has cut [src] apart with [W].",\ "You disassembled the broken APC frame.") else new /obj/item/apc_frame(loc) user.visible_message(\ - "[user.name] has cut [src] from the wall with [W].",\ + "[user.name] has cut [src] from the wall with [W].",\ "You cut the APC frame from the wall.") qdel(src) return @@ -531,7 +531,7 @@ if (opened==2) opened = 1 user.visible_message(\ - "[user.name] has replaced the damaged APC frontal panel with a new one.",\ + "[user.name] has replaced the damaged APC frontal panel with a new one.",\ "You replace the damaged APC frontal panel with a new one.") qdel(W) update_icon() @@ -539,7 +539,7 @@ if (has_electronics) user << "You cannot repair this APC until you remove the electronics still inside!" return - user.visible_message("[user.name] replaces the damaged APC frame with a new one.",\ + user.visible_message("[user.name] replaces the damaged APC frame with a new one.",\ "You begin to replace the damaged APC frame...") if(do_after(user, 50)) user << "You replace the damaged APC frame with a new one." @@ -604,7 +604,7 @@ cell.updateicon() src.cell = null - user.visible_message("[user.name] removes the power cell from [src.name]!",\ + user.visible_message("[user.name] removes the power cell from [src.name]!",\ "You remove the power cell.") //user << "You remove the power cell." charging = 0 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 1eedd5e85d8..03c2ace4c12 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -135,7 +135,7 @@ By design, d1 is the smallest direction and d2 is the highest if(istype(W, /obj/item/weapon/wirecutters)) if (shock(user, 50)) return - visible_message("[user] cuts the cable.") + user.visible_message("[user] cuts the cable.", "You cut the cable.") stored.add_fingerprint(user) investigate_log("was cut by [key_name(usr, usr.client)] in [user.loc.loc]","wires") Deconstruct() @@ -144,7 +144,7 @@ By design, d1 is the smallest direction and d2 is the highest else if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W if (coil.get_amount() < 1) - user << "Not enough cable" + user << "Not enough cable!" return coil.cable_join(src, user) diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index a885ae4e2f7..1013e5d9067 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -158,7 +158,7 @@ /obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user as mob) if(!spun && can_shoot()) - user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") + user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.") Spin() else var/num_unloaded = 0 @@ -185,7 +185,7 @@ return if(target != user) if(ismob(target)) - user << "A mechanism prevents you from shooting anyone but yourself." + user << "A mechanism prevents you from shooting anyone but yourself!" return if(ishuman(user)) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 4aff93675e5..03e5a104efa 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -63,7 +63,7 @@ return user << "You dissolve [src] in [target]." for(var/mob/O in viewers(2, user)) //viewers is necessary here because of the small radius - O << "[user] slips something into [target]." + O << "[user] slips something into [target]!" reagents.trans_to(target, reagents.total_volume) spawn(5) qdel(src)