Sets turf decal layer

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

@@ -1,6 +1,7 @@
 /obj/effect/decal
 	name = "decal"
 	anchored = TRUE
+<<<<<<< HEAD
 	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
 
 /obj/effect/decal/ex_act(severity, target)
@@ -19,6 +20,27 @@
 	var/group = TURF_DECAL_PAINT
 	icon = 'icons/turf/decals.dmi'
 	icon_state = "warningline"
+=======
+	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)
+
+/obj/effect/decal/HandleTurfChange(turf/T)
+	..()
+	if(T == loc && (isspaceturf(T) || isclosedturf(T) || islava(T) || istype(T, /turf/open/water) || istype(T, /turf/open/chasm)))
+		qdel(src)
+
+/obj/effect/turf_decal
+	var/group = TURF_DECAL_PAINT
+	icon = 'icons/turf/decals.dmi'
+	icon_state = "warningline"
+	layer = TURF_DECAL_LAYER
+>>>>>>> 41430d7... Sets decal layer
 	anchored = TRUE
 
 //in case we need some special decals