diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm
index 1da7f3da67e..35b05df547d 100644
--- a/code/ATMOSPHERICS/atmospherics.dm
+++ b/code/ATMOSPHERICS/atmospherics.dm
@@ -92,7 +92,7 @@ Pipelines + Other Objects -> Pipe network
user.visible_message( \
"[user] unfastens \the [src].", \
"You unfasten \the [src].", \
- "You hear ratchet.")
+ "You hear ratchet.")
investigate_log("was REMOVED by [key_name(usr)]", "atmos")
Deconstruct()
else
diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm
index 758e9121453..65121d7274a 100644
--- a/code/ATMOSPHERICS/components/unary/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -278,11 +278,11 @@
if(!src || !WT.isOn()) return
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
if(!welded)
- user.visible_message("[user] welds the vent shut.", "You weld the vent shut.", "You hear welding.")
+ user.visible_message("[user] welds the vent shut.", "You weld the vent shut.", "You hear welding.")
welded = 1
update_icon()
else
- user.visible_message("[user] unwelds the vent.", "You unweld the vent.", "You hear welding.")
+ user.visible_message("[user] unwelds the vent.", "You unweld the vent.", "You hear welding.")
welded = 0
update_icon()
return 1
@@ -363,11 +363,11 @@
L.visible_message("[L] scrambles into the ventilation ducts!", \
"You scramble into the ventilation ducts.")
- target_vent.audible_message("You hear something squeezing through the ventilation ducts.")
+ target_vent.audible_message("You hear something scampering through the ventilation ducts.")
if(target_vent.welded) //the vent can be welded while they scrolled through the list.
target_vent = src
- L << "The vent you were heading to appears to be welded."
+ L << "The vent you were heading to appears to be welded!"
L.loc = target_vent.loc
var/area/new_area = get_area(L.loc)
if(new_area)
diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm
index 1edf47c6366..c615d644b51 100644
--- a/code/datums/diseases/advance/symptoms/deafness.dm
+++ b/code/datums/diseases/advance/symptoms/deafness.dm
@@ -31,10 +31,10 @@ Bonus
var/mob/living/M = A.affected_mob
switch(A.stage)
if(3, 4)
- M << "[pick("You hear a ringing in your ear.", "Your ears pop.")]"
+ M << "[pick("You hear a ringing in your ear.", "Your ears pop.")]"
if(5)
if(!(M.ear_deaf))
- M << "Your ears pop and begin ringing loudly!"
+ M << "Your ears pop and begin ringing loudly!"
M.setEarDamage(-1,INFINITY) //Shall be enough
spawn(200)
if(M)
diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index 6309fa53df2..a25186734b5 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -137,11 +137,11 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048
//raises them if they are down (only if power's on)
if(!A.locked)
A.locked = 1
- A.audible_message("You hear a click from the bottom of the door.", null, 1)
+ A.audible_message("You hear a click from the bottom of the door.", null, 1)
else
if(A.hasPower()) //only can raise bolts if power's on
A.locked = 0
- A.audible_message("You hear a click from the bottom of the door.", null, 1)
+ A.audible_message("You hear a click from the bottom of the door.", null, 1)
A.update_icon()
if(AIRLOCK_WIRE_BACKUP_POWER1 || AIRLOCK_WIRE_BACKUP_POWER2)
diff --git a/code/game/dna.dm b/code/game/dna.dm
index 43f11afb6e7..57c02ef539b 100644
--- a/code/game/dna.dm
+++ b/code/game/dna.dm
@@ -403,8 +403,8 @@
return
user.changeNext_move(CLICK_CD_BREAKOUT)
user.last_special = world.time + CLICK_CD_BREAKOUT
- user << "You lean on the back of [src] and start pushing the door open. (this will take about [breakout_time] minutes.)"
- user.visible_message("You hear a metallic creaking from [src]!")
+ user << "You lean on the back of [src] and start pushing the door open... (this will take about [breakout_time] minutes.)"
+ user.visible_message("You hear a metallic creaking from [src]!")
if(do_after(user,(breakout_time*60*10))) //minutes * 60seconds * 10deciseconds
if(!user || user.stat != CONSCIOUS || user.loc != src || state_open || !locked)
diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index 016c2f8df2f..c96fc387697 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -23,19 +23,19 @@
/obj/effect/proc_holder/changeling/weapon/try_to_sting(var/mob/user, var/mob/target)
if(istype(user.l_hand, weapon_type)) //Not the nicest way to do it, but eh
qdel(user.l_hand)
- user.visible_message("With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "With a sickening crunch, [user] reforms his [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "The [user.get_active_hand()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!"
return
var/obj/item/W = new weapon_type(user)
user.put_in_hands(W)
@@ -64,7 +64,7 @@
var/mob/living/carbon/human/H = user
if(istype(H.wear_suit, suit_type) || istype(H.head, helmet_type))
- H.visible_message("[H] casts off their [suit_name_simple]!", "We cast off our [suit_name_simple][genetic_damage > 0 ? ", temporarily weakening our genomes." : "."]", "You hear the organic matter ripping and tearing!")
+ H.visible_message("[H] casts off their [suit_name_simple]!", "We cast off our [suit_name_simple][genetic_damage > 0 ? ", temporarily weakening our genomes." : "."]", "You hear the organic matter ripping and tearing!")
qdel(H.wear_suit)
qdel(H.head)
H.update_inv_wear_suit()
@@ -133,10 +133,10 @@
/obj/item/weapon/melee/arm_blade/New()
..()
if(ismob(loc))
- loc.visible_message("A grotesque blade forms around [loc.name]\'s arm!", "Our arm twists and mutates, transforming it into a deadly blade.", "You hear organic matter ripping and tearing!")
+ loc.visible_message("A grotesque blade forms around [loc.name]\'s arm!", "Our arm twists and mutates, transforming it into a deadly blade.", "You hear organic matter ripping and tearing!")
/obj/item/weapon/melee/arm_blade/dropped(mob/user)
- user.visible_message("With a sickening crunch, [user] reforms his blade into an arm!", "We assimilate the blade back into our body.", "With a sickening crunch, [user] reforms his blade into an arm!", "We assimilate the blade back into our body.", "[user] forces the door to open with \his [src]!", "We force the door to open.", "You hear a metal screeching sound.")
+ user.visible_message("[user] forces the door to open with \his [src]!", "We force the door to open.", "You hear a metal screeching sound.")
A.open(1)
@@ -207,7 +207,7 @@
/obj/item/weapon/melee/shield/New()
..()
if(ismob(loc))
- loc.visible_message("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "You hear organic matter ripping and tearing!")
+ loc.visible_message("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "You hear organic matter ripping and tearing!")
/obj/item/clothing/head/helmet/space/changeling/dropped()
qdel(src)
@@ -216,7 +216,7 @@
if(remaining_uses < 1)
if(ishuman(loc))
var/mob/living/carbon/human/H = loc
- H.visible_message("With a sickening crunch, [H] reforms his shield into an arm!", "We assimilate our shield into our body", "With a sickening crunch, [H] reforms his shield into an arm!", "We assimilate our shield into our body", "[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!")
+ loc.visible_message("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around their body!", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!")
SSobj.processing += src
/obj/item/clothing/suit/space/changeling/dropped()
@@ -312,7 +312,7 @@
/obj/item/clothing/suit/armor/changeling/New()
..()
if(ismob(loc))
- loc.visible_message("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!", "We harden our flesh, creating a suit of armor!", "You hear organic matter ripping and tearing!")
+ loc.visible_message("[loc.name]\'s flesh turns black, quickly transforming into a hard, chitinous mass!", "We harden our flesh, creating a suit of armor!", "You hear organic matter ripping and tearing!")
/obj/item/clothing/suit/armor/changeling/dropped()
qdel(src)
diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index fcaa66cacd3..ac159322699 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -236,7 +236,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
cultist.say(gibberish)
else
cultist.whisper(gibberish)
- visible_message("The markings pulse with a small burst of light, then fall dark.", 3, "You hear a faint fizzle.", 2)
+ visible_message("The markings pulse with a small burst of light, then fall dark.", 3, "You hear a faint fizzle.", 2)
return
/obj/effect/rune/proc/check_icon()
@@ -637,8 +637,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
return
for (var/mob/V in viewers(src))
- V.show_message("[user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "You hear chanting.", 2)
- user << "You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world."
+ V.show_message("[user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "You hear chanting.", 2)
+ user << "You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world."
user.take_overall_damage((rand(9)+1)/10) // 0.1 to 1.0 damage
if(do_after(user, 50))
if(usr.get_active_hand() != src)
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index babeb58ab51..340aa519ba5 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -26,8 +26,8 @@ var/list/sacrificed = list()
else
user.whisper("Sas[pick("'","`")]so c'arta forbici!")
user.visible_message("[user] disappears in a flash of red light!", \
- "You feel as your body gets dragged through the dimension of Nar-Sie!", \
- "You hear a sickening crunch and sloshing of viscera.")
+ "You feel as your body gets dragged through the dimension of Nar-Sie!", \
+ "You hear a sickening crunch and sloshing of viscera.")
user.loc = allrunesloc[rand(1,index)]
return
if(istype(src,/obj/effect/rune))
@@ -53,7 +53,7 @@ var/list/sacrificed = list()
IP = R
runecount++
if(runecount >= 2)
- user << "You feel pain, as the rune disappears in reality shift caused by too much wear of space-time fabric"
+ user << "You feel pain, as the rune disappears in reality shift caused by too much wear of space-time fabric"
if (istype(user, /mob/living))
user.take_overall_damage(5, 0)
qdel(src)
@@ -85,7 +85,7 @@ var/list/sacrificed = list()
usr.whisper("N[pick("'","`")]ath reth sh'yro eth d'raggathnor!")
usr.visible_message("Rune disappears with a flash of red light, and in its place now a book lies.", \
"You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a book.", \
- "You hear a pop and smell ozone.")
+ "You hear a pop and smell ozone.")
if(istype(src,/obj/effect/rune))
new /obj/item/weapon/tome(src.loc)
else
@@ -110,8 +110,8 @@ var/list/sacrificed = list()
C.say("Mah[pick("'","`")]weyh pleggh at e'ntrath!")
if(cultsinrange.len >= 3)
M.visible_message("[M] writhes in pain as the markings below him glow a bloody red.", \
- "AAAAAAHHHH!", \
- "You hear an anguished scream.")
+ "AAAAAAHHHH!", \
+ "You hear an anguished scream.")
if(is_convertable_to_cult(M.mind))
ticker.mode.add_cultist(M.mind)
M.mind.special_role = "Cultist"
@@ -221,14 +221,14 @@ var/list/sacrificed = list()
usr.say ("Yu[pick("'","`")]gular faras desdae. Havas mithum javara. Umathar uf'kal thenar!")
usr.visible_message("Blood flows from the rune into [usr]!", \
"The blood starts flowing from the rune and into your frail mortal body. You feel... empowered.", \
- "You hear a liquid flowing.")
+ "You hear a liquid flowing.")
var/mob/living/user = usr
if(user.bhunger)
user.bhunger = max(user.bhunger-2*drain,0)
if(drain>=50)
user.visible_message("[user]'s eyes give off eerie red glow!", \
"...but it wasn't nearly enough. You crave, crave for more. The hunger consumes you from within.", \
- "You hear a heartbeat.")
+ "You hear a heartbeat.")
user.bhunger += drain
src = user
spawn()
@@ -341,10 +341,10 @@ var/list/sacrificed = list()
usr.say("Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!")
corpse_to_raise.visible_message("[corpse_to_raise]'s eyes glow with a faint red as he stands up, slowly starting to breathe again.", \
"Life... I'm alive again...", \
- "You hear a faint, slightly familiar whisper.")
+ "You hear a faint, slightly familiar whisper.")
body_to_sacrifice.visible_message("[body_to_sacrifice] is torn apart, a black smoke swiftly dissipating from his remains!", \
"You feel as your blood boils, tearing you apart.", \
- "You hear a thousand voices, all crying in pain.")
+ "You hear a thousand voices, all crying in pain.")
body_to_sacrifice.gib()
// if(ticker.mode.name == "cult")
@@ -396,7 +396,7 @@ var/list/sacrificed = list()
usr.say("Fwe[pick("'","`")]sh mah erl nyag r'ya!")
usr.visible_message("[usr]'s eyes glow blue as \he freezes in place, absolutely motionless.", \
"The shadow that is your spirit separates itself from your body. You are now in the realm beyond. While this is a great sight, being here strains your mind and body. Hurry...", \
- "You hear only complete silence for a moment.")
+ "You hear only complete silence for a moment.")
usr.ghostize(1)
L.ajourn = 1
while(L)
@@ -431,7 +431,7 @@ var/list/sacrificed = list()
var/mob/living/carbon/human/dummy/D = new(this_rune.loc)
usr.visible_message("A shape forms in the center of the rune. A shape of... a man.", \
"A shape forms in the center of the rune. A shape of... a man.", \
- "You hear liquid flowing.")
+ "You hear liquid flowing.")
D.real_name = "[pick(first_names_male)] [pick(last_names)]"
D.status_flags = CANSTUN|CANWEAKEN|CANPARALYSE|CANPUSH
@@ -453,7 +453,7 @@ var/list/sacrificed = list()
if(D)
D.visible_message("[D] slowly dissipates into dust and bones.", \
"You feel pain, as bonds formed between your soul and this homunculus break.", \
- "You hear faint rustle.")
+ "You hear faint rustle.")
D.dust()
return
@@ -552,7 +552,7 @@ var/list/sacrificed = list()
runedec+=10
user.visible_message("[user] keels over dead, his blood glowing blue as it escapes his body and dissipates into thin air.", \
"In the last moment of your humble life, you feel an immense pain as fabric of reality mends... with your blood.", \
- "You hear faint rustle.")
+ "You hear faint rustle.")
for(,user.stat==2)
sleep(600)
if (!user)
@@ -877,7 +877,7 @@ var/list/sacrificed = list()
C.take_overall_damage(25, 0)
user.visible_message("Rune disappears with a flash of red light, and in its place now a body lies.", \
"You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a body.", \
- "You hear a pop and smell ozone.")
+ "You hear a pop and smell ozone.")
qdel(src)
return fizzle(user)
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index 3526c6b4414..b5576eab127 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -227,7 +227,7 @@
for(var/datum/AI_Module/small/overload_machine/overload in current_modules)
if(overload.uses > 0)
overload.uses --
- audible_message("You hear a loud electrical buzzing sound!")
+ audible_message("You hear a loud electrical buzzing sound!")
src << "Overloading machine circuitry..."
spawn(50)
if(M)
@@ -257,7 +257,7 @@
for(var/datum/AI_Module/small/override_machine/override in current_modules)
if(override.uses > 0)
override.uses --
- audible_message("You hear a loud electrical buzzing sound!")
+ audible_message("You hear a loud electrical buzzing sound!")
src << "Reprogramming machine behaviour..."
spawn(50)
if(M && !M.gc_destroyed)
diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm
index e47c19ecc3f..059464d70e9 100644
--- a/code/game/machinery/atmoalter/meter.dm
+++ b/code/game/machinery/atmoalter/meter.dm
@@ -93,7 +93,7 @@
user.visible_message( \
"[user] unfastens \the [src].", \
"You unfasten \the [src].", \
- "You hear ratchet.")
+ "You hear ratchet.")
new /obj/item/pipe_meter(src.loc)
qdel(src)
return
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 87d84453a52..88fa45990a7 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -124,7 +124,7 @@
user << "The autolathe is full. Please remove glass from the autolathe in order to insert more."
return 1
if (O.m_amt == 0 && O.g_amt == 0)
- user << "This object does not contain significant amounts of metal or glass, or cannot be accepted by the autolathe due to size or hazardous materials"
+ user << "This object does not contain significant amounts of metal or glass, or cannot be accepted by the autolathe due to size or hazardous materials."
return 1
var/amount = 1
diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm
index 0b8a5a460ca..17e2305723b 100644
--- a/code/game/machinery/bots/mulebot.dm
+++ b/code/game/machinery/bots/mulebot.dm
@@ -399,7 +399,7 @@ obj/machinery/bot/mulebot/bot_reset()
// called to load a crate
/obj/machinery/bot/mulebot/proc/load(var/atom/movable/C)
if(wires.LoadCheck() && !istype(C,/obj/structure/closet/crate))
- visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
+ visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
return // if not emagged, only allow crates to be loaded
@@ -593,25 +593,25 @@ obj/machinery/bot/mulebot/bot_reset()
blockcount++
mode = BOT_BLOCKED
if(blockcount == 3)
- visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
+ visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
if(blockcount > 10) // attempt 10 times before recomputing
// find new path excluding blocked turf
- visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
+ visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
spawn(2)
calc_path(next)
if(path.len > 0)
- visible_message("[src] makes a delighted ping!", "You hear a ping.")
+ visible_message("[src] makes a delighted ping!", "You hear a ping.")
playsound(loc, 'sound/machines/ping.ogg', 50, 0)
mode = BOT_BLOCKED
mode = BOT_WAIT_FOR_NAV
return
return
else
- visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
+ visible_message("[src] makes an annoyed buzzing sound.", "You hear an electronic buzzing sound.")
playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
//world << "Bad turf."
mode = BOT_NAV
@@ -631,11 +631,11 @@ obj/machinery/bot/mulebot/bot_reset()
if(path.len > 0)
blockcount = 0
mode = BOT_BLOCKED
- visible_message("[src] makes a delighted ping!", "You hear a ping.")
+ visible_message("[src] makes a delighted ping!", "You hear a ping.")
playsound(loc, 'sound/machines/ping.ogg', 50, 0)
else
- visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
+ visible_message("[src] makes a sighing buzz.", "You hear an electronic buzzing sound.")
playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
mode = BOT_NO_ROUTE
@@ -682,7 +682,7 @@ obj/machinery/bot/mulebot/bot_reset()
/obj/machinery/bot/mulebot/proc/at_target()
if(!reached_target)
radio_frequency = SUPP_FREQ //Supply channel
- visible_message("[src] makes a chiming sound!", "You hear a chime.")
+ visible_message("[src] makes a chiming sound!", "You hear a chime.")
playsound(loc, 'sound/machines/chime.ogg', 50, 0)
reached_target = 1
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index 9233758addd..18f8925050f 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -127,12 +127,12 @@
if(prob(10))
user.visible_message("[user.name] smashes the [src.name] with its paws.",\
"You smash the [src.name] with your paws.",\
- "You hear a smashing sound.")
+ "You hear a smashing sound.")
set_broken()
return
user.visible_message("[user.name] smashes against the [src.name] with its paws.",\
"You smash against the [src.name] with your paws.",\
- "You hear a clicking sound.")
+ "You hear hear a clicking sound.")
/obj/machinery/computer/attack_alien(mob/living/user)
user.do_attack_animation(src)
@@ -140,9 +140,9 @@
if(prob(80))
user.visible_message("[user.name] smashes the [src.name] with its claws.",\
"You smash the [src.name] with your claws.",\
- "You hear a smashing sound.")
+ "You hear a smashing sound.")
set_broken()
return
user.visible_message("[user.name] smashes against the [src.name] with its claws.",\
"You smash against the [src.name] with your claws.",\
- "You hear a clicking sound.")
+ "You hear a clicking sound.")
diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index d58f416f99c..c021d2e158a 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -132,7 +132,7 @@
var/obj/item/weapon/implant/I = locate(href_list["warn"])
if((I)&&(I.imp_in))
var/mob/living/carbon/R = I.imp_in
- R << "You hear a voice in your head saying: '[warning]'"
+ R << "You hear a voice in your head saying: '[warning]'"
log_say("[usr]/[usr.ckey] sent an implant message to [R]/[R.ckey]: '[warning]'")
src.add_fingerprint(usr)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 869e5310d6d..64117c66660 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -891,7 +891,7 @@ About the new airlock wires panel:
if(W.remove_fuel(0,user))
user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \
"You begin [welded ? "unwelding":"welding"] the airlock...", \
- "You hear welding.")
+ "You hear welding.")
playsound(loc, 'sound/items/Welder.ogg', 40, 1)
if(do_after(user,40,5,1))
if(density && !operating)//Door must be closed to weld.
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index dd9ea3aecd5..a4db08cf85b 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -406,7 +406,7 @@ var/global/list/pipeID2State = list(
user.visible_message( \
"[user] fastens \the [src].", \
"You fasten \the [src].", \
- "You hear ratchet.")
+ "You hear ratchet.")
qdel(src) // remove the pipe item
diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
index f2f995b497e..ed9680d8988 100644
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -87,7 +87,7 @@
user.visible_message( \
"[user] fastens \the [src].", \
"You fasten \the [src]. Now it can dispense pipes.", \
- "You hear ratchet.")
+ "You hear ratchet.")
anchored = 1
stat &= MAINT
if (usr.machine==src)
@@ -100,7 +100,7 @@
user.visible_message( \
"[user] unfastens \the [src].", \
"You unfasten \the [src]. Now it can be pulled somewhere else.", \
- "You hear ratchet.")
+ "You hear ratchet.")
anchored = 0
stat |= ~MAINT
power_change()
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index f78890e57ce..9692acc5ca6 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -219,13 +219,13 @@
if (src.active)
user.visible_message("[src] [user] deactivated the shield generator.", \
"[src] You deactivate the shield generator.", \
- "You hear heavy droning fade out.")
+ "You hear heavy droning fade out.")
src.shields_down()
else
if(anchored)
user.visible_message("[src] [user] activated the shield generator.", \
"[src] You activate the shield generator.", \
- "You hear heavy droning.")
+ "You hear heavy droning.")
src.shields_up()
else
user << "The device must first be secured to the floor!"
@@ -363,14 +363,14 @@
user.visible_message("[user] turned the shield generator off.", \
"You turn off the shield generator.", \
- "You hear heavy droning fade out.")
+ "You hear heavy droning fade out.")
src.cleanup()
else
src.active = 1
icon_state = "Shield_Gen +a"
user.visible_message("[user] turned the shield generator on.", \
"You turn on the shield generator.", \
- "You hear heavy droning.")
+ "You hear heavy droning.")
src.add_fingerprint(user)
/obj/machinery/shieldwallgen/process()
@@ -396,7 +396,7 @@
if(src.active >= 1)
if(src.power == 0)
src.visible_message("The [src.name] shuts down due to lack of power!", \
- "You hear heavy droning fade out")
+ "You hear heavy droning fade out.")
icon_state = "Shield_Gen"
src.active = 0
src.cleanup(1)
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 2c7bbef51b8..acc61087afe 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -293,7 +293,7 @@
if (!com)
return
if (!com.target)
- visible_message("Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.")
+ visible_message("Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.")
return
if (istype(M, /atom/movable))
if(do_teleport(M, com.target))
@@ -301,7 +301,7 @@
if(ishuman(M))//don't remove people from the round randomly you jerks
var/mob/living/carbon/human/human = M
if(human.dna && human.dna.species.id == "human")
- M << "You hear a buzzing in your ears."
+ M << "You hear a buzzing in your ears."
human.dna.species = new /datum/species/fly()
human.regenerate_icons()
human.apply_effect((rand(120 - accurate * 40, 180 - accurate * 60)), IRRADIATE, 0)
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index 4e4df55615e..e22bc5ba706 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -65,7 +65,7 @@
M.updatehealth()
target.visible_message("[chassis] squeezes [target].", \
"[chassis] squeezes [target].",\
- "You hear something crack")
+ "You hear something crack.")
add_logs(chassis.occupant, M, "attacked", object="[name]", addition="(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])")
else
step_away(M,chassis)
@@ -95,7 +95,7 @@
chassis.use_power(energy_drain)
target.visible_message("[chassis] starts to drill [target]", \
"[chassis] starts to drill [target]", \
- "You hear drilling.")
+ "You hear drilling.")
var/T = chassis.loc
var/C = target.loc //why are these backwards? we may never know -Pete
if(do_after_cooldown(target))
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index ac1b47f47b5..be8d9fccbc3 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -76,12 +76,12 @@
M.visible_message(\
"[M.name] buckles themselves to [src].",\
"You buckle yourself to [src].",\
- "You hear metal clanking.")
+ "You hear metal clanking.")
else
M.visible_message(\
"[M.name] is buckled to [src] by [user.name]!",\
"You are buckled to [src] by [user.name]!",\
- "You heat metal clanking.")
+ "You heat metal clanking.")
/obj/proc/user_unbuckle_mob(mob/user)
var/mob/living/M = unbuckle_mob()
@@ -91,12 +91,12 @@
M.visible_message(\
"[M.name] was unbuckled by [user.name].",\
"You were unbuckled from [src] by [user.name].",\
- "You hear metal clanking.")
+ "You hear metal clanking.")
else
M.visible_message(\
"[M.name] unbuckled themselves!",\
"You unbuckled yourself from [src].",\
- "You hear metal clanking.")
+ "You hear metal clanking.")
add_fingerprint(user)
return M
diff --git a/code/game/objects/effects/effect_system/effects_other.dm b/code/game/objects/effects/effect_system/effects_other.dm
index 93219cb61b4..30f2be1dd2d 100644
--- a/code/game/objects/effects/effect_system/effects_other.dm
+++ b/code/game/objects/effects/effect_system/effects_other.dm
@@ -75,7 +75,7 @@
/datum/effect/effect/system/reagents_explosion/start()
if(explosion_message)
location.visible_message("The solution violently explodes!", \
- "You hear an explosion!")
+ "You hear an explosion!")
if (amount <= 2)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(2, 1, location)
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index e820cc57eaf..daf2e5da390 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -141,7 +141,7 @@
var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = pick(vents)
if(prob(50))
visible_message("[src] scrambles into the ventillation ducts!", \
- "You hear something squeezing through the ventilation ducts.")
+ "You hear something scampering through the ventilation ducts.")
spawn(rand(20,60))
loc = exit_vent
@@ -154,7 +154,7 @@
return
if(prob(50))
- audible_message("You hear something squeezing through the ventilation ducts.")
+ audible_message("You hear something scampering through the ventilation ducts.")
sleep(travel_time)
if(!exit_vent || exit_vent.welded)
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index 746dfaea182..970e7550699 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -61,21 +61,21 @@
if(isturf(T) && !T.intact)
attached = locate() in T
if(!attached)
- user << "No exposed cable here to attach to."
+ user << "No exposed cable here to attach to!"
else
set_mode(CLAMPED_OFF)
user.visible_message( \
"[user] attaches \the [src] to the cable.", \
- "You attach \the [src] to the cable.",
- "You hear some wires being connected to something.")
+ "You attach \the [src] to the cable.",
+ "You hear some wires being connected to something.")
else
- user << "Device must be placed over an exposed cable to attach to it."
+ user << "Device must be placed over an exposed cable to attach to it!"
else
set_mode(DISCONNECTED)
user.visible_message( \
"[user] detaches \the [src] from the cable.", \
- "You detach \the [src] from the cable.",
- "You hear some wires being disconnected from something.")
+ "You detach \the [src] from the cable.",
+ "You hear some wires being disconnected from something.")
else
..()
@@ -93,8 +93,8 @@
if(CLAMPED_OFF)
user.visible_message( \
"[user] activates \the [src]!", \
- "You activate \the [src]!",
- "You hear a click.")
+ "You activate \the [src].",
+ "You hear a click.")
message_admins("Power sink activated by [key_name(user, user.client)](?) at ([x],[y],[z] - JMP)")
log_game("Power sink activated by [key_name(user)] at ([x],[y],[z])")
set_mode(OPERATING)
@@ -102,8 +102,8 @@
if(OPERATING)
user.visible_message( \
"[user] deactivates \the [src]!", \
- "You deactivate \the [src]!",
- "You hear a click.")
+ "You deactivate \the [src].",
+ "You hear a click.")
set_mode(CLAMPED_OFF)
/obj/item/device/powersink/process()
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 4a56ab7b1f8..7e38de5879d 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -21,7 +21,7 @@
for(var/mob/O in viewers(M, null))
if (O.client)
O.show_message("[user] has prodded [M] with an electrically-charged arm!", 1,
- " You hear someone fall", 2)
+ "You hear someone fall.", 2)
add_logs(user, M, "stunned", object="[src.name]", addition="(INTENT: [uppertext(user.a_intent)])")
/obj/item/borg/overdrive
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 272c99697d4..7a2a2a5146a 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -46,7 +46,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \
new_item.add_to_stacks(usr)
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.")
+ "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/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index cc9ef80a946..1795cb3a607 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -115,7 +115,7 @@ var/global/list/datum/stack_recipe/xeno_recipes = list ( \
istype(W, /obj/item/weapon/hatchet) )
//visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message)
- usr.visible_message("\the [usr] starts cutting hair off \the [src].", "You start cutting the hair off \the [src]...", "You hear the sound of a knife rubbing against flesh")
+ usr.visible_message("\the [usr] starts cutting hair off \the [src].", "You start cutting the hair off \the [src]...", "You hear the sound of a knife rubbing against flesh.")
if(do_after(user,50))
usr << "You cut the hair from this [src.singular_name]."
//Try locating an exisitng stack on the tile and add to there if possible
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 2c64baf8224..6d81c36bb2c 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -43,7 +43,7 @@
new_item.add_to_stacks(user)
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)
@@ -57,7 +57,7 @@
new_item.add_to_stacks(user)
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/toys.dm b/code/game/objects/items/toys.dm
index b5e6ea31c58..2b75380b43b 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -69,7 +69,7 @@
/obj/item/toy/balloon/throw_impact(atom/hit_atom)
if(src.reagents.total_volume >= 1)
- src.visible_message("\The [src] bursts!","You hear a pop and a splash.")
+ src.visible_message("\The [src] bursts!","You hear a pop and a splash.")
src.reagents.reaction(get_turf(hit_atom))
for(var/atom/A in get_turf(hit_atom))
src.reagents.reaction(A)
@@ -156,7 +156,7 @@
if (flag)
return
if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
- usr << "You don't have the dexterity to do this!"
+ usr << "You don't have the dexterity to do this!"
return
src.add_fingerprint(user)
if (src.bullets < 1)
@@ -167,7 +167,7 @@
src.bullets--
user.visible_message("[user] fires [src] at [target]!", \
"You fire [src] at [target]!", \
- " You hear a gunshot.")
+ " You hear a gunshot!")
/obj/item/toy/ammo/gun
name = "capgun ammo"
@@ -231,7 +231,7 @@
if(ishuman(user))
user.adjustBrainLoss(10)
else if((W.flags & NODROP) || (flags & NODROP))
- user << "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!"
+ user << "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!"
else
user << "You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool."
var/obj/item/weapon/twohanded/dualsaber/toy/newSaber = new /obj/item/weapon/twohanded/dualsaber/toy(user.loc)
@@ -428,7 +428,7 @@
if(territory_claimed(territory, user))
return
else
- user << "This area is unsuitable for territory tagging."
+ user << "This area is unsuitable for territory tagging!"
/////////////////////////////////////////
var/graf_rot
@@ -515,7 +515,7 @@
s.set_up(3, 1, src)
s.start()
new /obj/effect/decal/cleanable/ash(src.loc)
- src.visible_message(" The [src.name] explodes!"," You hear a snap!")
+ src.visible_message(" The [src.name] explodes!","You hear a snap!")
playsound(src, 'sound/effects/snap.ogg', 50, 1)
qdel(src)
@@ -529,7 +529,7 @@
s.set_up(2, 0, src)
s.start()
new /obj/effect/decal/cleanable/ash(src.loc)
- src.visible_message("The [src.name] explodes!","You hear a snap!")
+ src.visible_message("The [src.name] explodes!","You hear a snap!")
playsound(src, 'sound/effects/snap.ogg', 50, 1)
qdel(src)
@@ -759,7 +759,7 @@ obj/item/toy/cards/deck/attack_hand(mob/user as mob)
src.cards -= choice
H.pickup(user)
user.put_in_active_hand(H)
- user.visible_message("[user] draws a card from the deck.", "You draw a card from the deck.")
+ user.visible_message("[user] draws a card from the deck.", "You draw a card from the deck.")
if(cards.len > 26)
src.icon_state = "deck_[deckstyle]_full"
else if(cards.len > 10)
@@ -771,7 +771,7 @@ obj/item/toy/cards/deck/attack_self(mob/user as mob)
if(cooldown < world.time - 50)
cards = shuffle(cards)
playsound(user, 'sound/items/cardshuffle.ogg', 50, 1)
- user.visible_message("[user] shuffles the deck.", "You shuffle the deck.")
+ user.visible_message("[user] shuffles the deck.", "You shuffle the deck.")
cooldown = world.time
obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
@@ -779,13 +779,13 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use
if(istype(C))
if(C.parentdeck == src)
if(!user.unEquip(C))
- user << "The card is stuck to your hand, you can't add it to the deck!"
+ user << "The card is stuck to your hand, you can't add it to the deck!"
return
src.cards += C.cardname
- user.visible_message("[user] adds a card to the bottom of the deck.","You add the card to the bottom of the deck.")
+ user.visible_message("[user] adds a card to the bottom of the deck.","You add the card to the bottom of the deck.")
qdel(C)
else
- user << "You can't mix cards from other decks."
+ user << "You can't mix cards from other decks!"
if(cards.len > 26)
src.icon_state = "deck_[deckstyle]_full"
else if(cards.len > 10)
@@ -799,13 +799,13 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user,
if(istype(C))
if(C.parentdeck == src)
if(!user.unEquip(C))
- user << "The hand of cards is stuck to your hand, you can't add it to the deck!"
+ user << "The hand of cards is stuck to your hand, you can't add it to the deck!"
return
src.cards += C.currenthand
- user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.")
+ user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.")
qdel(C)
else
- user << "You can't mix cards from other decks."
+ user << "You can't mix cards from other decks!"
if(cards.len > 26)
src.icon_state = "deck_[deckstyle]_full"
else if(cards.len > 10)
@@ -830,7 +830,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user,
M.put_in_r_hand(src)
usr << "You pick up the deck."
else
- usr << "You can't reach it from here."
+ usr << "You can't reach it from here!"
@@ -876,7 +876,7 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
C.apply_card_vars(C,O)
C.pickup(cardUser)
cardUser.put_in_any_hand_if_possible(C)
- cardUser.visible_message("[cardUser] draws a card from \his hand.", "You take the [C.cardname] from your hand.")
+ cardUser.visible_message("[cardUser] draws a card from \his hand.", "You take the [C.cardname] from your hand.")
interact(cardUser)
if(src.currenthand.len < 3)
@@ -903,7 +903,7 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living
if(C.parentdeck == src.parentdeck)
src.currenthand += C.cardname
user.unEquip(C)
- user.visible_message("[user] adds a card to their hand.", "You add the [C.cardname] to your hand.")
+ user.visible_message("[user] adds a card to their hand.", "You add the [C.cardname] to your hand.")
interact(user)
if(currenthand.len > 4)
src.icon_state = "[deckstyle]_hand5"
@@ -913,7 +913,7 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living
src.icon_state = "[deckstyle]_hand3"
qdel(C)
else
- user << "You can't mix cards from other decks."
+ user << "You can't mix cards from other decks!"
obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/toy/cards/sourceobj)
..()
@@ -942,9 +942,9 @@ obj/item/toy/cards/singlecard/examine(mob/user)
if(ishuman(user))
var/mob/living/carbon/human/cardUser = user
if(cardUser.get_item_by_slot(slot_l_hand) == src || cardUser.get_item_by_slot(slot_r_hand) == src)
- cardUser.visible_message("[cardUser] checks \his card.", "The card reads: [src.cardname]")
+ cardUser.visible_message("[cardUser] checks \his card.", "The card reads: [src.cardname]")
else
- cardUser << "You need to have the card in your hand to check it."
+ cardUser << "You need to have the card in your hand to check it!"
obj/item/toy/cards/singlecard/verb/Flip()
@@ -984,14 +984,14 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
qdel(C)
qdel(src)
else
- user << "You can't mix cards from other decks."
+ user << "You can't mix cards from other decks!"
if(istype(I, /obj/item/toy/cards/cardhand/))
var/obj/item/toy/cards/cardhand/H = I
if(H.parentdeck == parentdeck)
H.currenthand += cardname
user.unEquip(src)
- user.visible_message("[user] adds a card to \his hand.", "You add the [cardname] to your hand.")
+ user.visible_message("[user] adds a card to \his hand.", "You add the [cardname] to your hand.")
H.interact(user)
if(H.currenthand.len > 4)
H.icon_state = "[deckstyle]_hand5"
@@ -1001,7 +1001,7 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
H.icon_state = "[deckstyle]_hand3"
qdel(src)
else
- user << "You can't mix cards from other decks."
+ user << "You can't mix cards from other decks!"
obj/item/toy/cards/singlecard/attack_self(mob/user)
@@ -1057,7 +1057,7 @@ obj/item/toy/cards/deck/syndicate
/obj/item/toy/nuke/attack_self(mob/user)
if (cooldown < world.time)
cooldown = world.time + 1800 //3 minutes
- user.visible_message("[user] presses a button on [src]", "You activate [src], it plays a loud noise!", "You hear the click of a button.")
+ user.visible_message("[user] presses a button on [src].", "You activate [src], it plays a loud noise!", "You hear the click of a button.")
spawn(5) //gia said so
icon_state = "nuketoy"
playsound(src, 'sound/machines/Alarm.ogg', 100, 0, surround = 0)
@@ -1125,7 +1125,7 @@ obj/item/toy/cards/deck/syndicate
/obj/item/toy/redbutton/attack_self(mob/user)
if (cooldown < world.time)
cooldown = (world.time + 300) // Sets cooldown at 30 seconds
- user.visible_message("[user] presses the big red button.", "You press the button, it plays a loud noise!", "The button clicks loudly.")
+ user.visible_message("[user] presses the big red button.", "You press the button, it plays a loud noise!", "You hear a loud click.")
playsound(src, 'sound/effects/explosionfar.ogg', 50, 0, surround = 0)
for(var/mob/M in range(10, src)) // Checks range
if(!M.stat && !istype(M, /mob/living/silicon/ai)) // Checks to make sure whoever's getting shaken is alive/not the AI
@@ -1133,4 +1133,4 @@ obj/item/toy/cards/deck/syndicate
shake_camera(M, 2, 1) // Shakes player camera 2 squares for 1 second.
else
- user << "Nothing happens."
+ user << "Nothing happens!"
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index 409ee2d7639..bedf0ebe085 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -147,9 +147,9 @@
else
injectamount = cause
reagents.trans_to(R, injectamount)
- R << "You hear a faint *beep*."
+ R << "You hear a faint beep."
if(!reagents.total_volume)
- R << "You hear a faint click from your chest."
+ R << "You hear a faint click from your chest."
qdel(src)
diff --git a/code/game/objects/items/weapons/paiwire.dm b/code/game/objects/items/weapons/paiwire.dm
index 83bc76517a6..b7f90a9ee0e 100644
--- a/code/game/objects/items/weapons/paiwire.dm
+++ b/code/game/objects/items/weapons/paiwire.dm
@@ -1,11 +1,11 @@
/obj/item/weapon/pai_cable/proc/plugin(obj/machinery/M as obj, mob/user as mob)
if(istype(M, /obj/machinery/door) || istype(M, /obj/machinery/camera))
- user.visible_message("[user] inserts [src] into a data port on [M].", "You insert [src] into a data port on [M].", "You hear the satisfying click of a wire jack fastening into place.")
+ user.visible_message("[user] inserts [src] into a data port on [M].", "You insert [src] into a data port on [M].", "You hear the satisfying click of a wire jack fastening into place.")
user.drop_item()
src.loc = M
src.machine = M
else
- user.visible_message("[user] dumbly fumbles to find a place on [M] to plug in [src].", "There aren't any ports on [M] that match the jack belonging to [src].")
+ user.visible_message("[user] dumbly fumbles to find a place on [M] to plug in [src].", "There aren't any ports on [M] that match the jack belonging to [src]!")
/obj/item/weapon/pai_cable/attack(obj/machinery/M as obj, mob/user as mob)
src.plugin(M, user)
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/singularityhammer.dm b/code/game/objects/items/weapons/singularityhammer.dm
index 0df64ef2e05..e2af15774b5 100644
--- a/code/game/objects/items/weapons/singularityhammer.dm
+++ b/code/game/objects/items/weapons/singularityhammer.dm
@@ -92,7 +92,7 @@
target.take_organ_damage(0,30)
target.visible_message("[target.name] was shocked by the [src.name]!", \
"You feel a powerful shock course through your body sending you flying!", \
- "You hear a heavy electrical crack.")
+ "You hear a heavy electrical crack!")
var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
target.throw_at(throw_target, 200, 4)
return
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index 9b7d8f19952..35ec6dfbb1b 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -48,11 +48,11 @@
desc += "It appears to be broken."
icon_state = src.icon_broken
for(var/mob/O in viewers(user, 3))
- O.show_message(text("\The [src] has been broken by [] with an electromagnetic card!", user), 1, text("You hear a faint electrical spark."), 2)
+ O.show_message(text("\The [src] has been broken by [] with an electromagnetic card!", user), 1, text("You hear a faint electrical spark."), 2)
return
/obj/item/weapon/storage/lockbox/show_to(mob/user as mob)
if(locked)
- user << "It's locked!"
+ user << "It's locked!"
else
..()
return
diff --git a/code/game/objects/structures/crates_lockers/bins.dm b/code/game/objects/structures/crates_lockers/bins.dm
index 0d94473a439..edabca55fb7 100644
--- a/code/game/objects/structures/crates_lockers/bins.dm
+++ b/code/game/objects/structures/crates_lockers/bins.dm
@@ -47,16 +47,16 @@
. = ..(O, user, 0, 0, 0)
if(.)
if(O != user)
- user.visible_message("[user] tries to stuff [O] into [src].", \
+ user.visible_message("[user] tries to stuff [O] into [src].", \
"You try to stuff [O] into [src].", \
- "You hear clanging.")
+ "You hear clanging.")
if (!do_after(user, 40))
return
if(!..(O, user, 0, 0))
return
- user.visible_message("[user] stuffs [O] into[src].", \
+ user.visible_message("[user] stuffs [O] into[src].", \
"You stuff [O] into [src].", \
- "You hear a loud metal bang.")
+ "You hear a loud metal bang.")
insert(O, 1, !opened)
if(opened)
close()
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 416256c4768..83508dc4ccc 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -211,7 +211,7 @@
return
playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
new /obj/item/stack/sheet/metal(src.loc)
- visible_message("[user] has cut \the [src] apart with \the [WT].", "You hear welding.")
+ visible_message("[user] has cut \the [src] apart with \the [WT].", "You hear welding.")
qdel(src)
return
if(isrobot(user))
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 6aadaaa0b9d..c0766520753 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -6,7 +6,7 @@
health = 200
user << "You have no idea how this thing is supposed to work!"
user << "You can't do that right now!"
- user.visible_message("[user] has [locked ? null : "un"]locked the locker.", "You [locked ? null : "un"]lock the locker.")
+ user.visible_message("[user] has [locked ? null : "un"]locked the locker.", "You [locked ? null : "un"]lock the locker.")
user << "Access Denied."
user << "The locker appears to be broken!"
O.show_message("The locker has been broken by [user] with an electromagnetic card!", 1, "You hear a faint electrical spark.", 2)
diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index cf74ee1341d..54a1fe847c3 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -15,9 +15,9 @@
var/turf/T = get_turf(src)
for(var/obj/O in contents)
O.loc = T
- user.visible_message("[user] pries \the [src] open.", \
+ user.visible_message("[user] pries \the [src] open.", \
"You pry open \the [src].", \
- "You hear splitting wood.")
+ "You hear splitting wood.")
qdel(src)
else
return attack_hand(user)
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 7b76cd43177..d37ebc83076 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -469,9 +469,9 @@ obj/structure/door_assembly/New()
if(door_check)
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user.visible_message("[user] secures the airlock assembly to the floor.", \
- "You start to secure the airlock assembly to the floor...", \
- "You hear wrenching")
+ user.visible_message("[user] secures the airlock assembly to the floor.", \
+ "You start to secure the airlock assembly to the floor...", \
+ "You hear wrenching.")
if(do_after(user, 40))
if( src.anchored )
@@ -484,9 +484,9 @@ obj/structure/door_assembly/New()
else if(istype(W, /obj/item/weapon/wrench) && anchored )
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user.visible_message("[user] unsecures the airlock assembly from the floor.", \
- "You start to unsecure the airlock assembly from the floor...", \
- "You hear wrenching")
+ user.visible_message("[user] unsecures the airlock assembly from the floor.", \
+ "You start to unsecure the airlock assembly from the floor...", \
+ "You hear wrenching.")
if(do_after(user, 40))
if( !src.anchored )
return
@@ -499,8 +499,8 @@ obj/structure/door_assembly/New()
if (C.get_amount() < 1)
user << "You need one length of cable to wire the airlock assembly!"
return
- user.visible_message("[user] wires the airlock assembly.", \
- "You start to wire the airlock assembly...")
+ user.visible_message("[user] wires the airlock assembly.", \
+ "You start to wire the airlock assembly...")
if(do_after(user, 40))
if(C.get_amount() < 1 || state != 0) return
C.use(1)
@@ -510,8 +510,8 @@ obj/structure/door_assembly/New()
else if(istype(W, /obj/item/weapon/wirecutters) && state == 1 )
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 the airlock assembly...")
+ user.visible_message("[user] cuts the wires from the airlock assembly.", \
+ "You start to cut the wires from the airlock assembly...")
if(do_after(user, 40))
if( src.state != 1 )
@@ -523,8 +523,8 @@ obj/structure/door_assembly/New()
else if(istype(W, /obj/item/weapon/airlock_electronics) && state == 1 )
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...")
if(do_after(user, 40))
@@ -541,13 +541,13 @@ obj/structure/door_assembly/New()
else if(istype(W, /obj/item/weapon/crowbar) && state == 2 )
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
- user.visible_message("[user] removes the electronics from the airlock assembly.", \
- "You start to remove electronics from the airlock assembly...")
+ user.visible_message("[user] removes the electronics from the airlock assembly.", \
+ "You start to remove electronics from the airlock assembly...")
if(do_after(user, 40))
if( src.state != 2 )
return
- user << " You removed the airlock electronics..."
+ user << " You remove the airlock electronics."
src.state = 1
src.name = "wired airlock assembly"
var/obj/item/weapon/airlock_electronics/ae
@@ -563,8 +563,8 @@ obj/structure/door_assembly/New()
if(G.get_amount() >= 1)
if(G.type == /obj/item/stack/sheet/rglass)
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
- user.visible_message("[user] adds [G.name] to the airlock assembly.", \
- "You start to install [G.name] into the airlock assembly...")
+ user.visible_message("[user] adds [G.name] to the airlock assembly.", \
+ "You start to install [G.name] into the airlock assembly...")
if(do_after(user, 40))
if(G.get_amount() < 1 || mineral) return
user << "You install reinforced glass windows into the airlock assembly."
@@ -587,8 +587,8 @@ obj/structure/door_assembly/New()
var/M = G.sheettype
if(G.get_amount() >= 2)
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
- user.visible_message("[user] adds [G.name] to the airlock assembly.", \
- "You start to install [G.name] into the airlock assembly...")
+ user.visible_message("[user] adds [G.name] to the airlock assembly.", \
+ "You start to install [G.name] into the airlock assembly...")
if(do_after(user, 40))
if(G.get_amount() < 2 || mineral) return
user << "You install [M] plating into the airlock assembly."
@@ -602,8 +602,8 @@ obj/structure/door_assembly/New()
else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 )
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
- user.visible_message("[user] finishes the airlock.", \
- "You start finishing the airlock...")
+ user.visible_message("[user] finishes the airlock.", \
+ "You start finishing the airlock...")
if(do_after(user, 40))
if(src.loc && state == 2)
diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm
index 36b14829157..d3fc4a8b3da 100644
--- a/code/game/objects/structures/electricchair.dm
+++ b/code/game/objects/structures/electricchair.dm
@@ -49,10 +49,10 @@
s.start()
if(buckled_mob)
buckled_mob.burn_skin(85)
- buckled_mob << "You feel a deep shock course through your body!"
+ buckled_mob << "You feel a deep shock course through your body!"
sleep(1)
buckled_mob.burn_skin(85)
- visible_message("The electric chair went off!", "You hear a deep sharp shock!")
+ visible_message("The electric chair went off!", "You hear a deep sharp shock!")
A.power_light = light
A.updateicon()
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index a56c74664f4..79fda3eda5c 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -40,8 +40,8 @@
user.do_attack_animation(src)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
user.visible_message("[user] hits [src].", \
- "You hit [src].", \
- "You hear twisting metal.")
+ "You hit [src].", \
+ "You hear twisting metal.")
if(shock(user, 70))
return
@@ -55,8 +55,8 @@
user.changeNext_move(CLICK_CD_MELEE)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
user.visible_message("[user] mangles [src].", \
- "You mangle [src].", \
- "You hear twisting metal.")
+ "You mangle [src].", \
+ "You hear twisting metal.")
if(!shock(user, 70))
health -= 5
@@ -70,8 +70,8 @@
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
user.visible_message("[user] smashes against [src].", \
- "You smash against [src].", \
- "You hear twisting metal.")
+ "You smash against [src].", \
+ "You hear twisting metal.")
health -= rand(1,2)
healthcheck()
@@ -83,8 +83,8 @@
M.do_attack_animation(src)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
M.visible_message("[M] smashes against [src].", \
- "You smash against [src].", \
- "You hear twisting metal.")
+ "You smash against [src].", \
+ "You hear twisting metal.")
health -= M.melee_damage_upper
healthcheck()
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 623cb4c6c5b..de189740406 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -164,11 +164,11 @@ var/global/list/crematoriums = new/list()
return //don't let you cremate something twice or w/e
if(contents.len <= 1)
- audible_message("You hear a hollow crackle.")
+ audible_message("You hear a hollow crackle.")
return
else
- audible_message("You hear a roar as the crematorium activates.")
+ audible_message("You hear a roar as the crematorium activates.")
locked = 1
update_icon()
diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm
index bca89cc5078..9a2a5da2cee 100644
--- a/code/game/objects/structures/musician.dm
+++ b/code/game/objects/structures/musician.dm
@@ -353,7 +353,7 @@
user.visible_message( \
"[user] tightens \the [src]'s casters.", \
" You tighten \the [src]'s casters. Now it can be played again.", \
- "You hear ratchet.")
+ "You hear ratchet.")
anchored = 1
else if(anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -362,7 +362,7 @@
user.visible_message( \
"[user] loosens \the [src]'s casters.", \
" You loosen \the [src]. Now it can be pulled somewhere else.", \
- "You hear ratchet.")
+ "You hear ratchet.")
anchored = 0
else
..()
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 3bb9fcdb47f..1676e9ae16c 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -42,11 +42,11 @@ FLOOR SAFES
/obj/structure/safe/proc/check_unlocked(mob/user as mob, canhear)
if(user && canhear)
if(tumbler_1_pos == tumbler_1_open)
- user << "You hear a [pick("tonk", "krunk", "plunk")] from [src]."
+ user << "You hear a [pick("tonk", "krunk", "plunk")] from [src]."
if(tumbler_2_pos == tumbler_2_open)
- user << "You hear a [pick("tink", "krink", "plink")] from [src]."
+ user << "You hear a [pick("tink", "krink", "plink")] from [src]."
if(tumbler_1_pos == tumbler_1_open && tumbler_2_pos == tumbler_2_open)
- if(user) visible_message("[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!")
+ if(user) visible_message("[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!")
return 1
return 0
@@ -109,11 +109,11 @@ FLOOR SAFES
if(dial == tumbler_1_pos + 1 || dial == tumbler_1_pos - 71)
tumbler_1_pos = decrement(tumbler_1_pos)
if(canhear)
- user << "You hear a [pick("clack", "scrape", "clank")] from [src]."
+ user << "You hear a [pick("clack", "scrape", "clank")] from [src]."
if(tumbler_1_pos == tumbler_2_pos + 37 || tumbler_1_pos == tumbler_2_pos - 35)
tumbler_2_pos = decrement(tumbler_2_pos)
if(canhear)
- user << "You hear a [pick("click", "chink", "clink")] from [src]."
+ user << "You hear a [pick("click", "chink", "clink")] from [src]."
check_unlocked(user, canhear)
updateUsrDialog()
return
@@ -123,11 +123,11 @@ FLOOR SAFES
if(dial == tumbler_1_pos - 1 || dial == tumbler_1_pos + 71)
tumbler_1_pos = increment(tumbler_1_pos)
if(canhear)
- user << "You hear a [pick("clack", "scrape", "clank")] from [src]."
+ user << "You hear a [pick("clack", "scrape", "clank")] from [src]."
if(tumbler_1_pos == tumbler_2_pos - 37 || tumbler_1_pos == tumbler_2_pos + 35)
tumbler_2_pos = increment(tumbler_2_pos)
if(canhear)
- user << "You hear a [pick("click", "chink", "clink")] from [src]."
+ user << "You hear a [pick("click", "chink", "clink")] from [src]."
check_unlocked(user, canhear)
updateUsrDialog()
return
diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
index 91b89fb8637..4673fcfeb40 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
@@ -12,14 +12,14 @@
var/mob/living/M = buckled_mob
if(M != user)
M.visible_message(\
- "[user.name] pulls [M.name] free from the sticky nest!",\
+ "[user.name] pulls [M.name] free from the sticky nest!",\
"[user.name] pulls you free from the gelatinous resin.",\
- "You hear squelching...")
+ "You hear squelching...")
else
M.visible_message(\
"[M.name] struggles to break free from the gelatinous resin!",\
- "You struggle to break free from the gelatinous resin. (Stay still for two minutes.)",\
- "You hear squelching...")
+ "You struggle to break free from the gelatinous resin... (Stay still for two minutes.)",\
+ "You hear squelching...")
if(!do_after(M, 1200))
if(M && M.buckled)
M << "You fail to unbuckle yourself!"
@@ -28,8 +28,8 @@
return
M.visible_message(\
"[M.name] breaks free from the gelatinous resin!",\
- "You break free from the gelatinous resin!",\
- "You hear squelching...")
+ "You break free from the gelatinous resin!",\
+ "You hear squelching...")
unbuckle_mob()
add_fingerprint(user)
@@ -47,9 +47,9 @@
if(buckle_mob(M))
M.visible_message(\
- "[user.name] secretes a thick vile goo, securing [M.name] into [src]!",\
- "[user.name] drenches you in a foul-smelling resin, trapping you in [src]!",\
- "You hear squelching...")
+ "[user.name] secretes a thick vile goo, securing [M.name] into [src]!",\
+ "[user.name] drenches you in a foul-smelling resin, trapping you in [src]!",\
+ "You hear squelching...")
/obj/structure/stool/bed/nest/post_buckle_mob(mob/living/M)
if(M == buckled_mob)
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 4808a159d97..be4ca40bbd3 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -20,7 +20,7 @@
if(swirlie)
user.changeNext_move(CLICK_CD_MELEE)
playsound(src.loc, "swing_hit", 25, 1)
- swirlie.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "[user] slams the toilet seat onto [swirlie]'s head!", "You hear reverberating porcelain.")
+ swirlie.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "[user] slams the toilet seat onto [swirlie]'s head!", "You hear reverberating porcelain.")
swirlie.adjustBruteLoss(5)
return
@@ -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
@@ -72,7 +72,7 @@
GM.visible_message("[user] starts to give [GM] a swirlie!", "[user] starts to give [GM] a swirlie...")
swirlie = GM
if(do_after(user, 30, 5, 0))
- GM.visible_message("[user] gives [GM] a swirlie!", "[user] gives [GM] a swirlie!", "You hear a toilet flushing.")
+ GM.visible_message("[user] gives [GM] a swirlie!", "[user] gives [GM] a swirlie!", "You hear a toilet flushing.")
if(iscarbon(GM))
var/mob/living/carbon/C = GM
if(!C.internal)
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index e65107fa148..62f5324dc59 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -199,7 +199,7 @@
if( user.loc == T && user.get_active_hand() == W )
user << "You remove the outer plating."
dismantle_wall()
- visible_message("The wall was sliced apart by [user]!", "You hear metal being sliced apart.")
+ visible_message("The wall was sliced apart by [user]!", "You hear metal being sliced apart.")
return 1
return 0
@@ -216,7 +216,7 @@
if( user.loc == T && user.get_active_hand() == W )
D.playDigSound()
dismantle_wall()
- visible_message("[user] smashes through the [name] with the [W.name]!", "You hear the grinding of metal.")
+ visible_message("[user] smashes through the [name] with the [W.name]!", "You hear the grinding of metal.")
return 1
return 0
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index c61cf5fcf80..be6281e25fe 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -41,7 +41,7 @@
if( user.loc == T && user.get_active_hand() == W )
D.update_icon()
D.playDigSound()
- visible_message("[user] smashes through the [name] with the [D.name]!", "You hear the grinding of metal.")
+ visible_message("[user] smashes through the [name] with the [D.name]!", "You hear the grinding of metal.")
dismantle_wall()
return 1
else if(istype(W, /obj/item/stack/sheet/metal) && d_state)
diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm
index 085b57a09fc..c89f8d740f4 100644
--- a/code/game/verbs/suicide.dm
+++ b/code/game/verbs/suicide.dm
@@ -150,7 +150,7 @@
suiciding = 1
visible_message("[src] is thrashing wildly! It looks like \he's trying to commit suicide.", \
"[src] is thrashing wildly! It looks like \he's trying to commit suicide.", \
- "You hear thrashing")
+ "You hear thrashing.")
//put em at -175
adjustOxyLoss(max(200 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
updatehealth()
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 7755e882965..b738becff50 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -33,7 +33,7 @@
if(usr)
if (usr.client)
if(usr.client.holder)
- M << "You hear [ticker.Bible_deity_name ? "the voice of " + ticker.Bible_deity_name : "a voice"] in your head... [msg]"
+ M << "You hear [ticker.Bible_deity_name ? "the voice of " + ticker.Bible_deity_name : "a voice"] in your head... [msg]"
log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]")
message_admins(" SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]")
diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm
index d8f8b6aad65..b43f7077d9f 100644
--- a/code/modules/detectivework/evidence.dm
+++ b/code/modules/detectivework/evidence.dm
@@ -45,8 +45,8 @@
else
return
- user.visible_message("[user] puts [I] into [src].", "You put [I] inside [src].",\
- "You hear a rustle as someone puts something into a plastic bag.")
+ user.visible_message("[user] puts [I] into [src].", "You put [I] inside [src].",\
+ "You hear a rustle as someone puts something into a plastic bag.")
icon_state = "evidence"
@@ -68,8 +68,8 @@
/obj/item/weapon/evidencebag/attack_self(mob/user as mob)
if(contents.len)
var/obj/item/I = contents[1]
- user.visible_message("[user] takes [I] out of [src].", "You take [I] out of [src].",\
- "You hear someone rustle around in a plastic bag, and remove something.")
+ user.visible_message("[user] takes [I] out of [src].", "You take [I] out of [src].",\
+ "You hear someone rustle around in a plastic bag, and remove something.")
overlays.Cut() //remove the overlays
user.put_in_hands(I)
w_class = 1
diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm
index a2d323e81d8..2e09166ae6e 100644
--- a/code/modules/detectivework/footprints_and_rag.dm
+++ b/code/modules/detectivework/footprints_and_rag.dm
@@ -21,7 +21,7 @@
/obj/item/weapon/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag)
if(ismob(target) && target.reagents && reagents.total_volume)
- user.visible_message("[user] has smothered \the [target] with \the [src]!", "You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise")
+ user.visible_message("[user] has smothered \the [target] with \the [src]!", "You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise.")
src.reagents.reaction(target, TOUCH)
src.reagents.clear_reagents()
return
@@ -31,8 +31,8 @@
/obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob,proximity)
if(!proximity) return
if(istype(A) && src in user)
- user.visible_message("[user] starts to wipe down [A] with [src]!")
+ user.visible_message("[user] starts to wipe down [A] with [src]!", "You start to wipe down [A] with [src]...You finish wiping off the [A].")
A.clean_blood()
return
diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm
index 3f40addebdf..03f8ea5051a 100644
--- a/code/modules/events/holiday/xmas.dm
+++ b/code/modules/events/holiday/xmas.dm
@@ -47,7 +47,7 @@
/obj/item/weapon/toy/xmas_cracker/attack(mob/target, mob/user)
if( !cracked && istype(target,/mob/living/carbon/human) && (target.stat == CONSCIOUS) && !target.get_active_hand() )
- target.visible_message("[user] and [target] pop \an [src]! *pop*", "You pull \an [src] with [target]! *pop*", "You hear a *pop*.")
+ target.visible_message("[user] and [target] pop \an [src]! *pop*", "You pull \an [src] with [target]! *pop*", "You hear a pop.")
var/obj/item/weapon/paper/Joke = new /obj/item/weapon/paper(user.loc)
Joke.name = "[pick("awful","terrible","unfunny")] joke"
Joke.info = pick("What did one snowman say to the other?\n\n'Is it me or can you smell carrots?'",
diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/food&drinks/kitchen machinery/gibber.dm
index 36862c68452..064e0aeb379 100644
--- a/code/modules/food&drinks/kitchen machinery/gibber.dm
+++ b/code/modules/food&drinks/kitchen machinery/gibber.dm
@@ -124,10 +124,10 @@
if(src.operating)
return
if(!src.occupant)
- visible_message("You hear a loud metallic grinding sound.")
+ visible_message("You hear a loud metallic grinding sound.")
return
use_power(1000)
- visible_message("You hear a loud squelchy grinding sound.")
+ visible_message("You hear a loud squelchy grinding sound.")
src.operating = 1
update_icon()
var/sourcename = src.occupant.real_name
diff --git a/code/modules/food&drinks/kitchen machinery/microwave.dm b/code/modules/food&drinks/kitchen machinery/microwave.dm
index 9e7e2b71bfd..71e6f1a60a5 100644
--- a/code/modules/food&drinks/kitchen machinery/microwave.dm
+++ b/code/modules/food&drinks/kitchen machinery/microwave.dm
@@ -272,7 +272,7 @@
return 0
/obj/machinery/microwave/proc/start()
- visible_message("The microwave turns on.", "You hear a microwave.")
+ visible_message("The microwave turns on.", "You hear a microwave humming.")
operating = 1
icon_state = "mw1"
updateUsrDialog()
@@ -298,7 +298,7 @@
/obj/machinery/microwave/proc/muck_finish()
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
- visible_message("The microwave gets covered in muck!")
+ visible_message("The microwave gets covered in muck!")
dirty = 100 // Make it dirty so it can't be used util cleaned
icon_state = "mwbloody" // Make it look dirty too
operating = 0 // Turn it off again aferwards
@@ -313,7 +313,7 @@
s.set_up(2, 1, src)
s.start()
icon_state = "mwb" // Make it look all busted up and shit
- visible_message("The microwave breaks!") //Let them know they're stupid
+ visible_message("The microwave breaks!") //Let them know they're stupid
broken = 2 // Make it broken so it can't be used util fixed
flags = null //So you can't add condiments
operating = 0 // Turn it off again aferwards
diff --git a/code/modules/food&drinks/kitchen machinery/processor.dm b/code/modules/food&drinks/kitchen machinery/processor.dm
index 32753bfb10a..cd87e36e038 100644
--- a/code/modules/food&drinks/kitchen machinery/processor.dm
+++ b/code/modules/food&drinks/kitchen machinery/processor.dm
@@ -84,8 +84,8 @@
if (O.client) //grief-proof
O.loc = loc
O.visible_message("Suddenly [O] jumps out from the processor!", \
- "You jump out from the processor", \
- "You hear chimpering")
+ "You jump out from the processor!", \
+ "You hear chimpering.")
return
var/obj/item/weapon/reagent_containers/glass/bucket/bucket_of_blood = new(loc)
var/datum/reagent/blood/B = new()
@@ -121,10 +121,10 @@
/obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(src.processing)
- user << "The processor is in the process of processing."
+ user << "The processor is in the process of processing!"
return 1
if(src.contents.len > 0) //TODO: several items at once? several different items?
- user << "Something is already in the processing chamber."
+ user << "Something is already in the processing chamber!"
return 1
if(default_unfasten_wrench(user, O))
return
@@ -137,7 +137,7 @@
var/datum/food_processor_process/P = select_recipe(what)
if (!P)
- user << "That probably won't blend."
+ user << "That probably won't blend!"
return 1
user.visible_message("[user] put [what] into [src].", \
"You put the [what] into [src].")
@@ -149,10 +149,10 @@
if (src.stat != 0) //NOPOWER etc
return
if(src.processing)
- user << "The processor is in the process of processing."
+ user << "The processor is in the process of processing!"
return 1
if(src.contents.len == 0)
- user << "The processor is empty."
+ user << "The processor is empty!"
return 1
for(var/O in src.contents)
var/datum/food_processor_process/P = select_recipe(O)
@@ -160,15 +160,15 @@
log_admin("DEBUG: [O] in processor havent suitable recipe. How do you put it in?") //-rastaf0
continue
src.processing = 1
- user.visible_message("[user] turns on \a [src].", \
- "You turn on \a [src].", \
- "You hear a food processor")
+ user.visible_message("[user] turns on \a [src].", \
+ "You turn on \a [src].", \
+ "You hear a food processor.")
playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
use_power(500)
sleep(P.time)
P.process_food(src.loc, O)
src.processing = 0
- src.visible_message("\the [src] finished processing.")
+ src.visible_message("\the [src] finishes processing.")
/obj/machinery/processor/verb/eject()
set category = "Object"
diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm
index 1f74c911de0..5f83a701ac6 100644
--- a/code/modules/holiday/halloween.dm
+++ b/code/modules/holiday/halloween.dm
@@ -279,11 +279,11 @@
/mob/living/simple_animal/hostile/retaliate/clown/insane/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(istype(O,/obj/item/weapon/nullrod))
if(prob(5))
- visible_message("[src] finally found the peace it deserves. You hear honks echoing off into the distance.")
+ visible_message("[src] finally found the peace it deserves. You hear honks echoing off into the distance.")
playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1)
qdel(src)
else
- visible_message("[src] seems to be resisting the effect!")
+ visible_message("[src] seems to be resisting the effect!")
else
..()
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 6fe05ab5607..75e14801e91 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -806,7 +806,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/proc/squish(atom/target)
new splat(src.loc)
- src.visible_message("The [src.name] has been squashed.","You hear a smack.")
+ src.visible_message("The [src.name] has been squashed.","You hear a smack.")
for(var/atom/A in get_turf(target))
src.reagents.reaction(A)
@@ -898,7 +898,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/attack_self(var/mob/user)
squish(user)
user.drop_item()
- src.visible_message("[user] squashes the [src.name].","You hear a smack.")
+ src.visible_message("[user] squashes the [src.name].","You hear a smack.")
qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/squish(atom/squishee)
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 3dc5a640cdd..d6761093715 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -317,6 +317,6 @@
icon_state = "coin_[cmineral]_[coinflip]"
playsound(user.loc, 'sound/items/coinflip.ogg', 50, 1)
if(do_after(user, 15))
- user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \
+ user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \
"You flip [src]. It lands on [coinflip].", \
- "You hear the clattering of loose change.")
\ No newline at end of file
+ "You hear the clattering of loose change.")
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm
index 05cc69ba948..5490d786297 100644
--- a/code/modules/mob/living/carbon/brain/death.dm
+++ b/code/modules/mob/living/carbon/brain/death.dm
@@ -1,8 +1,8 @@
/mob/living/carbon/brain/death(gibbed)
if(stat == DEAD) return
if(!gibbed && container && istype(container, /obj/item/device/mmi))//If not gibbed but in a container.
- container.visible_message("[src]'s MMI flatlines!", \
- "You hear something flatline.")
+ container.visible_message("[src]'s MMI flatlines!", \
+ "You hear something flatline.")
if(istype(src,/obj/item/organ/brain/alien))
container.icon_state = "mmi_alien_dead"
else
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 7d856a25dfc..bae07c42c8d 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -38,9 +38,9 @@
/mob/living/carbon/relaymove(var/mob/user, direction)
if(user in src.stomach_contents)
if(prob(40))
- audible_message("You hear something rumbling inside [src]'s stomach...", \
- "You hear something rumbling.", 4,\
- "Something is rumbling inside your stomach!")
+ audible_message("You hear something rumbling inside [src]'s stomach...", \
+ "You hear something rumbling.", 4,\
+ "Something is rumbling inside your stomach!")
var/obj/item/I = user.get_active_hand()
if(I && I.force)
var/d = rand(round(I.force / 4), I.force)
@@ -84,7 +84,7 @@
src.visible_message(
"[src] was shocked by \the [source]!", \
"You feel a powerful shock coursing through your body!", \
- "You hear a heavy electrical crack." \
+ "You hear a heavy electrical crack." \
)
if(prob(25) && heart_attack)
heart_attack = 0
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
index b9ca12ef44a..d72a5e91ba9 100644
--- a/code/modules/mob/living/carbon/human/species_types.dm
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -72,7 +72,7 @@
if(prob(15))
H.irradiate(rand(30,80))
H.Weaken(5)
- H.visible_message("[H] writhes in pain as \his vacuoles boil.", "[H] writhes in pain as \his vacuoles boil.", "You hear the crunching of leaves.")
+ H.visible_message("[H] writhes in pain as \his vacuoles boil.", "You writhe in pain as your vacuoles boil!", "You hear the crunching of leaves.")
if(prob(80))
randmutb(H)
domutcheck(H,null)
@@ -81,7 +81,7 @@
domutcheck(H,null)
else
H.adjustFireLoss(rand(5,15))
- H.show_message("The radiation beam singes you!")
+ H.show_message("The radiation beam singes you!")
if(/obj/item/projectile/energy/florayield)
H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL)
return
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index c0017863de6..bc665bd4ec5 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -4,7 +4,7 @@
if(src.cable)
if(get_dist(src, src.cable) > 1)
var/turf/T = get_turf(src.loc)
- T.visible_message("[src.cable] rapidly retracts back into its spool.", "You hear a click and the sound of wire spooling rapidly.")
+ T.visible_message("[src.cable] rapidly retracts back into its spool.", "You hear a click and the sound of wire spooling rapidly.")
qdel(src.cable)
cable = null
if(silence_time)
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index c2062b46546..a324cdbbfe7 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -108,7 +108,7 @@
// 33% chance of no additional effect
if(prob(20))
- visible_message("A shower of sparks spray from [src]'s inner workings.", 3, "You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2)
+ visible_message("A shower of sparks spray from [src]'s inner workings.", 3, "You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2)
return src.death(0)
silence_time = world.timeofday + 120 * 10 // Silence for 2 minutes
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index c7e6135380f..4144a3a3ef2 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -264,7 +264,7 @@
var/turf/T = get_turf(src.loc)
src.cable = new /obj/item/weapon/pai_cable(T)
for (var/mob/M in viewers(T))
- M.show_message("A port on [src] opens to reveal [src.cable], which promptly falls to the floor.", 3, "You hear the soft click of something light and hard falling to the ground.", 2)
+ M.show_message("A port on [src] opens to reveal [src.cable], which promptly falls to the floor.", 3, "You hear the soft click of something light and hard falling to the ground.", 2)
//src.updateUsrDialog() We only need to account for the single mob this is intended for, and he will *always* be able to call this window
src.paiInterface() // So we'll just call the update directly rather than doing some default checks
return
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 23cd0c56670..cfd71c02b0f 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -398,8 +398,8 @@
user << "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on \him."
else if(user)
user.visible_message("[user] puts [item_to_add] on [real_name]'s head. [src] looks at [user] and barks once.",
- "You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags \his tail once and barks.",
- "You hear a friendly-sounding bark.")
+ "You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags \his tail once and barks.",
+ "You hear a friendly-sounding bark.")
item_to_add.loc = src
src.inventory_head = item_to_add
regenerate_icons()
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index d4b807c56a6..939a4a2e942 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -489,7 +489,7 @@
if(!parrot_perch || parrot_interest.loc != parrot_perch.loc)
held_item = parrot_interest
parrot_interest.loc = src
- visible_message("[src] grabs [held_item]!", "You grab [held_item]!", "You hear the sounds of wings flapping furiously.")
+ visible_message("[src] grabs [held_item]!", "You grab [held_item]!", "You hear the sounds of wings flapping furiously.")
parrot_interest = null
parrot_state = PARROT_SWOOP | PARROT_RETURN
@@ -676,10 +676,10 @@
held_item = I
I.loc = src
- visible_message("[src] grabs [held_item]!", "You grab [held_item]!", "You hear the sounds of wings flapping furiously.")
+ visible_message("[src] grabs [held_item]!", "You grab [held_item]!", "You hear the sounds of wings flapping furiously.")
return held_item
- src << "There is nothing of interest to take."
+ src << "There is nothing of interest to take!"
return 0
/mob/living/simple_animal/parrot/proc/steal_from_mob()
@@ -707,10 +707,10 @@
C.unEquip(stolen_item)
held_item = stolen_item
stolen_item.loc = src
- visible_message("[src] grabs [held_item] out of [C]'s hand!", "You snag [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
+ visible_message("[src] grabs [held_item] out of [C]'s hand!", "You snag [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
return held_item
- src << "There is nothing of interest to take."
+ src << "There is nothing of interest to take!"
return 0
/mob/living/simple_animal/parrot/verb/drop_held_item_player()
diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
index ed6c7236267..f664c87a8b9 100644
--- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
@@ -27,7 +27,7 @@ It is possible to destroy the net by the occupant or someone else.
var/mob/living/carbon/M = affecting
M.anchored = 0
for(var/mob/O in viewers(src, 3))
- O.show_message("[M.name] was recovered from the energy net!", 1, "You hear a grunt.", 2)
+ O.show_message("[M.name] was recovered from the energy net!", 1, "You hear a grunt.", 2)
if(!isnull(master))//As long as they still exist.
master << "ERROR: unable to initiate transport protocol. Procedure terminated."
qdel(src)
@@ -82,7 +82,7 @@ It is possible to destroy the net by the occupant or someone else.
qdel(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0).
for(var/mob/O in viewers(src, 3))
- O.show_message("[M] vanished!", 1, "You hear sparks flying!", 2)
+ O.show_message("[M] vanishes!", 1, "You hear sparks flying!", 2)
if(!isnull(master))//As long as they still exist.
master << "SUCCESS: transport procedure of \the [affecting] complete."
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index 8747b0223c7..e8270dafd52 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -144,14 +144,14 @@
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] secures the [src.name] to the floor.", \
"You secure the anchor bolts to the floor.", \
- "You hear a ratchet")
+ "You hear a ratchet.")
src.anchored = 1
connect_to_network()
else if(!linked_shielding.len > 0)
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] unsecures the [src.name].", \
- "You remove the anchor bolts.", \
- "You hear a ratchet")
+ "YYou remove the anchor bolts.", \
+ "You hear a ratchet.")
src.anchored = 0
disconnect_from_network()
else
@@ -170,7 +170,7 @@
user.update_icons()
user.visible_message("[user.name] loads an [W.name] into the [src.name].", \
"You load an [W.name].", \
- "You hear a thunk.")
+ "You hear a thunk.")
return
if(W.force >= 20)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 62c0b2dbcfb..21514f2a5d7 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -388,7 +388,7 @@
user.visible_message(\
"[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!")
+ "You hear a crack.")
//ticker.mode:apcs-- //XSI said no and I agreed. -rastaf0
else
user.visible_message(\
@@ -510,7 +510,7 @@
return
user.visible_message("[user.name] welds [src].", \
"You start welding the APC frame...", \
- "You hear welding.")
+ "You hear welding.")
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
if(do_after(user, 50))
if(!src || !WT.remove_fuel(3, user)) return
@@ -559,7 +559,7 @@
opened = 2
user.visible_message("[user.name] has knocked down the APC cover with the [W.name]!", \
"You knock down the APC cover with your [W.name]!", \
- "You hear bang")
+ "You hear bang.")
update_icon()
else
if (istype(user, /mob/living/silicon))
@@ -956,8 +956,8 @@
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
- visible_message("The [src.name] suddenly lets out a blast of smoke and some sparks!", \
- "You hear sizzling electronics.")
+ visible_message("The [src.name] suddenly lets out a blast of smoke and some sparks!", \
+ "You hear sizzling electronics.")
/obj/machinery/power/apc/surplus()
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index e3fddeead48..00eb9f8c827 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -104,7 +104,7 @@
return
new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded )
user.visible_message("[user.name] deconstructs [src].", \
- "You deconstruct [src].", "You hear a noise.")
+ "You deconstruct [src].", "You hear a ratchet.")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1)
qdel(src)
if (src.stage == 2)
@@ -125,7 +125,7 @@
src.icon_state = "bulb-construct-stage1"
new /obj/item/stack/cable_coil(get_turf(src.loc), 1, "red")
user.visible_message("[user.name] removes the wiring from [src].", \
- "You remove the wiring from [src].", "You hear a noise.")
+ "You remove the wiring from [src].", "You hear clicking.")
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
return
@@ -140,7 +140,7 @@
src.icon_state = "bulb-construct-stage2"
src.stage = 2
user.visible_message("[user.name] adds wires to [src].", \
- "You add wires to [src].")
+ "You add wires to [src].")
else
user << "You need one length of cable to wire [src]!"
return
@@ -154,7 +154,7 @@
src.icon_state = "bulb-empty"
src.stage = 3
user.visible_message("[user.name] closes [src]'s casing.", \
- "You close [src]'s casing.", "You hear a noise.")
+ "You close [src]'s casing.", "You hear screwing.")
playsound(src.loc, 'sound/items/Screwdriver.ogg', 75, 1)
switch(fixture_type)
@@ -376,7 +376,7 @@
user.visible_message("[user.name] smashed the light!", \
"You hit the light, and it smashes!", \
- "You hear a tinkle of breaking glass")
+ "You hear a tinkle of breaking glass.")
if(on && (W.flags & CONDUCT))
//if(!user.mutations & COLD_RESISTANCE)
if (prob(12))
@@ -390,8 +390,8 @@
else if(status == LIGHT_EMPTY)
if(istype(W, /obj/item/weapon/screwdriver)) //If it's a screwdriver open it.
playsound(src.loc, 'sound/items/Screwdriver.ogg', 75, 1)
- user.visible_message("[user.name] opens [src]'s casing.", \
- "You open [src]'s casing.", "You hear a noise.")
+ user.visible_message("[user.name] opens [src]'s casing.", \
+ "You open [src]'s casing.", "You hear a noise.")
var/obj/machinery/light_construct/newlight = null
switch(fitting)
if("tube")
@@ -452,7 +452,7 @@
return
else if (status == LIGHT_OK||status == LIGHT_BURNED)
user.do_attack_animation(src)
- visible_message("[user.name] smashed the light!", "You hear a tinkle of breaking glass")
+ visible_message("[user.name] smashed the light!", "You hear a tinkle of breaking glass.")
broken()
return
@@ -463,7 +463,7 @@
return
else if (status == LIGHT_OK||status == LIGHT_BURNED)
M.do_attack_animation(src)
- visible_message("[M.name] smashed the light!", "You hear a tinkle of breaking glass")
+ visible_message("[M.name] smashed the light!", "You hear a tinkle of breaking glass.")
broken()
return
// attack with hand - remove tube/bulb
@@ -707,7 +707,7 @@
/obj/item/weapon/light/proc/shatter()
if(status == LIGHT_OK || status == LIGHT_BURNED)
- src.visible_message("[name] shatters.","You hear a small glass object shatter.")
+ src.visible_message("[name] shatters.","You hear a small glass object shatter.")
status = LIGHT_BROKEN
force = 5
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index f61a84da51a..3202414ffb7 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -81,14 +81,14 @@ var/global/list/rad_collectors = list()
anchored = 1
user.visible_message("[user.name] secures the [src.name].", \
"You secure the external bolts.", \
- "You hear a ratchet")
+ "You hear a ratchet.")
connect_to_network()
else if(anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
anchored = 0
user.visible_message("[user.name] unsecures the [src.name].", \
"You unsecure the external bolts.", \
- "You hear a ratchet")
+ "You hear a ratchet.")
disconnect_from_network()
else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
if (src.allowed(user))
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 5a3b4d2dcfd..ad420ffc5e6 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -95,7 +95,7 @@
user.burn_skin(shock_damage)
user.visible_message("[user.name] was shocked by the [src.name]!", \
"You feel a powerful shock course through your body, sending you flying!", \
- "You hear a heavy electrical crack.")
+ "You hear a heavy electrical crack.")
else if(issilicon(user))
if(prob(20))
@@ -103,7 +103,7 @@
user.take_overall_damage(0, shock_damage)
user.visible_message("[user.name] was shocked by the [src.name]!", \
"Energy pulse detected, system damaged!", \
- "You hear an electrical crack.")
+ "You hear an electrical crack.")
user.updatehealth()
bump(user)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 559a7c65f2a..007d10b427b 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -160,14 +160,14 @@
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] secures [src.name] to the floor.", \
"You secure the external reinforcing bolts to the floor.", \
- "You hear a ratchet")
+ "You hear a ratchet")
src.anchored = 1
if(1)
state = 0
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] unsecures [src.name] reinforcing bolts from the floor.", \
"You undo the external reinforcing bolts.", \
- "You hear a ratchet")
+ "You hear a ratchet.")
src.anchored = 0
if(2)
user << "The [src.name] needs to be unwelded from the floor!"
@@ -186,7 +186,7 @@
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
"You start to weld \the [src] to the floor...", \
- "You hear welding")
+ "You hear welding.")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 2
@@ -197,7 +197,7 @@
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
"You start to cut \the [src] free from the floor...", \
- "You hear welding")
+ "You hear welding.")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 1
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index b8094ab9e63..8cb5c1c626f 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -84,7 +84,7 @@ field_generator power level display
else
user.visible_message("[user.name] turns on the [src.name].", \
"You turn on the [src.name].", \
- "You hear heavy droning")
+ "You hear heavy droning.")
turn_on()
investigate_log("activated by [user.key].","singulo")
@@ -105,14 +105,14 @@ field_generator power level display
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] secures [src.name] to the floor.", \
"You secure the external reinforcing bolts to the floor.", \
- "You hear ratchet")
+ "You hear ratchet.")
src.anchored = 1
if(1)
state = 0
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] unsecures [src.name] reinforcing bolts from the floor.", \
"You undo the external reinforcing bolts.", \
- "You hear ratchet")
+ "You hear ratchet.")
src.anchored = 0
if(2)
user << "The [src.name] needs to be unwelded from the floor!"
@@ -128,7 +128,7 @@ field_generator power level display
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
"You start to weld \the [src] to the floor...", \
- "You hear welding")
+ "You hear welding.")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 2
@@ -140,7 +140,7 @@ field_generator power level display
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
"You start to cut \the [src] free from the floor...", \
- "You hear welding")
+ "You hear welding.")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 1
@@ -211,7 +211,7 @@ field_generator power level display
if(draw_power(round(power_draw/2,1)))
return 1
else
- visible_message("The [src.name] shuts down!", "You hear something shutting down")
+ visible_message("The [src.name] shuts down!", "You hear something shutting down.")
turn_off()
investigate_log("ran out of power and deactivated","singulo")
src.power = 0
diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm
index f73e3bcfa7d..6d8e6763389 100644
--- a/code/modules/power/singularity/generator.dm
+++ b/code/modules/power/singularity/generator.dm
@@ -20,14 +20,14 @@
if(!anchored && !isinspace())
user.visible_message("[user.name] secures [src.name] to the floor.", \
- "You secure the [src.name] to the floor.", \
- "You hear a ratchet")
+ "You secure the [src.name] to the floor.", \
+ "You hear a ratchet.")
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
anchored = 1
else if(anchored)
user.visible_message("[user.name] unsecures [src.name] from the floor.", \
- "You unsecure the [src.name] from the floor.", \
- "You hear a ratchet")
+ "You unsecure the [src.name] from the floor.", \
+ "You hear a ratchet.")
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
anchored = 0
return
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 6e926c209f9..a04bf8dda44 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -214,18 +214,18 @@
if(Adjacent(user))
return attack_hand(user)
else
- user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
+ user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
return
/obj/machinery/power/supermatter_shard/attack_ai(mob/user as mob)
- user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
+ user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
/obj/machinery/power/supermatter_shard/attack_hand(mob/living/user as mob)
if(!istype(user))
return
- user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\
- "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\
- "You hear an unearthly noise as a wave of heat washes over you.")
+ user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\
+ "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\
+ "You hear an unearthly noise as a wave of heat washes over you.")
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
@@ -242,9 +242,9 @@
return
if(user.drop_item(W))
Consume(W)
- user.visible_message("As [user] touches \the [src] with \a [W], silence fills the room...",\
- "You touch \the [src] with \the [W], and everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\
- "Everything suddenly goes silent.")
+ user.visible_message("As [user] touches \the [src] with \a [W], silence fills the room...",\
+ "You touch \the [src] with \the [W], and everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\
+ "Everything suddenly goes silent.")
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
@@ -253,12 +253,12 @@
/obj/machinery/power/supermatter_shard/Bumped(atom/AM as mob|obj)
if(istype(AM, /mob/living))
- AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\
- "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
- "You hear an unearthly noise as a wave of heat washes over you.")
+ AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\
+ "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
+ "You hear an unearthly noise as a wave of heat washes over you.")
else if(isobj(AM) && !istype(AM, /obj/effect))
- AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\
- "You hear a loud crack as you are washed with a wave of heat.")
+ AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\
+ "You hear a loud crack as you are washed with a wave of heat.")
else
return
@@ -286,7 +286,7 @@
L.irradiate(rads)
investigate_log("has irradiated [L] after consuming [AM].", "supermatter")
if(L in view())
- L.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\
- "The unearthly ringing subsides and you notice you have new radiation burns.", 2)
+ L.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\
+ "The unearthly ringing subsides and you notice you have new radiation burns.", 2)
else
- L.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2)
+ L.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2)
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index d6638100fe7..4cc38cb4fc2 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -91,7 +91,7 @@
if(!message)
return
if(pointblank)
- user.visible_message("[user] fires [src] point blank at [pbtarget]!", "You fire [src] point blank at [pbtarget]!", "You hear a [istype(src, /obj/item/weapon/gun/energy) ? "laser blast" : "gunshot"]!")
+ user.visible_message("[user] fires [src] point blank at [pbtarget]!", "You fire [src] point blank at [pbtarget]!", "You hear a [istype(src, /obj/item/weapon/gun/energy) ? "laser blast" : "gunshot"]!")
else
user.visible_message("[user] fires [src]!", "You fire [src]!", "You hear a [istype(src, /obj/item/weapon/gun/energy) ? "laser blast" : "gunshot"]!")
@@ -119,7 +119,7 @@
if(istype(user, /mob/living))
var/mob/living/M = user
if (M.disabilities & CLUMSY && prob(40))
- user << "You shoot yourself in the foot with \the [src]!"
+ user << "You shoot yourself in the foot with \the [src]!"
process_fire(user,user,0,params)
M.drop_item()
return
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 1013e5d9067..3be38af11ed 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -39,7 +39,7 @@
if (num_unloaded)
user << "You unload [num_unloaded] shell\s from [src]."
else
- user << "[src] is empty."
+ user << "[src] is empty!"
/obj/item/weapon/gun/projectile/revolver/can_shoot()
return get_ammo(0,0)
@@ -77,7 +77,7 @@
if(magazine.caliber != initial(magazine.caliber))
if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60
playsound(user, fire_sound, 50, 1)
- user << "[src] blows up in your face!"
+ user << "[src] blows up in your face!"
user.take_organ_damage(0,20)
user.drop_item()
qdel(src)
@@ -91,7 +91,7 @@
user << "You begin to reinforce the barrel of [src]..."
if(magazine.ammo_count())
afterattack(user, user) //you know the drill
- user.visible_message("[src] goes off!", "[src] goes off in your face!")
+ user.visible_message("[src] goes off!", "[src] goes off in your face!")
return
if(do_after(user, 30))
if(magazine.ammo_count())
@@ -99,12 +99,12 @@
return
magazine.caliber = "357"
desc = "The barrel and chamber assembly seems to have been modified."
- user << "You reinforce the barrel of [src]! Now it will fire .357 rounds."
+ user << "You reinforce the barrel of [src]. Now it will fire .357 rounds."
else
user << "You begin to revert the modifications to [src]..."
if(magazine.ammo_count())
afterattack(user, user) //and again
- user.visible_message("[src] goes off!", "[src] goes off in your face!")
+ user.visible_message("[src] goes off!", "[src] goes off in your face!")
return
if(do_after(user, 30))
if(magazine.ammo_count())
@@ -204,9 +204,9 @@
var/limb_name = affecting.getDisplayName()
if(affecting.name == "head" || affecting.name == "eyes" || affecting.name == "mouth")
user.apply_damage(300, BRUTE, affecting)
- user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a gunshot!")
+ user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a gunshot!")
else
- user.visible_message("[user.name] cowardly fires [src] at \his [limb_name]!", "You cowardly fire [src] at your [limb_name]!", "You hear a gunshot!")
+ user.visible_message("[user.name] cowardly fires [src] at \his [limb_name]!", "You cowardly fire [src] at your [limb_name]!", "You hear a gunshot!")
return
user.visible_message("*click*")