diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm index 0336c809511..7c720643fe8 100644 --- a/code/_onclick/click_override.dm +++ b/code/_onclick/click_override.dm @@ -27,10 +27,10 @@ /obj/item/badminBook/attack_self(mob/living/user as mob) if(user.middleClickOverride) - to_chat(user, "You try to draw power from the [src], but you cannot hold the power at this time!") + to_chat(user, "You try to draw power from [src], but you cannot hold the power at this time!") return user.middleClickOverride = clickBehavior - to_chat(user, "You draw a bit of power from the [src], you can use middle click or alt click to release the power!") + to_chat(user, "You draw a bit of power from [src], you can use middle click or alt click to release the power!") /datum/middleClickOverride/badminClicker var/summon_path = /obj/item/reagent_containers/food/snacks/cookie diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm index 9175fd677fb..32f2cd7e520 100644 --- a/code/datums/spells/lichdom.dm +++ b/code/datums/spells/lichdom.dm @@ -95,7 +95,7 @@ if((ABSTRACT in item.flags) || (NODROP in item.flags)) continue marked_item = item - to_chat(M, "You begin to focus your very being into the [item.name]...") + to_chat(M, "You begin to focus your very being into [item]...") break if(!marked_item) @@ -104,7 +104,7 @@ spawn(50) if(marked_item.loc != M) //I changed my mind I don't want to put my soul in a cheeseburger! - to_chat(M, "Your soul snaps back to your body as you drop the [marked_item.name]!") + to_chat(M, "Your soul snaps back to your body as you drop [marked_item]!") marked_item = null return name = "RISE!" diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm index bac924e8240..2e7d3d8278a 100644 --- a/code/datums/spells/summonitem.dm +++ b/code/datums/spells/summonitem.dm @@ -80,7 +80,7 @@ var/obj/item/organ/external/part = X if(item_to_retrieve in part.embedded_objects) part.embedded_objects -= item_to_retrieve - to_chat(C, "The [item_to_retrieve] that was embedded in your [part] has mysteriously vanished. How fortunate!") + to_chat(C, "\The [item_to_retrieve] that was embedded in your [part] has mysteriously vanished. How fortunate!") if(!C.has_embedded_objects()) C.clear_alert("embeddedobject") break @@ -99,7 +99,7 @@ if(!item_to_retrieve) return - item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly disappears!") + item_to_retrieve.loc.visible_message("\The [item_to_retrieve] suddenly disappears!") if(target.hand) //left active hand @@ -112,10 +112,10 @@ butterfingers = 1 if(butterfingers) item_to_retrieve.loc = target.loc - item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly appears!") + item_to_retrieve.loc.visible_message("\The [item_to_retrieve] suddenly appears!") playsound(get_turf(target),'sound/magic/summonitems_generic.ogg',50,1) else - item_to_retrieve.loc.visible_message("The [item_to_retrieve.name] suddenly appears in [target]'s hand!") + item_to_retrieve.loc.visible_message("\The [item_to_retrieve] suddenly appears in [target]'s hand!") playsound(get_turf(target),'sound/magic/summonitems_generic.ogg',50,1) if(message) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 11aa0cce55a..7e9b6c34634 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -150,16 +150,16 @@ if(usr.incapacitated() || usr.buckled) //are you cuffed, dying, lying, stunned or other return if(!ishuman(usr)) //Make sure they're a mob that has dna - to_chat(usr, "Try as you might, you can not climb up into the [src].") + to_chat(usr, "Try as you might, you can not climb up into [src].") return if(occupant) - to_chat(usr, "The [src] is already occupied!") + to_chat(usr, "[src] is already occupied!") return if(usr.abiotic()) to_chat(usr, "Subject cannot have abiotic items on.") return if(usr.has_buckled_mobs()) //mob attached to us - to_chat(usr, "[usr] will not fit into the [src] because [usr.p_they()] [usr.p_have()] a slime latched onto [usr.p_their()] head.") + to_chat(usr, "[usr] will not fit into [src] because [usr.p_they()] [usr.p_have()] a slime latched onto [usr.p_their()] head.") return usr.stop_pulling() usr.forceMove(src) @@ -188,7 +188,7 @@ if(!istype(user.loc, /turf) || !istype(O.loc, /turf)) // are you in a container/closet/pod/etc? return if(occupant) - to_chat(user, "The [src] is already occupied!") + to_chat(user, "[src] is already occupied!") return var/mob/living/L = O if(!istype(L) || L.buckled) @@ -200,9 +200,9 @@ to_chat(user, "[L] will not fit into [src] because [L.p_they()] [L.p_have()] a slime latched onto [L.p_their()] head.") return if(L == user) - visible_message("[user] climbs into the [src].") + visible_message("[user] climbs into [src].") else - visible_message("[user] puts [L.name] into the [src].") + visible_message("[user] puts [L.name] into [src].") put_in(L) if(user.pulling == L) user.stop_pulling() @@ -235,7 +235,7 @@ to_chat(user, "Subject cannot have abiotic items on.") return if(G.affecting.has_buckled_mobs()) //mob attached to us - to_chat(user, "will not fit into the [src] because [G.affecting.p_they()] [G.affecting.p_have()] a slime latched onto [G.affecting.p_their()] head.") + to_chat(user, "[G] will not fit into [src] because [G.affecting.p_they()] [G.affecting.p_have()] a slime latched onto [G.affecting.p_their()] head.") return if(panel_open) to_chat(usr, "Close the maintenance panel first.") diff --git a/code/game/gamemodes/changeling/powers/linglink.dm b/code/game/gamemodes/changeling/powers/linglink.dm index 30242968920..f245c711269 100644 --- a/code/game/gamemodes/changeling/powers/linglink.dm +++ b/code/game/gamemodes/changeling/powers/linglink.dm @@ -49,7 +49,7 @@ to_chat(user, "We stealthily stab [target] with a minor proboscis...") to_chat(target, "You experience a stabbing sensation and your ears begin to ring...") if(3) - to_chat(user, "You mold the [target]'s mind like clay, [target.p_they()] can now speak in the hivemind!") + to_chat(user, "You mold [target]'s mind like clay, [target.p_they()] can now speak in the hivemind!") to_chat(target, "A migraine throbs behind your eyes, you hear yourself screaming - but your mouth has not opened!") for(var/mob/M in GLOB.mob_list) if(GLOB.all_languages["Changeling"] in M.languages) diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 08f11e672a7..f0569db3909 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -38,7 +38,7 @@ /datum/action/changeling/weapon/sting_action(mob/user) if(!user.drop_item()) - to_chat(user, "The [user.get_active_hand()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!") + to_chat(user, "[user.get_active_hand()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!") return var/obj/item/W = new weapon_type(user, silent) user.put_in_hands(W) @@ -212,7 +212,7 @@ to_chat(loc, "You prepare to extend a tentacle.") /obj/item/gun/magic/tentacle/shoot_with_empty_chamber(mob/living/user as mob|obj) - to_chat(user, "The [name] is not ready yet.") + to_chat(user, "[src] is not ready yet.") /obj/item/gun/magic/tentacle/suicide_act(mob/user) user.visible_message("[user] coils [src] tightly around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide.") diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index d7354b87c5c..8cd86229ba6 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -30,7 +30,7 @@ if(target.has_buckled_mobs()) //mob attached to us to_chat(user, "[target] will not fit into [src] because [target.p_they()] [target.p_have()] a slime latched onto [target.p_their()] head.") return - visible_message("[user] puts [target] into the [src].") + visible_message("[user] puts [target] into [src].") target.forceMove(src) occupant = target @@ -187,12 +187,12 @@ if(isabductor(grabbed.affecting)) return if(occupant) - to_chat(user, "The [src] is already occupied!") + to_chat(user, "[src] is already occupied!") return if(grabbed.affecting.has_buckled_mobs()) //mob attached to us to_chat(user, "[grabbed.affecting] will not fit into [src] because [grabbed.affecting.p_they()] [grabbed.affecting.p_have()] a slime latched onto [grabbed.affecting.p_their()] head.") return - visible_message("[user] puts [grabbed.affecting] into the [src].") + visible_message("[user] puts [grabbed.affecting] into [src].") var/mob/living/carbon/human/H = grabbed.affecting H.forceMove(src) occupant = H diff --git a/code/game/gamemodes/miniantags/guardian/types/bomb.dm b/code/game/gamemodes/miniantags/guardian/types/bomb.dm index 67b99d91968..0a472e626f3 100644 --- a/code/game/gamemodes/miniantags/guardian/types/bomb.dm +++ b/code/game/gamemodes/miniantags/guardian/types/bomb.dm @@ -63,7 +63,7 @@ /obj/item/guardian_bomb/proc/detonate(mob/living/user) if(!istype(user)) return - to_chat(user, "The [src] was boobytrapped!") + to_chat(user, "[src] was boobytrapped!") if(istype(spawner, /mob/living/simple_animal/hostile/guardian)) var/mob/living/simple_animal/hostile/guardian/G = spawner if(user == G.summoner) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 3fb59002032..3b8649e26a5 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -400,12 +400,12 @@ GLOBAL_VAR(bomb_set) if(safety == 1) if(!is_syndicate) set_security_level(previous_level) - visible_message("The [src] quiets down.") + visible_message("[src] quiets down.") if(!lighthack) if(icon_state == "nuclearbomb2") icon_state = "nuclearbomb1" else - visible_message("The [src] emits a quiet whirling noise!") + visible_message("[src] emits a quiet whirling noise!") //==========DAT FUKKEN DISK=============== /obj/item/disk/nuclear diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 4d93a601e9d..3b491765919 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -513,7 +513,7 @@ target_apc.operating = 0 target_apc.update() target_apc.update_icon() - target_apc.visible_message("The [target_apc] flickers and begins to grow dark.") + target_apc.visible_message("[target_apc] flickers and begins to grow dark.") to_chat(user, "You dim the APC's screen and carefully begin siphoning its power into the void.") if(!do_after(user, 200, target=target_apc)) @@ -522,7 +522,7 @@ target_apc.operating = 1 target_apc.update() target_apc.update_icon() - target_apc.visible_message("The [target_apc] begins glowing brightly!") + target_apc.visible_message("[target_apc] begins glowing brightly!") else //We did it! to_chat(user, "You sent the APC's power to the void while overloading all it's lights!") diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index af83abba66b..937dc11f61c 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -57,7 +57,7 @@ new /obj/effect/particle_effect/smoke(H.loc) var/mob/living/carbon/human/M = new/mob/living/carbon/human(H.loc) M.key = C.key - to_chat(M, "You are the [H.real_name]'s apprentice! You are bound by magic contract to follow [H.p_their()] orders and help [H.p_them()] in accomplishing their goals.") + to_chat(M, "You are [H.real_name]'s apprentice! You are bound by magic contract to follow [H.p_their()] orders and help [H.p_them()] in accomplishing their goals.") switch(href_list["school"]) if("destruction") M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(null)) @@ -293,7 +293,7 @@ GLOBAL_LIST_EMPTY(multiverse) /obj/item/multisword/attack(mob/living/M as mob, mob/living/user as mob) //to prevent accidental friendly fire or out and out grief. if(M.real_name == user.real_name) - to_chat(user, "The [src] detects benevolent energies in your target and redirects your attack!") + to_chat(user, "[src] detects benevolent energies in your target and redirects your attack!") return ..() @@ -856,7 +856,7 @@ GLOBAL_LIST_EMPTY(multiverse) if(link) target = null link.loc = get_turf(src) - to_chat(user, "You remove the [link] from the doll.") + to_chat(user, "You remove [link] from the doll.") link = null update_targets() return diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index c22a26181ad..6d93e452d73 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -783,7 +783,7 @@ owner = user return if(user != owner) - to_chat(user, "The [name] does not recognize you as it's owner and refuses to open!") + to_chat(user, "[src] 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/PDApainter.dm b/code/game/machinery/PDApainter.dm index 332df41f086..b7aa437f9be 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -104,7 +104,7 @@ storedpda.desc = colorlist[P] else - to_chat(user, "The [src] is empty.") + to_chat(user, "[src] is empty.") /obj/machinery/pdapainter/verb/ejectpda() @@ -120,7 +120,7 @@ storedpda = null update_icon() else - to_chat(usr, "The [src] is empty.") + to_chat(usr, "[src] is empty.") /obj/machinery/pdapainter/power_change() diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm index 8a32c6d6374..d5a5a76d0d5 100644 --- a/code/game/machinery/camera/motion.dm +++ b/code/game/machinery/camera/motion.dm @@ -54,7 +54,7 @@ return FALSE if(status) SSalarm.triggerAlarm("Motion", get_area(src), list(UID()), src) - visible_message("A red light flashes on the [src]!") + visible_message("A red light flashes on [src]!") detectTime = -1 return TRUE diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 73ef22b3616..2177c15d596 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -234,7 +234,7 @@ if(!silent) var/obj/oldobj = obj - visible_message("The [oldobj.name] fades away!") + visible_message("[oldobj] fades away!") qdel(obj) /obj/machinery/computer/HolodeckControl/proc/checkInteg(area/A) @@ -505,12 +505,12 @@ return G.affecting.loc = src.loc G.affecting.Weaken(5) - visible_message("[G.assailant] dunks [G.affecting] into the [src]!") + visible_message("[G.assailant] dunks [G.affecting] into [src]!") qdel(W) return else if(istype(W, /obj/item) && get_dist(src,user)<2) user.drop_item(src) - visible_message("[user] dunks [W] into the [src]!") + visible_message("[user] dunks [W] into [src]!") return /obj/structure/holohoop/CanPass(atom/movable/mover, turf/target, height=0) diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index db28dd16dc6..287cca55b41 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -59,10 +59,7 @@ return TRUE if("toggle_bolts" in href_list) bolts = !bolts - if(bolts) - visible_message("You hear a quite click as the [src] bolts to the floor", "You hear a quite click") - else - visible_message("You hear a quite click as the [src]'s floor bolts raise", "You hear a quite click") + visible_message("You hear a quiet click as [src][bolts ? " bolts to the floor" : "'s bolts raise"].", "You begin to unfasten \the [src]...") diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 80a15be40d5..3abc12a169d 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -392,7 +392,7 @@ /obj/item/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I,/obj/item/card/id)||istype(I, /obj/item/pda)) if(allowed(user)) - user.visible_message("\the [user] waves [user.p_their()] ID past the [src]'s access protocol scanner.", "You swipe your ID past the [src]'s access protocol scanner.") + user.visible_message("[user] waves [user.p_their()] ID past [src]'s access protocol scanner.", "You swipe your ID past [src]'s access protocol scanner.") var/console_choice = input(user, "What do you want to configure the access to?", "Access Modification", "R&D Core") as null|anything in access_types if(console_choice == null) return diff --git a/code/game/machinery/defib_mount.dm b/code/game/machinery/defib_mount.dm index 79d02155832..5aac39d12dd 100644 --- a/code/game/machinery/defib_mount.dm +++ b/code/game/machinery/defib_mount.dm @@ -52,7 +52,7 @@ else . += "Its locking clamps can be [clamps_locked ? "dis" : ""]engaged by swiping an ID with access." else - . += "There are a pair of bolts in the defib unit housing securing the [src] to the wall." + . += "There are a pair of bolts in the defibrillator unit housing, securing [src] to the wall." /obj/machinery/defibrillator_mount/process() if(defib && defib.cell && defib.cell.charge < defib.cell.maxcharge && is_operational()) @@ -117,7 +117,7 @@ /obj/machinery/defibrillator_mount/wrench_act(mob/user, obj/item/I) . = TRUE if(defib) - to_chat(user, "The [defib] is blocking access to the bolts!") + to_chat(user, "[defib] is blocking access to the bolts!") return if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return diff --git a/code/game/machinery/dye_generator.dm b/code/game/machinery/dye_generator.dm index 920a111496e..32d59cf7485 100644 --- a/code/game/machinery/dye_generator.dm +++ b/code/game/machinery/dye_generator.dm @@ -43,7 +43,7 @@ if(istype(I, /obj/item/hair_dye_bottle)) var/obj/item/hair_dye_bottle/HD = I - user.visible_message("[user] fills the [HD] up with some dye.","You fill the [HD] up with some hair dye.") + user.visible_message("[user] fills [HD] up with some dye.","You fill [HD] up with some hair dye.") HD.dye_color = dye_color HD.update_dye_overlay() return @@ -52,7 +52,7 @@ //Hair Dye Bottle /obj/item/hair_dye_bottle - name = "Hair Dye Bottle" + name = "hair dye bottle" desc = "A refillable bottle used for holding hair dyes of all sorts of colors." icon = 'icons/obj/items.dmi' icon_state = "hairdyebottle" diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 71e919f10cc..da1d105f145 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -69,7 +69,7 @@ FIRE ALARM if(!emagged) emagged = TRUE if(user) - user.visible_message("Sparks fly out of the [src]!", + user.visible_message("Sparks fly out of [src]!", "You emag [src], disabling its thermal sensors.") playsound(loc, 'sound/effects/sparks4.ogg', 50, 1) diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index ab211939804..a8e2cecb1d1 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -21,7 +21,7 @@ return 1 if(istype(W, /obj/item/screwdriver)) - to_chat(user, "You begin to unscrew the bolts off the [src]...") + to_chat(user, "You begin to unscrew the bolts off [src]...") playsound(get_turf(src), W.usesound, 50, 1) if(do_after(user, 30 * W.toolspeed, target = src)) var/obj/machinery/mass_driver_frame/F = new(get_turf(src)) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 69166311caa..3c28c68a5e0 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -499,13 +499,11 @@ P.on_construction(dir, pipe_dir, color) user.visible_message( \ - "[user] fastens the [src].", \ - "You have fastened the [src].", \ - "You hear ratchet.") + "[user] fastens [src].", + "You fasten [src].", + "You hear a ratchet.") qdel(src) // remove the pipe item - return - /obj/item/pipe_meter name = "meter" desc = "A meter that can be laid on pipes" diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index f07e2e443e7..1836e149334 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -63,7 +63,7 @@ M.set_multitool_buffer(user, src) else linked_pad = M.buffer - to_chat(user, "You link the [src] to the one in the [I.name]'s buffer.") + to_chat(user, "You link [src] to the one in [I]'s buffer.") /obj/machinery/quantumpad/screwdriver_act(mob/user, obj/item/I) . = TRUE diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 99e0b45a90b..3234001ec2f 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -77,7 +77,7 @@ emergency_mode = FALSE update_icon() playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - to_chat(user, "You use the cryptographic sequencer on the [name].") + to_chat(user, "You use the cryptographic sequencer on [src].") /obj/machinery/recycler/update_icon() ..() diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 88bea6e8fe4..467e77cdaf5 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -126,7 +126,7 @@ return visible /obj/machinery/shieldgen - name = "Emergency shield projector" + name = "emergency shield projector" desc = "Used to seal minor hull breaches." icon = 'icons/obj/objects.dmi' icon_state = "shieldoff" @@ -253,7 +253,7 @@ health = max_health malfunction = TRUE playsound(loc, coil.usesound, 50, 1) - to_chat(user, "You repair the [src]!") + to_chat(user, "You repair [src]!") update_icon() else if(istype(I, /obj/item/card/id) || istype(I, /obj/item/pda)) @@ -409,7 +409,7 @@ active = 2 if(active >= 1) if(power == 0) - visible_message("The [name] shuts down due to lack of power!", \ + visible_message("[name] shuts down due to lack of power!", \ "You hear heavy droning fade out") icon_state = "Shield_Gen" active = 0 diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 9fe8c781c09..e3d58ed6aa5 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -315,7 +315,7 @@ if(store_item(I, user)) update_icon() SStgui.update_uis(src) - to_chat(user, "You load the [I] into the storage compartment.") + to_chat(user, "You load [I] into the storage compartment.") else to_chat(user, "You can't fit [I] into [src]!") return @@ -382,10 +382,10 @@ return var/mob/living/target = A if(!state_open) - to_chat(user, "The [src]'s doors are shut!") + to_chat(user, "[src]'s doors are shut!") return if(!is_operational()) - to_chat(user, "The [src] is not operational!") + to_chat(user, "[src] is not operational!") return if(occupant || helmet || suit || storage) to_chat(user, "It's too cluttered inside to fit in!") diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index ed196abc6dc..9294bb66804 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -540,7 +540,7 @@ to_chat(user, "You load [src] with [I].") I.loc = src else - to_chat(user, "The [I] wont fit! The [src] can only hold up to [max_beakers] containers.") + to_chat(user, "[I] won't fit! [src] can only hold up to [max_beakers] containers.") return else return ..() diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 9b7af34349f..3665934aced 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -56,7 +56,7 @@ return L.forceMove(src) locked = L - to_chat(user, "You insert the GPS device into the [src]'s slot.") + to_chat(user, "You insert the GPS device into [src]'s slot.") else return ..() diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 9f18c35c4b7..15a69318610 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -290,7 +290,7 @@ return I.forceMove(src) coin = I - to_chat(user, "You insert [I] into the [src]") + to_chat(user, "You insert [I] into [src].") SStgui.update_uis(src) return if(refill_canister && istype(I, refill_canister)) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index a5120327f4c..2c65b287ba9 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -309,7 +309,7 @@ crayon = null state = 1 if(5) - to_chat(user, "The [src] is busy.") + to_chat(user, "[src] is busy.") if(6) state = 7 if(7) diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 17d1b0b3a4f..d40e9302541 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -33,7 +33,7 @@ /obj/item/mecha_parts/mecha_equipment/Destroy()//missiles detonating, teleporter creating singularity? if(chassis) - chassis.occupant_message("The [src] is destroyed!") + chassis.occupant_message("[src] is destroyed!") chassis.log_append_to_last("[src] is destroyed.",1) if(istype(src, /obj/item/mecha_parts/mecha_equipment/weapon)) chassis.occupant << sound(chassis.weapdestrsound, volume = 50) diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 82f86db4a9f..be1f5783552 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -468,7 +468,7 @@ occupant_message("Syringe loaded.") update_equip_info() return 1 - occupant_message("The [src] syringe chamber is full.") + occupant_message("[src] syringe chamber is full.") return 0 /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/analyze_reagents(atom/A) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index abc349e906c..2c9682702f6 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -785,10 +785,10 @@ to_chat(user, "You close the hatch to the power unit") else // Since having maint protocols available is controllable by the MMI, I see this as a consensual way to remove an MMI without destroying the mech - user.visible_message("[user] begins levering out the MMI from the [src].", "You begin to lever out the MMI from the [src].") + user.visible_message("[user] begins levering out the MMI from [src].", "You begin to lever out the MMI from [src].") to_chat(occupant, "[user] is prying you out of the exosuit!") if(I.use_tool(src, user, 80, volume = I.tool_volume) && pilot_is_mmi()) - user.visible_message("[user] pries the MMI out of the [src]!", "You finish removing the MMI from the [src]!") + user.visible_message("[user] pries the MMI out of [src]!", "You finish removing the MMI from [src]!") go_out() /obj/mecha/screwdriver_act(mob/user, obj/item/I) @@ -1065,7 +1065,7 @@ return log_message("[user] tries to move in.") if(occupant) - to_chat(user, "The [src] is already occupied!") + to_chat(user, "[src] is already occupied!") log_append_to_last("Permission denied.") return var/passed diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 69ae7f6d77a..a0ac1d735bc 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -28,10 +28,10 @@ [fluffnotice]
" switch(get_area_type()) if(AREA_SPACE) - text += "

According to the [src.name], you are now in outer space. Hold your breath.

\ + text += "

According to [src], you are now in outer space. Hold your breath.

\

Mark this place as new area.

" if(AREA_SPECIAL) - text += "

This place is not noted on the [src.name].

" + text += "

This place is not noted on [src].

" return text @@ -57,7 +57,7 @@ . = ..() var/area/A = get_area() if(get_area_type() == AREA_STATION) - . += "

According to the [src], you are now in \"[sanitize(A.name)]\".

" + . += "

According to [src], you are now in \"[sanitize(A.name)]\".

" var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500) popup.set_content(.) popup.open() @@ -79,7 +79,7 @@ . = ..() var/area/A = get_area() if(get_area_type() == AREA_STATION) - . += "

According to the [src], you are now in \"[sanitize(A.name)]\".

" + . += "

According to [src], you are now in \"[sanitize(A.name)]\".

" var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500) popup.set_content(.) popup.open() @@ -106,7 +106,7 @@ . = ..() var/area/A = get_area() if(get_area_type() == AREA_STATION) - . += "

According to the [src], you are now in \"[sanitize(A.name)]\".

" + . += "

According to [src], you are now in \"[sanitize(A.name)]\".

" . += "

You may move an amendment to the drawing.

" if(!viewing) . += "

View structural data

" diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 5c4fc643d85..f5ea00a9d87 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -59,7 +59,7 @@ if(over_object == usr && (in_range(src, usr) || usr.contents.Find(src))) if(!ishuman(usr) || opened || length(contents)) return FALSE - visible_message("[usr] folds up the [name]") + visible_message("[usr] folds up [src].") new item_path(get_turf(src)) qdel(src) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 48e72a2cf9b..5bab3d47fde 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -40,7 +40,7 @@ /obj/item/candle/welder_act(mob/user, obj/item/I) . = TRUE if(I.tool_use_check(user, 0)) //Don't need to flash eyes because you are a badass - light("[user] casually lights the [name] with [I], what a badass.") + light("[user] casually lights [src] with [I], what a badass.") /obj/item/candle/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) if(!lit) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 73d0a2e376e..50ce47c4d58 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -237,23 +237,23 @@ //Spraycan stuff /obj/item/toy/crayon/spraycan - icon_state = "spraycan_cap" + name = "\improper Nanotrasen-brand Rapid Paint Applicator" desc = "A metallic container containing tasty paint." + icon_state = "spraycan_cap" var/capped = 1 instant = 1 validSurfaces = list(/turf/simulated/floor,/turf/simulated/wall) /obj/item/toy/crayon/spraycan/New() ..() - name = "Nanotrasen-brand Rapid Paint Applicator" update_icon() /obj/item/toy/crayon/spraycan/attack_self(mob/living/user as mob) var/choice = input(user,"Spraycan options") in list("Toggle Cap","Change Drawing","Change Color") switch(choice) if("Toggle Cap") - to_chat(user, "You [capped ? "Remove" : "Replace"] the cap of the [src]") - capped = capped ? 0 : 1 + to_chat(user, "You [capped ? "remove" : "replace"] the cap of [src].") + capped = !capped icon_state = "spraycan[capped ? "_cap" : ""]" update_icon() if("Change Drawing") diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index 181389800db..4564d5d6442 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -169,7 +169,7 @@ if(!S) to_chat(user, "You can't scan this body part.") return - M.visible_message("[user] scans the wounds on [M]'s [S] with [src]") + M.visible_message("[user] scans the wounds on [M]'s [S.name] with [src]") add_data(S) return 1 diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 3799d1d779e..aa637dc0332 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -26,19 +26,19 @@ return 0 return 1 -/obj/item/flash/attackby(obj/item/W, mob/user, params) +/obj/item/flash/attackby(obj/item/I, mob/user, params) if(can_overcharge) - if(istype(W, /obj/item/screwdriver)) + if(istype(I, /obj/item/screwdriver)) if(battery_panel) - to_chat(user, "You close the battery compartment on the [src].") + to_chat(user, "You close the battery compartment on [src].") battery_panel = 0 else - to_chat(user, "You open the battery compartment on the [src].") + to_chat(user, "You open the battery compartment on [src].") battery_panel = 1 if(battery_panel && !overcharged) - if(istype(W, /obj/item/stock_parts/cell)) - to_chat(user, "You jam the cell into battery compartment on the [src].") - qdel(W) + if(istype(I, /obj/item/stock_parts/cell)) + to_chat(user, "You jam [I] into the battery compartment on [src].") + qdel(I) overcharged = 1 overlays += "overcharge" @@ -51,7 +51,7 @@ /obj/item/flash/proc/burn_out() //Made so you can override it if you want to have an invincible flash from R&D or something. broken = 1 icon_state = "[initial(icon_state)]burnt" - visible_message("The [src.name] burns out!") + visible_message("[src] burns out!") /obj/item/flash/proc/flash_recharge(mob/user) @@ -119,15 +119,15 @@ add_attack_logs(user, M, "Flashed with [src]") if(M.flash_eyes(affect_silicon = 1)) M.Weaken(rand(5,10)) - user.visible_message("[user] overloads [M]'s sensors with the [src.name]!", "You overload [M]'s sensors with the [src.name]!") + user.visible_message("[user] overloads [M]'s sensors with [src]!", "You overload [M]'s sensors with [src]!") return 1 - user.visible_message("[user] fails to blind [M] with the [src.name]!", "You fail to blind [M] with the [src.name]!") + user.visible_message("[user] fails to blind [M] with [src]!", "You fail to blind [M] with [src]!") /obj/item/flash/attack_self(mob/living/carbon/user, flag = 0, emp = 0) if(!try_use_flash(user)) return 0 - user.visible_message("[user]'s [src.name] emits a blinding light!", "Your [src.name] emits a blinding light!") + user.visible_message("[user]'s [src] emits a blinding light!", "Your [src] emits a blinding light!") for(var/mob/living/carbon/M in oviewers(3, null)) flash_carbon(M, user, 3, 0) @@ -158,7 +158,7 @@ resisted = 1 if(resisted) - to_chat(user, "This mind seems resistant to the [name]!") + to_chat(user, "This mind seems resistant to [src]!") else to_chat(user, "They must be conscious before you can convert [M.p_them()]!") else diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index da8ad829b9b..d8ea4209cb1 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -52,13 +52,13 @@ user.drop_item() W.loc = src diode = W - to_chat(user, "You install a [diode.name] in [src].") + to_chat(user, "You install [diode] in [src].") else to_chat(user, "[src] already has a cell.") else if(istype(W, /obj/item/screwdriver)) if(diode) - to_chat(user, "You remove the [diode.name] from the [src].") + to_chat(user, "You remove [diode] from [src].") diode.loc = get_turf(src.loc) diode = null return diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index ceb52db9076..dc5a70ab468 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -50,10 +50,10 @@ /obj/item/pizza_bomb/proc/go_boom() if(disarmed) - visible_message("[bicon(src)] Sparks briefly jump out of the [correct_wire] wire on \the [src], but it's disarmed!") + visible_message("[bicon(src)] Sparks briefly jump out of the [correct_wire] wire on [src], but it's disarmed!") return atom_say("Enjoy the pizza!") - src.visible_message("\The [src] violently explodes!") + visible_message("[src] violently explodes!") explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb qdel(src) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 63c8e404b89..e6c7c40999c 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -305,7 +305,7 @@ if(ruined) return - to_chat(usr, "You erase the data from the [src]") + to_chat(usr, "You erase the data from [src].") clear() /obj/item/tape/proc/clear() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index ea9f7200177..820f95ee092 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -162,7 +162,7 @@ effective or pretty fucking useless. return ..() /obj/item/jammer/attack_self(mob/user) - to_chat(user,"You [active ? "deactivate" : "activate"] the [src].") + to_chat(user, "You [active ? "deactivate" : "activate"] [src].") active = !active if(active) GLOB.active_jammers |= src @@ -170,7 +170,7 @@ effective or pretty fucking useless. GLOB.active_jammers -= src /obj/item/teleporter - name = "Syndicate teleporter" + name = "\improper Syndicate teleporter" desc = "A strange syndicate version of a cult veil shifter. Warrenty voided if exposed to EMP." icon = 'icons/obj/device.dmi' icon_state = "syndi-tele" @@ -211,17 +211,17 @@ effective or pretty fucking useless. if(prob(50 / severity)) if(istype(loc, /mob/living/carbon/human)) var/mob/living/carbon/human/user = loc - to_chat(user, "The [src] buzzes and activates!") + to_chat(user, "[src] buzzes and activates!") attempt_teleport(user, TRUE) else - visible_message(" The [src] activates and blinks out of existence!") + visible_message("[src] activates and blinks out of existence!") do_sparks(2, 1, src) qdel(src) /obj/item/teleporter/proc/attempt_teleport(mob/user, EMP_D = FALSE) dir_correction(user) if(!charges) - to_chat(user, "The [src] is recharging still.") + to_chat(user, "[src] is still recharging.") return var/mob/living/carbon/C = user @@ -247,7 +247,7 @@ effective or pretty fucking useless. if(found_turf) if(user.loc != mobloc) // No locker / mech / sleeper teleporting, that breaks stuff - to_chat(C, "The [src] will not work here!") + to_chat(C, "[src] will not work here!") charges-- var/turf/destination = pick(turfs) if(tile_check(destination) || flawless) // Why is there so many bloody floor types @@ -264,7 +264,7 @@ effective or pretty fucking useless. else // Emp activated? Bag of holding? No saving throw for you get_fragged(user, destination) else - to_chat(C, "The [src] will not work here!") + to_chat(C, "[src] will not work here!") /obj/item/teleporter/proc/tile_check(turf/T) if(istype(T, /turf/simulated/floor) || istype(T, /turf/space)) @@ -345,7 +345,7 @@ effective or pretty fucking useless. M.apply_damage(20, BRUTE) M.Stun(3) M.Weaken(3) - to_chat(M, " [user] teleports into you, knocking you to the floor with the bluespace wave!") + to_chat(M, "[user] teleports into you, knocking you to the floor with the bluespace wave!") /obj/item/paper/teleporter name = "Teleporter Guide" diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 869fc1620cc..d52f38c79cd 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -59,7 +59,7 @@ user.remove_from_mob(A) attached_device = A A.forceMove(src) - to_chat(user, "You attach the [A] to the valve controls and secure it.") + to_chat(user, "You attach [A] to the valve controls and secure it.") A.holder = src A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb). if(istype(attached_device, /obj/item/assembly/prox_sensor)) diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index 0dda06d3e5c..fb7f913df3b 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -50,22 +50,22 @@ icon_state = initial(icon_state) /obj/item/flag/nt - name = "Nanotrasen flag" + name = "\improper Nanotrasen flag" desc = "A flag proudly boasting the logo of NT." icon_state = "ntflag" /obj/item/flag/clown - name = "Clown Planet flag" + name = "\improper Clown Planet flag" desc = "The banner of His Majesty, King Squiggles the Eighth." icon_state = "clownflag" /obj/item/flag/mime - name = "Mime Revolution flag" + name = "\improper Mime Revolution flag" desc = "The banner of the glorious revolutionary forces fighting the oppressors on Clown Planet." icon_state = "mimeflag" /obj/item/flag/ian - name = "Ian flag" + name = "\improper Ian flag" desc = "The banner of Ian, because SQUEEEEE." icon_state = "ianflag" @@ -73,128 +73,128 @@ //Species flags /obj/item/flag/species/slime - name = "Slime People flag" + name = "\improper Slime People flag" desc = "A flag proudly proclaiming the superior heritage of Slime People." icon_state = "slimeflag" /obj/item/flag/species/skrell - name = "Skrell flag" + name = "\improper Skrell flag" desc = "A flag proudly proclaiming the superior heritage of Skrell." icon_state = "skrellflag" /obj/item/flag/species/vox - name = "Vox flag" + name = "\improper Vox flag" desc = "A flag proudly proclaiming the superior heritage of Vox." icon_state = "voxflag" /obj/item/flag/species/machine - name = "Synthetics flag" + name = "\improper Synthetics flag" desc = "A flag proudly proclaiming the superior heritage of Synthetics." icon_state = "machineflag" /obj/item/flag/species/diona - name = "Diona flag" + name = "\improper Diona flag" desc = "A flag proudly proclaiming the superior heritage of Dionae." icon_state = "dionaflag" /obj/item/flag/species/human - name = "Human flag" + name = "\improper Human flag" desc = "A flag proudly proclaiming the superior heritage of Humans." icon_state = "humanflag" /obj/item/flag/species/greys - name = "Greys flag" + name = "\improper Greys flag" desc = "A flag proudly proclaiming the superior heritage of Greys." icon_state = "greysflag" /obj/item/flag/species/kidan - name = "Kidan flag" + name = "\improper Kidan flag" desc = "A flag proudly proclaiming the superior heritage of Kidan." icon_state = "kidanflag" /obj/item/flag/species/taj - name = "Tajaran flag" + name = "\improper Tajaran flag" desc = "A flag proudly proclaiming the superior heritage of Tajaran." icon_state = "tajflag" /obj/item/flag/species/unathi - name = "Unathi flag" + name = "\improper Unathi flag" desc = "A flag proudly proclaiming the superior heritage of Unathi." icon_state = "unathiflag" /obj/item/flag/species/vulp - name = "Vulpkanin flag" + name = "\improper Vulpkanin flag" desc = "A flag proudly proclaiming the superior heritage of Vulpkanin." icon_state = "vulpflag" /obj/item/flag/species/drask - name = "Drask flag" + name = "\improper Drask flag" desc = "A flag proudly proclaiming the superior heritage of Drask." icon_state = "draskflag" /obj/item/flag/species/plasma - name = "Plasmaman flag" + name = "\improper Plasmaman flag" desc = "A flag proudly proclaiming the superior heritage of Plasmamen." icon_state = "plasmaflag" //Department Flags /obj/item/flag/cargo - name = "Cargonia flag" + name = "\improper Cargonia flag" desc = "The flag of the independent, sovereign nation of Cargonia." icon_state = "cargoflag" /obj/item/flag/med - name = "Medistan flag" + name = "\improper Medistan flag" desc = "The flag of the independent, sovereign nation of Medistan." icon_state = "medflag" /obj/item/flag/sec - name = "Brigston flag" + name = "\improper Brigston flag" desc = "The flag of the independent, sovereign nation of Brigston." icon_state = "secflag" /obj/item/flag/rnd - name = "Scientopia flag" + name = "\improper Scientopia flag" desc = "The flag of the independent, sovereign nation of Scientopia." icon_state = "rndflag" /obj/item/flag/atmos - name = "Atmosia flag" + name = "\improper Atmosia flag" desc = "The flag of the independent, sovereign nation of Atmosia." icon_state = "atmosflag" /obj/item/flag/command - name = "Command flag" + name = "\improper Command flag" desc = "The flag of the independent, sovereign nation of Command." icon_state = "ntflag" //Antags /obj/item/flag/grey - name = "Greytide flag" + name = "\improper Greytide flag" desc = "A banner made from an old grey jumpsuit." icon_state = "greyflag" /obj/item/flag/syndi - name = "Syndicate flag" + name = "\improper Syndicate flag" desc = "A flag proudly boasting the logo of the Syndicate, in defiance of NT." icon_state = "syndiflag" /obj/item/flag/wiz - name = "Wizard Federation flag" + name = "\improper Wizard Federation flag" desc = "A flag proudly boasting the logo of the Wizard Federation, sworn enemies of NT." icon_state = "wizflag" /obj/item/flag/cult - name = "Nar'Sie Cultist flag" + name = "\improper Nar'Sie Cultist flag" desc = "A flag proudly boasting the logo of the cultists, sworn enemies of NT." icon_state = "cultflag" //Chameleon /obj/item/flag/chameleon - name = "Chameleon flag" + name = "chameleon flag" desc = "A poor recreation of the official NT flag. It seems to shimmer a little." icon_state = "ntflag" origin_tech = "syndicate=1;magnets=4" @@ -239,17 +239,17 @@ boobytrap = I trapper = user I.forceMove(src) - to_chat(user, "You hide [I] in the [src]. It will detonate some time after the flag is lit on fire.") + to_chat(user, "You hide [I] in [src]. It will detonate some time after the flag is lit on fire.") var/turf/bombturf = get_turf(src) var/area/A = get_area(bombturf) - log_game("[key_name(user)] has hidden [I] in the [src] ready for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).") - investigate_log("[key_name(user)] has hidden [I] in the [src] ready for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB) + log_game("[key_name(user)] has hidden [I] in [src] ready for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).") + investigate_log("[key_name(user)] has hidden [I] in [src] ready for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB) add_attack_logs(user, src, "has hidden [I] ready for detonation in", ATKLOG_MOST) else if(is_hot(I) && !(resistance_flags & ON_FIRE) && boobytrap && trapper) var/turf/bombturf = get_turf(src) var/area/A = get_area(bombturf) - log_game("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).") - investigate_log("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB) + log_game("[key_name_admin(user)] has lit [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).") + investigate_log("[key_name_admin(user)] has lit [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB) add_attack_logs(user, src, "has lit (booby trapped with [boobytrap]", ATKLOG_FEW) burn() else diff --git a/code/game/objects/items/mixing_bowl.dm b/code/game/objects/items/mixing_bowl.dm index 024274aa973..0e3aaba0c06 100644 --- a/code/game/objects/items/mixing_bowl.dm +++ b/code/game/objects/items/mixing_bowl.dm @@ -104,7 +104,7 @@ dat += {"[display_name]: [R.volume] unit\s
"} if(items_counts.len==0 && reagents.reagent_list.len==0) - dat = {"The [src] is empty
"} + dat = {"[src] is empty
"} else dat = {"Ingredients:
[dat]"} dat += {"

Eject ingredients!
"} diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm index b20a505212e..305d896a791 100644 --- a/code/game/objects/items/random_items.dm +++ b/code/game/objects/items/random_items.dm @@ -267,7 +267,7 @@ /mob/living/simple_animal/hostile/creature,/mob/living/simple_animal/hostile/pirate/ranged, /mob/living/simple_animal/hostile/hivebot,/mob/living/simple_animal/hostile/viscerator,/mob/living/simple_animal/hostile/pirate) - visible_message("Something falls out of the [src]!") + visible_message("Something falls out of [src]!") var/obj/item/grenade/clusterbuster/C = new(src.loc) C.prime() sleep(10) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index b8987dda5bb..c758e109e81 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -251,7 +251,7 @@ return if(M.brainmob.mind in SSticker.mode.head_revolutionaries) - to_chat(user, "The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the [M].") + to_chat(user, "The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept [M].") return diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 91ededd189c..9ed97abb045 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ to_chat(user, "There is not enough wire in this coil. You need 5 lengths.") return CC.use(5) - to_chat(user, "You attach wire to the [name].") + to_chat(user, "You attach wire to [src].") new /obj/item/stack/light_w(user.loc) use(1) else if( istype(W, /obj/item/stack/rods) ) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 6a2af11f0dc..7e331206016 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -198,7 +198,7 @@ return FALSE if(R.window_checks && !valid_window_location(usr.loc, usr.dir)) - to_chat(usr, "The [R.title] won't fit here!") + to_chat(usr, "\The [R.title] won't fit here!") return FALSE if(R.one_per_turf && (locate(R.result_type) in usr.drop_location())) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index a2d2aeac16d..9515c51a054 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -71,7 +71,7 @@ if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks/drinkingglass)) if(O.reagents) if(O.reagents.total_volume < 1) - to_chat(user, "The [O] is empty.") + to_chat(user, "[O] is empty.") else if(O.reagents.total_volume >= 1) if(O.reagents.has_reagent("facid", 1)) to_chat(user, "The acid chews through the balloon!") @@ -86,7 +86,7 @@ /obj/item/toy/balloon/throw_impact(atom/hit_atom) if(reagents.total_volume >= 1) - visible_message("The [src] bursts!","You hear a pop and a splash.") + visible_message("[src] bursts!","You hear a pop and a splash.") reagents.reaction(get_turf(hit_atom)) for(var/atom/A in get_turf(hit_atom)) reagents.reaction(A) @@ -256,7 +256,7 @@ ..() do_sparks(3, 1, src) new /obj/effect/decal/cleanable/ash(src.loc) - visible_message("The [name] explodes!","You hear a bang!") + visible_message("[src] explodes!","You hear a bang!") playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) @@ -970,7 +970,7 @@ /obj/item/toy/plushie/attack_self(mob/user as mob) var/cuddle_verb = pick("hugs","cuddles","snugs") - user.visible_message("[user] [cuddle_verb] the [src].") + user.visible_message("[user] [cuddle_verb] [src].") playsound(get_turf(src), poof_sound, 50, 1, -1) return ..() @@ -1253,7 +1253,7 @@ /obj/item/toy/owl/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = pick("You won't get away this time, Griffin!", "Stop right there, criminal!", "Hoot! Hoot!", "I am the night!") - to_chat(user, "You pull the string on the [src].") + to_chat(user, "You pull the string on [src].") playsound(user, 'sound/creatures/hoot.ogg', 25, 1) visible_message("[bicon(src)] [message]") cooldown = 1 @@ -1272,7 +1272,7 @@ /obj/item/toy/griffin/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = pick("You can't stop me, Owl!", "My plan is flawless! The vault is mine!", "Caaaawwww!", "You will never catch me!") - to_chat(user, "You pull the string on the [src].") + to_chat(user, "You pull the string on [src].") playsound(user, 'sound/creatures/caw.ogg', 25, 1) visible_message("[bicon(src)] [message]") cooldown = 1 @@ -1580,7 +1580,7 @@ /obj/item/toy/figure/attack_self(mob/user as mob) if(cooldown < world.time) cooldown = (world.time + 30) //3 second cooldown - user.visible_message("[bicon(src)] The [src] says \"[toysay]\".") + user.visible_message("[bicon(src)] [src] says \"[toysay]\".") playsound(user, 'sound/machines/click.ogg', 20, 1) /obj/item/toy/figure/cmo @@ -1804,7 +1804,7 @@ ////////////////////////////////////////////////////// /obj/item/toy/eight_ball - name = "Magic 8-Ball" + name = "\improper Magic 8-Ball" desc = "Mystical! Magical! Ages 8+!" icon = 'icons/obj/toy.dmi' icon_state = "eight-ball" @@ -1816,13 +1816,13 @@ if(!cooldown) var/answer = pick(possible_answers) user.visible_message("[user] focuses on [user.p_their()] question and [use_action]...") - user.visible_message("[bicon(src)] The [src] says \"[answer]\"") + user.visible_message("[bicon(src)] [src] says \"[answer]\"") spawn(30) cooldown = 0 return /obj/item/toy/eight_ball/conch - name = "Magic Conch Shell" + name = "\improper Magic Conch Shell" desc = "All hail the Magic Conch!" icon_state = "conch" use_action = "pulls the string" diff --git a/code/game/objects/items/weapons/RCL.dm b/code/game/objects/items/weapons/RCL.dm index 02827d3bcef..3a9d7507ae2 100644 --- a/code/game/objects/items/weapons/RCL.dm +++ b/code/game/objects/items/weapons/RCL.dm @@ -35,7 +35,7 @@ else return update_icon() - to_chat(user, "You add the cables to the [src]. It now contains [loaded.amount].") + to_chat(user, "You add the cables to [src]. It now contains [loaded.amount].") else ..() diff --git a/code/game/objects/items/weapons/caution.dm b/code/game/objects/items/weapons/caution.dm index b84f8eba6f4..96d39b367c0 100644 --- a/code/game/objects/items/weapons/caution.dm +++ b/code/game/objects/items/weapons/caution.dm @@ -49,7 +49,7 @@ if(istype(AM, /mob/living/carbon) && !istype(AM, /mob/living/carbon/brain)) var/mob/living/carbon/C = AM if(C.m_intent != MOVE_INTENT_WALK) - src.visible_message("The [src.name] beeps, \"Running on wet floors is hazardous to your health.\"") + src.visible_message("[src] beeps, \"Running on wet floors is hazardous to your health.\"") explosion(src.loc,-1,0,2) if(ishuman(C)) dead_legs(C) diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index e4433fdb270..42b2f957987 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -56,7 +56,7 @@ LIGHTERS ARE IN LIGHTERS.DM if(istype(M) && M.on_fire) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(M) - light("[user] coldly lights the [name] with the burning body of [M]. Clearly, [user.p_they()] offer[user.p_s()] the warmest of regards...") + light("[user] coldly lights [src] with the burning body of [M]. Clearly, [user.p_they()] offer[user.p_s()] the warmest of regards...") return TRUE else return ..() @@ -68,12 +68,12 @@ LIGHTERS ARE IN LIGHTERS.DM /obj/item/clothing/mask/cigarette/catch_fire() if(!lit) - light("The [name] is lit by the flames!") + light("[src] is lit by the flames!") /obj/item/clothing/mask/cigarette/welder_act(mob/user, obj/item/I) . = TRUE if(I.tool_use_check(user, 0)) //Don't need to flash eyes because you are a badass - light("[user] casually lights the [name] with [I], what a badass.") + light("[user] casually lights [src] with [I], what a badass.") /obj/item/clothing/mask/cigarette/attackby(obj/item/I, mob/user, params) ..() diff --git a/code/game/objects/items/weapons/courtroom.dm b/code/game/objects/items/weapons/courtroom.dm index 4a9e3c2b7cf..07bdaddbc52 100644 --- a/code/game/objects/items/weapons/courtroom.dm +++ b/code/game/objects/items/weapons/courtroom.dm @@ -14,7 +14,7 @@ resistance_flags = FLAMMABLE /obj/item/gavelhammer/suicide_act(mob/user) - user.visible_message("[user] has sentenced [user.p_them()]self to death with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] has sentenced [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide.") playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1) return BRUTELOSS diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index d7993768fec..2169a05d3f0 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -106,7 +106,7 @@ cell.update_icon() cell.loc = get_turf(loc) cell = null - to_chat(user, "You remove the cell from the [src].") + to_chat(user, "You remove the cell from [src].") update_icon() return diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 259ccad7ff6..5b2fc0c851b 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -31,7 +31,7 @@ A.master = src A.loc = src assemblyattacher = user.ckey - to_chat(user, "You add [A] to the [name].") + to_chat(user, "You add [A] to [src].") playsound(src, 'sound/weapons/tap.ogg', 20, 1) update_icon() return @@ -71,7 +71,7 @@ return if (istype(AM, /mob/living/carbon)) return - to_chat(user, "You start planting the [src]. The timer is set to [det_time]...") + to_chat(user, "You start planting [src]. The timer is set to [det_time]...") if(do_after(user, 50 * toolspeed, target = AM)) if(!user.unEquip(src)) @@ -90,7 +90,7 @@ /obj/item/grenade/plastic/suicide_act(mob/user) message_admins("[key_name_admin(user)]([ADMIN_QUE(user,"?")]) ([ADMIN_FLW(user,"FLW")]) suicided with [src.name] at ([user.x],[user.y],[user.z] - JMP)",0,1) log_game("[key_name(user)] suicided with [name] at ([user.x],[user.y],[user.z])") - user.visible_message("[user] activates the [name] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!") + user.visible_message("[user] activates [src] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!") var/message_say = "FOR NO RAISIN!" if(user.mind) if(user.mind.special_role) diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index e3c145e790b..46f563b4507 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -39,8 +39,8 @@ /obj/item/twohanded/garrote/wield(mob/living/carbon/user) if(strangling) - user.visible_message("[user] removes the [src] from [strangling]'s neck.", \ - "You remove the [src] from [strangling]'s neck.") + user.visible_message("[user] removes [src] from [strangling]'s neck.", + "You remove [src] from [strangling]'s neck.") strangling = null update_icon() @@ -103,8 +103,8 @@ playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1) - M.visible_message("[U] comes from behind and begins garroting [M] with the [src]!", \ - "[U] begins garroting you with the [src]![improvised ? "" : " You are unable to speak!"]", \ + M.visible_message("[U] comes from behind and begins garroting [M] with [src]!", \ + "[U] begins garroting you with [src]![improvised ? "" : " You are unable to speak!"]", \ "You hear struggling and wire strain against flesh!") return @@ -166,6 +166,6 @@ /obj/item/twohanded/garrote/suicide_act(mob/user) - user.visible_message("[user] is wrapping the [src] around [user.p_their()] neck and pulling the handles! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is wrapping [src] around [user.p_their()] neck and pulling the handles! It looks like [user.p_theyre()] trying to commit suicide.") playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1) return OXYLOSS diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 570cc603155..7d2eb0b41cd 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -104,7 +104,7 @@ log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]) [contained].") investigate_log("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])[contained].", INVESTIGATE_BOMB) add_attack_logs(user, src, "has primed (contained [contained])", ATKLOG_FEW) - to_chat(user, "You prime the [name]! [det_time / 10] second\s!") + to_chat(user, "You prime [src]! [det_time / 10] second\s!") playsound(user.loc, 'sound/weapons/armbomb.ogg', 60, 1) active = 1 update_icon() diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index c2303dd2937..1a7f4f07c02 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -40,7 +40,7 @@ /obj/item/grenade/iedcasing/attack_self(mob/user) // if(!active) if(clown_check(user)) - to_chat(user, "You light the [name]!") + to_chat(user, "You light [src]!") active = TRUE overlays -= "improvised_grenade_filled" icon_state = initial(icon_state) + "_active" diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 288c098a38b..a3bcb841476 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -64,7 +64,7 @@ /obj/item/grenade/attack_self(mob/user as mob) if(!active) if(clown_check(user)) - to_chat(user, "You prime the [name]! [det_time/10] seconds!") + to_chat(user, "You prime [src]! [det_time/10] seconds!") active = 1 icon_state = initial(icon_state) + "_active" add_fingerprint(user) @@ -94,16 +94,16 @@ switch(det_time) if("1") det_time = 10 - to_chat(user, "You set the [name] for 1 second detonation time.") + to_chat(user, "You set [src] for 1 second detonation time.") if("10") det_time = 30 - to_chat(user, "You set the [name] for 3 second detonation time.") + to_chat(user, "You set [src] for 3 second detonation time.") if("30") det_time = 50 - to_chat(user, "You set the [name] for 5 second detonation time.") + to_chat(user, "You set [src] for 5 second detonation time.") if("50") det_time = 1 - to_chat(user, "You set the [name] for instant detonation.") + to_chat(user, "You set [src] for instant detonation.") add_fingerprint(user) ..() diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 00a72f3401b..88c3e58629e 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -96,10 +96,10 @@ /obj/machinery/implantchair/proc/put_mob(mob/living/carbon/M) if(!iscarbon(M)) - to_chat(usr, "The [src.name] cannot hold this!") + to_chat(usr, "[src] cannot hold this!") return if(src.occupant) - to_chat(usr, "The [src.name] is already occupied!") + to_chat(usr, "[src] is already occupied!") return M.stop_pulling() M.forceMove(src) @@ -110,18 +110,19 @@ /obj/machinery/implantchair/proc/implant(mob/M) - if(!istype(M, /mob/living/carbon)) + if(!iscarbon(M)) + return + if(!length(implant_list)) return - if(!implant_list.len) return for(var/obj/item/implant/mindshield/imp in implant_list) - if(!imp) continue + if(!imp) + continue if(istype(imp, /obj/item/implant/mindshield)) - M.visible_message("[M] has been implanted by the [src.name].") + visible_message("[src] implants [M].") if(imp.implant(M)) implant_list -= imp break - return /obj/machinery/implantchair/proc/add_implants() diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index a9fa08b9271..0cf57c7b7a4 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -118,9 +118,9 @@ var/bayonet = FALSE //Can this be attached to a gun? /obj/item/kitchen/knife/suicide_act(mob/user) - user.visible_message(pick("[user] is slitting [user.p_their()] wrists with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.", \ - "[user] is slitting [user.p_their()] throat with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.", \ - "[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku.")) + user.visible_message(pick("[user] is slitting [user.p_their()] wrists with [src]! It looks like [user.p_theyre()] trying to commit suicide.", \ + "[user] is slitting [user.p_their()] throat with [src]! It looks like [user.p_theyre()] trying to commit suicide.", \ + "[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku.")) return BRUTELOSS /obj/item/kitchen/knife/plastic diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index 4902665da4a..56b9c61b35c 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -33,7 +33,7 @@ return ..() /obj/item/restraints/legcuffs/beartrap/suicide_act(mob/user) - user.visible_message("[user] is sticking [user.p_their()] head in the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is sticking [user.p_their()] head in [src]! It looks like [user.p_theyre()] trying to commit suicide.") playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return BRUTELOSS @@ -72,18 +72,18 @@ return user.drop_item() I.forceMove(src) - to_chat(user, "You sneak the [sig] underneath the pressure plate and connect the trigger wire.") + to_chat(user, "You sneak [sig] underneath the pressure plate and connect the trigger wire.") desc = "A trap used to catch bears and other legged creatures. There is a remote signaler hooked up to it." if(istype(I, /obj/item/screwdriver)) if(IED) IED.forceMove(get_turf(src)) IED = null - to_chat(user, "You remove the IED from the [src].") + to_chat(user, "You remove the IED from [src].") return if(sig) sig.forceMove(get_turf(src)) sig = null - to_chat(user, "You remove the signaler from the [src].") + to_chat(user, "You remove the signaler from [src].") return ..() diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index 1bfeeabae03..713988c0a01 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -82,9 +82,9 @@ cig.attackby(src, user) else if(istype(src, /obj/item/lighter/zippo)) - cig.light("[user] whips the [name] out and holds it for [M]. [user.p_their(TRUE)] arm is as steady as the unflickering flame [user.p_they()] light[user.p_s()] \the [cig] with.") + cig.light("[user] whips [src] out and holds it for [M]. [user.p_their(TRUE)] arm is as steady as the unflickering flame [user.p_they()] light[user.p_s()] \the [cig] with.") else - cig.light("[user] holds the [name] out for [M], and lights the [cig.name].") + cig.light("[user] holds [src] out for [M], and lights [cig].") M.update_inv_wear_mask() else ..() diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index b1903ea8eda..3cc7c989ebf 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -33,8 +33,8 @@ force -= faction_bonus_force /obj/item/melee/energy/suicide_act(mob/user) - user.visible_message(pick("[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku.", \ - "[user] is falling on the [name]! It looks like [user.p_theyre()] trying to commit suicide.")) + user.visible_message(pick("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku.", \ + "[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide.")) return BRUTELOSS|FIRELOSS /obj/item/melee/energy/attack_self(mob/living/carbon/user) @@ -100,7 +100,7 @@ light_color = LIGHT_COLOR_WHITE /obj/item/melee/energy/axe/suicide_act(mob/user) - user.visible_message("[user] swings the [name] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] swings [src] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide.") return BRUTELOSS|FIRELOSS /obj/item/melee/energy/sword diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index fbc8c1031bd..b3642eff146 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -24,7 +24,7 @@ /obj/item/melee/chainofcommand/suicide_act(mob/user) - to_chat(viewers(user), "[user] is strangling [user.p_them()]self with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.") + to_chat(viewers(user), "[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.") return OXYLOSS /obj/item/melee/rapier @@ -97,7 +97,7 @@ if(proximity_flag) if(is_type_in_typecache(target, strong_against)) new /obj/effect/decal/cleanable/insectguts(target.drop_location()) - to_chat(user, "You easily splat the [target].") + to_chat(user, "You easily splat [target].") if(istype(target, /mob/living/)) var/mob/living/bug = target bug.death(1) diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm index bb499d96753..a39d1a2d987 100644 --- a/code/game/objects/items/weapons/rpd.dm +++ b/code/game/objects/items/weapons/rpd.dm @@ -274,7 +274,7 @@ for(var/obj/O in T) if(O.rpd_blocksusage() == TRUE) - to_chat(user, "[O] blocks the [src]!") + to_chat(user, "[O] blocks [src]!") return // If we get here, then we're effectively acting on the turf, probably placing a pipe. diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm index fbe7e9b370e..567f67b4106 100644 --- a/code/game/objects/items/weapons/soap.dm +++ b/code/game/objects/items/weapons/soap.dm @@ -25,7 +25,7 @@ else if(target == user && user.a_intent == INTENT_GRAB && ishuman(target)) var/mob/living/carbon/human/muncher = user if(muncher && isdrask(muncher)) - to_chat(user, "You take a bite of the [name]. Delicious!") + to_chat(user, "You take a bite of [src]. Delicious!") playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0) user.adjust_nutrition(2) else if(istype(target, /obj/effect/decal/cleanable) || istype(target, /obj/effect/rune)) diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index f93f7220c75..c89fd8aeb0d 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -41,7 +41,7 @@ cant_hold = list(/obj/item/disk/nuclear) /obj/item/storage/bag/trash/suicide_act(mob/user) - user.visible_message("[user] puts the [name] over [user.p_their()] head and starts chomping at the insides! Disgusting!") + user.visible_message("[user] puts [src] over [user.p_their()] head and starts chomping at the insides! Disgusting!") playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1) return TOXLOSS diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 384dc250901..9200a58d65a 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -84,7 +84,7 @@ return if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) - to_chat(user, "The [src] slips out of your hand and hits your head.") + to_chat(user, "[src] slips out of your hand and hits your head.") user.take_organ_damage(10) user.Paralyse(20) return diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 952da94ff73..f3801b5aa6d 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -52,16 +52,16 @@ to_chat(user, "There's already something in the false bottom!") return if(I.w_class > WEIGHT_CLASS_NORMAL) - to_chat(user, "The [I] is too big to fit in the false bottom!") + to_chat(user, "[I] is too big to fit in the false bottom!") return if(!user.drop_item(I)) - to_chat(user, "The [I] is stuck to your hands!") + to_chat(user, "[I] is stuck to your hands!") return stored_item = I max_w_class = WEIGHT_CLASS_NORMAL - stored_item.w_class I.forceMove(null) //null space here we go - to stop it showing up in the briefcase - to_chat(user, "You place the [I] into the false bottom of the briefcase.") + to_chat(user, "You place [I] into the false bottom of the briefcase.") else return ..() @@ -72,7 +72,7 @@ if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return if(!bottom_open) - to_chat(user, "You begin to hunt around the rim of the [src]...") + to_chat(user, "You begin to hunt around the rim of [src]...") busy_hunting = TRUE if(do_after(user, 20, target = src)) if(user) @@ -80,13 +80,13 @@ bottom_open = TRUE busy_hunting = FALSE else - to_chat(user, "You push the false bottom down and close it with a click[stored_item ? ", with the [stored_item] snugly inside." : "."]") + to_chat(user, "You push the false bottom down and close it with a click[stored_item ? ", with [stored_item] snugly inside." : "."]") bottom_open = FALSE /obj/item/storage/briefcase/false_bottomed/attack_hand(mob/user) if(bottom_open && stored_item) user.put_in_hands(stored_item) - to_chat(user, "You pull out the [stored_item] from the [src]'s false bottom.") + to_chat(user, "You pull out [stored_item] from [src]'s false bottom.") stored_item = null max_w_class = initial(max_w_class) else diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index a7ac1d632c7..8fbdaa0e702 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -81,14 +81,14 @@ user.update_inv_r_hand() user.update_inv_l_hand() if(isrobot(user)) - to_chat(user, "You dedicate your module to [name].") + to_chat(user, "You dedicate your module to [src].") else - to_chat(user, "You grab the [name] with both hands.") + to_chat(user, "You grab [src] with both hands.") if(wieldsound) playsound(loc, wieldsound, 50, 1) var/obj/item/twohanded/offhand/O = new(user) ////Let's reserve his other hand~ O.name = "[name] - offhand" - O.desc = "Your second grip on the [name]" + O.desc = "Your second grip on [src]" user.put_in_inactive_hand(O) return TRUE @@ -306,7 +306,7 @@ return ..() if(HAS_TRAIT(user, TRAIT_CLUMSY) && (wielded) && prob(40)) - to_chat(user, "You twirl around a bit before losing your balance and impaling yourself on the [src].") + to_chat(user, "You twirl around a bit before losing your balance and impaling yourself on [src].") user.take_organ_damage(20, 25) return if((wielded) && prob(50)) @@ -717,9 +717,9 @@ /obj/item/twohanded/mjollnir/proc/shock(mob/living/target) do_sparks(5, 1, target.loc) - target.visible_message("[target.name] was shocked by the [name]!", \ - "You feel a powerful shock course through your body sending you flying!", \ - "You hear a heavy electrical crack!") + target.visible_message("[target] was shocked by [src]!", + "You feel a powerful shock course through your body sending you flying!", + "You hear a heavy electrical crack!") var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src))) target.throw_at(throw_target, 200, 4) @@ -783,15 +783,15 @@ if(isliving(A)) var/mob/living/Z = A if(Z.health >= 1) - Z.visible_message("[Z.name] was sent flying by a blow from the [name]!", \ - "You feel a powerful blow connect with your body and send you flying!", \ + Z.visible_message("[Z.name] was sent flying by a blow from [src]!", + "You feel a powerful blow connect with your body and send you flying!", "You hear something heavy impact flesh!.") var/atom/throw_target = get_edge_target_turf(Z, get_dir(src, get_step_away(Z, src))) Z.throw_at(throw_target, 200, 4) playsound(user, 'sound/weapons/marauder.ogg', 50, 1) else if(wielded && Z.health < 1) - Z.visible_message("[Z.name] was blown to pieces by the power of [name]!", \ - "You feel a powerful blow rip you apart!", \ + Z.visible_message("[Z.name] was blown to pieces by the power of [src]!", + "You feel a powerful blow rip you apart!", "You hear a heavy impact and the sound of ripping flesh!.") Z.gib() playsound(user, 'sound/weapons/marauder.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 3a4278d05ed..48b0d4b883f 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -17,7 +17,7 @@ resistance_flags = FIRE_PROOF /obj/item/banhammer/suicide_act(mob/user) - to_chat(viewers(user), "[user] is hitting [user.p_them()]self with the [src.name]! It looks like [user.p_theyre()] trying to ban [user.p_them()]self from life.") + visible_message("[user] is hitting [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to ban [user.p_them()]self from life.") return BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS /obj/item/banhammer/attack(mob/M, mob/user) @@ -61,7 +61,7 @@ resistance_flags = FIRE_PROOF /obj/item/claymore/suicide_act(mob/user) - user.visible_message("[user] is falling on the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide.") return BRUTELOSS /obj/item/claymore/ceremonial @@ -203,7 +203,7 @@ if(I.w_class <= WEIGHT_CLASS_NORMAL || istype(I, /obj/item/beach_ball)) // baseball bat deflecting if(deflectmode) if(prob(10)) - visible_message("[owner] Deflects [I] directly back at the thrower! It's a home run!", "You deflect the [I] directly back at the thrower! It's a home run!") + visible_message("[owner] Deflects [I] directly back at the thrower! It's a home run!", "You deflect [I] directly back at the thrower! It's a home run!") playsound(get_turf(owner), 'sound/weapons/homerun.ogg', 100, 1) do_attack_animation(I, ATTACK_EFFECT_DISARM) I.throw_at(I.thrownby, 20, 20, owner) @@ -220,7 +220,7 @@ lastdeflect = world.time + 3000 return FALSE else - visible_message("[owner] swings and deflects [I]!", "You swing and deflect the [I]!") + visible_message("[owner] swings and deflects [I]!", "You swing and deflect [I]!") playsound(get_turf(owner), 'sound/weapons/baseball_hit.ogg', 50, 1, -1) do_attack_animation(I, ATTACK_EFFECT_DISARM) I.throw_at(get_edge_target_turf(owner, pick(GLOB.cardinal)), rand(8,10), 14, owner) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 6fe17b0eeff..8a979bd18a7 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -327,7 +327,7 @@ //okay, so the closet is either welded or locked... resist!!! to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") for(var/mob/O in viewers(usr.loc)) - O.show_message("The [src] begins to shake violently!", 1) + O.show_message("[src] begins to shake violently!", 1) spawn(0) diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index ed16e8d338e..91a335ed918 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -102,7 +102,7 @@ if(localopened) if(fireaxe) user.put_in_hands(fireaxe) - to_chat(user, "You take \the [fireaxe] from the [src].") + to_chat(user, "You take \the [fireaxe] from [src].") fireaxe = null add_fingerprint(user) @@ -157,12 +157,12 @@ if(localopened) if(fireaxe) usr.put_in_hands(fireaxe) - to_chat(usr, "You take \the [fireaxe] from the [src].") + to_chat(usr, "You take \the [fireaxe] from [src].") fireaxe = null else - to_chat(usr, "The [src] is empty.") + to_chat(usr, "[src] is empty.") else - to_chat(usr, "The [src] is closed.") + to_chat(usr, "[src] is closed.") update_icon() /obj/structure/closet/fireaxecabinet/attack_ai(mob/user as mob) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm index 18cdb50d685..eaed06a2c29 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm @@ -32,13 +32,13 @@ /obj/structure/closet/secure_closet/syndicate/depot/attack_animal(mob/M) if(isanimal(M) && ("syndicate" in M.faction)) - to_chat(M, "The [src] resists your attack!") + to_chat(M, "[src] resists your attack!") return return ..() /obj/structure/closet/secure_closet/syndicate/depot/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/rcs)) - to_chat(user, "Bluespace interference prevents the [W] from locking onto [src]!") + to_chat(user, "Bluespace interference prevents [W] from locking onto [src]!") return return ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 5b2f0a54f24..8bf44346e72 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -125,7 +125,7 @@ //okay, so the closet is either welded or locked... resist!!! to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") for(var/mob/O in viewers(src)) - O.show_message("The [src] begins to shake violently!", 1) + O.show_message("[src] begins to shake violently!", 1) spawn(0) diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm index 29ba8882bd7..992b874154d 100644 --- a/code/game/objects/structures/depot.dm +++ b/code/game/objects/structures/depot.dm @@ -50,7 +50,7 @@ . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return - to_chat(user, "The [src] is too well secured to the floor.") + to_chat(user, "[src] is too well secured to the floor.") /obj/structure/fusionreactor/proc/overload(containment_failure = FALSE, skip_qdel = FALSE) if(has_overloaded) diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 02cad716d3d..161f507158c 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -226,7 +226,7 @@ return if(mineral) var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]") - visible_message("[user] welds the [mineral] plating off [src].",\ + user.visible_message("[user] welds the [mineral] plating off [src].",\ "You start to weld the [mineral] plating off [src]...",\ "You hear welding.") if(!I.use_tool(src, user, 40, volume = I.tool_volume)) @@ -236,7 +236,7 @@ var/obj/structure/door_assembly/PA = new previous_assembly(loc) transfer_assembly_vars(src, PA) else if(glass) - visible_message("[user] welds the glass panel out of [src].",\ + user.visible_message("[user] welds the glass panel out of [src].",\ "You start to weld the glass panel out of the [src]...",\ "You hear welding.") if(!I.use_tool(src, user, 40, volume = I.tool_volume)) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index f239194f911..b3bc69cbaea 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -184,7 +184,7 @@ W.update_nearby_icons() W.state = WINDOW_OUT_OF_FRAME S.use(2) - to_chat(user, "You place the [W] on [src].") + to_chat(user, "You place [W] on [src].") /obj/structure/grille/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index 9184d739a5f..be3fe496bc5 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -216,7 +216,7 @@ /obj/structure/guillotine/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE) if(!anchored) - to_chat(usr, "The [src] needs to be wrenched to the floor!") + to_chat(usr, "[src] needs to be wrenched to the floor!") return FALSE if(!ishuman(M)) diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index 647f0a53c6e..7ee9097aac5 100644 --- a/code/game/objects/structures/spirit_board.dm +++ b/code/game/objects/structures/spirit_board.dm @@ -74,7 +74,7 @@ users_in_range++ if(users_in_range < 2) - to_chat(M, "There aren't enough people to use the [src.name]!") + to_chat(M, "There aren't enough people to use [src]!") return 0 return 1 diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index bb53368ee4b..131351aaa2f 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -79,7 +79,7 @@ if(ismob(G.affecting) && G.state >= GRAB_AGGRESSIVE) var/mob/GM = G.affecting for(var/obj/structure/transit_tube_pod/pod in loc) - pod.visible_message("[user] starts putting [GM] into the [pod]!") + pod.visible_message("[user] starts putting [GM] into [pod]!") if(do_after(user, 30, target = GM) && GM && G && G.affecting == GM) GM.Weaken(5) Bumped(GM) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 0643db75416..1e260cf9e92 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -410,7 +410,7 @@ if(!valid_window_location(loc, target_dir)) target_dir = turn(dir, 90) if(!valid_window_location(loc, target_dir)) - to_chat(user, "There is no room to rotate the [src]") + to_chat(user, "There is no room to rotate [src].") return FALSE setDir(target_dir) diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm index 7c1464b92a4..1b5539e001a 100644 --- a/code/game/turfs/simulated/floor/chasm.dm +++ b/code/game/turfs/simulated/floor/chasm.dm @@ -178,7 +178,7 @@ qdel(AM) if(AM && !QDELETED(AM)) //It's indestructible - visible_message("[src] spits out the [AM]!") + visible_message("[src] spits out [AM]!") AM.alpha = oldalpha AM.color = oldcolor AM.transform = oldtransform diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm index a0a7c43a7a9..2517e91848b 100644 --- a/code/modules/assembly/health.dm +++ b/code/modules/assembly/health.dm @@ -72,7 +72,7 @@ /obj/item/assembly/health/interact(mob/user)//TODO: Change this to the wires thingy if(!secured) - user.show_message("The [name] is unsecured!") + user.show_message("[src] is unsecured!") return FALSE var/dat = text("Health Sensor [scanning?"On":"Off"]") if(scanning && health_scan) diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index ced9fbca932..9568543e912 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -97,7 +97,7 @@ /obj/item/assembly/prox_sensor/interact(mob/user)//TODO: Change this to the wires thingy if(!secured) - user.show_message("The [name] is unsecured!") + user.show_message("[src] is unsecured!") return FALSE var/second = time % 60 var/minute = (time - second) / 60 diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 67be53979d8..11907e84d78 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -64,7 +64,7 @@ /obj/item/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires if(!secured) - user.show_message("The [name] is unsecured!") + user.show_message("[src] is unsecured!") return FALSE var/second = time % 60 var/minute = (time - second) / 60 diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index bfeaaa5c374..c314850e549 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -936,7 +936,7 @@ if(!emagged) emagged = TRUE if(user) - user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its safeties.") + user.visible_message("Sparks fly out of \the [src]!", "You emag \the [src], disabling its safeties.") playsound(src.loc, 'sound/effects/sparks4.ogg', 50, TRUE) return diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index d943da48997..2377deca844 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -129,13 +129,10 @@ /obj/effect/meatgrinder name = "Meat Grinder" desc = "What is that thing?" - density = 1 - anchored = 1 - layer = 3 + density = TRUE icon = 'icons/mob/blob.dmi' icon_state = "blobpod" - var/triggerproc = "triggerrad1" //name of the proc thats called when the mine is triggered - var/triggered = 0 + var/triggered = FALSE /obj/effect/meatgrinder/Crossed(AM as mob|obj, oldloc) Bumped(AM) @@ -145,10 +142,9 @@ if(triggered) return if(istype(M, /mob/living/carbon/human)) - for(var/mob/O in viewers(world.view, src.loc)) - to_chat(O, "[M] triggered the [bicon(src)] [src]") - triggered = 1 - call(src,triggerproc)(M) + visible_message("[M] triggers [src]!") + triggered = TRUE + triggerrad1(M) /obj/effect/meatgrinder/proc/triggerrad1(mob) for(var/mob/O in viewers(world.view, src.loc)) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 9baf6c46079..42797896e23 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -457,10 +457,10 @@ BLIND // can't see anything if(istype(I, /obj/item/match) && src.loc == user) var/obj/item/match/M = I if(M.matchignite()) // Match isn't lit, but isn't burnt. - user.visible_message("[user] strikes a [M] on the bottom of [src], lighting it.","You strike the [M] on the bottom of [src] to light it.") + user.visible_message("[user] strikes a [M] on the bottom of [src], lighting it.","You strike [M] on the bottom of [src] to light it.") playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, 1) else - user.visible_message("[user] crushes the [M] into the bottom of [src], extinguishing it.","You crush the [M] into the bottom of [src], extinguishing it.") + user.visible_message("[user] crushes [M] into the bottom of [src], extinguishing it.","You crush [M] into the bottom of [src], extinguishing it.") M.dropped() return diff --git a/code/modules/clothing/gloves/rings.dm b/code/modules/clothing/gloves/rings.dm index 29e5af2121a..acae9edbea9 100644 --- a/code/modules/clothing/gloves/rings.dm +++ b/code/modules/clothing/gloves/rings.dm @@ -29,13 +29,13 @@ if(istype(I, /obj/item/stack/sheet/mineral/diamond)) var/obj/item/stack/sheet/mineral/diamond/D = I if(stud) - to_chat(usr, "The [src] already has a gem.") + to_chat(usr, "[src] already has a gem.") else if(D.amount >= 1) D.use(1) stud = 1 update_icon() - to_chat(usr, "You socket the diamond into the [src].") + to_chat(usr, "You socket the diamond into [src].") // s'pensive /obj/item/clothing/gloves/ring/silver diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 8514c038a58..e663856e3c5 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -129,7 +129,7 @@ /obj/item/clothing/mask/muzzle/safety/shock name = "shock muzzle" - desc = "A muzzle designed to prevent biting. This one is fitted with a behavior correction system." + desc = "A muzzle designed to prevent biting. This one is fitted with a behavior correction system." var/obj/item/assembly/trigger = null origin_tech = "materials=1;engineering=1" materials = list(MAT_METAL=500, MAT_GLASS=50) @@ -147,7 +147,7 @@ trigger.master = src trigger.holder = src AddComponent(/datum/component/proximity_monitor) - to_chat(user, "You attach the [W] to [src].") + to_chat(user, "You attach [W] to [src].") return TRUE else if(istype(W, /obj/item/assembly)) to_chat(user, "That won't fit in [src]. Perhaps a signaler or voice analyzer would?") diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index 51d06aec017..e546d67f485 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -213,21 +213,20 @@ return var/mob/living/carbon/human/H = user if(H.shoes != src) - to_chat(user, "You will have to put on the [src] before you can do that.") + to_chat(user, "The [src] blocks the [attack_text], sending out jets of flame!") + owner.visible_message("[src] blocks [attack_text], sending out jets of flame!") for(var/mob/living/carbon/C in range(6, owner)) if(C != owner) C.fire_stacks += 8 @@ -405,7 +405,7 @@ if(!active) return FALSE if(reaction_check(hitby)) - owner.visible_message("The [src] blocks the [attack_text], sending out arcs of lightning!") + owner.visible_message("[src] blocks [attack_text], sending out arcs of lightning!") for(var/mob/living/M in view(6, owner)) if(M == owner) continue @@ -451,7 +451,7 @@ new sparkle_path(get_turf(AM), get_dir(owner, AM)) if(isliving(AM)) var/mob/living/M = AM - to_chat(M, "You're thrown back by the [owner]'s reactive armor!") + to_chat(M, "You're thrown back by [owner]'s reactive armor!") INVOKE_ASYNC(AM, /atom/movable/.proc/throw_at, throw_target, ((clamp((repulse_power - (clamp(dist_from_user - 2, 0, dist_from_user))), 3, repulse_power))), 1) //So stuff gets tossed around at the same time. disable(rand(2, 5)) return TRUE diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index d7d55a478e8..c06f2285a7c 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -40,32 +40,32 @@ var/obj/item/gun/W = I if(!can_holster(W)) - to_chat(user, "This [W] won't fit in the [src]!") + to_chat(user, "This [W.name] won't fit in [src]!") return if(!user.canUnEquip(W, 0)) - to_chat(user, "You can't let go of the [W]!") + to_chat(user, "You can't let go of [W]!") return holstered = W user.unEquip(holstered) holstered.loc = src holstered.add_fingerprint(user) - user.visible_message("[user] holsters the [holstered].", "You holster the [holstered].") + user.visible_message("[user] holsters [holstered].", "You holster [holstered].") /obj/item/clothing/accessory/holster/proc/unholster(mob/user as mob) if(!holstered) return if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj)) - to_chat(user, "You need an empty hand to draw the [holstered]!") + to_chat(user, "You need an empty hand to draw [holstered]!") else if(user.a_intent == INTENT_HARM) - usr.visible_message("[user] draws the [holstered], ready to shoot!", \ - "You draw the [holstered], ready to shoot!") + usr.visible_message("[user] draws [holstered], ready to shoot!", \ + "You draw [holstered], ready to shoot!") else - user.visible_message("[user] draws the [holstered], pointing it at the ground.", \ - "You draw the [holstered], pointing it at the ground.") + user.visible_message("[user] draws [holstered], pointing it at the ground.", \ + "You draw [holstered], pointing it at the ground.") user.put_in_hands(holstered) holstered.add_fingerprint(user) holstered = null diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index ebad88067f7..cbcdf2ef43b 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -34,12 +34,12 @@ /obj/item/fluff/tattoo_gun/attack(mob/living/carbon/M as mob, mob/user as mob) if(user.a_intent == INTENT_HARM) - user.visible_message("[user] stabs [M] with the [src]!", "You stab [M] with the [src]!") - to_chat(M, "[user] stabs you with the [src]!
You feel a tiny prick!") + user.visible_message("[user] stabs [M] with [src]!", "You stab [M] with [src]!") + to_chat(M, "[user] stabs you with [src]!
You feel a tiny prick!") return if(used) - to_chat(user, "The [src] is out of ink.") + to_chat(user, "[src] is out of ink.") return if(!istype(M, /mob/living/carbon/human)) @@ -62,10 +62,10 @@ return if(target == user) - to_chat(user, "You use the [src] to apply a [tattoo_name] to yourself!") + to_chat(user, "You use [src] to apply a [tattoo_name] to yourself!") else - user.visible_message("[user] begins to apply a [tattoo_name] [target] with the [src].", "You begin to tattoo [target] with the [src]!") + user.visible_message("[user] begins to apply a [tattoo_name] [target] with [src].", "You begin to tattoo [target] with [src]!") if(!do_after(user, 30 * toolspeed, target = M)) return user.visible_message("[user] finishes the [tattoo_name] on [target].", "You finish the [tattoo_name].") @@ -108,12 +108,12 @@ tattoo_g = color2G(ink_color) tattoo_b = color2B(ink_color) - to_chat(user, "You change the color setting on the [src].") + to_chat(user, "You change the color setting on [src].") update_icon() else - to_chat(user, "The [src] is out of ink!") + to_chat(user, "[src] is out of ink!") /obj/item/fluff/bird_painter // BirdtTalon: Kahkiri name = "Orb of Onyx" @@ -292,7 +292,7 @@ return if(target.change_body_accessory("Jay Wingler Tail")) - to_chat(target, "You comb your tail with the [src].") + to_chat(target, "You comb your tail with [src].") used = 1 /obj/item/fluff/desolate_coat_kit //DesolateG: Micheal Smith @@ -460,7 +460,7 @@ var/obj/item/clothing/suit/storage/S = target var/obj/item/clothing/suit/storage/fluff/k3_webbing/webbing = new(get_turf(target)) webbing.allowed = S.allowed - to_chat(user, "You modify the [S] with [src].") + to_chat(user, "You modify [S] with [src].") H.update_inv_wear_suit() qdel(S) qdel(src) @@ -957,7 +957,7 @@ for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() - to_chat(user, "You turn the [src]'s lighting system [flavour].") + to_chat(user, "You turn [src]'s lighting system [flavour].") user.update_inv_wear_suit() /obj/item/clothing/suit/hooded/hoodie/fluff/xantholne // Xantholne: Meex Zwichsnicrur diff --git a/code/modules/detective_work/footprints_and_rag.dm b/code/modules/detective_work/footprints_and_rag.dm index bfc9d0aa824..526be9fe66f 100644 --- a/code/modules/detective_work/footprints_and_rag.dm +++ b/code/modules/detective_work/footprints_and_rag.dm @@ -25,7 +25,7 @@ /obj/item/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag) if(ismob(target) && target.reagents && reagents.total_volume) - user.visible_message("[user] has smothered \the [target] with \the [src]!", "You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise") + user.visible_message("[user] has smothered [target] with [src]!", "You smother [target] with [src]!", "You hear some struggling and muffled cries of surprise") src.reagents.reaction(target, REAGENT_TOUCH) src.reagents.clear_reagents() return @@ -35,8 +35,8 @@ /obj/item/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob,proximity) if(!proximity) return if(istype(A) && (src in user)) - user.visible_message("[user] starts to wipe down [A] with [src]!") + user.visible_message("[user] starts to wipe down [A] with [src]!") if(do_after(user, wipespeed, target = A)) - user.visible_message("[user] finishes wiping off the [A]!") + user.visible_message("[user] finishes wiping off [A]!") A.clean_blood() return diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index be8df4c3ae5..b8d610252c9 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -254,7 +254,7 @@ log transactions if("balance_statement") if(authenticated_account) if(world.timeofday < lastprint + PRINT_DELAY) - to_chat(usr, "The [name] flashes an error on its display.") + to_chat(usr, "[src] flashes an error on its display.") return lastprint = world.timeofday playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, TRUE) diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index 55a6541dfaf..dc9f7236fab 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -186,6 +186,6 @@ var/transSuccess = D.charge(transaction_amount, linked_account, transaction_purpose, machine_name, D.owner_name) if(transSuccess == TRUE) playsound(src, 'sound/machines/chime.ogg', 50, 1) - visible_message("[bicon(src)] The [src] chimes.") + visible_message("[src] chimes!") transaction_paid = 1 //emag? diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm index d1e4f8eaaba..fbea6172ac6 100644 --- a/code/modules/fish/fish_items.dm +++ b/code/modules/fish/fish_items.dm @@ -26,7 +26,7 @@ throw_range = 7 /obj/item/fish_net/suicide_act(mob/user) //"A tiny net is a death sentence: it's a net and it's tiny!" https://www.youtube.com/watch?v=FCI9Y4VGCVw - to_chat(viewers(user), "[user] places the [src.name] on top of [user.p_their()] head, [user.p_their()] fingers tangled in the netting! It looks like [user.p_theyre()] trying to commit suicide.") + visible_message("[user] places [src] on top of [user.p_their()] head, [user.p_their()] fingers tangled in the netting! It looks like [user.p_theyre()] trying to commit suicide.") return OXYLOSS /obj/item/fishfood @@ -52,7 +52,7 @@ attack_verb = list("scrubbed", "brushed", "scraped") /obj/item/tank_brush/suicide_act(mob/user) - to_chat(viewers(user), "[user] is vigorously scrubbing [user.p_them()]self raw with the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + visible_message("[user] is vigorously scrubbing [user.p_them()]self raw with [src]! It looks like [user.p_theyre()] trying to commit suicide.") return BRUTELOSS|FIRELOSS /obj/item/storage/bag/fish diff --git a/code/modules/fish/fishtank.dm b/code/modules/fish/fishtank.dm index 12c5d243b52..d41b48b6561 100644 --- a/code/modules/fish/fishtank.dm +++ b/code/modules/fish/fishtank.dm @@ -570,15 +570,14 @@ if(isAI(user)) return user.changeNext_move(CLICK_CD_MELEE) + playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, TRUE) if(user.a_intent == INTENT_HARM) - playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1) - user.visible_message("[user.name] bangs against the [name]!", \ - "You bang against the [name]!", \ + user.visible_message("[user] bangs against [src]!", + "You bang against [src]!", "You hear a banging sound.") else - playsound(loc, 'sound/effects/glassknock.ogg', 80, 1) - user.visible_message("[user.name] taps on the [name].", \ - "You tap on the [name].", \ + user.visible_message("[user] taps on [src].", + "You tap on [src].", "You hear a knocking sound.") /obj/machinery/fishtank/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) diff --git a/code/modules/food_and_drinks/drinks/bottler/bottler.dm b/code/modules/food_and_drinks/drinks/bottler/bottler.dm index dcdd116012d..9426a9cf21d 100644 --- a/code/modules/food_and_drinks/drinks/bottler/bottler.dm +++ b/code/modules/food_and_drinks/drinks/bottler/bottler.dm @@ -206,7 +206,7 @@ containers[con_type] = min(containers[con_type], max_define) S.use(sheets_to_use) else - visible_message("[src] rejects the [S] because it already is fully stocked with [con_type]s.") + visible_message("[src] rejects [S] because it already is fully stocked with [con_type]s.") /obj/machinery/bottler/proc/select_recipe() for(var/datum/bottler_recipe/recipe in available_recipes) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 8444e101132..b3b03b5777b 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -45,12 +45,12 @@ to_chat(chugger, "You need to open [src] first!") return if(istype(chugger) && loc == chugger && src == chugger.get_active_hand() && reagents.total_volume) - chugger.visible_message("[chugger] raises the [src] to [chugger.p_their()] mouth and starts [pick("chugging","gulping")] it down like [pick("a savage","a mad beast","it's going out of style","there's no tomorrow")]!", "You start chugging [src].", "You hear what sounds like gulping.") + chugger.visible_message("[chugger] raises [src] to [chugger.p_their()] mouth and starts [pick("chugging","gulping")] it down like [pick("a savage","a mad beast","it's going out of style","there's no tomorrow")]!", "You start chugging [src].", "You hear what sounds like gulping.") while(do_mob(chugger, chugger, 40)) //Between the default time for do_mob and the time it takes for a vampire to suck blood. chugger.eat(src, chugger, 25) //Half of a glass, quarter of a bottle. if(!reagents.total_volume) //Finish in style. chugger.emote("gasp") - chugger.visible_message("[chugger] [pick("finishes","downs","polishes off","slams")] the entire [src], what a [pick("savage","monster","champ","beast")]!", "You finish off the [src]![prob(50) ? " Maybe that wasn't such a good idea..." : ""]", "You hear a gasp and a clink.") + chugger.visible_message("[chugger] [pick("finishes","downs","polishes off","slams")] the entire [src], what a [pick("savage","monster","champ","beast")]!", "You finish off [src]![prob(50) ? " Maybe that wasn't such a good idea..." : ""]", "You hear a gasp and a clink.") break /obj/item/reagent_containers/food/drinks/afterattack(obj/target, mob/user, proximity) diff --git a/code/modules/food_and_drinks/drinks/drinks/cans.dm b/code/modules/food_and_drinks/drinks/drinks/cans.dm index d5508ca6919..4759f76eb2b 100644 --- a/code/modules/food_and_drinks/drinks/drinks/cans.dm +++ b/code/modules/food_and_drinks/drinks/drinks/cans.dm @@ -57,7 +57,7 @@ addtimer(CALLBACK(src, .proc/reset_shakable), 1 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) to_chat(H, "You start shaking up [src].") if(do_after(H, 1 SECONDS, target = H)) - visible_message("[user] shakes up the [name]!") + visible_message("[user] shakes up [src]!") if(times_shaken == 0) times_shaken++ addtimer(CALLBACK(src, .proc/reset_shaken), 1 MINUTES, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_NO_HASH_WAIT) diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm index 50b270d1bbe..66078b9b6fb 100644 --- a/code/modules/food_and_drinks/food/foods/pizza.dm +++ b/code/modules/food_and_drinks/food/foods/pizza.dm @@ -173,7 +173,7 @@ /obj/item/pizzabox/attack_hand(mob/user) if(open && pizza) user.put_in_hands(pizza) - to_chat(user, "You take the [pizza] out of the [src].") + to_chat(user, "You take [pizza] out of [src].") pizza = null update_icon() return @@ -215,11 +215,11 @@ boxes.Add(boxestoadd) box.update_icon() update_icon() - to_chat(user, "You put the [box] ontop of the [src]!") + to_chat(user, "You put [box] on top of [src]!") else to_chat(user, "The stack is too high!") else - to_chat(user, "Close the [box] first!") + to_chat(user, "Close [box] first!") return if(istype(I, /obj/item/reagent_containers/food/snacks/sliceable/pizza/)) // Long ass fucking object name @@ -230,9 +230,9 @@ update_icon() - to_chat(user, "You put the [I] in the [src]!") + to_chat(user, "You put [I] in [src]!") else - to_chat(user, "You try to push the [I] through the lid but it doesn't work!") + to_chat(user, "You try to push [I] through the lid but it doesn't work!") return if(istype(I, /obj/item/pen/)) diff --git a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm index c8cf2aa8eee..d950737b07d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm @@ -67,7 +67,7 @@ /obj/machinery/cooker/proc/burn_food(mob/user, obj/item/reagent_containers/props) var/obj/item/reagent_containers/food/snacks/badrecipe/burnt = new(get_turf(src)) setRegents(props, burnt) - to_chat(user, "You smell burning coming from the [src]!") + to_chat(user, "You smell burning coming from [src]!") var/datum/effect_system/smoke_spread/bad/smoke = new // burning things makes smoke! smoke.set_up(5, 0, src) smoke.start() @@ -75,7 +75,7 @@ var/turf/location = get_turf(src) var/obj/effect/decal/cleanable/liquid_fuel/oil = new(location) oil.name = "fat" - oil.desc = "uh oh, looks like some fat from the [src]" + oil.desc = "Uh oh, looks like some fat from [src]!" oil.loc = location location.hotspot_expose(700, 50, 1) //TODO have a chance of setting the tile on fire diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 4336c870bf3..4ec135e9e01 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -128,25 +128,25 @@ /obj/machinery/gibber/proc/move_into_gibber(mob/user, mob/living/victim) if(occupant) - to_chat(user, "The [src] is full, empty it first!") + to_chat(user, "[src] is full, empty it first!") return if(operating) - to_chat(user, "The [src] is locked and running, wait for it to finish.") + to_chat(user, "[src] is locked and running, wait for it to finish.") return if(!ishuman(victim)) - to_chat(user, "This is not suitable for the [src]!") + to_chat(user, "This is not suitable for [src]!") return if(victim.abiotic(1)) to_chat(user, "Subject may not have abiotic items on.") return - user.visible_message("[user] starts to put [victim] into the [src]!") + user.visible_message("[user] starts to put [victim] into [src]!") add_fingerprint(user) if(do_after(user, 30, target = victim) && user.Adjacent(src) && victim.Adjacent(user) && !occupant) - user.visible_message("[user] stuffs [victim] into the [src]!") + user.visible_message("[user] stuffs [victim] into [src]!") victim.forceMove(src) occupant = victim diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm index 12f09adeb10..b01925e009d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm @@ -213,7 +213,7 @@ dat += {"[display_name]: [R.volume] unit\s
"} if(items_counts.len==0 && reagents.reagent_list.len==0) - dat = {"The [src] is empty
"} + dat = {"[src] is empty
"} else dat = {"Ingredients:
[dat]"} dat += {"

\ @@ -394,7 +394,7 @@ /obj/machinery/kitchen_machine/proc/broke() do_sparks(2, 1, src) icon_state = broken_icon // Make it look all busted up and shit - visible_message("The [src] breaks!") //Let them know they're stupid + visible_message("[src] breaks!") //Let them know they're stupid broken = 2 // Make it broken so it can't be used util fixed flags = null //So you can't add condiments operating = 0 // Turn it off again aferwards diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index a648d37656d..8dbd68b0b71 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -78,7 +78,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) else var/obj/item/multitool/M = O M.buffer = src - to_chat(user, "You log [src] in the [M]'s buffer.") + to_chat(user, "You log [src] in [M]'s buffer.") return if(stat != 0) //NOPOWER etc return diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 8df53817d1b..87e17efd10b 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -238,7 +238,7 @@ usr.visible_message("[usr] picks up the deck.") /obj/item/pack - name = "Card Pack" + name = "card pack" desc = "For those with disposable income." icon_state = "card_pack" @@ -249,7 +249,7 @@ /obj/item/pack/attack_self(mob/user as mob) - user.visible_message("[name] rips open the [src]!", "You rips open the [src]!") + user.visible_message("[name] rips open [src]!", "You rip open [src]!") var/obj/item/cardhand/H = new(get_turf(user)) H.cards += cards @@ -410,8 +410,8 @@ if(cards.len) update_icon() if(H.cards.len) - usr.visible_message("The [usr] plays the [discarding].", "You play the [discarding].") - H.loc = get_step(usr,usr.dir) + user.visible_message("[user] plays the [discarding].", "You play the [discarding].") + H.loc = get_step(user, user.dir) if(!cards.len) qdel(src) diff --git a/code/modules/games/tarot.dm b/code/modules/games/tarot.dm index bd26c34d437..d5fdac7efd6 100644 --- a/code/modules/games/tarot.dm +++ b/code/modules/games/tarot.dm @@ -28,5 +28,5 @@ cards -= P cards = newcards playsound(user, 'sound/items/cardshuffle.ogg', 50, 1) - user.visible_message("[user] shuffles [src].", "You shuffle the [src].") + user.visible_message("[user] shuffles [src].", "You shuffle [src].") cooldown = world.time diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index 104593a62d9..10bed630a13 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -174,7 +174,7 @@ queen_bee = qb.queen qb.queen = null else - visible_message("The [qb] refuses to settle down. Maybe it's something to do with its reagent?") + visible_message("[qb] refuses to settle down. Maybe it's something to do with its reagent?") return if(queen_bee) diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 0552f78ee92..d2306a4033a 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -27,7 +27,7 @@ tastes = list("banana" = 1) /obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user) - user.visible_message("[user] is aiming the [name] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide.") playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1) sleep(25) if(!user) @@ -51,7 +51,7 @@ throw_range = 7 /obj/item/grown/bananapeel/suicide_act(mob/user) - user.visible_message("[user] is deliberately slipping on the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is deliberately slipping on [src]! It looks like [user.p_theyre()] trying to commit suicide.") playsound(loc, 'sound/misc/slip.ogg', 50, 1, -1) return BRUTELOSS diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index a937a8a6ebb..12cdb4834d2 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -105,7 +105,7 @@ /obj/item/reagent_containers/food/snacks/grown/firelemon seed = /obj/item/seeds/firelemon - name = "Combustible Lemon" + name = "combustible lemon" desc = "Made for burning houses down." icon_state = "firelemon" bitesize_mod = 2 @@ -115,7 +115,7 @@ /obj/item/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user) var/area/A = get_area(user) - user.visible_message("[user] primes the [src]!", "You prime the [src]!") + user.visible_message("[user] primes [src]!", "You prime [src]!") investigate_log("[key_name(user)] primed a combustible lemon for detonation at [A] [COORD(user)].", INVESTIGATE_BOMB) add_attack_logs(user, src, "primed a combustible lemon for detonation", ATKLOG_FEW) log_game("[key_name(user)] primed a combustible lemon for detonation at [A] [COORD(user)].") diff --git a/code/modules/hydroponics/grown/cotton.dm b/code/modules/hydroponics/grown/cotton.dm index 3f864e45328..8c5df5d7786 100644 --- a/code/modules/hydroponics/grown/cotton.dm +++ b/code/modules/hydroponics/grown/cotton.dm @@ -32,7 +32,7 @@ var/cotton_name = "raw cotton" /obj/item/grown/cotton/attack_self(mob/user) - user.show_message("You pull some [cotton_name] out of the [name]!", 1) + user.show_message("You pull some [cotton_name] out of [src]!", 1) var/seed_modifier = 0 if(seed) seed_modifier = round(seed.potency / 25) diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index dea72093b15..3a312a78154 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -191,7 +191,7 @@ /obj/item/grown/novaflower/attack(mob/living/carbon/M, mob/user) ..() if(isliving(M)) - to_chat(M, "You are lit on fire from the intense heat of the [name]!") + to_chat(M, "You are lit on fire from the intense heat of [src]!") M.adjust_fire_stacks(seed.potency / 20) if(M.IgniteMob()) message_admins("[key_name_admin(user)] set [key_name_admin(M)] on fire") @@ -203,12 +203,12 @@ if(force > 0) force -= rand(1, (force / 3) + 1) else - to_chat(usr, "All the petals have fallen off the [name] from violent whacking!") + to_chat(usr, "All the petals have fallen off [src] from violent whacking!") usr.unEquip(src) qdel(src) /obj/item/grown/novaflower/pickup(mob/living/carbon/human/user) . = ..() if(!user.gloves) - to_chat(user, "The [name] burns your bare hand!") + to_chat(user, "[src] burns your bare hand!") user.adjustFireLoss(rand(1, 5)) diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index da7c63393b2..060de890139 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -44,7 +44,7 @@ attack_verb = list("stung") /obj/item/grown/nettle/suicide_act(mob/user) - user.visible_message("[user] is eating some of the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is eating some of [src]! It looks like [user.p_theyre()] trying to commit suicide.") return BRUTELOSS|TOXLOSS /obj/item/grown/nettle/pickup(mob/living/user) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index e9d57b0dbad..ecddd999ea0 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -15,9 +15,9 @@ // ************************************* /obj/item/reagent_containers/spray/weedspray // -- Skie + name = "weed spray" desc = "It's a toxic mixture, in spray form, to kill small weeds." icon = 'icons/obj/hydroponics/equipment.dmi' - name = "weed spray" icon_state = "weedspray" item_state = "plantbgone" volume = 100 @@ -30,13 +30,13 @@ list_reagents = list("atrazine" = 100) /obj/item/reagent_containers/spray/weedspray/suicide_act(mob/user) - user.visible_message("[user] is huffing the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide.") return TOXLOSS /obj/item/reagent_containers/spray/pestspray // -- Skie + name = "pest spray" desc = "It's some pest eliminator spray! Do not inhale!" icon = 'icons/obj/hydroponics/equipment.dmi' - name = "pest spray" icon_state = "pestspray" item_state = "plantbgone" volume = 100 @@ -49,7 +49,7 @@ list_reagents = list("pestkiller" = 100) /obj/item/reagent_containers/spray/pestspray/suicide_act(mob/user) - user.visible_message("[user] is huffing the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide.") return TOXLOSS /obj/item/cultivator @@ -94,7 +94,7 @@ sharp = 1 /obj/item/hatchet/suicide_act(mob/user) - user.visible_message("[user] is chopping at [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is chopping at [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.") playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) return BRUTELOSS @@ -130,7 +130,7 @@ var/swiping = FALSE /obj/item/scythe/suicide_act(mob/user) - user.visible_message("[user] is beheading [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is beheading [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.") if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/external/affecting = H.get_organ("head") diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm index 20cd27d14e4..4731d8134e9 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -15,7 +15,7 @@ return ..() C.preserved() - to_chat(user, "You inject the [M] with the stabilizer. It will no longer go inert.") + to_chat(user, "You inject [M] with the stabilizer. It will no longer go inert.") qdel(src) /************************Hivelord core*******************/ diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index 1d43df490fd..98c5669fd72 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -39,7 +39,7 @@ var/list/L = get_destinations(user) if(!L.len) - to_chat(user, "The [name] found no beacons in the world to anchor a wormhole to.") + to_chat(user, "[src] found no beacons in the world to anchor a wormhole to.") return var/chosen_beacon = pick(L) var/obj/effect/portal/jaunt_tunnel/J = new(get_turf(src), get_turf(chosen_beacon), src, 100) diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm index 2a910428d31..9871c735725 100644 --- a/code/modules/mob/living/carbon/alien/larva/emote.dm +++ b/code/modules/mob/living/carbon/alien/larva/emote.dm @@ -37,73 +37,73 @@ m_type = 2 if("scratch") if(!src.restrained()) - message = "The [src.name] scratches." + message = "[src] scratches." m_type = 1 if("whimper") if(!muzzled) - message = "The [src.name] whimpers." + message = "[src] whimpers." m_type = 2 // if("roar") // if(!muzzled) -// message = "The [src.name] roars." Commenting out since larva shouldn't roar /N +// message = "[src] roars." Commenting out since larva shouldn't roar /N // m_type = 2 if("tail") - message = "The [src.name] waves its tail." + message = "[src] waves its tail." m_type = 1 if("gasp") - message = "The [src.name] gasps." + message = "[src] gasps." m_type = 2 if("shiver") - message = "The [src.name] shivers." + message = "[src] shivers." m_type = 2 if("drool") - message = "The [src.name] drools." + message = "[src] drools." m_type = 1 if("scretch") if(!muzzled) - message = "The [src.name] scretches." + message = "[src] scretches." m_type = 2 if("choke") - message = "The [src.name] chokes." + message = "[src] chokes." m_type = 2 if("moan") - message = "The [src.name] moans!" + message = "[src] moans!" m_type = 2 if("nod") - message = "The [src.name] nods its head." + message = "[src] nods its head." m_type = 1 // if("sit") -// message = "The [src.name] sits down." //Larvan can't sit down, /N +// message = "[src] sits down." //Larvan can't sit down, /N // m_type = 1 if("sway") - message = "The [src.name] sways around dizzily." + message = "[src] sways around dizzily." m_type = 1 if("sulk") - message = "The [src.name] sulks down sadly." + message = "[src] sulks down sadly." m_type = 1 if("twitch") - message = "The [src.name] twitches violently." + message = "[src] twitches violently." m_type = 1 if("dance") if(!src.restrained()) - message = "The [src.name] dances around happily." + message = "[src] dances around happily." m_type = 1 if("roll") if(!src.restrained()) - message = "The [src.name] rolls." + message = "[src] rolls." m_type = 1 if("shake") - message = "The [src.name] shakes its head." + message = "[src] shakes its head." m_type = 1 if("gnarl") if(!muzzled) - message = "The [src.name] gnarls and shows its teeth.." + message = "[src] gnarls and shows its teeth.." m_type = 2 if("jump") - message = "The [src.name] jumps!" + message = "[src] jumps!" m_type = 1 if("hiss_") - message = "The [src.name] hisses softly." + message = "[src] hisses softly." m_type = 1 if("collapse") Paralyse(2) diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index ddfb51c8781..07282106a21 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -28,7 +28,7 @@ /obj/item/mmi/attackby(obj/item/O as obj, mob/user as mob, params) if(istype(O, /obj/item/organ/internal/brain/crystal)) - to_chat(user, " This brain is too malformed to be able to use with the [src].") + to_chat(user, " This brain is too malformed to be able to use with [src].") return if(istype(O, /obj/item/organ/internal/brain/golem)) to_chat(user, "You can't find a way to plug [O] into [src].") @@ -79,8 +79,8 @@ if(radio) to_chat(user, "[src] already has a radio installed.") else - user.visible_message("[user] begins to install the [O] into [src]...", \ - "You start to install the [O] into [src]...") + user.visible_message("[user] begins to install [O] into [src]...", \ + "You start to install [O] into [src]...") if(do_after(user, 20, target=src)) if(user.drop_item()) user.visible_message("[user] installs [O] in [src].", \ diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 8877281fd39..b0b2769032e 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -79,7 +79,7 @@ for(var/mob/M in viewers(user, null)) if(M.client) - M.show_message(text("[user] attacks [src]'s stomach wall with the [I.name]!"), 2) + M.show_message(text("[user] attacks [src]'s stomach wall with [I]!"), 2) playsound(user.loc, 'sound/effects/attackblob.ogg', 50, 1) if(prob(getBruteLoss() - 50)) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 4bec68bc56f..5c4844d5933 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -57,7 +57,7 @@ if(M.powerlevel < 0) M.powerlevel = 0 - visible_message("The [M.name] has shocked [src]!", "The [M.name] has shocked you!") + visible_message("[M] has shocked [src]!", "[M] has shocked you!") do_sparks(5, TRUE, src) var/power = M.powerlevel + rand(0,3) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 4e3727aaf25..48cc3754905 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -25,8 +25,8 @@ emp_act reflected = is_type_in_list(P, safe_list) //And it's safe if(reflected) - visible_message("The [P.name] gets reflected by [src]!", \ - "The [P.name] gets reflected by [src]!") + visible_message("[P] gets reflected by [src]!", \ + "[P] gets reflected by [src]!") add_attack_logs(P.firer, src, "hit by [P.type] but got reflected") P.reflect_back(src) return -1 diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm index 3880d578b58..a6e3bf4ef18 100644 --- a/code/modules/mob/living/carbon/human/species/golem.dm +++ b/code/modules/mob/living/carbon/human/species/golem.dm @@ -392,8 +392,8 @@ if(!(P.original == H && P.firer == H)) if(P.flag == "bullet" || P.flag == "bomb") playsound(H, 'sound/effects/shovel_dig.ogg', 70, 1) - H.visible_message("The [P.name] sinks harmlessly in [H]'s sandy body!", \ - "The [P.name] sinks harmlessly in [H]'s sandy body!") + H.visible_message("[P] sinks harmlessly in [H]'s sandy body!", \ + "[P] sinks harmlessly in [H]'s sandy body!") return FALSE return TRUE @@ -425,8 +425,8 @@ /datum/species/golem/glass/bullet_act(obj/item/projectile/P, mob/living/carbon/human/H) if(!(P.original == H && P.firer == H)) //self-shots don't reflect if(P.is_reflectable) - H.visible_message("The [P.name] gets reflected by [H]'s glass skin!", \ - "The [P.name] gets reflected by [H]'s glass skin!") + H.visible_message("[P] gets reflected by [H]'s glass skin!", \ + "[P] gets reflected by [H]'s glass skin!") P.reflect_back(H) diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm index 1d646237c19..f4ccced8fd8 100644 --- a/code/modules/mob/living/carbon/human/species/vox.dm +++ b/code/modules/mob/living/carbon/human/species/vox.dm @@ -93,7 +93,7 @@ H.equip_or_collect(internal_tank, slot_l_hand) to_chat(H, "Could not find an empty slot for internals! Please report this as a bug") H.internal = internal_tank - to_chat(H, "You are now running on nitrogen internals from the [internal_tank]. Your species finds oxygen toxic, so you must breathe nitrogen only.") + to_chat(H, "You are now running on nitrogen internals from [internal_tank]. Your species finds oxygen toxic, so you must breathe nitrogen only.") H.update_action_buttons_icon() /datum/species/vox/on_species_gain(mob/living/carbon/human/H) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index eb0c356863b..26b940308ea 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -71,8 +71,8 @@ take_overall_damage(0, shock_damage, TRUE, used_weapon = "Electrocution") if(shock_damage > 200) visible_message( - "[src] was arc flashed by the [source]!", - "The [source] arc flashes and electrocutes you!", + "[src] was arc flashed by \the [source]!", + "\The [source] arc flashes and electrocutes you!", "You hear a lightning-like crack!") playsound(loc, 'sound/effects/eleczap.ogg', 50, 1, -1) explosion(loc, -1, 0, 2, 2) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index f8c27db8dc7..2f35fb7cf9c 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -719,7 +719,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( C.brute_damage = WC.brute C.electronics_damage = WC.burn - to_chat(usr, "You install the [W.name].") + to_chat(usr, "You install [W].") return @@ -1408,7 +1408,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( /mob/living/silicon/robot/deathsquad/bullet_act(obj/item/projectile/P) if(istype(P) && P.is_reflectable && P.starting) - visible_message("The [P.name] gets reflected by [src]!", "The [P.name] gets reflected by [src]!") + visible_message("[P] gets reflected by [src]!", "[P] gets reflected by [src]!") P.reflect_back(src) return -1 return ..(P) diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index e8d3ffeb54e..c17b911b0f2 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -135,7 +135,7 @@ emagged = 1 if(!open) locked = !locked - to_chat(user, "You [locked ? "lock" : "unlock"] the [src]'s controls!") + to_chat(user, "You [locked ? "lock" : "unlock"] [src]'s controls!") flick("mulebot-emagged", src) playsound(loc, 'sound/effects/sparks1.ogg', 100, 0) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index b888836c5d7..2e0f90ec24e 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -133,8 +133,8 @@ if(prob(reflectchance)) if((P.damage_type == BRUTE || P.damage_type == BURN)) adjustBruteLoss(P.damage * 0.5) - visible_message("The [P.name] gets reflected by [src]'s shell!", \ - "The [P.name] gets reflected by [src]'s shell!") + visible_message("[P] gets reflected by [src]'s shell!", \ + "[P] gets reflected by [src]'s shell!") P.reflect_back(src, list(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3)) diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 73cf8f6a155..666942b8042 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -322,7 +322,7 @@ if(valid) if(health <= 0) - to_chat(user, "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on [p_them()].") + to_chat(user, "There is merely a dull, lifeless look in [real_name]'s eyes as you put [item_to_add] on [p_them()].") // :'( else if(user) user.visible_message("[user] puts [item_to_add] on [real_name]'s head. [src] looks at [user] and barks once.", "You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags [p_their()] tail once and barks.", diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm index 7359d11384f..6402526be42 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -79,12 +79,12 @@ var/datum/effect_system/smoke_spread/smoke = new smoke.set_up(5, 0, src.loc) smoke.start() - visible_message("The [src] warps in!") + visible_message("[src] warps in!") playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1) /mob/living/simple_animal/hostile/hivebot/tele/proc/warpbots() icon_state = "def_radar" - visible_message("The [src] turns on!") + visible_message("[src] turns on!") while(bot_amt > 0) bot_amt-- switch(bot_type) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm index b1b3c7066b8..6f2239d334d 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm @@ -43,10 +43,10 @@ target = new_target if(target != null) if(istype(target, /obj/item/stack/ore) && loot.len < 10) - visible_message("The [name] looks at [target.name] with hungry eyes.") + visible_message("[src] looks at [target.name] with hungry eyes.") else if(isliving(target)) Aggro() - visible_message("The [name] tries to flee from [target.name]!") + visible_message("[src] tries to flee from [target.name]!") retreat_distance = 10 minimum_distance = 10 if(will_burrow) @@ -69,7 +69,7 @@ /mob/living/simple_animal/hostile/asteroid/goldgrub/proc/Burrow()//Begin the chase to kill the goldgrub in time if(!stat) - visible_message("The [name] buries into the ground, vanishing from sight!") + visible_message("[src] buries into the ground, vanishing from sight!") qdel(src) /mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(obj/item/projectile/P) diff --git a/code/modules/mob/living/simple_animal/hostile/mining/mining.dm b/code/modules/mob/living/simple_animal/hostile/mining/mining.dm index a888fa7ee9a..d5f60384e1f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/mining.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/mining.dm @@ -48,7 +48,7 @@ if(!stat) Aggro() if(T.throwforce <= 20) - visible_message("The [T.name] [throw_message] [src.name]!") + visible_message("[T] [throw_message] [src.name]!") return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 6728330e492..ed22692ffac 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -148,7 +148,7 @@ /mob/living/simple_animal/hostile/mushroom/proc/Bruise() if(!bruised && !stat) - src.visible_message("The [src.name] was bruised!") + src.visible_message("[src] was bruised!") bruised = 1 /mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I as obj, mob/user as mob, params) diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 83485dcee3a..b69836d1f26 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -50,7 +50,7 @@ user.do_attack_animation(src) if(O.force) if(prob(melee_block_chance)) - visible_message("[src] blocks the [O] with its shield! ") + visible_message("[src] blocks [O] with its shield! ") else var/damage = O.force if(O.damtype == STAMINA) @@ -59,11 +59,11 @@ visible_message("[src] is unharmed by [O]!") return adjustHealth(damage) - visible_message("[src] has been attacked with the [O] by [user]. ") + visible_message("[src] has been attacked with [O] by [user]. ") playsound(loc, O.hitsound, 25, 1, -1) else to_chat(usr, "This weapon is ineffective, it does no damage.") - visible_message("[user] gently taps [src] with the [O]. ") + visible_message("[user] gently taps [src] with [O]. ") /mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/projectile/Proj) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm index 303bf8151ef..9f93bcab1ef 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm @@ -319,7 +319,7 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list) if(stat == DEAD) // Can't use if(.) for this due to the fact it can sometimes return FALSE even when mob is alive. if(prob(2)) // 2% chance every cycle to decompose - visible_message("\The dead body of the [src] decomposes!") + visible_message("The dead body of [src] decomposes!") gib() else if(degenerate) diff --git a/code/modules/mob/living/simple_animal/slime/emote.dm b/code/modules/mob/living/simple_animal/slime/emote.dm index 94806ede9d1..0eceec7a124 100644 --- a/code/modules/mob/living/simple_animal/slime/emote.dm +++ b/code/modules/mob/living/simple_animal/slime/emote.dm @@ -30,38 +30,38 @@ return return custom_emote(m_type, message) if("bounce") - message = "The [src.name] bounces in place." + message = "[src] bounces in place." m_type = 1 if("custom") return custom_emote(m_type, message) if("jiggle") - message = "The [src.name] jiggles!" + message = "[src] jiggles!" m_type = 1 if("light") - message = "The [src.name] lights up for a bit, then stops." + message = "[src] lights up for a bit, then stops." m_type = 1 if("moan") - message = "The [src.name] moans." + message = "[src] moans." m_type = 2 if("shiver") - message = "The [src.name] shivers." + message = "[src] shivers." m_type = 2 if("sway") - message = "The [src.name] sways around dizzily." + message = "[src] sways around dizzily." m_type = 1 if("twitch") - message = "The [src.name] twitches." + message = "[src] twitches." m_type = 1 if("vibrate") - message = "The [src.name] vibrates!" + message = "[src] vibrates!" m_type = 1 if("noface") //mfw I have no face diff --git a/code/modules/ninja/martial_art.dm b/code/modules/ninja/martial_art.dm index 0f4fbfba51e..6e1a1f2fdb9 100644 --- a/code/modules/ninja/martial_art.dm +++ b/code/modules/ninja/martial_art.dm @@ -19,9 +19,9 @@ /obj/item/creeping_widow_injector/attack_self(mob/living/carbon/human/user as mob) if(!used) - user.visible_message("You stick the [src]'s needle into your arm and press the button.", \ - "[user] sticks the [src]'s needle [user.p_their()] arm and presses the button.") - to_chat(user, "The nanomachines in the [src] flow through your bloodstream.") + user.visible_message("You stick [src]'s needle into your arm and press the button.", \ + "[user] sticks [src]'s needle [user.p_their()] arm and presses the button.") + to_chat(user, "The nanomachines in [src] flow through your bloodstream.") var/datum/martial_art/ninja_martial_art/N = new/datum/martial_art/ninja_martial_art(null) N.teach(user) @@ -31,7 +31,7 @@ desc = "A strange autoinjector made of a black metal.
It appears to be used up and empty." return 0 else - to_chat(user, "The [src] has been used already!") + to_chat(user, "[src] has been used already!") return 1 // Ninja martial art datum diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 47ddcda3036..24f3026a7d0 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -39,7 +39,7 @@ if(istype(W, /obj/item/paper) || istype(W, /obj/item/photo) || istype(W, /obj/item/paper_bundle) || istype(W, /obj/item/documents)) user.drop_item() W.loc = src - to_chat(user, "You put the [W] into \the [src].") + to_chat(user, "You put [W] into [src].") update_icon() else if(istype(W, /obj/item/pen)) rename_interactive(user, W) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index ba809fd7119..226869e69f7 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -405,7 +405,7 @@ src.loc = get_turf(h_user) if(h_user.client) h_user.client.screen -= src h_user.put_in_hands(B) - to_chat(user, "You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name].") + to_chat(user, "You clip [P] to [(src.name == "paper") ? "the paper" : src.name].") src.loc = B P.loc = B B.amount++ diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 8dc2cd85e8f..e4ef4d28719 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -168,7 +168,7 @@ if(href_list["remove"]) var/obj/item/W = src[page] usr.put_in_hands(W) - to_chat(usr, "You remove the [W.name] from the bundle.") + to_chat(usr, "You remove [W] from the bundle.") if(amount == 1) var/obj/item/paper/P = src[1] usr.unEquip(src) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index a3ca2c5d410..203eacc5001 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -85,7 +85,7 @@ P.loc = user.loc user.put_in_hands(P) P.add_fingerprint(user) - to_chat(user, "You take [P] out of the [src].") + to_chat(user, "You take [P] out of [src].") else to_chat(user, "[src] is empty!") @@ -138,7 +138,7 @@ P = new /obj/item/paper/carbon P.loc = user.loc user.put_in_hands(P) - to_chat(user, "You take [P] out of the [src].") + to_chat(user, "You take [P] out of [src].") else to_chat(user, "[src] is empty!") diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 09cfcd2a82f..a0e7b47da13 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -25,7 +25,7 @@ pressure_resistance = 2 /obj/item/pen/suicide_act(mob/user) - to_chat(viewers(user), "[user] starts scribbling numbers over [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit sudoku.") + to_chat(viewers(user), "[user] starts scribbling numbers over [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit sudoku.") return BRUTELOSS /obj/item/pen/blue diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm old mode 100755 new mode 100644 index c0f05650d64..d6aaaebf0f6 --- a/code/modules/pda/PDA.dm +++ b/code/modules/pda/PDA.dm @@ -8,7 +8,7 @@ GLOBAL_LIST_EMPTY(PDAs) /obj/item/pda - name = "PDA" + name = "\improper PDA" desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge." icon = 'icons/obj/pda.dmi' icon_state = "pda" @@ -179,7 +179,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(ismob(loc)) var/mob/M = loc M.put_in_hands(id) - to_chat(user, "You remove the ID from the [name].") + to_chat(user, "You remove the ID from [src].") SStgui.update_uis(src) else id.forceMove(get_turf(src)) @@ -214,10 +214,10 @@ GLOBAL_LIST_EMPTY(PDAs) if(issilicon(user)) return - if( can_use(user) ) + if(can_use(user)) var/obj/item/pen/O = locate() in src if(O) - to_chat(user, "You remove the [O] from [src].") + to_chat(user, "You remove [O] from [src].") playsound(src, 'sound/machines/pda_button2.ogg', 50, TRUE) if(istype(loc, /mob)) var/mob/M = loc diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 00fe161e6d4..d192cb037eb 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -731,11 +731,11 @@ if(usr == user && opened && !issilicon(user)) if(cell) + user.visible_message("[user.name] removes [cell] from [src]!", "You remove [cell].") user.put_in_hands(cell) cell.add_fingerprint(user) cell.update_icon() cell = null - user.visible_message("[user.name] removes [cell] from [src]!", "You remove the [cell].") charging = FALSE update_icon() return @@ -1050,7 +1050,7 @@ smoke.start() do_sparks(3, 1, src) for(var/mob/M in viewers(src)) - M.show_message("The [name] suddenly lets out a blast of smoke and some sparks!", 3, "You hear sizzling electronics.", 2) + M.show_message("[src] suddenly lets out a blast of smoke and some sparks!", 3, "You hear sizzling electronics.", 2) /obj/machinery/power/apc/surplus() diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 96ad65666ca..250e065cfb6 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -498,9 +498,9 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai /obj/item/stack/cable_coil/suicide_act(mob/user) if(locate(/obj/structure/chair/stool) in user.loc) - user.visible_message("[user] is making a noose with the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is making a noose with [src]! It looks like [user.p_theyre()] trying to commit suicide.") else - user.visible_message("[user] is strangling [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.") return OXYLOSS /obj/item/stack/cable_coil/New(loc, length = MAXCOIL, paramcolor = null) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index b92b456890f..ec1184d7837 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -92,7 +92,7 @@ . += "The charge meter reads [round(percent() )]%." /obj/item/stock_parts/cell/suicide_act(mob/user) - to_chat(viewers(user), "[user] is licking the electrodes of the [src]! It looks like [user.p_theyre()] trying to commit suicide.") + to_chat(viewers(user), "[user] is licking the electrodes of [src]! It looks like [user.p_theyre()] trying to commit suicide.") return FIRELOSS /obj/item/stock_parts/cell/attackby(obj/item/W, mob/user, params) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 38df561727d..90acc6dd253 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -279,9 +279,9 @@ var/obj/item/stack/addstack = O var/amount = min((max_sheets - sheets), addstack.amount) if(amount < 1) - to_chat(user, "The [src.name] is full!") + to_chat(user, "[src] is full!") return - to_chat(user, "You add [amount] sheet\s to the [src.name].") + to_chat(user, "You add [amount] sheet\s to [src].") sheets += amount addstack.use(amount) SStgui.update_uis(src) diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 0701e848a53..2f5a92046f1 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -109,7 +109,7 @@ if(prob(20)) user.Stun(2) user.take_overall_damage(0, shock_damage) - user.visible_message("[user.name] was shocked by the [src.name]!", \ + user.visible_message("[user.name] was shocked by [src]!", \ "Energy pulse detected, system damaged!", \ "You hear an electrical crack.") diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index bd14f07c785..6757ee090ea 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -197,7 +197,7 @@ else state = EMITTER_NEEDS_WRENCH anchored = FALSE - user.visible_message("[user] unsecures [src] reinforcing bolts from the floor.", + user.visible_message("[user] unsecures [src]'s reinforcing bolts from the floor.", "You undo the external reinforcing bolts.", "You hear a ratchet.") playsound(src, I.usesound, I.tool_volume, TRUE) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 4d3eb5f51f0..d8d8ce5c0e1 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -64,11 +64,11 @@ field_generator power level display if(state == FG_WELDED) if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on if(active >= FG_CHARGING) - to_chat(user, "You are unable to turn off the [name] once it is online!") + to_chat(user, "You are unable to turn off [src] once it is online!") return 1 else - user.visible_message("[user.name] turns on the [name].", \ - "You turn on the [name].", \ + user.visible_message("[user] turns on [src].", \ + "You turn on [src].", \ "You hear heavy droning.") turn_on() investigate_log("activated by [user.key].","singulo") @@ -100,7 +100,7 @@ field_generator power level display "You hear ratchet.") anchored = 0 if(FG_WELDED) - to_chat(user, "The [name] needs to be unwelded from the floor!") + to_chat(user, "[src] needs to be unwelded from the floor!") else return ..() @@ -188,7 +188,7 @@ field_generator power level display check_power_level() return 1 else - visible_message("The [name] shuts down!", "You hear something shutting down.") + visible_message("[src] shuts down!", "You hear something shutting down.") turn_off() investigate_log("ran out of power and deactivated","singulo") power = 0 diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm index 9bed8105a3e..6a6f32a101c 100644 --- a/code/modules/power/singularity/generator.dm +++ b/code/modules/power/singularity/generator.dm @@ -26,13 +26,13 @@ anchored = !anchored playsound(src.loc, W.usesound, 75, 1) if(anchored) - user.visible_message("[user.name] secures [src.name] to the floor.", \ - "You secure the [src.name] to the floor.", \ + user.visible_message("[user.name] secures [src] to the floor.", \ + "You secure [src] to the floor.", \ "You hear a ratchet") src.add_hiddenprint(user) else - user.visible_message("[user.name] unsecures [src.name] from the floor.", \ - "You unsecure the [src.name] from the floor.", \ + user.visible_message("[user.name] unsecures [src] from the floor.", \ + "You unsecure [src.name] from the floor.", \ "You hear a ratchet") return return ..() diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 0edee98e835..0e1e9176642 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -201,7 +201,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin var/obj/item/stack/cable_coil/C = W if(C.use(1)) playsound(loc, C.usesound, 50, 1) - user.visible_message("[user.name] adds wires to the [name].", \ + user.visible_message("[user] adds wires to [src].", \ "You add some wires.") construction_state = ACCELERATOR_WIRED update_icon() @@ -302,7 +302,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin var/obj/item/stack/cable_coil/C = W if(C.use(1)) playsound(loc, C.usesound, 50, 1) - user.visible_message("[user.name] adds wires to the [name].", \ + user.visible_message("[user] adds wires to [src].", \ "You add some wires.") construction_state = ACCELERATOR_WIRED update_icon() diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 26ad13014a1..8f707cc1e14 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -412,12 +412,12 @@ if(istype(H.glasses, /obj/item/clothing/glasses/meson)) var/obj/item/clothing/glasses/meson/MS = H.glasses if(MS.vision_flags == SEE_TURFS) - to_chat(H, "You look directly into the [src.name], good thing you had your protective eyewear on!") + to_chat(H, "You look directly into [src], good thing you had your protective eyewear on!") return M.apply_effect(3, STUN) - M.visible_message("[M] stares blankly at the [src.name]!", \ - "You look directly into the [src.name] and feel weak.") + M.visible_message("[M] stares blankly at [src]!", \ + "You look directly into [src] and feel weak.") return diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index f830debdd17..f6d1fccdb73 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -154,7 +154,7 @@ return if(user.loc == loc) - to_chat(user, "You must not be on the same tile as the [src].") + to_chat(user, "You must not be on the same tile as [src].") return //Direction the terminal will face to @@ -173,7 +173,7 @@ to_chat(user, "You must remove the floor plating first.") return - to_chat(user, "You start adding cable to the [src].") + to_chat(user, "You start adding cable to [src].") playsound(loc, C.usesound, 50, 1) if(do_after(user, 50, target = src)) @@ -429,7 +429,7 @@ if(is_station_level(src.z)) if(prob(1)) //explosion for(var/mob/M in viewers(src)) - M.show_message("The [src.name] is making strange noises!", 3, "You hear sizzling electronics.", 2) + M.show_message("[src] is making strange noises!", 3, "You hear sizzling electronics.", 2) sleep(10*pick(4,5,6,7,10,14)) var/datum/effect_system/smoke_spread/smoke = new smoke.set_up(3, 0, src.loc) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 695ab02c43b..69eccb2d7a5 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -165,10 +165,10 @@ /obj/item/gun/energy/suicide_act(mob/user) if(can_shoot()) - user.visible_message("[user] is putting the barrel of the [name] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.") sleep(25) if(user.l_hand == src || user.r_hand == src) - user.visible_message("[user] melts [user.p_their()] face off with the [name]!") + user.visible_message("[user] melts [user.p_their()] face off with [src]!") playsound(loc, fire_sound, 50, 1, -1) var/obj/item/ammo_casing/energy/shot = ammo_type[select] cell.use(shot.e_cost) @@ -178,7 +178,7 @@ user.visible_message("[user] panics and starts choking to death!") return OXYLOSS else - user.visible_message("[user] is pretending to blow [user.p_their()] brains out with the [name]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!") playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1) return OXYLOSS diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 1e156ec612d..8d9f50cedd7 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -129,7 +129,7 @@ /obj/item/gun/energy/kinetic_accelerator/suicide_act(mob/user) if(!suppressed) playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) - user.visible_message("[user] cocks the [name] and pretends to blow [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] cocks [src] and pretends to blow [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!") shoot_live_shot(user, user, FALSE, FALSE) return OXYLOSS diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm index af7cffbe7c8..1b88098ed15 100644 --- a/code/modules/projectiles/guns/grenade_launcher.dm +++ b/code/modules/projectiles/guns/grenade_launcher.dm @@ -25,7 +25,7 @@ return I.loc = src grenades += I - to_chat(user, "You put the grenade in the [name].") + to_chat(user, "You put the grenade in [src].") to_chat(user, "[grenades.len] / [max_grenades] grenades.") else to_chat(user, "The grenade launcher cannot hold more grenades.") diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 44273f1e653..05a0134ded6 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -75,10 +75,10 @@ return /obj/item/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj) - to_chat(user, "The [name] whizzles quietly.") + to_chat(user, "[src] whizzles quietly.") return /obj/item/gun/magic/suicide_act(mob/user) - user.visible_message("[user] is twisting the [name] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is twisting [src] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide.") playsound(loc, fire_sound, 50, 1, -1) return FIRELOSS diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 6d9fd77e5a4..0a005077a6e 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -164,17 +164,17 @@ /obj/item/gun/projectile/suicide_act(mob/user) if(chambered && chambered.BB && !chambered.BB.nodamage) - user.visible_message("[user] is putting the barrel of the [name] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.") + user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.") sleep(25) if(user.l_hand == src || user.r_hand == src) process_fire(user, user, 0, zone_override = "head") - user.visible_message("[user] blows [user.p_their()] brains out with the [name]!") + user.visible_message("[user] blows [user.p_their()] brains out with [src]!") return BRUTELOSS else user.visible_message("[user] panics and starts choking to death!") return OXYLOSS else - user.visible_message("[user] is pretending to blow [user.p_their()] brains out with the [name]! It looks like [user.p_theyre()] trying to commit suicide!") + user.visible_message("[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!") playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1) return OXYLOSS diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index f710416258e..c182f909795 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -115,7 +115,7 @@ return else afterattack(user, user) - user.visible_message("The [src] goes click!", "The [src] you are holding goes click.") + user.visible_message("[src] goes click!", "[src] you are holding goes click.") if(magazine.ammo_count()) //Spill the mag onto the floor user.visible_message("[user.name] opens [src] up and the shells go goes flying around!", "You open [src] up and the shells go goes flying everywhere!!") while(get_ammo(0) > 0) @@ -158,7 +158,7 @@ return else afterattack(user, user) - user.visible_message("The [src] goes click!", "The [src] you are holding goes click.") + user.visible_message("[src] goes click!", "[src] you are holding goes click.") if(magazine.ammo_count()) //Spill the mag onto the floor user.visible_message("[user.name] opens [src] up and the shells go goes flying around!", "You open [src] up and the shells go goes flying everywhere!!") while(get_ammo() > 0) diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 415a7e0bb87..027de5c9f54 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -252,8 +252,8 @@ return 1 else blocked = 100 - target.visible_message("The [name] was deflected!", \ - "You were protected against the [name]!") + target.visible_message("[src] was deflected!", \ + "You were protected against [src]!") ..(target, blocked, hit_zone) reagents.set_reacting(TRUE) reagents.handle_reactions() diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 5d659eca377..490878ea74d 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -159,7 +159,7 @@ /obj/item/projectile/clown/Bump(atom/A as mob|obj|turf|area) do_sparks(3, 1, src) new /obj/effect/decal/cleanable/ash(loc) - visible_message("The [name] explodes!","You hear a snap!") + visible_message("[src] explodes!","You hear a snap!") playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 90c42cb4403..181bc65eeb1 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -458,7 +458,7 @@ ME2.Uses-- if(ME2.Uses <= 0) // give the notification that the slime core is dead for(var/mob/living/M in seen) - to_chat(M, "[bicon(my_atom)] The [my_atom]'s power is consumed in the reaction.") + to_chat(M, "[bicon(my_atom)] [my_atom]'s power is consumed in the reaction.") ME2.name = "used slime extract" ME2.desc = "This extract has been used up." diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index a8649eb5145..4ee5d7aa28e 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -571,7 +571,7 @@ cell.update_icon() cell.loc = get_turf(src) cell = null - to_chat(user, "You remove the cell from the [src].") + to_chat(user, "You remove the cell from [src].") update_icon() return ..() diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 2a58eaaf223..d3813ddffcc 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -88,7 +88,7 @@ return if(panel_open) - to_chat(user, "You can't use the [name] while it's panel is opened!") + to_chat(user, "You can't use [src] while it's panel is opened!") return TRUE if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks/drinkingglass)) diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index 995085b1dce..fd7a4001aa6 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -432,7 +432,7 @@ slime.update_name() continue slime.rabid = 1 - slime.visible_message("The [slime] is driven into a frenzy!") + slime.visible_message("[slime] is driven into a frenzy!") /datum/chemical_reaction/slimespeed @@ -563,7 +563,7 @@ SSblackbox.record_feedback("tally", "slime_cores_used", 1, type) if(holder.my_atom) var/obj/item/stack/ore/bluespace_crystal/BC = new(get_turf(holder.my_atom)) - BC.visible_message("The [BC.name] appears out of thin air!") + BC.visible_message("[BC] appears out of thin air!") //Cerulean /datum/chemical_reaction/slimepsteroid2 diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index ddd15413820..d3023b9d1ff 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -115,7 +115,7 @@ /obj/item/reagent_containers/dropper/precision/viral_injector/attack(mob/living/M, mob/living/user, def_zone) if(M.can_inject(user, TRUE)) - to_chat(user, "You stab [M] with the [src].") + to_chat(user, "You stealthily stab [M] with [src].") if(reagents.total_volume && M.reagents) var/list/injected = list() for(var/datum/reagent/R in reagents.reagent_list) diff --git a/code/modules/reagents/reagent_containers/iv_bag.dm b/code/modules/reagents/reagent_containers/iv_bag.dm index bb80be6a91a..e6db62b18ba 100644 --- a/code/modules/reagents/reagent_containers/iv_bag.dm +++ b/code/modules/reagents/reagent_containers/iv_bag.dm @@ -60,7 +60,7 @@ return if(get_dist(get_turf(src), get_turf(injection_target)) > 1) - to_chat(injection_target, "The [src]'s' needle is ripped out of you!") + to_chat(injection_target, "[src]'s needle is ripped out of you!") injection_target.apply_damage(3, BRUTE, pick("r_arm", "l_arm")) end_processing() return diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index adb27fccc82..b2afa9c06e3 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -120,11 +120,11 @@ if(ismob(G.affecting)) var/mob/GM = G.affecting for(var/mob/V in viewers(usr)) - V.show_message("[usr] starts putting [GM.name] into the disposal.", 3) + V.show_message("[usr] starts putting [GM] into the disposal.", 3) if(do_after(usr, 20, target = GM)) GM.forceMove(src) for(var/mob/C in viewers(src)) - C.show_message("[GM.name] has been placed in the [src] by [user].", 3) + C.show_message("[GM] has been placed in [src] by [user].", 3) qdel(G) add_attack_logs(usr, GM, "Disposal'ed", !!GM.ckey ? null : ATKLOG_ALL) return @@ -137,11 +137,11 @@ if(I) I.forceMove(src) - to_chat(user, "You place \the [I] into the [src].") + to_chat(user, "You place [I] into [src].") for(var/mob/M in viewers(src)) if(M == user) continue - M.show_message("[user.name] places \the [I] into the [src].", 3) + M.show_message("[user.name] places [I] into [src].", 3) update() @@ -203,11 +203,11 @@ return if(target == user && !user.stat && !user.IsWeakened() && !user.stunned && !user.paralysis) // if drop self, then climbed in // must be awake, not stunned or whatever - msg = "[user.name] climbs into the [src]." - to_chat(user, "You climb into the [src].") + msg = "[user.name] climbs into [src]." + to_chat(user, "You climb into [src].") else if(target != user && !user.restrained() && !user.stat && !user.IsWeakened() && !user.stunned && !user.paralysis) - msg = "[user.name] stuffs [target.name] into the [src]!" - to_chat(user, "You stuff [target.name] into the [src]!") + msg = "[user.name] stuffs [target.name] into [src]!" + to_chat(user, "You stuff [target.name] into [src]!") if(!iscarbon(user)) target.LAssailant = null else diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 5e8faa17bdb..83b09e5c228 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -95,7 +95,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). default_deconstruction_crowbar(user, O) return else - to_chat(user, "You can't load the [src.name] while it's opened.") + to_chat(user, "You can't load [src] while it's opened.") return if(O.is_open_container()) return FALSE diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index bbb2583b931..41b7fedd6db 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -62,10 +62,10 @@ Note: Must be placed within 3 tiles of the R&D Console if(disabled) return if(!linked_console) - to_chat(user, "The [src.name] must be linked to an R&D console first!") + to_chat(user, "[src] must be linked to an R&D console first!") return if(busy) - to_chat(user, "The [src.name] is busy right now.") + to_chat(user, "[src] is busy right now.") return if(istype(O, /obj/item) && !loaded_item) if(!O.origin_tech) @@ -76,12 +76,12 @@ Note: Must be placed within 3 tiles of the R&D Console to_chat(user, "You cannot deconstruct this item!") return if(!user.drop_item()) - to_chat(user, "\The [O] is stuck to your hand, you cannot put it in the [src.name]!") + to_chat(user, "[O] is stuck to your hand, you cannot put it in [src]!") return busy = 1 loaded_item = O O.loc = src - to_chat(user, "You add the [O.name] to the [src.name]!") + to_chat(user, "You add [O] to [src]!") flick("d_analyzer_la", src) spawn(10) icon_state = "d_analyzer_l" diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 1fda208e5d9..a89a70d6e6a 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -16,7 +16,7 @@ #define FAIL 8 /obj/machinery/r_n_d/experimentor - name = "E.X.P.E.R.I-MENTOR" + name = "\improper E.X.P.E.R.I-MENTOR" icon = 'icons/obj/machines/heavy_lathe.dmi' icon_state = "h_lathe" density = 1 @@ -129,16 +129,16 @@ return if(!checkCircumstances(O)) - to_chat(user, "The [O] is not yet valid for the [src] and must be completed!") + to_chat(user, "[O] is not yet valid for [src] and must be completed!") return if(disabled) return if(!linked_console) - to_chat(user, "The [src] must be linked to an R&D console first!") + to_chat(user, "[src] must be linked to an R&D console first!") return if(loaded_item) - to_chat(user, "The [src] is already loaded.") + to_chat(user, "[src] is already loaded.") return if(istype(O, /obj/item)) if(!O.origin_tech) @@ -152,7 +152,7 @@ return loaded_item = O O.loc = src - to_chat(user, "You add the [O.name] to the machine.") + to_chat(user, "You add [O] to the machine.") flick("h_lathe_load", src) return @@ -263,7 +263,7 @@ 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 [exp_on]!") var/mob/living/target = locate(/mob/living) in oview(7,src) if(target) var/obj/item/throwing = loaded_item @@ -443,7 +443,7 @@ if(exp == SCANTYPE_OBLITERATE) 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 [exp_on]!") new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src)))) if(linked_console.linked_lathe) var/datum/component/material_container/linked_materials = linked_console.linked_lathe.GetComponent(/datum/component/material_container) @@ -478,7 +478,7 @@ visible_message("[exp_on] [a], and [b], the experiment was a failure.") if(exp == SCANTYPE_DISCOVER) - visible_message("[src] scans the [exp_on], revealing its true nature!") + visible_message("[src] scans [exp_on], revealing its true nature!") playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 3, -1) var/obj/item/relic/R = loaded_item R.reveal() @@ -710,17 +710,17 @@ to_chat(user, "[src] begins to heat up!") spawn(rand(35,100)) if(src.loc == user) - visible_message("The [src]'s top opens, releasing a powerful blast!") + visible_message("[src]'s top opens, releasing a powerful blast!") explosion(user.loc, -1, rand(1,5), rand(1,5), rand(1,5), rand(1,5), flame_range = 2) warn_admins(user, "Explosion") qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!! /obj/item/relic/proc/teleport(mob/user) - to_chat(user, "The [src] begins to vibrate!") + to_chat(user, "[src] begins to vibrate!") spawn(rand(10,30)) var/turf/userturf = get_turf(user) if(src.loc == user && is_teleport_allowed(userturf.z)) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you! - visible_message("The [src] twists and bends, relocating itself!") + visible_message("[src] twists and bends, relocating itself!") throwSmoke(userturf) do_teleport(user, userturf, 8, asoundin = 'sound/effects/phasein.ogg') throwSmoke(get_turf(user)) diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 44fa7e00e1b..263e67dd795 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -102,7 +102,7 @@ Note: Must be placed west/left of and R&D console to function. default_deconstruction_crowbar(user, O) return 1 else - to_chat(user, "You can't load the [src.name] while it's opened.") + to_chat(user, "You can't load [src] while it's opened.") return 1 if(O.is_open_container()) return FALSE diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 52b220b866b..0c2079ef160 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -176,7 +176,7 @@ if(istype(M.buffer, /obj/machinery/monkey_recycler)) connected_recycler = M.buffer connected_recycler.connected += src - to_chat(user, "You link [src] to the recycler stored in the [M]'s buffer.") + to_chat(user, "You link [src] to the recycler stored in [M]'s buffer.") /datum/action/innate/slime_place name = "Place Slimes" diff --git a/code/modules/spacepods/lock_buster.dm b/code/modules/spacepods/lock_buster.dm index 8a83315ce3d..0907878fc17 100644 --- a/code/modules/spacepods/lock_buster.dm +++ b/code/modules/spacepods/lock_buster.dm @@ -11,4 +11,4 @@ icon_state = "lock_buster_on" else icon_state = "lock_buster_off" - to_chat(usr, "You turn the [src] [on ? "on" : "off"].") + to_chat(usr, "You turn [src] [on ? "on" : "off"].") diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm index fc03de708b5..29112499926 100644 --- a/code/modules/spacepods/spacepod.dm +++ b/code/modules/spacepods/spacepod.dm @@ -257,7 +257,7 @@ deal_damage(15) playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) to_chat(user, "You slash at [src]!") - visible_message("The [user] slashes at [src.name]'s armor!") + visible_message("[user] slashes at [src]'s armor!") /obj/spacepod/proc/deal_damage(damage) var/oldhealth = health @@ -391,22 +391,22 @@ else if(istype(W, /obj/item/lock_buster)) var/obj/item/lock_buster/L = W if(L.on && equipment_system.lock_system) - user.visible_message(user, "[user] is drilling through the [src]'s lock!", - "You start drilling through the [src]'s lock!") + user.visible_message(user, "[user] is drilling through [src]'s lock!", + "You start drilling through [src]'s lock!") if(do_after(user, 100 * W.toolspeed, target = src)) QDEL_NULL(equipment_system.lock_system) unlocked = TRUE - user.visible_message(user, "[user] has destroyed the [src]'s lock!", - "You destroy the [src]'s lock!") + user.visible_message(user, "[user] has destroyed [src]'s lock!", + "You destroy [src]'s lock!") else - user.visible_message(user, "[user] fails to break through the [src]'s lock!", - "You were unable to break through the [src]'s lock!") + user.visible_message(user, "[user] fails to break through [src]'s lock!", + "You were unable to break through [src]'s lock!") return if(L.on && unlocked == FALSE) //The buster is on, we don't have a lock system, and the pod is still somehow locked, unlocking. unlocked = TRUE user.visible_message(user, "[user] repairs [src]'s doors with [L].", "You repair [src]'s doors with [L].") - to_chat(user, "Turn the [L] on first.") + to_chat(user, "Turn [L] on first.") return else if(cargo_hold.storage_slots > 0 && !hatch_open && unlocked) // must be the last option as all items not listed prior will be stored @@ -471,7 +471,7 @@ target = passengers[1] if(target && istype(target)) - src.visible_message("[user] is trying to rip the door open and pull [target] out of the [src]!", + src.visible_message("[user] is trying to rip the door open and pull [target] out of [src]!", "You see [user] outside the door trying to rip it open!") if(do_after(user, 50, target = src)) target.Stun(1) @@ -479,11 +479,11 @@ eject_pilot() else eject_passenger(target) - target.visible_message("[user] flings the door open and tears [target] out of the [src]", - "The door flies open and you are thrown out of the [src] and to the ground!") + target.visible_message("[user] flings the door open and tears [target] out of [src]", + "The door flies open and you are thrown out of [src] and to the ground!") return target.visible_message("[user] was unable to get the door open!", - "You manage to keep [user] out of the [src]!") + "You manage to keep [user] out of [src]!") if(!hatch_open) if(cargo_hold.storage_slots > 0) @@ -867,9 +867,9 @@ occupant_sanity_check() if(usr.restrained()) - to_chat(usr, "You attempt to stumble out of the [src]. This will take two minutes.") + to_chat(usr, "You attempt to stumble out of [src]. This will take two minutes.") if(pilot) - to_chat(pilot, "[usr] is trying to escape the [src].") + to_chat(pilot, "[usr] is trying to escape [src].") if(!do_after(usr, 1200, target = src)) return @@ -1016,7 +1016,7 @@ else to_chat(user, "You fail to find anything of value.") else - to_chat(user, "You decide against searching the [src]") + to_chat(user, "You decide against searching [src]") /obj/spacepod/proc/enter_after(delay as num, mob/user as mob, numticks = 5) var/delayfraction = delay/numticks diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm index f4b5a02783a..3defa561f4f 100644 --- a/code/modules/station_goals/shield.dm +++ b/code/modules/station_goals/shield.dm @@ -126,7 +126,7 @@ to_chat(user, "You can only activate satellites which are in space.") return FALSE if(user) - to_chat(user, "You [active ? "deactivate": "activate"] the [src]") + to_chat(user, "You [active ? "deactivate": "activate"] [src]") active = !active if(active) animate(src, pixel_y = 2, time = 10, loop = -1) diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index ef05df1d350..319f044f449 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -99,12 +99,12 @@ if(L_item) A = pick(oview(range)) L_item.throw_at(A, range, 2) - to_chat(owner, "Your left arm spasms and throws the [L_item.name]!") + to_chat(owner, "Your left arm spasms and throws [L_item]!") l_hand_obj = null if(R_item) A = pick(oview(range)) R_item.throw_at(A, range, 2) - to_chat(owner, "Your right arm spasms and throws the [R_item.name]!") + to_chat(owner, "Your right arm spasms and throws [R_item]!") r_hand_obj = null /obj/item/organ/internal/cyberimp/brain/anti_drop/proc/release_items() diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index 62efb298006..797a3b7c11a 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -209,7 +209,7 @@ current_type = "burn" var/obj/item/stack/cable_coil/C = tool if(!(affected.burn_dam > 0)) - to_chat(user, "The [affected] does not have any burn damage!") + to_chat(user, "\The [affected] does not have any burn damage!") return -1 if(!istype(C)) return -1 @@ -223,7 +223,7 @@ else if(implement_type in implements_heal_brute) current_type = "brute" if(!(affected.brute_dam > 0 || affected.disfigured)) - to_chat(user, "The [affected] does not require welding repair!") + to_chat(user, "\The [affected] does not require welding repair!") return -1 if(tool.tool_behaviour == TOOL_WELDER) if(!tool.use(1)) diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 41fed1fd11e..36d151ced6d 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -70,7 +70,7 @@ if(M.buffer && istype(M.buffer, /obj/machinery/telepad)) telepad = M.buffer M.buffer = null - to_chat(user, "You upload the data from the [W.name]'s buffer.") + to_chat(user, "You upload the data from [M]'s buffer.") updateUsrDialog() else return ..()