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

code/game/atoms.dm

@@ -36,6 +36,9 @@
 	var/rad_insulation = RAD_NO_INSULATION
 
 	var/icon/blood_splatter_icon
+	var/list/fingerprints
+	var/list/fingerprintshidden
+	var/list/blood_DNA
 
 /atom/New(loc, ...)
 	//atom creation method that preloads variables at creation
@@ -244,23 +247,22 @@
 		return TRUE
 	return FALSE
 
-/atom/proc/get_examine_name(mob/user)
-	. = "\a [src]"
-	var/list/override = list(gender == PLURAL ? "some" : "a", " ", "[name]")
-	if(article)
-		. = "[article] [src]"
-		override[EXAMINE_POSITION_ARTICLE] = article
-	if(SEND_SIGNAL(src, COMSIG_ATOM_GET_EXAMINE_NAME, user, override) & COMPONENT_EXNAME_CHANGED)
-		. = override.Join("")
-
-/atom/proc/get_examine_string(mob/user, thats = FALSE)
-	. = "[icon2html(src, user)] [thats? "That's ":""][get_examine_name(user)]"
-
 /atom/proc/examine(mob/user)
-	to_chat(user, get_examine_string(user, TRUE))
+	//This reformat names to get a/an properly working on item descriptions when they are bloody
+	var/f_name = "\a [src]."
+	if(src.blood_DNA && !istype(src, /obj/effect/decal))
+		if(gender == PLURAL)
+			f_name = "some "
+		else
+			f_name = "a "
+		f_name += "<span class='danger'>blood-stained</span> [name]!"
+
+	to_chat(user, "[icon2html(src, user)] That's [f_name]")
 
 	if(desc)
 		to_chat(user, desc)
+	// *****RM
+	//to_chat(user, "[name]: Dn:[density] dir:[dir] cont:[contents] icon:[icon] is:[icon_state] loc:[loc]")
 
 	if(reagents)
 		if(container_type & TRANSPARENT)
@@ -282,8 +284,6 @@
 			else
 				to_chat(user, "<span class='danger'>It's empty.</span>")
 
-	SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user)
-
 /atom/proc/relaymove(mob/user)
 	if(buckle_message_cooldown <= world.time)
 		buckle_message_cooldown = world.time + 50
@@ -345,18 +345,123 @@
 	var/new_blood_dna = L.get_blood_dna_list()
 	if(!new_blood_dna)
 		return FALSE
-	var/old_length = blood_DNA_length()
-	add_blood_DNA(new_blood_dna)
-	if(blood_DNA_length() == old_length)
+	if(!blood_DNA)	//if our list of DNA doesn't exist yet, initialise it.
+		blood_DNA = list()
+	var/old_length = blood_DNA.len
+	blood_DNA |= new_blood_dna
+	if(blood_DNA.len == old_length)
 		return FALSE
 	return TRUE
 
+//to add blood dna info to the object's blood_DNA list
+/atom/proc/transfer_blood_dna(list/blood_dna)
+	if(!blood_DNA)
+		blood_DNA = list()
+	var/old_length = blood_DNA.len
+	blood_DNA |= blood_dna
+	if(blood_DNA.len > old_length)
+		return TRUE//some new blood DNA was added
+
+
 //to add blood from a mob onto something, and transfer their dna info
 /atom/proc/add_mob_blood(mob/living/M)
 	var/list/blood_dna = M.get_blood_dna_list()
 	if(!blood_dna)
 		return FALSE
-	return add_blood_DNA(blood_dna)
+	return add_blood(blood_dna)
+
+//to add blood onto something, with blood dna info to include.
+/atom/proc/add_blood(list/blood_dna)
+	return FALSE
+
+/obj/add_blood(list/blood_dna)
+	return transfer_blood_dna(blood_dna)
+
+/obj/item/add_blood(list/blood_dna)
+	if(!..())
+		return FALSE
+	add_blood_overlay()
+	return TRUE //we applied blood to the item
+
+/obj/item/proc/add_blood_overlay()
+	if(!blood_DNA.len)
+		return
+	if(initial(icon) && initial(icon_state))
+		blood_splatter_icon = icon(initial(icon), initial(icon_state), , 1)		//we only want to apply blood-splatters to the initial icon_state for each object
+		blood_splatter_icon.Blend("#fff", ICON_ADD) 			//fills the icon_state with white (except where it's transparent)
+		blood_splatter_icon.Blend(icon('icons/effects/blood.dmi', "itemblood"), ICON_MULTIPLY) //adds blood and the remaining white areas become transparant
+		blood_splatter_icon.Blend(blood_DNA_to_color(), ICON_MULTIPLY)
+		add_overlay(blood_splatter_icon)
+
+/obj/item/clothing/gloves/add_blood(mob/living/carbon/M)
+	. = ..()
+	transfer_blood = rand(2, 4)
+	return TRUE
+
+/obj/item/clothing/shoes/add_blood(mob/living/carbon/M)
+	. = ..()
+	transfer_blood = rand(2, 4)
+	return TRUE
+
+/turf/add_blood(list/blood_dna)
+	var/obj/effect/decal/cleanable/blood/splatter/B = locate() in src
+	if(!B)
+		B = new /obj/effect/decal/cleanable/blood/splatter(src)
+	B.transfer_blood_dna(blood_dna) //give blood info to the blood decal.
+	return TRUE //we bloodied the floor
+
+/mob/living/carbon/human/add_blood(list/blood_dna)
+	if(wear_suit)
+		wear_suit.add_blood(blood_dna)
+		update_inv_wear_suit()
+	else if(w_uniform)
+		w_uniform.add_blood(blood_dna)
+		update_inv_w_uniform()
+	if(gloves)
+		var/obj/item/clothing/gloves/G = gloves
+		G.add_blood(blood_dna)
+	else
+		transfer_blood_dna(blood_dna)
+		bloody_hands = rand(2, 4)
+	update_inv_gloves()	//handles bloody hands overlays and updating
+	if(shoes)
+		var/obj/item/clothing/shoes/S = shoes
+		S.add_blood(blood_dna)
+	else
+		transfer_blood_dna(blood_dna)
+		bloody_feet = rand(2, 4)
+	update_inv_shoes() // get them feet messy for prints!
+	return TRUE
+
+/atom/proc/clean_blood()
+	if(islist(blood_DNA))
+		blood_DNA = null
+		return TRUE
+
+/atom/proc/blood_DNA_to_color()
+	var/list/colors = list()//first we make a list of all bloodtypes present
+	for(var/bloop in blood_DNA)
+		if(colors[blood_DNA[bloop]])
+			colors[blood_DNA[bloop]]++
+		else
+			colors[blood_DNA[bloop]] = 1
+
+	var/final_rgb = "#940000"
+
+	if(colors.len)
+		var/sum = 0 //this is all shitcode, but it works; trust me
+		final_rgb = bloodtype_to_color(colors[1])
+		sum = colors[colors[1]]
+		if(colors.len > 1)
+			var/i = 2
+			while(i <= colors.len)
+				var/tmp = colors[colors[i]]
+				final_rgb = BlendRGB(final_rgb, bloodtype_to_color(colors[i]), tmp/(tmp+sum))
+				sum += tmp
+				i++
+
+	return final_rgb
+
 
 /atom/proc/wash_cream()
 	return TRUE

code/game/machinery/suit_storage_unit.dm

@@ -246,7 +246,8 @@
 				visible_message("<span class='warning'>[src]'s door slides open, barraging you with the nauseating smell of charred flesh.</span>")
 			playsound(src, 'sound/machines/airlockclose.ogg', 25, 1)
 			for(var/obj/item/I in src) //Scorches away blood and forensic evidence, although the SSU itself is unaffected
-				SEND_SIGNAL(I, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRONG)
+				I.clean_blood()
+				I.fingerprints = list()
 				var/datum/component/radioactive/contamination = I.GetComponent(/datum/component/radioactive)
 				if(contamination)
 					qdel(contamination)

code/game/machinery/washing_machine.dm

@@ -11,10 +11,6 @@
 	var/obj/item/color_source
 	var/max_wash_capacity = 5
 
-/obj/machinery/washing_machine/ComponentInitialize()
-	. = ..()
-	AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT = CALLBACK(src, .proc/clean_blood)))
-
 /obj/machinery/washing_machine/examine(mob/user)
 	..()
 	to_chat(user, "<span class='notice'>Alt-click it to start a wash cycle.</span>")
@@ -59,7 +55,8 @@
 		M.Translate(rand(-3, 3), rand(-1, 3))
 		animate(src, transform=M, time=2)
 
-/obj/machinery/washing_machine/proc/clean_blood()
+/obj/machinery/washing_machine/clean_blood()
+	..()
 	if(!busy)
 		bloody_mess = FALSE
 		update_icon()
@@ -67,7 +64,7 @@
 /obj/machinery/washing_machine/proc/wash_cycle()
 	for(var/X in contents)
 		var/atom/movable/AM = X
-		SEND_SIGNAL(AM, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+		AM.clean_blood()
 		AM.machine_wash(src)
 
 	busy = FALSE

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

@@ -82,7 +82,8 @@
 				add_blood = bloodiness
 			bloodiness -= add_blood
 			S.blood_smear[blood_state] = min(MAX_SHOE_BLOODINESS,S.blood_smear[blood_state]+add_blood)
-			S.add_blood_DNA(return_blood_DNA())
+			if(blood_DNA && blood_DNA.len)
+				S.add_blood(blood_DNA)
 			S.blood_state = blood_state
 			S.blood_color = blood_color
 			update_icon()
@@ -97,7 +98,8 @@
 			bloodiness -= add_blood
 			H.blood_smear[blood_state] = min(MAX_SHOE_BLOODINESS,H.blood_smear[blood_state]+add_blood)
 			H.bloodiness = add_blood
-			H.add_blood_DNA(return_blood_DNA())
+			if(blood_DNA && blood_DNA.len)
+				H.add_blood(blood_DNA)
 			H.blood_state = blood_state
 			H.blood_color = blood_color
 			update_icon()

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

@@ -4,10 +4,7 @@
 	name = "xeno blood"
 	desc = "It's green and acidic. It looks like... <i>blood?</i>"
 	color = BLOOD_COLOR_XENO
-
-/obj/effect/decal/cleanable/blood/xeno/Initialize()
-	. = ..()
-	add_blood_DNA(list("UNKNOWN DNA" = "X*"))
+	blood_DNA = list("UNKNOWN DNA" = "X*")
 
 /obj/effect/decal/cleanable/blood/splatter/xeno
 	color = BLOOD_COLOR_XENO
@@ -64,6 +61,10 @@
 /obj/effect/decal/cleanable/blood/gibs/xeno/larva/body
 	random_icon_states = list("xgiblarvahead", "xgiblarvatorso")
 
-/obj/effect/decal/cleanable/blood/xeno/tracks/Initialize()
-	. = ..()
-	add_blood_DNA(list("UNKNOWN DNA" = "X*"))
+/obj/effect/decal/cleanable/blood/xtracks
+	icon_state = "tracks"
+	random_icon_states = null
+
+/obj/effect/decal/cleanable/blood/xtracks/Initialize()
+	add_blood(list("UNKNOWN DNA" = "X*"))
+	. = ..()

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

@@ -48,6 +48,7 @@
 				diseases = infective.diseases
 			var/obj/effect/decal/cleanable/blood/gibs/gibbers = src
 			var/obj/effect/decal/cleanable/blood/splatter/splat = new /obj/effect/decal/cleanable/blood/splatter(loc, diseases)
+			splat.transfer_blood_dna(blood_DNA)
 			splat.color = gibbers.blood_color
 			splat.blood_color = gibbers.blood_color
 
@@ -87,7 +88,7 @@
 	. = ..()
 	setDir(pick(1,2,4,8))
 	icon_state += "-old"
-	add_blood_DNA(list("Non-human DNA" = "A+"))
+	add_blood(list("Non-human DNA" = "A+"))
 
 /obj/effect/decal/cleanable/blood/drip
 	name = "drips of blood"

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

@@ -4,40 +4,28 @@
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "floor1"
 	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
+	blood_DNA = list()
 	blood_state = BLOOD_STATE_BLOOD
 	color = BLOOD_COLOR_HUMAN //default so we don't have white splotches everywhere.
 	bloodiness = BLOOD_AMOUNT_PER_DECAL
 
 
 /obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
-	if(bloodiness)
-		if(C.bloodiness < MAX_SHOE_BLOODINESS)
-			C.bloodiness += bloodiness
+	if (C.blood_DNA)
+		blood_DNA |= C.blood_DNA.Copy()
 	update_icon()
-	return ..()
+	..()
 
-/obj/effect/decal/cleanable/blood/add_blood_DNA(list/blood_dna)
-	return TRUE
+/obj/effect/decal/cleanable/blood/transfer_blood_dna()
+	..()
+	update_icon()
 
 /obj/effect/decal/cleanable/blood/transfer_mob_blood_dna()
 	. = ..()
 	update_icon()
 
 /obj/effect/decal/cleanable/blood/update_icon()
-	if(!blood_color)
-		if(reagents.reagent_list.len)
-			for(var/datum/reagent/R in reagents.reagent_list)
-				// Get blood data from the blood reagent.
-				if(istype(R, /datum/reagent/blood))
-					if(R.data["blood_type"])
-						blood_color = bloodtype_to_color(R.data["blood_type"])
-				else if(istype(R, /datum/reagent/liquidgibs))
-					if(R.data["blood_type"])
-						blood_color = bloodtype_to_color(R.data["blood_type"])
-		else
-			return
-	else
-		color = blood_color
+	color = blood_DNA_to_color()
 
 //obj/effect/decal/cleanable/blood/update_color()
  // if(SEND_SIGNAL(COMSIG_BLOOD_COLOR) & COMPONENT_BLOCK_UPDATE_COLOR)
@@ -50,8 +38,9 @@
 	color = "#3a0505"
 
 /obj/effect/decal/cleanable/blood/old/Initialize(mapload, list/datum/disease/diseases)
-	. = ..()
-	add_blood_DNA(list("blood_type"= "A+"))
+	..()
+	icon_state += "-old"
+	add_blood(list("Non-human DNA" = "A+"))
 
 /obj/effect/decal/cleanable/blood/splatter
 	random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5")
@@ -66,10 +55,7 @@
 	bloodiness = BLOOD_AMOUNT_PER_DECAL
 
 /obj/effect/decal/cleanable/trail_holder/update_icon()
-	GET_COMPONENT(D, /datum/component/forensics)
-	if(istype(D) && !blood_color)
-		blood_color = D.blood_mix_color
-	color = blood_color
+	color = blood_DNA_to_color()
 
 /obj/effect/cleanable/trail_holder/Initialize()
 	. = ..()
@@ -78,6 +64,10 @@
 /obj/effect/decal/cleanable/trail_holder/can_bloodcrawl_in()
 	return TRUE
 
+/obj/effect/decal/cleanable/trail_holder/transfer_blood_dna()
+	..()
+	update_icon()
+
 /obj/effect/decal/cleanable/trail_holder/transfer_mob_blood_dna()
 	. = ..()
 	update_icon()
@@ -122,6 +112,8 @@
 		var/mob/living/carbon/human/H = O
 		var/obj/item/clothing/shoes/S = H.shoes
 		if(S && S.blood_smear[blood_state])
+			if(color != bloodtype_to_color(S.last_bloodtype))//last entry - we check its color
+				return
 			S.blood_smear[blood_state] = max(S.blood_smear[blood_state] - BLOOD_LOSS_PER_STEP, 0)
 			S.blood_color = blood_color
 			shoe_types  |= S.type
@@ -138,6 +130,7 @@
 				update_icon()
 
 /obj/effect/decal/cleanable/blood/footprints/tracks/update_icon()
+	..()
 	cut_overlays()
 
 	for(var/Ddir in GLOB.cardinals)

code/game/objects/effects/spawners/gibspawner.dm

@@ -12,8 +12,6 @@
 
 /obj/effect/gibspawner/Initialize(mapload, mob/living/source_mob, list/datum/disease/diseases)
 	. = ..()
-	AddComponent(/datum/component/forensics)
-
 	if(gibtypes.len != gibamounts.len)
 		stack_trace("Gib list amount length mismatch!")
 		return
@@ -74,7 +72,7 @@
 					var/mob/living/carbon/digester = loc
 					digester.stomach_contents += gib
 
-				gib.add_blood_DNA(dna_to_add)
+				gib.blood_DNA += dna_to_add
 				// color them properly, please.
 				gib.body_colors = body_coloring
 				gib.update_icon()

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -43,7 +43,7 @@
 	animate(src, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = duration)
 
 /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter
-	splatter_type = "xsplatter"
+	color = BLOOD_COLOR_XENO
 
 /obj/effect/temp_visual/dir_setting/speedbike_trail
 	name = "speedbike trails"

code/game/objects/items.dm

@@ -538,6 +538,17 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 			M.become_blind(EYE_DAMAGE)
 			to_chat(M, "<span class='danger'>You go blind!</span>")
 
+/obj/item/clean_blood()
+	. = ..()
+	if(.)
+		if(blood_splatter_icon)
+			cut_overlay(blood_splatter_icon)
+
+/obj/item/clothing/gloves/clean_blood()
+	. = ..()
+	if(.)
+		transfer_blood = 0
+
 /obj/item/singularity_pull(S, current_size)
 	..()
 	if(current_size >= STAGE_FOUR)

code/game/objects/items/clown_items.dm

@@ -88,7 +88,7 @@
 			var/obj/effect/decal/cleanable/C = locate() in target
 			qdel(C)
 			target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
-			SEND_SIGNAL(target, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
+			target.clean_blood()
 			target.wash_cream()
 	return
 

code/game/objects/items/devices/radio/intercom.dm

@@ -136,7 +136,7 @@
 		else
 			icon_state = initial(icon_state)
 
-/obj/item/radio/intercom/add_blood_DNA(list/blood_dna)
+/obj/item/radio/intercom/add_blood(list/blood_dna)
 	return FALSE
 
 //Created through the autolathe or through deconstructing intercoms. Can be applied to wall to make a new intercom on it!

code/game/objects/items/melee/energy.dm

@@ -22,7 +22,7 @@
 	user.visible_message("<span class='suicide'>[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku!</span>")
 	return (BRUTELOSS|FIRELOSS)
 
-/obj/item/melee/transforming/energy/add_blood_DNA(list/blood_dna)
+/obj/item/melee/transforming/energy/add_blood(list/blood_dna)
 	return FALSE
 
 /obj/item/melee/transforming/energy/is_sharp()

code/game/objects/items/melee/misc.dm

@@ -343,7 +343,7 @@
 	shard.Consume()
 	T.CalculateAdjacentTurfs()
 
-/obj/item/melee/supermatter_sword/add_blood_DNA(list/blood_dna)
+/obj/item/melee/supermatter_sword/add_blood(list/blood_dna)
 	return FALSE
 
 /obj/item/melee/curator_whip

code/game/objects/items/mop.dm

@@ -26,7 +26,7 @@
 
 /obj/item/mop/proc/clean(turf/A)
 	if(reagents.has_reagent("water", 1) || reagents.has_reagent("holywater", 1) || reagents.has_reagent("vodka", 1) || reagents.has_reagent("cleaner", 1))
-		SEND_SIGNAL(A, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
+		A.clean_blood()
 		for(var/obj/effect/O in A)
 			if(is_cleanable(O))
 				qdel(O)

code/game/objects/items/stacks/stack.dm

@@ -388,10 +388,10 @@
 	else
 		. = ..()
 
-/obj/item/stack/proc/copy_evidences(obj/item/stack/from)
-	add_blood_DNA(from.return_blood_DNA())
-	add_fingerprint_list(from.return_fingerprints())
-	add_hiddenprint_list(from.return_hiddenprints())
+/obj/item/stack/proc/copy_evidences(obj/item/stack/from as obj)
+	blood_DNA = from.blood_DNA
+	fingerprints  = from.fingerprints
+	fingerprintshidden  = from.fingerprintshidden
 	fingerprintslast  = from.fingerprintslast
 	//TODO bloody overlay
 

code/game/objects/items/storage/book.dm

@@ -241,5 +241,5 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 	else
 		return ..(M,user,heal_mode = FALSE)
 
-/obj/item/storage/book/bible/syndicate/add_blood_DNA(list/blood_dna)
+/obj/item/storage/book/bible/syndicate/add_blood(list/blood_dna)
 	return FALSE

code/game/objects/items/twohanded.dm

@@ -341,7 +341,7 @@
 		icon_state = "dualsaber[item_color][wielded]"
 	else
 		icon_state = "dualsaber0"
-	SEND_SIGNAL(src, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+	clean_blood()//blood overlays get weird otherwise, because the sprite changes.
 
 /obj/item/twohanded/dualsaber/attack(mob/target, mob/living/carbon/human/user)
 	if(user.has_dna())

code/game/objects/structures/watercloset.dm

@@ -317,7 +317,7 @@
 
 
 /obj/machinery/shower/proc/wash_obj(obj/O)
-	. = SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
+	. = O.clean_blood()
 	O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
 	if(isitem(O))
 		var/obj/item/I = O
@@ -328,7 +328,7 @@
 /obj/machinery/shower/proc/wash_turf()
 	if(isturf(loc))
 		var/turf/tile = loc
-		SEND_SIGNAL(tile, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
+		tile.clean_blood()
 		tile.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
 		for(var/obj/effect/E in tile)
 			if(is_cleanable(E))
@@ -336,7 +336,7 @@
 
 
 /obj/machinery/shower/proc/wash_mob(mob/living/L)
-	SEND_SIGNAL(L, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
+	L.clean_blood()
 	L.wash_cream()
 	L.ExtinguishMob()
 	L.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily
@@ -381,7 +381,7 @@
 			else if(H.w_uniform && wash_obj(H.w_uniform))
 				H.update_inv_w_uniform()
 			if(washgloves)
-				SEND_SIGNAL(H, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+				H.clean_blood()
 			if(H.shoes && washshoes && wash_obj(H.shoes))
 				H.update_inv_shoes()
 			if(H.wear_mask && washmask && wash_obj(H.wear_mask))
@@ -398,9 +398,9 @@
 		else
 			if(M.wear_mask && wash_obj(M.wear_mask))
 				M.update_inv_wear_mask(0)
-			SEND_SIGNAL(M, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+			M.clean_blood()
 	else
-		SEND_SIGNAL(L, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+		L.clean_blood()
 
 /obj/machinery/shower/proc/contamination_cleanse(atom/movable/thing)
 	var/datum/component/radioactive/healthy_green_glow = thing.GetComponent(/datum/component/radioactive)
@@ -498,7 +498,7 @@
 			H.regenerate_icons()
 		user.drowsyness = max(user.drowsyness - rand(2,3), 0) //Washing your face wakes you up if you're falling asleep
 	else
-		SEND_SIGNAL(user, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+		user.clean_blood()
 
 /obj/structure/sink/attackby(obj/item/O, mob/living/user, params)
 	if(busy)
@@ -554,7 +554,7 @@
 			busy = FALSE
 			return 1
 		busy = FALSE
-		SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
+		O.clean_blood()
 		O.acid_level = 0
 		create_reagents(5)
 		reagents.add_reagent(dispensedreagent, 5)

code/game/turfs/open.dm

@@ -225,7 +225,7 @@
 	for(var/mob/living/simple_animal/slime/M in src)
 		M.apply_water()
 
-	SEND_SIGNAL(src, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
+	clean_blood()
 	for(var/obj/effect/O in src)
 		if(is_cleanable(O))
 			qdel(O)