Merge pull request #1583 from CIB/cib

Full wound system rewrite - Tested and ready to merge

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

@@ -118,10 +118,22 @@ MEDICAL
 		if (!ointment && (affecting.status & ORGAN_BLEEDING))
 			affecting.status &= ~ORGAN_BLEEDING
 
-		if (affecting.heal_damage(src.heal_brute, src.heal_burn))
-			H.UpdateDamageIcon()
+		// handle wound stuff
+		if(ointment)
+			for(var/datum/wound/W in affecting.wounds)
+				W.salved = 1
 		else
-			H.UpdateDamage()
+			for(var/datum/wound/W in affecting.wounds)
+				W.bandaged = 1
+
+		// make sure to apply the updates of the wound to the organ
+		affecting.update_damages()
+
+		// Don't do direct healing
+		//if (affecting.heal_damage(src.heal_brute, src.heal_burn))
+		//	H.UpdateDamageIcon()
+		//else
+		H.UpdateDamage()
 
 		M.updatehealth()