From e371dd9f359b0fbb5053e638f99159408ab71b7e Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Sun, 19 Apr 2015 08:55:24 +0300 Subject: [PATCH] more spans --- code/datums/diseases/transformation.dm | 2 +- code/datums/spells/mind_transfer.dm | 12 +++++----- code/game/gamemodes/cult/ritual.dm | 2 +- code/game/gamemodes/nuclear/pinpointer.dm | 6 ++--- code/game/gamemodes/wizard/spellbook.dm | 8 +++---- code/game/machinery/ai_slipper.dm | 2 +- code/game/machinery/atmoalter/canister.dm | 2 +- code/game/machinery/autolathe.dm | 2 +- code/game/machinery/cloning.dm | 4 ++-- .../machinery/computer/HolodeckControl.dm | 6 ++--- code/game/machinery/computer/card.dm | 2 +- code/game/machinery/computer/cloning.dm | 2 +- .../game/machinery/computer/communications.dm | 6 ++--- code/game/machinery/computer/law.dm | 6 ++--- code/game/machinery/computer/medical.dm | 2 +- code/game/machinery/computer/security.dm | 2 +- code/game/machinery/constructable_frame.dm | 2 +- code/game/machinery/deployable.dm | 4 ++-- code/game/machinery/newscaster.dm | 2 +- code/game/machinery/portable_turret.dm | 2 +- code/game/machinery/robot_fabricator.dm | 2 +- code/game/machinery/suit_storage_unit.dm | 4 ++-- code/game/machinery/vending.dm | 4 ++-- code/game/mecha/mech_fabricator.dm | 8 +++---- code/game/mecha/mecha.dm | 8 +++---- code/game/objects/items/devices/camera_bug.dm | 4 ++-- code/game/objects/items/devices/flashlight.dm | 2 +- .../objects/items/devices/radio/headset.dm | 6 ++--- .../game/objects/items/devices/radio/radio.dm | 6 ++--- .../objects/items/robot/robot_upgrades.dm | 2 +- code/game/objects/items/shooting_range.dm | 6 ++--- code/game/objects/items/stacks/stack.dm | 2 +- code/game/objects/items/weapons/cards_ids.dm | 2 +- .../objects/items/weapons/tanks/jetpack.dm | 4 ++-- .../objects/items/weapons/tanks/watertank.dm | 6 ++--- code/game/objects/structures/barsigns.dm | 10 ++++---- code/game/objects/structures/kitchen_spike.dm | 18 +++++++------- code/game/objects/structures/mineral_doors.dm | 6 ++--- code/game/objects/structures/target_stake.dm | 6 ++--- code/modules/admin/verbs/bluespacearty.dm | 2 +- code/modules/assembly/mousetrap.dm | 2 +- code/modules/clothing/clothing.dm | 24 +++++++++---------- code/modules/clothing/head/hardhat.dm | 2 +- code/modules/clothing/head/helmet.dm | 2 +- code/modules/clothing/head/misc_special.dm | 4 ++-- code/modules/clothing/head/soft_caps.dm | 4 ++-- code/modules/clothing/shoes/magboots.dm | 2 +- code/modules/clothing/spacesuits/hardsuit.dm | 4 ++-- code/modules/clothing/suits/toggles.dm | 2 +- code/modules/crafting/guncrafting.dm | 4 ++-- code/modules/hydroponics/hydroponics.dm | 10 ++++---- code/modules/hydroponics/seeds.dm | 6 ++--- .../mob/living/carbon/human/inventory.dm | 4 ++-- .../modules/mob/living/silicon/robot/robot.dm | 6 ++--- .../living/simple_animal/friendly/corgi.dm | 4 ++-- .../mob/living/simple_animal/parrot.dm | 2 +- .../mob/living/simple_animal/slime/slime.dm | 2 +- code/modules/paperwork/photography.dm | 4 ++-- code/modules/power/cell.dm | 2 +- code/modules/power/lighting.dm | 6 ++--- code/modules/power/smes.dm | 2 +- code/modules/projectiles/gun.dm | 2 +- code/modules/reagents/Chemistry-Machinery.dm | 6 ++--- .../security levels/keycard authentication.dm | 6 ++--- code/modules/telesci/telesci_computer.dm | 2 +- 65 files changed, 149 insertions(+), 149 deletions(-) diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 639c94e2b54..4eac92f16b9 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -189,7 +189,7 @@ stage2 = list("You are turning a little green.") stage3 = list("Your limbs are getting oozy.", "Your skin begins to peel away.") stage4 = list("You are turning into a slime.") - stage5 = list("You become a slime.") + stage5 = list("You have become a slime.") new_form = /mob/living/simple_animal/slime /datum/disease/transformation/slime/stage_act() diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm index 710d98ba015..9a6605ff3ca 100644 --- a/code/datums/spells/mind_transfer.dm +++ b/code/datums/spells/mind_transfer.dm @@ -22,29 +22,29 @@ Also, you never added distance checking after target is selected. I've went ahea */ /obj/effect/proc_holder/spell/targeted/mind_transfer/cast(list/targets,mob/user = usr, distanceoverride) if(!targets.len) - user << "No mind found." + user << "No mind found!" return if(targets.len > 1) - user << "Too many minds! You're not a hive damnit!"//Whaa...aat? + user << "Too many minds! You're not a hive damnit!"//Whaa...aat? return var/mob/living/target = targets[1] if(!(target in oview(range)) && !distanceoverride)//If they are not in overview after selection. Do note that !() is necessary for in to work because ! takes precedence over it. - user << "They are too far away!" + user << "They are too far away!" return if(target.stat == DEAD) - user << "You don't particularly want to be dead." + user << "You don't particularly want to be dead!" return if(!target.key || !target.mind) - user << "They appear to be catatonic. Not even magic can affect their vacant mind." + user << "They appear to be catatonic! Not even magic can affect their vacant mind." return if(target.mind.special_role in protected_roles) - user << "Their mind is resisting your spell." + user << "Their mind is resisting your spell!" return var/mob/living/victim = target//The target of the spell whos body will be transferred to. diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 55f41231870..0c8b13767d2 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -670,7 +670,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // if(M == user) for(var/entry in words) words[entry] = T.words[entry] - user << "You copy the translation notes from your tome." + user << "You copy the translation notes from your tome." /obj/item/weapon/tome/examine(mob/user) diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index d61191f9334..74e88d79bad 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -122,7 +122,7 @@ location = locate(locationx,locationy,Z.z) - usr << "You set the pinpointer to locate [locationx],[locationy]" + usr << "You set the pinpointer to locate [locationx],[locationy]" return attack_self() @@ -140,9 +140,9 @@ return target=locate(possible_items[targetitem]) if(!target) - usr << "Failed to locate [targetitem]!" + usr << "Failed to locate [targetitem]!" return - usr << "You set the pinpointer to locate [targetitem]" + usr << "You set the pinpointer to locate [targetitem]." if("DNA") var/DNAstring = input("Input DNA string to search for." , "Please Enter String." , "") if(!DNAstring) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 138a77305c1..3d30ba9e242 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -18,9 +18,9 @@ if(istype(O, /obj/item/weapon/antag_spawner/contract)) var/obj/item/weapon/antag_spawner/contract/contract = O if(contract.used) - user << "The contract has been used, you can't get your points back now." + user << "The contract has been used, you can't get your points back now!" else - user << "You feed the contract back into the spellbook, refunding your points." + user << "You feed the contract back into the spellbook, refunding your points." src.max_uses++ src.uses++ qdel(O) @@ -30,11 +30,11 @@ /obj/item/weapon/spellbook/attack_self(mob/user as mob) if(!owner) - user << "You bind the spellbook to yourself." + user << "You bind the spellbook to yourself." owner = user return if(user != owner) - user << "The [name] does not recognize you as it's owner and refuses to open." + user << "The [name] does not recognize you as it's owner and refuses to open!" return user.set_machine(src) var/dat diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 386c11d09c9..82d9841d328 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -36,7 +36,7 @@ else // trying to unlock the interface if (src.allowed(usr)) locked = !locked - user << "You [ locked ? "lock" : "unlock"] the device." + user << "You [ locked ? "lock" : "unlock"] the device." if (locked) if (user.machine==src) user.unset_machine() diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 5450c05c626..3004a7a4389 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -245,7 +245,7 @@ update_flag transfer_moles = pressure_delta*thejetpack.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION)//Actually transfer the gas var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) thejetpack.merge(removed) - user << "You pulse-pressurize your jetpack from the tank." + user << "You pulse-pressurize your jetpack from the tank." return ..() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 5b1167272dc..87d84453a52 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -150,7 +150,7 @@ use_power(max(1000, (m_amt+g_amt)*amount/10)) src.m_amount += m_amt * amount src.g_amount += g_amt * amount - user << "You insert [amount] sheet[amount>1 ? "s" : ""] to the autolathe." + user << "You insert [amount] sheet[amount>1 ? "s" : ""] to the autolathe." if (O && O.loc == src) qdel(O) busy = 0 diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index ab45982bb34..87be0acbdf5 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -83,7 +83,7 @@ /obj/item/weapon/disk/data/attack_self(mob/user as mob) read_only = !read_only - user << "You flip the write-protect tab to [src.read_only ? "protected" : "unprotected"]." + user << "You flip the write-protect tab to [src.read_only ? "protected" : "unprotected"]." /obj/item/weapon/disk/data/examine(mob/user) ..() @@ -270,7 +270,7 @@ /obj/machinery/clonepod/emag_act(user as mob) if (isnull(src.occupant)) return - user << "You force an emergency ejection." + user << "You force an emergency ejection." src.locked = 0 src.go_out() diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 253d5df8e86..6d127808ceb 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -474,7 +474,7 @@ return /obj/machinery/readybutton/attack_paw(mob/user as mob) - user << "You are too primitive to use this device" + user << "You are too primitive to use this device!" return /obj/machinery/readybutton/New() @@ -486,7 +486,7 @@ /obj/machinery/readybutton/attack_hand(mob/user as mob) if(user.stat || stat & (NOPOWER|BROKEN)) - user << "This device is not powered." + user << "This device is not powered!" return currentarea = get_area(src.loc) @@ -494,7 +494,7 @@ qdel(src) if(eventstarted) - usr << "The event has already begun!" + usr << "The event has already begun!" return ready = !ready diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index acc6cccc4db..180f3dc2fd5 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -354,7 +354,7 @@ var/time_last_changed_position = 0 if(region_access) authenticated = 1 else if ((!( authenticated ) && (istype(usr, /mob/living/silicon))) && (!modify)) - usr << "You can't modify an ID without an ID inserted to modify. Once one is in the modify slot on the computer, you can log in." + usr << "You can't modify an ID without an ID inserted to modify! Once one is in the modify slot on the computer, you can log in." if ("logout") region_access = null head_subordinates = null diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 240cdaa11b7..38489cb1497 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -79,7 +79,7 @@ user.drop_item() W.loc = src src.diskette = W - user << "You insert [W]." + user << "You insert [W]." src.updateUsrDialog() return else diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 1c0138f4c66..c335d4ad6f6 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -103,11 +103,11 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 feedback_inc("alert_comms_blue",1) tmp_alertlevel = 0 else: - usr << "You are not authorized to do this." + usr << "You are not authorized to do this!" tmp_alertlevel = 0 state = STATE_DEFAULT else - usr << "You need to swipe your ID." + usr << "You need to swipe your ID!" if("announce") if(src.authenticated==2 && !message_cooldown) @@ -333,7 +333,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 src.emagged = 1 if(authenticated == 1) authenticated = 2 - user << "You scramble the communication routing circuits!" + user << "You scramble the communication routing circuits." /obj/machinery/computer/communications/attack_hand(var/mob/user as mob) if(..()) diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index c314be68b5e..0ab00973dd5 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -10,7 +10,7 @@ if(src.stat & (NOPOWER|BROKEN|MAINT)) return if(!current) - user << "You haven't selected anything to transmit laws to!" + user << "You haven't selected anything to transmit laws to!" return if(!can_upload_to(current)) user << "Upload failed! Check to make sure [current.name] is functioning properly." @@ -43,7 +43,7 @@ src.current = select_active_ai(user) if (!src.current) - user << "No active AIs detected." + user << "No active AIs detected!" else user << "[src.current.name] selected for law changes." @@ -68,7 +68,7 @@ src.current = select_active_free_borg(user) if(!src.current) - user << "No active unslaved cyborgs detected." + user << "No active unslaved cyborgs detected!" else user << "[src.current.name] selected for law changes." diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index bc686b127d9..8a52e787827 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -24,7 +24,7 @@ usr.drop_item() O.loc = src scan = O - user << "You insert [O]." + user << "You insert [O]." else ..() diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index f4f5f3c9d00..3ac9f1abf03 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -28,7 +28,7 @@ usr.drop_item() O.loc = src scan = O - user << "You insert [O]." + user << "You insert [O]." else ..() diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 63d85b6f81b..c2a98ae7c84 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -207,7 +207,7 @@ if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CP = P if (CP.get_amount() < 1) - user << "You need more cable!" + user << "You need more cable!" return var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src, 1, CP.item_color) if(CP.use(1)) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 98c7cf1fff0..29225878e42 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -196,7 +196,7 @@ for reference: if (src.emagged == 0) src.emagged = 1 src.req_access = null - user << "You break the ID authentication lock on \the [src]." + user << "You break the ID authentication lock on \the [src]." var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() @@ -204,7 +204,7 @@ for reference: return else if (src.emagged == 1) src.emagged = 2 - user << "You short out the anchoring mechanism on \the [src]." + user << "You short out the anchoring mechanism on \the [src]." var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(2, 1, src) s.start() diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index ef82371c9ac..d374dfb6480 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -861,7 +861,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co else targetcam = R.aicamera else - user << "You cannot interface with silicon photo uploading" //gtfo pAIs + user << "You cannot interface with silicon photo uploading!" //gtfo pAIs if(targetcam.aipictures.len == 0) usr << "No images saved" diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 1cd5ff30a83..999bf32d41b 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -710,7 +710,7 @@ if(do_after(user, 20)) if(!src || !WT.remove_fuel(5, user)) return build_step = 1 - user << "You remove the turret's interior metal armor." + user << "You remove the turret's interior metal armor." new /obj/item/stack/sheet/metal( loc, 2) return diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 85c818f2fd8..2e1c8275332 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -28,7 +28,7 @@ if (O:amount < 1) qdel(O) - user << "You insert [count] metal sheet\s into \the [src]." + user << "You insert [count] metal sheet\s into \the [src]." src.overlays -= "fab-load-metal" updateDialog() else diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index b8f815b3e25..ba94519f738 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -531,7 +531,7 @@ if(!user.drop_item()) user << "\The [S] is stuck to your hand, you cannot put it in the Suit Storage Unit!" return - user << "You load the [S.name] into the suit storage compartment." + user << "You load the [S.name] into the suit storage compartment." S.loc = src src.SUIT = S src.update_icon() @@ -547,7 +547,7 @@ if(!user.drop_item()) user << "\The [H] is stuck to your hand, you cannot put it in the Suit Storage Unit!" return - user << "You load the [H.name] into the helmet storage compartment." + user << "You load the [H.name] into the helmet storage compartment." H.loc = src src.HELMET = H src.update_icon() diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 50cf25db59f..947203a018d 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -246,7 +246,7 @@ if(istype(W, /obj/item/weapon/screwdriver) && anchored) panel_open = !panel_open - user << "You [panel_open ? "open" : "close"] the maintenance panel." + user << "You [panel_open ? "open" : "close"] the maintenance panel." overlays.Cut() if(panel_open) overlays += image(icon, "[initial(icon_state)]-panel") @@ -285,7 +285,7 @@ /obj/machinery/vending/emag_act(user as mob) if(!emagged) emagged = 1 - user << "You short out the product lock on [src]." + user << "You short out the product lock on [src]." /obj/machinery/vending/attack_paw(mob/user) return attack_hand(user) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 8bbcb205c9f..fc8d60e2263 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -526,10 +526,10 @@ return ..() if(being_built) - user << "\The [src] is currently processing. Please wait until completion." + user << "\The [src] is currently processing! Please wait until completion." return if(res_max_amount - resources[material] < MINERAL_MATERIAL_AMOUNT) //overstuffing the fabricator - user << "\The [src] [material2name(material)] storage is full." + user << "\The [src] [material2name(material)] storage is full!" return var/obj/item/stack/sheet/stack = W var/sname = "[stack.name]" @@ -539,12 +539,12 @@ var/transfer_amount = min(stack.amount, round((res_max_amount - resources[material])/MINERAL_MATERIAL_AMOUNT,1)) resources[material] += transfer_amount * MINERAL_MATERIAL_AMOUNT stack.use(transfer_amount) - user << "You insert [transfer_amount] [sname] sheet\s into \the [src]." + user << "You insert [transfer_amount] [sname] sheet\s into \the [src]." sleep(10) updateUsrDialog() overlays -= "fab-load-[material2name(material)]" //No matter what the overlay shall still be deleted else - user << "\The [src] cannot hold any more [sname] sheet\s." + user << "\The [src] cannot hold any more [sname] sheet\s!" return /obj/machinery/mecha_part_fabricator/proc/material2name(var/ID) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index e8b714cabc9..0c69c112d3d 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -348,15 +348,15 @@ obj/mecha/proc/can_use(mob/user) return if(user != src.occupant) //While not "realistic", this piece is player friendly. user.forceMove(get_turf(src)) - user << "You climb out from [src]" + user << "You climb out from [src]." return 0 if(connected_port) if(world.time - last_message > 20) - src.occupant_message("Unable to move while connected to the air system port") + src.occupant_message("Unable to move while connected to the air system port!") last_message = world.time return 0 if(state) - occupant_message("Maintenance protocols in effect") + occupant_message("Maintenance protocols in effect.") return return domove(direction) @@ -724,7 +724,7 @@ obj/mecha/proc/can_use(mob/user) else if(istype(W, /obj/item/weapon/screwdriver)) if(hasInternalDamage(MECHA_INT_TEMP_CONTROL)) clearInternalDamage(MECHA_INT_TEMP_CONTROL) - user << "You repair the damaged temperature controller." + user << "You repair the damaged temperature controller." else if(state==3 && src.cell) src.cell.forceMove(src.loc) src.cell = null diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 69339728593..64c7c3d270f 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -311,7 +311,7 @@ /obj/item/device/camera_bug/attackby(var/obj/item/W as obj,var/mob/living/user as mob, params) if(istype(W,/obj/item/weapon/screwdriver) && expansion) expansion.loc = get_turf(loc) - user << "You unscrew [expansion]." + user << "You unscrew [expansion]." user.put_in_inactive_hand(expansion) expansion = null bugtype = VANILLA_BUG @@ -352,7 +352,7 @@ user.drop_item() W.loc = src expansion = W - user << "You add [W] to [src]." + user << "You add [W] to [src]." get_cameras() // the tracking code will want to know the new camera list if(bugtype in list(UNIVERSAL_BUG,NETWORK_BUG,ADMIN_BUG)) skip_bugcheck = 1 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index b01e7a349c2..5e8555d13ad 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -38,7 +38,7 @@ /obj/item/device/flashlight/attack_self(mob/user) if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities. + user << "You cannot turn the light on while in this [user.loc]!" //To prevent some lighting anomalities. return 0 on = !on update_brightness(user) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 86fce610ab3..92ad5697dc7 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -242,14 +242,14 @@ keyslot2 = null recalculateChannels() - user << "You pop out the encryption keys in the headset!" + user << "You pop out the encryption keys in the headset." else - user << "This headset doesn't have any unique encryption keys! How useless..." + user << "This headset doesn't have any unique encryption keys! How useless..." if(istype(W, /obj/item/device/encryptionkey/)) if(keyslot && keyslot2) - user << "The headset can't hold another key!" + user << "The headset can't hold another key!" return if(!keyslot) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index c7283a15f29..978b09390b0 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -621,14 +621,14 @@ keyslot = null recalculateChannels() - user << "You pop out the encryption key in the radio!" + user << "You pop out the encryption key in the radio." else - user << "This radio doesn't have any encryption keys!" + user << "This radio doesn't have any encryption keys!" if(istype(W, /obj/item/device/encryptionkey/)) if(keyslot) - user << "The radio can't hold another key!" + user << "The radio can't hold another key!" return if(!keyslot) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 01dc031a466..55c1be2ac5a 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -66,7 +66,7 @@ /obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R) if(R.health < 0) - usr << "You have to repair the cyborg before using this module!" + usr << "You have to repair the cyborg before using this module!" return 0 if(!R.key) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index f69fdbf1766..bffb0d948e7 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -37,7 +37,7 @@ var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) overlays.Cut() - usr << "You slice off [src]'s uneven chunks of aluminium and scorch marks." + usr << "You slice off [src]'s uneven chunks of aluminium and scorch marks." return @@ -59,10 +59,10 @@ if(ishuman(user)) if(!user.get_active_hand()) user.put_in_hands(src) - user << "You take the target out of the stake." + user << "You take the target out of the stake." else src.loc = get_turf(user) - user << "You take the target out of the stake." + user << "You take the target out of the stake." stake.pinned_target = null return diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index c0af7b5a6a3..4d00da3e8f5 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -210,7 +210,7 @@ if (item.amount>=item.max_amount) continue oldsrc.attackby(item, usr) - usr << "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s." + usr << "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s." if(oldsrc.amount <= 0) break oldsrc.update_icon() diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 60fc902e23e..00f3fbfd3b2 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -224,7 +224,7 @@ update_label("John Doe", "Clowny") var/points = 0 /obj/item/weapon/card/id/prisoner/attack_self(mob/user as mob) - usr << "You have accumulated [points] out of the [goal] points you need for freedom." + usr << "You have accumulated [points] out of the [goal] points you need for freedom." /obj/item/weapon/card/id/prisoner/one name = "Prisoner #13-001" diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 5f0738215fb..e83c50f5594 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -23,7 +23,7 @@ if(usr.stat || !usr.canmove || usr.restrained()) return src.stabilization_on = !( src.stabilization_on ) - usr << "You toggle the stabilization [stabilization_on? "on":"off"]." + usr << "You toggle the stabilization [stabilization_on? "on":"off"]." return @@ -41,7 +41,7 @@ icon_state = initial(icon_state) // item_state = initial(item_state) ion_trail.stop() - usr << "You toggle the jetpack [on? "on":"off"]." + usr << "You toggle the jetpack [on? "on":"off"]." return diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index ead66f9e685..d634d9a832c 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -268,10 +268,10 @@ return //Safety check so you don't blast yourself trying to refill your tank var/datum/reagents/R = reagents if(R.total_volume < 100) - user << "You need at least 100 units of water to use the nanofrost launcher!" + user << "You need at least 100 units of water to use the nanofrost launcher!" return if(nanofrost_cooldown) - user << "Nanofrost launcher is still recharging..." + user << "Nanofrost launcher is still recharging..." return nanofrost_cooldown = 1 R.remove_any(100) @@ -297,7 +297,7 @@ if(src) metal_synthesis_cooldown-- else - user << "Metal foam mix is still being synthesized..." + user << "Metal foam mix is still being synthesized..." return /obj/effect/nanofrost_container diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index e6d09208015..09d1b6414e6 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -66,11 +66,11 @@ return if( istype(I, /obj/item/weapon/screwdriver)) if(!panel_open) - user << "You open the maintenance panel." + user << "You open the maintenance panel." set_sign(new /datum/barsign/hiddensigns/signoff) panel_open = 1 else - user << "You close the maintenance panel." + user << "You close the maintenance panel." if(!broken && !emagged) set_sign(pick(barsigns)) else if(emagged) @@ -82,10 +82,10 @@ if(istype(I, /obj/item/stack/cable_coil) && panel_open) var/obj/item/stack/cable_coil/C = I if(emagged) //Emagged, not broken by EMP - user << "Sign has been damaged beyond repair." + user << "Sign has been damaged beyond repair!" return else if(!broken) - user << "This sign is functioning properly." + user << "This sign is functioning properly!" return if(C.use(2)) @@ -105,7 +105,7 @@ /obj/structure/sign/barsign/emag_act(mob/user) if(broken || emagged) - user << "Nothing interesting happens." + user << "Nothing interesting happens!" return user << "You emag the barsign. Takeover in progress..." sleep(100) //10 seconds diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 9df1aa4ef93..4cd8cae36e3 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -88,45 +88,45 @@ if(src.skin >= 1) src.skin-- new /obj/item/stack/sheet/animalhide/monkey(src.loc) - user << "You remove the hide from the monkey!" + user << "You remove the hide from the monkey." else if(src.meat > 1) src.meat-- new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey(src.loc ) - usr << "You remove some meat from the monkey." + usr << "You remove some meat from the monkey." else if(src.meat == 1) src.meat-- new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey(src.loc) - usr << "You remove the last piece of meat from the monkey!" + usr << "You remove the last piece of meat from the monkey." src.icon_state = "spike" src.occupied = 0 else if(src.meattype == MEATTYPE_ALIEN && src.skintype == SKINTYPE_ALIEN) if(src.skin >= 1) src.skin-- new /obj/item/stack/sheet/animalhide/xeno(src.loc) - user << "You remove the hide from the alien!" + user << "You remove the hide from the alien." else if(src.meat > 1) src.meat-- new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno(src.loc ) - usr << "You remove some meat from the alien." + usr << "You remove some meat from the alien." else if(src.meat == 1) src.meat-- new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno(src.loc) - usr << "You remove the last piece of meat from the alien!" + usr << "You remove the last piece of meat from the alien." src.icon_state = "spike" src.occupied = 0 else if(src.meattype == MEATTYPE_BEAR && src.skintype == SKINTYPE_BEAR) if(src.skin >= 1) src.skin-- new /obj/item/clothing/head/bearpelt(src.loc) - user << "You remove the hide from the bear!" + user << "You remove the hide from the bear." else if(src.meat > 1) src.meat-- new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear(src.loc ) - usr << "You remove some meat from the bear." + usr << "You remove some meat from the bear." else if(src.meat == 1) src.meat-- new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear(src.loc) - usr << "You remove the last piece of meat from the bear!" + usr << "You remove the last piece of meat from the bear." src.icon_state = "spike" src.occupied = 0 diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 78fa6b2bd53..49537016514 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -125,13 +125,13 @@ /obj/structure/mineral_door/attackby(obj/item/weapon/W, mob/user, params) if(istype(W,/obj/item/weapon/pickaxe)) var/obj/item/weapon/pickaxe/digTool = W - user << "You start digging the [name]..." + user << "You start digging the [name]..." if(do_after(user,digTool.digspeed*hardness) && src) - user << "You finish digging." + user << "You finish digging." Dismantle() else if(istype(W,/obj/item/weapon)) //not sure, can't not just weapons get passed to this proc? hardness -= W.force/100 - user << "You hit the [name] with your [W.name]!" + user << "You hit the [name] with your [W.name]!" CheckHardness() else attack_hand(user) diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index 15405604004..e1d8952d518 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -30,7 +30,7 @@ W.loc = loc W.layer = 3.1 pinned_target = W - user << "You slide the target into the stake." + user << "You slide the target into the stake." return /obj/structure/target_stake/attack_hand(mob/user as mob) @@ -44,9 +44,9 @@ if(ishuman(user)) if(!user.get_active_hand()) user.put_in_hands(pinned_target) - user << "You take the target out of the stake." + user << "You take the target out of the stake." else pinned_target.loc = get_turf(user) - user << "You take the target out of the stake." + user << "You take the target out of the stake." pinned_target = null diff --git a/code/modules/admin/verbs/bluespacearty.dm b/code/modules/admin/verbs/bluespacearty.dm index b39c89e42b3..486c0003129 100644 --- a/code/modules/admin/verbs/bluespacearty.dm +++ b/code/modules/admin/verbs/bluespacearty.dm @@ -29,6 +29,6 @@ target.Weaken(20) target.stuttering = 20 - target << "You're hit by bluespace artillery!" + target << "You're hit by bluespace artillery!" log_admin("[target.name] has been hit by Bluespace Artillery fired by [usr]") message_admins("[target.name] has been hit by Bluespace Artillery fired by [usr]") diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 38bdb41d43b..94b5790af58 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -19,7 +19,7 @@ if(ishuman(usr)) var/mob/living/carbon/human/user = usr if((user.getBrainLoss() >= 60) || user.disabilities & CLUMSY && prob(50)) - user << "Your hand slips, setting off the trigger." + user << "Your hand slips, setting off the trigger!" pulse(0) update_icon() if(usr) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index b8391bd840a..c64c25d5302 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -113,12 +113,12 @@ BLIND // can't see anything permeability_coefficient = initial(permeability_coefficient) flags |= visor_flags flags_inv |= visor_flags_inv - user << "You push \the [src] back into place." + user << "You push \the [src] back into place." src.mask_adjusted = 0 slot_flags = initial(slot_flags) else src.icon_state += "_up" - user << "You push \the [src] out of the way." + user << "You push \the [src] out of the way." gas_transfer_coefficient = null permeability_coefficient = null flags &= ~visor_flags @@ -293,20 +293,20 @@ atom/proc/generate_female_clothing(index,t_color,icon,type) var/list/modes = list("Off", "Binary vitals", "Exact vitals", "Tracking beacon") var/switchMode = input("Select a sensor mode:", "Suit Sensor Mode", modes[sensor_mode + 1]) in modes if(get_dist(usr, src) > 1) - usr << "You have moved too far away." + usr << "You have moved too far away!" return sensor_mode = modes.Find(switchMode) - 1 if (src.loc == usr) switch(sensor_mode) if(0) - usr << "You disable your suit's remote sensing equipment." + usr << "You disable your suit's remote sensing equipment." if(1) - usr << "Your suit will now only report whether you are alive or dead." + usr << "Your suit will now only report whether you are alive or dead." if(2) - usr << "Your suit will now only report your exact vital lifesigns." + usr << "Your suit will now only report your exact vital lifesigns." if(3) - usr << "Your suit will now report your exact vital lifesigns as well as your coordinate position." + usr << "Your suit will now report your exact vital lifesigns as well as your coordinate position." if(istype(loc,/mob/living/carbon/human)) var/mob/living/carbon/human/H = loc @@ -329,19 +329,19 @@ atom/proc/generate_female_clothing(index,t_color,icon,type) if(!can_use(usr)) return if(!can_adjust) - usr << "You cannot wear this suit any differently." + usr << "You cannot wear this suit any differently!" return if(src.adjusted == 1) src.fitted = initial(fitted) src.item_color = initial(item_color) src.item_color = src.suit_color //colored jumpsuits are shit and break without this - usr << "You adjust the suit back to normal." + usr << "You adjust the suit back to normal." src.adjusted = 0 else if(src.fitted != FEMALE_UNIFORM_TOP) src.fitted = NO_FEMALE_UNIFORM src.item_color += "_d" - usr << "You adjust the suit to wear it more casually." + usr << "You adjust the suit to wear it more casually." src.adjusted = 1 usr.update_inv_w_uniform() ..() @@ -388,7 +388,7 @@ atom/proc/generate_female_clothing(index,t_color,icon,type) flags |= (visor_flags) flags_inv |= (visor_flags_inv) icon_state = initial(icon_state) - usr << "You pull \the [src] down." + usr << "You pull \the [src] down." flash_protect = initial(flash_protect) tint = initial(tint) else @@ -396,7 +396,7 @@ atom/proc/generate_female_clothing(index,t_color,icon,type) flags &= ~(visor_flags) flags_inv &= ~(visor_flags_inv) icon_state = "[initial(icon_state)]up" - usr << "You push \the [src] up." + usr << "You push \the [src] up." flash_protect = 0 tint = 0 diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index e712565dc77..e1d1e53e8b8 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -12,7 +12,7 @@ attack_self(mob/user) if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities. + user << "You cannot turn the light on while in this [user.loc]!" //To prevent some lighting anomalities. return on = !on icon_state = "hardhat[on]_[item_color]" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 4fbd2b6b832..8edd7ce05fb 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -263,7 +263,7 @@ obj/item/clothing/head/helmet/bluetaghelm var/mob/living/carbon/human/user = usr if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]." + user << "You cannot turn the light on while in this [user.loc]!" F.on = !F.on user << "You toggle the helmetlight [F.on ? "on":"off"]." diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index f5a8ac28885..6eee2eaf8a0 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -100,12 +100,12 @@ src.icon_state = "ushankaup" src.item_state = "ushankaup" earflaps = 0 - user << "You raise the ear flaps on the ushanka." + user << "You raise the ear flaps on the ushanka." else src.icon_state = "ushankadown" src.item_state = "ushankadown" earflaps = 1 - user << "You lower the ear flaps on the ushanka." + user << "You lower the ear flaps on the ushanka." /* * Pumpkin head diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 02fc5c460f7..96c5f55cedd 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -27,10 +27,10 @@ src.flipped = !src.flipped if(src.flipped) icon_state = "[item_color]soft_flipped" - user << "You flip the hat backwards." + user << "You flip the hat backwards." else icon_state = "[item_color]soft" - user << "You flip the hat back in normal position." + user << "You flip the hat back in normal position." usr.update_inv_head(0) //so our mob-overlays update /obj/item/clothing/head/soft/examine(mob/user) diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index d7d2414ff68..8d742f983db 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -28,7 +28,7 @@ src.slowdown = slowdown_active magpulse = !magpulse icon_state = "[magboot_state][magpulse]" - user << "You [magpulse ? "enable" : "disable"] the mag-pulse traction system." + user << "You [magpulse ? "enable" : "disable"] the mag-pulse traction system." user.update_inv_shoes(0) //so our mob-overlays update user.update_gravity(user.mob_has_gravity()) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 5e019d89409..f178515a89b 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -14,7 +14,7 @@ /obj/item/clothing/head/helmet/space/hardsuit/attack_self(mob/user) if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities. + user << "You cannot turn the light on while in this [user.loc]!" //To prevent some lighting anomalities. return on = !on icon_state = "hardsuit[on]-[item_color]" @@ -171,7 +171,7 @@ /obj/item/clothing/head/helmet/space/hardsuit/syndi/attack_self(mob/user) //Toggle Helmet if(!isturf(user.loc)) - user << "You cannot toggle your helmet while in this [user.loc]" //To prevent some lighting anomalities. + user << "You cannot toggle your helmet while in this [user.loc]!" //To prevent some lighting anomalities. return on = !on if(on || force) diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 72cee5861d5..470b6f6ebd4 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -66,7 +66,7 @@ if(!can_use(usr)) return 0 - usr << "You toggle [src]'s [togglename]." + usr << "You toggle [src]'s [togglename]." if(src.suittoggled) src.icon_state = "[initial(icon_state)]" src.suittoggled = 0 diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm index 758e2501647..ae95ef86a03 100644 --- a/code/modules/crafting/guncrafting.dm +++ b/code/modules/crafting/guncrafting.dm @@ -20,7 +20,7 @@ /obj/item/weaponcrafting/reciever/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W,/obj/item/pipe)) - user << "You attach the shotgun barrel to the receiver. The pins seem loose." + user << "You attach the shotgun barrel to the receiver. The pins seem loose." var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction user.unEquip(src) user.put_in_hands(I) @@ -53,7 +53,7 @@ /obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weaponcrafting/stock)) - user << "You attach the stock to the receiver-barrel assembly." + user << "You attach the stock to the receiver-barrel assembly." var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3 user.unEquip(src) user.put_in_hands(I) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 0441d9daf39..2477234819d 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -650,7 +650,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p else if(istype(O, /obj/item/seeds/)) if(!planted) user.unEquip(O) - user << "You plant [O]." + user << "You plant [O]." dead = 0 myseed = O planted = 1 @@ -737,12 +737,12 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p if(anchored == 2) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) anchored = 1 - user << "You unscrew \the [src]'s hoses." + user << "You unscrew \the [src]'s hoses." else if(anchored == 1) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) anchored = 2 - user << "You screw in \the [src]'s hoses." + user << "You screw in \the [src]'s hoses." for(var/obj/machinery/hydroponics/h in range(1,src)) spawn() @@ -758,7 +758,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p else if(dead) planted = 0 dead = 0 - user << "You remove the dead plant from [src]." + user << "You remove the dead plant from [src]." qdel(myseed) update_icon() else @@ -986,5 +986,5 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p /obj/machinery/hydroponics/soil/attackby(var/obj/item/O as obj, var/mob/user as mob, params) ..() if(istype(O, /obj/item/weapon/shovel)) - user << "You clear up [src]!" + user << "You clear up [src]!" qdel(src) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 56c309a95fc..3d63316edaa 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -107,12 +107,12 @@ mutant_color = bloodSample.data["mutant_color"] factions = bloodSample.data["factions"] W.reagents.clear_reagents() - user << "You inject the contents of the syringe into the seeds." + user << "You inject the contents of the syringe into the seeds." contains_sample = 1 else - user << "The seeds reject the sample!" + user << "The seeds reject the sample!" else - user << "The seeds already contain a genetic sample." + user << "The seeds already contain a genetic sample!" ..() diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 2aaa5ee8aca..c7db2dc90c6 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -123,11 +123,11 @@ return 0 if(!wear_suit.allowed) if(!disable_warning) - usr << "You somehow have a suit with no defined allowed items for suit storage, stop that." //should be src? + usr << "You somehow have a suit with no defined allowed items for suit storage, stop that!" //should be src? return 0 if(I.w_class > 4) if(!disable_warning) - usr << "The [I.name] is too big to attach." //should be src? + usr << "The [I.name] is too big to attach!" //should be src? return 0 if( istype(I, /obj/item/device/pda) || istype(I, /obj/item/weapon/pen) || is_type_in_list(I, wear_suit.allowed) ) //ugly and un-polymorphic. return 1 diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 92beb4f0f12..fd755e9e700 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -510,7 +510,7 @@ else if(allowed(usr)) locked = !locked - user << "You [ locked ? "lock" : "unlock"] [src]'s cover." + user << "You [ locked ? "lock" : "unlock"] [src]'s cover." update_icons() else user << "Access denied." @@ -571,7 +571,7 @@ SetLockdown(1) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown lawupdate = 0 connected_ai = null - user << "You emag [src]'s interface." + user << "You emag [src]'s interface." message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)]. Laws overridden.") log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.") clear_supplied_laws() @@ -666,7 +666,7 @@ cell.updateicon() cell.add_fingerprint(user) user.put_in_active_hand(cell) - user << "You remove \the [cell]." + user << "You remove \the [cell]." cell = null update_icons() diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 333c25dc805..23cd0c56670 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -219,7 +219,7 @@ ) if( ! ( item_to_add.type in allowed_types ) ) - usr << "You set [item_to_add] on [src]'s back, but \he shakes it off!" + usr << "You set [item_to_add] on [src]'s back, but \he shakes it off!" if(!usr.drop_item()) usr << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!" return @@ -408,7 +408,7 @@ if(user && !user.drop_item()) user << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!" return 0 - user << "You set [item_to_add] on [src]'s head, but \he shakes it off!" + user << "You set [item_to_add] on [src]'s head, but \he shakes it off!" item_to_add.loc = loc if(prob(25)) step_rand(item_to_add) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 8e2b95003a7..d4b807c56a6 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -232,7 +232,7 @@ usr.drop_item() headset_to_add.loc = src src.ears = headset_to_add - usr << "You fit the headset onto [src]." + usr << "You fit the headset onto [src]." clearlist(available_channels) for(var/ch in headset_to_add.channels) diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index cde4d29cadc..7dd50a1008d 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -284,7 +284,7 @@ ++Friends[user] else Friends[user] = 1 - user << "You feed the slime the plasma. It chirps happily." + user << "You feed the slime the plasma. It chirps happily." var/obj/item/stack/sheet/mineral/plasma/S = W S.use(1) return diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index a759a817464..bfb76afccc0 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -53,7 +53,7 @@ if(in_range(user, src)) show(user) else - user << "You need to get closer to get a good look at this photo." + user << "You need to get closer to get a good look at this photo!" /obj/item/weapon/photo/proc/show(mob/user) @@ -427,4 +427,4 @@ obj/item/device/camera/siliconcam/robot_camera/proc/borgprint() p.pixel_y = rand(-10, 10) C.toner -= 20 //Cyborgs are very ineffeicient at printing an image visible_message("[C.name] spits out a photograph from a narrow slot on it's chassis.") - usr << "You print a photograph." + usr << "You print a photograph." diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index a73e924ee08..68bf7c270b0 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -63,7 +63,7 @@ if(istype(W, /obj/item/weapon/reagent_containers/syringe)) var/obj/item/weapon/reagent_containers/syringe/S = W - user << "You inject the solution into the power cell." + user << "You inject the solution into the power cell." if(S.reagents.has_reagent("plasma", 5)) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 1731e0362c8..e3fddeead48 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -409,7 +409,7 @@ qdel(src) return - user << "You stick \the [W] into the light socket!" + user << "You stick \the [W] into the light socket!" if(has_power() && (W.flags & CONDUCT)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) @@ -494,7 +494,7 @@ if(prot > 0) user << "You remove the light [fitting]." else if(istype(user) && user.dna.check_mutation(TK)) - user << "You telekinetically remove the light [fitting]." + user << "You telekinetically remove the light [fitting]." else user << "You try to remove the light [fitting], but you burn your hand on it!" @@ -529,7 +529,7 @@ user << "There is no [fitting] in this light." return - user << "You telekinetically remove the light [fitting]." + user << "You telekinetically remove the light [fitting]." // create a light tube/bulb item and put it in the user's hand var/obj/item/weapon/light/L = new light_type() L.status = status diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 01c4bf85577..599cc293ec7 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -119,7 +119,7 @@ user << "You need more wires!" return - user << "You start building the power terminal..." + user << "You start building the power terminal..." playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20) && C.amount >= 10) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 5acb58f5f78..d6638100fe7 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -275,7 +275,7 @@ var/mob/living/carbon/human/user = usr if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]." + user << "You cannot turn the light on while in this [user.loc]!" F.on = !F.on user << "You toggle the gunlight [F.on ? "on":"off"]." diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index b6238cce2eb..4fd76334aab 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -291,7 +291,7 @@ src.beaker = B user.drop_item() B.loc = src - user << "You add the beaker to the machine!" + user << "You add the beaker to the machine." src.updateUsrDialog() icon_state = "mixer1" @@ -620,7 +620,7 @@ src.beaker = B user.drop_item() B.loc = src - user << "You add the beaker to the machine!" + user << "You add the beaker to the machine." src.updateUsrDialog() icon_state = "mixer1" @@ -1077,7 +1077,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) B.remove_from_storage(G, src) holdingitems += G if(holdingitems && holdingitems.len >= limit) //Sanity checking so the blender doesn't overfill - user << "You fill the All-In-One grinder to the brim." + user << "You fill the All-In-One grinder to the brim." break if(!O.contents.len) diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 3d75e5a227a..2a1909a15dd 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -25,7 +25,7 @@ return /obj/machinery/keycard_auth/attack_paw(mob/user as mob) - user << "You are too primitive to use this device." + user << "You are too primitive to use this device!" return /obj/machinery/keycard_auth/attackby(obj/item/weapon/W as obj, mob/user as mob, params) @@ -53,10 +53,10 @@ /obj/machinery/keycard_auth/attack_hand(mob/user as mob) if(user.stat || stat & (NOPOWER|BROKEN)) - user << "This device is not powered." + user << "This device is not powered!" return if(busy) - user << "This device is busy." + user << "This device is busy!" return user.set_machine(src) diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index ea9d253b54f..36a63154d1a 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -50,7 +50,7 @@ crystals += new /obj/item/bluespace_crystal/artificial(null) // starting crystals /obj/machinery/computer/telescience/attack_paw(mob/user) - user << "You are too primitive to use this computer." + user << "You are too primitive to use this computer!" return /obj/machinery/computer/telescience/attackby(obj/item/W, mob/user, params)