Revert "12/21 modernizations from TG live"

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

@@ -1,15 +1,18 @@
 /obj/effect/decal/cleanable/generic
 	name = "clutter"
 	desc = "Someone should clean that up."
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "shards"
 
 /obj/effect/decal/cleanable/ash
 	name = "ashes"
 	desc = "Ashes to ashes, dust to dust, and into space."
+	gender = PLURAL
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "ash"
-	mergeable_decal = 0
 
 /obj/effect/decal/cleanable/ash/New()
 	..()
@@ -17,29 +20,29 @@
 	pixel_x = rand(-5, 5)
 	pixel_y = rand(-5, 5)
 
-/obj/effect/decal/cleanable/ash/large
-	name = "large pile of ashes"
-	icon_state = "big_ash"
-
-/obj/effect/decal/cleanable/ash/large/New()
-	..()
-	reagents.add_reagent("ash", 30) //double the amount of ash.
-
-
 /obj/effect/decal/cleanable/dirt
 	name = "dirt"
 	desc = "Someone should clean that up."
 	icon_state = "dirt"
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	mouse_opacity = 0
 
 /obj/effect/decal/cleanable/flour
 	name = "flour"
 	desc = "It's still good. Four second rule!"
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	icon_state = "flour"
 
 /obj/effect/decal/cleanable/greenglow
 	name = "glowing goo"
 	desc = "Jeez. I hope that's not for lunch."
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	luminosity = 1
 	icon_state = "greenglow"
 
@@ -49,39 +52,45 @@
 /obj/effect/decal/cleanable/cobweb
 	name = "cobweb"
 	desc = "Somebody should remove that."
-	gender = NEUTER
-	layer = WALL_OBJ_LAYER
+	density = 0
+	layer = OBJ_LAYER
 	icon_state = "cobweb1"
-	resistance_flags = FLAMMABLE
+	burntime = 1
 
-/obj/effect/decal/cleanable/cobweb/cobweb2
-	icon_state = "cobweb2"
+/obj/effect/decal/cleanable/cobweb/fire_act()
+	qdel(src)
 
-/obj/effect/decal/cleanable/molten_object
+/obj/effect/decal/cleanable/molten_item
 	name = "gooey grey mass"
 	desc = "It looks like a melted... something."
-	gender = NEUTER
-	icon = 'icons/effects/effects.dmi'
+	density = 0
+	layer = OBJ_LAYER
+	icon = 'icons/obj/chemical.dmi'
 	icon_state = "molten"
-	mergeable_decal = 0
 
-/obj/effect/decal/cleanable/molten_object/large
-	name = "big gooey grey mass"
-	icon_state = "big_molten"
+/obj/effect/decal/cleanable/cobweb2
+	name = "cobweb"
+	desc = "Somebody should remove that."
+	density = 0
+	layer = OBJ_LAYER
+	icon_state = "cobweb2"
 
 //Vomit (sorry)
 /obj/effect/decal/cleanable/vomit
 	name = "vomit"
 	desc = "Gosh, how unpleasant."
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "vomit_1"
 	random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
 	var/list/viruses = list()
 
 /obj/effect/decal/cleanable/vomit/attack_hand(var/mob/user)
-	if(ishuman(user))
+	if(istype(user,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
-		if(isflyperson(H))
+		if(H.dna.species.id == "fly")
 			playsound(get_turf(src), 'sound/items/drink.ogg', 50, 1) //slurp
 			H.visible_message("<span class='alert'>[H] extends a small proboscis into the vomit pool, sucking it with a slurping sound.</span>")
 			if(reagents)
@@ -103,34 +112,38 @@
 /obj/effect/decal/cleanable/tomato_smudge
 	name = "tomato smudge"
 	desc = "It's red."
-	gender = NEUTER
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
 
 /obj/effect/decal/cleanable/plant_smudge
 	name = "plant smudge"
-	gender = NEUTER
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_plant")
 
 /obj/effect/decal/cleanable/egg_smudge
 	name = "smashed egg"
 	desc = "Seems like this one won't hatch."
-	gender = NEUTER
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
 
 /obj/effect/decal/cleanable/pie_smudge //honk
 	name = "smashed pie"
 	desc = "It's pie cream from a cream pie."
-	gender = NEUTER
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_pie")
 
 /obj/effect/decal/cleanable/chem_pile
 	name = "chemical pile"
 	desc = "A pile of chemicals. You can't quite tell what's inside it."
-	gender = NEUTER
+	gender = PLURAL
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "ash"
 
@@ -139,15 +152,12 @@
 	desc = "The shredded remains of what appears to be clothing."
 	icon_state = "shreds"
 	gender = PLURAL
-	mergeable_decal = 0
-
-/obj/effect/decal/cleanable/shreds/ex_act(severity, target)
-	if(severity == 1) //so shreds created during an explosion aren't deleted by the explosion.
-		qdel(src)
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 
 /obj/effect/decal/cleanable/shreds/New()
-	pixel_x = rand(-10, 10)
-	pixel_y = rand(-10, 10)
+	pixel_x = rand(-5, 5)
+	pixel_y = rand(-5, 5)
 	..()
 
 /obj/effect/decal/cleanable/salt
@@ -155,4 +165,3 @@
 	desc = "A sizable pile of table salt. Someone must be upset."
 	icon = 'icons/effects/tomatodecal.dmi'
 	icon_state = "salt_pile"
-	gender = NEUTER