[MIRROR] Fixed healing simplemobs with medical stacks + grammar/formatting/user feedback

code/game/objects/items/stacks/medical.dm

@@ -32,6 +32,8 @@
 	var/sanitization
 	/// How much we add to flesh_healing for burn wounds on application
 	var/flesh_regeneration
+	/// Time it takes to assess injuries when looping healing
+	var/assessing_injury_delay = 1 SECONDS
 
 /obj/item/stack/medical/interact_with_atom(atom/interacting_with, mob/living/user)
 	if(!isliving(interacting_with))
@@ -78,8 +80,11 @@
 /obj/item/stack/medical/proc/try_heal(mob/living/patient, mob/user, silent = FALSE, looping = FALSE)
 	if(!try_heal_checks(patient, user, heal_brute, heal_burn, looping))
 		return
-	var/new_self_delay = looping ? clamp((self_delay-(1 SECONDS)), 0, self_delay) : self_delay
-	var/new_other_delay = looping ? clamp((other_delay-(1 SECONDS)), 0, other_delay) : other_delay
+	var/new_self_delay = self_delay
+	var/new_other_delay = other_delay
+	if(iscarbon(patient))
+		new_self_delay = looping ? clamp((self_delay - assessing_injury_delay), 0, self_delay) : self_delay
+		new_other_delay = looping ? clamp((other_delay - assessing_injury_delay), 0, other_delay) : other_delay
 	if(patient == user)
 		if(!silent)
 			user.visible_message(
@@ -121,37 +126,55 @@
 /obj/item/stack/medical/proc/heal(mob/living/patient, mob/user)
 	if(patient.stat == DEAD)
 		patient.balloon_alert(user, "they're dead!")
-		return
-	if(isanimal_or_basicmob(patient) && heal_brute) // only brute can heal
-		if (!(patient.mob_biotypes & MOB_ORGANIC))
-			patient.balloon_alert(user, "can't fix that!")
+		return FALSE
+	if(iscarbon(patient))
+		return heal_carbon(patient, user, heal_brute, heal_burn)
+	else if(isanimal_or_basicmob(patient))
+		if(!try_heal_checks(patient, user, heal_brute, heal_burn))
+			return FALSE
+		if(patient.heal_bodypart_damage((heal_brute * patient.maxHealth/100)))
+			user.visible_message("<span class='infoplain'><span class='green'>[user] applies [src] on [patient].</span></span>", "<span class='infoplain'><span class='green'>You apply [src] on [patient].</span></span>")
+			return TRUE
+	patient.balloon_alert(user, "can't heal [patient]!")
+	return FALSE
+
+/obj/item/stack/medical/proc/try_heal_checks(mob/living/patient, mob/user, brute, burn, looping = FALSE)
+	if(iscarbon(patient))
+		if(looping)
+			balloon_alert(user, "assessing injuries...")
+			if(!do_after(user, assessing_injury_delay, patient))
+				return FALSE
+		var/mob/living/carbon/carbon_patient = patient
+		var/obj/item/bodypart/affecting = carbon_patient.get_bodypart(check_zone(user.zone_selected))
+		if(!affecting) //Missing limb?
+			carbon_patient.balloon_alert(user, "no [parse_zone(user.zone_selected)]!")
+			return FALSE
+		if(!IS_ORGANIC_LIMB(affecting)) //Limb must be organic to be healed - RR
+			carbon_patient.balloon_alert(user, "[affecting.plaintext_zone] is not organic!")
+			return FALSE
+		if(!(affecting.brute_dam && brute) && !(affecting.burn_dam && burn))
+			if(!affecting.brute_dam && !affecting.burn_dam)
+				if(patient != user || !looping)
+					carbon_patient.balloon_alert(user, "[affecting.plaintext_zone] is not hurt!")
+			else
+				carbon_patient.balloon_alert(user, "can't heal [affecting.plaintext_zone] with [name]!")
+			return FALSE
+		return TRUE
+	if(isanimal_or_basicmob(patient))
+		if(patient.stat == DEAD)
+			patient.balloon_alert(user, "they're dead!")
+			return FALSE
+		if(!heal_brute) // only brute can heal
+			patient.balloon_alert(user, "can't heal with [name]!")
+			return FALSE
+		if(!(patient.mob_biotypes & MOB_ORGANIC))
+			patient.balloon_alert(user, "no organic tissue!")
 			return FALSE
-		if (patient.health == patient.maxHealth)
+		if(patient.health == patient.maxHealth)
 			patient.balloon_alert(user, "not hurt!")
 			return FALSE
-		user.visible_message("<span class='infoplain'><span class='green'>[user] applies [src] on [patient].</span></span>", "<span class='infoplain'><span class='green'>You apply [src] on [patient].</span></span>")
-		patient.heal_bodypart_damage((heal_brute * patient.maxHealth/100))
 		return TRUE
-	if(iscarbon(patient))
-		return heal_carbon(patient, user, heal_brute, heal_burn)
-	patient.balloon_alert(user, "can't heal that!")
 
-/obj/item/stack/medical/proc/try_heal_checks(mob/living/carbon/patient, mob/user, brute, burn, looping = FALSE)
-	if(looping)
-		balloon_alert(user, "assessing damage...")
-		if(!do_after(user, 1 SECONDS, patient))
-			return FALSE
-	var/obj/item/bodypart/affecting = patient.get_bodypart(check_zone(user.zone_selected))
-	if(!affecting) //Missing limb?
-		patient.balloon_alert(user, "no [parse_zone(user.zone_selected)]!")
-		return FALSE
-	if(!IS_ORGANIC_LIMB(affecting)) //Limb must be organic to be healed - RR
-		patient.balloon_alert(user, "it's not organic!")
-		return FALSE
-	if(!(affecting.brute_dam && brute) && !(affecting.burn_dam && burn))
-		patient.balloon_alert(user, "can't heal [affecting]!")
-		return FALSE
-	return TRUE
 
 /// The healing effects on a carbon patient. Since we have extra details for dealing with bodyparts, we get our own fancy proc. Still returns TRUE on success and FALSE on fail
 /obj/item/stack/medical/proc/heal_carbon(mob/living/carbon/patient, mob/user, brute, burn)