Merge pull request #15642 from deathride58/multblood

Multiplicative blood

code/game/atoms.dm

@@ -702,7 +702,7 @@
 	var/blood_id = get_blood_id()
 	if(!(blood_id in GLOB.blood_reagent_types))
 		return
-	return list("color" = BLOOD_COLOR_HUMAN, "ANIMAL DNA" = "Y-")
+	return list("color" = BLOOD_COLOR_HUMAN, "blendmode" = BLEND_MULTIPLY, "ANIMAL DNA" = "Y-")
 
 /mob/living/carbon/get_blood_dna_list()
 	var/blood_id = get_blood_id()
@@ -711,14 +711,16 @@
 	var/list/blood_dna = list()
 	if(dna)
 		blood_dna["color"] = dna.species.exotic_blood_color //so when combined, the list grows with the number of colors
+		blood_dna["blendmode"] = dna.species.exotic_blood_blend_mode
 		blood_dna[dna.unique_enzymes] = dna.blood_type
 	else
 		blood_dna["color"] = BLOOD_COLOR_HUMAN
+		blood_dna["blendmode"] = BLEND_MULTIPLY
 		blood_dna["UNKNOWN DNA"] = "X*"
 	return blood_dna
 
 /mob/living/carbon/alien/get_blood_dna_list()
-	return list("color" = BLOOD_COLOR_XENO, "UNKNOWN DNA" = "X*")
+	return list("color" = BLOOD_COLOR_XENO, "blendmode" = BLEND_MULTIPLY, "UNKNOWN DNA" = "X*")
 
 //to add a mob's dna info into an object's blood_DNA list.
 /atom/proc/transfer_mob_blood_dna(mob/living/L)
@@ -737,6 +739,7 @@
 		var/old = blood_DNA["color"]
 		blood_DNA["color"] = BlendRGB(blood_DNA["color"], new_blood_dna["color"])
 		changed = old != blood_DNA["color"]
+	blood_DNA["blendmode"] = new_blood_dna["blendmode"]
 	if(blood_DNA.len == old_length)
 		return FALSE
 	return changed
@@ -756,6 +759,7 @@
 			blood_DNA["color"] = blood_dna["color"]
 		else
 			blood_DNA["color"] = BlendRGB(blood_DNA["color"], blood_dna["color"])
+		blood_DNA["blendmode"] = blood_dna["blendmode"]
 
 //to add blood from a mob onto something, and transfer their dna info
 /atom/proc/add_mob_blood(mob/living/M)
@@ -826,6 +830,11 @@
 /atom/proc/blood_DNA_to_color()
 	return (blood_DNA && blood_DNA["color"]) || BLOOD_COLOR_HUMAN
 
+/atom/proc/blood_DNA_to_blend()
+	if(blood_DNA && !isnull(blood_DNA["blendmode"]))
+		return blood_DNA["blendmode"]
+	return BLEND_MULTIPLY
+
 /atom/proc/clean_blood()
 	. = blood_DNA? TRUE : FALSE
 	blood_DNA = null

code/game/objects/effects/decals/cleanable/gibs.dm

@@ -3,6 +3,7 @@
 	desc = "They look bloody and gruesome."
 	icon_state = "gibbl5"
 	layer = LOW_OBJ_LAYER
+	blend_mode = BLEND_DEFAULT
 	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
 	mergeable_decal = FALSE
 	bloodiness = 0				//This isn't supposed to be bloody.

code/game/objects/effects/decals/cleanable/humans.dm

@@ -3,6 +3,7 @@
 	desc = "It's gooey. Perhaps it's the chef's cooking?"
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "floor1"
+	blend_mode = BLEND_MULTIPLY
 	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
 	blood_state = BLOOD_STATE_BLOOD
 	bloodiness = BLOOD_AMOUNT_PER_DECAL
@@ -33,16 +34,20 @@
 	. = ..()
 	if(!fixed_color)
 		add_atom_colour(blood_DNA_to_color(), FIXED_COLOUR_PRIORITY)
+		blend_mode = blood_DNA_to_blend()
 
 /obj/effect/decal/cleanable/blood/PersistenceSave(list/data)
 	. = ..()
 	data["color"] = color
+	data["blendmode"] = blend_mode
 
 /obj/effect/decal/cleanable/blood/PersistenceLoad(list/data)
 	. = ..()
 	if(data["color"])
 		fixed_color = TRUE
 		add_atom_colour(data["color"], FIXED_COLOUR_PRIORITY)
+	if(data["blendmode"])
+		blend_mode = data["blendmode"]
 	name = "dried blood"
 	desc = "Looks like it's been here a while. Eew"
 	bloodiness = 0
@@ -83,6 +88,7 @@
 	name = "blood"
 	icon = 'icons/effects/blood.dmi'
 	desc = "Your instincts say you shouldn't be following these."
+	blend_mode = BLEND_MULTIPLY
 	random_icon_states = null
 	beauty = -50
 	persistent = TRUE
@@ -94,6 +100,7 @@
 	. = ..()
 	data["dir"] = dir
 	data["color"] = color
+	data["blendmode"] = blend_mode
 
 /obj/effect/decal/cleanable/trail_holder/PersistenceLoad(list/data)
 	. = ..()
@@ -102,11 +109,14 @@
 	if(data["color"])
 		fixed_color = TRUE
 		add_atom_colour(data["color"], FIXED_COLOUR_PRIORITY)
+	if(data["blendmode"])
+		blend_mode = data["blendmode"]
 
 /obj/effect/decal/cleanable/trail_holder/update_icon()
 	. = ..()
 	if(!fixed_color)
 		add_atom_colour(blood_DNA_to_color(), FIXED_COLOUR_PRIORITY)
+		blend_mode = blood_DNA_to_blend()
 
 /obj/effect/cleanable/trail_holder/Initialize(mapload)
 	. = ..()