Merge branch 'master' into final_away_maps_additions

# Conflicts:
#	code/__defines/misc.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
#	icons/mob/head.dmi
#	maps/exodus/code/exodus.dm

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

@@ -19,6 +19,7 @@
 	var/amount = 5
 	var/drytime
 	var/dries = TRUE
+	var/bleed_time
 
 /obj/effect/decal/cleanable/blood/no_dry
 	dries = FALSE
@@ -53,10 +54,15 @@
 						blood_DNA |= B.blood_DNA.Copy()
 					qdel(B)
 	drytime = DRYING_TIME * (amount+1)
-	if (dries && !mapload)
-		addtimer(CALLBACK(src, /obj/effect/decal/cleanable/blood/.proc/dry), drytime)
-	else if (dries)
-		dry()
+	bleed_time = world.time
+	if (dries)
+		animate(src, color = "#000000", time = drytime, loop = 0, flags = ANIMATION_RELATIVE)
+
+/obj/effect/decal/cleanable/blood/examine()
+	if(dries && world.time > (bleed_time + drytime))
+		name = dryname
+		desc = drydesc
+	. = ..()
 
 /obj/effect/decal/cleanable/attackby(obj/item/I, mob/user)
 	if(istype(I, /obj/item/gun/energy/rifle/cult))
@@ -70,6 +76,8 @@
 /obj/effect/decal/cleanable/blood/Crossed(mob/living/carbon/human/perp)
 	if (!istype(perp))
 		return
+	if(dries && world.time > (bleed_time + drytime))
+		amount = 0
 	if(amount < 1)
 		return
 
@@ -115,14 +123,10 @@
 	if(amount > 2 && prob(perp.slip_chance(perp.m_intent == M_RUN ? 20 : 5)))
 		perp.slip(src, 4)
 
-/obj/effect/decal/cleanable/blood/proc/dry()
-	name = dryname
-	desc = drydesc
-	color = adjust_brightness(color, -50)
-	amount = 0
-
 /obj/effect/decal/cleanable/blood/attack_hand(mob/living/carbon/human/user)
 	..()
+	if(dries && world.time > (bleed_time + drytime))
+		amount = 0
 	if (amount && istype(user))
 		add_fingerprint(user)
 		if (user.gloves)
@@ -254,11 +258,7 @@
 	random_icon_states = null
 
 	var/list/datum/disease2/disease/virus2 = list()
-	var/dry = 0 // Keeps the lag down
 
 /obj/effect/decal/cleanable/mucus/Initialize()
 	. = ..()
-	addtimer(CALLBACK(src, .proc/dry), DRYING_TIME * 2)
-
-/obj/effect/decal/cleanable/mucus/proc/dry()
-	dry = TRUE
+	animate(src, color = "#000000", time = DRYING_TIME * 2, loop = 0, flags = ANIMATION_RELATIVE)

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

@@ -5,14 +5,11 @@
 	icon_state = "gib1"
 	basecolor="#030303"
 	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7")
-	dries = FALSE	// So we can avoid setting the timer if it's not going to do anything.
+	dries = FALSE
 
 /obj/effect/decal/cleanable/blood/gibs/robot/update_icon()
 	color = "#FFFFFF"
 
-/obj/effect/decal/cleanable/blood/gibs/robot/dry()	//pieces of robots do not dry up like
-	return
-
 /obj/effect/decal/cleanable/blood/gibs/robot/streak(var/list/directions)
 	set waitfor = FALSE
 	var/direction = pick(directions)
@@ -42,13 +39,10 @@
 	basecolor="#030303"
 	dries = FALSE
 
-/obj/effect/decal/cleanable/blood/oil/dry()
-	return
-
 /obj/effect/decal/cleanable/blood/oil/streak
 	random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5")
 	amount = 2
 
 /obj/effect/decal/cleanable/blood/drip/oil
 	name = "drips of motor oil"
-	desc = "It's black and greasy."
+	desc = "It's black and greasy."

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

@@ -157,8 +157,9 @@
 	desc = "They look like still wet tracks left by bare feet."
 	drydesc = "They look like dried tracks left by bare feet."
 
-/obj/effect/decal/cleanable/blood/tracks/footprints/barefoot/del_dry/dry()
-	qdel(src)
+/obj/effect/decal/cleanable/blood/tracks/footprints/barefoot/del_dry/Initialize()
+	. = ..()
+	QDEL_IN(src, TRACKS_CRUSTIFY_TIME)
 
 /obj/effect/decal/cleanable/blood/tracks/wheels
 	name = "wet tracks"