reverts forensics components. If I can't figure it out, MURDER IT

code/modules/antagonists/devil/true_devil/_true_devil.dm

@@ -69,8 +69,10 @@
 	//Left hand items
 	for(var/obj/item/I in held_items)
 		if(!(I.item_flags & ABSTRACT))
-			msg += "It is holding [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
-
+			if(I.blood_DNA)
+				msg += "<span class='warning'>It is holding [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in its [get_held_index_name(get_held_index_of_item(I))]!</span>\n"
+			else
+				msg += "It is holding [icon2html(I, user)] \a [I] in its [get_held_index_name(get_held_index_of_item(I))].\n"
 	//Braindead
 	if(!client && stat != DEAD)
 		msg += "The devil seems to be in deep contemplation.\n"

code/modules/antagonists/wizard/equipment/artefact.dm

@@ -327,11 +327,8 @@
 	possible = list()
 	if(!voodoo_link)
 		return
-	var/list/prints = voodoo_link.return_fingerprints()
-	if(!length(prints))
-		return FALSE
 	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
-		if(prints[md5(H.dna.uni_identity)])
+		if(md5(H.dna.uni_identity) in voodoo_link.fingerprints)
 			possible |= H
 
 /obj/item/voodoo/proc/GiveHint(mob/victim,force=0)

code/modules/clothing/clothing.dm

@@ -43,6 +43,8 @@
 
 	var/blood_state = BLOOD_STATE_NOT_BLOODY
 	var/list/blood_smear = list(BLOOD_STATE_BLOOD = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
+	var/last_bloodtype = ""//used to track the last bloodtype to have graced these shoes; makes for better performing footprint shenanigans
+	var/last_blood_DNA = ""//same as last one
 
 /obj/item/clothing/Initialize()
 	. = ..()
@@ -157,6 +159,11 @@
 		damaged_clothes = 0
 		cut_overlay(damaged_clothes_icons[index], TRUE)
 
+/obj/item/clothing/transfer_blood_dna(list/blood_dna)
+	..()
+	if(blood_dna.len)
+		last_bloodtype = blood_dna[blood_dna[blood_dna.len]]//trust me this works
+		last_blood_DNA = blood_dna[blood_dna.len]
 
 /*
 SEE_SELF  // can see self, no matter what

code/modules/clothing/gloves/_gloves.dm

@@ -11,15 +11,6 @@
 	strip_delay = 20
 	equip_delay_other = 40
 
-/obj/item/clothing/gloves/ComponentInitialize()
-	. = ..()
-	AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT = CALLBACK(src, .proc/clean_blood)))
-
-/obj/item/clothing/gloves/proc/clean_blood(datum/source, strength)
-	if(strength < CLEAN_STRENGTH_BLOOD)
-		return
-	transfer_blood = 0
-
 /obj/item/clothing/gloves/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>\the [src] are forcing [user]'s hands around [user.p_their()] neck! It looks like the gloves are possessed!</span>")
 	return OXYLOSS
@@ -29,9 +20,8 @@
 	if(!isinhands)
 		if(damaged_clothes)
 			. += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves")
-		IF_HAS_BLOOD_DNA(src)
-			GET_COMPONENT(D, /datum/component/forensics)
-			. += mutable_appearance('icons/effects/blood.dmi', "bloodyhands", color = D.blood_mix_color)
+		if(blood_DNA)
+			. += mutable_appearance('icons/effects/blood.dmi', "bloodyhands", color = blood_DNA_to_color())
 
 /obj/item/clothing/gloves/update_clothes_damaged_state(damaging = TRUE)
 	..()

code/modules/clothing/head/_head.dm

@@ -46,9 +46,8 @@
 	if(!isinhands)
 		if(damaged_clothes)
 			. += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet")
-		IF_HAS_BLOOD_DNA(src)
-			GET_COMPONENT(D, /datum/component/forensics)
-			. += mutable_appearance('icons/effects/blood.dmi', "helmetblood", color = D.blood_DNA_to_color())
+		if(blood_DNA)
+			. += mutable_appearance('icons/effects/blood.dmi', "helmetblood", color = blood_DNA_to_color())
 
 /obj/item/clothing/head/update_clothes_damaged_state(damaging = TRUE)
 	..()

code/modules/clothing/masks/_masks.dm

@@ -17,9 +17,8 @@
 		if(body_parts_covered & HEAD)
 			if(damaged_clothes)
 				. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
-			IF_HAS_BLOOD_DNA(src)
-				GET_COMPONENT(D, /datum/component/forensics)
-				. += mutable_appearance('icons/effects/blood.dmi', "maskblood", color = D.blood_mix_color)
+			if(blood_DNA)
+				. += mutable_appearance('icons/effects/blood.dmi', "maskblood", color = blood_DNA_to_color())
 
 /obj/item/clothing/mask/equipped(mob/user, slot)
 	..()

code/modules/clothing/neck/_neck.dm

@@ -12,8 +12,8 @@
 		if(body_parts_covered & HEAD)
 			if(damaged_clothes)
 				. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
-			IF_HAS_BLOOD_DNA(src)
-				. += mutable_appearance('icons/effects/blood.dmi', "maskblood")
+			if(blood_DNA)
+				. += mutable_appearance('icons/effects/blood.dmi', "maskblood", color = blood_DNA_to_color())
 
 /obj/item/clothing/neck/tie
 	name = "tie"

code/modules/clothing/shoes/_shoes.dm

@@ -19,10 +19,6 @@
 
 	var/move_trail = /obj/effect/decal/cleanable/blood/footprints/tracks/shoe
 
-/obj/item/clothing/shoes/ComponentInitialize()
-	. = ..()
-	AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT = CALLBACK(src, .proc/clean_blood)))
-
 /obj/item/clothing/shoes/suicide_act(mob/living/carbon/user)
 	if(rand(2)>1)
 		user.visible_message("<span class='suicide'>[user] begins tying \the [src] up waaay too tightly! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -46,7 +42,7 @@
 	. = list()
 	if(!isinhands)
 		var/bloody = FALSE
-		IF_HAS_BLOOD_DNA(src)
+		if(blood_DNA)
 			bloody = TRUE
 		else
 			bloody = blood_smear[BLOOD_STATE_BLOOD]
@@ -55,9 +51,9 @@
 			. += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe")
 		if(bloody)
 			if(adjusted == NORMAL_STYLE)
-				. += mutable_appearance('icons/effects/blood.dmi', "shoeblood", color = blood_color)
+				. += mutable_appearance('icons/effects/blood.dmi', "shoeblood", color = blood_DNA_to_color())
 			else
-				. += mutable_appearance('modular_citadel/icons/mob/digishoes.dmi', "shoeblood", color = blood_color)
+				. += mutable_appearance('modular_citadel/icons/mob/digishoes.dmi', "shoeblood", color = blood_DNA_to_color())
 
 /obj/item/clothing/shoes/equipped(mob/user, slot)
 	. = ..()
@@ -93,9 +89,8 @@
 		var/mob/M = loc
 		M.update_inv_shoes()
 
-/obj/item/clothing/shoes/proc/clean_blood(datum/source, strength)
-	if(strength < CLEAN_STRENGTH_BLOOD)
-		return
+/obj/item/clothing/shoes/clean_blood()
+	..()
 	blood_smear = list(BLOOD_STATE_BLOOD = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
 	blood_state = BLOOD_STATE_NOT_BLOODY
 	blood_color = null

code/modules/clothing/suits/_suits.dm

@@ -54,12 +54,11 @@
 	if(!isinhands)
 		if(damaged_clothes)
 			. += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]")
-		IF_HAS_BLOOD_DNA(src)
-			GET_COMPONENT(D, /datum/component/forensics)
+		if(blood_DNA)
 			if(taurmode >= SNEK_TAURIC)
-				. += mutable_appearance('modular_citadel/icons/mob/64x32_effects.dmi', "[blood_overlay_type]blood", color = D.blood_mix_color)
+				. += mutable_appearance('modular_citadel/icons/mob/64x32_effects.dmi', "[blood_overlay_type]blood", color = blood_DNA_to_color())
 			else
-				. += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood", color = D.blood_mix_color)
+				. += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood", color = blood_DNA_to_color())
 		var/mob/living/carbon/human/M = loc
 		if(ishuman(M) && M.w_uniform)
 			var/obj/item/clothing/under/U = M.w_uniform

code/modules/clothing/under/_under.dm

@@ -22,9 +22,8 @@
 	if(!isinhands)
 		if(damaged_clothes)
 			. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
-		IF_HAS_BLOOD_DNA(src)
-			GET_COMPONENT(D, /datum/component/forensics)
-			. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = D.blood_mix_color)
+		if(blood_DNA)
+			. += mutable_appearance('icons/effects/blood.dmi', "uniformblood", color = blood_DNA_to_color())
 		if(accessory_overlay)
 			. += accessory_overlay
 

code/modules/detectivework/detective_work.dm

@@ -1,121 +1,119 @@
 //CONTAINS: Suit fibers and Detective's Scanning Computer
 
-/atom/proc/return_fingerprints()
-	GET_COMPONENT(D, /datum/component/forensics)
-	if(D)
-		. = D.fingerprints
-
-/atom/proc/return_hiddenprints()
-	GET_COMPONENT(D, /datum/component/forensics)
-	if(D)
-		. = D.hiddenprints
-
-/atom/proc/return_blood_DNA()
-	GET_COMPONENT(D, /datum/component/forensics)
-	if(D)
-		. = D.blood_DNA
-
-/atom/proc/blood_DNA_length()
-	GET_COMPONENT(D, /datum/component/forensics)
-	if(D)
-		. = length(D.blood_DNA)
-
-/atom/proc/return_fibers()
-	GET_COMPONENT(D, /datum/component/forensics)
-	if(D)
-		. = D.fibers
-
-/atom/proc/return_blood_mix_types()
-	GET_COMPONENT(D, /datum/component/forensics)
-	if(D)
-		. = D.blood_mix_types
-
-/atom/proc/return_blood_mix_color()
-	GET_COMPONENT(D, /datum/component/forensics)
-	if(D)
-		. = D.blood_mix_color
-
-/atom/proc/add_fingerprint_list(list/fingerprints)		//ASSOC LIST FINGERPRINT = FINGERPRINT
-	if(length(fingerprints))
-		. = AddComponent(/datum/component/forensics, fingerprints)
-
-//Set ignoregloves to add prints irrespective of the mob having gloves on.
-/atom/proc/add_fingerprint(mob/living/M, ignoregloves = FALSE)
-	var/datum/component/forensics/D = AddComponent(/datum/component/forensics)
-	. = D.add_fingerprint(M, ignoregloves)
-
-/atom/proc/add_fiber_list(list/fibertext)				//ASSOC LIST FIBERTEXT = FIBERTEXT
-	if(length(fibertext))
-		. = AddComponent(/datum/component/forensics, null, null, null, fibertext)
+/atom/var/list/suit_fibers
 
 /atom/proc/add_fibers(mob/living/carbon/human/M)
-	var/old = 0
-	if(M.gloves && istype(M.gloves, /obj/item/clothing))
+	if(M.gloves && istype(M.gloves, /obj/item/clothing/))
 		var/obj/item/clothing/gloves/G = M.gloves
-		old = length(G.return_blood_DNA())
 		if(G.transfer_blood > 1) //bloodied gloves transfer blood to touched objects
-			if(add_blood_DNA(G.return_blood_DNA()) && length(G.return_blood_DNA()) > old) //only reduces the bloodiness of our gloves if the item wasn't already bloody
+			if(add_blood(G.blood_DNA)) //only reduces the bloodiness of our gloves if the item wasn't already bloody
 				G.transfer_blood--
 	else if(M.bloody_hands > 1)
-		old = length(M.return_blood_DNA())
-		if(add_blood_DNA(M.return_blood_DNA()) && length(M.return_blood_DNA()) > old)
+		if(add_blood(M.blood_DNA))
 			M.bloody_hands--
-	var/datum/component/forensics/D = AddComponent(/datum/component/forensics)
-	. = D.add_fibers(M)
+	if(!suit_fibers)
+		suit_fibers = list()
+	var/fibertext
+	var/item_multiplier = isitem(src)?1.2:1
+	if(M.wear_suit)
+		fibertext = "Material from \a [M.wear_suit]."
+		if(prob(10*item_multiplier) && !(fibertext in suit_fibers))
+			suit_fibers += fibertext
+		if(!(M.wear_suit.body_parts_covered & CHEST))
+			if(M.w_uniform)
+				fibertext = "Fibers from \a [M.w_uniform]."
+				if(prob(12*item_multiplier) && !(fibertext in suit_fibers)) //Wearing a suit means less of the uniform exposed.
+					suit_fibers += fibertext
+		if(!(M.wear_suit.body_parts_covered & HANDS))
+			if(M.gloves)
+				fibertext = "Material from a pair of [M.gloves.name]."
+				if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
+					suit_fibers += fibertext
+	else if(M.w_uniform)
+		fibertext = "Fibers from \a [M.w_uniform]."
+		if(prob(15*item_multiplier) && !(fibertext in suit_fibers))
+			// "Added fibertext: [fibertext]"
+			suit_fibers += fibertext
+		if(M.gloves)
+			fibertext = "Material from a pair of [M.gloves.name]."
+			if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
+				suit_fibers += "Material from a pair of [M.gloves.name]."
+	else if(M.gloves)
+		fibertext = "Material from a pair of [M.gloves.name]."
+		if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
+			suit_fibers += "Material from a pair of [M.gloves.name]."
 
-/atom/proc/add_hiddenprint_list(list/hiddenprints)	//NOTE: THIS IS FOR ADMINISTRATION FINGERPRINTS, YOU MUST CUSTOM SET THIS TO INCLUDE CKEY/REAL NAMES! CHECK FORENSICS.DM
-	if(length(hiddenprints))
-		. = AddComponent(/datum/component/forensics, null, hiddenprints)
 
 /atom/proc/add_hiddenprint(mob/living/M)
-	var/datum/component/forensics/D = AddComponent(/datum/component/forensics)
-	. = D.add_hiddenprint(M)
+	if(!M || !M.key)
+		return
 
-/atom/proc/add_blood_DNA(list/dna)						//ASSOC LIST DNA = BLOODTYPE
-	return FALSE
+	if(!fingerprintshidden) //Add the list if it does not exist
+		fingerprintshidden = list()
 
-/obj/add_blood_DNA(list/dna)
-	. = ..()
-	if(length(dna))
-		. = AddComponent(/datum/component/forensics, null, null, dna)
+	var/hasgloves = ""
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(H.gloves)
+			hasgloves = "(gloves)"
+
+	var/current_time = TIME_STAMP("hh:mm:ss", FALSE)
+	if(!fingerprintshidden[M.key])
+		fingerprintshidden[M.key] = "First: [M.real_name]\[[current_time]\][hasgloves]. Ckey: [M.ckey]"
+	else
+		var/laststamppos = findtext(fingerprintshidden[M.key], " Last: ")
+		if(laststamppos)
+			fingerprintshidden[M.key] = copytext(fingerprintshidden[M.key], 1, laststamppos)
+		fingerprintshidden[M.key] += " Last: [M.real_name]\[[current_time]\][hasgloves]. Ckey: [M.ckey]"
+
+	fingerprintslast = M.ckey
+
+
+//Set ignoregloves to add prints irrespective of the mob having gloves on.
+/atom/proc/add_fingerprint(mob/living/M, ignoregloves = 0)
+	if(!M || !M.key)
+		return
+
+	add_hiddenprint(M)
+
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+
+		add_fibers(H)
+
+		if(H.gloves) //Check if the gloves (if any) hide fingerprints
+			var/obj/item/clothing/gloves/G = H.gloves
+			if(G.transfer_prints)
+				ignoregloves = 1
+
+			if(!ignoregloves)
+				H.gloves.add_fingerprint(H, 1) //ignoregloves = 1 to avoid infinite loop.
+				return
+
+		if(!fingerprints) //Add the list if it does not exist
+			fingerprints = list()
+		var/full_print = md5(H.dna.uni_identity)
+		fingerprints[full_print] = full_print
 
-/obj/item/clothing/gloves/add_blood_DNA(list/blood_dna, list/datum/disease/diseases)
-	. = ..()
-	transfer_blood = rand(2, 4)
 
-/turf/add_blood_DNA(list/blood_dna, list/datum/disease/diseases)
-	var/obj/effect/decal/cleanable/blood/splatter/B = locate() in src
-	if(!B)
-		B = new /obj/effect/decal/cleanable/blood/splatter(src, diseases)
-	B.add_blood_DNA(blood_dna) //give blood info to the blood decal.
-	return TRUE //we bloodied the floor
 
-/mob/living/carbon/human/add_blood_DNA(list/blood_dna, list/datum/disease/diseases)
-	if(wear_suit)
-		wear_suit.add_blood_DNA(blood_dna)
-		update_inv_wear_suit()
-	else if(w_uniform)
-		w_uniform.add_blood_DNA(blood_dna)
-		update_inv_w_uniform()
-	if(gloves)
-		var/obj/item/clothing/gloves/G = gloves
-		G.add_blood_DNA(blood_dna)
-	else if(length(blood_dna))
-		AddComponent(/datum/component/forensics, null, null, blood_dna)
-		bloody_hands = rand(2, 4)
-	if(head)
-		head.add_blood_DNA(blood_dna)
-		update_inv_head()
-	else if(wear_mask)
-		wear_mask.add_blood_DNA(blood_dna)
-		update_inv_wear_mask()
-	if(wear_neck)
-		wear_neck.add_blood_DNA(blood_dna)
-		update_inv_neck()
-	update_inv_gloves()	//handles bloody hands overlays and updating
-	return TRUE
 
 /atom/proc/transfer_fingerprints_to(atom/A)
-	A.add_fingerprint_list(return_fingerprints())
-	A.add_hiddenprint_list(return_hiddenprints())
-	A.fingerprintslast = fingerprintslast
+
+	// Make sure everything are lists.
+	if(!islist(A.fingerprints))
+		A.fingerprints = list()
+	if(!islist(A.fingerprintshidden))
+		A.fingerprintshidden = list()
+
+	if(!islist(fingerprints))
+		fingerprints = list()
+	if(!islist(fingerprintshidden))
+		fingerprintshidden = list()
+
+	// Transfer
+	if(fingerprints)
+		A.fingerprints |= fingerprints.Copy()            //detective
+	if(fingerprintshidden)
+		A.fingerprintshidden |= fingerprintshidden.Copy()    //admin
+	A.fingerprintslast = fingerprintslast

code/modules/detectivework/footprints_and_rag.dm

@@ -1,10 +1,14 @@
 
 /mob
 	var/bloody_hands = 0
+	var/bloody_feet = 0
 
 /obj/item/clothing/gloves
 	var/transfer_blood = 0
 
+/obj/item/clothing/shoes
+	var/transfer_blood = 0
+
 
 /obj/item/reagent_containers/glass/rag
 	name = "damp rag"
@@ -46,5 +50,6 @@
 		user.visible_message("[user] starts to wipe down [A] with [src]!", "<span class='notice'>You start to wipe down [A] with [src]...</span>")
 		if(do_after(user,30, target = A))
 			user.visible_message("[user] finishes wiping off [A]!", "<span class='notice'>You finish wiping off [A].</span>")
-			SEND_SIGNAL(A, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
+			A.clean_blood()
+			A.wash_cream()
 	return

code/modules/detectivework/scanner.dm

@@ -80,14 +80,20 @@
 
 		//Make our lists
 		var/list/fingerprints = list()
-		var/list/blood = A.return_blood_DNA()
-		var/list/fibers = A.return_fibers()
+		var/list/blood = list()
+		var/list/fibers = list()
 		var/list/reagents = list()
 
 		var/target_name = A.name
 
 		// Start gathering
 
+		if(A.blood_DNA && A.blood_DNA.len)
+			blood = A.blood_DNA.Copy()
+
+		if(A.suit_fibers && A.suit_fibers.len)
+			fibers = A.suit_fibers.Copy()
+
 		if(ishuman(A))
 
 			var/mob/living/carbon/human/H = A
@@ -96,7 +102,8 @@
 
 		else if(!ismob(A))
 
-			fingerprints = A.return_fingerprints()
+			if(A.fingerprints && A.fingerprints.len)
+				fingerprints = A.fingerprints.Copy()
 
 			// Only get reagents from non-mobs.
 			if(A.reagents && A.reagents.reagent_list.len)
@@ -110,7 +117,6 @@
 						if(R.data["blood_DNA"] && R.data["blood_type"])
 							var/blood_DNA = R.data["blood_DNA"]
 							var/blood_type = R.data["blood_type"]
-							LAZYINITLIST(blood)
 							blood[blood_DNA] = blood_type
 
 		// We gathered everything. Create a fork and slowly display the results to the holder of the scanner.
@@ -119,7 +125,7 @@
 		add_log("<B>[STATION_TIME_TIMESTAMP("hh:mm:ss")][get_timestamp()] - [target_name]</B>", 0)
 
 		// Fingerprints
-		if(length(fingerprints))
+		if(fingerprints && fingerprints.len)
 			sleep(30)
 			add_log("<span class='info'><B>Prints:</B></span>")
 			for(var/finger in fingerprints)
@@ -127,7 +133,7 @@
 			found_something = 1
 
 		// Blood
-		if (length(blood))
+		if (blood && blood.len)
 			sleep(30)
 			add_log("<span class='info'><B>Blood:</B></span>")
 			found_something = 1
@@ -135,7 +141,7 @@
 				add_log("Type: <font color='red'>[blood[B]]</font> DNA: <font color='red'>[B]</font>")
 
 		//Fibers
-		if(length(fibers))
+		if(fibers && fibers.len)
 			sleep(30)
 			add_log("<span class='info'><B>Fibers:</B></span>")
 			for(var/fiber in fibers)
@@ -143,7 +149,7 @@
 			found_something = 1
 
 		//Reagents
-		if(length(reagents))
+		if(reagents && reagents.len)
 			sleep(30)
 			add_log("<span class='info'><B>Reagents:</B></span>")
 			for(var/R in reagents)

code/modules/mob/living/blood.dm

@@ -287,7 +287,8 @@
 				drop.transfer_mob_blood_dna(src)
 				return
 			else
-				temp_blood_DNA = drop.return_blood_DNA() //we transfer the dna from the drip to the splatter
+				temp_blood_DNA = list()
+				temp_blood_DNA |= drop.blood_DNA.Copy() //we transfer the dna from the drip to the splatter
 				qdel(drop)//the drip is replaced by a bigger splatter
 		else
 			drop = new(T, get_static_viruses())
@@ -303,9 +304,9 @@
 	B.transfer_mob_blood_dna(src) //give blood info to the blood decal.
 	if(temp_blood_DNA)
 		if(isalien(src))
-			B.add_blood_DNA(list("UNKNOWN DNA" = "X*"))
+			B.blood_DNA["UNKNOWN DNA"] = "X*"
 		else
-			B.add_blood_DNA(temp_blood_DNA)
+			B.blood_DNA |= temp_blood_DNA
 
 /mob/living/carbon/human/add_splatter_floor(turf/T, small_drip)
 	if(!(NOBLOOD in dna.species.species_traits))

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

@@ -11,18 +11,21 @@
 	if (handcuffed)
 		msg += "<span class='warning'>[t_He] [t_is] [icon2html(handcuffed, user)] handcuffed!</span>\n"
 	if (head)
-		msg += "[t_He] [t_is] wearing [head.get_examine_string(user)] on [t_his] head. \n"
+		msg += "[t_He] [t_is] wearing [icon2html(head, user)] \a [src.head] on [t_his] head. \n"
 	if (wear_mask)
-		msg += "[t_He] [t_is] wearing [wear_mask.get_examine_string(user)] on [t_his] face.\n"
+		msg += "[t_He] [t_is] wearing [icon2html(wear_mask, user)] \a [src.wear_mask] on [t_his] face.\n"
 	if (wear_neck)
-		msg += "[t_He] [t_is] wearing [wear_neck.get_examine_string(user)] around [t_his] neck.\n"
+		msg += "[t_He] [t_is] wearing [icon2html(wear_neck, user)] \a [src.wear_neck] around [t_his] neck.\n"
 
 	for(var/obj/item/I in held_items)
 		if(!(I.item_flags & ABSTRACT))
-			msg += "[t_He] [t_is] holding [I.get_examine_string(user)] in [t_his] [get_held_index_name(get_held_index_of_item(I))].\n"
+			if(I.blood_DNA)
+				msg += "<span class='warning'>[t_He] [t_is] holding [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in [t_his] [get_held_index_name(get_held_index_of_item(I))]!</span>\n"
+			else
+				msg += "[t_He] [t_is] holding [icon2html(I, user)] \a [I] in [t_his] [get_held_index_name(get_held_index_of_item(I))].\n"
 
 	if (back)
-		msg += "[t_He] [t_has] [back.get_examine_string(user)] on [t_his] back.\n"
+		msg += "[t_He] [t_has] [icon2html(back, user)] \a [src.back] on [t_his] back.\n"
 	var/appears_dead = 0
 	if (stat == DEAD)
 		appears_dead = 1
@@ -88,7 +91,7 @@
 
 		if(digitalcamo)
 			msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly unsimian manner.\n"
-	
+
 	if(combatmode)
 		msg += "[t_He] [t_is] visibly tense[resting ? "." : ", and [t_is] standing in combative stance."]\n"
 

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

@@ -37,30 +37,46 @@
 			if(U.attached_accessory)
 				accessory_msg += " with [icon2html(U.attached_accessory, user)] \a [U.attached_accessory]"
 
-		msg += "[t_He] [t_is] wearing [w_uniform.get_examine_string(user)][accessory_msg].\n"
+		if(w_uniform.blood_DNA)
+			msg += "<span class='warning'>[t_He] [t_is] wearing [icon2html(w_uniform, user)] [w_uniform.gender==PLURAL?"some":"a"] blood-stained [w_uniform.name][accessory_msg]!</span>\n"
+		else
+			msg += "[t_He] [t_is] wearing [icon2html(w_uniform, user)] \a [w_uniform][accessory_msg].\n"
 	//head
 	if(head)
-		msg += "[t_He] [t_is] wearing [head.get_examine_string(user)] on [t_his] head.\n"
+		if(head.blood_DNA)
+			msg += "<span class='warning'>[t_He] [t_is] wearing [icon2html(head, user)] [head.gender==PLURAL?"some":"a"] blood-stained [head.name] on [t_his] head!</span>\n"
+		else
+			msg += "[t_He] [t_is] wearing [icon2html(head, user)] \a [head] on [t_his] head.\n"
 	//suit/armor
 	if(wear_suit)
-		msg += "[t_He] [t_is] wearing [wear_suit.get_examine_string(user)].\n"
+		if(wear_suit.blood_DNA)
+			msg += "<span class='warning'>[t_He] [t_is] wearing [icon2html(wear_suit, user)] [wear_suit.gender==PLURAL?"some":"a"] blood-stained [wear_suit.name]!</span>\n"
+		else
+			msg += "[t_He] [t_is] wearing [icon2html(wear_suit, user)] \a [wear_suit].\n"
 		//suit/armor storage
-		if(s_store)
-			msg += "[t_He] [t_is] carrying [s_store.get_examine_string(user)] on [t_his] [wear_suit.name].\n"
+		if(s_store.blood_DNA)
+			msg += "<span class='warning'>[t_He] [t_is] carrying [icon2html(s_store, user)] [s_store.gender==PLURAL?"some":"a"] blood-stained [s_store.name] on [t_his] [wear_suit.name]!</span>\n"
+		else
+			msg += "[t_He] [t_is] carrying [icon2html(s_store, user)] \a [s_store] on [t_his] [wear_suit.name].\n"
 	//back
 	if(back)
-		msg += "[t_He] [t_has] [back.get_examine_string(user)] on [t_his] back.\n"
-
+		if(back.blood_DNA)
+			msg += "<span class='warning'>[t_He] [t_has] [icon2html(back, user)] [back.gender==PLURAL?"some":"a"] blood-stained [back] on [t_his] back.</span>\n"
+		else
+			msg += "[t_He] [t_has] [icon2html(back, user)] \a [back] on [t_his] back.\n"
 	//Hands
 	for(var/obj/item/I in held_items)
-		if(!(I.item_flags & ABSTRACT))
-			msg += "[t_He] [t_is] holding [I.get_examine_string(user)] in [t_his] [get_held_index_name(get_held_index_of_item(I))].\n"
-
-	GET_COMPONENT(FR, /datum/component/forensics)
+		if(I.blood_DNA)
+			msg += "<span class='warning'>[t_He] [t_is] holding [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in [t_his] [get_held_index_name(get_held_index_of_item(I))]!</span>\n"
+		else
+			msg += "[t_He] [t_is] holding [icon2html(I, user)] \a [I] in [t_his] [get_held_index_name(get_held_index_of_item(I))].\n"
 	//gloves
 	if(gloves && !(SLOT_GLOVES in obscured))
-		msg += "[t_He] [t_has] [gloves.get_examine_string(user)] on [t_his] hands.\n"
-	else if(FR && length(FR.blood_DNA))
+		if(gloves.blood_DNA)
+			msg += "<span class='warning'>[t_He] [t_has] [icon2html(gloves, user)] [gloves.gender==PLURAL?"some":"a"] blood-stained [gloves.name] on [t_his] hands!</span>\n"
+		else
+			msg += "[t_He] [t_has] [icon2html(gloves, user)] \a [gloves] on [t_his] hands.\n"
+	else if(blood_DNA)
 		var/hand_number = get_num_arms(FALSE)
 		if(hand_number)
 			msg += "<span class='warning'>[t_He] [t_has] [hand_number > 1 ? "" : "a"] blood-stained hand[hand_number > 1 ? "s" : ""]!</span>\n"
@@ -76,33 +92,47 @@
 
 	//belt
 	if(belt)
-		msg += "[t_He] [t_has] [belt.get_examine_string(user)] about [t_his] waist.\n"
+		if(belt.blood_DNA)
+			msg += "<span class='warning'>[t_He] [t_has] [icon2html(belt, user)] [belt.gender==PLURAL?"some":"a"] blood-stained [belt.name] about [t_his] waist!</span>\n"
+		else
+			msg += "[t_He] [t_has] [icon2html(belt, user)] \a [belt] about [t_his] waist.\n"
 
 	//shoes
 	if(shoes && !(SLOT_SHOES in obscured))
-		msg += "[t_He] [t_is] wearing [shoes.get_examine_string(user)] on [t_his] feet.\n"
+		if(shoes.blood_DNA)
+			msg += "<span class='warning'>[t_He] [t_is] wearing [icon2html(shoes, user)] [shoes.gender==PLURAL?"some":"a"] blood-stained [shoes.name] on [t_his] feet!</span>\n"
+		else
+			msg += "[t_He] [t_is] wearing [icon2html(shoes, user)] \a [shoes] on [t_his] feet.\n"
 
 	//mask
 	if(wear_mask && !(SLOT_WEAR_MASK in obscured))
-		msg += "[t_He] [t_has] [wear_mask.get_examine_string(user)] on [t_his] face.\n"
+		if(wear_mask.blood_DNA)
+			msg += "<span class='warning'>[t_He] [t_has] [icon2html(wear_mask, user)] [wear_mask.gender==PLURAL?"some":"a"] blood-stained [wear_mask.name] on [t_his] face!</span>\n"
+		else
+			msg += "[t_He] [t_has] [icon2html(wear_mask, user)] \a [wear_mask] on [t_his] face.\n"
 
-	if (wear_neck && !(SLOT_NECK in obscured))
-		msg += "[t_He] [t_is] wearing [wear_neck.get_examine_string(user)] around [t_his] neck.\n"
+	//neck
+	if(wear_neck && !(SLOT_NECK in obscured))
+		msg += "[t_He] [t_is] wearing [icon2html(wear_neck, user)] \a [src.wear_neck] around [t_his] neck.\n"
 
 	//eyes
 	if(!(SLOT_GLASSES in obscured))
 		if(glasses)
-			msg += "[t_He] [t_has] [glasses.get_examine_string(user)] covering [t_his] eyes.\n"
+			if(glasses.blood_DNA)
+				msg += "<span class='warning'>[t_He] [t_has] [icon2html(glasses, user)] [glasses.gender==PLURAL?"some":"a"] blood-stained [glasses] covering [t_his] eyes!</span>\n"
+			else
+				msg += "[t_He] [t_has] [icon2html(glasses, user)] \a [glasses] covering [t_his] eyes.\n"
+
 		else if(eye_color == BLOODCULT_EYE && iscultist(src) && has_trait(CULT_EYES))
 			msg += "<span class='warning'><B>[t_His] eyes are glowing an unnatural red!</B></span>\n"
 
 	//ears
 	if(ears && !(SLOT_EARS in obscured))
-		msg += "[t_He] [t_has] [ears.get_examine_string(user)] on [t_his] ears.\n"
+		msg += "[t_He] [t_has] [icon2html(ears, user)] \a [ears] on [t_his] ears.\n"
 
 	//ID
 	if(wear_id)
-		msg += "[t_He] [t_is] wearing [wear_id.get_examine_string(user)].\n"
+		msg += "[t_He] [t_is] wearing [icon2html(wear_id, user)] \a [wear_id].\n"
 
 	//Status effects
 	msg += status_effect_examines()

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

@@ -31,8 +31,6 @@
 	if(CONFIG_GET(flag/disable_stambuffer))
 		togglesprint()
 
-	AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT = CALLBACK(src, .proc/clean_blood)))
-
 
 /mob/living/carbon/human/ComponentInitialize()
 	. = ..()
@@ -687,16 +685,22 @@
 		if(..())
 			dropItemToGround(I)
 
-/mob/living/carbon/human/proc/clean_blood(datum/source, strength)
-	if(strength < CLEAN_STRENGTH_BLOOD)
-		return
-	if(gloves)
-		if(SEND_SIGNAL(gloves, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
-			update_inv_gloves()
+/mob/living/carbon/human/clean_blood()
+	var/mob/living/carbon/human/H = src
+	if(H.gloves)
+		if(H.gloves.clean_blood())
+			H.update_inv_gloves()
 	else
-		if(bloody_hands)
-			bloody_hands = 0
-			update_inv_gloves()
+		..() // Clear the Blood_DNA list
+		if(H.bloody_hands)
+			H.bloody_hands = 0
+			H.update_inv_gloves()
+		if(H.bloody_feet)
+			H.bloody_feet = 0
+			H.update_inv_shoes()
+		bloodiness = 0
+
+	update_icons()	//apply the now updated overlays to the mob
 
 /mob/living/carbon/human/wash_cream()
 	if(creamed) //clean both to prevent a rare bug

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

@@ -45,6 +45,8 @@
 
 	var/bloodiness = 0
 	var/bloodinessmax = 5
+	var/last_bloodtype = ""//used to track the last bloodtype to have graced this filthy spaceman; makes for better performing footprint shenanigans
+	var/last_blood_DNA = ""//same as last one
 	var/blood_state = BLOOD_STATE_NOT_BLOODY
 	var/list/blood_smear = list(BLOOD_STATE_BLOOD = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
 	var/blood_color //For blood smearing stuff

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

@@ -147,3 +147,9 @@
 			return FALSE
 
 	return .
+
+/mob/living/carbon/human/transfer_blood_dna(list/blood_dna)
+	..()
+	if(blood_dna.len)
+		last_bloodtype = blood_dna[blood_dna[blood_dna.len]]//trust me this works
+		last_blood_DNA = blood_dna[blood_dna.len]

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

@@ -57,18 +57,20 @@
 					var/turf/T = get_turf(src)
 					if(S.blood_smear && S.blood_smear[S.blood_state])
 						var/obj/effect/decal/cleanable/blood/footprints/tracks/shoe/oldFP = locate(/obj/effect/decal/cleanable/blood/footprints/tracks/shoe) in T
-						if(oldFP && (oldFP.blood_state == S.blood_state && oldFP.color == S.blood_color))
+						if(oldFP && (oldFP.blood_state == S.blood_state && oldFP.color == bloodtype_to_color(S.last_bloodtype)))
 							return
-						S.blood_smear[S.blood_state] = max(0, S.blood_smear[S.blood_state]-BLOOD_LOSS_PER_STEP)
-						var/obj/effect/decal/cleanable/blood/footprints/tracks/shoe/FP = new /obj/effect/decal/cleanable/blood/footprints/tracks/shoe(T)
-						FP.icon_state = FOOTPRINT_SHOE
-						FP.print_state = FOOTPRINT_SHOE
-						FP.blood_state = S.blood_state
-						FP.blood_color = S.blood_color
-						FP.entered_dirs |= dir
-						FP.bloodiness = S.blood_smear[S.blood_state]
-						FP.update_icon()
-						update_inv_shoes()
+					S.blood_smear[S.blood_state] = max(0, S.blood_smear[S.blood_state]-BLOOD_LOSS_PER_STEP)
+					var/obj/effect/decal/cleanable/blood/footprints/tracks/shoe/FP = new /obj/effect/decal/cleanable/blood/footprints/tracks/shoe(T)
+					FP.icon_state = FOOTPRINT_SHOE
+					FP.print_state = FOOTPRINT_SHOE
+					FP.blood_state = S.blood_state
+					FP.entered_dirs |= dir
+					FP.bloodiness = S.blood_smear[S.blood_state]
+					if(S.last_blood_DNA && S.last_bloodtype)
+						FP.blood_DNA += list(S.last_blood_DNA = S.last_bloodtype)
+						//hacky as heck; we need to move the LAST entry to there, otherwise we mix all the blood
+					FP.update_icon()
+					update_inv_shoes()
 					//End bloody footprints
 
 					S.step_action()
@@ -80,27 +82,28 @@
 				var/step_print = dna.species.get_move_trail(src)
 				if(bloodiness && blood_smear[blood_state])
 					var/obj/effect/decal/cleanable/blood/footprints/tracks/oldFP = locate(step_print) in T
-					if(oldFP && (oldFP.blood_state == blood_state && oldFP == dna.species.move_trail && oldFP.blood_color == blood_color))
+					if(oldFP && (oldFP.blood_state == blood_state && oldFP.color == bloodtype_to_color(last_bloodtype)))
 						return
-					else
-						var/obj/effect/decal/cleanable/blood/footprints/tracks/FP = new step_print(T)
-						if(("taur" in dna.species.mutant_bodyparts) && (dna.features["taur"] != "None") && !lying)
-							if(dna.features["taur"] in GLOB.noodle_taurs)
-								FP.icon_state = FOOTPRINT_SNAKE
-								FP.print_state = FOOTPRINT_SNAKE
-							else if(dna.features["taur"] in GLOB.paw_taurs)
-								FP.icon_state = FOOTPRINT_PAW
-								FP.print_state = FOOTPRINT_PAW
-						if(!dna.species.move_trail && !lying) //we're assuming people have their chosen snowflake on, so.
-							FP.icon_state = FOOTPRINT_SHOE
-							FP.print_state = FOOTPRINT_SHOE
+					var/obj/effect/decal/cleanable/blood/footprints/tracks/FP = new step_print(T)
+					if(("taur" in dna.species.mutant_bodyparts) && (dna.features["taur"] != "None") && !lying)
+						if(dna.features["taur"] in GLOB.noodle_taurs)
+							FP.icon_state = FOOTPRINT_SNAKE
+							FP.print_state = FOOTPRINT_SNAKE
+						else if(dna.features["taur"] in GLOB.paw_taurs)
+							FP.icon_state = FOOTPRINT_PAW
+							FP.print_state = FOOTPRINT_PAW
+					if(!dna.species.move_trail && !lying) //we're assuming people have their chosen snowflake on, so.
+						FP.icon_state = FOOTPRINT_SHOE
+						FP.print_state = FOOTPRINT_SHOE
 
-						FP.add_blood_DNA(return_blood_DNA())
-						FP.blood_color = blood_color
-						FP.entered_dirs |= dir
-						FP.bloodiness = blood_smear[blood_state]
-						FP.update_icon()
-						bloodiness--
+					FP.blood_state = blood_state
+					FP.entered_dirs |= dir
+					FP.bloodiness = blood_smear[blood_state]
+					if(last_blood_DNA && last_bloodtype)
+						FP.blood_DNA += list(last_blood_DNA = last_bloodtype)
+						//hacky as heck; we need to move the LAST entry to there, otherwise we mix all the blood
+					FP.update_icon()
+					bloodiness--
 
 /mob/living/carbon/human/Process_Spacemove(movement_dir = 0) //Temporary laziness thing. Will change to handles by species reee.
 	if(dna.species.space_move(src))

code/modules/mob/living/simple_animal/bot/mulebot.dm

@@ -474,7 +474,8 @@
 				if(isturf(next))
 					if(bloodiness)
 						var/obj/effect/decal/cleanable/blood/footprints/tracks/wheels/B = new(loc)
-						B.add_blood_DNA(return_blood_DNA())
+						if(blood_DNA && blood_DNA.len)
+							B.blood_DNA |= blood_DNA.Copy()
 						var/newdir = get_dir(next, loc)
 						if(newdir == dir)
 							B.setDir(newdir)
@@ -656,7 +657,8 @@
 	T.add_mob_blood(H)
 
 	var/list/blood_dna = H.get_blood_dna_list()
-	add_blood_DNA(blood_dna)
+	if(blood_dna)
+		transfer_blood_dna(blood_dna)
 	bloodiness += 4
 
 // player on mulebot attempted to move

code/modules/mob/living/simple_animal/friendly/drone/_drone.dm

@@ -169,15 +169,23 @@
 	//Hands
 	for(var/obj/item/I in held_items)
 		if(!(I.item_flags & ABSTRACT))
-			msg += "It has [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
-
+			if(I.blood_DNA)
+				msg += "<span class='warning'>It has [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in its [get_held_index_name(get_held_index_of_item(I))]!</span>\n"
+			else
+				msg += "It has [icon2html(I, user)] \a [I] in its [get_held_index_name(get_held_index_of_item(I))].\n"
 	//Internal storage
 	if(internal_storage && !(internal_storage.item_flags & ABSTRACT))
-		msg += "It is holding [internal_storage.get_examine_string(user)] in its internal storage.\n"
+		if(internal_storage.blood_DNA)
+			msg += "<span class='warning'>It is holding [icon2html(internal_storage, user)] [internal_storage.gender==PLURAL?"some":"a"] blood-stained [internal_storage.name] in its internal storage!</span>\n"
+		else
+			msg += "It is holding [icon2html(internal_storage, user)] \a [internal_storage] in its internal storage.\n"
 
 	//Cosmetic hat - provides no function other than looks
 	if(head && !(head.item_flags & ABSTRACT))
-		msg += "It is wearing [head.get_examine_string(user)] on its head.\n"
+		if(head.blood_DNA)
+			msg += "<span class='warning'>It is wearing [icon2html(head, user)] [head.gender==PLURAL?"some":"a"] blood-stained [head.name] on its head!</span>\n"
+		else
+			msg += "It is wearing [icon2html(head, user)] \a [head] on its head.\n"
 
 	//Braindead
 	if(!client && stat != DEAD)

code/modules/mob/living/simple_animal/guardian/types/dextrous.dm

@@ -23,9 +23,15 @@
 
 		for(var/obj/item/I in held_items)
 			if(!(I.item_flags & ABSTRACT))
-				msg += "It has [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
+				if(I.blood_DNA)
+					msg += "<span class='warning'>It has [icon2html(I, user)] [I.gender==PLURAL?"some":"a"] blood-stained [I.name] in its [get_held_index_name(get_held_index_of_item(I))]!</span>\n"
+				else
+					msg += "It has [icon2html(I, user)] \a [I] in its [get_held_index_name(get_held_index_of_item(I))].\n"
 		if(internal_storage && !(internal_storage.item_flags & ABSTRACT))
-			msg += "It is holding [internal_storage.get_examine_string(user)] in its internal storage.\n"
+			if(internal_storage.blood_DNA)
+				msg += "<span class='warning'>It is holding [icon2html(internal_storage, user)] [internal_storage.gender==PLURAL?"some":"a"] blood-stained [internal_storage.name] in its internal storage!</span>\n"
+			else
+				msg += "It is holding [icon2html(internal_storage, user)] \a [internal_storage] in its internal storage.\n"
 		msg += "*---------*</span>"
 		to_chat(user, msg)
 	else

code/modules/mob/living/simple_animal/hostile/alien.dm

@@ -177,6 +177,6 @@
 			qdel(target)
 			return TRUE
 		var/atom/movable/M = target
-		SEND_SIGNAL(M, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+		M.clean_blood()
 		visible_message("[src] polishes \the [target].")
 		return TRUE

code/modules/projectiles/guns/ballistic.dm

@@ -169,7 +169,7 @@
 			if(iscarbon(user))
 				var/mob/living/carbon/C = user
 				user_dna = C.dna
-				B.add_blood_DNA(user_dna)
+				B.add_blood(user_dna)
 			var/datum/callback/gibspawner = CALLBACK(GLOBAL_PROC, /proc/spawn_atom_to_turf, /obj/effect/gibspawner/generic, B, 1, FALSE, list(user_dna))
 			B.throw_at(target, BRAINS_BLOWN_THROW_RANGE, BRAINS_BLOWN_THROW_SPEED, callback=gibspawner)
 			return(BRUTELOSS)

code/modules/projectiles/projectile.dm

@@ -161,10 +161,19 @@
 			var/splatter_dir = dir
 			if(starting)
 				splatter_dir = get_dir(starting, target_loca)
-			if(isalien(L))
+			var/obj/item/bodypart/B = L.get_bodypart(def_zone)
+			if(B.status == BODYPART_ROBOTIC) // So if you hit a robotic, it sparks instead of bloodspatters
+				do_sparks(2, FALSE, target.loc)
+				if(prob(25))
+					new /obj/effect/decal/cleanable/oil(target_loca)
+			else if(isalien(L))
 				new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(target_loca, splatter_dir)
 			else
-				new /obj/effect/temp_visual/dir_setting/bloodsplatter(target_loca, splatter_dir)
+				if(ishuman(target))
+					var/mob/living/carbon/human/H = target
+					new /obj/effect/temp_visual/dir_setting/bloodsplatter(target_loca, splatter_dir, bloodtype_to_color(H.dna.blood_type))
+				else
+					new /obj/effect/temp_visual/dir_setting/bloodsplatter(target_loca, splatter_dir, bloodtype_to_color())
 			if(iscarbon(L))
 				var/mob/living/carbon/C = L
 				C.bleed(damage)

code/modules/projectiles/projectile/bullets/smg.dm

@@ -19,27 +19,27 @@
 	var/turf/T = get_turf(target)
 
 	//section shamelessly copypasta'd from the clean component
-	SEND_SIGNAL(T, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+	clean_blood()//blood overlays get weird otherwise, because the sprite changes.
 	for(var/A in T)
 		if(is_cleanable(A))
 			qdel(A)
 		else if(istype(A, /obj/item))
 			var/obj/item/I = A
-			SEND_SIGNAL(I, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+			I.clean_blood()
 			if(ismob(I.loc))
 				var/mob/M = I.loc
 				M.regenerate_icons()
 		else if(ishuman(A))
 			var/mob/living/carbon/human/cleaned_human = A
 			if(cleaned_human.head)
-				SEND_SIGNAL(cleaned_human.head, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+				cleaned_human.head.clean_blood()
 			if(cleaned_human.wear_suit)
-				SEND_SIGNAL(cleaned_human.wear_suit, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+				cleaned_human.wear_suit.clean_blood()
 			else if(cleaned_human.w_uniform)
-				SEND_SIGNAL(cleaned_human.w_uniform, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+				cleaned_human.w_uniform.clean_blood()
 			if(cleaned_human.shoes)
-				SEND_SIGNAL(cleaned_human.shoes, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
-			SEND_SIGNAL(cleaned_human, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+				cleaned_human.shoes.clean_blood()
+			cleaned_human.clean_blood()
 			cleaned_human.wash_cream()
 			cleaned_human.regenerate_icons()
 

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -41,12 +41,12 @@
 						C.blood_volume = min(C.blood_volume + round(reac_volume, 0.1), BLOOD_VOLUME_MAXIMUM)
 
 	if(reac_volume >= 10 && istype(L))
-		L.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
+		L.add_blood(list(data["blood_DNA"] = data["blood_type"]))
 		L.color = bloodtype_to_color(data["blood_type"])
 
 /datum/reagent/blood/reaction_obj(obj/O, volume)
 	if(volume >= 3 && istype(O))
-		O.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
+		O.add_blood(list(data["blood_DNA"] = data["blood_type"]))
 		O.color = bloodtype_to_color(data["blood_type"])
 
 /datum/reagent/blood/on_new(list/data)
@@ -1004,7 +1004,7 @@
 
 /datum/reagent/iron/on_mob_life(mob/living/carbon/C)
 	if(C.blood_volume < BLOOD_VOLUME_NORMAL)
-		C.blood_volume += 0.5
+		C.blood_volume += 0.01 //we'll have synthetics from medbay.
 	..()
 
 /datum/reagent/iron/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
@@ -1128,12 +1128,12 @@
 	else
 		if(O)
 			O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
-			SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+			O.clean_blood()
 
 /datum/reagent/space_cleaner/reaction_turf(turf/T, reac_volume)
 	if(reac_volume >= 1)
 		T.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
-		SEND_SIGNAL(T, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+		T.clean_blood()
 		for(var/obj/effect/decal/cleanable/C in T)
 			qdel(C)
 
@@ -1151,26 +1151,26 @@
 					H.lip_style = null
 					H.update_body()
 			for(var/obj/item/I in C.held_items)
-				SEND_SIGNAL(I, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+				I.clean_blood()
 			if(C.wear_mask)
-				if(SEND_SIGNAL(C.wear_mask, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
+				if(C.clean_blood())
 					C.update_inv_wear_mask()
 			if(ishuman(M))
 				var/mob/living/carbon/human/H = C
 				if(H.head)
-					if(SEND_SIGNAL(H.head, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
+					if(H.head.clean_blood())
 						H.update_inv_head()
 				if(H.wear_suit)
-					if(SEND_SIGNAL(H.wear_suit, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
+					if(H.wear_suit.clean_blood())
 						H.update_inv_wear_suit()
 				else if(H.w_uniform)
-					if(SEND_SIGNAL(H.w_uniform, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
+					if(H.w_uniform.clean_blood())
 						H.update_inv_w_uniform()
 				if(H.shoes)
-					if(SEND_SIGNAL(H.shoes, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
+					if(H.shoes.clean_blood())
 						H.update_inv_shoes()
 				H.wash_cream()
-			SEND_SIGNAL(M, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+			M.clean_blood()
 
 /datum/reagent/space_cleaner/ez_clean
 	name = "EZ Clean"

code/modules/reagents/reagent_containers/blood_pack.dm

@@ -48,7 +48,7 @@
 
 /obj/item/reagent_containers/blood/random/Initialize()
 	icon_state = "bloodpack"
-	blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L", "SY")
+	blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L", "SY", "HF", "GEL")
 	return ..()
 
 /obj/item/reagent_containers/blood/APlus
@@ -78,6 +78,12 @@
 /obj/item/reagent_containers/blood/synthetics
 	blood_type = "SY"
 
+/obj/item/reagent_containers/blood/oilblood
+	blood_type = "HF"
+
+/obj/item/reagent_containers/blood/jellyblood
+	blood_type = "GEL"
+
 /obj/item/reagent_containers/blood/attackby(obj/item/I, mob/user, params)
 	if (istype(I, /obj/item/pen) || istype(I, /obj/item/toy/crayon))
 		if(!user.is_literate())