Merge pull request #8024 from deathride58/bloodybloodbloodblood

Atomizes the med rework's blood effect changes (most things that make a blood effect will now make you actually lose blood) and makes the blood reagent act more like you'd expect

code/modules/mob/living/carbon/carbon_defense.dm

@@ -87,21 +87,21 @@
 	//CIT CHANGES END HERE
 		apply_damage(totitemdamage, I.damtype, affecting) //CIT CHANGE - replaces I.force with totitemdamage
 		if(I.damtype == BRUTE && affecting.status == BODYPART_ORGANIC)
-			if(prob(33))
+			var/basebloodychance = affecting.brute_dam + totitemdamage
+			if(prob(basebloodychance))
 				I.add_mob_blood(src)
-				var/turf/location = get_turf(src)
-				add_splatter_floor(location)
-				if(get_dist(user, src) <= 1)	//people with TK won't get smeared with blood
+				bleed(totitemdamage)
+				if(totitemdamage >= 10 && get_dist(user, src) <= 1)	//people with TK won't get smeared with blood
 					user.add_mob_blood(src)
 
 				if(affecting.body_zone == BODY_ZONE_HEAD)
-					if(wear_mask)
+					if(wear_mask && prob(basebloodychance))
 						wear_mask.add_mob_blood(src)
 						update_inv_wear_mask()
-					if(wear_neck)
+					if(wear_neck && prob(basebloodychance))
 						wear_neck.add_mob_blood(src)
 						update_inv_neck()
-					if(head)
+					if(head && prob(basebloodychance))
 						head.add_mob_blood(src)
 						update_inv_head()
 

code/modules/mob/living/carbon/human/species.dm

@@ -1591,7 +1591,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 				bloody = 1
 				var/turf/location = H.loc
 				if(istype(location))
-					H.add_splatter_floor(location)
+					H.bleed(totitemdamage)
 				if(get_dist(user, H) <= 1)	//people with TK won't get smeared with blood
 					user.add_mob_blood(H)