Merge branch 'master' into fourth_week_preparation_and_fixes

# Conflicts:
#	code/game/jobs/faction/zavodskoi.dm

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

@@ -35,7 +35,6 @@
 	icon_state = ""
 	var/coming_state = "blood1"
 	var/going_state = "blood2"
-	var/updated_tracks = 0
 
 	// dir = id in stack
 	var/list/setdirs = list(
@@ -97,7 +96,6 @@
 			track = new /datum/fluidtrack(b, footprint_color, t)
 			stack.Add(track)
 			setdirs["[b]"] = stack.Find(track)
-			updated_tracks |= b
 			updated=1
 
 		// GOING BIT (shift up 4)
@@ -114,7 +112,6 @@
 			track= new /datum/fluidtrack(b, footprint_color, t)
 			stack.Add(track)
 			setdirs["[b]"] = stack.Find(track)
-			updated_tracks |= b
 			updated = 1
 
 	dirs |= comingdir|realgoing
@@ -146,7 +143,6 @@
 		track.overlay = I
 		stack[stack_idx] = track
 		add_overlay(I)
-	updated_tracks = 0 // Clear our memory of updated tracks.
 
 /obj/effect/decal/cleanable/blood/tracks/footprints
 	name = "wet footprints"
@@ -157,6 +153,13 @@
 	going_state  = "human2"
 	amount = 0
 
+/obj/effect/decal/cleanable/blood/tracks/footprints/barefoot
+	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/wheels
 	name = "wet tracks"
 	dryname = "dried tracks"
@@ -194,4 +197,4 @@
 	desc = "A still-wet trail left by someone crawling."
 	drydesc = "A dried trail left by someone crawling."
 	coming_state = "trail1"
-	going_state  = "trail2"
+	going_state  = "trail2"