Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018

# Conflicts:
#	code/game/objects/structures/signs.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/organs/organ_icon.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme

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

@@ -154,20 +154,49 @@ var/global/list/image/fluidtrack_cache=list()
 /obj/effect/decal/cleanable/blood/tracks/footprints
 	name = "wet footprints"
 	dryname = "dried footprints"
-	desc = "Whoops..."
-	drydesc = "Whoops..."
+	desc = "They look like still wet tracks left by footwear."
+	drydesc = "They look like dried tracks left by footwear."
 	coming_state = "human1"
 	going_state  = "human2"
 	amount = 0
 
+/obj/effect/decal/cleanable/blood/tracks/snake
+	name = "wet tracks"
+	dryname = "dried tracks"
+	desc = "They look like still wet tracks left by a giant snake."
+	drydesc = "They look like dried tracks left by a giant snake."
+	coming_state = "snake1"
+	going_state  = "snake2"
+	random_icon_states = null
+	amount = 0
+
+/obj/effect/decal/cleanable/blood/tracks/paw
+	name = "wet tracks"
+	dryname = "dried tracks"
+	desc = "They look like still wet tracks left by a mammal."
+	drydesc = "They look like dried tracks left by a mammal."
+	coming_state = "paw1"
+	going_state  = "paw2"
+	random_icon_states = null
+	amount = 0
+
+/obj/effect/decal/cleanable/blood/tracks/claw
+	name = "wet tracks"
+	dryname = "dried tracks"
+	desc = "They look like still wet tracks left by a reptile."
+	drydesc = "They look like dried tracks left by a reptile."
+	coming_state = "claw1"
+	going_state  = "claw2"
+	random_icon_states = null
+	amount = 0
+
 /obj/effect/decal/cleanable/blood/tracks/wheels
 	name = "wet tracks"
 	dryname = "dried tracks"
-	desc = "Whoops..."
-	drydesc = "Whoops..."
+	desc = "They look like still wet tracks left by wheels."
+	drydesc = "They look like dried tracks left by wheels."
 	coming_state = "wheels"
 	going_state  = ""
-	desc = "They look like tracks left by wheels."
 	gender = PLURAL
 	random_icon_states = null
 	amount = 0