Merge pull request #4019 from tigercat2000/disease1

-tg- disease1

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

@@ -18,7 +18,6 @@ var/global/list/image/splatter_cache=list()
 	var/list/viruses = list()
 	blood_DNA = list()
 	var/basecolor="#A10808" // Color when wet.
-	var/list/datum/disease2/disease/virus2 = list()
 	var/amount = 5
 	appearance_flags = NO_CLIENT_COLOR
 
@@ -198,20 +197,20 @@ var/global/list/image/splatter_cache=list()
 
 
 /obj/effect/decal/cleanable/blood/gibs/proc/streak(var/list/directions)
-        spawn (0)
-                var/direction = pick(directions)
-                for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
-                        sleep(3)
-                        if (i > 0)
-                                var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc)
-                                b.basecolor = src.basecolor
-                                b.update_icon()
-                                for(var/datum/disease2/disease/D in src.viruses)
-                                        var/datum/disease2/disease/ND = D.getcopy()
-                                        b.viruses += ND
-
-                        if (step_to(src, get_step(src, direction), 0))
-                                break
+	set waitfor = 0
+	var/direction = pick(directions)
+	for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
+		sleep(3)
+		if (i > 0)
+			var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc)
+			b.basecolor = src.basecolor
+			b.update_icon()
+			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/old/New()
@@ -221,29 +220,3 @@ var/global/list/image/splatter_cache=list()
 /obj/effect/decal/cleanable/blood/gibs/old/New()
 	..()
 	dry()
-
-/obj/effect/decal/cleanable/mucus
-	name = "mucus"
-	desc = "Disgusting mucus."
-	gender = PLURAL
-	density = 0
-	anchored = 1
-	layer = 2
-	icon = 'icons/effects/blood.dmi'
-	icon_state = "mucus"
-	random_icon_states = list("mucus")
-
-	var/list/datum/disease2/disease/virus2 = list()
-	var/dry=0 // Keeps the lag down
-
-/obj/effect/decal/cleanable/mucus/New()
-	spawn(DRYING_TIME * 2)
-		dry=1
-
-/obj/effect/decal/cleanable/blood/viralsputum
-	name = "viral sputum"
-	desc = "It's black and nasty."
-//	basecolor="#030303"
-	icon = 'icons/mob/robots.dmi'
-	icon_state = "floor1"
-	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")

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

@@ -114,7 +114,6 @@
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "vomit_1"
 	random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
-	var/list/datum/disease2/disease/virus2 = list()
 	noclear = 1
 
 /obj/effect/decal/cleanable/vomit/New()
@@ -133,17 +132,6 @@
 	reagents.remove_reagent("vomit", 5)
 	reagents.add_reagent("green_vomit", 5)
 
-/obj/effect/decal/cleanable/poop
-	name = "poop"
-	desc = "Gosh, how unpleasant."
-	gender = PLURAL
-	density = 0
-	anchored = 1
-	layer = 2
-	icon = 'icons/effects/poop.dmi'
-	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
-	var/list/datum/disease2/disease/virus2 = list()
-
 /obj/effect/decal/cleanable/tomato_smudge
 	name = "tomato smudge"
 	desc = "It's red."