diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 62a575b11d1..68b4f2f104d 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -44,12 +44,12 @@
/mob/living/simple_animal/attacked_by(var/obj/item/I, var/mob/living/user)
if(!I.force)
user.visible_message("[user] gently taps [src] with [I].",\
- "This weapon is ineffective, it does no damage.")
+ "This weapon is ineffective, it does no damage!")
else if(I.force >= force_threshold && I.damtype != STAMINA)
..()
else
- visible_message("[I] bounces harmlessly off of [src].",\
- "[I] bounces harmlessly off of [src].")
+ visible_message("[I] bounces harmlessly off of [src].",\
+ "[I] bounces harmlessly off of [src]!")
diff --git a/code/game/dna.dm b/code/game/dna.dm
index 57c02ef539b..58f5ac12a95 100644
--- a/code/game/dna.dm
+++ b/code/game/dna.dm
@@ -411,7 +411,7 @@
return
locked = 0
- visible_message("[user] successfully broke out of [src]!")
+ visible_message("[user] successfully broke out of [src]!")
user << "You successfully break out of [src]!"
open_machine()
diff --git a/code/game/gamemodes/abduction/abduction_surgery.dm b/code/game/gamemodes/abduction/abduction_surgery.dm
index 62308897062..f6a6f32a66e 100644
--- a/code/game/gamemodes/abduction/abduction_surgery.dm
+++ b/code/game/gamemodes/abduction/abduction_surgery.dm
@@ -17,16 +17,16 @@
if(I.type in organ_types)
IC = I
break
- user.visible_message("[user] starts to remove [target]'s organs.")
+ user.visible_message("[user] starts to remove [target]'s organs.", "You start to remove [target]'s organs...")
/datum/surgery_step/extract_organ/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(IC)
- user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!")
+ user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "You pull [IC] out of [target]'s [target_zone].")
user.put_in_hands(IC)
target.internal_organs -= IC
return 1
else
- user.visible_message("[user] doesn't find anything in [target]'s [target_zone].")
+ user << "You don't find anything in [target]'s [target_zone]!"
return 0
/datum/surgery_step/gland_insert
@@ -34,10 +34,10 @@
time = 32
/datum/surgery_step/gland_insert/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] starts to insert [tool] into [target].")
+ user.visible_message("[user] starts to insert [tool] into [target].", "You start to insert [tool] into [target]...")
/datum/surgery_step/gland_insert/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] inserts [tool] into [target].")
+ user.visible_message("[user] inserts [tool] into [target].", "You insert [tool] into [target].")
user.drop_item()
var/obj/item/gland/gland = tool
gland.Inject(target)
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index f21a4b99e79..c9a01b96900 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -315,7 +315,7 @@
user << "The welding tool must be on to complete this task!"
return
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
- user << "You start deconstructing the frame."
+ user << "You start deconstructing the frame..."
if(do_after(user, 20))
if(!src || !WT.isOn()) return
user << "You deconstruct the frame."
@@ -325,7 +325,7 @@
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "You start to unfasten the frame."
+ user << "You start to unfasten the frame..."
if(do_after(user, 20))
user << "You unfasten the frame."
anchored = 0
@@ -365,11 +365,11 @@
var/obj/item/stack/cable_coil/C = P
if(C.get_amount() >= 5)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
- user << "You start adding cables to the frame."
+ user << "You start adding cables to the frame..."
if(do_after(user, 20))
if(C.get_amount() >= 5 && state == 2)
C.use(5)
- user << "You add cables to the frame..."
+ user << "You add cables to the frame."
state = 3
icon_state = "3"
else
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 29225878e42..471818ca3c4 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -67,11 +67,11 @@ for reference:
user.changeNext_move(CLICK_CD_MELEE)
if (istype(W, /obj/item/stack/sheet/mineral/wood))
if (src.health < src.maxhealth)
- visible_message("[user] begins to repair \the [src]!")
+ visible_message("[user] begins to repair \the [src]!", "You begin to repair \the [src]...")
if(do_after(user,20))
src.health = src.maxhealth
W:use(1)
- visible_message("[user] repairs \the [src]!")
+ visible_message("[user] repairs \the [src]!", "You repair \the [src].")
return
else
return
@@ -84,7 +84,7 @@ for reference:
src.health -= W.force * 0.75
else
if (src.health <= 0)
- visible_message("The barricade is smashed apart!")
+ visible_message("The barricade is smashed apart!")
new /obj/item/stack/sheet/mineral/wood(get_turf(src))
new /obj/item/stack/sheet/mineral/wood(get_turf(src))
new /obj/item/stack/sheet/mineral/wood(get_turf(src))
@@ -94,13 +94,13 @@ for reference:
/obj/structure/barricade/wooden/ex_act(severity, target)
switch(severity)
if(1.0)
- visible_message("The barricade is blown apart!")
+ visible_message("The barricade is blown apart!")
qdel(src)
return
if(2.0)
src.health -= 25
if (src.health <= 0)
- visible_message("The barricade is blown apart!")
+ visible_message("The barricade is blown apart!")
new /obj/item/stack/sheet/mineral/wood(get_turf(src))
new /obj/item/stack/sheet/mineral/wood(get_turf(src))
new /obj/item/stack/sheet/mineral/wood(get_turf(src))
@@ -110,7 +110,7 @@ for reference:
/obj/structure/barricade/wooden/blob_act()
src.health -= 25
if (src.health <= 0)
- visible_message("The blob eats through the barricade!")
+ visible_message("The blob eats through the barricade!")
qdel(src)
return
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 999bf32d41b..714d70e0907 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -707,6 +707,7 @@
return
playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
+ user << "You start to remove the turret's interior metal armor..."
if(do_after(user, 20))
if(!src || !WT.remove_fuel(5, user)) return
build_step = 1
@@ -782,6 +783,7 @@
user << "You need more fuel to complete this task!"
playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
+ user << "You begin to weld the turret's armor down..."
if(do_after(user, 30))
if(!src || !WT.remove_fuel(5, user))
return
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index ba94519f738..cc5c8e96fb8 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -455,7 +455,7 @@
else
isopen = 1
islocked = 0
- visible_message("[user] successfully broke out of [src]!")
+ visible_message("[user] successfully broke out of [src]!")
else
return
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index e22bc5ba706..fb3c28a3d27 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -93,8 +93,8 @@
return
set_ready_state(0)
chassis.use_power(energy_drain)
- target.visible_message("[chassis] starts to drill [target]", \
- "[chassis] starts to drill [target]", \
+ target.visible_message("[chassis] starts to drill [target].", \
+ "[chassis] starts to drill [target]...", \
"You hear drilling.")
var/T = chassis.loc
var/C = target.loc //why are these backwards? we may never know -Pete
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 0c69c112d3d..42d25b93a92 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -1527,7 +1527,7 @@ var/year_integer = text2num(year) // = 2013???
src.dna = null
if(href_list["repair_int_control_lost"])
if(usr != src.occupant) return
- src.occupant_message("Recalibrating coordination system.")
+ src.occupant_message("Recalibrating coordination system...")
src.log_message("Recalibration of coordination system started.")
var/T = src.loc
if(do_after(100))
@@ -1536,7 +1536,7 @@ var/year_integer = text2num(year) // = 2013???
src.occupant_message("Recalibration successful.")
src.log_message("Recalibration of coordination system finished with 0 errors.")
else
- src.occupant_message("Recalibration failed.")
+ src.occupant_message("Recalibration failed!")
src.log_message("Recalibration of coordination system failed with 1 error.",1)
//debug
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index daf2e5da390..b680e468d13 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -233,7 +233,7 @@
var/breakout_time = 2
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + CLICK_CD_BREAKOUT
- user << "You struggle against the tight bonds! (This will take about [breakout_time] minutes.)"
+ user << "You struggle against the tight bonds... (This will take about [breakout_time] minutes.)"
visible_message("You see something struggling and writhing in \the [src]!")
if(do_after(user,(breakout_time*60*10)))
if(!user || user.stat != CONSCIOUS || user.loc != src)
@@ -243,7 +243,7 @@
/obj/effect/spider/cocoon/Destroy()
- src.visible_message("\The [src] splits open.")
+ src.visible_message("\The [src] splits open.")
for(var/atom/movable/A in contents)
A.loc = src.loc
..()
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 4d00da3e8f5..f758904770d 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -122,7 +122,7 @@
if(!building_checks(R, multiplier))
return
if (R.time)
- usr << "You start building [R.title]..."
+ usr.visible_message("[usr] starts building [R.title].", "You start building [R.title]...")
if (!do_after(usr, R.time))
return
if(!building_checks(R, multiplier))
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index e76181e672a..b04cbfa5467 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -110,7 +110,7 @@ RCD
if(istype(W, /obj/item/weapon/rcd_ammo))
var/obj/item/weapon/rcd_ammo/R = W
if((matter + R.ammoamt) > max_matter)
- user << "The RCD cant hold any more matter-units."
+ user << "The RCD can't hold any more matter-units!"
return
user.drop_item()
qdel(W)
@@ -127,19 +127,19 @@ RCD
switch(mode)
if(1)
mode = 2
- user << "Changed mode to 'Airlock'"
+ user << "You change RCD's mode to 'Airlock'."
if(prob(20))
src.spark_system.start()
return
if(2)
mode = 3
- user << "Changed mode to 'Deconstruct'"
+ user << "You change RCD's mode to 'Deconstruct'."
if(prob(20))
src.spark_system.start()
return
if(3)
mode = 1
- user << "Changed mode to 'Floor & Walls'"
+ user << "You change RCD's mode to 'Floor & Walls'."
if(prob(20))
src.spark_system.start()
return
@@ -161,7 +161,7 @@ RCD
if(1)
if(istype(A, /turf/space))
if(useResource(1, user))
- user << "Building Floor..."
+ user << "You start building floor..."
activate()
A:ChangeTurf(/turf/simulated/floor/plating)
return 1
@@ -169,7 +169,7 @@ RCD
if(istype(A, /turf/simulated/floor))
if(checkResource(3, user))
- user << "Building Wall ..."
+ user << "You start building wall..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 20))
if(!useResource(3, user)) return 0
@@ -188,7 +188,7 @@ RCD
break
if(door_check)
- user << "Building Airlock..."
+ user << "You start building airlock..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 50))
if(!useResource(10, user)) return 0
@@ -202,7 +202,7 @@ RCD
return 1
return 0
else
- user << "There is another door here!"
+ user << "There is another door here!"
return 0
return 0
@@ -211,7 +211,7 @@ RCD
if(istype(A, /turf/simulated/wall/r_wall) && !canRwall)
return 0
if(checkResource(5, user))
- user << "Deconstructing Wall..."
+ user << "You start deconstructing wall..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 40))
if(!useResource(5, user)) return 0
@@ -222,7 +222,7 @@ RCD
if(istype(A, /turf/simulated/floor))
if(checkResource(5, user))
- user << "Deconstructing Floor..."
+ user << "You start deconstructing floor..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 50))
if(!useResource(5, user)) return 0
@@ -233,7 +233,7 @@ RCD
if(istype(A, /obj/machinery/door/airlock))
if(checkResource(20, user))
- user << "Deconstructing Airlock..."
+ user << "You start deconstructing airlock..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 50))
if(!useResource(20, user)) return 0
diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm
index 2928fcd9ce2..360e473ab26 100644
--- a/code/game/objects/items/weapons/RPD.dm
+++ b/code/game/objects/items/weapons/RPD.dm
@@ -536,7 +536,7 @@ var/global/list/RPD_recipes=list(
if(EATING_MODE) // Eating pipes
// Must click on an actual pipe or meter.
if(istype(A,/obj/item/pipe) || istype(A,/obj/item/pipe_meter) || istype(A,/obj/structure/disposalconstruct))
- user << "Destroying Pipe..."
+ user << "You start destroying pipe..."
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 5))
activate()
@@ -551,7 +551,7 @@ var/global/list/RPD_recipes=list(
if(!(istype(A, /turf)))
user << "The [src]'s error light flickers!"
return 0
- user << "Building Pipes..."
+ user << "You start building pipes..."
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 20))
activate()
@@ -566,7 +566,7 @@ var/global/list/RPD_recipes=list(
if(!(istype(A, /turf)))
user << "The [src]'s error light flickers!"
return 0
- user << "Building Meter..."
+ user << "You start building meter..."
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 20))
activate()
@@ -578,7 +578,7 @@ var/global/list/RPD_recipes=list(
if(!(istype(A, /turf)))
user << "The [src]'s error light flickers!"
return 0
- user << "Building Pipes..."
+ user << "You start building pipes..."
playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
if(do_after(user, 20))
var/obj/structure/disposalconstruct/C = new (A, queued_p_type ,queued_p_dir)
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 2912b4bc7ce..a44dc2c14e0 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -375,7 +375,7 @@
for(var/obj/item/carried_item in H.contents)
if(istype(carried_item, /obj/item/clothing/suit/space))
if(!defib.combat)
- user.visible_message("[defib] buzzes: Patient's chest is obscured. Operation aborted.")
+ user.visible_message("[defib] buzzes: Patient's chest is obscured. Operation aborted.")
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
busy = 0
update_icon()
@@ -429,10 +429,10 @@
cooldown = 1
defib.cooldowncheck(user)
else
- user.visible_message("[defib] buzzes: Patient is not in a valid state. Operation aborted.")
+ user.visible_message("[defib] buzzes: Patient is not in a valid state. Operation aborted.")
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
busy = 0
update_icon()
else
- user << "You need to target your patient's chest with [src]."
+ user << "You need to target your patient's chest with [src]!"
return
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index d1ad1fb981d..8f992ab49d1 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -66,7 +66,7 @@
if(loc == target)
return
- user << "Planting explosives..."
+ user << "You start planting the bomb..."
if(do_after(user, 50) && in_range(user, target))
user.drop_item()
@@ -75,7 +75,7 @@
if (ismob(target))
add_logs(user, target, "planted [name] on")
- user.visible_message("[user.name] finished planting an explosive on [target.name]!")
+ user.visible_message("[user.name] finished planting an explosive on [target.name].", "You finish planting an explosive on [target.name].")
message_admins("[key_name(user, user.client)](?) planted [src.name] on [key_name(target)](?) with [timer] second fuse",0,1)
log_game("[key_name(user)] planted [src.name] on [key_name(target)] with [timer] second fuse")
@@ -84,7 +84,7 @@
log_game("[key_name(user)] planted [src.name] on [target.name] at ([target.x],[target.y],[target.z]) with [timer] second fuse")
target.overlays += image_overlay
- user << "Bomb has been planted. Timer counting down from [timer]."
+ user << "You plant the bomb. Timer counting down from [timer]."
spawn(timer*10)
if(target && !target.gc_destroyed)
explode(get_turf(target))
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index e8ebdd6d7dc..b3023ea69ef 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -25,9 +25,9 @@
var/turf/T = get_turf(M)
if(T && (M == user || do_after(user, 50)))
if(user && M && (get_turf(M) == T) && src && imp)
- M.visible_message("[user] has implanted [M].")
+ M.visible_message("[user] has implanted [M].", "[user] implants you with the implant.")
add_logs(user, M, "implanted", object="[name]")
- user << "You implanted the implant into [M]."
+ user << "You implant the implant into [M]."
if(imp.implanted(M))
imp.loc = M
imp.imp_in = M
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 22ee1031980..5b719a3f190 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -36,7 +36,7 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A)
if(!proximity) return
if(reagents.total_volume < 1)
- user << "Your mop is dry!"
+ user << "Your mop is dry!"
return
var/turf/simulated/turf = A
@@ -45,11 +45,11 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A)
A = null
if(istype(turf))
- user.visible_message("[user] begins to clean \the [turf] with [src].")
+ user.visible_message("[user] begins to clean \the [turf] with [src].", "You begin to clean \the [turf] with [src]...")
if(do_after(user, mopspeed))
clean(turf)
- user << "You have finished mopping!"
+ user << "You finish mopping./span>"
/obj/effect/attackby(obj/item/I, mob/user, params)
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 83508dc4ccc..bf2f725f6c2 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -233,7 +233,7 @@
welded = !welded
user << "You [welded ? "weld [src] shut":"unweld [src]"]."
update_icon()
- user.visible_message("[user.name] has [welded ? "welded [src] shut":"unwelded [src]"].")
+ user.visible_message("[user.name] has [welded ? "welded [src] shut":"unwelded [src]"].", "You [welded ? "weld [src] shut":"unweld [src]"].")
return
if(secure && broken)
user << "The locker appears to be broken."
@@ -337,8 +337,7 @@
welded = 0 //applies to all lockers lockers
locked = 0 //applies to critter crates and secure lockers only
broken = 1 //applies to secure lockers only
- visible_message("[user] successfully broke out of [src]!")
- user << "You successfully break out of [src]!"
+ user.visible_message("[user] successfully broke out of [src]!", "You successfully break out of [src]!")
if(istype( src.loc, /obj/structure/bigDelivery))
var/obj/structure/bigDelivery/D = src.loc
qdel(D)
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index 77f41cddb2d..7a677e8fa42 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -78,7 +78,7 @@
else if(mybag)
mybag.attackby(I, user)
else if(istype(I, /obj/item/weapon/crowbar))
- user.visible_message("[user] begins to empty the contents of [src].")
+ user.visible_message("[user] begins to empty the contents of [src].", "You begin to empty the contents of [src]...")
if(do_after(user, 30))
usr << "You empty the contents of [src]'s bucket onto the floor."
reagents.reaction(src.loc)
diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm
index dfcb2f58270..98e64467ee0 100644
--- a/code/game/objects/structures/ladders.dm
+++ b/code/game/objects/structures/ladders.dm
@@ -40,27 +40,27 @@
if(up && down)
switch( alert("Go up or down the ladder?", "Ladder", "Up", "Down", "Cancel") )
if("Up")
- user.visible_message("[user] climbs up \the [src]!", \
- "You climb up \the [src]!")
+ user.visible_message("[user] climbs up \the [src].", \
+ "You climb up \the [src].")
user.loc = get_turf(up)
up.add_fingerprint(user)
if("Down")
- user.visible_message("[user] climbs down \the [src]!", \
- "You climb down \the [src]!")
+ user.visible_message("[user] climbs down \the [src].", \
+ "You climb down \the [src].")
user.loc = get_turf(down)
down.add_fingerprint(user)
if("Cancel")
return
else if(up)
- user.visible_message("[user] climbs up \the [src]!", \
- "You climb up \the [src]!")
+ user.visible_message("[user] climbs up \the [src].", \
+ "You climb up \the [src].")
user.loc = get_turf(up)
up.add_fingerprint(user)
else if(down)
- user.visible_message("[user] climbs down \the [src]!", \
- "You climb down \the [src]!")
+ user.visible_message("[user] climbs down \the [src].", \
+ "You climb down \the [src].")
user.loc = get_turf(down)
down.add_fingerprint(user)
diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm
index 3a191773127..7178f8c35ac 100644
--- a/code/game/objects/structures/lamarr_cage.dm
+++ b/code/game/objects/structures/lamarr_cage.dm
@@ -75,8 +75,8 @@
if (src.destroyed)
return
else
- user.visible_message("[user] kicks the lab cage.", \
- "You kick the lab cage.")
+ user.visible_message("[user] kicks the lab cage.", \
+ "You kick the lab cage.")
src.health -= 2
healthcheck()
return
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 050f225a6b4..3776b5306e2 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -65,7 +65,7 @@
return
if(prob(I.force * 2))
- visible_message("[user] smashes [src] with [I]!")
+ visible_message("[user] smashes [src] with [I].")
shatter()
else
visible_message("[user] hits [src] with [I]!")
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index de189740406..526e9e3f028 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -243,7 +243,7 @@ Crematorium Switch
connected.close()
add_fingerprint(user)
else
- user << "That's not connected to anything."
+ user << "That's not connected to anything!"
/obj/structure/tray/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
if(!istype(O, /atom/movable) || O.anchored || !Adjacent(user) || !user.Adjacent(O) || O.loc == user)
@@ -259,7 +259,7 @@ Crematorium Switch
return
O.loc = src.loc
if (user != O)
- visible_message("[user] stuffs [O] into [src]!")
+ visible_message("[user] stuffs [O] into [src].")
return
/*
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 3efe4925963..86ec583212d 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -22,60 +22,60 @@
if(istype(W, /obj/item/weapon/wrench))
if(anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user.visible_message("[user] is loosening the [name]'s bolts...", \
+ user.visible_message("[user] is loosening the [name]'s bolts.", \
"You are loosening the [name]'s bolts...")
if(do_after(user,40))
if(!src.loc || !anchored)
return
- user.visible_message("[user] loosened the [name]'s bolts!", \
- "You loosened the [name]'s bolts!")
+ user.visible_message("[user] loosened the [name]'s bolts!", \
+ "You loosen the [name]'s bolts!")
anchored = 0
else
if (!istype(src.loc, /turf/simulated/floor))
- user.visible_message("A floor must be present to secure the [name]!")
+ user.visible_message("A floor must be present to secure the [name]!")
return
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user.visible_message("[user] is securing the [name]'s bolts...", \
+ user.visible_message("[user] is securing the [name]'s bolts...", \
"You are securing the [name]'s bolts...")
if(do_after(user, 40))
if(!src.loc || anchored)
return
- user.visible_message("[user] has secured the [name]'s bolts!", \
- "You have secured the [name]'s bolts!")
+ user.visible_message("[user] has secured the [name]'s bolts.", \
+ "You have secured the [name]'s bolts.")
anchored = 1
else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
- user.visible_message("[user] is slicing apart the [name]...", \
+ user.visible_message("[user] is slicing apart the [name]...", \
"You are slicing apart the [name]...")
if(do_after(user,30))
if(!src.loc)
return
- user.visible_message("[user] slices apart the [name]!", \
- "You slice apart the [name]!")
+ user.visible_message("[user] slices apart the [name].", \
+ "You slice apart the [name].")
Dismantle(1)
else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
var/obj/item/weapon/pickaxe/drill/jackhammer/D = W
if(!D.bcell.use(D.drillcost))
- user << "Your [D.name] doesn't have enough power to break through the [name]."
+ user << "Your [D.name] doesn't have enough power to break through the [name]!"
return
D.update_icon()
if(!src.loc)
return
- user.visible_message("[user] destroys the [name]!", \
- "You destroy the [name]!")
+ user.visible_message("[user] destroys the [name]!", \
+ "You destroy the [name].")
D.playDigSound()
qdel(src)
else if(istype(W, /obj/item/weapon/weldingtool) && !anchored)
playsound(loc, 'sound/items/Welder.ogg', 40, 1)
- user.visible_message("[user] is slicing apart the [name]...", \
+ user.visible_message("[user] is slicing apart the [name].", \
"You are slicing apart the [name]...")
if(do_after(user, 40))
if(!src.loc)
return
playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
- user.visible_message("[user] slices apart the [name]!", \
+ user.visible_message("[user] slices apart the [name].", \
"You slice apart the [name]!")
Dismantle(1)
@@ -87,7 +87,7 @@
/obj/structure/statue/attack_hand(mob/living/user as mob)
user.changeNext_move(CLICK_CD_MELEE)
add_fingerprint(user)
- user.visible_message("[user] rubs some dust off from the [name]'s surface.", \
+ user.visible_message("[user] rubs some dust off from the [name]'s surface.", \
"You rub some dust off from the [name]'s surface.")
/obj/structure/statue/CanAtmosPass()
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 950e27b42eb..af9c059a8f7 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -92,7 +92,7 @@
return
if(buckled_mob)
return 0
- visible_message("[usr] collapses \the [src.name].")
+ usr.visible_message("[usr] collapses \the [src.name].", "You collapse \the [src.name].")
new/obj/item/roller(get_turf(src))
qdel(src)
return
@@ -114,7 +114,7 @@
if(loaded)
var/obj/structure/stool/bed/roller/R = loaded
R.loc = user.loc
- user.visible_message("[user] deploys [loaded].")
+ user.visible_message("[user] deploys [loaded].", "You deploy [loaded].")
loaded = null
else
user << "The dock is empty!"
@@ -124,7 +124,7 @@
if(!proximity)
return
if(loaded)
- user << "You already have a roller bed docked!"
+ user << "You already have a roller bed docked!"
return
var/obj/structure/stool/bed/roller/R = target
@@ -133,6 +133,6 @@
loaded = target
target.loc = src
- user.visible_message("[user] collects [loaded].")
+ user.visible_message("[user] collects [loaded].", "You collect [loaded].")
..()
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 669a328a3d1..d7d6b0ddc24 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -307,7 +307,7 @@
for(var/obj/item/C in oldContents)
C.loc = src.loc
- user.visible_message("[user] empties [I] on [src].")
+ user.visible_message("[user] empties [I] on [src].")
return
// If the tray IS empty, continue on (tray will be placed on the table like other items)
@@ -568,20 +568,20 @@
user.do_attack_animation(src)
playsound(loc, 'sound/items/dodgeball.ogg', 80, 1)
user.visible_message("[user] kicks [src].", \
- "You kick [src].")
+ "You kick [src].")
health -= rand(1,2)
healthcheck()
/obj/structure/rack/attack_alien(mob/living/user)
user.do_attack_animation(src)
- visible_message("[user] slices [src] apart!")
+ visible_message("[user] slices [src] apart.")
rack_destroy()
/obj/structure/rack/attack_animal(mob/living/simple_animal/user)
if(user.environment_smash)
user.do_attack_animation(src)
- visible_message("[user] smashes [src] apart!")
+ visible_message("[user] smashes [src] apart.")
rack_destroy()
/obj/structure/rack/attack_tk() // no telehulk sorry
return
@@ -615,7 +615,7 @@
return
/obj/item/weapon/rack_parts/attack_self(mob/user as mob)
- user << "Constructing rack..."
+ user << "You start constructing rack..."
if (do_after(user, 50))
var/obj/structure/rack/R = new /obj/structure/rack( user.loc )
R.add_fingerprint(user)
diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm
index 949f192ecc7..cbc1fbb529a 100644
--- a/code/game/objects/structures/transit_tubes/station.dm
+++ b/code/game/objects/structures/transit_tubes/station.dm
@@ -54,7 +54,7 @@
T.add_fingerprint(user)
T.loc = src.loc
T.dir = turn(src.dir, -90)
- user.visible_message("[user] inserts the [R].", "You insert the [R].")
+ user.visible_message("[user] inserts the [R].", "You insert the [R].")
qdel(R)
@@ -67,7 +67,7 @@
else if(icon_state == "open")
if(pod.contents.len && user.loc != pod)
- user.visible_message("[user] starts emptying [pod]'s contents onto the floor!")
+ user.visible_message("[user] starts emptying [pod]'s contents onto the floor.", "You start emptying [pod]'s contents onto the floor...")
if(do_after(user, 10)) //So it doesn't default to close_animation() on fail
if(pod.loc == loc)
for(var/atom/movable/AM in pod)
@@ -96,9 +96,9 @@
if(istype(W, /obj/item/weapon/crowbar))
for(var/obj/structure/transit_tube_pod/pod in loc)
if(pod.contents)
- user << "Empty the pod first."
+ user << "Empty the pod first!"
return
- user.visible_message("[user] removes the [pod].", "You remove the [pod].")
+ user.visible_message("[user] removes the [pod].", "You remove the [pod].")
var/obj/structure/c_transit_tube_pod/R = new/obj/structure/c_transit_tube_pod(src.loc)
pod.transfer_fingerprints_to(R)
R.add_fingerprint(user)
diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm
index 76ef8050415..3db04c5088a 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube.dm
@@ -44,7 +44,7 @@ obj/structure/transit_tube/ex_act(severity, target)
for(var/obj/structure/transit_tube_pod/pod in src.loc)
user << "Remove the pod first!"
return
- user.visible_message("[user] starts to deattach \the [src]!", "You start deattaching the [name]...")
+ user.visible_message("[user] starts to deattach \the [src].", "You start to deattach the [name]...")
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user, 35))
user << "You deattach the [name]."
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
index c65b611887c..b686464321e 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
@@ -31,7 +31,7 @@
for(var/obj/structure/transit_tube/station/T in loc)
return
if(src.contents.len)
- user.visible_message("[user] empties \the [src].", "You empty \the [src].")
+ user.visible_message("[user] empties \the [src].", "You empty \the [src].")
src.empty()
return
else
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index be4ca40bbd3..69e34eab25a 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -51,7 +51,7 @@
user << "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]..."
playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, 1)
if(do_after(user, 30))
- user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.")
+ user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.")
cistern = !cistern
update_icon()
return
@@ -65,7 +65,7 @@
var/mob/living/GM = G.affecting
if(G.state >= GRAB_AGGRESSIVE)
if(GM.loc != get_turf(src))
- user << "[GM] needs to be on [src]."
+ user << "[GM] needs to be on [src]!"
return
if(!swirlie)
if(open)
@@ -372,12 +372,12 @@
if(!Adjacent(user)) return //Person has moved away from the sink
user.clean_blood()
- user.visible_message("[user] washes their hands in [src].")
+ user.visible_message("[user] washes their hands in [src].", "You wash your hands in [src].")
/obj/structure/sink/attackby(obj/item/O, mob/user, params)
if(busy)
- user << "Someone's already washing here."
+ user << "Someone's already washing here!"
return
if(istype(O, /obj/item/weapon/reagent_containers))
@@ -422,7 +422,7 @@
O.clean_blood()
user.visible_message( \
- "[user] washes [I] using [src].", \
+ "[user] washes [I] using [src].", \
"You wash [I] using [src].")
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index dc4eb3c1d9c..1c173316ec3 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -76,7 +76,7 @@ obj/structure/windoor_assembly/Destroy()
if(istype(W, /obj/item/weapon/weldingtool) && !anchored )
var/obj/item/weapon/weldingtool/WT = W
if (WT.remove_fuel(0,user))
- user.visible_message("[user] dissassembles the windoor assembly.", "You start to disassemble the windoor assembly...")
+ user.visible_message("[user] disassembles the windoor assembly.", "You start to disassemble the windoor assembly...")
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
if(do_after(user, 40))
@@ -98,7 +98,7 @@ obj/structure/windoor_assembly/Destroy()
user << "There is already a windoor in that location!"
return
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user.visible_message("[user] secures the windoor assembly to the floor.", "You start to secure the windoor assembly to the floor...")
+ user.visible_message("[user] secures the windoor assembly to the floor.", "You start to secure the windoor assembly to the floor...")
if(do_after(user, 40))
if(!src || src.anchored)
@@ -117,7 +117,7 @@ obj/structure/windoor_assembly/Destroy()
//Unwrenching an unsecure assembly un-anchors it. Step 4 undone
else if(istype(W, /obj/item/weapon/wrench) && anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user.visible_message("[user] unsecures the windoor assembly to the floor.", "You start to unsecure the windoor assembly to the floor...")
+ user.visible_message("[user] unsecures the windoor assembly to the floor.", "You start to unsecure the windoor assembly to the floor...")
if(do_after(user, 40))
if(!src || !src.anchored)
@@ -151,7 +151,7 @@ obj/structure/windoor_assembly/Destroy()
//Adding cable to the assembly. Step 5 complete.
else if(istype(W, /obj/item/stack/cable_coil) && anchored)
- user.visible_message("[user] wires the windoor assembly.", "You start to wire the windoor assembly...")
+ user.visible_message("[user] wires the windoor assembly.", "You start to wire the windoor assembly...")
if(do_after(user, 40))
if(!src || !src.anchored || src.state != "01")
@@ -172,7 +172,7 @@ obj/structure/windoor_assembly/Destroy()
//Removing wire from the assembly. Step 5 undone.
if(istype(W, /obj/item/weapon/wirecutters))
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
- user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly...")
+ user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly...")
if(do_after(user, 40))
if(!src || src.state != "02")
@@ -189,7 +189,7 @@ obj/structure/windoor_assembly/Destroy()
//Adding airlock electronics for access. Step 6 complete.
else if(istype(W, /obj/item/weapon/airlock_electronics))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
- user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly...")
+ user.visible_message("[user] installs the electronics into the airlock assembly.", "You start to install electronics into the airlock assembly...")
user.drop_item()
W.loc = src
@@ -209,7 +209,7 @@ obj/structure/windoor_assembly/Destroy()
return
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
- user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to uninstall electronics from the airlock assembly...")
+ user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to uninstall electronics from the airlock assembly...")
if(do_after(user, 40))
if(!src || !electronics)
@@ -239,7 +239,7 @@ obj/structure/windoor_assembly/Destroy()
return
usr << browse(null, "window=windoor_access")
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
- user.visible_message("[user] pries the windoor into the frame.", "You start prying the windoor into the frame...")
+ user.visible_message("[user] pries the windoor into the frame.", "You start prying the windoor into the frame...")
if(do_after(user, 40))
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 08dad9453ce..f773adc6714 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -136,7 +136,7 @@
if(!can_be_reached(user))
return
user.changeNext_move(CLICK_CD_MELEE)
- user.visible_message("[user] knocks on [src].")
+ user.visible_message("[user] knocks on [src].")
add_fingerprint(user)
playsound(loc, 'sound/effects/Glassknock.ogg', 50, 1)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 8edd7ce05fb..cc4c13cfa43 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -235,14 +235,14 @@ obj/item/clothing/head/helmet/bluetaghelm
helmetCam.c_tag = "Helmet-Mounted Camera (No User)([rand(1,999)])"
helmetCam.network = list("SS13")
update_icon()
- user.visible_message("[user] attaches [A] to [src]","You attach [A] to [src]")
+ user.visible_message("[user] attaches [A] to [src].","You attach [A] to [src].")
return
if(istype(A, /obj/item/weapon/crowbar))
if(!helmetCam)
..()
return
- user.visible_message("[user] removes [helmetCam] from [src]","You remove [helmetCam] from [src]")
+ user.visible_message("[user] removes [helmetCam] from [src].","You remove [helmetCam] from [src].")
helmetCam.assembly.loc = get_turf(src)
helmetCam.assembly = null
qdel(helmetCam)
diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm
index 6c4d586d740..1dda5f2ebd2 100644
--- a/code/modules/clothing/under/ties.dm
+++ b/code/modules/clothing/under/ties.dm
@@ -100,10 +100,10 @@
if(user == M)
user << "You attach [src] to [U]."
else
- user.visible_message("[user] pins \the [src] on [M]'s chest.", \
+ user.visible_message("[user] pins \the [src] on [M]'s chest.", \
"You pin \the [src] on [M]'s chest.")
- else user << "Medals can only be pinned on jumpsuits."
+ else user << "Medals can only be pinned on jumpsuits!"
else ..()
/obj/item/clothing/tie/medal/conduct
diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm
index 6888a4a9a04..6986e52d26a 100644
--- a/code/modules/food&drinks/drinks/drinks.dm
+++ b/code/modules/food&drinks/drinks/drinks.dm
@@ -224,7 +224,7 @@
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user)
if(M == user && !src.reagents.total_volume && user.a_intent == "harm" && user.zone_sel.selecting == "head")
- user.visible_message("[user] crushes the can of [src] on \his forehead!", "You crush the can of [src] on your forehead!")
+ user.visible_message("[user] crushes the can of [src] on \his forehead!", "You crush the can of [src] on your forehead.")
playsound(user.loc,'sound/weapons/pierce.ogg', rand(10,50), 1)
var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.loc)
crushed_can.icon_state = icon_state
diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm
index f140a341367..f34b33fb441 100644
--- a/code/modules/food&drinks/food/snacks.dm
+++ b/code/modules/food&drinks/food/snacks.dm
@@ -86,8 +86,8 @@
M.visible_message("[user] attempts to feed [M] [src].", \
"[user] attempts to feed [M] [src].")
else
- M.visible_message("[user] cannot force anymore of [src] down [M]'s throat!", \
- "[user] cannot force anymore of [src] down [M]'s throat!")
+ M.visible_message("[user] cannot force anymore of [src] down [M]'s throat!", \
+ "[user] cannot force anymore of [src] down [M]'s throat!")
return 0
if(!do_mob(user, M))
@@ -97,7 +97,7 @@
"[user] feeds [M] to eat [src].")
else
- user << "[M] doesn't seem to have a mouth!"
+ user << "[M] doesn't seem to have a mouth!"
return
if(reagents) //Handle ingestion of the reagent.
@@ -181,12 +181,12 @@
var/slices_lost = 0
if (accuracy > 1)
user.visible_message( \
- "[user] slices [src].", \
+ "[user] slices [src].", \
"You slice [src]." \
)
else
user.visible_message( \
- "[user] inaccurately slices [src] with [W]!", \
+ "[user] inaccurately slices [src] with [W]!", \
"You inaccurately slice [src] with your [W]!" \
)
slices_lost = rand(1,min(1,round(slices_num/2)))
diff --git a/code/modules/food&drinks/food/snacks_egg.dm b/code/modules/food&drinks/food/snacks_egg.dm
index 23c80a6bf4b..608064ed01b 100644
--- a/code/modules/food&drinks/food/snacks_egg.dm
+++ b/code/modules/food&drinks/food/snacks_egg.dm
@@ -100,12 +100,12 @@
/obj/item/weapon/reagent_containers/food/snacks/omelette/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W,/obj/item/weapon/kitchen/utensil/fork))
if(W.icon_state == "forkloaded")
- user << "You already have omelette on your fork."
+ user << "You already have omelette on your fork!"
return
W.icon_state = "forkloaded"
user.visible_message( \
- "[user] takes a piece of omelette with their fork!", \
- "You take a piece of omelette with your fork!" \
+ "[user] takes a piece of omelette with their fork!", \
+ "You take a piece of omelette with your fork." \
)
reagents.remove_reagent("nutriment", 1)
if(reagents.total_volume <= 0)
diff --git a/code/modules/food&drinks/kitchen machinery/microwave.dm b/code/modules/food&drinks/kitchen machinery/microwave.dm
index 71e6f1a60a5..4db5f5ea817 100644
--- a/code/modules/food&drinks/kitchen machinery/microwave.dm
+++ b/code/modules/food&drinks/kitchen machinery/microwave.dm
@@ -59,23 +59,23 @@
if(src.broken > 0)
if(src.broken == 2 && istype(O, /obj/item/weapon/wirecutters)) // If it's broken and they're using a screwdriver
user.visible_message( \
- "[user] starts to fix part of the microwave.", \
+ "[user] starts to fix part of the microwave.", \
"You start to fix part of the microwave..." \
)
if (do_after(user,20))
user.visible_message( \
- "[user] fixes part of the microwave.", \
+ "[user] fixes part of the microwave.", \
"You fix part of the microwave." \
)
src.broken = 1 // Fix it a bit
else if(src.broken == 1 && istype(O, /obj/item/weapon/weldingtool)) // If it's broken and they're doing the wrench
user.visible_message( \
- "[user] starts to fix part of the microwave.", \
+ "[user] starts to fix part of the microwave.", \
"You start to fix part of the microwave..." \
)
if (do_after(user,20))
user.visible_message( \
- "[user] fixes the microwave.", \
+ "[user] fixes the microwave.", \
"You fix the microwave." \
)
src.icon_state = "mw"
@@ -84,7 +84,7 @@
src.flags = OPENCONTAINER
return 0 //to use some fuel
else
- user << "It's broken!"
+ user << "It's broken!"
return 1
else if(istype(O, /obj/item/weapon/reagent_containers/spray/))
var/obj/item/weapon/reagent_containers/spray/clean_spray = O
@@ -92,7 +92,7 @@
clean_spray.reagents.remove_reagent("cleaner",clean_spray.amount_per_transfer_from_this,1)
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
user.visible_message( \
- "[user] has cleaned the microwave.", \
+ "[user] has cleaned the microwave.", \
"You clean the microwave." \
)
src.dirty = 0 // It's clean!
@@ -108,12 +108,12 @@
else if(istype(O, /obj/item/weapon/soap/)) // If they're trying to clean it then let them
var/obj/item/weapon/soap/P = O
user.visible_message( \
- "[user] starts to clean the microwave.", \
+ "[user] starts to clean the microwave.S", \
"You start to clean the microwave..." \
)
if (do_after(user, P.cleanspeed))
user.visible_message( \
- "[user] has cleaned the microwave.", \
+ "[user] has cleaned the microwave.", \
"You clean the microwave." \
)
src.dirty = 0 // It's clean!
@@ -150,7 +150,7 @@
return 0
O.loc = src
user.visible_message( \
- "[user] has added \the [O] to \the [src].", \
+ "[user] has added \the [O] to \the [src].", \
"You add \the [O] to \the [src].")
else
diff --git a/code/modules/food&drinks/kitchen machinery/smartfridge.dm b/code/modules/food&drinks/kitchen machinery/smartfridge.dm
index 6e42d462126..35c84a26620 100644
--- a/code/modules/food&drinks/kitchen machinery/smartfridge.dm
+++ b/code/modules/food&drinks/kitchen machinery/smartfridge.dm
@@ -42,12 +42,12 @@
return 0
if(contents.len >= max_n_of_items)
- user << "\The [src] is full."
+ user << "\The [src] is full!"
return 0
if(accept_check(O))
load(O)
- user.visible_message("[user] has added \the [O] to \the [src].", "You add \the [O] to \the [src].")
+ user.visible_message("[user] has added \the [O] to \the [src].", "You add \the [O] to \the [src].")
updateUsrDialog()
return 1
@@ -62,7 +62,7 @@
load(G)
loaded++
else
- user << "\The [src] smartly refuses [O]."
+ user << "\The [src] smartly refuses [O]."
updateUsrDialog()
return 0
@@ -70,15 +70,15 @@
// this code follows storage items and trays only.
if(loaded)
if(contents.len >= max_n_of_items)
- user.visible_message("[user] loads \the [src] with \the [O].", \
+ user.visible_message("[user] loads \the [src] with \the [O].", \
"You fill \the [src] with \the [O].")
else
- user.visible_message("[user] loads \the [src] with \the [O].", \
+ user.visible_message("[user] loads \the [src] with \the [O].", \
"You load \the [src] with \the [O].")
if(O.contents.len > 0)
- user << "Some items are refused."
+ user << "Some items are refused."
else
- user << "There is nothing in [O] to put in [src]."
+ user << "There is nothing in [O] to put in [src]!"
return 0
updateUsrDialog()
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 2477234819d..361fe6843b0 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -692,11 +692,11 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p
else if(istype(O, /obj/item/weapon/minihoe))
if(weedlevel > 0)
- user.visible_message("[user] uproots the weeds.", "You remove the weeds from [src].")
+ user.visible_message("[user] uproots the weeds.", "You remove the weeds from [src].")
weedlevel = 0
update_icon()
else
- user << "This plot is completely devoid of weeds. It doesn't need uprooting."
+ user << "This plot is completely devoid of weeds! It doesn't need uprooting."
else if(istype(O, /obj/item/weapon/storage/bag/plants))
attack_hand(user)
@@ -708,28 +708,28 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p
else if(istype(O, /obj/item/weapon/wrench) && unwrenchable)
if(anchored == 2)
- user << "Unscrew the hoses first!"
+ user << "Unscrew the hoses first!"
return
if(!anchored && !isinspace())
- user.visible_message("[user] begins to wrench [src] into place.", \
+ user.visible_message("[user] begins to wrench [src] into place.", \
"You begin to wrench [src] in place...")
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
if (do_after(user, 20))
if(anchored)
return
anchored = 1
- user.visible_message("[user] wrenches [src] into place.", \
+ user.visible_message("[user] wrenches [src] into place.", \
"You wrench [src] in place.")
else if(anchored)
- user.visible_message("[user] begins to unwrench [src].", \
+ user.visible_message("[user] begins to unwrench [src].", \
"You begin to unwrench [src]...")
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
if (do_after(user, 20))
if(!anchored)
return
anchored = 0
- user.visible_message("[user] unwrenches [src].", \
+ user.visible_message("[user] unwrenches [src].", \
"You unwrench [src].")
else if(istype(O, /obj/item/weapon/screwdriver) && unwrenchable) //THIS NEED TO BE DONE DIFFERENTLY, SOMEONE REFACTOR THE TRAY CODE ALREADY
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 3be38af11ed..471b5401196 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -147,9 +147,9 @@
/obj/item/weapon/gun/projectile/revolver/russian/attackby(var/obj/item/A as obj, mob/user as mob, params)
var/num_loaded = ..()
if(num_loaded)
- user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "You load a single bullet into the chamber and spin it.")
+ user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "You load a single bullet into the chamber and spin it.")
else
- 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.")
if(get_ammo() > 0)
Spin()
update_icon()
@@ -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
@@ -170,7 +170,7 @@
CB.update_icon()
num_unloaded++
if (num_unloaded)
- user << "You unload [num_unloaded] shell\s from [src]!"
+ user << "You unload [num_unloaded] shell\s from [src]."
else
user << "[src] is empty."
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 49ee7a356d4..3e391dff091 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -106,7 +106,7 @@
src.reagents.update_total()
src.on_reagent_change()
src.reagents.handle_reactions()
- user.visible_message("[user] takes a blood sample from [target].")
+ user.visible_message("[user] takes a blood sample from [target].")
else //if not mob
if(!target.reagents.total_volume)
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 5c2928a6556..ab72b62f722 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -149,11 +149,11 @@
if((!istype(user)) || (user.stat))
return
if(cups <= 0)
- user << "What? No cups?"
+ user << "No cups left!"
return
cups--
user.put_in_hands(new /obj/item/weapon/reagent_containers/food/drinks/sillycup)
- user.visible_message("[user] gets a cup from [src].","You get a cup from [src].")
+ user.visible_message("[user] gets a cup from [src].","You get a cup from [src].")
/obj/structure/reagent_dispensers/water_cooler/attackby(var/obj/item/I, var/mob/user, params)
if(istype(I, /obj/item/weapon/paper))
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 78133825971..04b09332466 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -134,7 +134,7 @@
user.drop_item()
I.loc = src
- user.visible_message("[user.name] places \the [I] into \the [src].", \
+ user.visible_message("[user.name] places \the [I] into \the [src].", \
"You place \the [I] into \the [src].")
update()
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 1900c979236..19d4496b315 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -38,15 +38,15 @@
else if(istype(W, /obj/item/weapon/pen))
var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
- user << "Invalid text."
+ user << "Invalid text!"
return
- user.visible_message("[user] labels [src] as [str].")
+ user.visible_message("[user] labels [src] as [str].")
name = "[name] ([str])"
else if(istype(W, /obj/item/stack/wrapping_paper) && !giftwrapped)
var/obj/item/stack/wrapping_paper/WP = W
if(WP.use(3))
- user.visible_message("[user] wraps the package in festive paper!")
+ user.visible_message("[user] wraps the package in festive paper!")
giftwrapped = 1
if(istype(wrapped, /obj/structure/closet/crate))
icon_state = "giftcrate"
@@ -92,9 +92,9 @@
else if(istype(W, /obj/item/weapon/pen))
var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
- user << "Invalid text."
+ user << "Invalid text!"
return
- user.visible_message("[user] labels [src] as [str].")
+ user.visible_message("[user] labels [src] as [str].")
name = "[name] ([str])"
else if(istype(W, /obj/item/stack/wrapping_paper) && !giftwrapped)
@@ -102,7 +102,7 @@
if(WP.use(1))
icon_state = "giftcrate[wrapped.w_class]"
giftwrapped = 1
- user.visible_message("[user] wraps the package in festive paper!")
+ user.visible_message("[user] wraps the package in festive paper!")
if(WP.amount <= 0 && !WP.loc) //if we used our last wrapping paper, drop a cardboard tube
new /obj/item/weapon/c_tube( get_turf(user) )
else
@@ -176,10 +176,10 @@
user << "You need more paper!"
return
else
- user << "The object you are trying to wrap is unsuitable for the sorting machinery."
+ user << "The object you are trying to wrap is unsuitable for the sorting machinery!"
return
- user.visible_message("[user] wraps [target].")
+ user.visible_message("[user] wraps [target].")
user.attack_log += text("\[[time_stamp()]\] Has used [name] on [target]")
if(amount <= 0 && !src.loc) //if we used our last wrapping paper, drop a cardboard tube
diff --git a/code/modules/surgery/appendectomy.dm b/code/modules/surgery/appendectomy.dm
index 7ba9ad03ba0..0ba1db2da7c 100644
--- a/code/modules/surgery/appendectomy.dm
+++ b/code/modules/surgery/appendectomy.dm
@@ -15,17 +15,17 @@
/datum/surgery_step/extract_appendix/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
A = locate() in target.internal_organs
if(A)
- user.visible_message("[user] begins to extract [target]'s appendix.")
+ user.visible_message("[user] begins to extract [target]'s appendix.", "You begin to extract [target]'s appendix...")
else
- user.visible_message("[user] looks for an appendix in [target].")
+ user.visible_message("[user] looks for an appendix in [target].", "You look for an appendix in [target]...")
/datum/surgery_step/extract_appendix/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(A)
- user.visible_message("[user] successfully removes [target]'s appendix!")
+ user.visible_message("[user] successfully removes [target]'s appendix!", "You successfully removes [target]'s appendix.")
A.loc = get_turf(target)
target.internal_organs -= A
for(var/datum/disease/appendicitis in target.viruses)
appendicitis.cure()
else
- user.visible_message("[user] can't find an appendix in [target]!")
+ user << "You can't find an appendix in [target]!"
return 1
\ No newline at end of file
diff --git a/code/modules/surgery/brain_removal.dm b/code/modules/surgery/brain_removal.dm
index 41c3b4ee68c..0d57fb6f9a2 100644
--- a/code/modules/surgery/brain_removal.dm
+++ b/code/modules/surgery/brain_removal.dm
@@ -14,13 +14,13 @@
/datum/surgery_step/extract_brain/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
B = target.getorgan(/obj/item/organ/brain)
if(B)
- user.visible_message("[user] begins to extract [target]'s brain.")
+ user.visible_message("[user] begins to extract [target]'s brain.", "You begin to extract [target]'s brain...")
else
- user.visible_message("[user] looks for a brain in [target].")
+ user.visible_message("[user] looks for a brain in [target].", "You look for a brain in [target]...")
/datum/surgery_step/extract_brain/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(B)
- user.visible_message("[user] successfully removes [target]'s brain!")
+ user.visible_message("[user] successfully removes [target]'s brain!", "You successfully remove [target]'s brain.")
B.loc = get_turf(target)
B.transfer_identity(target)
target.internal_organs -= B
@@ -30,7 +30,7 @@
H.apply_damage(25,"brute","head")
add_logs(user, target, "debrained", addition="INTENT: [uppertext(user.a_intent)]")
else
- user.visible_message("[user] can't find a brain in [target]!")
+ user << "You can't find a brain in [target]!"
return 1
diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm
index 289dadeec2d..4373e3c2a8b 100644
--- a/code/modules/surgery/cavity_implant.dm
+++ b/code/modules/surgery/cavity_implant.dm
@@ -19,27 +19,27 @@
IC = I
break
if(tool)
- user.visible_message("[user] begins to insert [tool] into [target]'s [target_zone].")
+ user.visible_message("[user] begins to insert [tool] into [target]'s [target_zone].", "You begin to insert [tool] into [target]'s [target_zone]...")
else
- user.visible_message("[user] checks for items in [target]'s [target_zone].")
+ user.visible_message("[user] checks for items in [target]'s [target_zone].", "You check for items in [target]'s [target_zone]...")
/datum/surgery_step/handle_cavity/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(tool)
if(IC || tool.w_class > 3 || NODROP in tool.flags || tool.GetTypeInAllContents(/obj/item/weapon/disk/nuclear) || istype(tool, /obj/item/weapon/disk/nuclear) || istype(tool, /obj/item/organ))
- user.visible_message("[user] can't seem to fit [tool] in [target]'s [target_zone].")
+ user << "You can't seem to fit [tool] in [target]'s [target_zone]!"
return 0
else
- user.visible_message("[user] stuffs [tool] into [target]'s [target_zone]!")
+ user.visible_message("[user] stuffs [tool] into [target]'s [target_zone]!", "You stuff [tool] into [target]'s [target_zone].")
user.drop_item()
target.internal_organs += tool
tool.loc = target
return 1
else
if(IC)
- user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!")
+ user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "You pull [IC] out of [target]'s [target_zone].")
user.put_in_hands(IC)
target.internal_organs -= IC
return 1
else
- user.visible_message("[user] doesn't find anything in [target]'s [target_zone].")
+ user << "You don't find anything in [target]'s [target_zone]."
return 0
\ No newline at end of file
diff --git a/code/modules/surgery/core_removal.dm b/code/modules/surgery/core_removal.dm
index 2f8dff6988f..6a38e160560 100644
--- a/code/modules/surgery/core_removal.dm
+++ b/code/modules/surgery/core_removal.dm
@@ -11,14 +11,13 @@
time = 16
/datum/surgery_step/extract_core/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to extract a core from [target].")
+ user.visible_message("[user] begins to extract a core from [target].", "You begin to extract a core from [target]...")
/datum/surgery_step/extract_core/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/mob/living/simple_animal/slime/slime = target
if(slime.cores > 0)
slime.cores--
- user.visible_message("[user] successfully extracts a core from [target]!")
- user << "[slime.cores] core\s remaining."
+ user.visible_message("[user] successfully extracts a core from [target]!", "You successfully extract a core from [target]. [slime.cores] core\s remaining.")
new slime.coretype(slime.loc)
@@ -28,5 +27,5 @@
else
return 0
else
- user.visible_message("There aren't any cores left in [target].")
+ user << "There aren't any cores left in [target]!"
return 1
\ No newline at end of file
diff --git a/code/modules/surgery/cybernetic_implants.dm b/code/modules/surgery/cybernetic_implants.dm
index 0e4312f7263..3f4dcb5210c 100644
--- a/code/modules/surgery/cybernetic_implants.dm
+++ b/code/modules/surgery/cybernetic_implants.dm
@@ -2,7 +2,7 @@
#define MAX_CHEST_IMPLANT 3
/datum/surgery_step/cybernetic_implant/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/cybernetic_implant/implant, datum/surgery/surgery)
- user.visible_message("[user] begins to implant [target] with [implant].")
+ user.visible_message("[user] begins to implant [target] with [implant].", "You begin to implant [target] with [implant]...")
//[[[[EYES]]]]
/datum/surgery/eye_cybernetic_implant/eyes
@@ -68,9 +68,9 @@
/datum/surgery_step/cybernetic_implant/proc/insert(mob/user, mob/living/carbon/target, obj/item/cybernetic_implant/implant,target_zone,full)
if(full)
- user.visible_message("[user] can't seem to implant anything else into the [target]'s [target_zone].")
+ user << "You can't seem to implant anything else into the [target]'s [target_zone]!"
else
- user.visible_message("[user] inserts [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone]!")
+ user.visible_message("[user] inserts [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone]!", "You insert [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone].")
implant.owner = target
implant.function()
user.drop_item()
diff --git a/code/modules/surgery/generic_steps.dm b/code/modules/surgery/generic_steps.dm
index 7683c9444ff..b31ec1afe24 100644
--- a/code/modules/surgery/generic_steps.dm
+++ b/code/modules/surgery/generic_steps.dm
@@ -5,7 +5,7 @@
time = 24
/datum/surgery_step/incise/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to make an incision in [target]'s [parse_zone(target_zone)].")
+ user.visible_message("[user] begins to make an incision in [target]'s [parse_zone(target_zone)].", "You begin to make an incision in [target]'s [parse_zone(target_zone)]...")
@@ -15,7 +15,7 @@
time = 48
/datum/surgery_step/clamp_bleeders/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to clamp bleeders in [target]'s [parse_zone(target_zone)].")
+ user.visible_message("[user] begins to clamp bleeders in [target]'s [parse_zone(target_zone)].", "You begin to clamp bleeders in [target]'s [parse_zone(target_zone)]...")
//retract skin
@@ -24,7 +24,7 @@
time = 32
/datum/surgery_step/retract_skin/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to retract the skin in [target]'s [parse_zone(target_zone)].")
+ user.visible_message("[user] begins to retract the skin in [target]'s [parse_zone(target_zone)].", "You begin to retract the skin in [target]'s [parse_zone(target_zone)]...")
@@ -34,7 +34,7 @@
time = 32
/datum/surgery_step/close/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to mend the incision in [target]'s [parse_zone(target_zone)].")
+ user.visible_message("[user] begins to mend the incision in [target]'s [parse_zone(target_zone)].", "You begin to mend the incision in [target]'s [parse_zone(target_zone)]...")
/datum/surgery_step/close/tool_check(mob/user, obj/item/tool)
@@ -62,7 +62,7 @@
time = 64
/datum/surgery_step/saw/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)].")
+ user.visible_message("[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)].", "You begin to saw through the bone in [target]'s [parse_zone(target_zone)]...")
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index 0f399f50677..e3ca48899f1 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -45,7 +45,7 @@
if(procedure.location == "anywhere") // if location == "anywhere" change location to the surgeon's target, otherwise leave location as is.
procedure.location = user.zone_sel.selecting
M.surgeries += procedure
- user.visible_message("[user] drapes [I] over [M]'s [parse_zone(procedure.location)] to prepare for \an [procedure.name].")
+ user.visible_message("[user] drapes [I] over [M]'s [parse_zone(procedure.location)] to prepare for \an [procedure.name].", "You drape [I] over [M]'s [parse_zone(procedure.location)] to prepare for \an [procedure.name].")
add_logs(user, M, "operated", addition="Operation type: [procedure.name]")
return 1
diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm
index 97277220159..8e21fae2ff2 100644
--- a/code/modules/surgery/implant_removal.dm
+++ b/code/modules/surgery/implant_removal.dm
@@ -19,19 +19,19 @@
I = W
break
if(I)
- user.visible_message("[user] begins to extract [I] from [target]'s [target_zone].")
+ user.visible_message("[user] begins to extract [I] from [target]'s [target_zone].", "You begin to extract [I] from [target]'s [target_zone]...")
else
- user.visible_message("[user] looks for an implant in [target]'s [target_zone].")
+ user.visible_message("[user] looks for an implant in [target]'s [target_zone].", "You look for an implant in [target]'s [target_zone]...")
/datum/surgery_step/extract_implant/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(I)
- user.visible_message("[user] successfully removes [I] from [target]'s [target_zone]!")
+ user.visible_message("[user] successfully removes [I] from [target]'s [target_zone]!", "You successfully remove [I] from [target]'s [target_zone].")
if(istype(I, /obj/item/weapon/implant/loyalty))
- target << "You feel a sense of liberation as Nanotrasen's grip on your mind fades away."
+ target << "You feel a sense of liberation as Nanotrasen's grip on your mind fades away."
qdel(I)
if(istype(target, /mob/living/carbon/human))
var/mob/living/carbon/human/H = target
H.sec_hud_set_implants()
else
- user.visible_message("[user] can't find anything in [target]'s [target_zone].")
+ user << "You can't find anything in [target]'s [target_zone]!"
return 1
diff --git a/code/modules/surgery/limb augmentation.dm b/code/modules/surgery/limb augmentation.dm
index f9a26f9f49a..b520fb5a4e8 100644
--- a/code/modules/surgery/limb augmentation.dm
+++ b/code/modules/surgery/limb augmentation.dm
@@ -10,7 +10,7 @@
/datum/surgery_step/replace/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to sever the muscles on [target]'s [parse_zone(user.zone_sel.selecting)]!")
+ user.visible_message("[user] begins to sever the muscles on [target]'s [parse_zone(user.zone_sel.selecting)].", "You begin to sever the muscles on [target]'s [parse_zone(user.zone_sel.selecting)]...")
/datum/surgery_step/add_limb
@@ -24,9 +24,9 @@
/datum/surgery_step/add_limb/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
L = new_organ
if(L)
- user.visible_message("[user] begins to augment [target]'s [parse_zone(user.zone_sel.selecting)].")
+ user.visible_message("[user] begins to augment [target]'s [parse_zone(user.zone_sel.selecting)].", "You begin to augment [target]'s [parse_zone(user.zone_sel.selecting)]...")
else
- user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].")
+ user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].", "You look for [target]'s [parse_zone(user.zone_sel.selecting)]...")
@@ -46,7 +46,7 @@
if(L)
if(ishuman(target))
var/mob/living/carbon/human/H = target
- user.visible_message("[user] successfully augments [target]'s [parse_zone(target_zone)]!")
+ user.visible_message("[user] successfully augments [target]'s [parse_zone(target_zone)]!", "You successfully augment [target]'s [parse_zone(target_zone)].")
L.loc = get_turf(target)
H.organs -= L
switch(target_zone)
@@ -72,5 +72,5 @@
H.update_augments() //Gives them the Cyber limb overlay
add_logs(user, target, "augmented", addition="by giving him new [parse_zone(target_zone)] INTENT: [uppertext(user.a_intent)]")
else
- user.visible_message("[user] [target] has no organic [parse_zone(target_zone)] there!")
+ user << "[target] has no organic [parse_zone(target_zone)] there!"
return 1
diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm
index 2f3645a5df3..88f2cd2f4d1 100644
--- a/code/modules/surgery/lipoplasty.dm
+++ b/code/modules/surgery/lipoplasty.dm
@@ -13,10 +13,10 @@
time = 64
/datum/surgery_step/cut_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to cut away [target]'s excess fat!")
+ user.visible_message("[user] begins to cut away [target]'s excess fat.", "You begin to cut away [target]'s excess fat...")
/datum/surgery_step/cut_fat/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] cuts [target]'s excess fat loose!")
+ user.visible_message("[user] cuts [target]'s excess fat loose!", "You cut [target]'s excess fat loose.")
return 1
//remove fat
@@ -25,10 +25,10 @@
time = 32
/datum/surgery_step/remove_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to extract [target]'s loose fat!")
+ user.visible_message("[user] begins to extract [target]'s loose fat!", "You begin to extract [target]'s loose fat...")
/datum/surgery_step/remove_fat/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] extracts [target]'s fat!")
+ user.visible_message("[user] extracts [target]'s fat!", "You extract [target]'s fat.")
target.overeatduration = 0 //patient is unfatted
var/removednutriment = target.nutrition
target.nutrition = NUTRITION_LEVEL_WELL_FED
diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm
index aa744928a95..e0a4dc96c76 100644
--- a/code/modules/surgery/plastic_surgery.dm
+++ b/code/modules/surgery/plastic_surgery.dm
@@ -10,15 +10,15 @@
time = 64
/datum/surgery_step/reshape_face/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to alter [target]'s appearance.")
+ user.visible_message("[user] begins to alter [target]'s appearance.", "You begin to alter [target]'s appearance...")
/datum/surgery_step/reshape_face/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(target.status_flags & DISFIGURED)
target.status_flags &= ~DISFIGURED
- user.visible_message("[user] successfully restores [target]'s appearance!")
+ user.visible_message("[user] successfully restores [target]'s appearance!", "You successfully restore [target]'s appearance.")
else
var/oldname = target.real_name
target.real_name = random_name(target.gender)
var/newname = target.real_name //something about how the code handles names required that I use this instead of target.real_name
- user.visible_message("[user] alters [oldname]'s appearance completely, they are now [newname]!")
+ user.visible_message("[user] alters [oldname]'s appearance completely, they are now [newname]!", "You alter [oldname]'s appearance completely, they are now [newname].")
return 1
\ No newline at end of file
diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm
index 749faa22698..33968dd8968 100644
--- a/code/modules/surgery/remove_embedded_object.dm
+++ b/code/modules/surgery/remove_embedded_object.dm
@@ -18,9 +18,9 @@
/datum/surgery_step/remove_object/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
L = new_organ
if(L)
- user.visible_message("[user] looks for objects embedded in [target]'s [parse_zone(user.zone_sel.selecting)].")
+ user.visible_message("[user] looks for objects embedded in [target]'s [parse_zone(user.zone_sel.selecting)].", "You look for objects embedded in [target]'s [parse_zone(user.zone_sel.selecting)]...")
else
- user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].")
+ user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].", "You look for [target]'s [parse_zone(user.zone_sel.selecting)]...")
/datum/surgery_step/remove_object/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -34,11 +34,11 @@
L.embedded_objects -= I
if(objects > 0)
- user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L.getDisplayName()]!")
+ user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L.getDisplayName()]!", "You sucessfully remove [objects] objects from [H]'s [L.getDisplayName()].")
else
- user.visible_message("[user] finds no objects embedded in [H]'s [L.getDisplayName()].")
+ user << "You find no objects embedded in [H]'s [L.getDisplayName()]!"
else
- user.visible_message("[user] can't find [target]'s [parse_zone(user.zone_sel.selecting)], let alone any objects embedded in it!")
+ user << "You can't find [target]'s [parse_zone(user.zone_sel.selecting)], let alone any objects embedded in it!"
return 1
\ No newline at end of file