diff --git a/code/citadel/cit_reagents.dm b/code/citadel/cit_reagents.dm
index 12604f26f5..79ccfea936 100644
--- a/code/citadel/cit_reagents.dm
+++ b/code/citadel/cit_reagents.dm
@@ -21,7 +21,7 @@
 		S = new(T)
 	S.reagents.add_reagent("semen", reac_volume)
 	if(data["blood_DNA"])
-		S.blood_DNA[data["blood_DNA"]] = data["blood_type"]
+		S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
 
 /obj/effect/decal/cleanable/semen
 	name = "semen"
@@ -62,17 +62,16 @@
 	icon = 'code/citadel/icons/effects.dmi'
 	icon_state = "fem1"
 	random_icon_states = list("fem1", "fem2", "fem3", "fem4")
-	blood_DNA = list()
 	blood_state = null
 	bloodiness = null
 
 /obj/effect/decal/cleanable/femcum/New()
 	..()
 	dir = pick(1,2,4,8)
+	add_blood_DNA(list("Non-human DNA" = "A+"))
 
 /obj/effect/decal/cleanable/femcum/replace_decal(obj/effect/decal/cleanable/femcum/F)
-	if (F.blood_DNA)
-		blood_DNA |= F.blood_DNA.Copy()
+	F.add_blood_DNA(return_blood_DNA())
 	..()
 
 /datum/reagent/consumable/femcum/reaction_turf(turf/T, reac_volume)
@@ -86,7 +85,7 @@
 		S = new(T)
 	S.reagents.add_reagent("femcum", reac_volume)
 	if(data["blood_DNA"])
-		S.blood_DNA[data["blood_DNA"]] = data["blood_type"]
+		S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
 
 //aphrodisiac & anaphrodisiac
 
diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm
index 9a6a6581c9..2713b19976 100644
--- a/code/citadel/dogborgstuff.dm
+++ b/code/citadel/dogborgstuff.dm
@@ -259,7 +259,7 @@
 			to_chat(user,"<span class='notice'>You clean \the [target.name].</span>")
 			var/obj/effect/decal/cleanable/C = locate() in target
 			qdel(C)
-			target.clean_blood()
+			SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 	else if(ishuman(target))
 		if(src.emagged)
 			var/mob/living/silicon/robot.R = user
@@ -292,7 +292,7 @@
 			to_chat(user, "<span class='notice'>You clean \the [target.name].</span>")
 			var/obj/effect/decal/cleanable/C = locate() in target
 			qdel(C)
-			target.clean_blood()
+			SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 	return
 
 
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index ddb768488a..e494009e35 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -144,27 +144,27 @@
 /atom/movable/proc/clean_on_move()
 	var/turf/tile = loc
 	if(isturf(tile))
-		tile.clean_blood()
+		tile.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 		for(var/A in tile)
 			if(is_cleanable(A))
 				qdel(A)
 			else if(istype(A, /obj/item))
 				var/obj/item/cleaned_item = A
-				cleaned_item.clean_blood()
+				cleaned_item.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 			else if(ishuman(A))
 				var/mob/living/carbon/human/cleaned_human = A
 				if(cleaned_human.lying)
 					if(cleaned_human.head)
-						cleaned_human.head.clean_blood()
+						cleaned_human.head.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 						cleaned_human.update_inv_head()
 					if(cleaned_human.wear_suit)
-						cleaned_human.wear_suit.clean_blood()
+						cleaned_human.wear_suit.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 						cleaned_human.update_inv_wear_suit()
 					else if(cleaned_human.w_uniform)
-						cleaned_human.w_uniform.clean_blood()
+						cleaned_human.w_uniform.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 						cleaned_human.update_inv_w_uniform()
 					if(cleaned_human.shoes)
-						cleaned_human.shoes.clean_blood()
+						cleaned_human.shoes.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
 						cleaned_human.update_inv_shoes()
 					cleaned_human.clean_blood()
 					cleaned_human.wash_cream()
diff --git a/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm b/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm
index 385e9cd9d4..3c564f1807 100644
--- a/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm
+++ b/modular_citadel/code/game/objects/items/melee/eutactic_blades.dm
@@ -273,7 +273,7 @@
 		var/mob/M = loc
 		M.update_inv_hands()
 
-	clean_blood()//blood overlays get weird otherwise, because the sprite changes. (retained from original desword because I have no idea what this is)
+	SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)//blood overlays get weird otherwise, because the sprite changes. (retained from original desword because I have no idea what this is)
 
 /obj/item/twohanded/hypereutactic/AltClick(mob/living/user)
 	if(!in_range(src, user))	//Basic checks to prevent abuse
diff --git a/tgstation.dme b/tgstation.dme
index 8217c8adbd..4d7f43a3e4 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2475,6 +2475,6 @@
 #include "modular_citadel\code\game\objects\items\devices\PDA\PDA.dm"
 #include "modular_citadel\code\game\objects\items\melee\eutactic_blades.dm"
 #include "modular_citadel\code\modules\crafting\recipes.dm"
-#include "modular_citadel\code\modules\mob\living\silicon\robot\robot_modules.dm"
 #include "modular_citadel\code\modules\mob\living\carbon\human\human_defense.dm"
+#include "modular_citadel\code\modules\mob\living\silicon\robot\robot_modules.dm"
 // END_INCLUDE