From 8991f73efcbda7ba6a681370d4a7179ba6bcb8f6 Mon Sep 17 00:00:00 2001
From: Pobiega <robin.aakerman@gmail.com>
Date: Tue, 16 Oct 2012 10:35:13 +0200
Subject: [PATCH] Fixes issue #1772, bandaging already bandaged wounds.

---
 code/game/objects/items/stacks/medical.dm | 42 +++++++++++++----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 1b5403d3282..bf05bf0f9d5 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -9,7 +9,7 @@
 		else if (M.gender == FEMALE)
 			t_him = "her"
 		user << "\red \The [M] is dead, you cannot help [t_him]!"
-		return
+		return 1
 
 	if (!istype(M))
 		user << "\red \The [src] cannot be applied to [M]!"
@@ -21,24 +21,6 @@
 		user << "\red You don't have the dexterity to do this!"
 		return 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." \
-			)
-
 	if (istype(M, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
 		var/datum/organ/external/affecting = H.get_organ("chest")
@@ -65,16 +47,20 @@
 			if(src.heal_brute)
 				if(!affecting.bandage() && !child.bandage())
 					user << "\red The wounds on this limb have already been bandaged."
+					return 1
 			else if(src.heal_burn)
 				if(!affecting.salve() && !child.salve())
 					user << "\red The wounds on this limb have already been salved."
+					return 1
 		else
 			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
 
 		H.UpdateDamageIcon()
 		M.updatehealth()
@@ -82,3 +68,21 @@
 		M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
 
 	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." \
+			)