Revert "12/21 modernizations from TG live"

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

@@ -3,45 +3,57 @@
 /obj/effect/decal/cleanable/xenoblood
 	name = "xeno blood"
 	desc = "It's green and acidic. It looks like... <i>blood?</i>"
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "xfloor1"
 	random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
 	var/list/viruses = list()
-	blood_DNA = list("UNKNOWN DNA" = "X*")
+	blood_DNA = list("UNKNOWN DNA" = "X")
 	bloodiness = MAX_SHOE_BLOODINESS
 	blood_state = BLOOD_STATE_XENO
 
+/obj/effect/decal/cleanable/xenoblood/can_bloodcrawl_in()
+	return 1
+
 /obj/effect/decal/cleanable/xenoblood/Destroy()
 	for(var/datum/disease/D in viruses)
 		D.cure(0)
 	viruses = null
 	return ..()
 
+/obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(list/directions)
+	spawn (0)
+		var/direction = pick(directions)
+		for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
+			sleep(3)
+			if (i > 0)
+				var/obj/effect/decal/cleanable/xenoblood/b = new /obj/effect/decal/cleanable/xenoblood/xsplatter(src.loc)
+				for(var/datum/disease/D in src.viruses)
+					var/datum/disease/ND = D.Copy(1)
+					b.viruses += ND
+					ND.holder = b
+			if (step_to(src, get_step(src, direction), 0))
+				break
+
 /obj/effect/decal/cleanable/xenoblood/xsplatter
 	random_icon_states = list("xgibbl1", "xgibbl2", "xgibbl3", "xgibbl4", "xgibbl5")
 
+/obj/effect/decal/cleanable/xsplatter/can_bloodcrawl_in()
+	return 1
+
 /obj/effect/decal/cleanable/xenoblood/xgibs
 	name = "xeno gibs"
 	desc = "Gnarly..."
+	gender = PLURAL
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "xgib1"
-	layer = LOW_OBJ_LAYER
 	random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6")
-	mergeable_decal = 0
 
-/obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(list/directions)
-	set waitfor = 0
-	var/direction = pick(directions)
-	for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50), i++)
-		sleep(2)
-		if (i > 0)
-			var/obj/effect/decal/cleanable/xenoblood/b = new /obj/effect/decal/cleanable/xenoblood/xsplatter(src.loc)
-			for(var/datum/disease/D in src.viruses)
-				var/datum/disease/ND = D.Copy(1)
-				b.viruses += ND
-				ND.holder = b
-		if (!step_to(src, get_step(src, direction), 0))
-			break
+/obj/effect/decal/cleanable/xgibs/can_bloodcrawl_in()
+	return 1
+
 
 /obj/effect/decal/cleanable/xenoblood/xgibs/ex_act()
 	return
@@ -55,22 +67,27 @@
 /obj/effect/decal/cleanable/xenoblood/xgibs/body
 	random_icon_states = list("xgibhead", "xgibtorso")
 
-/obj/effect/decal/cleanable/xenoblood/xgibs/torso
-	random_icon_states = list("xgibtorso")
-
 /obj/effect/decal/cleanable/xenoblood/xgibs/limb
 	random_icon_states = list("xgibleg", "xgibarm")
 
 /obj/effect/decal/cleanable/xenoblood/xgibs/core
 	random_icon_states = list("xgibmid1", "xgibmid2", "xgibmid3")
 
-/obj/effect/decal/cleanable/xenoblood/xgibs/larva
-	random_icon_states = list("xgiblarva1", "xgiblarva2")
-
-/obj/effect/decal/cleanable/xenoblood/xgibs/larva/body
-	random_icon_states = list("xgiblarvahead", "xgiblarvatorso")
-
 /obj/effect/decal/cleanable/blood/xtracks
 	icon_state = "xtracks"
 	random_icon_states = null
-	blood_DNA = list("UNKNOWN DNA" = "X*")
+	blood_DNA = list("UNKNOWN DNA" = "X")
+
+/obj/effect/decal/cleanable/xdrip
+	name = "drips of blood"
+	desc = "It's green."
+	gender = PLURAL
+	icon = 'icons/effects/blood.dmi'
+	icon_state = "1"
+	random_icon_states = list("xdrip1","xdrip2","xdrip3","xdrip4","xdrip5")
+	bloodiness = 0
+	var/drips = 1
+	blood_DNA = list("UNKNOWN DNA" = "X")
+
+/obj/effect/decal/cleanable/xdrip/can_bloodcrawl_in()
+	return 1

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

@@ -1,6 +1,9 @@
 /obj/effect/decal/cleanable/blood
 	name = "blood"
 	desc = "It's red and gooey. Perhaps it's the chef's cooking?"
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_NORMAL_TURF_LAYER
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "floor1"
 	random_icon_states = list("floor1", "floor2", "floor3", "floor4", "floor5", "floor6", "floor7")
@@ -26,12 +29,16 @@
 /obj/effect/decal/cleanable/blood/tracks
 	icon_state = "tracks"
 	desc = "They look like tracks left by wheels."
+	gender = PLURAL
 	random_icon_states = null
 
 /obj/effect/decal/cleanable/trail_holder //not a child of blood on purpose
 	name = "blood"
 	icon_state = "ltrails_1"
 	desc = "Your instincts say you shouldn't be following these."
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	random_icon_states = null
 	var/list/existing_dirs = list()
 	blood_DNA = list()
@@ -44,32 +51,22 @@
 /obj/effect/decal/cleanable/blood/gibs
 	name = "gibs"
 	desc = "They look bloody and gruesome."
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "gibbl5"
-	layer = LOW_OBJ_LAYER
 	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
-	mergeable_decal = 0
 
 /obj/effect/decal/cleanable/blood/gibs/New()
 	..()
 	reagents.add_reagent("liquidgibs", 5)
 
-/obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target)
+/obj/effect/decal/cleanable/blood/gibs/replace_decal(obj/effect/decal/cleanable/C)
 	return
 
-/obj/effect/decal/cleanable/blood/gibs/proc/streak(list/directions)
-	set waitfor = 0
-	var/direction = pick(directions)
-	for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50), i++)
-		sleep(2)
-		if (i > 0)
-			var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc)
-			for(var/datum/disease/D in src.viruses)
-				var/datum/disease/ND = D.Copy(1)
-				b.viruses += ND
-				ND.holder = b
-		if (!step_to(src, get_step(src, direction), 0))
-			break
+/obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target)
+	return
 
 /obj/effect/decal/cleanable/blood/gibs/up
 	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6","gibup1","gibup1","gibup1")
@@ -80,10 +77,6 @@
 /obj/effect/decal/cleanable/blood/gibs/body
 	random_icon_states = list("gibhead", "gibtorso")
 
-/obj/effect/decal/cleanable/blood/gibs/torso
-	random_icon_states = list("gibtorso")
-
-
 /obj/effect/decal/cleanable/blood/gibs/limb
 	random_icon_states = list("gibleg", "gibarm")
 
@@ -91,9 +84,24 @@
 	random_icon_states = list("gibmid1", "gibmid2", "gibmid3")
 
 
+/obj/effect/decal/cleanable/blood/gibs/proc/streak(list/directions)
+	set waitfor = 0
+	var/direction = pick(directions)
+	for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
+		sleep(3)
+		if (i > 0)
+			var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc)
+			for(var/datum/disease/D in src.viruses)
+				var/datum/disease/ND = D.Copy(1)
+				b.viruses += ND
+				ND.holder = b
+		if (step_to(src, get_step(src, direction), 0))
+			break
+
 /obj/effect/decal/cleanable/blood/drip
 	name = "drips of blood"
 	desc = "It's red."
+	gender = PLURAL
 	icon_state = "1"
 	random_icon_states = list("drip1","drip2","drip3","drip4","drip5")
 	bloodiness = 0
@@ -110,6 +118,7 @@
 	icon = 'icons/effects/footprints.dmi'
 	icon_state = "nothingwhatsoever"
 	desc = "where might they lead?"
+	gender = PLURAL
 	random_icon_states = null
 	var/entered_dirs = 0
 	var/exited_dirs = 0

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

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

@@ -3,19 +3,20 @@
 /obj/effect/decal/cleanable/robot_debris
 	name = "robot debris"
 	desc = "It's a useless heap of junk... <i>or is it?</i>"
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	icon = 'icons/mob/robots.dmi'
 	icon_state = "gib1"
-	layer = LOW_OBJ_LAYER
 	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7")
 	blood_state = BLOOD_STATE_OIL
 	bloodiness = MAX_SHOE_BLOODINESS
-	mergeable_decal = 0
 
 /obj/effect/decal/cleanable/robot_debris/proc/streak(list/directions)
 	set waitfor = 0
 	var/direction = pick(directions)
-	for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50), i++)
-		sleep(2)
+	for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
+		sleep(3)
 		if (i > 0)
 			if (prob(40))
 				new /obj/effect/decal/cleanable/oil/streak(src.loc)
@@ -23,7 +24,7 @@
 				var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 				s.set_up(3, 1, src)
 				s.start()
-		if (!step_to(src, get_step(src, direction), 0))
+		if (step_to(src, get_step(src, direction), 0))
 			break
 
 /obj/effect/decal/cleanable/robot_debris/ex_act()
@@ -41,6 +42,9 @@
 /obj/effect/decal/cleanable/oil
 	name = "motor oil"
 	desc = "It's black and greasy. Looks like Beepsky made another mess."
+	gender = PLURAL
+	density = 0
+	layer = ABOVE_OPEN_TURF_LAYER
 	icon = 'icons/mob/robots.dmi'
 	icon_state = "floor1"
 	var/viruses = list()

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

@@ -1,10 +1,7 @@
 /obj/effect/decal/cleanable
-	gender = PLURAL
-	layer = ABOVE_NORMAL_TURF_LAYER
 	var/list/random_icon_states = list()
 	var/blood_state = "" //I'm sorry but cleanable/blood code is ass, and so is blood_DNA
 	var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints
-	var/mergeable_decal = 1 //when two of these are on a same tile or do we need to merge them into just one?
 
 /obj/effect/decal/cleanable/New()
 	if (random_icon_states && length(src.random_icon_states) > 0)
@@ -19,8 +16,7 @@
 
 
 /obj/effect/decal/cleanable/proc/replace_decal(obj/effect/decal/cleanable/C)
-	if(mergeable_decal)
-		qdel(C)
+	qdel(C)
 
 /obj/effect/decal/cleanable/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/reagent_containers/glass) || istype(W, /obj/item/weapon/reagent_containers/food/drinks))
@@ -46,8 +42,6 @@
 			src.reagents.chem_temp = min(src.reagents.chem_temp + added_heat, hotness)
 			src.reagents.handle_reactions()
 			user << "<span class='notice'>You heat [src] with [W]!</span>"
-	else
-		return ..()
 
 /obj/effect/decal/cleanable/ex_act()
 	if(reagents)
@@ -55,7 +49,7 @@
 			R.on_ex_act()
 	..()
 
-/obj/effect/decal/cleanable/fire_act(exposed_temperature, exposed_volume)
+/obj/effect/decal/cleanable/fire_act()
 	if(reagents)
 		reagents.chem_temp += 30
 		reagents.handle_reactions()

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

@@ -3,9 +3,15 @@
 	desc = "Graffiti. Damn kids."
 	icon = 'icons/effects/crayondecal.dmi'
 	icon_state = "rune1"
-	gender = NEUTER
+	layer = ABOVE_NORMAL_TURF_LAYER
 	var/do_icon_rotate = TRUE
 
+/obj/effect/decal/cleanable/crayon/examine()
+	set src in view(2)
+	..()
+	return
+
+
 /obj/effect/decal/cleanable/crayon/New(location, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune", var/rotation = 0, var/alt_icon = null)
 	..()
 	loc = location
@@ -24,7 +30,7 @@
 		M.Turn(rotation)
 		src.transform = M
 
-	add_atom_colour(main, FIXED_COLOUR_PRIORITY)
+	color = main
 
 
 /obj/effect/decal/cleanable/crayon/gang
@@ -37,12 +43,14 @@
 		qdel(src)
 
 	var/area/territory = get_area(location)
+	var/color
+
 	gang = G
-	var/newcolor = G.color_hex
+	color = G.color_hex
 	icon_state = G.name
 	G.territory_new |= list(territory.type = territory.name)
 
-	..(location, newcolor, icon_state, e_name, rotation)
+	..(location, color, icon_state, e_name, rotation)
 
 /obj/effect/decal/cleanable/crayon/gang/Destroy()
 	var/area/territory = get_area(src)

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

@@ -1,11 +1,6 @@
 /obj/effect/decal
 	name = "decal"
 	anchored = 1
-	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
 
 /obj/effect/decal/ex_act(severity, target)
-	qdel(src)
-
-/obj/effect/decal/fire_act(exposed_temperature, exposed_volume)
-	if(!(resistance_flags & FIRE_PROOF)) //non fire proof decal or being burned by lava
-		qdel(src)
+	qdel(src)

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

@@ -11,9 +11,6 @@
 	desc = "They look like the remains of something... alien. They have a strange aura about them."
 	icon_state = "remainsxeno"
 
-/obj/effect/decal/remains/xeno/larva
-	icon_state = "remainslarva"
-
 /obj/effect/decal/remains/robot
 	desc = "They look like the remains of something mechanical. They have a strange aura about them."
 	icon = 'icons/mob/robots.dmi'