[READY]Component Forensics and Item Blood OverlayS!

code/modules/clothing/gloves/_gloves.dm

@@ -11,13 +11,21 @@
 	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(strength)
+	if(strength < CLEAN_STRENGTH_BLOOD)
+		return
+	transfer_blood = 0
 
 /obj/item/clothing/gloves/worn_overlays(isinhands = FALSE)
 	. = list()
 	if(!isinhands)
 		if(damaged_clothes)
 			. += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves")
-		if(blood_DNA)
+		IF_HAS_BLOOD_DNA(src)
 			. += mutable_appearance('icons/effects/blood.dmi', "bloodyhands")
 
 /obj/item/clothing/gloves/update_clothes_damaged_state(damaging = TRUE)

code/modules/clothing/head/_head.dm

@@ -20,7 +20,7 @@
 	if(!isinhands)
 		if(damaged_clothes)
 			. += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet")
-		if(blood_DNA)
+		IF_HAS_BLOOD_DNA(src)
 			. += mutable_appearance('icons/effects/blood.dmi', "helmetblood")
 
 /obj/item/clothing/head/update_clothes_damaged_state(damaging = TRUE)

code/modules/clothing/masks/_masks.dm

@@ -15,7 +15,7 @@
 		if(body_parts_covered & HEAD)
 			if(damaged_clothes)
 				. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
-			if(blood_DNA)
+			IF_HAS_BLOOD_DNA(src)
 				. += mutable_appearance('icons/effects/blood.dmi', "maskblood")
 
 /obj/item/clothing/mask/update_clothes_damaged_state(damaging = TRUE)

code/modules/clothing/neck/_neck.dm

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

code/modules/clothing/shoes/_shoes.dm

@@ -15,12 +15,16 @@
 	var/offset = 0
 	var/equipped_before_drop = FALSE
 
+/obj/item/clothing/shoes/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT), CALLBACK(src, .proc/clean_blood))
+
 /obj/item/clothing/shoes/worn_overlays(isinhands = FALSE)
 	. = list()
 	if(!isinhands)
-		var/bloody = 0
-		if(blood_DNA)
-			bloody = 1
+		var/bloody = FALSE
+		IF_HAS_BLOOD_DNA(src)
+			bloody = TRUE
 		else
 			bloody = bloody_shoes[BLOOD_STATE_HUMAN]
 
@@ -53,8 +57,9 @@
 		var/mob/M = loc
 		M.update_inv_shoes()
 
-/obj/item/clothing/shoes/clean_blood()
-	..()
+/obj/item/clothing/shoes/proc/clean_blood(strength)
+	if(strength < CLEAN_STRENGTH_BLOOD)
+		return
 	bloody_shoes = list(BLOOD_STATE_HUMAN = 0,BLOOD_STATE_XENO = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
 	blood_state = BLOOD_STATE_NOT_BLOODY
 	if(ismob(loc))
@@ -62,4 +67,4 @@
 		M.update_inv_shoes()
 
 /obj/item/proc/negates_gravity()
-	return 0
+	return FALSE

code/modules/clothing/suits/_suits.dm

@@ -14,7 +14,7 @@
 	if(!isinhands)
 		if(damaged_clothes)
 			. += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]")
-		if(blood_DNA)
+		IF_HAS_BLOOD_DNA(src)
 			. += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood")
 		var/mob/living/carbon/human/M = loc
 		if(ishuman(M) && M.w_uniform)

code/modules/clothing/under/_under.dm

@@ -19,10 +19,9 @@
 /obj/item/clothing/under/worn_overlays(isinhands = FALSE)
 	. = list()
 	if(!isinhands)
-
 		if(damaged_clothes)
 			. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
-		if(blood_DNA)
+		IF_HAS_BLOOD_DNA(src)
 			. += mutable_appearance('icons/effects/blood.dmi', "uniformblood")
 		if(accessory_overlay)
 			. += accessory_overlay

code/modules/detectivework/detective_work.dm

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 //CONTAINS: Suit fibers and Detective's Scanning Computer
 
 /atom/var/list/suit_fibers
@@ -117,3 +118,107 @@
 	if(fingerprintshidden)
 		A.fingerprintshidden |= fingerprintshidden.Copy()    //admin
 	A.fingerprintslast = fingerprintslast
+=======
+//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/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/proc/add_fibers(mob/living/carbon/human/M)
+	var/old = 0
+	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
+				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)
+			M.bloody_hands--
+	var/datum/component/forensics/D = AddComponent(/datum/component/forensics)
+	. = D.add_fibers(M)
+
+/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)
+
+/atom/proc/add_blood_DNA(list/dna)						//ASSOC LIST DNA = BLOODTYPE
+	return FALSE
+
+/obj/add_blood_DNA(list/dna)
+	. = ..()
+	if(length(dna))
+		. = AddComponent(/datum/component/forensics, null, null, dna)
+
+/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, dna)
+		bloody_hands = rand(2, 4)
+	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
+>>>>>>> 9d0e97f... Merge pull request #32311 from kevinz000/component_forensics

code/modules/detectivework/evidence.dm

@@ -23,7 +23,7 @@
 	icon_state = initial(icon_state)
 	desc = initial(desc)
 
-/obj/item/evidencebag/proc/evidencebagEquip(obj/item/I, mob/user)	
+/obj/item/evidencebag/proc/evidencebagEquip(obj/item/I, mob/user)
 	if(!istype(I) || I.anchored == 1)
 		return
 

code/modules/detectivework/footprints_and_rag.dm

@@ -46,6 +46,5 @@
 		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 the [A]!", "<span class='notice'>You finish wiping off the [A].</span>")
-			A.clean_blood()
-			A.wash_cream()
+			A.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
 	return

code/modules/detectivework/scanner.dm

@@ -67,20 +67,14 @@
 
 		//Make our lists
 		var/list/fingerprints = list()
-		var/list/blood = list()
-		var/list/fibers = list()
+		var/list/blood = A.return_blood_DNA()
+		var/list/fibers = A.return_fibers()
 		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
@@ -89,8 +83,7 @@
 
 		else if(!ismob(A))
 
-			if(A.fingerprints && A.fingerprints.len)
-				fingerprints = A.fingerprints.Copy()
+			fingerprints = A.return_fingerprints()
 
 			// Only get reagents from non-mobs.
 			if(A.reagents && A.reagents.reagent_list.len)
@@ -104,6 +97,7 @@
 						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.
@@ -112,7 +106,7 @@
 		add_log("<B>[worldtime2text()][get_timestamp()] - [target_name]</B>", 0)
 
 		// Fingerprints
-		if(fingerprints && fingerprints.len)
+		if(length(fingerprints))
 			sleep(30)
 			add_log("<span class='info'><B>Prints:</B></span>")
 			for(var/finger in fingerprints)
@@ -120,7 +114,7 @@
 			found_something = 1
 
 		// Blood
-		if (blood && blood.len)
+		if (length(blood))
 			sleep(30)
 			add_log("<span class='info'><B>Blood:</B></span>")
 			found_something = 1
@@ -128,7 +122,7 @@
 				add_log("Type: <font color='red'>[blood[B]]</font> DNA: <font color='red'>[B]</font>")
 
 		//Fibers
-		if(fibers && fibers.len)
+		if(length(fibers))
 			sleep(30)
 			add_log("<span class='info'><B>Fibers:</B></span>")
 			for(var/fiber in fibers)
@@ -136,7 +130,7 @@
 			found_something = 1
 
 		//Reagents
-		if(reagents && reagents.len)
+		if(length(reagents))
 			sleep(30)
 			add_log("<span class='info'><B>Reagents:</B></span>")
 			for(var/R in reagents)

code/modules/integrated_electronics/core/printer.dm

@@ -101,6 +101,7 @@
 		return
 	if(..())
 		return TRUE
+	add_fingerprint(usr)
 
 	if(href_list["category"])
 		current_category = href_list["category"]

code/modules/mob/living/blood.dm

@@ -252,8 +252,7 @@
 				drop.transfer_mob_blood_dna(src)
 				return
 			else
-				temp_blood_DNA = list()
-				temp_blood_DNA |= drop.blood_DNA.Copy() //we transfer the dna from the drip to the splatter
+				temp_blood_DNA = drop.return_blood_DNA() //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())
@@ -266,7 +265,7 @@
 		B = new /obj/effect/decal/cleanable/blood/splatter(T, get_static_viruses())
 	B.transfer_mob_blood_dna(src) //give blood info to the blood decal.
 	if(temp_blood_DNA)
-		B.blood_DNA |= temp_blood_DNA
+		B.add_blood_DNA(temp_blood_DNA)
 
 /mob/living/carbon/human/add_splatter_floor(turf/T, small_drip)
 	if(!(NOBLOOD in dna.species.species_traits))
@@ -278,7 +277,7 @@
 	var/obj/effect/decal/cleanable/xenoblood/B = locate() in T.contents
 	if(!B)
 		B = new(T)
-	B.blood_DNA["UNKNOWN DNA"] = "X*"
+	B.add_blood_DNA(list("UNKNOWN DNA" = "X*"))
 
 /mob/living/silicon/robot/add_splatter_floor(turf/T, small_drip)
 	if(!T)

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

@@ -11,21 +11,18 @@
 	if (handcuffed)
 		msg += "<span class='warning'>[t_He] [t_is] [icon2html(handcuffed, user)] handcuffed!</span>\n"
 	if (head)
-		msg += "[t_He] [t_is] wearing [icon2html(head, user)] \a [src.head] on [t_his] head. \n"
+		msg += "[t_He] [t_is] wearing [head.get_examine_string(user)] on [t_his] head. \n"
 	if (wear_mask)
-		msg += "[t_He] [t_is] wearing [icon2html(wear_mask, user)] \a [src.wear_mask] on [t_his] face.\n"
+		msg += "[t_He] [t_is] wearing [wear_mask.get_examine_string(user)] on [t_his] face.\n"
 	if (wear_neck)
-		msg += "[t_He] [t_is] wearing [icon2html(wear_neck, user)] \a [src.wear_neck] around [t_his] neck.\n"
+		msg += "[t_He] [t_is] wearing [wear_neck.get_examine_string(user)] around [t_his] neck.\n"
 
 	for(var/obj/item/I in held_items)
 		if(!(I.flags_1 & ABSTRACT_1))
-			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"
+			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 (back)
-		msg += "[t_He] [t_has] [icon2html(back, user)] \a [src.back] on [t_his] back.\n"
+		msg += "[t_He] [t_has] [back.get_examine_string(user)] on [t_his] back.\n"
 	var/appears_dead = 0
 	if (stat == DEAD)
 		appears_dead = 1

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

@@ -21,54 +21,30 @@
 			if(U.attached_accessory)
 				accessory_msg += " with [icon2html(U.attached_accessory, user)] \a [U.attached_accessory]"
 
-		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"
-
+		msg += "[t_He] [t_is] wearing [w_uniform.get_examine_string(user)][accessory_msg].\n"
 	//head
 	if(head)
-		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"
-
+		msg += "[t_He] [t_is] wearing [head.get_examine_string(user)] on [t_his] head.\n"
 	//suit/armor
 	if(wear_suit)
-		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"
-
+		msg += "[t_He] [t_is] wearing [wear_suit.get_examine_string(user)].\n"
 		//suit/armor storage
 		if(s_store)
-			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"
-
+			msg += "[t_He] [t_is] carrying [s_store.get_examine_string(user)] on [t_his] [wear_suit.name].\n"
 	//back
 	if(back)
-		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"
+		msg += "[t_He] [t_has] [back.get_examine_string(user)] on [t_his] back.\n"
 
 	//Hands
 	for(var/obj/item/I in held_items)
 		if(!(I.flags_1 & ABSTRACT_1))
-			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"
+			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)
 	//gloves
 	if(gloves && !(slot_gloves in obscured))
-		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)
+		msg += "[t_He] [t_has] [gloves.get_examine_string(user)] on [t_his] hands.\n"
+	else if(FR && length(FR.blood_DNA))
 		var/hand_number = get_num_arms()
 		if(hand_number)
 			msg += "<span class='warning'>[t_He] [t_has] [hand_number > 1 ? "" : "a"] blood-stained hand[hand_number > 1 ? "s" : ""]!</span>\n"
@@ -84,42 +60,30 @@
 
 	//belt
 	if(belt)
-		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"
+		msg += "[t_He] [t_has] [belt.get_examine_string(user)] about [t_his] waist.\n"
 
 	//shoes
 	if(shoes && !(slot_shoes in obscured))
-		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"
+		msg += "[t_He] [t_is] wearing [shoes.get_examine_string(user)] on [t_his] feet.\n"
 
 	//mask
 	if(wear_mask && !(slot_wear_mask in obscured))
-		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"
+		msg += "[t_He] [t_has] [wear_mask.get_examine_string(user)] on [t_his] face.\n"
 
 	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"
+		msg += "[t_He] [t_is] wearing [wear_neck.get_examine_string(user)] around [t_his] neck.\n"
 
 	//eyes
 	if(glasses && !(slot_glasses in obscured))
-		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"
+		msg += "[t_He] [t_has] [glasses.get_examine_string(user)] covering [t_his] eyes.\n"
 
 	//ears
 	if(ears && !(slot_ears in obscured))
-		msg += "[t_He] [t_has] [icon2html(ears, user)] \a [ears] on [t_his] ears.\n"
+		msg += "[t_He] [t_has] [ears.get_examine_string(user)] on [t_his] ears.\n"
 
 	//ID
 	if(wear_id)
-		msg += "[t_He] [t_is] wearing [icon2html(wear_id, user)] \a [wear_id].\n"
+		msg += "[t_He] [t_is] wearing [wear_id.get_examine_string(user)].\n"
 
 	//Jitters
 	switch(jitteriness)

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

@@ -25,6 +25,7 @@
 	create_internal_organs() //most of it is done in set_species now, this is only for parent call
 
 	handcrafting = new()
+	AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT), CALLBACK(src, .proc/clean_blood))
 
 	. = ..()
 
@@ -683,19 +684,18 @@
 		if(..())
 			dropItemToGround(I)
 
-/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()
+/mob/living/carbon/human/proc/clean_blood(strength)
+	if(strength < CLEAN_STRENGTH_BLOOD)
+		return
+	if(gloves)
+		if(gloves.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
+			update_inv_gloves()
 	else
-		..() // Clear the Blood_DNA list
-		if(H.bloody_hands)
-			H.bloody_hands = 0
-			H.update_inv_gloves()
+		if(bloody_hands)
+			bloody_hands = 0
+			update_inv_gloves()
 	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
 		cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_lizard"))

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

@@ -51,8 +51,7 @@
 							FP.blood_state = S.blood_state
 							FP.entered_dirs |= dir
 							FP.bloodiness = S.bloody_shoes[S.blood_state] - BLOOD_LOSS_IN_SPREAD
-							if(S.blood_DNA && S.blood_DNA.len)
-								FP.transfer_blood_dna(S.blood_DNA)
+							FP.add_blood_DNA(S.return_blood_DNA())
 							FP.update_icon()
 						update_inv_shoes()
 				//End bloody footprints

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

@@ -175,7 +175,8 @@ There are several things that need to be remembered:
 		var/obj/screen/inventory/inv = hud_used.inv_slots[slot_gloves]
 		inv.update_icon()
 
-	if(!gloves && blood_DNA)
+	GET_COMPONENT(FR, /datum/component/forensics)
+	if(!gloves && FR && length(FR.blood_DNA))
 		var/mutable_appearance/bloody_overlay = mutable_appearance('icons/effects/blood.dmi', "bloodyhands", -GLOVES_LAYER)
 		if(get_num_arms() < 2)
 			if(has_left_hand())

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

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

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

@@ -177,24 +177,15 @@
 	//Hands
 	for(var/obj/item/I in held_items)
 		if(!(I.flags_1 & ABSTRACT_1))
-			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"
+			msg += "It has [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
 
 	//Internal storage
 	if(internal_storage && !(internal_storage.flags_1&ABSTRACT_1))
-		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 += "It is holding [internal_storage.get_examine_string(user)] in its internal storage.\n"
 
 	//Cosmetic hat - provides no function other than looks
 	if(head && !(head.flags_1&ABSTRACT_1))
-		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"
+		msg += "It is wearing [head.get_examine_string(user)] on its head.\n"
 
 	//Braindead
 	if(!client && stat != DEAD)

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

@@ -31,16 +31,9 @@
 
 		for(var/obj/item/I in held_items)
 			if(!(I.flags_1 & ABSTRACT_1))
-				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"
-
+				msg += "It has [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
 		if(internal_storage && !(internal_storage.flags_1&ABSTRACT_1))
-			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 += "It is holding [internal_storage.get_examine_string(user)] in its internal storage.\n"
 		msg += "*---------*</span>"
 		to_chat(user, msg)
 	else

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

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

code/modules/ninja/suit/gloves.dm

@@ -40,26 +40,26 @@
 
 /obj/item/clothing/gloves/space_ninja/Touch(atom/A,proximity)
 	if(!candrain || draining)
-		return 0
+		return FALSE
 	if(!ishuman(loc))
-		return 0 //Only works while worn
+		return FALSE	//Only works while worn
 
 	var/mob/living/carbon/human/H = loc
 
 	var/obj/item/clothing/suit/space/space_ninja/suit = H.wear_suit
 	if(!istype(suit))
-		return 0
+		return FALSE
 	if(isturf(A))
-		return 0
+		return FALSE
 
 	if(!proximity)
-		return 0
+		return FALSE
 
 	A.add_fingerprint(H)
 
-	draining = 1
+	draining = TRUE
 	. = A.ninjadrain_act(suit,H,src)
-	draining = 0
+	draining = FALSE
 
 	if(isnum(.)) //Numerical values of drained handle their feedback here, Alpha values handle it themselves (Research hacking)
 		if(.)
@@ -67,7 +67,7 @@
 		else
 			to_chat(H, "<span class='danger'>\The [A] has run dry of energy, you must find another source!</span>")
 	else
-		. = 0 //as to not cancel attack_hand()
+		. = FALSE	//as to not cancel attack_hand()
 
 
 /obj/item/clothing/gloves/space_ninja/proc/toggledrain()

code/modules/power/cable.dm

@@ -665,7 +665,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 
 			NC.d1 = 0
 			NC.d2 = fdirn
-			NC.add_fingerprint()
+			NC.add_fingerprint(user)
 			NC.update_icon()
 
 			//create a new powernet with the cable, if needed it will be merged later
@@ -716,7 +716,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 		//updates the stored cable coil
 		C.update_stored(2, item_color)
 
-		C.add_fingerprint()
+		C.add_fingerprint(user)
 		C.update_icon()
 
 

code/modules/projectiles/guns/ballistic.dm

@@ -164,7 +164,7 @@
 			if(iscarbon(user))
 				var/mob/living/carbon/C = user
 				user_dna = C.dna
-				B.add_blood(user_dna)
+				B.add_blood_DNA(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/reagents/chemistry/reagents/other_reagents.dm

@@ -79,8 +79,7 @@
 	if(!B)
 		B = new(T)
 	if(data["blood_DNA"])
-		B.blood_DNA[data["blood_DNA"]] = data["blood_type"]
-
+		B.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
 
 /datum/reagent/liquidgibs
 	name = "Liquid gibs"
@@ -941,12 +940,12 @@
 	else
 		if(O)
 			O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
-			O.clean_blood()
+			O.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 
 /datum/reagent/space_cleaner/reaction_turf(turf/T, reac_volume)
 	if(reac_volume >= 1)
 		T.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
-		T.clean_blood()
+		T.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 		for(var/obj/effect/decal/cleanable/C in T)
 			qdel(C)
 
@@ -964,26 +963,26 @@
 					H.lip_style = null
 					H.update_body()
 			for(var/obj/item/I in C.held_items)
-				I.clean_blood()
+				I.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 			if(C.wear_mask)
-				if(C.wear_mask.clean_blood())
+				if(C.wear_mask.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
 					C.update_inv_wear_mask()
 			if(ishuman(M))
 				var/mob/living/carbon/human/H = C
 				if(H.head)
-					if(H.head.clean_blood())
+					if(H.head.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
 						H.update_inv_head()
 				if(H.wear_suit)
-					if(H.wear_suit.clean_blood())
+					if(H.wear_suit.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
 						H.update_inv_wear_suit()
 				else if(H.w_uniform)
-					if(H.w_uniform.clean_blood())
+					if(H.w_uniform.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
 						H.update_inv_w_uniform()
 				if(H.shoes)
-					if(H.shoes.clean_blood())
+					if(H.shoes.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD))
 						H.update_inv_shoes()
 				H.wash_cream()
-			M.clean_blood()
+			M.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 
 /datum/reagent/space_cleaner/ez_clean
 	name = "EZ Clean"

code/modules/shuttle/computer.dm

@@ -14,6 +14,7 @@
 	if(..(user))
 		return
 	add_fingerprint(usr)
+
 	var/list/options = params2list(possible_destinations)
 	var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId)
 	var/dat = "Status: [M ? M.getStatusText() : "*Missing*"]<br><br>"