Merge pull request #3838 from Crazylemon64/slime_blood_work_right_dangit

Skeletons, Slime people, and other bloodless races no longer bleed

code/modules/reagents/Chemistry-Holder.dm

@@ -91,12 +91,27 @@ var/const/INGEST = 2
 
 	return the_id
 
-/datum/reagents/proc/trans_to(var/obj/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred.
-	if (!target )
+/datum/reagents/proc/trans_to(var/target, var/amount=1, var/multiplier=1, var/preserve_data=1)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred.
+	if (!target)
 		return
-	if (!target.reagents || src.total_volume<=0)
+	if(src.total_volume <= 0)
 		return
-	var/datum/reagents/R = target.reagents
+	var/datum/reagents/R
+	if(istype(target, /obj))
+		var/obj/O = target
+		if (!O.reagents )
+			return
+		R = O.reagents
+	else if (istype(target, /mob/living))
+		var/mob/living/M = target
+		if(!M.reagents)
+			return
+		R = M.reagents
+	else if(istype(target, /datum/reagents))
+		R = target
+	else
+		return
+
 	amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume)
 	var/part = amount / src.total_volume
 	var/trans_data = null
@@ -605,6 +620,14 @@ atom/proc/create_reagents(var/max_vol)
 	reagents = new/datum/reagents(max_vol)
 	reagents.my_atom = src
 
+/datum/reagents/proc/get_reagent_from_id(var/id)
+	var/datum/reagent/result = null
+	for(var/datum/reagent/R in reagent_list)
+		if(R.id == id)
+			result = R
+			break
+	return result
+
 /datum/reagents/Destroy()
 	. = ..()
 	processing_objects.Remove(src)

code/modules/reagents/oldchem/reagents/reagents_water.dm

@@ -184,16 +184,18 @@
 	if(!istype(T)) return
 	var/datum/reagent/blood/self = src
 	src = null
-	if(!(volume >= 3)) return
+	var/big_splash = 1
+	if(volume < 3)
+		big_splash = 0
 	//var/datum/disease/D = self.data["virus"]
 	if(!self.data["donor"] || istype(self.data["donor"], /mob/living/carbon/human))
+		blood_splatter(T, src, big_splash)
 		var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T //find some blood here
-		if(!blood_prop) //first blood!
-			blood_prop = new(T)
-			blood_prop.blood_DNA[self.data["blood_DNA"]] = self.data["blood_type"]
 
-		if(self.data["virus2"])
-			blood_prop.virus2 = virus_copylist(self.data["virus2"])
+		if(blood_prop)
+			blood_prop.blood_DNA[self.data["blood_DNA"]] = self.data["blood_type"]
+			if(self.data["virus2"])
+				blood_prop.virus2 = virus_copylist(self.data["virus2"])
 
 	else if(istype(self.data["donor"], /mob/living/carbon/alien))
 		var/obj/effect/decal/cleanable/blood/xeno/blood_prop = locate() in T