Revert "12/21 modernizations from TG live"

2016-12-22 22:35:44 -06:00
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
@@ -9,9 +9,8 @@
 	icon = 'icons/obj/artstuff.dmi'
 	icon_state = "easel"
 	density = 1
-	resistance_flags = FLAMMABLE
-	obj_integrity = 60
-	max_integrity = 60
+	burn_state = FLAMMABLE
+	burntime = 15
 	var/obj/item/weapon/canvas/painting = null


@@ -52,7 +51,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
 	desc = "draw out your soul on this canvas!"
 	icon = 'icons/obj/artstuff.dmi'
 	icon_state = "11x11"
-	resistance_flags = FLAMMABLE
+	burn_state = FLAMMABLE
 	var/whichGlobalBackup = 1 //List index

 /obj/item/weapon/canvas/nineteenXnineteen