though-this-world-may-be-broken

code/modules/paperwork/clipboard.dm

@@ -12,7 +12,7 @@
 	var/obj/item/pen/containedpen
 	var/obj/item/toppaper
 	slot_flags = SLOT_BELT
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/clipboard/New()
 	..()

code/modules/paperwork/contract.dm

@@ -55,7 +55,7 @@
 
 /obj/item/paper/contract/infernal
 	var/contractType = 0
-	burn_state = LAVA_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	var/datum/mind/owner
 	icon_state = "evil_contract"
 

code/modules/paperwork/folders.dm

@@ -5,7 +5,7 @@
 	icon_state = "folder"
 	w_class = WEIGHT_CLASS_SMALL
 	pressure_resistance = 2
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/folder/blue
 	desc = "A blue folder."

code/modules/paperwork/paper.dm

@@ -17,8 +17,8 @@
 	pressure_resistance = 0
 	slot_flags = SLOT_HEAD
 	body_parts_covered = HEAD
-	burn_state = FLAMMABLE
-	burntime = 5
+	resistance_flags = FLAMMABLE
+	max_integrity = 50
 	attack_verb = list("bapped")
 	dog_fashion = /datum/dog_fashion/head
 	var/info		//What's actually written on the paper.
@@ -303,7 +303,7 @@
 /obj/item/paper/attackby(obj/item/P, mob/living/user, params)
 	..()
 
-	if(burn_state == ON_FIRE)
+	if(resistance_flags & ON_FIRE)
 		return
 
 	var/clown = 0
@@ -403,7 +403,7 @@
 
 /obj/item/paper/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
 	..()
-	if(burn_state >= FLAMMABLE) //Renders paper that has been lit on fire to be illegible.
+	if(!(resistance_flags & FIRE_PROOF))
 		info = "<i>Heat-curled corners and sooty words offer little insight. Whatever was once written on this page has been rendered illegible through fire.</i>"
 
 /obj/item/paper/proc/stamp(var/obj/item/stamp/S)

code/modules/paperwork/paperbin.dm

@@ -8,7 +8,6 @@
 	throw_speed = 3
 	throw_range = 7
 	pressure_resistance = 8
-	burn_state = FLAMMABLE
 	var/amount = 30					//How much paper is in the bin.
 	var/list/papers = list()	//List of papers put in the bin for reference.
 

code/modules/paperwork/paperplane.dm

@@ -8,8 +8,8 @@
 	throw_speed = 1
 	throwforce = 0
 	w_class = WEIGHT_CLASS_TINY
-	burn_state = FLAMMABLE
-	burntime = 5
+	resistance_flags = FLAMMABLE
+	max_integrity = 50
 	no_spin = TRUE
 
 	var/obj/item/paper/internal_paper

code/modules/paperwork/photography.dm

@@ -16,7 +16,7 @@
 	icon_state = "film"
 	item_state = "electropack"
 	w_class = WEIGHT_CLASS_TINY
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 
 /********
@@ -28,8 +28,8 @@
 	icon_state = "photo"
 	item_state = "paper"
 	w_class = WEIGHT_CLASS_SMALL
-	burn_state = FLAMMABLE
-	burntime = 5
+	resistance_flags = FLAMMABLE
+	max_integrity = 50
 	var/blueprints = 0 // Does this have the blueprints?
 	var/icon/img	//Big photo image
 	var/scribble	//Scribble on the back.
@@ -111,7 +111,7 @@
 	icon_state = "album"
 	item_state = "briefcase"
 	can_hold = list(/obj/item/photo)
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/storage/photo_album/MouseDrop(obj/over_object as obj)