though-our-bodies-be-ravaged

code/game/objects/items/flag.dm

@@ -6,13 +6,13 @@
 	lefthand_file = 'icons/mob/inhands/flags_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/flags_righthand.dmi'
 	w_class = WEIGHT_CLASS_BULKY
-	burntime = 20
-	burn_state = FLAMMABLE
+	max_integrity = 40
+	resistance_flags = FLAMMABLE
 	var/rolled = FALSE
 
 /obj/item/flag/attackby(obj/item/W, mob/user, params)
 	..()
-	if(is_hot(W) && burn_state != ON_FIRE)
+	if(is_hot(W) && !(resistance_flags & ON_FIRE))
 		user.visible_message("<span class='notice'>[user] lights [src] with [W].</span>", "<span class='notice'>You light [src] with [W].</span>", "<span class='warning'>You hear a low whoosh.</span>")
 		fire_act()
 
@@ -35,11 +35,11 @@
 	item_state = icon_state
 	if(rolled)
 		icon_state = "[icon_state]_rolled"
-	if(burn_state == ON_FIRE)
+	if(resistance_flags & ON_FIRE)
 		item_state = "[item_state]_fire"
-	if(burn_state == ON_FIRE && rolled)
+	if((resistance_flags & ON_FIRE) && rolled)
 		overlays += image('icons/obj/flag.dmi', src , "fire_rolled")
-	else if(burn_state == ON_FIRE && !rolled)
+	else if((resistance_flags & ON_FIRE) && !rolled)
 		overlays += image('icons/obj/flag.dmi', src , "fire")
 	if(ismob(loc))
 		var/mob/M = loc
@@ -254,7 +254,7 @@
 		..()
 
 /obj/item/flag/chameleon/attackby(obj/item/W, mob/user, params)
-	if(is_hot(W) && burn_state != ON_FIRE && boobytrap && trapper)
+	if(is_hot(W) && !(resistance_flags & ON_FIRE) && boobytrap && trapper)
 		var/turf/bombturf = get_turf(src)
 		var/area/A = get_area(bombturf)
 		message_admins("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a>.")

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -193,7 +193,7 @@
 	icon_state = "tile_space"
 	turf_type = /turf/simulated/floor/carpet/arcade
 	merge_type = /obj/item/stack/tile/arcade_carpet
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/stack/tile/arcade_carpet/loaded
 	amount = 20

code/game/objects/items/toys.dm

@@ -795,7 +795,7 @@ obj/item/toy/cards/deck/syndicate/black
 	item_state = "egg4"
 	w_class = WEIGHT_CLASS_TINY
 	var/cooldown = 0
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/toy/therapy/New()
 	if(item_color)

code/game/objects/items/weapons/grenades/grenade.dm

@@ -10,7 +10,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	resistance_flags = FLAMMABLE
-	burntime = 5
+	max_integrity = 40
 	var/active = 0
 	var/det_time = 50
 	var/display_timer = 1

code/game/objects/items/weapons/storage/backpack.dm

@@ -16,7 +16,7 @@
 	max_combined_w_class = 21
 	storage_slots = 21
 	resistance_flags = NONE
-	burntime = 20
+	max_integrity = 300
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/back.dmi',
 		"Vox Armalis" = 'icons/mob/species/armalis/back.dmi',
@@ -152,7 +152,7 @@
 	desc = "It's a special backpack made exclusively for Nanotrasen officers."
 	icon_state = "captainpack"
 	item_state = "captainpack"
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 
 /obj/item/storage/backpack/industrial
 	name = "industrial backpack"
@@ -190,7 +190,7 @@
 	desc = "A specially designed backpack. It's fire resistant and smells vaguely of plasma."
 	icon_state = "toxpack"
 	item_state = "toxpack"
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 
 /obj/item/storage/backpack/virology
 	name = "virology backpack"
@@ -274,7 +274,7 @@
 	name = "scientist satchel"
 	desc = "Useful for holding research materials."
 	icon_state = "satchel-tox"
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 
 /obj/item/storage/backpack/satchel_sec
 	name = "security satchel"
@@ -290,7 +290,7 @@
 	name = "captain's satchel"
 	desc = "An exclusive satchel for Nanotrasen officers."
 	icon_state = "satchel-cap"
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 
 /obj/item/storage/backpack/satchel_flat
 	name = "smuggler's satchel"
@@ -468,7 +468,7 @@
 	desc = "A duffelbag designed to hold large quantities of condoms."
 	icon_state = "duffel-captain"
 	item_state = "duffel-captain"
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 
 /obj/item/storage/backpack/duffel/security
 	name = "security duffelbag"
@@ -518,7 +518,7 @@
 	desc = "A duffelbag designed to hold tools. This one is specially designed for atmospherics."
 	icon_state = "duffel-atmos"
 	item_state = "duffel-atmos"
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 
 /obj/item/storage/backpack/duffel/hydro
 	name = "hydroponics duffelbag"

code/game/objects/items/weapons/storage/bible.dm

@@ -5,7 +5,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = WEIGHT_CLASS_NORMAL
-	burn_state = FLAMMABLE
+	resistance_flags = FIRE_PROOF
 	var/mob/affecting = null
 	var/deity_name = "Christ"
 

code/game/objects/items/weapons/storage/briefcase.dm

@@ -13,7 +13,7 @@
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
 	resistance_flags = FLAMMABLE
-	burntime = 20
+	max_integrity = 150
 
 /obj/item/storage/briefcase/sniperbundle
 	desc = "Its label reads \"genuine hardened Captain leather\", but suspiciously has no other tags or branding. Smells like L'Air du Temps."