Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull

August2020UpstreamPull

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

@@ -5,6 +5,8 @@
 	plane = DIRTY_PLANE
 	anchored = 1
 	var/amount = 1
+	generic_filth = TRUE
+	persistent = FALSE
 
 /obj/effect/decal/cleanable/liquid_fuel/New(turf/newLoc,amt=1,nologs=1)
 	if(!nologs)

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

@@ -20,6 +20,8 @@ var/global/list/image/splatter_cache=list()
 	var/synthblood = 0
 	var/list/datum/disease2/disease/virus2 = list()
 	var/amount = 5
+	generic_filth = TRUE
+	persistent = FALSE
 
 /obj/effect/decal/cleanable/blood/reveal_blood()
 	if(!fluorescent)

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

@@ -5,6 +5,8 @@
 	icon_state = "gib1"
 	basecolor = SYNTH_BLOOD_COLOUR
 	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7")
+	generic_filth = FALSE
+	persistent = FALSE
 
 /obj/effect/decal/cleanable/blood/gibs/robot/update_icon()
 	color = "#FFFFFF"
@@ -39,6 +41,8 @@
 
 /obj/effect/decal/cleanable/blood/oil
 	basecolor = SYNTH_BLOOD_COLOUR
+	generic_filth = FALSE
+	persistent = FALSE
 
 /obj/effect/decal/cleanable/blood/oil/dry()
 	return

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

@@ -1,7 +1,22 @@
 /obj/effect/decal/cleanable
 	plane = DIRTY_PLANE
+	var/persistent = FALSE
+	var/generic_filth = FALSE
+	var/age = 0
 	var/list/random_icon_states = list()
 
+/obj/effect/decal/cleanable/Initialize(var/ml, var/_age)
+	if(!isnull(_age))
+		age = _age
+	if(random_icon_states && length(src.random_icon_states) > 0)
+		src.icon_state = pick(src.random_icon_states)
+	SSpersistence.track_value(src, /datum/persistent/filth)
+	. = ..()
+
+/obj/effect/decal/cleanable/Destroy()
+	SSpersistence.forget_value(src, /datum/persistent/filth)
+	. = ..()
+
 /obj/effect/decal/cleanable/clean_blood(var/ignore = 0)
 	if(!ignore)
 		qdel(src)

code/game/objects/effects/decals/posters/voreposters_vr.dm

@@ -22,10 +22,6 @@
 	icon_state = "sbsposter6"
 	name = "Mawletta"
 	desc = "The best view in the system."
-/datum/poster/vore_7
-	icon_state = "sbsposter7"
-	name = "Sam FEAR"
-	desc = "A poster of the most dangerous cat working for NT."
 /datum/poster/vore_8
 	icon_state = "sbsposter8"
 	name = "Shitty Timbs"
@@ -34,10 +30,6 @@
 	icon_state = "sbsposter9"
 	name = "Shitty Tim"
 	desc = "A Shitty Tim concert poster."
-/datum/poster/vore_10
-	icon_state = "sbsposter10"
-	name = "Kitty Kisuke"
-	desc = "A poster of famous redspace researcher, Kisuke Gema."
 /datum/poster/vore_11
 	icon_state = "sbsposter11"
 	name = "Fear"