From 507dc0c49651cc88e37245fffceea4208fa59931 Mon Sep 17 00:00:00 2001
From: Chinsky <krauchinsky@gmail.com>
Date: Sun, 2 Dec 2012 16:30:24 +0400
Subject: [PATCH] Better feedback messages and ability to target groin, hands
 and feet.

---
 code/game/objects/items/stacks/medical.dm | 50 ++++++++++-------------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 559d8255d36..63992bde103 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -23,42 +23,34 @@
 
 	if (istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
-		var/datum/organ/external/affecting = H.get_organ(check_zone(user.zone_sel.selecting))
-
+		var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 		if(affecting.status & ORGAN_ROBOT)
 			user << "\red This isn't useful at all on a robotic limb.."
 			return 1
 
-			if(src.heal_brute)
-				if(!affecting.bandage())
-					user << "\red The wounds on this limb have already been bandaged."
-					return 1
-			else if(src.heal_burn)
-				if(!affecting.salve())
-					user << "\red The wounds on this limb have already been salved."
-					return 1
+		if(src.heal_brute)
+			if(!affecting.bandage())
+				user << "\red The wounds on [M]'s [affecting.display_name] have already been bandaged."
+				return 1
+			else
+				user.visible_message( 	"\blue [user] bandages wounds on [M]'s [affecting.display_name].", \
+										"\blue You bandage wounds on [M]'s [affecting.display_name]." )
+
+		else if(src.heal_burn)
+			if(!affecting.salve())
+				user << "\red The wounds on [M]'s [affecting.display_name] have already been salved."
+				return 1
+			else
+				user.visible_message( 	"\blue [user] salves wounds on [M]'s [affecting.display_name].", \
+										"\blue You salve wounds on [M]'s [affecting.display_name]." )
 
 		H.UpdateDamageIcon()
-		M.updatehealth()
 	else
 		M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
+		user.visible_message( \
+			"\blue [M] has been applied with [src] by [user].", \
+			"\blue You apply \the [src] to [M]." \
+		)
 
 	use(1)
-
-	if (user)
-		if (M != user)
-			user.visible_message( \
-				"\blue [M] has been applied with [src] by [user].", \
-				"\blue You apply \the [src] to [M]." \
-			)
-		else
-			var/t_himself = "itself"
-			if (user.gender == MALE)
-				t_himself = "himself"
-			else if (user.gender == FEMALE)
-				t_himself = "herself"
-
-			user.visible_message( \
-				"\blue [M] applied [src] on [t_himself].", \
-				"\blue You apply \the [src] on yourself." \
-			)
+	M.updatehealth()