Fixes #7392

code/game/atoms.dm

@@ -382,22 +382,23 @@ its easier to just keep the beam vertical.
 
 //returns 1 if made bloody, returns 0 otherwise
 /atom/proc/add_blood(mob/living/carbon/human/M as mob)
-	if(flags & NOBLOODY) return 0
-	.=1
-	if (!( istype(M, /mob/living/carbon/human) ))
-		return 0
-	if (!istype(M.dna, /datum/dna))
-		M.dna = new /datum/dna(null)
-		M.dna.real_name = M.real_name
-	M.check_dna()
-	if (!( src.flags ) & FPRINT)
+
+	if((flags & NOBLOODY) || !(flags & FPRINT))
 		return 0
+
 	if(!blood_DNA || !istype(blood_DNA, /list))	//if our list of DNA doesn't exist yet (or isn't a list) initialise it.
 		blood_DNA = list()
+
 	blood_color = "#A10808"
-	if (M.species)
-		blood_color = M.species.blood_color
-	return
+	if(istype(M))
+		if (!istype(M.dna, /datum/dna))
+			M.dna = new /datum/dna(null)
+			M.dna.real_name = M.real_name
+		M.check_dna()
+		if (M.species)
+			blood_color = M.species.blood_color
+	. = 1
+	return 1
 
 /atom/proc/add_vomit_floor(mob/living/carbon/M as mob, var/toxvomit = 0)
 	if( istype(src, /turf/simulated) )

code/game/objects/items.dm

@@ -605,10 +605,10 @@
 		overlays += blood_overlay
 
 	//if this blood isn't already in the list, add it
-
-	if(blood_DNA[M.dna.unique_enzymes])
-		return 0 //already bloodied with this blood. Cannot add more.
-	blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
+	if(istype(M))
+		if(blood_DNA[M.dna.unique_enzymes])
+			return 0 //already bloodied with this blood. Cannot add more.
+		blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
 	return 1 //we applied blood to the item
 
 /obj/item/proc/generate_blood_overlay()

code/game/turfs/simulated.dm

@@ -110,15 +110,15 @@
 	if (!..())
 		return 0
 
-	for(var/obj/effect/decal/cleanable/blood/B in contents)
-		if(!B.blood_DNA[M.dna.unique_enzymes])
-			B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
-			B.virus2 = virus_copylist(M.virus2)
+	if(istype(M))
+		for(var/obj/effect/decal/cleanable/blood/B in contents)
+			if(!B.blood_DNA[M.dna.unique_enzymes])
+				B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
+				B.virus2 = virus_copylist(M.virus2)
+			return 1 //we bloodied the floor
+		blood_splatter(src,M.get_blood(M.vessel),1)
 		return 1 //we bloodied the floor
-
-	blood_splatter(src,M.get_blood(M.vessel),1)
-	return 1 //we bloodied the floor
-
+	return 0
 
 // Only adds blood on the floor -- Skie
 /turf/simulated/proc/add_blood_floor(mob/living/carbon/M as mob)