From 761d31cea0c62d189822fb01469e65b6fa80a8e7 Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Fri, 24 Apr 2015 20:02:51 +0300 Subject: [PATCH] More visible.message span classes removed. --- code/game/machinery/teleporter.dm | 2 +- code/game/objects/items/weapons/RSF.dm | 2 +- code/game/objects/items/weapons/twohanded.dm | 4 +- code/modules/mining/ores_coins.dm | 6 +- code/modules/mob/living/carbon/brain/MMI.dm | 12 +-- .../mob/living/carbon/brain/brain_item.dm | 12 +-- code/modules/mob/living/carbon/human/human.dm | 4 +- .../mob/living/carbon/human/human_defense.dm | 12 +-- .../mob/living/carbon/human/species.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 6 +- code/modules/mob/living/silicon/silicon.dm | 10 +-- .../living/simple_animal/friendly/corgi.dm | 14 ++-- .../simple_animal/friendly/farm_animals.dm | 12 +-- .../mob/living/simple_animal/friendly/pug.dm | 2 +- .../living/simple_animal/hostile/headcrab.dm | 4 +- .../mob/living/simple_animal/hostile/mimic.dm | 2 +- .../simple_animal/hostile/mining_mobs.dm | 2 +- .../living/simple_animal/hostile/mushroom.dm | 12 +-- .../living/simple_animal/hostile/pirate.dm | 2 +- .../living/simple_animal/hostile/russian.dm | 2 +- .../living/simple_animal/hostile/syndicate.dm | 4 +- .../mob/living/simple_animal/slime/powers.dm | 4 +- code/modules/mob/mob_helpers.dm | 2 +- .../ninja/suit/n_suit_verbs/ninja_net.dm | 6 +- code/modules/paperwork/handlabeler.dm | 2 +- code/modules/paperwork/paper.dm | 4 +- code/modules/paperwork/paperbin.dm | 2 +- code/modules/paperwork/photocopier.dm | 4 +- code/modules/power/apc.dm | 6 +- code/modules/projectiles/guns/energy.dm | 2 +- code/modules/projectiles/guns/magic/wand.dm | 2 +- code/modules/projectiles/guns/projectile.dm | 2 +- .../projectiles/guns/projectile/automatic.dm | 2 +- .../projectiles/guns/projectile/shotgun.dm | 2 +- code/modules/projectiles/guns/syringe_gun.dm | 6 +- .../Chemistry-Reagents/Drug-Reagents.dm | 1 + .../reagents/reagent_containers/borghydro.dm | 6 +- .../reagents/reagent_containers/dropper.dm | 2 +- .../reagents/reagent_containers/hypospray.dm | 2 +- .../reagents/reagent_containers/pill.dm | 2 +- .../reagents/reagent_containers/spray.dm | 2 +- .../reagents/reagent_containers/syringes.dm | 2 +- code/modules/recycling/disposal.dm | 2 +- code/modules/research/experimentor.dm | 78 +++++++++---------- .../research/xenobiology/xenobiology.dm | 2 +- 45 files changed, 137 insertions(+), 136 deletions(-) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index acc61087afe..0c31ede202a 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -384,7 +384,7 @@ M.buffer = null user << "You upload the data from the [W.name]'s buffer." else - user << "This station cant hold more information, try to use better parts." + user << "This station can't hold more information, try to use better parts." if(default_deconstruction_screwdriver(user, "controller-o", "controller", W)) update_icon() return diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 15f3079898e..8dcdac57823 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -23,7 +23,7 @@ RSF ..() if (istype(W, /obj/item/weapon/rcd_ammo)) if ((matter + 10) > 30) - user << "The RSF cant hold any more matter." + user << "The RSF can't hold any more matter." return qdel(W) matter += 10 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 860f46f362b..2735a07f8b7 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -230,13 +230,13 @@ obj/item/weapon/twohanded/ /obj/item/weapon/twohanded/dualsaber/attack_hulk(mob/living/carbon/human/user) //In case thats just so happens that it is still activated on the groud, prevents hulk from picking it up if(wielded) - user << "You cant pick up such dangerous item with your meaty hands without losing fingers, better not to." + user << "You can't pick up such dangerous item with your meaty hands without losing fingers, better not to!" return 1 /obj/item/weapon/twohanded/dualsaber/wield(mob/living/carbon/M) //Specific wield () hulk checks due to reflection chance for balance issues and switches hitsounds. if(istype(M)) if(M.dna.check_mutation(HULK)) - M << "You lack the grace to wield this." + M << "You lack the grace to wield this!" return ..() hitsound = 'sound/weapons/blade1.ogg' diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index d6761093715..e9cfeaeb1e7 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -123,7 +123,7 @@ /obj/item/weapon/twohanded/required/gibtonite/attackby(obj/item/I, mob/user, params) if(!wires && istype(I, /obj/item/device/assembly/igniter)) - user.visible_message("[user] attaches [I] to [src]!") + user.visible_message("[user] attaches [I] to [src].", "You attach [I] to [src].") wires = new(src) attacher = key_name(user) qdel(I) @@ -141,7 +141,7 @@ if(primed) if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) || istype(I, /obj/item/device/multitool)) primed = 0 - user.visible_message("The chain reaction was stopped! ...The ore's quality went down.") + user.visible_message("The chain reaction was stopped! ...The ore's quality looks diminished.", "You stopped the chain reaction. ...The ore's quality looks diminished.") icon_state = "Gibtonite ore" quality = 1 return @@ -185,7 +185,7 @@ else if(triggered_by == 2) log_game("A signal has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z]). Igniter attacher: [attacher].") else - user.visible_message("[user] strikes \the [src], causing a chain reaction!") + user.visible_message("[user] strikes \the [src], causing a chain reaction!", "You strike \the [src], causing a chain reaction.") log_game("[key_name(user)] has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])") spawn(det_time) if(primed) diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 49a3bc558d3..0b649aec99d 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -22,12 +22,12 @@ if(istype(O,/obj/item/organ/brain)) //Time to stick a brain in it --NEO var/obj/item/organ/brain/newbrain = O if(brain) - user << "There's already a brain in the MMI!" + user << "There's already a brain in the MMI!" return if(!newbrain.brainmob) - user << "You aren't sure where this brain came from, but you're pretty sure it's a useless brain." + user << "You aren't sure where this brain came from, but you're pretty sure it's a useless brain!" return - visible_message("[user] sticks \a [newbrain] into \the [src]") + visible_message("[user] sticks \a [newbrain] into \the [src].") brainmob = newbrain.brainmob newbrain.brainmob = null @@ -67,9 +67,9 @@ /obj/item/device/mmi/attack_self(mob/user as mob) if(!brain) - user << "You upend the MMI, but there's nothing in it." + user << "You upend the MMI, but there's nothing in it!" else if(locked) - user << "You upend the MMI, but the brain is clamped into place." + user << "You upend the MMI, but the brain is clamped into place!" else user << "You upend the MMI, spilling the brain onto the floor." @@ -123,7 +123,7 @@ set popup_menu = 0 if(brainmob.stat) - brainmob << "Can't do that while incapacitated or dead." + brainmob << "Can't do that while incapacitated or dead!" radio.listening = radio.listening==1 ? 0 : 1 brainmob << "Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast." diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 4bd461376ed..ed151132066 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -52,7 +52,7 @@ var/mob/living/carbon/human/H = M if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES))) - user << "You're going to need to remove their head cover first." + user << "You're going to need to remove their head cover first!" return //since these people will be dead M != usr @@ -63,15 +63,15 @@ if(O == (user || M)) continue if(M == user) - O << "[user] inserts [src] into \his head!" + O << "[user] inserts [src] into \his head!" else - O << "[M] has [src] inserted into \his head by [user]." + O << "[M] has [src] inserted into \his head by [user]." if(M != user) - M << "[user] inserts [src] into your head!" - user << "You insert [src] into [M]'s head!" + M << "[user] inserts [src] into your head." + user << "You insert [src] into [M]'s head." else - user << "You insert [src] into your head!" //LOL + user << "You insert [src] into your head." //LOL //this might actually be outdated since barring badminnery, a debrain'd body will have any client sucked out to the brain's internal mob. Leaving it anyway to be safe. --NEO if(M.key) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 0f8f8d366ae..c1a0e21b364 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -282,14 +282,14 @@ if(!I || !L || I.loc != src) //no item, no limb, or item is not in limb (the person atleast) anymore return var/time_taken = I.embedded_unsafe_removal_time*I.w_class - usr.visible_message("[usr] attempts to remove [I] from their [L.getDisplayName()]!","You attempt to remove [I] from your [L.getDisplayName()], it will take [time_taken/10] seconds.") + usr.visible_message("[usr] attempts to remove [I] from their [L.getDisplayName()].","You attempt to remove [I] from your [L.getDisplayName()]... (It will take [time_taken/10] seconds.)") if(do_after(usr, time_taken, needhand = 1)) L.embedded_objects -= I L.take_damage(I.embedded_unsafe_removal_pain_multiplier*I.w_class)//It hurts to rip it out, get surgery you dingus. I.loc = get_turf(src) usr.put_in_hands(I) usr.emote("scream") - usr.visible_message("[usr] successfully rips [I] out of their [L.getDisplayName()]!","You successfully remove [I] from your [L.getDisplayName()]!") + usr.visible_message("[usr] successfully rips [I] out of their [L.getDisplayName()]!","You successfully remove [I] from your [L.getDisplayName()].") return if(href_list["item"]) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index fd919216a09..980ba2ce475 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -146,7 +146,7 @@ emp_act else return 0 - var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened a hit to your [hit_area].") + var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened a hit to your [hit_area].") if(armor >= 100) return 0 var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords) @@ -220,7 +220,7 @@ emp_act for(var/obj/item/organ/limb/L in src.organs) if(L.status == ORGAN_ROBOTIC) if(!informed) - src << "You feel a sharp pain as your robotic limbs overload." + src << "You feel a sharp pain as your robotic limbs overload." informed = 1 switch(severity) if(1) @@ -250,7 +250,7 @@ emp_act update_inv_wear_mask() update_inv_head() else - src << "Your [head_clothes.name] protects your head and face from the acid!" + src << "Your [head_clothes.name] protects your head and face from the acid!" else . = get_organ("head") if(.) @@ -270,7 +270,7 @@ emp_act update_inv_w_uniform() update_inv_wear_suit() else - src << "Your [chest_clothes.name] protects your body from the acid!" + src << "Your [chest_clothes.name] protects your body from the acid!" else . = get_organ("chest") if(.) @@ -300,7 +300,7 @@ emp_act update_inv_w_uniform() update_inv_wear_suit() else - src << "Your [arm_clothes.name] protects your arms and hands from the acid!" + src << "Your [arm_clothes.name] protects your arms and hands from the acid!" else . = get_organ("r_arm") if(.) @@ -325,7 +325,7 @@ emp_act update_inv_w_uniform() update_inv_wear_suit() else - src << "Your [leg_clothes.name] protects your legs and feet from the acid!" + src << "Your [leg_clothes.name] protects your legs and feet from the acid!" else . = get_organ("r_leg") if(.) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 977b942316c..090bc46f055 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -849,7 +849,7 @@ else return 0 - var/armor = H.run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened a hit to your [hit_area].") + var/armor = H.run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened a hit to your [hit_area].") if(armor >= 100) return 0 var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index c9b817fa344..df8ebcfd28d 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -409,7 +409,7 @@ adjustBruteLoss(-30) updatehealth() add_fingerprint(user) - visible_message("[user] has fixed some of the dents on [src].") + visible_message("[user] has fixed some of the dents on [src].") return 0 else user << "The welder must be on for this task!" @@ -420,7 +420,7 @@ if (coil.use(1)) adjustFireLoss(-30) updatehealth() - visible_message("[user] has fixed some of the burnt wires on [src].") + user.visible_message("[user] has fixed some of the burnt wires on [src].", "You fix some of the burnt wires on [src].") else user << "You need one length of cable to repair [src]!" @@ -477,7 +477,7 @@ playsound(src, 'sound/items/Ratchet.ogg', 50, 1) user << "You start to unfasten [src]'s securing bolts..." if(do_after(user, 50) && !cell) - user.visible_message("[user] deconstructs [src]!", "You unfasten the securing bolts, and [src] falls to pieces!") + user.visible_message("[user] deconstructs [src]!", "You unfasten the securing bolts, and [src] falls to pieces!") deconstruct() else if(istype(W, /obj/item/weapon/aiModule)) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 24bb007c3d2..82a7a0be1e9 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -389,7 +389,7 @@ /mob/living/silicon/attack_larva(mob/living/carbon/alien/larva/L) if(L.a_intent == "help") - visible_message("[L.name] rubs its head against [src].") + visible_message("[L.name] rubs its head against [src].") return /mob/living/silicon/attack_hulk(mob/living/carbon/human/user) @@ -405,15 +405,15 @@ /mob/living/silicon/attack_hand(mob/living/carbon/human/M) switch(M.a_intent) if ("help") - M.visible_message("[M] pets [src]!", \ - "You pet [src]!") + M.visible_message("[M] pets [src].", \ + "You pet [src].") if("grab") grabbedby(M) else M.do_attack_animation(src) playsound(src.loc, 'sound/effects/bang.ogg', 10, 1) - visible_message("[M] punches [src], but doesn't leave a dent.", \ - "[M] punches [src], but doesn't leave a dent.!") + visible_message("[M] punches [src], but doesn't leave a dent.", \ + "[M] punches [src], but doesn't leave a dent.") return 0 /mob/living/silicon/adjustEarDamage() diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index cfd71c02b0f..29fbf497b7d 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -113,14 +113,14 @@ visible_message(" [user] hits [src] with [O], however [src] is too armored.") else user << "[src] is wearing too much armor! You can't reach \his skin." - visible_message("[user] gently taps [src] with [O].") + visible_message("[user] gently taps [src] with [O].") if(health>0 && prob(15)) emote("me", 1, "looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression.") return if(istype(O, /obj/item/weapon/newspaper)) if(!stat) - user.visible_message("[user] baps [name] on the nose with the rolled up [O]") + user.visible_message("[user] baps [name] on the nose with the rolled up [O].") spawn(0) for(var/i in list(1,2,4,8,4,2,1,2)) dir = i @@ -130,9 +130,9 @@ if (shaved) user << "You can't shave this corgi, it's already been shaved!" return - user.visible_message("[user] starts to shave [src] using \the [O].", "You start to shave [src] using \the [O]...") + user.visible_message("[user] starts to shave [src] using \the [O].", "You start to shave [src] using \the [O]...") if(do_after(user, 50)) - user.visible_message("[user] shaves [src]'s hair using \the [O]. ") + user.visible_message("[user] shaves [src]'s hair using \the [O].") playsound(loc, 'sound/items/Welder2.ogg', 20, 1) shaved = 1 icon_living = "[initial(icon_living)]_shaved" @@ -194,13 +194,13 @@ if("back") if(inventory_back) - usr << "It's already wearing something." + usr << "It's already wearing something!" return else var/obj/item/item_to_add = usr.get_active_hand() if(!item_to_add) - usr.visible_message("[usr] pets [src]","You rest your hand on [src]'s back for a moment.") + usr.visible_message("[usr] pets [src].","You rest your hand on [src]'s back for a moment.") return if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess item_to_add.afterattack(src,usr,1) @@ -253,7 +253,7 @@ if(user) user << "You can't put more than one hat on [src]!" return if(!item_to_add) - user.visible_message("[user] pets [src]","You rest your hand on [src]'s head for a moment.") + user.visible_message("[user] pets [src].","You rest your hand on [src]'s head for a moment.") return diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index ed50a96a326..22a7e584ac6 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -74,13 +74,13 @@ /mob/living/simple_animal/hostile/retaliate/goat/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass)) - user.visible_message("[user] milks [src] using \the [O].") + user.visible_message("[user] milks [src] using \the [O].", "You milk [src] using \the [O].") var/obj/item/weapon/reagent_containers/glass/G = O var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) if(G.reagents.total_volume >= G.volume) - user << "[O] is full." + user << "[O] is full!" if(!transfered) - user << "The udder is dry. Wait a bit longer..." + user << "The udder is dry! Wait a bit longer..." else ..() //cow @@ -115,7 +115,7 @@ /mob/living/simple_animal/cow/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass)) - user.visible_message("[user] milks [src] using \the [O].") + user.visible_message("[user] milks [src] using \the [O].", "You milk [src] using \the [O].") var/obj/item/weapon/reagent_containers/glass/G = O var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) if(G.reagents.total_volume >= G.volume) @@ -242,14 +242,14 @@ var/global/chicken_count = 0 /mob/living/simple_animal/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(istype(O, food_type)) //feedin' dem chickens if(!stat && eggsleft < 8) - var/feedmsg = "[user] feeds [O] to [name]! [pick(feedMessages)]" + var/feedmsg = "[user] feeds [O] to [name]! [pick(feedMessages)]" user.visible_message(feedmsg) user.drop_item() qdel(O) eggsleft += rand(1, 4) //world << eggsleft else - user << "[name] doesn't seem hungry!" + user << "[name] doesn't seem hungry!" else ..() diff --git a/code/modules/mob/living/simple_animal/friendly/pug.dm b/code/modules/mob/living/simple_animal/friendly/pug.dm index c25834a4479..1086486142d 100644 --- a/code/modules/mob/living/simple_animal/friendly/pug.dm +++ b/code/modules/mob/living/simple_animal/friendly/pug.dm @@ -33,7 +33,7 @@ /mob/living/simple_animal/pet/pug/attackby(var/obj/item/O as obj, var/mob/user as mob, params) //Marker -Agouri if(istype(O, /obj/item/weapon/newspaper)) if(!stat) - user.visible_message("[user] baps [name] on the nose with the rolled up [O]") + user.visible_message("[user] baps [name] on the nose with the rolled up [O].") spawn(0) for(var/i in list(1,2,4,8,4,2,1,2)) dir = i diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index 5d8c69b1565..8df6b5460fc 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -28,7 +28,7 @@ else if(mind) // Let's make this a feature egg.owner = mind victim.internal_organs += egg - visible_message("[src] lays an egg in a [victim]!") + visible_message("[src] lays an egg in a [victim].") egg_lain = 1 /mob/living/simple_animal/hostile/headcrab/AttackingTarget() @@ -39,7 +39,7 @@ var/mob/living/carbon/human/H = target if(H.stat == DEAD) Infect(target) - src << "With your egg laid you feel your death rapidly approaching, time to die..." + src << "With your egg laid you feel your death rapidly approaching, time to die..." spawn(100) death() return diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 74ac5e70c30..869100f6e94 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -37,7 +37,7 @@ /mob/living/simple_animal/hostile/mimic/death() ..(1) - visible_message("[src] stops moving!") + visible_message("[src] stops moving!") ghostize() qdel(src) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 626392bccab..de377488aeb 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -280,7 +280,7 @@ user << "[src] are useless on the dead." return if(H != user) - H.visible_message("[user] forces [H] to eat [src]... they quickly regenerate all injuries!") + H.visible_message("[user] forces [H] to eat [src]... they quickly regenerate all injuries!") else user << "You chomp into [src], barely managing to hold it down, but feel amazingly refreshed in mere moments." playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1) diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 6fd0f9ea59e..f75f91096a1 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -71,10 +71,10 @@ if(istype(L, /mob/living/simple_animal/hostile/mushroom) && stat == DEAD) var/mob/living/simple_animal/hostile/mushroom/M = L if(faint_ticker < 2) - M.visible_message("[M] chews a bit on [src].") + M.visible_message("[M] chews a bit on [src].") faint_ticker++ return - M.visible_message("[M] devours [src]!") + M.visible_message("[M] devours [src]!") var/level_gain = (powerlevel - M.powerlevel) if(level_gain >= -1 && !bruised && !M.ckey)//Player shrooms can't level up to become robust gods. if(level_gain < 1)//So we still gain a level if two mushrooms were the same level @@ -91,7 +91,7 @@ /mob/living/simple_animal/hostile/mushroom/death(gibbed) if(!gibbed) - visible_message("[src] fainted.") + visible_message("[src] fainted.") ..(gibbed) UpdateMushroomCap() @@ -103,7 +103,7 @@ overlays += cap_living /mob/living/simple_animal/hostile/mushroom/proc/Recover() - visible_message("[src] slowly begins to recover.") + visible_message("[src] slowly begins to recover.") faint_ticker = 0 revive() UpdateMushroomCap() @@ -123,7 +123,7 @@ /mob/living/simple_animal/hostile/mushroom/proc/Bruise() if(!bruised && !stat) - src.visible_message("The [src.name] was bruised!") + src.visible_message("The [src.name] was bruised!") bruised = 1 /mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I as obj, mob/user as mob, params) @@ -132,7 +132,7 @@ Recover() qdel(I) else - user << "[src] won't eat it!" + user << "[src] won't eat it!" return if(I.force) Bruise() diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm index d6d265a3d79..fa9a2164d9b 100644 --- a/code/modules/mob/living/simple_animal/hostile/pirate.dm +++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm @@ -44,7 +44,7 @@ /mob/living/simple_animal/hostile/pirate/death() ..(1) - visible_message("[src] stops moving.") + visible_message("[src] stops moving.") if(corpse) new corpse (src.loc) if(weapon1) diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm index c9ef9685534..64796ad7e99 100644 --- a/code/modules/mob/living/simple_animal/hostile/russian.dm +++ b/code/modules/mob/living/simple_animal/hostile/russian.dm @@ -46,7 +46,7 @@ /mob/living/simple_animal/hostile/russian/death(gibbed) ..(1) - visible_message("[src] stops moving.") + visible_message("[src] stops moving.") if(corpse) new corpse (src.loc) if(weapon1) diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index c12c04b8a0e..d01462502f6 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -63,8 +63,8 @@ visible_message("[src] blocks [O] with its shield!") playsound(loc, O.hitsound, 25, 1, -1) else - usr << "This weapon is ineffective, it does no damage." - visible_message("[user] gently taps [src] with [O].") + usr << "This weapon is ineffective, it does no damage!" + visible_message("[user] gently taps [src] with [O].") /mob/living/simple_animal/hostile/syndicate/melee/bullet_act(var/obj/item/projectile/Proj) diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm index e8b647e5e8d..b6f4ed34b86 100644 --- a/code/modules/mob/living/simple_animal/slime/powers.dm +++ b/code/modules/mob/living/simple_animal/slime/powers.dm @@ -71,7 +71,7 @@ Victim.adjustToxLoss(rand(2,4)) if(prob(15) && Victim.client) - Victim << "[pick("You can feel your body becoming weak!", \ + Victim << "[pick("You can feel your body becoming weak!", \ "You feel like you're about to die!", \ "You feel every part of your body screaming in agony!", \ "A low, rolling pain passes through your body!", \ @@ -89,7 +89,7 @@ src << "[pick("This subject is incompatible", \ "This subject does not have a life energy", "This subject is empty", \ "I am not satisified", "I can not feed from this subject", \ - "I do not feel nourished", "This subject is not food")]..." + "I do not feel nourished", "This subject is not food")]!" if(fed_succesfully) add_nutrition(rand(15,30), lastnut) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index fdb69def835..dd575cd6adf 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -480,7 +480,7 @@ proc/is_special_character(mob/M) // returns 1 for special characters and 2 for h affecting.heal_damage(brute,burn,1) H.update_damage_overlays(0) H.updatehealth() - user.visible_message("[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.getDisplayName()].") + user.visible_message("[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.getDisplayName()].", "You fix some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.getDisplayName()].") return else user << "[H]'s [affecting.getDisplayName()] is already in good condition!" diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm index 428f417ca44..b31d49c1d82 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm @@ -12,7 +12,7 @@ if(!locate(/obj/effect/energy_net) in C.loc)//Check if they are already being affected by an energy net. for(var/turf/T in getline(H.loc, C.loc)) if(T.density)//Don't want them shooting nets through walls. It's kind of cheesy. - H << "You may not use an energy net through solid obstacles!" + H << "You may not use an energy net through solid obstacles!" return spawn(0) H.Beam(C,"n_beam",,15) @@ -25,7 +25,7 @@ spawn(0)//Parallel processing. E.process(C) else - H << "They are already trapped inside an energy net." + H << "They are already trapped inside an energy net!" else - H << "They will bring no honor to your Clan!" + H << "They will bring no honor to your Clan!" return \ No newline at end of file diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index a5a892e4f57..96c8f83e2b0 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -31,7 +31,7 @@ user << "You can't label cyborgs!" return - user.visible_message("[user] labels [A] as [label].", \ + user.visible_message("[user] labels [A] as [label].", \ "You label [A] as [label].") A.name = "[A.name] ([label])" labels_left-- diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index cf006b775cc..564411de900 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -336,12 +336,12 @@ /obj/item/weapon/paper/proc/burn(var/showmsg, var/burntime) if(showmsg) - src.visible_message("[src] catches on fire!") + src.visible_message("[src] catches on fire.") burning = 1 icon_state = "paper_onfire" info = "[stars(info)]" sleep(burntime) //7 seconds - src.visible_message("[src] burns away, leaving behind a pile of ashes.") + src.visible_message("[src] burns away, leaving behind a pile of ashes.") new /obj/effect/decal/cleanable/ash(src.loc) qdel(src) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index a26c0497223..8493cfb876a 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -57,7 +57,7 @@ user.put_in_hands(P) user << "You take [P] out of \the [src]." else - user << "[src] is empty!" + user << "[src] is empty!" add_fingerprint(user) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 8cf5b05510b..92f82705db9 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -320,12 +320,12 @@ if(photocopy) photocopy.loc = src.loc - visible_message("[photocopy] is shoved out of the way by [ass]!") + visible_message("[photocopy] is shoved out of the way by [ass]!") photocopy = null else if(copy) copy.loc = src.loc - visible_message("[copy] is shoved out of the way by [ass]!") + visible_message("[copy] is shoved out of the way by [ass]!") copy = null updateUsrDialog() diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 21514f2a5d7..44da3f238a0 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -417,7 +417,7 @@ W.loc = src cell = W user.visible_message(\ - "[user.name] has inserted the power cell to [src.name]!",\ + "[user.name] has inserted the power cell to [src.name]!",\ "You insert the power cell.") chargecount = 0 update_icon() @@ -557,7 +557,7 @@ && W.w_class >= 3.0 \ && prob(20) ) opened = 2 - user.visible_message("[user.name] has knocked down the APC cover with the [W.name]!", \ + 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.") update_icon() @@ -785,7 +785,7 @@ var/mob/living/carbon/human/H = user if (istype(H)) if(H.getBrainLoss() >= 60) - H.visible_message("[H] stares cluelessly at [src] and drools.") + H.visible_message("[H] stares cluelessly at [src] and drools.") return 0 else if(prob(H.getBrainLoss())) user << "You momentarily forget how to use [src]." diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index d342e89b0d4..b728fc3a886 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -67,7 +67,7 @@ fire_sound = shot.fire_sound fire_delay = shot.delay if (shot.select_name) - user << "[src] is now set to [shot.select_name]." + user << "[src] is now set to [shot.select_name]." update_icon() return diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index ad7246f8359..20cf03caaa3 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -48,7 +48,7 @@ /obj/item/weapon/gun/magic/wand/proc/zap_self(mob/living/user as mob) - user.visible_message("[user] zaps \himself with [src]!") + user.visible_message("[user] zaps \himself with [src].") playsound(user, fire_sound, 50, 1) user.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] zapped \himself with a [src]" diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index e5760cc8efd..66184119b45 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -79,7 +79,7 @@ update_icon() return else - user << "[src] already has a suppressor." + user << "[src] already has a suppressor!" return else user << "You can't seem to figure out how to fit [S] on [src]!" diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index b01d9a55bc7..010b3686cc6 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -136,7 +136,7 @@ /obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays if(cover_open) - user << "[src]'s cover is open! Close it before firing!" + user << "[src]'s cover is open! Close it before firing!" else ..() update_icon() diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 043f88a77c4..e5d5b462c6d 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -175,7 +175,7 @@ if (num_unloaded) user << "You break open \the [src] and unload [num_unloaded] shell\s." else - user << "[src] is empty." + user << "[src] is empty!" // IMPROVISED SHOTGUN // diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm index 0b08405cdcc..2fb641d6c56 100644 --- a/code/modules/projectiles/guns/syringe_gun.dm +++ b/code/modules/projectiles/guns/syringe_gun.dm @@ -47,7 +47,7 @@ /obj/item/weapon/gun/syringe/attack_self(mob/living/user as mob) if(!syringes.len) - user << "[src] is empty." + user << "[src] is empty!" return 0 var/obj/item/weapon/reagent_containers/syringe/S = syringes[syringes.len] @@ -56,7 +56,7 @@ S.loc = user.loc syringes.Remove(S) - user << "You unload [S] from \the [src]!" + user << "You unload [S] from \the [src]." return 1 @@ -69,7 +69,7 @@ A.loc = src return 1 else - usr << "[src] cannot hold more syringes." + usr << "[src] cannot hold more syringes!" return 0 /obj/item/weapon/gun/syringe/rapidsyringe diff --git a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm index 17fea97c5dd..7f426393b39 100644 --- a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm @@ -46,6 +46,7 @@ datum/reagent/drug/nicotine/on_mob_life(var/mob/living/M as mob) M.adjustStaminaLoss(-0.5*REM) ..() + M << "You feel like you smoked too much." datum/reagent/drug/crank name = "Crank" id = "crank" diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 7e2e63aba62..f4304ba596a 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -123,7 +123,7 @@ Borg Hypospray empty = 0 if(empty) - usr << "It is currently empty. Allow some time for the internal syntheszier to produce more." + usr << "It is currently empty! Allow some time for the internal syntheszier to produce more." /* Borg Shaker */ @@ -167,7 +167,7 @@ Borg Shaker else if(target.is_open_container() && target.reagents) var/datum/reagents/R = reagent_list[mode] if(!R.total_volume) - user << "[src] is currently out of this ingredient. Please allow some time for the synthesizer to produce more." + user << "[src] is currently out of this ingredient! Please allow some time for the synthesizer to produce more." return if(target.reagents.total_volume >= target.reagents.maximum_volume) @@ -187,7 +187,7 @@ Borg Shaker empty = 0 if(empty) - usr << "It is currently empty. Please allow some time for the synthesizer to produce more." + usr << "It is currently empty! Please allow some time for the synthesizer to produce more." /obj/item/weapon/reagent_containers/borghypo/borgshaker/hacked ..() diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 39630fd85d7..8a8f5f1728b 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -73,7 +73,7 @@ return if(!target.reagents.total_volume) - user << "[target] is empty." + user << "[target] is empty!" return var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 2d83c9580b8..b6da840f2cf 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -16,7 +16,7 @@ /obj/item/weapon/reagent_containers/hypospray/attack(mob/living/M, mob/user) if(!reagents.total_volume) - user << "[src] is empty." + user << "[src] is empty!" return if(!istype(M)) return diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 03e5a104efa..4520bb48afb 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -59,7 +59,7 @@ if(!proximity) return if(target.is_open_container() != 0 && target.reagents) if(!target.reagents.total_volume) - user << "[target] is empty. There's nothing to dissolve [src] in." + user << "[target] is empty! There's nothing to dissolve [src] in." return user << "You dissolve [src] in [target]." for(var/mob/O in viewers(2, user)) //viewers is necessary here because of the small radius diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 43484c7cc4b..edfce7a4595 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -40,7 +40,7 @@ return if(reagents.total_volume < amount_per_transfer_from_this) - user << "\The [src] is empty!" + user << "\The [src] is empty!" return spray(A) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 3e391dff091..9d7988c289e 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -110,7 +110,7 @@ else //if not mob if(!target.reagents.total_volume) - user << "[target] is empty." + user << "[target] is empty!" return if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers) && !istype(target,/obj/item/slime_extract)) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 04b09332466..0cbd54f514f 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -149,7 +149,7 @@ if(!iscarbon(user) && !user.ventcrawler) //only carbon and ventcrawlers can climb into disposal by themselves. return if(target.mob_size > MOB_SIZE_HUMAN) - user << "[target] doesn't fit inside [src]." + user << "[target] doesn't fit inside [src]!" return src.add_fingerprint(user) if(user == target) diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index c98f09a7cc8..be722fe8fb0 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -254,21 +254,21 @@ var/criticalReaction = locate(exp_on) in critical_items ? TRUE : FALSE //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_POKE) - visible_message("[src] prods at [exp_on] with mechanical arms.") + visible_message("[src] prods at [exp_on] with mechanical arms.") if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[exp_on] is gripped in just the right way, enhancing it's focus.") + visible_message("[exp_on] is gripped in just the right way, enhancing its focus.") badThingCoeff++ if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src] malfunctions and destroys [exp_on], lashing it's arms out at nearby people!.") + visible_message("[src] malfunctions and destroys [exp_on], lashing its arms out at nearby people!") for(var/mob/living/m in oview(1, src)) m.apply_damage(15,"brute",pick("head","chest","groin")) investigate_log("Experimentor dealt minor brute to [m].", "experimentor") ejectItem(TRUE) if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions!.") + visible_message("[src] malfunctions!") exp = SCANTYPE_OBLITERATE if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] malfunctions, throwing the [exp_on]!.") + visible_message("[src] malfunctions, throwing the [exp_on]!") var/mob/living/target = locate(/mob/living) in oview(7,src) if(target) var/obj/item/throwing = loaded_item @@ -278,21 +278,21 @@ throwing.throw_at(target, 10, 1) //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_IRRADIATE) - visible_message("[src] reflects radioactive rays at [exp_on]!") + visible_message("[src] reflects radioactive rays at [exp_on]!") if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[exp_on] has activated an unknown subroutine!") + visible_message("[exp_on] has activated an unknown subroutine!") cloneMode = TRUE cloneCount = badThingCoeff investigate_log("Experimentor has made a clone of [exp_on]", "experimentor") ejectItem() if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src] malfunctions, melting [exp_on] and leaking radiation!.") + visible_message("[src] malfunctions, melting [exp_on] and leaking radiation!") for(var/mob/living/m in oview(1, src)) m.irradiate(25) investigate_log("Experimentor has irradiated [m]", "experimentor") //One entry per person so we know what was irradiated. ejectItem(TRUE) if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions, spewing toxic waste!.") + visible_message("[src] malfunctions, spewing toxic waste!") for(var/turf/T in oview(1, src)) if(!T.density) if(prob(EFFECT_PROB_VERYHIGH)) @@ -303,7 +303,7 @@ ejectItem(TRUE) var/newPath = pickWeighted(valid_items) loaded_item = new newPath(src) - visible_message("[src] malfunctions, transforming [savedName] into [loaded_item]!.") + visible_message("[src] malfunctions, transforming [savedName] into [loaded_item]!") investigate_log("Experimentor has transformed [savedName] into [loaded_item]", "experimentor") if(istype(loaded_item,/obj/item/weapon/grenade/chem_grenade)) var/obj/item/weapon/grenade/chem_grenade/CG = loaded_item @@ -311,12 +311,12 @@ ejectItem() //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_GAS) - visible_message("[src] fills it's chamber with gas, [exp_on] included.") + visible_message("[src] fills its chamber with gas, [exp_on] included.") if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[exp_on] achieves the perfect mix!") + visible_message("[exp_on] achieves the perfect mix!") new /obj/item/stack/sheet/mineral/plasma(get_turf(pick(oview(1,src)))) if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src] destroys [exp_on], leaking dangerous gas!.") + visible_message("[src] destroys [exp_on], leaking dangerous gas!") chosenchem = pick("carbon","radium","toxin","condensedcapsaicin","mushroomhallucinogen","space_drugs","ethanol","beepskysmash") var/datum/reagents/R = new/datum/reagents(50) R.my_atom = src @@ -343,18 +343,18 @@ warn_admins(usr, "[chosenchem] smoke") investigate_log("Experimentor has released [chosenchem] smoke!", "experimentor") if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions, spewing harmless gas!.") + visible_message("[src] malfunctions, spewing harmless gas.>") throwSmoke(src.loc) if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] melts [exp_on], ionizing the air around it!.") + visible_message("[src] melts [exp_on], ionizing the air around it!") empulse(src.loc, 4, 6) investigate_log("Experimentor has generated an Electromagnetic Pulse.", "experimentor") ejectItem(TRUE) //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_HEAT) - visible_message("[src] raises [exp_on]'s temperature.") + visible_message("[src] raises [exp_on]'s temperature.") if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[src]'s emergency coolant system gives off a small ding!") + visible_message("[src]'s emergency coolant system gives off a small ding!") playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) var/obj/item/weapon/reagent_containers/food/drinks/coffee/C = new /obj/item/weapon/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src)))) chosenchem = pick("plasma","capsaicin","ethanol") @@ -377,12 +377,12 @@ FB.xo = MT.x - start.x FB.fire() if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions, melting [exp_on] and releasing a burst of flame!.") + visible_message("[src] malfunctions, melting [exp_on] and releasing a burst of flame!") explosion(src.loc, -1, 0, 0, 0, 0, flame_range = 2) investigate_log("Experimentor started a fire.", "experimentor") ejectItem(TRUE) if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] malfunctions, melting [exp_on] and leaking hot air!.") + visible_message("[src] malfunctions, melting [exp_on] and leaking hot air!") var/datum/gas_mixture/env = src.loc.return_air() var/transfer_moles = 0.25 * env.total_moles() var/datum/gas_mixture/removed = env.remove(transfer_moles) @@ -396,7 +396,7 @@ investigate_log("Experimentor has released hot air.", "experimentor") ejectItem(TRUE) if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] malfunctions, activating it's emergency coolant systems!.") + visible_message("[src] malfunctions, activating its emergency coolant systems!") throwSmoke(src.loc) for(var/mob/living/m in oview(1, src)) m.apply_damage(5,"burn",pick("head","chest","groin")) @@ -404,9 +404,9 @@ ejectItem() //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_COLD) - visible_message("[src] lowers [exp_on]'s temperature.") + visible_message("[src] lowers [exp_on]'s temperature.") if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[src]'s emergency coolant system gives off a small ding!") + visible_message("[src]'s emergency coolant system gives off a small ding!") var/obj/machinery/vending/coffee/C = new /obj/machinery/vending/coffee(get_turf(pick(oview(1,src)))) playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) //Ding! Your death coffee is ready! chosenchem = pick("uranium","frostoil","ephedrine") @@ -416,7 +416,7 @@ C.desc = "It has a large hazard symbol printed on the side in fading ink." investigate_log("Experimentor has made a cup of [chosenchem] coffee.", "experimentor") if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!") + visible_message("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!") var/datum/reagents/R = new/datum/reagents(50) R.my_atom = src R.add_reagent("frostoil" , 50) @@ -428,7 +428,7 @@ qdel(R) ejectItem(TRUE) if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions, shattering [exp_on] and leaking cold air!.") + visible_message("[src] malfunctions, shattering [exp_on] and leaking cold air!") var/datum/gas_mixture/env = src.loc.return_air() var/transfer_moles = 0.25 * env.total_moles() var/datum/gas_mixture/removed = env.remove(transfer_moles) @@ -442,22 +442,22 @@ investigate_log("Experimentor has released cold air.", "experimentor") ejectItem(TRUE) if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!.") + visible_message("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!") var/datum/effect/effect/system/harmless_smoke_spread/smoke = new smoke.set_up(1,0, src.loc, 0) smoke.start() ejectItem() //////////////////////////////////////////////////////////////////////////////////////////////// if(exp == SCANTYPE_OBLITERATE) - visible_message("[exp_on] activates the crushing mechanism, [exp_on] is destroyed!") + visible_message("[exp_on] activates the crushing mechanism, [exp_on] is destroyed!") if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!") + visible_message("[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!") new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src)))) if(linked_console.linked_lathe) linked_console.linked_lathe.m_amount += min((linked_console.linked_lathe.max_material_storage - linked_console.linked_lathe.TotalMaterials()), (exp_on.m_amt)) linked_console.linked_lathe.g_amount += min((linked_console.linked_lathe.max_material_storage - linked_console.linked_lathe.TotalMaterials()), (exp_on.g_amt)) if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src]'s crusher goes way too many levels too high, crushing right through space-time!") + visible_message("[src]'s crusher goes way too many levels too high, crushing right through space-time!") playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 1, -3) investigate_log("Experimentor has triggered the 'throw things' reaction.", "experimentor") var/list/throwAt = list() @@ -469,7 +469,7 @@ var/cast = throwAt[counter] cast:throw_at(src,10,1) if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src]'s crusher goes one level too high, crushing right into space-time!.") + visible_message("[src]'s crusher goes one level too high, crushing right into space-time!") playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 1, -3) investigate_log("Experimentor has triggered the 'minor throw things' reaction.", "experimentor") var/list/oViewStuff = oview(7,src) @@ -486,10 +486,10 @@ if(exp == FAIL) var/a = pick("rumbles","shakes","vibrates","shudders") var/b = pick("crushes","spins","viscerates","smashes","insults") - visible_message("[exp_on] [a], and [b], the experiment was a failiure!") + visible_message("[exp_on] [a], and [b], the experiment was a failure.") if(exp == SCANTYPE_DISCOVER) - visible_message("[src] scans the [exp_on], revealing it's true nature!.") + visible_message("[src] scans the [exp_on], revealing its true nature!") playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 3, -1) var/obj/item/weapon/relic/R = loaded_item R.reveal() @@ -500,11 +500,11 @@ if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) var/globalMalf = rand(1,100) if(globalMalf < 15) - visible_message("[src]'s onboard detection system has malfunctioned!.") + visible_message("[src]'s onboard detection system has malfunctioned!") item_reactions["[exp_on.type]"] = pick(SCANTYPE_POKE,SCANTYPE_IRRADIATE,SCANTYPE_GAS,SCANTYPE_HEAT,SCANTYPE_COLD,SCANTYPE_OBLITERATE) ejectItem() if(globalMalf > 16 && globalMalf < 35) - visible_message("[src] melts [exp_on], ian-izing the air around it!.") + visible_message("[src] melts [exp_on], ian-izing the air around it!") throwSmoke(src.loc) if(trackedIan) throwSmoke(trackedIan.loc) @@ -515,7 +515,7 @@ investigate_log("Experimentor has spawned a new corgi.", "experimentor") ejectItem(TRUE) if(globalMalf > 36 && globalMalf < 50) - visible_message("[src] improves [exp_on], drawing the life essence of those nearby!") + visible_message("[src] improves [exp_on], drawing the life essence of those nearby!") for(var/mob/living/m in view(4,src)) m << "You feel your flesh being torn from you, mists of blood drifting to [src]!" m.apply_damage(50,"brute","chest") @@ -526,7 +526,7 @@ exp_on.origin_tech = list2params(reqs) investigate_log("Experimentor has set the origin tech of [exp_on] to [exp_on.origin_tech]", "experimentor") if(globalMalf > 51 && globalMalf < 75) - visible_message("[src] encounters a run-time error!") + visible_message("[src] encounters a run-time error!") throwSmoke(src.loc) if(trackedRuntime) throwSmoke(trackedRuntime.loc) @@ -537,7 +537,7 @@ investigate_log("Experimentor failed to steal runtime, and instead spawned a new cat.", "experimentor") ejectItem(TRUE) if(globalMalf > 76) - visible_message("[src] begins to smoke and hiss, shaking violently!") + visible_message("[src] begins to smoke and hiss, shaking violently!") use_power(500000) investigate_log("Experimentor has drained power from its APC", "experimentor") @@ -567,7 +567,7 @@ src.updateUsrDialog() else if(recentlyExperimented) - usr << "[src] has been used too recently!" + usr << "[src] has been used too recently!" return var/dotype if(text2num(scantype) == SCANTYPE_DISCOVER) @@ -638,7 +638,7 @@ /obj/item/weapon/relic/attack_self(mob/user as mob) if(revealed) if(cooldown) - user << "[src] does not react." + user << "[src] does not react!" return else if(src.loc == user) cooldown = TRUE @@ -690,7 +690,7 @@ qdel(src) /obj/item/weapon/relic/proc/rapidDupe(var/mob/user) - audible_message("[src] emits a loud pop!") + audible_message("[src] emits a loud pop!") var/list/dupes = list() var/counter var/max = rand(5,10) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index f22e5f82de2..f054bbb6867 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -204,7 +204,7 @@ M.languages |= HUMAN M.faction -= "neutral" M << "All at once it makes sense, you know what you are and who you are! Self awareness is yours!" - M << "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost." + M << "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost." user << "[M] is suddenly attentive and aware. It worked!" qdel(src) else