More Suture Changes (#30164)

* more suture changes * grammar
2026-07-15 17:13:46 +01:00 · 2025-08-28 19:10:32 -04:00
parent fa904d12d1
commit b4724b63fa
4 changed files with 132 additions and 34 deletions
@@ -368,80 +368,95 @@
 	icon_state = "suture"
 	gender = PLURAL
 	merge_type = /obj/item/stack/medical/suture
-	healverb = "suturing"
 	amount = 10
 	max_amount = 10
 	heal_brute = 10
 	stop_bleeding = 1200
 	dynamic_icon_state = TRUE
 	delay = 1 SECONDS
+	healverb = "suturing"
+	var/healverb_past = "sutured"
 	var/self_delay = 3 SECONDS
-	var/applying = FALSE
+	var/mob/current_target

 /obj/item/stack/medical/suture/apply(mob/living/carbon/human/target, mob/user)
 	. = TRUE
-	if(applying)
-		to_chat(user, "<span class='warning'>You're already applying [src].</span>")
+	if(current_target)
+		if(current_target != target)
+			to_chat(user, "<span class='warning'>You're already suturing [current_target].</span>")
+			return
+		// Allow for cancelling of the target by clicking again
+		interrupt_do_after_once(user, current_target)
+		to_chat(user, "<span class='warning'>You stop [healverb] [target.i_yourself(user)].</span>")
 		return
 	if(!ishuman(target) || !target.can_inject(user, TRUE))
 		return
 	var/heal_type = (heal_brute ? BRUTE : BURN)
 	var/heal_display = (heal_brute ? BRUTE : "burn")
 	if(!target.get_damage_amount(heal_type))
-		if(target == user)
-			to_chat(user, "<span class='warning'>You don't have any [heal_display] damage.</span>")
-		else
-			to_chat(user, "<span class='warning'>They don't have any [heal_display] damage.</span>")
+		to_chat(user, "<span class='warning'>[target.i_you(user, TRUE)] [target.i_do(user)]n't have any [heal_display] damage.</span>")
 		return

 	var/obj/item/organ/external/current_limb = target.get_organ(user.zone_selected)
 	if(!current_limb)
-		to_chat(user, "<span class='danger'>That limb is missing!</span>")
+		to_chat(user, "<span class='warning'>That limb is missing!</span>")
 		return
 	if(current_limb.is_robotic())
-		to_chat(user, "<span class='danger'>This can't be used on a robotic limb.</span>")
+		to_chat(user, "<span class='warning'>This can't be used on a robotic limb.</span>")
+		return
+	// Swap to another limb if the current one has no damage.
+	if(!most_damaged_limb(target))
+		to_chat(user, "<span class='warning'>[target.i_you(user, TRUE)] [target.i_do(user)]n't have any [heal_display] damage that could be [healverb_past].</span>")
 		return
-	if((heal_brute > 0 && !current_limb.brute_dam) || (heal_burn > 0 && !current_limb.burn_dam))
-		if(!do_after(user, delay / 2, target = target))
-			return
-		current_limb = most_damaged_limb(target)

 	var/mend_time = delay
 	if(target == user)
-		target.visible_message("[user] begins [healverb] [user.p_themselves()] with [src].", "<span class='notice'>You begin [healverb] your [current_limb.name] with [src].</span>")
 		mend_time = self_delay
-	else
-		user.visible_message("<span class='notice'>[user] begins [healverb] [target] with [src].</span>", "<span class='notice'>You begin [healverb] [target.p_their()] [current_limb.name] with [src].</span>")

-	applying = TRUE
-	while(do_after(user, mend_time, target = target))
-		if(!target.can_inject(user, TRUE))
+	user.visible_message("<span class='notice'>[user] begins [healverb] [target.e_themselves(user)] with [src].</span>", "<span class='notice'>You begin [healverb] [target.i_your(user)] [current_limb.name] with [src].</span>")
+	current_limb = try_swap_to_most_damaged_limb(target, user, current_limb)
+	if(!current_limb)
+		return
+
+	var/last_targetted_zone = user.zone_selected
+	current_target = target
+	while(do_after_once(user, mend_time, target = target))
+		if(!target.can_inject(user, TRUE, current_limb.limb_name))
 			break
+
 		var/cut_open = FALSE
 		if(stop_bleeding)
 			for(var/obj/item/organ/external/E in target.bodyparts)
 				if(E.open >= ORGAN_ORGANIC_OPEN)
 					cut_open = TRUE
-					to_chat(user, "<span class='warning'>[target]'s [E.name] is cut open, you'll need more than some [name] to stop their bleeding.</span>")
+					to_chat(user, "<span class='warning'>[target]'s [E.name] is cut open, you'll need more than some [name] to stop [target.i_your(user)] bleeding.</span>")
 					break
 		if(!apply_to(target, user, current_limb, !cut_open))
 			break
 		if(is_zero_amount(TRUE))
 			break
-		if((heal_brute > 0 && !current_limb.brute_dam) || (heal_burn > 0 && !current_limb.burn_dam))
-			if(!target.get_damage_amount(heal_type))
-				if(target == user)
-					target.visible_message("[user] finishes [healverb] [user.p_themselves()] with [src].", "<span class='notice'>You finish [healverb] yourself with [src].</span>")
-				else
-					user.visible_message("<span class='warning'>[user] finishes [healverb] [target] with [src].</span>", "<span class='notice'>You finish [healverb] [target] with [src].</span>")
-				break
-			if(!do_after(user, delay / 2, target = target))
-				break
-			current_limb = most_damaged_limb(target)
-			to_chat(user, "<span class='notice'>You begin [healverb] [target == user ? "your" : target.p_their()] [current_limb.name] with [src].</span>")
-		if(!target.can_inject(user, TRUE))
+		if(!target.get_damage_amount(heal_type))
+			user.visible_message("<span class='warning'>[user] finishes [healverb] [target.e_themselves(user)] with [src].</span>", "<span class='notice'>You finish [healverb] [target.i_yourself(user)] with [src].</span>")
 			break
-	applying = FALSE
+
+		var/skip_swap = FALSE
+		if(last_targetted_zone != user.zone_selected)
+			last_targetted_zone = user.zone_selected
+			var/new_limb = on_target_zone_change(target, user)
+			if(new_limb && current_limb != new_limb)
+				current_limb = new_limb
+				skip_swap = TRUE
+				to_chat(user, "<span class='notice'>You switch to [healverb] [target.i_your(user)] <b>[current_limb.name]</b>.</span>")
+
+		if(!skip_swap)
+			current_limb = try_swap_to_most_damaged_limb(target, user, current_limb)
+			if(!current_limb)
+				user.visible_message("<span class='warning'>[user] finishes [healverb] [target.e_themselves(user)] with [src].</span>", "<span class='notice'>You finish [healverb] [target.i_yourself(user)] with [src].</span>")
+				break
+
+		if(!target.can_inject(user, TRUE, current_limb.limb_name))
+			break
+	current_target = null
 	user.changeNext_move(CLICK_CD_MELEE)

 /obj/item/stack/medical/suture/proc/apply_to(mob/living/carbon/human/target, mob/user, obj/item/organ/external/current_limb, allow_stop_bleeding = TRUE)
@@ -449,6 +464,7 @@
 		return FALSE

 	current_limb.heal_damage(heal_brute, heal_burn, FALSE, FALSE, updating_health = TRUE)
+	target.UpdateDamageIcon()

 	if(stop_bleeding && !target.bleedsuppress && allow_stop_bleeding)
 		target.suppress_bloodloss(stop_bleeding)
@@ -459,6 +475,10 @@
 	var/most_damaged_amount = 0
 	var/focus_brute = (heal_brute > 0)
 	for(var/obj/item/organ/external/E in target.bodyparts)
+		if(QDELETED(E))
+			continue
+		if(E.is_robotic())
+			continue
 		if(focus_brute)
 			if(E.brute_dam > most_damaged_amount)
 				most_damaged = E
@@ -468,10 +488,41 @@
 			most_damaged_amount = E.burn_dam
 	return most_damaged

+/obj/item/stack/medical/suture/proc/try_swap_to_most_damaged_limb(mob/living/carbon/human/target, mob/user, obj/item/organ/external/current_limb)
+	if(heal_brute && current_limb.brute_dam)
+		return current_limb
+	if(heal_burn && current_limb.burn_dam)
+		return current_limb
+
+	var/obj/item/organ/external/new_limb = most_damaged_limb(target)
+	if(!new_limb)
+		return
+	if(current_limb != new_limb)
+		to_chat(user, "<span class='notice'>You begin [healverb] [target.i_your(user)] <b>[new_limb.name]</b>.</span>")
+	if(!do_after(user, delay / 2, target = target))
+		return
+	return new_limb
+
+/obj/item/stack/medical/suture/proc/on_target_zone_change(mob/living/carbon/human/target, mob/user)
+	var/obj/item/organ/external/new_limb = target.get_organ(user.zone_selected)
+	if(!new_limb)
+		to_chat(user, "<span class='warning'>That limb is missing!</span>")
+		return FALSE
+	if(new_limb.is_robotic())
+		to_chat(user, "<span class='warning'>This can't be used on a robotic limb.</span>")
+		return FALSE
+
+	if(heal_brute && new_limb.brute_dam)
+		return new_limb
+	if(heal_burn && new_limb.burn_dam)
+		return new_limb
+	return FALSE
+
 /obj/item/stack/medical/suture/emergency
 	name = "emergency sutures"
 	singular_name = "emergency suture"
 	desc = "A small bundle of cheap sutures. They're not pretty, but still quite effective at keeping the blood inside your body."
+	icon_state = "suture_emer"
 	merge_type = /obj/item/stack/medical/suture/emergency
 	heal_brute = 5

@@ -491,6 +542,7 @@
 	icon_state = "regen_mesh"
 	merge_type = /obj/item/stack/medical/suture/regen_mesh
 	healverb = "grafting"
+	healverb_past = "grafted"
 	heal_brute = 0
 	heal_burn = 10
 	/// This var determines if the sterile packaging of the mesh has been opened.