im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)

* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.

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

@@ -6,10 +6,17 @@
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "xfloor1"
 	random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
+	var/list/viruses = list()
 	blood_DNA = list("UNKNOWN DNA" = "X*")
 	bloodiness = MAX_SHOE_BLOODINESS
 	blood_state = BLOOD_STATE_XENO
 
+/obj/effect/decal/cleanable/xenoblood/Destroy()
+	for(var/datum/disease/D in viruses)
+		D.cure(0)
+	viruses = null
+	return ..()
+
 /obj/effect/decal/cleanable/xenoblood/xsplatter
 	random_icon_states = list("xgibbl1", "xgibbl2", "xgibbl3", "xgibbl4", "xgibbl5")
 
@@ -27,9 +34,13 @@
 	var/direction = pick(directions)
 	for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50), i++)
 		sleep(2)
-		if(i > 0)
-			new /obj/effect/decal/cleanable/xenoblood/xsplatter(loc)
-		if(!step_to(src, get_step(src, direction), 0))
+		if (i > 0)
+			var/obj/effect/decal/cleanable/xenoblood/b = new /obj/effect/decal/cleanable/xenoblood/xsplatter(src.loc)
+			for(var/datum/disease/D in src.viruses)
+				var/datum/disease/ND = D.Copy(1)
+				b.viruses += ND
+				ND.holder = b
+		if (!step_to(src, get_step(src, direction), 0))
 			break
 
 /obj/effect/decal/cleanable/xenoblood/xgibs/ex_act()

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

@@ -4,10 +4,17 @@
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "floor1"
 	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
+	var/list/viruses = list()
 	blood_DNA = list()
 	blood_state = BLOOD_STATE_HUMAN
 	bloodiness = MAX_SHOE_BLOODINESS
 
+/obj/effect/decal/cleanable/blood/Destroy()
+	for(var/datum/disease/D in viruses)
+		D.cure(0)
+	viruses = null
+	return ..()
+
 /obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
 	if (C.blood_DNA)
 		blood_DNA |= C.blood_DNA.Copy()
@@ -63,11 +70,15 @@
 /obj/effect/decal/cleanable/blood/gibs/proc/streak(list/directions)
 	set waitfor = 0
 	var/direction = pick(directions)
-	for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50), i++)
+	for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50), i++)
 		sleep(2)
-		if(i > 0)
-			new /obj/effect/decal/cleanable/blood/splatter(loc)
-		if(!step_to(src, get_step(src, direction), 0))
+		if (i > 0)
+			var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc)
+			for(var/datum/disease/D in src.viruses)
+				var/datum/disease/ND = D.Copy(1)
+				b.viruses += ND
+				ND.holder = b
+		if (!step_to(src, get_step(src, direction), 0))
 			break
 
 /obj/effect/decal/cleanable/blood/gibs/up

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

@@ -80,8 +80,9 @@
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "vomit_1"
 	random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
+	var/list/viruses = list()
 
-/obj/effect/decal/cleanable/vomit/attack_hand(mob/user)
+/obj/effect/decal/cleanable/vomit/attack_hand(var/mob/user)
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
 		if(isflyperson(H))
@@ -97,6 +98,12 @@
 			reagents.trans_to(H, reagents.total_volume)
 			qdel(src)
 
+/obj/effect/decal/cleanable/vomit/Destroy()
+	for(var/datum/disease/D in viruses)
+		D.cure(0)
+	viruses = null
+	return ..()
+
 /obj/effect/decal/cleanable/vomit/old
 	name = "crusty dried vomit"
 	desc = "You try not to look at the chunks, and fail."

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

@@ -43,6 +43,7 @@
 	desc = "It's black and greasy. Looks like Beepsky made another mess."
 	icon = 'icons/mob/robots.dmi'
 	icon_state = "floor1"
+	var/viruses = list()
 	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
 	blood_state = BLOOD_STATE_OIL
 	bloodiness = MAX_SHOE_BLOODINESS
@@ -51,5 +52,11 @@
 	..()
 	reagents.add_reagent("oil", 30)
 
+/obj/effect/decal/cleanable/oil/Destroy()
+	for(var/datum/disease/D in viruses)
+		D.cure(0)
+	viruses = null
+	return ..()
+
 /obj/effect/decal/cleanable/oil/streak
 	random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5")