diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 9a2de31ea53..ddacd466a85 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -675,6 +675,12 @@ GLOBAL_LIST_EMPTY(species_list)
if(mob.ckey == key)
return mob
+/// Returns a string for the specified body zone. If we have a bodypart in this zone, refers to its plaintext_zone instead.
+/mob/living/proc/parse_zone_with_bodypart(zone)
+ var/obj/item/bodypart/part = get_bodypart(zone)
+
+ return part?.plaintext_zone || parse_zone(zone)
+
///Return a string for the specified body zone. Should be used for parsing non-instantiated bodyparts, otherwise use [/obj/item/bodypart/var/plaintext_zone]
/proc/parse_zone(zone)
switch(zone)
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 1d05ccc16c0..83d82fbe0bb 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -289,7 +289,7 @@
if(body_position == LYING_DOWN)
zone_hit_chance += 10
targeting = get_random_valid_zone(targeting, zone_hit_chance)
- var/targeting_human_readable = parse_zone(targeting)
+ var/targeting_human_readable = parse_zone_with_bodypart(targeting)
send_item_attack_message(attacking_item, user, targeting_human_readable, targeting)
diff --git a/code/datums/components/surgery_initiator.dm b/code/datums/components/surgery_initiator.dm
index c609d7216e0..604535025eb 100644
--- a/code/datums/components/surgery_initiator.dm
+++ b/code/datums/components/surgery_initiator.dm
@@ -119,11 +119,11 @@
patient.surgeries -= the_surgery
REMOVE_TRAIT(patient, TRAIT_ALLOWED_HONORBOUND_ATTACK, type)
user.visible_message(
- span_notice("[user] removes [parent] from [patient]'s [parse_zone(selected_zone)]."),
- span_notice("You remove [parent] from [patient]'s [parse_zone(selected_zone)]."),
+ span_notice("[user] removes [parent] from [patient]'s [patient.parse_zone_with_bodypart(selected_zone)]."),
+ span_notice("You remove [parent] from [patient]'s [patient.parse_zone_with_bodypart(selected_zone)]."),
)
- patient.balloon_alert(user, "stopped work on [parse_zone(selected_zone)]")
+ patient.balloon_alert(user, "stopped work on [patient.parse_zone_with_bodypart(selected_zone)]")
qdel(the_surgery)
return
@@ -153,11 +153,11 @@
REMOVE_TRAIT(patient, TRAIT_ALLOWED_HONORBOUND_ATTACK, ELEMENT_TRAIT(type))
user.visible_message(
- span_notice("[user] closes [patient]'s [parse_zone(selected_zone)] with [close_tool] and removes [parent]."),
- span_notice("You close [patient]'s [parse_zone(selected_zone)] with [close_tool] and remove [parent]."),
+ span_notice("[user] closes [patient]'s [patient.parse_zone_with_bodypart(selected_zone)] with [close_tool] and removes [parent]."),
+ span_notice("You close [patient]'s [patient.parse_zone_with_bodypart(selected_zone)] with [close_tool] and remove [parent]."),
)
- patient.balloon_alert(user, "closed up [parse_zone(selected_zone)]")
+ patient.balloon_alert(user, "closed up [patient.parse_zone_with_bodypart(selected_zone)]")
qdel(the_surgery)
@@ -329,7 +329,7 @@
return
if (surgery_needs_exposure(surgery, target))
- target.balloon_alert(user, "expose [target.p_their()] [parse_zone(selected_zone)]!")
+ target.balloon_alert(user, "expose [target.p_their()] [target.parse_zone_with_bodypart(selected_zone)]!")
return
ui_close()
@@ -340,8 +340,8 @@
target.balloon_alert(user, "starting \"[LOWER_TEXT(procedure.name)]\"")
user.visible_message(
- span_notice("[user] drapes [parent] over [target]'s [parse_zone(selected_zone)] to prepare for surgery."),
- span_notice("You drape [parent] over [target]'s [parse_zone(selected_zone)] to prepare for \an [procedure.name]."),
+ span_notice("[user] drapes [parent] over [target]'s [target.parse_zone_with_bodypart(selected_zone)] to prepare for surgery."),
+ span_notice("You drape [parent] over [target]'s [target.parse_zone_with_bodypart(selected_zone)] to prepare for \an [procedure.name]."),
)
if(!(HAS_TRAIT(target, TRAIT_ANALGESIA) || target.stat >= UNCONSCIOUS)) ///skyrat add start - warning for unanesthetized surgery
diff --git a/code/game/machinery/computer/operating_computer.dm b/code/game/machinery/computer/operating_computer.dm
index d0ea49df27b..d67cea367e9 100644
--- a/code/game/machinery/computer/operating_computer.dm
+++ b/code/game/machinery/computer/operating_computer.dm
@@ -151,7 +151,7 @@
else
alternative_step = "Finish operation"
data["procedures"] += list(list(
- "name" = capitalize("[parse_zone(procedure.location)] [procedure.name]"),
+ "name" = capitalize("[patient.parse_zone_with_bodypart(procedure.location)] [procedure.name]"),
"next_step" = capitalize(surgery_step.name),
"chems_needed" = chems_needed,
"alternative_step" = alternative_step,
diff --git a/code/game/objects/items/robot/items/hypo.dm b/code/game/objects/items/robot/items/hypo.dm
index b685d5405f1..4c1c2a5565e 100644
--- a/code/game/objects/items/robot/items/hypo.dm
+++ b/code/game/objects/items/robot/items/hypo.dm
@@ -195,7 +195,7 @@
balloon_alert(user, "[amount_per_transfer_from_this] unit\s injected")
log_combat(user, injectee, "injected", src, "(CHEMICALS: [selected_reagent])")
else
- balloon_alert(user, "[parse_zone(user.zone_selected)] is blocked!")
+ balloon_alert(user, "[injectee.parse_zone_with_bodypart(user.zone_selected)] is blocked!")
/obj/item/reagent_containers/borghypo/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 59c65411805..d76861b6c49 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -182,8 +182,8 @@
if(!try_heal_checks(patient, user, brute, burn))
return FALSE
user.visible_message(
- span_infoplain(span_green("[user] applies [src] on [patient]'s [parse_zone(affecting.body_zone)].")),
- span_infoplain(span_green("You apply [src] on [patient]'s [parse_zone(affecting.body_zone)]."))
+ span_infoplain(span_green("[user] applies [src] on [patient]'s [affecting.plaintext_zone].")),
+ span_infoplain(span_green("You apply [src] on [patient]'s [affecting.plaintext_zone]."))
)
var/previous_damage = affecting.get_damage()
if(affecting.heal_damage(brute, burn))
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 559e2dd7808..51d85d4583d 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -345,7 +345,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
if(busy)
to_chat(user, span_warning("Someone's already washing here!"))
return
- var/selected_area = parse_zone(user.zone_selected)
+ var/selected_area = user.parse_zone_with_bodypart(user.zone_selected)
var/washing_face = 0
if(selected_area in list(BODY_ZONE_HEAD, BODY_ZONE_PRECISE_MOUTH, BODY_ZONE_PRECISE_EYES))
washing_face = 1
@@ -601,7 +601,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink/kitchen, (-16))
if(busy)
to_chat(user, span_warning("Someone's already washing here!"))
return
- var/selected_area = parse_zone(user.zone_selected)
+ var/selected_area = user.parse_zone_with_bodypart(user.zone_selected)
var/washing_face = FALSE
if(selected_area in list(BODY_ZONE_HEAD, BODY_ZONE_PRECISE_MOUTH, BODY_ZONE_PRECISE_EYES))
washing_face = TRUE
diff --git a/code/modules/antagonists/heretic/magic/flesh_surgery.dm b/code/modules/antagonists/heretic/magic/flesh_surgery.dm
index 898b1a63fa6..2ca256419ef 100644
--- a/code/modules/antagonists/heretic/magic/flesh_surgery.dm
+++ b/code/modules/antagonists/heretic/magic/flesh_surgery.dm
@@ -135,7 +135,7 @@
// Round u pto the nearest generic zone (body, chest, arm)
var/zone_to_check = check_zone(caster.zone_selected)
- var/parsed_zone = parse_zone(zone_to_check)
+ var/parsed_zone = victim.parse_zone_with_bodypart(zone_to_check)
var/list/organs_we_can_remove = list()
for(var/obj/item/organ/organ as anything in carbon_victim.organs)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 4e0a38b2186..c5690090424 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -195,13 +195,16 @@
if(!(def_zone in covered_limbs))
return
- var/zone_name = parse_zone(def_zone)
+ var/zone_name
var/break_verb = ((damage_type == BRUTE) ? "torn" : "burned")
if(iscarbon(loc))
- var/mob/living/carbon/C = loc
- C.visible_message(span_danger("The [zone_name] on [C]'s [src.name] is [break_verb] away!"), span_userdanger("The [zone_name] on your [src.name] is [break_verb] away!"), vision_distance = COMBAT_MESSAGE_RANGE)
- RegisterSignal(C, COMSIG_MOVABLE_MOVED, PROC_REF(bristle), override = TRUE)
+ var/mob/living/carbon/carbon_loc = loc
+ zone_name = carbon_loc.parse_zone_with_bodypart(def_zone)
+ carbon_loc.visible_message(span_danger("The [zone_name] on [carbon_loc]'s [src.name] is [break_verb] away!"), span_userdanger("The [zone_name] on your [src.name] is [break_verb] away!"), vision_distance = COMBAT_MESSAGE_RANGE)
+ RegisterSignal(carbon_loc, COMSIG_MOVABLE_MOVED, PROC_REF(bristle), override = TRUE)
+ else
+ zone_name = parse_zone(def_zone)
zones_disabled++
body_parts_covered &= ~body_zone2cover_flags(def_zone)
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 48c85ac57aa..b10ed3dd24a 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -198,14 +198,14 @@
user.visible_message(span_suicide("[user] puts \the [src] to [user.p_their()] chest! It looks like [user.p_they()] won't hear much!"))
return OXYLOSS
-/obj/item/clothing/neck/stethoscope/attack(mob/living/M, mob/living/user)
- if(!ishuman(M) || !isliving(user))
+/obj/item/clothing/neck/stethoscope/attack(mob/living/target, mob/living/user)
+ if(!ishuman(target) || !isliving(user))
return ..()
if(user.combat_mode)
return
- var/mob/living/carbon/carbon_patient = M
- var/body_part = parse_zone(user.zone_selected)
+ var/mob/living/carbon/carbon_patient = target
+ var/body_part = carbon_patient.parse_zone_with_bodypart(user.zone_selected)
var/oxy_loss = carbon_patient.getOxyLoss()
var/heart_strength
@@ -235,13 +235,13 @@
|| (HAS_TRAIT(carbon_patient, TRAIT_NOBREATH))\
|| carbon_patient.failed_last_breath \
|| carbon_patient.losebreath)//If pt is dead or otherwise not breathing
- render_list += "[M.p_Theyre()] not breathing!\n"
+ render_list += "[target.p_Theyre()] not breathing!\n"
else if(lungs.damage > 10)//if breathing, check for lung damage
- render_list += "You hear fluid in [M.p_their()] lungs!\n"
+ render_list += "You hear fluid in [target.p_their()] lungs!\n"
else if(oxy_loss > 10)//if they have suffocation damage
- render_list += "[M.p_Theyre()] breathing heavily!\n"
+ render_list += "[target.p_Theyre()] breathing heavily!\n"
else
- render_list += "[M.p_Theyre()] breathing normally.\n"//they're okay :D
+ render_list += "[target.p_Theyre()] breathing normally.\n"//they're okay :D
//assess heart
if(body_part == BODY_ZONE_CHEST)//if we're listening to the chest
@@ -261,20 +261,20 @@
var/appendix_okay = TRUE
var/liver_okay = TRUE
if(!liver)//sanity check, ensure the patient actually has a liver
- render_list += "You can't feel anything where [M.p_their()] liver would be.\n"
+ render_list += "You can't feel anything where [target.p_their()] liver would be.\n"
liver_okay = FALSE
else
if(liver.damage > 10)
- render_list += "[M.p_Their()] liver feels firm.\n"//their liver is damaged
+ render_list += "[target.p_Their()] liver feels firm.\n"//their liver is damaged
liver_okay = FALSE
if(!appendix)//sanity check, ensure the patient actually has an appendix
- render_list += "You can't feel anything where [M.p_their()] appendix would be.\n"
+ render_list += "You can't feel anything where [target.p_their()] appendix would be.\n"
appendix_okay = FALSE
else
if(appendix.damage > 10 && carbon_patient.stat == CONSCIOUS)
- render_list += "[M] screams when you lift your hand from [M.p_their()] appendix!\n"//scream if their appendix is damaged and they're awake
- M.emote("scream")
+ render_list += "[target] screams when you lift your hand from [target.p_their()] appendix!\n"//scream if their appendix is damaged and they're awake
+ target.emote("scream")
appendix_okay = FALSE
if(liver_okay && appendix_okay)//if they have all their organs and have no detectable damage
@@ -310,7 +310,7 @@
else
pulse_pressure = span_notice("strong")//they're okay :D
- render_list += "[M.p_Their()] pulse is [pulse_pressure] and [heart_strength].\n"
+ render_list += "[target.p_Their()] pulse is [pulse_pressure] and [heart_strength].\n"
//display our packaged information in an examine block for easy reading
to_chat(user, examine_block(jointext(render_list, "")), type = MESSAGE_TYPE_INFO)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 9490ea741f0..a7805fbebf3 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -1141,14 +1141,14 @@
return
var/list/limb_list = list()
if(edit_action == "remove")
- for(var/obj/item/bodypart/B as anything in bodyparts)
- limb_list += B.body_zone
+ for(var/obj/item/bodypart/iter_part as anything in bodyparts)
+ limb_list += iter_part.body_zone
limb_list -= BODY_ZONE_CHEST
else
limb_list = list(BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_CHEST)
var/result = input(usr, "Please choose which bodypart to [edit_action]","[capitalize(edit_action)] Bodypart") as null|anything in sort_list(limb_list)
if(result)
- var/obj/item/bodypart/BP = get_bodypart(result)
+ var/obj/item/bodypart/part = get_bodypart(result)
var/list/limbtypes = list()
switch(result)
if(BODY_ZONE_CHEST)
@@ -1165,9 +1165,9 @@
limbtypes = typesof(/obj/item/bodypart/leg/right)
switch(edit_action)
if("remove")
- if(BP)
- BP.drop_limb()
- admin_ticket_log("[key_name_admin(usr)] has removed [src]'s [parse_zone(BP.body_zone)]")
+ if(part)
+ part.drop_limb()
+ admin_ticket_log("[key_name_admin(usr)] has removed [src]'s [part.plaintext_zone]")
else
to_chat(usr, span_boldwarning("[src] doesn't have such bodypart."))
admin_ticket_log("[key_name_admin(usr)] has attempted to modify the bodyparts of [src]")
@@ -1175,8 +1175,8 @@
var/limb2add = input(usr, "Select a bodypart type to add", "Add/Replace Bodypart") as null|anything in sort_list(limbtypes)
var/obj/item/bodypart/new_bp = new limb2add()
if(new_bp.replace_limb(src, special = TRUE))
- admin_ticket_log("key_name_admin(usr)] has replaced [src]'s [BP.type] with [new_bp.type]")
- qdel(BP)
+ admin_ticket_log("key_name_admin(usr)] has replaced [src]'s [part.type] with [new_bp.type]")
+ qdel(part)
else
to_chat(usr, "Failed to replace bodypart! They might be incompatible.")
admin_ticket_log("[key_name_admin(usr)] has attempted to modify the bodyparts of [src]")
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 5746799e5f8..d25eb894ae9 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -214,7 +214,7 @@
span_userdanger("You're hit by [thrown_item]!"))
if(!thrown_item.throwforce)
return
- var/armor = run_armor_check(zone, MELEE, "Your armor has protected your [parse_zone(zone)].", "Your armor has softened hit to your [parse_zone(zone)].", thrown_item.armour_penetration, "", FALSE, thrown_item.weak_against_armour)
+ var/armor = run_armor_check(zone, MELEE, "Your armor has protected your [parse_zone_with_bodypart(zone)].", "Your armor has softened hit to your [parse_zone_with_bodypart(zone)].", thrown_item.armour_penetration, "", FALSE, thrown_item.weak_against_armour)
apply_damage(thrown_item.throwforce, thrown_item.damtype, zone, armor, sharpness = thrown_item.get_sharpness(), wound_bonus = (nosell_hit * CANT_WOUND))
if(QDELETED(src)) //Damage can delete the mob.
return
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 1d53eff0f9b..08530405338 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -358,7 +358,7 @@
var/organ_hit_text = ""
if(hit_limb_zone)
- organ_hit_text = " in \the [parse_zone(hit_limb_zone)]"
+ organ_hit_text = " in \the [living_target.parse_zone_with_bodypart(hit_limb_zone)]"
if(suppressed == SUPPRESSED_VERY)
//playsound(loc, hitsound, 5, TRUE, -1) SKYRAT EDIT REMOVAL - IMPACT SOUNDS
else if(suppressed)
diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm
index d442743c36b..80444904b25 100644
--- a/code/modules/surgery/amputation.dm
+++ b/code/modules/surgery/amputation.dm
@@ -43,9 +43,9 @@
display_results(
user,
target,
- span_notice("You begin to sever [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to sever [target]'s [parse_zone(target_zone)]!"),
- span_notice("[user] begins to sever [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You begin to sever [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to sever [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
+ span_notice("[user] begins to sever [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
display_pain(target, "You feel a gruesome pain in your [parse_zone(target_zone)]'s joint!")
@@ -54,11 +54,11 @@
display_results(
user,
target,
- span_notice("You sever [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] severs [target]'s [parse_zone(target_zone)]!"),
- span_notice("[user] severs [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You sever [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] severs [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
+ span_notice("[user] severs [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
- display_pain(target, "You can no longer feel your severed [parse_zone(target_zone)]!")
+ display_pain(target, "You can no longer feel your severed [target.parse_zone_with_bodypart(target_zone)]!")
if(HAS_MIND_TRAIT(user, TRAIT_MORBID) && ishuman(user))
var/mob/living/carbon/human/morbid_weirdo = user
diff --git a/code/modules/surgery/bodyparts/wounds.dm b/code/modules/surgery/bodyparts/wounds.dm
index 1fc16c7ca8f..93d61b091d9 100644
--- a/code/modules/surgery/bodyparts/wounds.dm
+++ b/code/modules/surgery/bodyparts/wounds.dm
@@ -317,7 +317,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 [parse_zone(body_zone)] falls away."))
+ 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."))
QDEL_NULL(current_gauze)
wound_damage_multiplier = dam_mul
diff --git a/code/modules/surgery/bone_mending.dm b/code/modules/surgery/bone_mending.dm
index ae4ef6e4330..73fdcba3fce 100644
--- a/code/modules/surgery/bone_mending.dm
+++ b/code/modules/surgery/bone_mending.dm
@@ -60,13 +60,13 @@
display_results(
user,
target,
- span_notice("You begin to repair the fracture in [target]'s [parse_zone(user.zone_selected)]..."),
- span_notice("[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)] with [tool]."),
- span_notice("[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)]."),
+ span_notice("You begin to repair the fracture in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."),
+ span_notice("[user] begins to repair the fracture in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)] with [tool]."),
+ span_notice("[user] begins to repair the fracture in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."),
)
- display_pain(target, "Your [parse_zone(user.zone_selected)] aches with pain!")
+ display_pain(target, "Your [target.parse_zone_with_bodypart(user.zone_selected)] aches with pain!")
else
- user.visible_message(span_notice("[user] looks for [target]'s [parse_zone(user.zone_selected)]."), span_notice("You look for [target]'s [parse_zone(user.zone_selected)]..."))
+ user.visible_message(span_notice("[user] looks for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."), span_notice("You look for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."))
/datum/surgery_step/repair_bone_hairline/success(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
if(surgery.operated_wound)
@@ -76,9 +76,9 @@
display_results(
user,
target,
- span_notice("You successfully repair the fracture in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)] with [tool]!"),
- span_notice("[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You successfully repair the fracture in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] successfully repairs the fracture in [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]!"),
+ span_notice("[user] successfully repairs the fracture in [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
log_combat(user, target, "repaired a hairline fracture in", addition="COMBAT_MODE: [uppertext(user.combat_mode)]")
qdel(surgery.operated_wound)
@@ -109,13 +109,13 @@
display_results(
user,
target,
- span_notice("You begin to reset the bone in [target]'s [parse_zone(user.zone_selected)]..."),
- span_notice("[user] begins to reset the bone in [target]'s [parse_zone(user.zone_selected)] with [tool]."),
- span_notice("[user] begins to reset the bone in [target]'s [parse_zone(user.zone_selected)]."),
+ span_notice("You begin to reset the bone in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."),
+ span_notice("[user] begins to reset the bone in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)] with [tool]."),
+ span_notice("[user] begins to reset the bone in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."),
)
- display_pain(target, "The aching pain in your [parse_zone(user.zone_selected)] is overwhelming!")
+ display_pain(target, "The aching pain in your [target.parse_zone_with_bodypart(user.zone_selected)] is overwhelming!")
else
- user.visible_message(span_notice("[user] looks for [target]'s [parse_zone(user.zone_selected)]."), span_notice("You look for [target]'s [parse_zone(user.zone_selected)]..."))
+ user.visible_message(span_notice("[user] looks for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."), span_notice("You look for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."))
/datum/surgery_step/reset_compound_fracture/success(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
if(surgery.operated_wound)
@@ -125,9 +125,9 @@
display_results(
user,
target,
- span_notice("You successfully reset the bone in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] successfully resets the bone in [target]'s [parse_zone(target_zone)] with [tool]!"),
- span_notice("[user] successfully resets the bone in [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You successfully reset the bone in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] successfully resets the bone in [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]!"),
+ span_notice("[user] successfully resets the bone in [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
log_combat(user, target, "reset a compound fracture in", addition="COMBAT MODE: [uppertext(user.combat_mode)]")
else
@@ -159,13 +159,13 @@
display_results(
user,
target,
- span_notice("You begin to repair the fracture in [target]'s [parse_zone(user.zone_selected)]..."),
- span_notice("[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)] with [tool]."),
- span_notice("[user] begins to repair the fracture in [target]'s [parse_zone(user.zone_selected)]."),
+ span_notice("You begin to repair the fracture in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."),
+ span_notice("[user] begins to repair the fracture in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)] with [tool]."),
+ span_notice("[user] begins to repair the fracture in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."),
)
- display_pain(target, "The aching pain in your [parse_zone(user.zone_selected)] is overwhelming!")
+ display_pain(target, "The aching pain in your [target.parse_zone_with_bodypart(user.zone_selected)] is overwhelming!")
else
- user.visible_message(span_notice("[user] looks for [target]'s [parse_zone(user.zone_selected)]."), span_notice("You look for [target]'s [parse_zone(user.zone_selected)]..."))
+ user.visible_message(span_notice("[user] looks for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."), span_notice("You look for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."))
/datum/surgery_step/repair_bone_compound/success(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
if(surgery.operated_wound)
@@ -175,9 +175,9 @@
display_results(
user,
target,
- span_notice("You successfully repair the fracture in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)] with [tool]!"),
- span_notice("[user] successfully repairs the fracture in [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You successfully repair the fracture in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] successfully repairs the fracture in [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]!"),
+ span_notice("[user] successfully repairs the fracture in [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
log_combat(user, target, "repaired a compound fracture in", addition="COMBAT MODE: [uppertext(user.combat_mode)]")
qdel(surgery.operated_wound)
@@ -218,9 +218,9 @@
display_results(
user,
target,
- span_notice("You begin to discard the smaller skull debris in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to discard the smaller skull debris in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to poke around in [target]'s [parse_zone(target_zone)]..."),
+ span_notice("You begin to discard the smaller skull debris in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to discard the smaller skull debris in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to poke around in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
)
display_pain(target, "Your brain feels like it's getting stabbed by little shards of glass!")
diff --git a/code/modules/surgery/burn_dressing.dm b/code/modules/surgery/burn_dressing.dm
index 61be9056f6c..cde9b7b2980 100644
--- a/code/modules/surgery/burn_dressing.dm
+++ b/code/modules/surgery/burn_dressing.dm
@@ -72,20 +72,20 @@
if(surgery.operated_wound)
var/datum/wound/burn/flesh/burn_wound = surgery.operated_wound
if(burn_wound.infestation <= 0)
- to_chat(user, span_notice("[target]'s [parse_zone(user.zone_selected)] has no infected flesh to remove!"))
+ to_chat(user, span_notice("[target]'s [target.parse_zone_with_bodypart(user.zone_selected)] has no infected flesh to remove!"))
surgery.status++
repeatable = FALSE
return
display_results(
user,
target,
- span_notice("You begin to excise infected flesh from [target]'s [parse_zone(user.zone_selected)]..."),
- span_notice("[user] begins to excise infected flesh from [target]'s [parse_zone(user.zone_selected)] with [tool]."),
- span_notice("[user] begins to excise infected flesh from [target]'s [parse_zone(user.zone_selected)]."),
+ span_notice("You begin to excise infected flesh from [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."),
+ span_notice("[user] begins to excise infected flesh from [target]'s [target.parse_zone_with_bodypart(user.zone_selected)] with [tool]."),
+ span_notice("[user] begins to excise infected flesh from [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."),
)
- display_pain(target, "The infection in your [parse_zone(user.zone_selected)] stings like hell! It feels like you're being stabbed!")
+ display_pain(target, "The infection in your [target.parse_zone_with_bodypart(user.zone_selected)] stings like hell! It feels like you're being stabbed!")
else
- user.visible_message(span_notice("[user] looks for [target]'s [parse_zone(user.zone_selected)]."), span_notice("You look for [target]'s [parse_zone(user.zone_selected)]..."))
+ user.visible_message(span_notice("[user] looks for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."), span_notice("You look for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."))
/datum/surgery_step/debride/success(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
var/datum/wound/burn/flesh/burn_wound = surgery.operated_wound
@@ -94,9 +94,9 @@
display_results(
user,
target,
- span_notice("You successfully excise some of the infected flesh from [target]'s [parse_zone(target_zone)][progress_text]."),
- span_notice("[user] successfully excises some of the infected flesh from [target]'s [parse_zone(target_zone)] with [tool]!"),
- span_notice("[user] successfully excises some of the infected flesh from [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You successfully excise some of the infected flesh from [target]'s [target.parse_zone_with_bodypart(target_zone)][progress_text]."),
+ span_notice("[user] successfully excises some of the infected flesh from [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]!"),
+ span_notice("[user] successfully excises some of the infected flesh from [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
log_combat(user, target, "excised infected flesh in", addition="COMBAT MODE: [uppertext(user.combat_mode)]")
surgery.operated_bodypart.receive_damage(brute=3, wound_bonus=CANT_WOUND)
@@ -113,9 +113,9 @@
display_results(
user,
target,
- span_notice("You carve away some of the healthy flesh from [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] carves away some of the healthy flesh from [target]'s [parse_zone(target_zone)] with [tool]!"),
- span_notice("[user] carves away some of the healthy flesh from [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You carve away some of the healthy flesh from [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] carves away some of the healthy flesh from [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]!"),
+ span_notice("[user] carves away some of the healthy flesh from [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
surgery.operated_bodypart.receive_damage(brute=rand(4,8), sharpness=TRUE)
@@ -146,13 +146,13 @@
display_results(
user,
target,
- span_notice("You begin to dress the burns on [target]'s [parse_zone(user.zone_selected)]..."),
- span_notice("[user] begins to dress the burns on [target]'s [parse_zone(user.zone_selected)] with [tool]."),
- span_notice("[user] begins to dress the burns on [target]'s [parse_zone(user.zone_selected)]."),
+ span_notice("You begin to dress the burns on [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."),
+ span_notice("[user] begins to dress the burns on [target]'s [target.parse_zone_with_bodypart(user.zone_selected)] with [tool]."),
+ span_notice("[user] begins to dress the burns on [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."),
)
- display_pain(target, "The burns on your [parse_zone(user.zone_selected)] sting like hell!")
+ display_pain(target, "The burns on your [target.parse_zone_with_bodypart(user.zone_selected)] sting like hell!")
else
- user.visible_message(span_notice("[user] looks for [target]'s [parse_zone(user.zone_selected)]."), span_notice("You look for [target]'s [parse_zone(user.zone_selected)]..."))
+ user.visible_message(span_notice("[user] looks for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."), span_notice("You look for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."))
/datum/surgery_step/dress/success(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
var/datum/wound/burn/flesh/burn_wound = surgery.operated_wound
@@ -160,9 +160,9 @@
display_results(
user,
target,
- span_notice("You successfully wrap [target]'s [parse_zone(target_zone)] with [tool]."),
- span_notice("[user] successfully wraps [target]'s [parse_zone(target_zone)] with [tool]!"),
- span_notice("[user] successfully wraps [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You successfully wrap [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]."),
+ span_notice("[user] successfully wraps [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]!"),
+ span_notice("[user] successfully wraps [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
log_combat(user, target, "dressed burns in", addition="COMBAT MODE: [uppertext(user.combat_mode)]")
burn_wound.sanitization += sanitization_added
diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm
index dc28e5da576..0d583d09a11 100644
--- a/code/modules/surgery/dental_implant.dm
+++ b/code/modules/surgery/dental_implant.dm
@@ -15,11 +15,11 @@
display_results(
user,
target,
- span_notice("You begin to wedge [tool] in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to wedge \the [tool] in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to wedge something in [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to wedge [tool] in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to wedge \the [tool] in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to wedge something in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "Something's being jammed into your [parse_zone(target_zone)]!")
+ display_pain(target, "Something's being jammed into your [target.parse_zone_with_bodypart(target_zone)]!")
/datum/surgery_step/insert_pill/success(mob/user, mob/living/carbon/target, target_zone, obj/item/reagent_containers/pill/tool, datum/surgery/surgery, default_display_results = FALSE)
if(!istype(tool))
@@ -36,9 +36,9 @@
display_results(
user,
target,
- span_notice("You wedge [tool] into [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] wedges \the [tool] into [target]'s [parse_zone(target_zone)]!"),
- span_notice("[user] wedges something into [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You wedge [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] wedges \the [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
+ span_notice("[user] wedges something into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
return ..()
diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm
index 6905de5d8db..7c11ef3b98e 100644
--- a/code/modules/surgery/limb_augmentation.dm
+++ b/code/modules/surgery/limb_augmentation.dm
@@ -24,20 +24,20 @@
to_chat(user, span_warning("That's not an augment, silly!"))
return SURGERY_STEP_FAIL
if(aug.body_zone != target_zone)
- to_chat(user, span_warning("[tool] isn't the right type for [parse_zone(target_zone)]."))
+ to_chat(user, span_warning("[tool] isn't the right type for [target.parse_zone_with_bodypart(target_zone)]."))
return SURGERY_STEP_FAIL
target_limb = surgery.operated_bodypart
if(target_limb)
display_results(
user,
target,
- span_notice("You begin to augment [target]'s [parse_zone(user.zone_selected)]..."),
- span_notice("[user] begins to augment [target]'s [parse_zone(user.zone_selected)] with [aug]."),
- span_notice("[user] begins to augment [target]'s [parse_zone(user.zone_selected)]."),
+ span_notice("You begin to augment [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."),
+ span_notice("[user] begins to augment [target]'s [target.parse_zone_with_bodypart(user.zone_selected)] with [aug]."),
+ span_notice("[user] begins to augment [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."),
)
- display_pain(target, "You feel a horrible pain in your [parse_zone(user.zone_selected)]!")
+ display_pain(target, "You feel a horrible pain in your [target.parse_zone_with_bodypart(user.zone_selected)]!")
else
- user.visible_message(span_notice("[user] looks for [target]'s [parse_zone(user.zone_selected)]."), span_notice("You look for [target]'s [parse_zone(user.zone_selected)]..."))
+ user.visible_message(span_notice("[user] looks for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."), span_notice("You look for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."))
//ACTUAL SURGERIES
@@ -75,9 +75,9 @@
display_results(
user,
target,
- span_warning("You fail in replacing [target]'s [parse_zone(target_zone)]! Their body has rejected [tool]!"),
- span_warning("[user] fails to replace [target]'s [parse_zone(target_zone)]!"),
- span_warning("[user] fails to replaces [target]'s [parse_zone(target_zone)]!"),
+ span_warning("You fail in replacing [target]'s [target.parse_zone_with_bodypart(target_zone)]! Their body has rejected [tool]!"),
+ span_warning("[user] fails to replace [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
+ span_warning("[user] fails to replaces [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
tool.forceMove(target.loc)
return
@@ -86,12 +86,12 @@
display_results(
user,
target,
- span_notice("You successfully augment [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] successfully augments [target]'s [parse_zone(target_zone)] with [tool]!"),
- span_notice("[user] successfully augments [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You successfully augment [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] successfully augments [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]!"),
+ span_notice("[user] successfully augments [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
- display_pain(target, "Your [parse_zone(target_zone)] comes awash with synthetic sensation!", mechanical_surgery = TRUE)
- log_combat(user, target, "augmented", addition="by giving him new [parse_zone(target_zone)] COMBAT MODE: [uppertext(user.combat_mode)]")
+ display_pain(target, "Your [target.parse_zone_with_bodypart(target_zone)] comes awash with synthetic sensation!", mechanical_surgery = TRUE)
+ log_combat(user, target, "augmented", addition="by giving him new [target.parse_zone_with_bodypart(target_zone)] COMBAT MODE: [uppertext(user.combat_mode)]")
else
- to_chat(user, span_warning("[target] has no organic [parse_zone(target_zone)] there!"))
+ to_chat(user, span_warning("[target] has no organic [target.parse_zone_with_bodypart(target_zone)] there!"))
return ..()
diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm
index bb07fb72ded..309090a03ca 100644
--- a/code/modules/surgery/mechanic_steps.dm
+++ b/code/modules/surgery/mechanic_steps.dm
@@ -14,11 +14,11 @@
display_results(
user,
target,
- span_notice("You begin to unscrew the shell of [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to unscrew the shell of [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to unscrew the shell of [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to unscrew the shell of [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to unscrew the shell of [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to unscrew the shell of [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You can feel your [parse_zone(target_zone)] grow numb as the sensory panel is unscrewed.", TRUE)
+ display_pain(target, "You can feel your [target.parse_zone_with_bodypart(target_zone)] grow numb as the sensory panel is unscrewed.", TRUE)
/datum/surgery_step/mechanic_open/tool_check(mob/user, obj/item/tool)
if(implement_type == /obj/item && !tool.get_sharpness())
@@ -44,11 +44,11 @@
display_results(
user,
target,
- span_notice("You begin to screw the shell of [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to screw the shell of [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to screw the shell of [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to screw the shell of [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to screw the shell of [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to screw the shell of [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You feel the faint pricks of sensation return as your [parse_zone(target_zone)]'s panel is screwed in.", TRUE)
+ display_pain(target, "You feel the faint pricks of sensation return as your [target.parse_zone_with_bodypart(target_zone)]'s panel is screwed in.", TRUE)
/datum/surgery_step/mechanic_close/tool_check(mob/user, obj/item/tool)
if(implement_type == /obj/item && !tool.get_sharpness())
@@ -72,11 +72,11 @@
display_results(
user,
target,
- span_notice("You begin to prepare electronics in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to prepare electronics in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to prepare electronics in [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to prepare electronics in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to prepare electronics in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to prepare electronics in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You can feel a faint buzz in your [parse_zone(target_zone)] as the electronics reboot.", TRUE)
+ display_pain(target, "You can feel a faint buzz in your [target.parse_zone_with_bodypart(target_zone)] as the electronics reboot.", TRUE)
//unwrench
/datum/surgery_step/mechanic_unwrench
@@ -91,11 +91,11 @@
display_results(
user,
target,
- span_notice("You begin to unwrench some bolts in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to unwrench some bolts in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to unwrench some bolts in [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to unwrench some bolts in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to unwrench some bolts in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to unwrench some bolts in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You feel a jostle in your [parse_zone(target_zone)] as the bolts begin to loosen.", TRUE)
+ display_pain(target, "You feel a jostle in your [target.parse_zone_with_bodypart(target_zone)] as the bolts begin to loosen.", TRUE)
/datum/surgery_step/mechanic_unwrench/tool_check(mob/user, obj/item/tool)
if(tool.usesound)
@@ -116,11 +116,11 @@
display_results(
user,
target,
- span_notice("You begin to wrench some bolts in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to wrench some bolts in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to wrench some bolts in [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to wrench some bolts in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to wrench some bolts in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to wrench some bolts in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You feel a jostle in your [parse_zone(target_zone)] as the bolts begin to tighten.", TRUE)
+ display_pain(target, "You feel a jostle in your [target.parse_zone_with_bodypart(target_zone)] as the bolts begin to tighten.", TRUE)
/datum/surgery_step/mechanic_wrench/tool_check(mob/user, obj/item/tool)
if(tool.usesound)
@@ -140,11 +140,11 @@
display_results(
user,
target,
- span_notice("You begin to open the hatch holders in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to open the hatch holders in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to open the hatch holders in [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to open the hatch holders in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to open the hatch holders in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to open the hatch holders in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "The last faint pricks of tactile sensation fade from your [parse_zone(target_zone)] as the hatch is opened.", TRUE)
+ display_pain(target, "The last faint pricks of tactile sensation fade from your [target.parse_zone_with_bodypart(target_zone)] as the hatch is opened.", TRUE)
/datum/surgery_step/open_hatch/tool_check(mob/user, obj/item/tool)
if(tool.usesound)
diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm
index 144d30e067d..1da7f59426c 100644
--- a/code/modules/surgery/organ_manipulation.dm
+++ b/code/modules/surgery/organ_manipulation.dm
@@ -158,7 +158,7 @@
if(!isorgan(target_organ))
if (target_zone == BODY_ZONE_PRECISE_EYES)
target_zone = check_zone(target_zone)
- to_chat(user, span_warning("You cannot put [target_organ] into [target]'s [parse_zone(target_zone)]!"))
+ to_chat(user, span_warning("You cannot put [target_organ] into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"))
return SURGERY_STEP_FAIL
tool = target_organ
if(isorgan(tool))
@@ -167,7 +167,7 @@
success_sound = 'sound/surgery/organ2.ogg'
target_organ = tool
if(target_zone != target_organ.zone || target.get_organ_slot(target_organ.slot))
- to_chat(user, span_warning("There is no room for [target_organ] in [target]'s [parse_zone(target_zone)]!"))
+ to_chat(user, span_warning("There is no room for [target_organ] in [target]'s [target.parse_zone_with_bodypart(target_zone)]!"))
return SURGERY_STEP_FAIL
var/obj/item/organ/meatslab = tool
if(!meatslab.useable)
@@ -182,11 +182,11 @@
display_results(
user,
target,
- span_notice("You begin to insert [tool] into [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to insert [tool] into [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to insert something into [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to insert [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to insert [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to insert something into [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You can feel something being placed in your [parse_zone(target_zone)]!")
+ display_pain(target, "You can feel something being placed in your [target.parse_zone_with_bodypart(target_zone)]!")
else if(implement_type in implements_extract)
@@ -199,7 +199,7 @@
if (target_zone == BODY_ZONE_PRECISE_EYES)
target_zone = check_zone(target_zone)
if(!length(organs))
- to_chat(user, span_warning("There are no removable organs in [target]'s [parse_zone(target_zone)]!"))
+ to_chat(user, span_warning("There are no removable organs in [target]'s [target.parse_zone_with_bodypart(target_zone)]!"))
return SURGERY_STEP_FAIL
else
for(var/obj/item/organ/organ in organs)
@@ -221,11 +221,11 @@
display_results(
user,
target,
- span_notice("You begin to extract [target_organ] from [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to extract [target_organ] from [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to extract something from [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to extract [target_organ] from [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to extract [target_organ] from [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to extract something from [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You can feel your [target_organ.name] being removed from your [parse_zone(target_zone)]!")
+ display_pain(target, "You can feel your [target_organ.name] being removed from your [target.parse_zone_with_bodypart(target_zone)]!")
else
return SURGERY_STEP_FAIL
@@ -247,11 +247,11 @@
display_results(
user,
target,
- span_notice("You insert [tool] into [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] inserts [tool] into [target]'s [parse_zone(target_zone)]!"),
- span_notice("[user] inserts something into [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You insert [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] inserts [tool] into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
+ span_notice("[user] inserts something into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
- display_pain(target, "Your [parse_zone(target_zone)] throbs with pain as your new [tool.name] comes to life!")
+ display_pain(target, "Your [target.parse_zone_with_bodypart(target_zone)] throbs with pain as your new [tool.name] comes to life!")
target_organ.on_surgical_insertion(user, target, target_zone, tool)
else
target_organ.forceMove(target.loc)
@@ -261,11 +261,11 @@
display_results(
user,
target,
- span_notice("You successfully extract [target_organ] from [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] successfully extracts [target_organ] from [target]'s [parse_zone(target_zone)]!"),
- span_notice("[user] successfully extracts something from [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You successfully extract [target_organ] from [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] successfully extracts [target_organ] from [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
+ span_notice("[user] successfully extracts something from [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
- display_pain(target, "Your [parse_zone(target_zone)] throbs with pain, you can't feel your [target_organ.name] anymore!")
+ display_pain(target, "Your [target.parse_zone_with_bodypart(target_zone)] throbs with pain, you can't feel your [target_organ.name] anymore!")
log_combat(user, target, "surgically removed [target_organ.name] from", addition="COMBAT MODE: [uppertext(user.combat_mode)]")
target_organ.Remove(target)
target_organ.forceMove(get_turf(target))
@@ -274,9 +274,9 @@
display_results(
user,
target,
- span_warning("You can't extract anything from [target]'s [parse_zone(target_zone)]!"),
- span_notice("[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!"),
- span_notice("[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!"),
+ span_warning("You can't extract anything from [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
+ span_notice("[user] can't seem to extract anything from [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
+ span_notice("[user] can't seem to extract anything from [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
if(HAS_MIND_TRAIT(user, TRAIT_MORBID) && ishuman(user))
var/mob/living/carbon/human/morbid_weirdo = user
diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm
index aa697cb1072..a307d00dbba 100644
--- a/code/modules/surgery/organic_steps.dm
+++ b/code/modules/surgery/organic_steps.dm
@@ -16,11 +16,11 @@
display_results(
user,
target,
- span_notice("You begin to make an incision in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to make an incision in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to make an incision in [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to make an incision in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to make an incision in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to make an incision in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You feel a stabbing in your [parse_zone(target_zone)].")
+ display_pain(target, "You feel a stabbing in your [target.parse_zone_with_bodypart(target_zone)].")
/datum/surgery_step/incise/tool_check(mob/user, obj/item/tool)
if(implement_type == /obj/item && !tool.get_sharpness())
@@ -35,9 +35,9 @@
display_results(
user,
target,
- span_notice("Blood pools around the incision in [human_target]'s [parse_zone(target_zone)]."),
- span_notice("Blood pools around the incision in [human_target]'s [parse_zone(target_zone)]."),
- span_notice("Blood pools around the incision in [human_target]'s [parse_zone(target_zone)]."),
+ span_notice("Blood pools around the incision in [human_target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("Blood pools around the incision in [human_target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("Blood pools around the incision in [human_target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
var/obj/item/bodypart/target_bodypart = target.get_bodypart(target_zone)
if(target_bodypart)
@@ -48,11 +48,11 @@
display_results(
user,
target,
- span_notice("You begin to carefully make an incision in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to carefully make an incision in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to carefully make an incision in [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to carefully make an incision in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to carefully make an incision in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to carefully make an incision in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You feel a careful stabbing in your [parse_zone(target_zone)].")
+ display_pain(target, "You feel a careful stabbing in your [target.parse_zone_with_bodypart(target_zone)].")
//clamp bleeders
/datum/surgery_step/clamp_bleeders
@@ -69,11 +69,11 @@
display_results(
user,
target,
- span_notice("You begin to clamp bleeders in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to clamp bleeders in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to clamp bleeders in [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to clamp bleeders in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to clamp bleeders in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to clamp bleeders in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You feel a pinch as the bleeding in your [parse_zone(target_zone)] is slowed.")
+ display_pain(target, "You feel a pinch as the bleeding in your [target.parse_zone_with_bodypart(target_zone)] is slowed.")
/datum/surgery_step/clamp_bleeders/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results)
if(locate(/datum/surgery_step/saw) in surgery.steps)
@@ -101,11 +101,11 @@
display_results(
user,
target,
- span_notice("You begin to retract the skin in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to retract the skin in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to retract the skin in [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to retract the skin in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to retract the skin in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to retract the skin in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You feel a severe stinging pain spreading across your [parse_zone(target_zone)] as the skin is pulled back!")
+ display_pain(target, "You feel a severe stinging pain spreading across your [target.parse_zone_with_bodypart(target_zone)] as the skin is pulled back!")
//close incision
/datum/surgery_step/close
@@ -123,11 +123,11 @@
display_results(
user,
target,
- span_notice("You begin to mend the incision in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to mend the incision in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to mend the incision in [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to mend the incision in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to mend the incision in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to mend the incision in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "Your [parse_zone(target_zone)] is being burned!")
+ display_pain(target, "Your [target.parse_zone_with_bodypart(target_zone)] is being burned!")
/datum/surgery_step/close/tool_check(mob/user, obj/item/tool)
if(implement_type == TOOL_WELDER || implement_type == /obj/item)
@@ -173,11 +173,11 @@
display_results(
user,
target,
- span_notice("You begin to saw through the bone in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to saw through the bone in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to saw through the bone in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to saw through the bone in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You feel a horrid ache spread through the inside of your [parse_zone(target_zone)]!")
+ display_pain(target, "You feel a horrid ache spread through the inside of your [target.parse_zone_with_bodypart(target_zone)]!")
/datum/surgery_step/saw/tool_check(mob/user, obj/item/tool)
if(implement_type == /obj/item && !(tool.get_sharpness() && (tool.force >= 10)))
@@ -189,11 +189,11 @@
display_results(
user,
target,
- span_notice("You saw [target]'s [parse_zone(target_zone)] open."),
- span_notice("[user] saws [target]'s [parse_zone(target_zone)] open!"),
- span_notice("[user] saws [target]'s [parse_zone(target_zone)] open!"),
+ span_notice("You saw [target]'s [target.parse_zone_with_bodypart(target_zone)] open."),
+ span_notice("[user] saws [target]'s [target.parse_zone_with_bodypart(target_zone)] open!"),
+ span_notice("[user] saws [target]'s [target.parse_zone_with_bodypart(target_zone)] open!"),
)
- display_pain(target, "It feels like something just broke in your [parse_zone(target_zone)]!")
+ display_pain(target, "It feels like something just broke in your [target.parse_zone_with_bodypart(target_zone)]!")
return ..()
//drill bone
@@ -211,18 +211,18 @@
display_results(
user,
target,
- span_notice("You begin to drill into the bone in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to drill into the bone in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to drill into the bone in [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to drill into the bone in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to drill into the bone in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to drill into the bone in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You feel a horrible piercing pain in your [parse_zone(target_zone)]!")
+ display_pain(target, "You feel a horrible piercing pain in your [target.parse_zone_with_bodypart(target_zone)]!")
/datum/surgery_step/drill/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
display_results(
user,
target,
- span_notice("You drill into [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] drills into [target]'s [parse_zone(target_zone)]!"),
- span_notice("[user] drills into [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You drill into [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] drills into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
+ span_notice("[user] drills into [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
return ..()
diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm
index 9224c29b2db..78e42237963 100644
--- a/code/modules/surgery/plastic_surgery.dm
+++ b/code/modules/surgery/plastic_surgery.dm
@@ -42,11 +42,11 @@
display_results(
user,
target,
- span_notice("You begin to insert [tool] into the incision in [target]'s [parse_zone(target_zone)]..."),
- span_notice("[user] begins to insert [tool] into the incision in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to insert [tool] into the incision in [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to insert [tool] into the incision in [target]'s [target.parse_zone_with_bodypart(target_zone)]..."),
+ span_notice("[user] begins to insert [tool] into the incision in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to insert [tool] into the incision in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
- display_pain(target, "You feel something inserting just below the skin in your [parse_zone(target_zone)].")
+ display_pain(target, "You feel something inserting just below the skin in your [target.parse_zone_with_bodypart(target_zone)].")
/datum/surgery_step/insert_plastic/success(mob/user, mob/living/target, target_zone, obj/item/stack/tool, datum/surgery/surgery, default_display_results)
. = ..()
diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm
index 818c7a788d9..fcfc01f3a9b 100644
--- a/code/modules/surgery/prosthetic_replacement.dm
+++ b/code/modules/surgery/prosthetic_replacement.dm
@@ -62,27 +62,27 @@
organ_rejection_dam = 30
if(!bodypart_to_attach.can_attach_limb(target))
- target.balloon_alert(user, "that doesn't go on the [parse_zone(target_zone)]!")
+ target.balloon_alert(user, "that doesn't go on the [target.parse_zone_with_bodypart(target_zone)]!")
return SURGERY_STEP_FAIL
if(target_zone == bodypart_to_attach.body_zone) //so we can't replace a leg with an arm, or a human arm with a monkey arm.
display_results(
user,
target,
- span_notice("You begin to replace [target]'s [parse_zone(target_zone)] with [tool]..."),
- span_notice("[user] begins to replace [target]'s [parse_zone(target_zone)] with [tool]."),
- span_notice("[user] begins to replace [target]'s [parse_zone(target_zone)]."),
+ span_notice("You begin to replace [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]..."),
+ span_notice("[user] begins to replace [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]."),
+ span_notice("[user] begins to replace [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
else
- to_chat(user, span_warning("[tool] isn't the right type for [parse_zone(target_zone)]."))
+ to_chat(user, span_warning("[tool] isn't the right type for [target.parse_zone_with_bodypart(target_zone)]."))
return SURGERY_STEP_FAIL
else if(target_zone == BODY_ZONE_L_ARM || target_zone == BODY_ZONE_R_ARM)
display_results(
user,
target,
span_notice("You begin to attach [tool] onto [target]..."),
- span_notice("[user] begins to attach [tool] onto [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] begins to attach something onto [target]'s [parse_zone(target_zone)]."),
+ span_notice("[user] begins to attach [tool] onto [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] begins to attach something onto [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
)
else
to_chat(user, span_warning("[tool] must be installed onto an arm."))
@@ -105,11 +105,11 @@
display_results(
user,
target,
- span_notice("You succeed in replacing [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] successfully replaces [target]'s [parse_zone(target_zone)] with [tool]!"),
- span_notice("[user] successfully replaces [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You succeed in replacing [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] successfully replaces [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]!"),
+ span_notice("[user] successfully replaces [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
- display_pain(target, "You feel synthetic sensation wash from your [parse_zone(target_zone)], which you can feel again!", TRUE)
+ display_pain(target, "You feel synthetic sensation wash from your [target.parse_zone_with_bodypart(target_zone)], which you can feel again!", TRUE)
return
else
var/obj/item/bodypart/bodypart_to_attach = target.newBodyPart(target_zone, FALSE, FALSE)
@@ -123,7 +123,7 @@
span_notice("[user] finishes attaching [tool]!"),
span_notice("[user] finishes the attachment procedure!"),
)
- display_pain(target, "You feel a strange sensation from your new [parse_zone(target_zone)].", TRUE)
+ display_pain(target, "You feel a strange sensation from your new [target.parse_zone_with_bodypart(target_zone)].", TRUE)
if(istype(tool, /obj/item/chainsaw))
qdel(tool)
var/obj/item/chainsaw/mounted_chainsaw/new_arm = new(target)
diff --git a/code/modules/surgery/repair_puncture.dm b/code/modules/surgery/repair_puncture.dm
index 9b9071cff89..31a61a88279 100644
--- a/code/modules/surgery/repair_puncture.dm
+++ b/code/modules/surgery/repair_puncture.dm
@@ -50,22 +50,22 @@
/datum/surgery_step/repair_innards/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/datum/wound/pierce/bleed/pierce_wound = surgery.operated_wound
if(!pierce_wound)
- user.visible_message(span_notice("[user] looks for [target]'s [parse_zone(user.zone_selected)]."), span_notice("You look for [target]'s [parse_zone(user.zone_selected)]..."))
+ user.visible_message(span_notice("[user] looks for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."), span_notice("You look for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."))
return
if(pierce_wound.blood_flow <= 0)
- to_chat(user, span_notice("[target]'s [parse_zone(user.zone_selected)] has no puncture to repair!"))
+ to_chat(user, span_notice("[target]'s [target.parse_zone_with_bodypart(user.zone_selected)] has no puncture to repair!"))
surgery.status++
return
display_results(
user,
target,
- span_notice("You begin to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)]..."),
- span_notice("[user] begins to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)] with [tool]."),
- span_notice("[user] begins to realign the torn blood vessels in [target]'s [parse_zone(user.zone_selected)]."),
+ span_notice("You begin to realign the torn blood vessels in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."),
+ span_notice("[user] begins to realign the torn blood vessels in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)] with [tool]."),
+ span_notice("[user] begins to realign the torn blood vessels in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."),
)
- display_pain(target, "You feel a horrible stabbing pain in your [parse_zone(user.zone_selected)]!")
+ display_pain(target, "You feel a horrible stabbing pain in your [target.parse_zone_with_bodypart(user.zone_selected)]!")
/datum/surgery_step/repair_innards/success(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
var/datum/wound/pierce/bleed/pierce_wound = surgery.operated_wound
@@ -76,9 +76,9 @@
display_results(
user,
target,
- span_notice("You successfully realign some of the blood vessels in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] successfully realigns some of the blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!"),
- span_notice("[user] successfully realigns some of the blood vessels in [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You successfully realign some of the blood vessels in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] successfully realigns some of the blood vessels in [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]!"),
+ span_notice("[user] successfully realigns some of the blood vessels in [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
log_combat(user, target, "excised infected flesh in", addition="COMBAT MODE: [uppertext(user.combat_mode)]")
surgery.operated_bodypart.receive_damage(brute=3, wound_bonus=CANT_WOUND)
@@ -90,9 +90,9 @@
display_results(
user,
target,
- span_notice("You jerk apart some of the blood vessels in [target]'s [parse_zone(target_zone)]."),
- span_notice("[user] jerks apart some of the blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!"),
- span_notice("[user] jerk apart some of the blood vessels in [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You jerk apart some of the blood vessels in [target]'s [target.parse_zone_with_bodypart(target_zone)]."),
+ span_notice("[user] jerks apart some of the blood vessels in [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]!"),
+ span_notice("[user] jerk apart some of the blood vessels in [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
surgery.operated_bodypart.receive_damage(brute=rand(4,8), sharpness=SHARP_EDGED, wound_bonus = 10)
@@ -117,16 +117,16 @@
/datum/surgery_step/seal_veins/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/datum/wound/pierce/bleed/pierce_wound = surgery.operated_wound
if(!pierce_wound)
- user.visible_message(span_notice("[user] looks for [target]'s [parse_zone(user.zone_selected)]."), span_notice("You look for [target]'s [parse_zone(user.zone_selected)]..."))
+ user.visible_message(span_notice("[user] looks for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."), span_notice("You look for [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."))
return
display_results(
user,
target,
- span_notice("You begin to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)]..."),
- span_notice("[user] begins to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)] with [tool]."),
- span_notice("[user] begins to meld some of the split blood vessels in [target]'s [parse_zone(user.zone_selected)]."),
+ span_notice("You begin to meld some of the split blood vessels in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]..."),
+ span_notice("[user] begins to meld some of the split blood vessels in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)] with [tool]."),
+ span_notice("[user] begins to meld some of the split blood vessels in [target]'s [target.parse_zone_with_bodypart(user.zone_selected)]."),
)
- display_pain(target, "You're being burned inside your [parse_zone(user.zone_selected)]!")
+ display_pain(target, "You're being burned inside your [target.parse_zone_with_bodypart(user.zone_selected)]!")
/datum/surgery_step/seal_veins/success(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
var/datum/wound/pierce/bleed/pierce_wound = surgery.operated_wound
@@ -137,9 +137,9 @@
display_results(
user,
target,
- span_notice("You successfully meld some of the split blood vessels in [target]'s [parse_zone(target_zone)] with [tool]."),
- span_notice("[user] successfully melds some of the split blood vessels in [target]'s [parse_zone(target_zone)] with [tool]!"),
- span_notice("[user] successfully melds some of the split blood vessels in [target]'s [parse_zone(target_zone)]!"),
+ span_notice("You successfully meld some of the split blood vessels in [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]."),
+ span_notice("[user] successfully melds some of the split blood vessels in [target]'s [target.parse_zone_with_bodypart(target_zone)] with [tool]!"),
+ span_notice("[user] successfully melds some of the split blood vessels in [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
)
log_combat(user, target, "dressed burns in", addition="COMBAT MODE: [uppertext(user.combat_mode)]")
pierce_wound.adjust_blood_flow(-0.5)
@@ -147,7 +147,7 @@
surgery.status = REALIGN_INNARDS
to_chat(user, span_notice("There still seems to be misaligned blood vessels to finish..."))
else
- to_chat(user, span_green("You've repaired all the internal damage in [target]'s [parse_zone(target_zone)]!"))
+ to_chat(user, span_green("You've repaired all the internal damage in [target]'s [target.parse_zone_with_bodypart(target_zone)]!"))
return ..()
#undef REALIGN_INNARDS
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index 2199e426440..bf4ad17db42 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -51,7 +51,7 @@
if(get_location_accessible(target, target_zone) || (surgery.surgery_flags & SURGERY_IGNORE_CLOTHES))
initiate(user, target, target_zone, tool, surgery, try_to_fail)
else
- to_chat(user, span_warning("You need to expose [target]'s [parse_zone(target_zone)] to perform surgery on it!"))
+ to_chat(user, span_warning("You need to expose [target]'s [target.parse_zone_with_bodypart(target_zone)] to perform surgery on it!"))
return TRUE //returns TRUE so we don't stab the guy in the dick or wherever.
if(repeatable)