Merge conflicts begone

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

@@ -84,6 +84,10 @@
 	layer = 3
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "cobweb1"
+	burntime = 1
+
+/obj/effect/decal/cleanable/cobweb/fire_act()
+	qdel(src)
 
 /obj/effect/decal/cleanable/molten_item
 	name = "gooey grey mass"

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

@@ -38,6 +38,7 @@
 	..()
 
 /obj/effect/decal/cleanable/fire_act()
-	reagents.chem_temp += 30
-	reagents.handle_reactions()
+	if(reagents)
+		reagents.chem_temp += 30
+		reagents.handle_reactions()
 	..()

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

@@ -18,6 +18,7 @@
 	var/serial_number = 0
 	var/obj/structure/sign/poster/resulting_poster = null //The poster that will be created is initialised and stored through contraband/poster's constructor
 	var/subtype = 0
+	burn_state = FLAMMABLE
 
 
 /obj/item/weapon/contraband/poster/New(turf/loc, given_serial = 0)