Makes burn_state use defines

2026-08-26 06:29:23 +01:00 · 2015-12-13 05:36:55 -06:00
parent 1019b057c5
commit d8a37204e7
87 changed files with 179 additions and 174 deletions
@@ -49,7 +49,7 @@
 /obj/buckle_mob(mob/living/M, force = 0)
 	. = ..()
 	if(.)
-		if(burn_state == 1) //Sets the mob on fire if you buckle them to a burning atom/movableect
+		if(burn_state == FLAMMABLE) //Sets the mob on fire if you buckle them to a burning atom/movableect
 			M.adjust_fire_stacks(1)
 			M.IgniteMob()

@@ -103,7 +103,7 @@ list(name = "- Carbon Dioxide", desc = " This informational poster teaches the v
 	desc = "You probably shouldn't be holding this."
 	icon = 'icons/obj/contraband.dmi'
 	force = 0
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	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/official = 0
@@ -205,7 +205,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
 /obj/item/attack_hand(mob/user)
 	if (!user) return

-	if(burn_state == 1)
+	if(burn_state == FLAMMABLE)
 		var/mob/living/carbon/human/H = user
 		if(istype(H))
 			if(H.gloves && (H.gloves.max_heat_protection_temperature > 360))
@@ -1,7 +1,7 @@
 //copy pasta of the space piano, don't hurt me -Pete
 /obj/item/device/instrument
 	name = "generic instrument"
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	burntime = 20
 	var/datum/song/handheld/song
 	var/instrumentId = "generic"
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/food/containers.dmi'
 	icon_state = "pizzabox1"
 	item_state = "pizzabox"
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	var/timer = 10 //Adjustable timer
 	var/timer_set = 0
 	var/primed = 0
@@ -10,7 +10,7 @@
 	throw_speed = 2
 	throw_range = 2
 	w_class = 1
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /obj/item/stack/spacecash/c10
 	icon_state = "spacecash10"
@@ -7,7 +7,7 @@
 	w_class = 1
 	throw_speed = 3
 	throw_range = 7
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	burntime = 5
 	var/heal_brute = 0
 	var/heal_burn = 0
@@ -118,7 +118,7 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \
 	throw_range = 3
 	origin_tech = "plasmatech=2;materials=2"
 	sheettype = "plasma"
-	burn_state = 0
+	burn_state = FLAMMABLE
 	burntime = 5
 	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)

@@ -115,7 +115,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	icon = 'icons/obj/items.dmi'
 	origin_tech = "materials=1;biotech=1"
 	sheettype = "wood"
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /obj/item/stack/sheet/mineral/wood/New(var/loc, var/amount=null)
 	recipes = wood_recipes
@@ -130,7 +130,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	singular_name = "cloth roll"
 	icon_state = "sheet-cloth"
 	origin_tech = "materials=2"
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /*
 * Cardboard
@@ -153,7 +153,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
 	singular_name = "cardboard sheet"
 	icon_state = "sheet-card"
 	origin_tech = "materials=1"
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /obj/item/stack/sheet/cardboard/New(var/loc, var/amount=null)
 		recipes = cardboard_recipes
@@ -70,7 +70,7 @@
 	icon_state = "tile_grass"
 	origin_tech = "biotech=1"
 	turf_type = /turf/simulated/floor/grass
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE


 //Wood
@@ -81,7 +81,7 @@
 	icon_state = "tile-wood"
 	origin_tech = "biotech=1"
 	turf_type = /turf/simulated/floor/wood
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE


 //Carpets
@@ -91,7 +91,7 @@
 	desc = "A piece of carpet. It is the same size as a floor tile."
 	icon_state = "tile-carpet"
 	turf_type = /turf/simulated/floor/carpet
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE


 /obj/item/stack/tile/fakespace
@@ -100,7 +100,7 @@
 	desc = "A piece of carpet with a convincing star pattern."
 	icon_state = "tile_space"
 	turf_type = /turf/simulated/floor/fakespace
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /obj/item/stack/tile/fakespace/loaded
 	amount = 30
@@ -270,7 +270,7 @@
 	item_state = "arm_blade"
 	attack_verb = list("pricked", "absorbed", "gored")
 	w_class = 2
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE


 /*
@@ -709,7 +709,7 @@


 /obj/item/toy/cards
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	burntime = 5
 	var/parentdeck = null
 	var/deckstyle = "nanotrasen"
@@ -953,8 +953,8 @@
 	newobj.card_throw_speed = sourceobj.card_throw_speed
 	newobj.card_throw_range = sourceobj.card_throw_range
 	newobj.card_attack_verb = sourceobj.card_attack_verb
-	if(sourceobj.burn_state == -1)
-		newobj.burn_state = -1
+	if(sourceobj.burn_state == FIRE_PROOF)
+		newobj.burn_state = FIRE_PROOF

 /obj/item/toy/cards/singlecard
 	name = "card"
@@ -1070,7 +1070,7 @@
 	card_throw_speed = 3
 	card_throw_range = 7
 	card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
-	burn_state = -1 //Not Burnable
+	burn_state = FIRE_PROOF

 /*
 * Fake nuke
@@ -1130,7 +1130,7 @@
 	item_state = "carp_plushie"
 	w_class = 2
 	attack_verb = list("bitten", "eaten", "fin slapped")
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	var/bitesound = 'sound/weapons/bite.ogg'

 //Attack mob
@@ -1220,7 +1220,7 @@
 	icon_state = "toy_mouse"
 	w_class = 2.0
 	var/cooldown = 0
-	burn_state = 0 // Burnable
+	burn_state = FLAMMABLE


 /*
@@ -3,7 +3,7 @@
 	icon = 'icons/obj/janitor.dmi'
 	desc = "This is rubbish."
 	w_class = 1
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /obj/item/trash/raisins
 	name = "\improper 4no raisins"
@@ -40,7 +40,7 @@
 /obj/item/trash/plate
 	name = "plate"
 	icon_state = "plate"
-	burn_state = -1 //Not Burnable
+	burn_state = FIRE_PROOF

 /obj/item/trash/pistachios
 	name = "pistachios pack"
@@ -53,7 +53,7 @@
 /obj/item/trash/tray
 	name = "tray"
 	icon_state = "tray"
-	burn_state = -1 //Not Burnable
+	burn_state = FIRE_PROOF

 /obj/item/trash/candle
 	name = "candle"
@@ -63,7 +63,6 @@
 /obj/item/trash/can
 	name = "crushed can"
 	icon_state = "cola"
-	burn_state = -1 //Not Burnable
-
+	burn_state = FIRE_PROOF
 /obj/item/trash/attack(mob/M, mob/living/user)
 	return
@@ -11,7 +11,7 @@
 	throwforce = 6
 	w_class = 2
 	attack_verb = list("bashed", "battered", "judged", "whacked")
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /obj/item/weapon/gavelhammer/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] has sentenced \himself to death with the [src.name]! It looks like \he's trying to commit suicide.</span>")
@@ -26,7 +26,7 @@
 	force = 2
 	throwforce = 2
 	w_class = 1
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /obj/item/weapon/gavelblock/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/gavelhammer))
@@ -13,7 +13,7 @@
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "giftcrate3"
 	item_state = "gift1"
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /obj/item/weapon/a_gift/New()
 	..()
@@ -88,7 +88,7 @@
 	flags = NOBLUDGEON
 	amount = 25
 	max_amount = 25
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /obj/item/stack/wrapping_paper/attack_self(mob/user)
 	user << "<span class='warning'>You need to use it on a package that has already been wrapped!</span>"
@@ -9,7 +9,7 @@
 	throw_range = 7
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	burntime = 5
 	var/active = 0
 	var/det_time = 50
@@ -11,7 +11,7 @@
 	throw_range = 7
 	w_class = 3
 	attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	var/mopping = 0
 	var/mopcount = 0
 	var/mopcap = 5
@@ -10,7 +10,7 @@
 	item_color = "FFFFFF"
 	item_state = "paintcan"
 	w_class = 3
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	burntime = 5
 	var/paintleft = 10

@@ -9,7 +9,7 @@
 	throw_speed = 3
 	throw_range = 7
 	origin_tech = "bluespace=4"
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /obj/item/weapon/teleportation_scroll/apprentice
 	name = "lesser scroll of teleportation"
@@ -5,7 +5,7 @@
 	force = 5
 	w_class = 4
 	attack_verb = list("bashed","smacked")
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 	var/label = ""
 	var/last_wave = 0
@@ -19,7 +19,7 @@
 	max_w_class = 3
 	max_combined_w_class = 21
 	storage_slots = 21
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	burntime = 20

 /obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W, mob/user, params)
@@ -37,7 +37,7 @@
 	icon_state = "holdingpack"
 	max_w_class = 5
 	max_combined_w_class = 35
-	burn_state = -1 // NotBurnable
+	burn_state = FIRE_PROOF
 	var/pshoom = 'sound/items/PSHOOM.ogg'
 	var/alt_sound = 'sound/items/PSHOOM_2.ogg'

@@ -148,14 +148,14 @@
 	desc = "It's a special backpack made exclusively for Nanotrasen officers."
 	icon_state = "captainpack"
 	item_state = "captainpack"
-	burn_state = -1 //Not Burnable
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/industrial
 	name = "industrial backpack"
 	desc = "It's a tough backpack for the daily grind of station life."
 	icon_state = "engiepack"
 	item_state = "engiepack"
-	burn_state = -1 //Not Burnable
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/botany
 	name = "botany backpack"
@@ -180,7 +180,7 @@
 	desc = "A specially designed backpack. It's fire resistant and smells vaguely of plasma."
 	icon_state = "toxpack"
 	item_state = "toxpack"
-	burn_state = -1 //Not Burnable
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/virology
 	name = "virology backpack"
@@ -197,7 +197,7 @@
 	name = "leather satchel"
 	desc = "It's a very fancy satchel made with fine leather."
 	icon_state = "satchel"
-	burn_state = -1 //Not Burnable
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/satchel/withwallet/New()
 	..()
@@ -213,7 +213,7 @@
 	desc = "A tough satchel with extra pockets."
 	icon_state = "satchel-eng"
 	item_state = "engiepack"
-	burn_state = -1 //Not Burnable
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/satchel_med
 	name = "medical satchel"
@@ -244,7 +244,7 @@
 	desc = "Useful for holding research materials."
 	icon_state = "satchel-tox"
 	item_state = "satchel-tox"
-	burn_state = -1 //Not Burnable
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/satchel_hyd
 	name = "botanist satchel"
@@ -263,7 +263,7 @@
 	desc = "An exclusive satchel for Nanotrasen officers."
 	icon_state = "satchel-cap"
 	item_state = "captainpack"
-	burn_state = -1 //Not Burnable
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/satchel_flat
 	name = "smuggler's satchel"
@@ -361,7 +361,7 @@
 	desc = "A large dufflebag for holding extra captainly goods."
 	icon_state = "duffle-captain"
 	item_state = "duffle-captain"
-	burn_state = -1 //Not Burnable
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/dufflebag/med
 	name = "medical dufflebag"
@@ -380,7 +380,7 @@
 	desc = "A large dufflebag for holding extra tools and supplies."
 	icon_state = "duffle-eng"
 	item_state = "duffle-eng"
-	burn_state = -1 //Not Burnable
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/dufflebag/clown
 	name = "clown's dufflebag"
@@ -111,7 +111,7 @@
 	max_w_class = 3
 	w_class = 1
 	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/weapon/grown)
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 ////////

@@ -289,7 +289,7 @@
 	max_w_class = 3
 	w_class = 4 //Bigger than a book because physics
 	can_hold = list(/obj/item/weapon/book, /obj/item/weapon/storage/book, /obj/item/weapon/spellbook)
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /*
 * Trays - Agouri
@@ -359,7 +359,7 @@
 	w_class = 1
 	preposition = "in"
 	can_hold = list(/obj/item/weapon/reagent_containers/pill, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle)
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /*
 *  Biowaste bag (mostly for xenobiologists)
@@ -375,4 +375,4 @@
 	w_class = 1
 	preposition = "in"
 	can_hold = list(/obj/item/slime_extract, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/blood, /obj/item/weapon/reagent_containers/hypospray/medipen, /obj/item/trash/deadmouse)
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
@@ -6,7 +6,7 @@
 	throw_speed = 2
 	throw_range = 5
 	w_class = 3
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	var/title = "book"
 /obj/item/weapon/storage/book/attack_self(mob/user)
 		user << "<span class='notice'>The pages of [title] have been cut out!</span>"
@@ -24,7 +24,7 @@
 	desc = "It's just an ordinary box."
 	icon_state = "box"
 	item_state = "syringe_kit"
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	var/foldable = /obj/item/stack/sheet/cardboard


@@ -11,7 +11,7 @@
 	max_w_class = 3
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	burntime = 20

 /obj/item/weapon/storage/briefcase/New()
@@ -17,7 +17,7 @@
 	icon = 'icons/obj/food/containers.dmi'
 	icon_state = "donutbox6"
 	name = "donut box"
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	var/icon_type = "donut"
 	var/spawn_type = null

@@ -4,7 +4,7 @@
 	storage_slots = 4
 	icon_state = "wallet"
 	w_class = 2
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE
 	can_hold = list(
 		/obj/item/stack/spacecash,
 		/obj/item/weapon/card,
@@ -79,7 +79,7 @@
 	return front_id

 /obj/item/weapon/storage/wallet/GetAccess()
-	if(combined_access.len) 
+	if(combined_access.len)
 		return combined_access
 	else
 		return ..()
@@ -240,14 +240,14 @@
 	w_class = 2
 	flags = NOSHIELD
 	attack_verb = list("bludgeoned", "whacked", "disciplined")
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /obj/item/weapon/staff/broom
 	name = "broom"
 	desc = "Used for sweeping, and flying into the night while cackling. Black cat not included."
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "broom"
-	burn_state = 0 //Burnable
+	burn_state = FLAMMABLE

 /obj/item/weapon/staff/stick
 	name = "stick"
@@ -9,7 +9,7 @@
 	var/damtype = "brute"
 	var/force = 0

-	var/burn_state = -1 // -1=fireproof | 0=will burn in fires | 1=currently on fire
+	var/burn_state = FIRE_PROOF // LAVA_PROOF | FIRE_PROOF | FLAMMABLE | ON_FIRE
 	var/burntime = 10 //How long it takes to burn to ashes, in seconds
 	var/burn_world_time //What world time the object will burn up completely

@@ -165,7 +165,7 @@

 /obj/fire_act(global_overlay=1)
 	if(!burn_state)
-		burn_state = 1
+		burn_state = ON_FIRE
 		SSobj.burning += src
 		burn_world_time = world.time + burntime*rand(10,20)
 		if(global_overlay)
@@ -180,8 +180,8 @@
 	qdel(src)

 /obj/proc/extinguish()
-	if(burn_state == 1)
-		burn_state = 0
+	if(burn_state == ON_FIRE)
+		burn_state = FLAMMABLE
 		overlays -= fire_overlay
 		SSobj.burning -= src

@@ -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
@@ -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()
@@ -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)
@@ -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))
@@ -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))
@@ -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)