diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 70da5ac19de..ee4d8f2deee 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -315,7 +315,7 @@
if(user != src)
// This doesn't factor in armor, or most damage modifiers (physiology). Your mileage may vary
- if(check_block(attacking_item, damage, "the [attacking_item.name]", MELEE_ATTACK, attacking_item.armour_penetration, attacking_item.damtype))
+ if(check_block(attacking_item, damage, "\the [attacking_item]", MELEE_ATTACK, attacking_item.armour_penetration, attacking_item.damtype))
return FALSE
SEND_SIGNAL(attacking_item, COMSIG_ITEM_ATTACK_ZONE, src, user, targeting)
diff --git a/code/datums/actions/mobs/charge.dm b/code/datums/actions/mobs/charge.dm
index 43cbb05c939..e12c93289c6 100644
--- a/code/datums/actions/mobs/charge.dm
+++ b/code/datums/actions/mobs/charge.dm
@@ -216,7 +216,7 @@
var/mob/living/living_target = target
if(ishuman(living_target))
var/mob/living/carbon/human/human_target = living_target
- if(human_target.check_block(source, 0, "the [source.name]", attack_type = LEAP_ATTACK) && living_source)
+ if(human_target.check_block(source, 0, "\the [source]", attack_type = LEAP_ATTACK) && living_source)
living_source.Stun(recoil_duration, ignore_canstun = TRUE)
return
diff --git a/code/datums/elements/disarm_attack.dm b/code/datums/elements/disarm_attack.dm
index 8b4b0b3ff8a..3256e738d53 100644
--- a/code/datums/elements/disarm_attack.dm
+++ b/code/datums/elements/disarm_attack.dm
@@ -27,7 +27,7 @@
SIGNAL_HANDLER
if(!user.can_disarm(victim) || !can_disarm_attack(source, victim, user))
return COMPONENT_SECONDARY_CANCEL_ATTACK_CHAIN
- if(victim.check_block(source, 0, "the [source.name]", MELEE_ATTACK, 0))
+ if(victim.check_block(source, 0, "\the [source]", MELEE_ATTACK, 0))
return COMPONENT_SECONDARY_CANCEL_ATTACK_CHAIN
user.disarm(victim, source)
user.changeNext_move(source.secondary_attack_speed || source.attack_speed)
diff --git a/code/datums/elements/glass_pacifist.dm b/code/datums/elements/glass_pacifist.dm
index 76204201c60..dbec37bc434 100644
--- a/code/datums/elements/glass_pacifist.dm
+++ b/code/datums/elements/glass_pacifist.dm
@@ -13,6 +13,6 @@
SIGNAL_HANDLER
if(istype(hit, /obj/structure/window))
- owner.visible_message(span_notice("[owner.name] nuzzles the [hit.name]!"))
+ owner.visible_message(span_notice("\The [owner] nuzzles \the [hit]!"))
new /obj/effect/temp_visual/heart(hit.loc)
return COMPONENT_CANCEL_ATTACK_CHAIN
diff --git a/code/game/machinery/computer/mechlaunchpad.dm b/code/game/machinery/computer/mechlaunchpad.dm
index 7590e690d07..ee3451bb12b 100644
--- a/code/game/machinery/computer/mechlaunchpad.dm
+++ b/code/game/machinery/computer/mechlaunchpad.dm
@@ -105,12 +105,12 @@
remove_pad(buffered_pad)
connect_launchpad(buffered_pad)
multitool.set_buffer(null)
- to_chat(user, span_notice("You connect the console to the pad with data from the [multitool.name]'s buffer."))
+ to_chat(user, span_notice("You connect the console to the pad with data from \the [multitool]'s buffer."))
return ITEM_INTERACT_SUCCESS
add_pad(buffered_pad)
multitool.set_buffer(null)
- to_chat(user, span_notice("You upload the data from the [multitool.name]'s buffer."))
+ to_chat(user, span_notice("You upload the data from \the [multitool]'s buffer."))
return ITEM_INTERACT_SUCCESS
/obj/machinery/computer/mechpad/proc/add_pad(obj/machinery/mechpad/pad)
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index d093cc0d355..5d130491b64 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -403,8 +403,8 @@
if(!panel_open || density || operating)
return
add_fingerprint(user)
- user.visible_message(span_notice("[user] removes the electronics from the [name]."), \
- span_notice("You start to remove electronics from the [name]..."))
+ user.visible_message(span_notice("[user] removes the electronics from \the [src]."), \
+ span_notice("You start to remove electronics from \the [src]..."))
if(!tool.use_tool(src, user, 40, volume=50))
return
if(!panel_open || density || operating || !loc)
diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm
index bbb6f33236d..1dd3e2f067b 100644
--- a/code/game/machinery/harvester.dm
+++ b/code/game/machinery/harvester.dm
@@ -104,7 +104,7 @@
operation_order = reverseList(carbon_occupant.bodyparts) //Chest and head are first in bodyparts, so we invert it to make them suffer more
warming_up = TRUE
harvesting = TRUE
- visible_message(span_notice("The [name] begins warming up!"))
+ visible_message(span_notice("\The [src] begins warming up!"))
say("Initializing harvest protocol.")
update_appearance()
addtimer(CALLBACK(src, PROC_REF(harvest)), interval)
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index abd481d525d..1e1d4f5fe63 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -448,7 +448,7 @@ Buildable meters
new /obj/machinery/meter/turf(loc, piping_layer)
S.play_tool_sound(src)
- to_chat(user, span_notice("You fasten the meter to the [loc.name]."))
+ to_chat(user, span_notice("You fasten the meter to \the [loc]."))
qdel(src)
/obj/item/pipe_meter/dropped()
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 25dc258a38d..5e8769f5aa0 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -257,7 +257,7 @@
)
user.add_mob_memory(/datum/memory/bomb_planted/syndicate, antagonist = src)
log_bomber(user, "has primed a", src, "for detonation (Payload: [payload.name])")
- payload.adminlog = "The [name] that [key_name(user)] had primed detonated!"
+ payload.adminlog = "\The [src] that [key_name(user)] had primed detonated!"
user.log_message("primed the [src]. (Payload: [payload.name])", LOG_GAME, log_globally = FALSE)
///Bomb Subtypes///
diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm
index adb2786a51c..75c2a2aaff4 100644
--- a/code/game/objects/effects/decals/cleanable/humans.dm
+++ b/code/game/objects/effects/decals/cleanable/humans.dm
@@ -330,7 +330,7 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache)
/obj/effect/decal/cleanable/blood/footprints/examine(mob/user)
. = ..()
if((shoe_types.len + species_types.len) > 0)
- . += "You recognise the [name] as belonging to:"
+ . += "You recognise \the [src] as belonging to:"
for(var/sole in shoe_types)
var/obj/item/clothing/item = sole
var/article = initial(item.gender) == PLURAL ? "Some" : "A"
diff --git a/code/game/objects/effects/posters/poster.dm b/code/game/objects/effects/posters/poster.dm
index ca4242daa76..e1091c04026 100644
--- a/code/game/objects/effects/posters/poster.dm
+++ b/code/game/objects/effects/posters/poster.dm
@@ -65,7 +65,7 @@
return
poster_structure.trap = WEAKREF(I)
- to_chat(user, span_notice("You conceal the [I.name] inside the rolled up poster."))
+ to_chat(user, span_notice("You conceal \the [I] inside the rolled up poster."))
/obj/item/poster/Exited(atom/movable/gone, direction)
. = ..()
diff --git a/code/game/objects/items/botpad_remote.dm b/code/game/objects/items/botpad_remote.dm
index 6b219725aa0..21620f05a7b 100644
--- a/code/game/objects/items/botpad_remote.dm
+++ b/code/game/objects/items/botpad_remote.dm
@@ -43,7 +43,7 @@
connected_botpad.connected_remote = src
connected_botpad.id = id
multitool.set_buffer(null)
- to_chat(user, span_notice("You connect the controller to the pad with data from the [multitool.name]'s buffer."))
+ to_chat(user, span_notice("You connect the controller to the pad with data from \the [multitool]'s buffer."))
return ITEM_INTERACT_SUCCESS
/obj/item/botpad_remote/proc/try_launch(mob/living/user)
diff --git a/code/game/objects/items/cigarettes.dm b/code/game/objects/items/cigarettes.dm
index f7e841c22ea..89bfb8280d7 100644
--- a/code/game/objects/items/cigarettes.dm
+++ b/code/game/objects/items/cigarettes.dm
@@ -545,11 +545,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM
return ..()
if(cig.lit)
- to_chat(user, span_warning("The [cig.name] is already lit!"))
+ to_chat(user, span_warning("\The [cig] is already lit!"))
if(M == user)
cig.attackby(src, user)
else
- cig.light(span_notice("[user] holds the [name] out for [M], and lights [M.p_their()] [cig.name]."))
+ cig.light(span_notice("[user] holds \the [src] out for [M], and lights [M.p_their()] [cig.name]."))
/obj/item/cigarette/fire_act(exposed_temperature, exposed_volume)
light()
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 7de4d4ff854..e8b842b39d2 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -508,7 +508,7 @@
clicky = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(ICON_SIZE_Y/2), ICON_SIZE_Y/2)
if(!instant)
- to_chat(user, span_notice("You start drawing a [temp] on the [target.name]..."))
+ to_chat(user, span_notice("You start drawing a [temp] on \the [target]..."))
if(pre_noise)
audible_message(span_notice("You hear spraying."))
diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm
index dde01baac03..4ede441b3eb 100644
--- a/code/game/objects/items/dna_injector.dm
+++ b/code/game/objects/items/dna_injector.dm
@@ -47,7 +47,7 @@
target.dna.remove_mutation(removed_mutation)
for(var/added_mutation in add_mutations)
if(added_mutation == /datum/mutation/human/race)
- message_admins("[ADMIN_LOOKUPFLW(user)] injected [key_name_admin(target)] with the [name] [span_danger("(MONKEY)")]")
+ message_admins("[ADMIN_LOOKUPFLW(user)] injected [key_name_admin(target)] with \the [src] [span_danger("(MONKEY)")]")
if(target.dna.mutation_in_sequence(added_mutation))
target.dna.activate_mutation(added_mutation)
else
@@ -119,7 +119,7 @@
if(target.dna.get_mutation(mutation))
continue //Skip permanent mutations we already have.
if(mutation == /datum/mutation/human/race && !ismonkey(target))
- message_admins("[ADMIN_LOOKUPFLW(user)] injected [key_name_admin(target)] with the [name] [span_danger("(MONKEY)")]")
+ message_admins("[ADMIN_LOOKUPFLW(user)] injected [key_name_admin(target)] with \the [src] [span_danger("(MONKEY)")]")
target.dna.add_mutation(mutation, MUT_OTHER, endtime)
else
target.dna.add_mutation(mutation, MUT_OTHER, endtime)
diff --git a/code/game/objects/items/forensicsspoofer.dm b/code/game/objects/items/forensicsspoofer.dm
index b2384d2dda2..49e8c2376ed 100644
--- a/code/game/objects/items/forensicsspoofer.dm
+++ b/code/game/objects/items/forensicsspoofer.dm
@@ -57,7 +57,7 @@
return
playsound(src, SFX_INDUSTRIAL_SCAN, 20, TRUE, -2, TRUE, FALSE)
user.visible_message(
- span_notice("\The [user] points the [name] at \the [target] and performs a forensic scan.")
+ span_notice("\The [user] points \the [src] at \the [target] and performs a forensic scan.")
)
/obj/item/forensics_spoofer/proc/clear_values(list/the_list)
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 4fe4a696a25..78031af7d74 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -53,7 +53,7 @@
. += span_notice("You scan the grenade and detect the following reagents:")
for(var/obj/item/reagent_containers/cup/glass_beaker in beakers)
for(var/datum/reagent/reagent in glass_beaker.reagents.reagent_list)
- . += span_notice("[reagent.volume] units of [reagent.name] in the [glass_beaker.name].")
+ . += span_notice("[reagent.volume] units of [reagent.name] in \the [glass_beaker].")
if(beakers.len == 1)
. += span_notice("You detect no second beaker in the grenade.")
else
@@ -126,7 +126,7 @@
if(!landminemode.secured)
landminemode.toggle_secure()
landminemode.toggle_scan(FALSE)
- to_chat(user, span_notice("You disarm the [landminemode.name]."))
+ to_chat(user, span_notice("You disarm \the [landminemode]."))
tool.play_tool_sound(src, 25)
else
to_chat(user, span_warning("You need to add at least one beaker before locking the [initial(name)] assembly!"))
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index e63085d65be..caecc135962 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -423,7 +423,7 @@
return ..()
/obj/item/restraints/legcuffs/beartrap/suicide_act(mob/living/user)
- user.visible_message(span_suicide("[user] is sticking [user.p_their()] head in the [src.name]! It looks like [user.p_theyre()] trying to commit suicide!"))
+ user.visible_message(span_suicide("[user] is sticking [user.p_their()] head in \the [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
playsound(loc, 'sound/items/weapons/bladeslice.ogg', 50, TRUE, -1)
return BRUTELOSS
diff --git a/code/game/objects/items/knives.dm b/code/game/objects/items/knives.dm
index 438a157e9a6..158608d6f01 100644
--- a/code/game/objects/items/knives.dm
+++ b/code/game/objects/items/knives.dm
@@ -54,9 +54,9 @@
AddComponent(/datum/component/alternative_sharpness, SHARP_POINTY, alt_continuous, alt_simple)
/obj/item/knife/suicide_act(mob/living/user)
- user.visible_message(pick(span_suicide("[user] is slitting [user.p_their()] wrists with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide."), \
- span_suicide("[user] is slitting [user.p_their()] throat with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide."), \
- span_suicide("[user] is slitting [user.p_their()] stomach open with the [src.name]! It looks like [user.p_theyre()] trying to commit seppuku.")))
+ user.visible_message(pick(span_suicide("[user] is slitting [user.p_their()] wrists with \the [src]! It looks like [user.p_theyre()] trying to commit suicide."), \
+ span_suicide("[user] is slitting [user.p_their()] throat with \the [src]! It looks like [user.p_theyre()] trying to commit suicide."), \
+ span_suicide("[user] is slitting [user.p_their()] stomach open with \the [src]! It looks like [user.p_theyre()] trying to commit seppuku.")))
return BRUTELOSS
/obj/item/knife/ritual
diff --git a/code/game/objects/items/lighter.dm b/code/game/objects/items/lighter.dm
index 38794ab9079..625b123c2e5 100644
--- a/code/game/objects/items/lighter.dm
+++ b/code/game/objects/items/lighter.dm
@@ -203,15 +203,15 @@
return ..()
if(cig.lit)
- to_chat(user, span_warning("The [cig.name] is already lit!"))
+ to_chat(user, span_warning("\The [cig] is already lit!"))
if(target_mob == user)
cig.attackby(src, user)
return
if(fancy)
- cig.light(span_rose("[user] whips the [name] out and holds it for [target_mob]. [user.p_Their()] arm is as steady as the unflickering flame [user.p_they()] light[user.p_s()] \the [cig] with."))
+ cig.light(span_rose("[user] whips \the [src] out and holds it for [target_mob]. [user.p_Their()] arm is as steady as the unflickering flame [user.p_they()] light[user.p_s()] \the [cig] with."))
else
- cig.light(span_notice("[user] holds the [name] out for [target_mob], and lights [target_mob.p_their()] [cig.name]."))
+ cig.light(span_notice("[user] holds \the [src] out for [target_mob], and lights [target_mob.p_their()] [cig.name]."))
///Checks if the lighter is able to perform a welding task.
/obj/item/lighter/tool_use_check(mob/living/user, amount, heat_required)
@@ -333,7 +333,7 @@
fancy = FALSE
/obj/item/lighter/mime/ignition_effect(atom/A, mob/user)
- . = span_infoplain("[user] lifts the [name] to the [A], which miraculously lights!")
+ . = span_infoplain("[user] lifts \the [src] to the [A], which miraculously lights!")
/obj/item/lighter/bright
name = "illuminative zippo"
diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm
index 1b5f9a9fd90..74e5d54e8b1 100644
--- a/code/game/objects/items/melee/baton.dm
+++ b/code/game/objects/items/melee/baton.dm
@@ -555,7 +555,7 @@
attack(user, user)
return FIRELOSS
else
- user.visible_message(span_suicide("[user] is shoving the [name] down their throat! It looks like [user.p_theyre()] trying to commit suicide!"))
+ user.visible_message(span_suicide("[user] is shoving \the [src] down their throat! It looks like [user.p_theyre()] trying to commit suicide!"))
return OXYLOSS
/obj/item/melee/baton/security/Destroy()
@@ -877,10 +877,10 @@
our_crystal.use(1)
our_prod = /obj/item/melee/baton/security/cattleprod/telecrystalprod
else
- to_chat(user, span_notice("You don't think the [item.name] will do anything to improve the [src]."))
+ to_chat(user, span_notice("You don't think \the [item] will do anything to improve \the [src]."))
return ..()
- to_chat(user, span_notice("You place the [item.name] firmly into the igniter."))
+ to_chat(user, span_notice("You place \the [item] firmly into \the [sparkler]."))
remove_item_from_storage(user)
qdel(src)
var/obj/item/melee/baton/security/cattleprod/brand_new_prod = new our_prod(user.loc)
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 7cb720daee3..6d1bbe7bc64 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
return
CC.use(5)
use(1)
- to_chat(user, span_notice("You attach wire to the [name]."))
+ to_chat(user, span_notice("You attach wire to \the [src]."))
var/obj/item/stack/light_w/new_tile = new(user.loc)
if (!QDELETED(new_tile))
new_tile.add_fingerprint(user)
diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm
index c9153c82844..9023c8270b5 100644
--- a/code/game/objects/items/stacks/sheets/light.dm
+++ b/code/game/objects/items/stacks/sheets/light.dm
@@ -16,7 +16,7 @@
/obj/item/stack/light_w/examine(mob/user)
. = ..()
- . += span_warning("The [name] looks unfinished, add iron to complete it.")
+ . += span_warning("\The [src] looks unfinished, add iron to complete it.")
/obj/item/stack/light_w/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/stack/sheet/iron))
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 72f1d5f1ce2..8a601736e78 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -112,10 +112,10 @@
AddComponent(/datum/component/electrified_buckle, (SHOCK_REQUIREMENT_ITEM | SHOCK_REQUIREMENT_LIVE_CABLE | SHOCK_REQUIREMENT_SIGNAL_RECEIVED_TOGGLE), input_shock_kit, overlays_from_child_procs, FALSE)
if(HAS_TRAIT(src, TRAIT_ELECTRIFIED_BUCKLE))
- to_chat(user, span_notice("You connect the shock kit to the [name], electrifying it "))
+ to_chat(user, span_notice("You connect the shock kit to \the [src], electrifying it "))
else
user.put_in_active_hand(input_shock_kit)
- to_chat(user, span_notice("You cannot fit the shock kit onto the [name]!"))
+ to_chat(user, span_notice("You cannot fit the shock kit onto \the [src]!"))
/obj/structure/chair/wrench_act_secondary(mob/living/user, obj/item/weapon)
diff --git a/code/game/objects/structures/cannons/mounted_guns/mounted_gun.dm b/code/game/objects/structures/cannons/mounted_guns/mounted_gun.dm
index a027bd94e00..96510c6a9f7 100644
--- a/code/game/objects/structures/cannons/mounted_guns/mounted_gun.dm
+++ b/code/game/objects/structures/cannons/mounted_guns/mounted_gun.dm
@@ -117,7 +117,7 @@
/obj/structure/mounted_gun/pipe/examine_more(mob/user)
. = ..()
- . += span_notice("Looking down at the [name], you recall a tale told to you in some distant memory...")
+ . += span_notice("Looking down at \the [src], you recall a tale told to you in some distant memory...")
. += span_info("To commit an act of vengeance is not unlike to enter a blood pact with a devil, ending the life of another, at the cost of your own.")
. += span_info("When humanity first spilled the blood of its own kind, with likely nothing more than a rock, the seal was broken. Vengeance was borne unto the world.")
diff --git a/code/game/objects/structures/gym/weight_machine.dm b/code/game/objects/structures/gym/weight_machine.dm
index a329f70750d..a0a1162057b 100644
--- a/code/game/objects/structures/gym/weight_machine.dm
+++ b/code/game/objects/structures/gym/weight_machine.dm
@@ -112,7 +112,7 @@
var/clumsy_chance = 30 - (user.mind.get_skill_level(/datum/skill/athletics) * 5)
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(clumsy_chance))
playsound(src, 'sound/effects/bang.ogg', 50, TRUE)
- to_chat(user, span_warning("Your hand slips, causing the [name] to smash you!"))
+ to_chat(user, span_warning("Your hand slips, causing \the [src] to smash you!"))
user.take_bodypart_damage(rand(2, 5))
end_workout()
return
diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm
index 5518375de68..2975d08f1f2 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube.dm
@@ -38,9 +38,9 @@
for(var/obj/structure/transit_tube_pod/pod in src.loc)
to_chat(user, span_warning("Remove the pod first!"))
return
- user.visible_message(span_notice("[user] starts to detach \the [src]."), span_notice("You start to detach the [name]..."))
+ user.visible_message(span_notice("[user] starts to detach \the [src]."), span_notice("You start to detach \the [src]..."))
if(W.use_tool(src, user, 2 SECONDS, volume=50))
- to_chat(user, span_notice("You detach the [name]."))
+ to_chat(user, span_notice("You detach \the [src]."))
var/obj/structure/c_transit_tube/R = new tube_construction(loc)
R.setDir(dir)
transfer_fingerprints_to(R)
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
index e6b0f30225c..420e39f627d 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
@@ -42,10 +42,10 @@
..()
if(!can_wrench_in_loc(user))
return
- to_chat(user, span_notice("You start attaching the [name]..."))
+ to_chat(user, span_notice("You start attaching \the [src]..."))
add_fingerprint(user)
if(I.use_tool(src, user, 2 SECONDS, volume=50, extra_checks=CALLBACK(src, PROC_REF(can_wrench_in_loc), user)))
- to_chat(user, span_notice("You attach the [name]."))
+ to_chat(user, span_notice("You attach \the [src]."))
var/obj/structure/transit_tube/R = new build_type(loc, dir)
transfer_fingerprints_to(R)
qdel(src)
diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm
index 52372448616..726b7274834 100644
--- a/code/game/shuttle_engines.dm
+++ b/code/game/shuttle_engines.dm
@@ -111,12 +111,12 @@
. = ..()
switch(engine_state)
if(ENGINE_UNWRENCHED)
- to_chat(user, span_warning("The [src.name] needs to be wrenched to the floor!"))
+ to_chat(user, span_warning("\The [src] needs to be wrenched to the floor!"))
if(ENGINE_WRENCHED)
if(!tool.tool_start_check(user, amount=round(ENGINE_WELDTIME / 5), heat_required = HIGH_TEMPERATURE_REQUIRED))
return TRUE
- user.visible_message(span_notice("[user.name] starts to weld the [name] to the floor."), \
+ user.visible_message(span_notice("[user.name] starts to weld \the [src] to the floor."), \
span_notice("You start to weld \the [src] to the floor..."), \
span_hear("You hear welding."))
@@ -129,7 +129,7 @@
if(!tool.tool_start_check(user, amount=round(ENGINE_WELDTIME / 5), heat_required = HIGH_TEMPERATURE_REQUIRED))
return TRUE
- user.visible_message(span_notice("[user.name] starts to cut the [name] free from the floor."), \
+ user.visible_message(span_notice("[user.name] starts to cut \the [src] free from the floor."), \
span_notice("You start to cut \the [src] free from the floor..."), \
span_hear("You hear welding."))
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index 27aa1d36920..4337fc3eb03 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -373,7 +373,7 @@
if(!(lube & SLIDE_ICE))
// Ice slides are intended to be combo'd so don't give the feedback
- to_chat(slipper, span_notice("You slipped[ slippable ? " on the [slippable.name]" : ""]!"))
+ to_chat(slipper, span_notice("You slipped[ slippable ? " on \the [slippable]" : ""]!"))
playsound(slipper.loc, 'sound/misc/slip.ogg', 50, TRUE, -3)
SEND_SIGNAL(slipper, COMSIG_ON_CARBON_SLIP)
diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm
index a71ed37f374..421e4c61a83 100644
--- a/code/game/turfs/open/lava.dm
+++ b/code/game/turfs/open/lava.dm
@@ -225,7 +225,7 @@
if(istype(C, /obj/item/cigarette))
var/obj/item/cigarette/ciggie = C
if(ciggie.lit)
- to_chat(user, span_warning("The [ciggie.name] is already lit!"))
+ to_chat(user, span_warning("\The [ciggie] is already lit!"))
return TRUE
var/clumsy_modifier = HAS_TRAIT(user, TRAIT_CLUMSY) ? 2 : 1
if(prob(25 * clumsy_modifier) && isliving(user))
diff --git a/code/modules/antagonists/clown_ops/clown_weapons.dm b/code/modules/antagonists/clown_ops/clown_weapons.dm
index c801d3ce6f6..49bef43a6e4 100644
--- a/code/modules/antagonists/clown_ops/clown_weapons.dm
+++ b/code/modules/antagonists/clown_ops/clown_weapons.dm
@@ -249,7 +249,7 @@
QDEL_NULL(bomb)
/obj/item/grown/bananapeel/bombanana/suicide_act(mob/living/user)
- user.visible_message(span_suicide("[user] is deliberately slipping on the [src.name]! It looks like \he's trying to commit suicide."))
+ user.visible_message(span_suicide("[user] is deliberately slipping on \the [src]! It looks like \he's trying to commit suicide."))
playsound(loc, 'sound/misc/slip.ogg', 50, TRUE, -1)
bomb.arm_grenade(user, 0, FALSE)
return BRUTELOSS
diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm
index b0f3e5a6d36..843728199db 100644
--- a/code/modules/antagonists/cult/cult_comms.dm
+++ b/code/modules/antagonists/cult/cult_comms.dm
@@ -81,7 +81,7 @@
var/my_message
if(!message)
return
- my_message = span_cult_bold_italic("The [user.name]: [message]")
+ my_message = span_cult_bold_italic("\The [user]: [message]")
for(var/mob/player_list as anything in GLOB.player_list)
if(IS_CULTIST(player_list))
to_chat(player_list, my_message)
diff --git a/code/modules/antagonists/cult/datums/cult_team.dm b/code/modules/antagonists/cult/datums/cult_team.dm
index 3554a59c3b4..927ab734bde 100644
--- a/code/modules/antagonists/cult/datums/cult_team.dm
+++ b/code/modules/antagonists/cult/datums/cult_team.dm
@@ -164,7 +164,7 @@
if(cultist.current.stat == DEAD || !cultist.current.client)
continue
- to_chat(cultist.current, span_bold(span_cult_large("[marker] has marked [blood_target] in the [target_area.name] as the cult's top priority, get there immediately!")))
+ to_chat(cultist.current, span_bold(span_cult_large("[marker] has marked [blood_target] in \the [target_area] as the cult's top priority, get there immediately!")))
SEND_SOUND(cultist.current, sound(SFX_HALLUCINATION_OVER_HERE, 0, 1, 75))
cultist.current.client.images += blood_target_image
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index f4b424e4f20..a01217ea4f9 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -1174,7 +1174,7 @@ GLOBAL_VAR_INIT(narsie_summon_count, 0)
addtimer(CALLBACK(M, TYPE_PROC_REF(/atom/, remove_alt_appearance),"cult_apoc",TRUE), duration)
images += C
else
- to_chat(M, span_cult_large("An Apocalypse Rune was invoked in the [place.name], it is no longer available as a summoning site!"))
+ to_chat(M, span_cult_large("An Apocalypse Rune was invoked in \the [place], it is no longer available as a summoning site!"))
SEND_SOUND(M, 'sound/effects/pope_entry.ogg')
image_handler(images, duration)
if(intensity >= 285) // Based on the prior formula, this means the cult makes up <15% of current players
diff --git a/code/modules/antagonists/voidwalker/voidwalker_loot.dm b/code/modules/antagonists/voidwalker/voidwalker_loot.dm
index 11a51c8a5b2..7e14e252833 100644
--- a/code/modules/antagonists/voidwalker/voidwalker_loot.dm
+++ b/code/modules/antagonists/voidwalker/voidwalker_loot.dm
@@ -25,7 +25,7 @@
to_chat(user, span_bolddanger("OH GOD NOO!!!! WHYYYYYYYYY!!!!! WHO WOULD DO THIS?!!"))
return
- to_chat(user, span_purple("You begin staring into the [name]..."))
+ to_chat(user, span_purple("You begin staring into \the [src]..."))
if(!do_after(user, 10 SECONDS, src))
return
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 0ac5993aecc..00fa02caab4 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -70,7 +70,7 @@
/obj/item/assembly/proc/is_secured(mob/user)
if(!secured)
- to_chat(user, span_warning("The [name] is unsecured!"))
+ to_chat(user, span_warning("\The [src] is unsecured!"))
return FALSE
return TRUE
diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm
index eed92903f3c..653a4990797 100644
--- a/code/modules/detectivework/scanner.dm
+++ b/code/modules/detectivework/scanner.dm
@@ -115,7 +115,7 @@
user.visible_message(
- span_notice("\The [user] points the [src.name] at \the [scanned_atom] and performs a forensic scan."),
+ span_notice("\The [user] points \the [src] at \the [scanned_atom] and performs a forensic scan."),
ignored_mobs = user
)
to_chat(user, span_notice("You scan \the [scanned_atom]. The scanner is now analysing the results..."))
diff --git a/code/modules/food_and_drinks/machinery/smartfridge.dm b/code/modules/food_and_drinks/machinery/smartfridge.dm
index afd566b7e47..36fafdf4ff7 100644
--- a/code/modules/food_and_drinks/machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/machinery/smartfridge.dm
@@ -64,7 +64,7 @@
return ITEM_INTERACT_BLOCKING
user.visible_message(
- span_notice("[user.name] starts to cut the [name] free from the floor."),
+ span_notice("[user.name] starts to cut \the [src] free from the floor."),
span_notice("You start to cut [src] free from the floor..."),
span_hear("You hear welding."),
)
@@ -84,7 +84,7 @@
return ITEM_INTERACT_BLOCKING
user.visible_message(
- span_notice("[user.name] starts to weld the [name] to the floor."),
+ span_notice("[user.name] starts to weld \the [src] to the floor."),
span_notice("You start to weld [src] to the floor..."),
span_hear("You hear welding."),
)
diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm
index 82607e4049c..c451c1f2746 100644
--- a/code/modules/food_and_drinks/pizzabox.dm
+++ b/code/modules/food_and_drinks/pizzabox.dm
@@ -173,7 +173,7 @@
return
bomb_defused = FALSE
log_bomber(user, "has trapped a", src, "with [bomb] set to [bomb_timer] seconds")
- bomb.adminlog = "The [bomb.name] in [src.name] that [key_name(user)] activated has detonated!"
+ bomb.adminlog = "\The [bomb] in [src.name] that [key_name(user)] activated has detonated!"
balloon_alert(user, "bomb set")
update_appearance()
else if(length(boxes))
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 640eadcd035..665b5f19cc2 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -204,7 +204,7 @@
if(bees_attack)
visible_message(span_danger("[user] disturbs the bees!"))
else
- visible_message(span_danger("[user] disturbs the [name] to no effect!"))
+ visible_message(span_danger("[user] disturbs \the [src] to no effect!"))
else
var/option = tgui_alert(user, "Which piece do you wish to remove?", "Apiary Adjustment", list("Honey Frame", "Queen Bee"))
if(!option || QDELETED(user) || QDELETED(src) || !user.can_perform_action(src, NEED_DEXTERITY))
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 3549b3e965f..f5e7c7b29a4 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -73,7 +73,7 @@
if(!tool.tool_start_check(user, amount=2))
return TRUE
user.visible_message(
- span_notice("[user.name] starts to cut the [name] free from the floor."),
+ span_notice("[user.name] starts to cut \the [src] free from the floor."),
span_notice("You start to cut [src] free from the floor..."),
span_hear("You hear welding."),
)
@@ -88,7 +88,7 @@
if(!tool.tool_start_check(user, amount=2))
return TRUE
user.visible_message(
- span_notice("[user.name] starts to weld the [name] to the floor."),
+ span_notice("[user.name] starts to weld \the [src] to the floor."),
span_notice("You start to weld [src] to the floor..."),
span_hear("You hear welding."),
)
diff --git a/code/modules/meteors/meteor_changeling.dm b/code/modules/meteors/meteor_changeling.dm
index 9c25f8b6776..268ccccab1c 100644
--- a/code/modules/meteors/meteor_changeling.dm
+++ b/code/modules/meteors/meteor_changeling.dm
@@ -38,7 +38,7 @@
for(var/atom/movable/changeling in contents)
changeling.forceMove(get_turf(src))
changeling.throw_at(landing_target, 2, 2)
- changeling.visible_message(span_warning("[changeling] is launched out from inside of the [name]"), span_changeling("Sensing that something is terribly wrong, we forcibly eject ourselves from the [name]!"))
+ changeling.visible_message(span_warning("[changeling] is launched out from inside of \the [src]!"), span_changeling("Sensing that something is terribly wrong, we forcibly eject ourselves from \the [src]!"))
playsound(changeling, 'sound/effects/splat.ogg', 50, pressure_affected = FALSE)
return ..()
diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index fa9b63a4658..909e3985a62 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -15,7 +15,7 @@
slot_flags = ITEM_SLOT_BELT
/obj/item/wormhole_jaunter/attack_self(mob/user)
- user.visible_message(span_notice("[user.name] activates the [src.name]!"))
+ user.visible_message(span_notice("[user.name] activates \the [src]!"))
SSblackbox.record_feedback("tally", "jaunter", 1, "User") // user activated
activate(user, TRUE)
@@ -23,7 +23,7 @@
var/turf/device_turf = get_turf(src)
if(!device_turf || is_centcom_level(device_turf.z) || is_reserved_level(device_turf.z))
if(user)
- to_chat(user, span_notice("You're having difficulties getting the [src.name] to work."))
+ to_chat(user, span_notice("You're having difficulties getting \the [src] to work."))
return FALSE
return TRUE
diff --git a/code/modules/mob/living/basic/cult/constructs/juggernaut.dm b/code/modules/mob/living/basic/cult/constructs/juggernaut.dm
index 5d5ae8c6454..696cb4db853 100644
--- a/code/modules/mob/living/basic/cult/constructs/juggernaut.dm
+++ b/code/modules/mob/living/basic/cult/constructs/juggernaut.dm
@@ -44,8 +44,8 @@
apply_damage(bullet.damage * 0.5, bullet.damage_type)
visible_message(
- span_danger("The [bullet.name] is reflected by [src]'s armored shell!"),
- span_userdanger("The [bullet.name] is reflected by your armored shell!"),
+ span_danger("\The [bullet] is reflected by [src]'s armored shell!"),
+ span_userdanger("\The [bullet] is reflected by your armored shell!"),
)
bullet.reflect(src)
diff --git a/code/modules/mob/living/basic/pets/cat/keeki.dm b/code/modules/mob/living/basic/pets/cat/keeki.dm
index 7314f9b4906..93bafae582b 100644
--- a/code/modules/mob/living/basic/pets/cat/keeki.dm
+++ b/code/modules/mob/living/basic/pets/cat/keeki.dm
@@ -50,7 +50,7 @@
so quickly that it generally doesn't matter. You're remarkably resilient to any damage besides this and it's hard for you to really die at all. You should go around and bring happiness and \
free cake to the station!")
var/default_name = initial(name)
- var/new_name = sanitize_name(reject_bad_text(tgui_input_text(src, "You are the [name]. Would you like to change your name to something else?", "Name change", default_name, MAX_NAME_LEN)), cap_after_symbols = FALSE)
+ var/new_name = sanitize_name(reject_bad_text(tgui_input_text(src, "You are \the [src]. Would you like to change your name to something else?", "Name change", default_name, MAX_NAME_LEN)), cap_after_symbols = FALSE)
if(new_name)
to_chat(src, span_notice("Your name is now [new_name]!"))
name = new_name
diff --git a/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm b/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm
index c5fac5f966e..18b956e5ec2 100644
--- a/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm
+++ b/code/modules/mob/living/basic/pets/dog/dog_subtypes.dm
@@ -109,7 +109,7 @@
so quickly that it generally doesn't matter. You're remarkably resilient to any damage besides this and it's hard for you to really die at all. You should go around and bring happiness and \
free bread to the station! 'I’m not alone, and you aren’t either'")
var/default_name = "Kobun"
- var/new_name = sanitize_name(reject_bad_text(tgui_input_text(src, "You are the [name]. Would you like to change your name to something else?", "Name change", default_name, MAX_NAME_LEN)), cap_after_symbols = FALSE)
+ var/new_name = sanitize_name(reject_bad_text(tgui_input_text(src, "You are \the [src]. Would you like to change your name to something else?", "Name change", default_name, MAX_NAME_LEN)), cap_after_symbols = FALSE)
if(new_name)
to_chat(src, span_notice("Your name is now [new_name]!"))
name = new_name
diff --git a/code/modules/mob/living/basic/slime/slime.dm b/code/modules/mob/living/basic/slime/slime.dm
index 8f80e24f699..f5380143795 100644
--- a/code/modules/mob/living/basic/slime/slime.dm
+++ b/code/modules/mob/living/basic/slime/slime.dm
@@ -312,9 +312,9 @@
if(prob(stunprob) && our_slime.powerlevel >= SLIME_EXTRA_SHOCK_COST)
our_slime.powerlevel = clamp(our_slime.powerlevel - SLIME_EXTRA_SHOCK_COST, SLIME_MIN_POWER, SLIME_MAX_POWER)
borg_target.apply_damage(our_slime.powerlevel * rand(6, 10), BRUTE, spread_damage = TRUE, wound_bonus = CANT_WOUND)
- borg_target.visible_message(span_danger("The [our_slime.name] shocks [borg_target]!"), span_userdanger("The [our_slime.name] shocks you!"))
+ borg_target.visible_message(span_danger("\The [our_slime] shocks [borg_target]!"), span_userdanger("\The [our_slime] shocks you!"))
else
- borg_target.visible_message(span_danger("The [our_slime.name] fails to hurt [borg_target]!"), span_userdanger("The [our_slime.name] failed to hurt you!"))
+ borg_target.visible_message(span_danger("\The [our_slime] fails to hurt [borg_target]!"), span_userdanger("\The [our_slime] failed to hurt you!"))
return COMPONENT_HOSTILE_NO_ATTACK
@@ -324,7 +324,7 @@
if(!prob(stunprob))
return NONE // normal attack
- carbon_target.visible_message(span_danger("The [our_slime.name] shocks [carbon_target]!"), span_userdanger("The [our_slime.name] shocks you!"))
+ carbon_target.visible_message(span_danger("\The [our_slime] shocks [carbon_target]!"), span_userdanger("\The [our_slime] shocks you!"))
do_sparks(5, TRUE, carbon_target)
var/power = our_slime.powerlevel + rand(0,3)
diff --git a/code/modules/mob/living/basic/space_fauna/bear/_bear.dm b/code/modules/mob/living/basic/space_fauna/bear/_bear.dm
index e6d77586e4b..f21ae028684 100644
--- a/code/modules/mob/living/basic/space_fauna/bear/_bear.dm
+++ b/code/modules/mob/living/basic/space_fauna/bear/_bear.dm
@@ -170,7 +170,7 @@
so quickly that it generally doesn't matter. You're remarkably resilient to any damage besides this and it's hard for you to really die at all. You should go around and bring happiness and \
free butter to the station!")
var/default_name = "Terrygold"
- var/new_name = sanitize_name(reject_bad_text(tgui_input_text(src, "You are the [name]. Would you like to change your name to something else?", "Name change", default_name, MAX_NAME_LEN)), cap_after_symbols = FALSE)
+ var/new_name = sanitize_name(reject_bad_text(tgui_input_text(src, "You are \the [src]. Would you like to change your name to something else?", "Name change", default_name, MAX_NAME_LEN)), cap_after_symbols = FALSE)
if(new_name)
to_chat(src, span_notice("Your name is now [new_name]!"))
name = new_name
diff --git a/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm b/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm
index 9764f07fb9d..6241108c168 100644
--- a/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm
@@ -80,7 +80,7 @@
var/blocked = FALSE
if(ishuman(hit_atom))
var/mob/living/carbon/human/H = hit_atom
- if(H.check_block(src, 0, "the [name]", attack_type = LEAP_ATTACK))
+ if(H.check_block(src, 0, "\the [src]", attack_type = LEAP_ATTACK))
blocked = TRUE
if(!blocked)
L.visible_message(span_danger("[src] pounces on [L]!"), span_userdanger("[src] pounces on you!"))
diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm
index 3948534254b..1eed98b6175 100644
--- a/code/modules/mob/living/carbon/human/_species.dm
+++ b/code/modules/mob/living/carbon/human/_species.dm
@@ -716,7 +716,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
return FALSE
if(I.w_class > WEIGHT_CLASS_BULKY)
if(!disable_warning)
- to_chat(H, span_warning("The [I.name] is too big to attach!")) //should be src?
+ to_chat(H, span_warning("\The [I] is too big to attach!")) //should be src?
return FALSE
if( istype(I, /obj/item/modular_computer/pda) || istype(I, /obj/item/pen) || is_type_in_list(I, H.wear_suit.allowed) )
return TRUE
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 95774e8b54e..2523ea4dd92 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -51,8 +51,8 @@
if(bullet.reflectable)
if(check_reflect(def_zone)) // Checks if you've passed a reflection% check
visible_message(
- span_danger("The [bullet.name] gets reflected by [src]!"),
- span_userdanger("The [bullet.name] gets reflected by [src]!"),
+ span_danger("\The [bullet] gets reflected by [src]!"),
+ span_userdanger("\The [bullet] gets reflected by [src]!"),
)
// Finds and plays the block_sound of item which reflected
for(var/obj/item/held_item in held_items)
@@ -64,7 +64,7 @@
bullet.reflect(src)
return BULLET_ACT_FORCE_PIERCE // complete projectile permutation
- if(check_block(bullet, bullet.damage, "the [bullet.name]", PROJECTILE_ATTACK, bullet.armour_penetration, bullet.damage_type))
+ if(check_block(bullet, bullet.damage, "\the [bullet]", PROJECTILE_ATTACK, bullet.armour_penetration, bullet.damage_type))
bullet.on_hit(src, 100, def_zone, piercing_hit)
return BULLET_ACT_HIT
@@ -191,7 +191,7 @@
var/damage = HAS_TRAIT(user, TRAIT_PERFECT_ATTACKER) ? monkey_mouth.unarmed_damage_high : rand(monkey_mouth.unarmed_damage_low, monkey_mouth.unarmed_damage_high)
if(!damage)
return FALSE
- if(check_block(user, damage, "the [user.name]", attack_type = UNARMED_ATTACK))
+ if(check_block(user, damage, "\the [user]", attack_type = UNARMED_ATTACK))
return FALSE
apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, MELEE))
return TRUE
@@ -248,18 +248,18 @@
return TRUE
apply_damage(damage, BRUTE, affecting, armor_block)
-/mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L, list/modifiers)
+/mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/worm, list/modifiers)
. = ..()
if(!.)
return //successful larva bite.
- var/damage = rand(L.melee_damage_lower, L.melee_damage_upper)
+ var/damage = rand(worm.melee_damage_lower, worm.melee_damage_upper)
if(!damage)
return
- if(check_block(L, damage, "the [L.name]", attack_type = UNARMED_ATTACK))
+ if(check_block(worm, damage, "\the [worm]", attack_type = UNARMED_ATTACK))
return FALSE
if(stat != DEAD)
- L.amount_grown = min(L.amount_grown + damage, L.max_grown)
- var/obj/item/bodypart/affecting = get_bodypart(get_random_valid_zone(L.zone_selected))
+ worm.amount_grown = min(worm.amount_grown + damage, worm.max_grown)
+ var/obj/item/bodypart/affecting = get_bodypart(get_random_valid_zone(worm.zone_selected))
var/armor_block = run_armor_check(affecting, MELEE)
apply_damage(damage, BRUTE, affecting, armor_block)
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 219060012fc..b459ba4dfa6 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -397,7 +397,7 @@
if(!storage.supports_smart_equip)
return
if (equipped_item.atom_storage.locked) // Determines if container is locked before trying to put something in or take something out so we dont give out information on contents (or lack of)
- to_chat(src, span_warning("The [equipped_item.name] is locked!"))
+ to_chat(src, span_warning("\The [equipped_item] is locked!"))
return
if(thing) // put thing in storage item
if(!equipped_item.atom_storage?.attempt_insert(thing, src))
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm
index ef8e596ac2c..9e118249e6f 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm
@@ -51,7 +51,7 @@
rapid_melee = initial(rapid_melee)
return
if(!aggressive_message_said && target)
- visible_message(span_danger("The [name] gets an enraged look at [target]!"))
+ visible_message(span_danger("\The [src] gets an enraged look at [target]!"))
aggressive_message_said = TRUE
rapid_melee = 2
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 0a79238d1c6..3242796342e 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -398,8 +398,8 @@
playsound(source, 'sound/items/weapons/saberoff.ogg', 5, TRUE)
UnregisterSignal(source, list(COMSIG_ITEM_UNEMBEDDED, COMSIG_ITEM_FAILED_EMBED))
victim.visible_message(
- message = span_warning("The blade of the [hidden_name] retracts as the [source.name] is removed from [victim]!"),
- self_message = span_warning("The blade of the [hidden_name] retracts as the [source.name] is removed from you!"),
+ message = span_warning("The blade of the [hidden_name] retracts as \the [source] is removed from [victim]!"),
+ self_message = span_warning("The blade of the [hidden_name] retracts as \the [source] is removed from you!"),
blind_message = span_warning("You hear an energy blade retract!"),
vision_distance = 1
)
diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm
index 2eb7b8974c5..14ae1cf24df 100644
--- a/code/modules/plumbing/plumbers/_plumb_machinery.dm
+++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm
@@ -88,10 +88,10 @@
return ITEM_INTERACT_BLOCKING
if(I.tool_start_check(user, amount = 1))
- to_chat(user, span_notice("You start slicing the [name] apart."))
+ to_chat(user, span_notice("You start slicing \the [src] apart."))
if(I.use_tool(src, user, 1.5 SECONDS, volume = 50))
deconstruct(TRUE)
- to_chat(user, span_notice("You slice the [name] apart."))
+ to_chat(user, span_notice("You slice \the [src] apart."))
return ITEM_INTERACT_SUCCESS
return ITEM_INTERACT_BLOCKING
diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm
index b5b0744589a..445eae02f27 100644
--- a/code/modules/plumbing/plumbers/pill_press.dm
+++ b/code/modules/plumbing/plumbers/pill_press.dm
@@ -62,7 +62,7 @@
/obj/machinery/plumbing/pill_press/examine(mob/user)
. = ..()
- . += span_notice("The [name] currently has [stored_products.len] stored. There needs to be less than [MAX_FLOOR_PRODUCTS] on the floor to continue dispensing.")
+ . += span_notice("\The [src] currently has [stored_products.len] stored. There needs to be less than [MAX_FLOOR_PRODUCTS] on the floor to continue dispensing.")
/obj/machinery/plumbing/pill_press/process(seconds_per_tick)
if(!is_operational)
diff --git a/code/modules/plumbing/plumbers/pumps.dm b/code/modules/plumbing/plumbers/pumps.dm
index 5aa1dc707e3..087367a110c 100644
--- a/code/modules/plumbing/plumbers/pumps.dm
+++ b/code/modules/plumbing/plumbers/pumps.dm
@@ -40,7 +40,7 @@
update_appearance()
if(!geyser) //we didnt find one, abort
geyserless = TRUE
- visible_message(span_warning("The [name] makes a sad beep!"))
+ visible_message(span_warning("\The [src] makes a sad beep!"))
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50)
return
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index e27ea98f8ca..e742e8f3324 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -180,9 +180,9 @@
var/obj/item/stack/addstack = O
var/amount = min((max_sheets - sheets), addstack.amount)
if(amount < 1)
- to_chat(user, span_notice("The [src.name] is full!"))
+ to_chat(user, span_notice("\The [src] is full!"))
return
- to_chat(user, span_notice("You add [amount] sheets to the [src.name]."))
+ to_chat(user, span_notice("You add [amount] sheets to \the [src]."))
sheets += amount
addstack.use(amount)
return
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 22682471d13..87cc6c9af57 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -145,7 +145,7 @@
if(prob(20))
user.Stun(40)
user.take_overall_damage(burn = shock_damage)
- user.visible_message(span_danger("[user.name] is shocked by the [src.name]!"), \
+ user.visible_message(span_danger("[user.name] is shocked by \the [src]!"), \
span_userdanger("Energy pulse detected, system damaged!"), \
span_hear("You hear an electrical crack."))
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index f3dd1be2581..952f57b9174 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -282,7 +282,7 @@
if(welded)
if(!item.tool_start_check(user, amount=1))
return TRUE
- user.visible_message(span_notice("[user.name] starts to cut the [name] free from the floor."), \
+ user.visible_message(span_notice("[user.name] starts to cut \the [src] free from the floor."), \
span_notice("You start to cut [src] free from the floor..."), \
span_hear("You hear welding."))
if(!item.use_tool(src, user, 20, 1, 50))
@@ -298,7 +298,7 @@
return TRUE
if(!item.tool_start_check(user, amount=1))
return TRUE
- user.visible_message(span_notice("[user.name] starts to weld the [name] to the floor."), \
+ user.visible_message(span_notice("[user.name] starts to weld \the [src] to the floor."), \
span_notice("You start to weld [src] to the floor..."), \
span_hear("You hear welding."))
if(!item.use_tool(src, user, 20, 1, 50))
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index da3a4e12c56..0b199627c24 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -252,7 +252,7 @@ no power level overlay is currently in the overlays list.
check_power_level()
return TRUE
else
- visible_message(span_danger("The [name] shuts down!"), span_hear("You hear something shutting down."))
+ visible_message(span_danger("\The [src] shuts down!"), span_hear("You hear something shutting down."))
turn_off()
investigate_log("ran out of power and DEACTIVATED.", INVESTIGATE_ENGINE)
power = 0
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index a53d959c9e3..47d2488602f 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -454,7 +454,7 @@
if(istype(stunned_human.glasses, /obj/item/clothing/glasses/meson))
var/obj/item/clothing/glasses/meson/check_meson = stunned_human.glasses
if(check_meson.vision_flags & SEE_TURFS)
- to_chat(stunned_human, span_notice("You look directly into the [name], good thing you had your protective eyewear on!"))
+ to_chat(stunned_human, span_notice("You look directly into \the [src], good thing you had your protective eyewear on!"))
continue
apply_stun(stunned_mob)
@@ -462,8 +462,8 @@
/obj/singularity/proc/apply_stun(mob/living/carbon/stunned_mob)
stunned_mob.apply_effect(60, EFFECT_STUN)
stunned_mob.visible_message(
- span_danger("[stunned_mob] stares blankly at the [name]!"),
- span_userdanger("You look directly into the [name] and feel weak.")
+ span_danger("[stunned_mob] stares blankly at \the [src]!"),
+ span_userdanger("You look directly into \the [src] and feel weak.")
)
/obj/singularity/proc/emp_area()
diff --git a/code/modules/power/supermatter/supermatter_hit_procs.dm b/code/modules/power/supermatter/supermatter_hit_procs.dm
index d2e87ef4e54..cb17c8eae62 100644
--- a/code/modules/power/supermatter/supermatter_hit_procs.dm
+++ b/code/modules/power/supermatter/supermatter_hit_procs.dm
@@ -81,7 +81,7 @@
if (!scalpel.usesLeft)
to_chat(user, span_notice("A tiny piece of \the [scalpel] falls off, rendering it useless!"))
else
- to_chat(user, span_warning("You fail to extract a sliver from \The [src]! \the [scalpel] isn't sharp enough anymore."))
+ to_chat(user, span_warning("You fail to extract a sliver from \the [src]! \The [scalpel] isn't sharp enough anymore."))
return
if(istype(item, /obj/item/hemostat/supermatter))
diff --git a/code/modules/power/turbine/turbine.dm b/code/modules/power/turbine/turbine.dm
index bdb91cd8d2f..be10a0de311 100644
--- a/code/modules/power/turbine/turbine.dm
+++ b/code/modules/power/turbine/turbine.dm
@@ -92,7 +92,7 @@
. += span_notice("Currently at tier [installed_part.current_tier].")
if(installed_part.current_tier + 1 < TURBINE_PART_TIER_FOUR)
. += span_notice("Can be upgraded by using a tier [installed_part.current_tier + 1] part.")
- . += span_notice("The [installed_part.name] can be [EXAMINE_HINT("pried")] out.")
+ . += span_notice("\The [installed_part] can be [EXAMINE_HINT("pried")] out.")
else
. += span_warning("Is missing a [initial(part_path.name)].")
. += span_notice("Its maintainence panel can be [EXAMINE_HINT("screwed")] [panel_open ? "closed" : "open"].")
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index 57adddc62c7..7ecfc266695 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -419,7 +419,7 @@
/obj/item/gun/ballistic/automatic/battle_rifle/examine_more(mob/user)
. = ..()
- . += span_notice("Looking down at the [name], you recall something you read in a promotional pamphlet... ")
+ . += span_notice("Looking down at \the [src], you recall something you read in a promotional pamphlet... ")
. += span_info("The BR-38 possesses an acceleration rail that launches bullets at higher than typical velocity.\
This allows even less powerful cartridges to put out significant amounts of stopping power.")
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index c65cc51e9a8..0c0bcf18b00 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -319,7 +319,7 @@
/obj/item/gun/ballistic/rifle/boltaction/pipegun/examine_more(mob/user)
. = ..()
- . += span_notice("Looking down at the [name], you recall a tale told to you in some distant memory...")
+ . += span_notice("Looking down at \the [src], you recall a tale told to you in some distant memory...")
. += span_info("It's said that the first slaying committed on a Nanotrasen space station was by an assistant.")
. += span_info("That this act, done by toolbox, maybe spear, was what consigned their kind to a life of destitution, rejection and violence.")
diff --git a/code/modules/projectiles/guns/energy/laser_gatling.dm b/code/modules/projectiles/guns/energy/laser_gatling.dm
index e4375bd4832..eb2c74f3c73 100644
--- a/code/modules/projectiles/guns/energy/laser_gatling.dm
+++ b/code/modules/projectiles/guns/energy/laser_gatling.dm
@@ -83,9 +83,9 @@
gun.forceMove(src)
armed = FALSE
if(user)
- to_chat(user, span_notice("You attach the [gun.name] to the [name]."))
+ to_chat(user, span_notice("You attach \the [gun] to \the [src]."))
else
- src.visible_message(span_warning("The [gun.name] snaps back onto the [name]!"))
+ src.visible_message(span_warning("\The [gun] snaps back onto \the [src]!"))
update_appearance()
user.update_worn_back()
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index 44d50188eb7..62bda8a9a32 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -129,7 +129,7 @@
/obj/item/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj)
- to_chat(user, span_warning("The [name] whizzles quietly."))
+ to_chat(user, span_warning("\The [src] whizzles quietly."))
/obj/item/gun/magic/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] is twisting [src] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide!"))
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 4384e3abda0..4aa22a89b84 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -2966,7 +2966,7 @@
/datum/reagent/ants/on_mob_end_metabolize(mob/living/living_anthill)
. = ..()
ant_ticks = 0
- to_chat(living_anthill, span_notice("You feel like the last of the [name] are out of your system."))
+ to_chat(living_anthill, span_notice("You feel like the last of \the [src] are out of your system."))
/datum/reagent/ants/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)
. = ..()
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index f331dcfbab7..6e02f2f4e6a 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -509,7 +509,7 @@
var/datum/reagent/cryostylane/cryostylane = holder.has_reagent(/datum/reagent/cryostylane)
var/turf/local_turf = get_turf(holder.my_atom)
playsound(local_turf, 'sound/effects/magic/ethereal_exit.ogg', 50, 1)
- local_turf.visible_message("The reaction furiously freezes up as a snowman suddenly rises out of the [holder.my_atom.name]!")
+ local_turf.visible_message("The reaction furiously freezes up as a snowman suddenly rises out of \the [holder.my_atom]!")
freeze_radius(holder, equilibrium, holder.chem_temp, clamp(cryostylane.volume/15, 3, 10), 180 SECONDS, 5)
new /obj/structure/statue/snow/snowman(local_turf)
clear_reactants(holder)
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 41622550f8f..4682faaca8b 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -431,7 +431,7 @@
/datum/chemical_reaction/slime/slimecrystal/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
var/obj/item/stack/ore/bluespace_crystal/BC = new (get_turf(holder.my_atom))
- BC.visible_message(span_notice("The [BC.name] appears out of thin air!"))
+ BC.visible_message(span_notice("\The [BC] appears out of thin air!"))
..()
/datum/chemical_reaction/slime/slimeradio
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index bfd6d6878ec..ff6ad337db1 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -235,7 +235,7 @@
reagents.expose(target_turf, TOUCH, (1 - splash_multiplier)) // 1 - splash_multiplier because it's what didn't hit the target
else if(bartender_check(target) && thrown)
- visible_message(span_notice("[src] lands onto the [target.name] without spilling a single drop."))
+ visible_message(span_notice("[src] lands onto \the [target] without spilling a single drop."))
return
else
diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm
index 15ee5c32e2a..2a24db03a84 100644
--- a/code/modules/reagents/reagent_containers/cups/_cup.dm
+++ b/code/modules/reagents/reagent_containers/cups/_cup.dm
@@ -189,7 +189,7 @@
return TRUE
var/cooling = (0 - reagents.chem_temp) * extinguisher.cooling_power * 2
reagents.expose_temperature(cooling)
- to_chat(user, span_notice("You cool the [name] with the [attacking_item]!"))
+ to_chat(user, span_notice("You cool \the [src] with the [attacking_item]!"))
playsound(loc, 'sound/effects/extinguish.ogg', 75, TRUE, -3)
extinguisher.reagents.remove_all(1)
return TRUE
diff --git a/code/modules/reagents/reagent_containers/cups/organ_jar.dm b/code/modules/reagents/reagent_containers/cups/organ_jar.dm
index 927e3477148..e65f20d3f14 100644
--- a/code/modules/reagents/reagent_containers/cups/organ_jar.dm
+++ b/code/modules/reagents/reagent_containers/cups/organ_jar.dm
@@ -58,7 +58,7 @@
balloon_alert(user, "inserted [tool]")
held_organ = tool
name = "[tool.name] in a jar"
- desc = "A jar with the [tool.name] inside it."
+ desc = "A jar with \the [tool] inside it."
check_organ_freeze()
update_appearance()
return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 9360f19ccd2..85323220433 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -148,7 +148,7 @@
return
var/cooling = (0 - reagents.chem_temp) * extinguisher.cooling_power * 2
reagents.expose_temperature(cooling)
- to_chat(user, span_notice("You cool the [name] with the [I]!"))
+ to_chat(user, span_notice("You cool \the [src] with the [I]!"))
playsound(loc, 'sound/effects/extinguish.ogg', 75, TRUE, -3)
extinguisher.reagents.remove_all(1)
diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm
index c68410caa04..9984970e6d0 100644
--- a/code/modules/research/destructive_analyzer.dm
+++ b/code/modules/research/destructive_analyzer.dm
@@ -46,12 +46,12 @@
if(!is_insertion_ready(user))
return ..()
if(!user.transferItemToLoc(weapon, src))
- to_chat(user, span_warning("\The [weapon] is stuck to your hand, you cannot put it in the [name]!"))
+ to_chat(user, span_warning("\The [weapon] is stuck to your hand, you cannot put it in \the [src]!"))
return ITEM_INTERACT_BLOCKING
busy = TRUE
loaded_item = weapon
- to_chat(user, span_notice("You place the [weapon.name] inside the [name]."))
+ to_chat(user, span_notice("You place \the [weapon] inside \the [src]."))
flick("[base_icon_state]_la", src)
addtimer(CALLBACK(src, PROC_REF(finish_loading)), 1 SECONDS)
return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 75ad0146fd4..19f42ed5e19 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -121,7 +121,7 @@
if(!is_insertion_ready(user))
return ..()
if(!user.transferItemToLoc(weapon, src))
- to_chat(user, span_warning("\The [weapon] is stuck to your hand, you cannot put it in the [name]!"))
+ to_chat(user, span_warning("\The [weapon] is stuck to your hand, you cannot put it in \the [src]!"))
return TRUE
loaded_item = weapon
to_chat(user, span_notice("You add [weapon] to the machine."))
diff --git a/code/modules/shuttle/mobile_port/mobile_port.dm b/code/modules/shuttle/mobile_port/mobile_port.dm
index 26f3187ee90..8679c1f7cf7 100644
--- a/code/modules/shuttle/mobile_port/mobile_port.dm
+++ b/code/modules/shuttle/mobile_port/mobile_port.dm
@@ -743,7 +743,7 @@
///Let people know shits about to go down
/obj/docking_port/mobile/proc/announce_shuttle_events()
for(var/datum/shuttle_event/event as anything in event_list)
- notify_ghosts("The [name] has selected: [event.name]")
+ notify_ghosts("\The [src] has selected: [event.name]")
/obj/docking_port/mobile/emergency/on_emergency_launch()
return
diff --git a/code/modules/surgery/bodyparts/wounds.dm b/code/modules/surgery/bodyparts/wounds.dm
index d6b9d857b7a..7402dec9b7e 100644
--- a/code/modules/surgery/bodyparts/wounds.dm
+++ b/code/modules/surgery/bodyparts/wounds.dm
@@ -322,7 +322,7 @@
dam_mul *= iter_wound.damage_multiplier_penalty
if(!LAZYLEN(wounds) && current_gauze && !replaced) // no more wounds = no need for the gauze anymore
- owner.visible_message(span_notice("\The [current_gauze.name] on [owner]'s [name] falls away."), span_notice("The [current_gauze.name] on your [plaintext_zone] falls away."))
+ owner.visible_message(span_notice("\The [current_gauze.name] on [owner]'s [name] falls away."), span_notice("\The [current_gauze] on your [plaintext_zone] falls away."))
QDEL_NULL(current_gauze)
wound_damage_multiplier = dam_mul
diff --git a/code/modules/surgery/organs/external/restyling.dm b/code/modules/surgery/organs/external/restyling.dm
index 097f8b53bd7..49d6c481d28 100644
--- a/code/modules/surgery/organs/external/restyling.dm
+++ b/code/modules/surgery/organs/external/restyling.dm
@@ -63,7 +63,7 @@
if(restyle_flags & restyle_type)
INVOKE_ASYNC(src, PROC_REF(attempt_feature_restyle), source, trimmer, original_target, body_zone, restyle_type, style_speed)
else
- to_chat(trimmer, span_warning("This tool is incompatible with the [src.name]!"))
+ to_chat(trimmer, span_warning("This tool is incompatible with \the [src]!"))
///Restyles the external organ from a list of valid options
/obj/item/organ/proc/attempt_feature_restyle(atom/source, mob/living/trimmer, atom/movable/original_target, body_zone, restyle_type, style_speed)
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
index ffd3f022e7e..a499b900de5 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
@@ -64,7 +64,7 @@
for(var/obj/item/stored_item as anything in stored_items)
throw_target = pick(oview(range))
stored_item.throw_at(throw_target, range, 2)
- to_chat(owner, span_warning("Your [owner.get_held_index_name(owner.get_held_index_of_item(stored_item))] spasms and throws the [stored_item.name]!"))
+ to_chat(owner, span_warning("Your [owner.get_held_index_name(owner.get_held_index_of_item(stored_item))] spasms and throws \the [stored_item]!"))
stored_items = list()
diff --git a/code/modules/transport/tram/tram_controller.dm b/code/modules/transport/tram/tram_controller.dm
index 4fcb00fdb55..bade7d07a85 100644
--- a/code/modules/transport/tram/tram_controller.dm
+++ b/code/modules/transport/tram/tram_controller.dm
@@ -200,7 +200,7 @@
SIGNAL_HANDLER
travel_remaining = 0
- bumped_atom.visible_message(span_userdanger("The [bumped_atom.name] crashes into the field violently!"))
+ bumped_atom.visible_message(span_userdanger("\The [bumped_atom] crashes into the field violently!"))
for(var/obj/structure/transport/linear/tram/transport_module as anything in transport_modules)
transport_module.set_travelling(FALSE)
for(var/explosive_target in transport_module.transport_contents)
diff --git a/code/modules/vehicles/mecha/mecha_ai_interaction.dm b/code/modules/vehicles/mecha/mecha_ai_interaction.dm
index f43a11903a9..9457357840c 100644
--- a/code/modules/vehicles/mecha/mecha_ai_interaction.dm
+++ b/code/modules/vehicles/mecha/mecha_ai_interaction.dm
@@ -40,7 +40,7 @@
for(var/mob/living/silicon/ai/aipilot in occupants)
ai_pilots += aipilot
if(!length(ai_pilots)) //Mech does not have an AI for a pilot
- to_chat(user, span_warning("No AI detected in the [name] onboard computer."))
+ to_chat(user, span_warning("No AI detected in \the [src]'s onboard computer."))
return
if(length(ai_pilots) > 1) //Input box for multiple AIs, but if there's only one we'll default to them.
AI = tgui_input_list(user, "Which AI do you wish to card?", "AI Selection", sort_list(ai_pilots))
diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm
index d7f52915a4b..547ae21eba4 100644
--- a/code/modules/vehicles/mecha/mecha_defense.dm
+++ b/code/modules/vehicles/mecha/mecha_defense.dm
@@ -481,7 +481,7 @@
else
gun.projectiles_cache = gun.projectiles_cache + ammo_needed
playsound(get_turf(user),A.load_audio,50,TRUE)
- to_chat(user, span_notice("You add [ammo_needed] [A.ammo_type][ammo_needed > 1?"s":""] to the [gun.name]"))
+ to_chat(user, span_notice("You add [ammo_needed] [A.ammo_type][ammo_needed > 1?"s":""] to \the [gun]"))
A.rounds = A.rounds - ammo_needed
if(A.custom_materials) //Change material content of the ammo box according to the amount of ammo deposited into the weapon
/// list of materials contained in the ammo box after we put it through the equation so we can stick this list into set_custom_materials()
@@ -500,7 +500,7 @@
else
gun.projectiles_cache = gun.projectiles_cache + A.rounds
playsound(get_turf(user),A.load_audio,50,TRUE)
- to_chat(user, span_notice("You add [A.rounds] [A.ammo_type][A.rounds > 1?"s":""] to the [gun.name]"))
+ to_chat(user, span_notice("You add [A.rounds] [A.ammo_type][A.rounds > 1?"s":""] to \the [gun]"))
if(A.qdel_on_empty)
qdel(A)
return TRUE