Makes burn_state use defines

This commit is contained in:
KorPhaeron
2015-12-13 05:36:55 -06:00
parent 1019b057c5
commit d8a37204e7
87 changed files with 179 additions and 174 deletions
+2 -2
View File
@@ -9,7 +9,7 @@
icon = 'icons/obj/artstuff.dmi'
icon_state = "easel"
density = 1
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 15
var/obj/item/weapon/canvas/painting = null
@@ -52,7 +52,7 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES]
desc = "draw out your soul on this canvas!"
icon = 'icons/obj/artstuff.dmi'
icon_state = "11x11"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
var/whichGlobalBackup = 1 //List index
/obj/item/weapon/canvas/nineteenXnineteen
@@ -15,7 +15,7 @@
anchored = 1
can_buckle = 1
buckle_lying = 1
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 30
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 2
@@ -86,7 +86,7 @@
icon = 'icons/obj/rollerbed.dmi'
icon_state = "down"
anchored = 0
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
foldabletype = /obj/item/roller
/obj/structure/bed/roller/post_buckle_mob(mob/living/M)
@@ -3,7 +3,7 @@
desc = "You sit in this. Either by will or force.\n<span class='notice'>Alt-click to rotate it clockwise.</span>"
icon_state = "chair"
buckle_lying = 0 //you sit in a chair, not lay
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
buildstackamount = 1
/obj/structure/bed/chair/New()
@@ -85,7 +85,7 @@
// Chair types
/obj/structure/bed/chair/wood
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
buildstacktype = /obj/item/stack/sheet/mineral/wood
buildstackamount = 3
@@ -105,7 +105,7 @@
desc = "It looks comfy.\n<span class='notice'>Alt-click to rotate it clockwise.</span>"
icon_state = "comfychair"
color = rgb(255,255,255)
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 30
buildstackamount = 2
var/image/armrest = null
+2 -2
View File
@@ -17,7 +17,7 @@ LINEN BINS
throw_range = 2
w_class = 1
item_color = "white"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/item/weapon/bedsheet/attack(mob/living/M, mob/user)
@@ -175,7 +175,7 @@ LINEN BINS
icon = 'icons/obj/structures.dmi'
icon_state = "linenbin-full"
anchored = 1
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
var/amount = 10
var/list/sheets = list()
@@ -4,7 +4,7 @@
icon_state = "cardboard"
health = 10
mob_storage_capacity = 1
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
can_weld_shut = 0
cutting_tool = /obj/item/weapon/wirecutters
@@ -2,7 +2,7 @@
name = "cabinet"
desc = "Old will forever be in fashion."
icon_state = "cabinet"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
/obj/structure/closet/acloset
@@ -117,7 +117,7 @@
name = "coffin"
desc = "It's a burial receptacle for the dearly departed."
icon_state = "coffin"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
/obj/structure/closet/wardrobe/red
@@ -2,7 +2,7 @@
name = "booze storage"
req_access = list(access_bar)
icon_state = "cabinet"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
/obj/structure/closet/secure_closet/bar/New()
@@ -25,7 +25,7 @@
/obj/structure/closet/secure_closet/personal/cabinet
icon_state = "cabinet"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
/obj/structure/closet/secure_closet/personal/cabinet/New()
@@ -155,7 +155,7 @@
name = "\proper detective's cabinet"
req_access = list(access_forensics_lockers)
icon_state = "cabinet"
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
/obj/structure/closet/secure_closet/detective/New()
+2 -2
View File
@@ -1,5 +1,5 @@
/obj/structure/flora
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 30
//trees
@@ -221,7 +221,7 @@
icon_state = "rock1"
icon = 'icons/obj/flora/rocks.dmi'
anchored = 1
burn_state = -1 //Not Burnable
burn_state = FIRE_PROOF
/obj/structure/flora/rock/New()
..()
@@ -242,7 +242,7 @@
hardness = 1
openSound = 'sound/effects/doorcreaky.ogg'
closeSound = 'sound/effects/doorcreaky.ogg'
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 30
/obj/structure/mineral_door/wood/Dismantle(devastated = 0)
+1 -1
View File
@@ -73,7 +73,7 @@
icon = 'icons/obj/decals.dmi'
icon_state = "backing"
w_class = 3
burn_state = 0 //Burnable, made of wood
burn_state = FLAMMABLE
/obj/item/sign_backing/afterattack(atom/target, mob/user, proximity)
if(!isturf(target))
+1 -1
View File
@@ -86,7 +86,7 @@
icon_state = "wood_frame"
framestack = /obj/item/stack/sheet/mineral/wood
framestackamount = 2
burn_state = 0 //Burnable
burn_state = FLAMMABLE
/obj/structure/table_frame/wood/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/wrench))
+1 -1
View File
@@ -309,7 +309,7 @@
frame = /obj/structure/table_frame/wood
framestack = /obj/item/stack/sheet/mineral/wood
buildstack = /obj/item/stack/sheet/mineral/wood
burn_state = 0 //Burnable
burn_state = FLAMMABLE
burntime = 20
canSmoothWith = list(/obj/structure/table/wood, /obj/structure/table/wood/poker)