Merge pull request #20726 from phil235/PreliminaryDamageRefactor

Some preliminary changes before the damage refactor PR.
2026-08-29 08:08:49 +01:00 · 2016-09-29 10:07:51 -04:00
parent 7ce4f1293d 4c05d432a1
commit dafccd0f1a
205 changed files with 589 additions and 602 deletions
@@ -61,7 +61,7 @@
 /obj/buckle_mob(mob/living/M, force = 0)
 	. = ..()
 	if(.)
-		if(burn_state == ON_FIRE) //Sets the mob on fire if you buckle them to a burning atom/movableect
+		if(resistance_flags & ON_FIRE) //Sets the mob on fire if you buckle them to a burning atom/movableect
 			M.adjust_fire_stacks(1)
 			M.IgniteMob()

@@ -15,7 +15,7 @@
 	density = 0
 	opacity = 0
 	anchored = 1
-	unacidable = 1
+	resistance_flags = FIRE_PROOF | UNACIDABLE
 	var/atom/target
 	var/ticks = 0
 	var/target_strength = 0
@@ -4,7 +4,6 @@
 	name = "anomaly"
 	desc = "A mysterious anomaly, seen commonly only in the region of space that the station orbits..."
 	icon_state = "bhole3"
-	unacidable = 1
 	density = 0
 	anchored = 1
 	luminosity = 3
@@ -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 = FLAMMABLE
+	resistance_flags = 0
 	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
@@ -9,7 +9,6 @@ would spawn and follow the beaker, even if it is carried or thrown.
 /obj/effect/particle_effect
 	name = "particle effect"
 	mouse_opacity = 0
-	unacidable = 1//So effects are not targeted by alien acid.
 	pass_flags = PASSTABLE | PASSGRILLE

 /obj/effect/particle_effect/New()
@@ -173,7 +173,7 @@
 	density = 1
 	opacity = 1 	// changed in New()
 	anchored = 1
-	unacidable = 1
+	resistance_flags = FIRE_PROOF | ACID_PROOF
 	name = "foamed metal"
 	desc = "A lightweight foamed metal wall."
 	gender = PLURAL
@@ -4,4 +4,6 @@

 /obj/effect
 	icon = 'icons/effects/effects.dmi'
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE
+

@@ -5,7 +5,6 @@
 	anchored = 1
 	opacity = 0
 	density = 1
-	unacidable = 1

 /obj/effect/forcefield/CanAtmosPass(turf/T)
 	return !density
@@ -3,7 +3,6 @@
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "x2"
 	anchored = 1
-	unacidable = 1
 	invisibility = INVISIBILITY_ABSTRACT

 /obj/effect/landmark/New()
@@ -2,7 +2,6 @@
 	name = "manifest"
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "x"
-	unacidable = 1//Just to be sure.

 /obj/effect/manifest/New()
 	src.invisibility = INVISIBILITY_ABSTRACT
@@ -9,7 +9,6 @@

 /obj/effect/beam
 	name = "beam"
-	unacidable = 1//Just to be sure.
 	var/def_zone
 	pass_flags = PASSTABLE

@@ -1,6 +1,5 @@
 /obj/effect/overlay
 	name = "overlay"
-	unacidable = 1
 	var/i_attached//Added for possible image attachments to objects. For hallucinations and the like.

 /obj/effect/overlay/singularity_act()
@@ -23,7 +22,7 @@
 	icon_state = "nothing"
 	anchored = 1
 	layer = ABOVE_MOB_LAYER
-	burn_state = LAVA_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE
 	mouse_opacity = 0
 	var/duration = 10 //in deciseconds
 	var/randomdir = TRUE
@@ -5,7 +5,6 @@
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "portal"
 	density = 1
-	unacidable = 1//Can't destroy energy portals.
 	var/obj/item/target = null
 	var/creator = null
 	anchored = 1
@@ -47,7 +47,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
 	var/permeability_coefficient = 1 // for chemicals/diseases
 	var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit)
 	var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up
-	var/list/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 	var/armour_penetration = 0 //percentage of armour effectiveness to remove
 	var/list/allowed = null //suit storage stuff.
 	var/obj/item/device/uplink/hidden_uplink = null
@@ -220,7 +219,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
 	if(anchored)
 		return

-	if(burn_state == ON_FIRE)
+	if(resistance_flags & ON_FIRE)
 		var/mob/living/carbon/human/H = user
 		if(istype(H))
 			if(H.gloves && (H.gloves.max_heat_protection_temperature > 360))
@@ -504,7 +503,7 @@ obj/item/proc/item_action_slot_check(slot, mob/user)

 /obj/item/acid_act(acidpwr, acid_volume)
 	. = 1
-	if(unacidable)
+	if(resistance_flags & UNACIDABLE)
 		return

 	var/meltingpwr = acid_volume*acidpwr
@@ -5,7 +5,7 @@
 	icon = 'icons/obj/cardboard_cutout.dmi'
 	icon_state = "cutout_basic"
 	w_class = 4
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	// Possible restyles for the cutout;
 	// add an entry in change_appearance() if you add to here
 	var/list/possible_appearances = list("Assistant", "Clown", "Mime",
@@ -1,7 +1,7 @@
 //copy pasta of the space piano, don't hurt me -Pete
 /obj/item/device/instrument
 	name = "generic instrument"
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 20
 	var/datum/song/handheld/song
 	var/instrumentId = "generic"
@@ -197,7 +197,7 @@
 	name = "mining cyborg lavaproof tracks"
 	desc = "An upgrade kit to apply specialized coolant systems and insulation layers to mining cyborg tracks, enabling them to withstand exposure to molten rock."
 	icon_state = "ash_plating"
-	burn_state = LAVA_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF
 	require_module = 1
 	module_type = /obj/item/weapon/robot_module/miner
 	origin_tech = "engineering=4;materials=4;plasmatech=4"
@@ -10,7 +10,7 @@
 	throw_speed = 2
 	throw_range = 2
 	w_class = 1
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	var/value = 1

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

@@ -146,7 +146,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 = FLAMMABLE
+	resistance_flags = 0

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

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

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


 //Wood
@@ -90,7 +90,7 @@
 	icon_state = "tile-wood"
 	origin_tech = "biotech=1"
 	turf_type = /turf/open/floor/wood
-	burn_state = FLAMMABLE
+	resistance_flags = 0


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


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

 /obj/item/stack/tile/fakespace/loaded
 	amount = 30
@@ -12,7 +12,7 @@
 	flags = NOBLUDGEON
 	amount = 25
 	max_amount = 25
-	burn_state = FLAMMABLE
+	resistance_flags = 0

 /obj/item/stack/wrapping_paper/Destroy()
 	if(!amount)
@@ -32,7 +32,7 @@
 	flags = NOBLUDGEON
 	amount = 25
 	max_amount = 25
-	burn_state = FLAMMABLE
+	resistance_flags = 0

 /obj/item/proc/can_be_package_wrapped() //can the item be wrapped with package wrapper into a delivery package
 	return 1
@@ -277,7 +277,7 @@
 	item_state = "arm_blade"
 	attack_verb = list("pricked", "absorbed", "gored")
 	w_class = 2
-	burn_state = FLAMMABLE
+	resistance_flags = 0


 /*
@@ -638,7 +638,7 @@


 /obj/item/toy/cards
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 5
 	var/parentdeck = null
 	var/deckstyle = "nanotrasen"
@@ -873,8 +873,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 == FIRE_PROOF)
-		newobj.burn_state = FIRE_PROOF
+	if(sourceobj.resistance_flags & FIRE_PROOF)
+		newobj.resistance_flags |= FIRE_PROOF

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

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

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


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

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

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

 /obj/item/trash/candle
 	name = "candle"
@@ -63,7 +63,7 @@
 /obj/item/trash/can
 	name = "crushed can"
 	icon_state = "cola"
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF

 /obj/item/trash/attack(mob/M, mob/living/user)
 	return
@@ -152,7 +152,6 @@
 	icon_state = "chronofield"
 	density = 0
 	anchored = 1
-	unacidable = 1
 	blend_mode = BLEND_MULTIPLY
 	var/mob/living/captured = null
 	var/obj/item/weapon/gun/energy/chrono_gun/gun = null
@@ -11,7 +11,7 @@
 	throwforce = 6
 	w_class = 2
 	attack_verb = list("bashed", "battered", "judged", "whacked")
-	burn_state = FLAMMABLE
+	resistance_flags = 0

 /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 = FLAMMABLE
+	resistance_flags = 0

 /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 = "giftdeliverypackage3"
 	item_state = "gift1"
-	burn_state = FLAMMABLE
+	resistance_flags = 0

 /obj/item/weapon/a_gift/New()
 	..()
@@ -9,7 +9,7 @@
 	throw_range = 7
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 5
 	var/active = 0
 	var/det_time = 50
@@ -118,6 +118,7 @@
 	icon = 'icons/effects/effects.dmi'
 	anchored = 1
 	var/holo_integrity = 1
+	armor = list(melee = 0, bullet = 50, laser = 50, energy = 50, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
 	var/obj/item/weapon/holosign_creator/projector

 /obj/effect/overlay/holograph/New(loc, source_projector)
@@ -9,7 +9,7 @@
 	throw_range = 7
 	w_class = 3
 	attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	var/mopping = 0
 	var/mopcount = 0
 	var/mopcap = 5
@@ -10,7 +10,7 @@
 	item_color = "FFFFFF"
 	item_state = "paintcan"
 	w_class = 3
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 5
 	var/paintleft = 10

@@ -9,7 +9,7 @@
 	throw_speed = 3
 	throw_range = 7
 	origin_tech = "bluespace=6"
-	burn_state = FLAMMABLE
+	resistance_flags = 0

 /obj/item/weapon/teleportation_scroll/apprentice
 	name = "lesser scroll of teleportation"
@@ -48,7 +48,7 @@
 	item_state = "buckler"
 	materials = list()
 	origin_tech = "materials=1;combat=3;biotech=2"
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	block_chance = 30

 /obj/item/weapon/shield/energy
@@ -5,7 +5,7 @@
 	force = 5
 	w_class = 4
 	attack_verb = list("bashed","smacked")
-	burn_state = FLAMMABLE
+	resistance_flags = 0

 	var/label = ""
 	var/last_wave = 0
@@ -19,7 +19,7 @@
 	max_w_class = 3
 	max_combined_w_class = 21
 	storage_slots = 21
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	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 = 6
 	max_combined_w_class = 35
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 	var/pshoom = 'sound/items/PSHOOM.ogg'
 	var/alt_sound = 'sound/items/PSHOOM_2.ogg'

@@ -141,14 +141,14 @@
 	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/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 = FIRE_PROOF
+	resistance_flags = FIRE_PROOF

 /obj/item/weapon/storage/backpack/botany
 	name = "botany backpack"
@@ -173,7 +173,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/weapon/storage/backpack/virology
 	name = "virology backpack"
@@ -196,7 +196,7 @@
 	name = "leather satchel"
 	desc = "It's a very fancy satchel made with fine leather."
 	icon_state = "satchel"
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF

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

 /obj/item/weapon/storage/backpack/satchel/med
 	name = "medical satchel"
@@ -238,7 +238,7 @@
 	desc = "Useful for holding research materials."
 	icon_state = "satchel-tox"
 	item_state = "satchel-tox"
-	burn_state = FIRE_PROOF
+	resistance_flags = 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 = FIRE_PROOF
+	resistance_flags = FIRE_PROOF

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

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

 /obj/item/weapon/storage/backpack/dufflebag/drone
 	name = "drone dufflebag"
 	desc = "A large dufflebag for holding tools and hats."
 	icon_state = "duffle-drone"
 	item_state = "duffle-drone"
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF

 /obj/item/weapon/storage/backpack/dufflebag/drone/New()
 	..()
@@ -113,7 +113,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 = FLAMMABLE
+	resistance_flags = 0

 ////////

@@ -294,7 +294,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 = FLAMMABLE
+	resistance_flags = 0

 /*
 * Trays - Agouri
@@ -364,7 +364,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 = FLAMMABLE
+	resistance_flags = 0

 /*
 *  Biowaste bag (mostly for xenobiologists)
@@ -380,4 +380,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 = FLAMMABLE
+	resistance_flags = 0
@@ -6,7 +6,7 @@
 	throw_speed = 2
 	throw_range = 5
 	w_class = 3
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	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>"
@@ -25,7 +25,7 @@
 	desc = "It's just an ordinary box."
 	icon_state = "box"
 	item_state = "syringe_kit"
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	var/foldable = /obj/item/stack/sheet/cardboard


@@ -634,7 +634,7 @@
 	desc = "A sack neatly crafted out of paper."
 	icon_state = "paperbag_None"
 	item_state = "paperbag_None"
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	foldable = null
 	var/design = NODESIGN

@@ -11,7 +11,7 @@
 	max_w_class = 3
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 20
 	var/folder_path = /obj/item/weapon/folder //this is the path of the folder that gets spawned in New()

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

 /obj/item/weapon/storage/briefcase/sniperbundle/New()
@@ -17,7 +17,7 @@
 	icon = 'icons/obj/food/containers.dmi'
 	icon_state = "donutbox6"
 	name = "donut box"
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	var/icon_type = "donut"
 	var/spawn_type = null
 	var/fancy_open = FALSE
@@ -4,7 +4,7 @@
 	storage_slots = 4
 	icon_state = "wallet"
 	w_class = 2
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	can_hold = list(
 		/obj/item/stack/spacecash,
 		/obj/item/weapon/card,
@@ -393,14 +393,14 @@ var/highlander_claymores = 0
 	w_class = 2
 	armour_penetration = 100
 	attack_verb = list("bludgeoned", "whacked", "disciplined")
-	burn_state = FLAMMABLE
+	resistance_flags = 0

 /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 = FLAMMABLE
+	resistance_flags = 0

 /obj/item/weapon/staff/stick
 	name = "stick"
@@ -2,7 +2,6 @@
 	languages_spoken = HUMAN
 	languages_understood = HUMAN
 	var/crit_fail = 0
-	var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj.
 	animate_movement = 2
 	var/throwforce = 0
 	var/in_use = 0 // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
@@ -10,7 +9,9 @@
 	var/damtype = "brute"
 	var/force = 0

-	var/burn_state = FIRE_PROOF // LAVA_PROOF | FIRE_PROOF | FLAMMABLE | ON_FIRE
+	var/list/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
+	var/resistance_flags = FIRE_PROOF // INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ON_FIRE | UNACIDABLE | ACID_PROOF
+
 	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
 	var/being_shocked = 0
@@ -189,8 +190,8 @@
 	return T.storage_contents_dump_act(src_object, user)

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

 /obj/proc/extinguish()
-	if(burn_state == ON_FIRE)
-		burn_state = FLAMMABLE
+	if(resistance_flags & ON_FIRE)
+		resistance_flags &= ~ON_FIRE
 		overlays -= fire_overlay
 		SSobj.burning -= src

@@ -9,7 +9,7 @@
 	icon = 'icons/obj/artstuff.dmi'
 	icon_state = "easel"
 	density = 1
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 15
 	var/obj/item/weapon/canvas/painting = null

@@ -51,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"
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	var/whichGlobalBackup = 1 //List index

 /obj/item/weapon/canvas/nineteenXnineteen
@@ -15,7 +15,7 @@
 	anchored = 1
 	can_buckle = 1
 	buckle_lying = 1
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 30
 	var/buildstacktype = /obj/item/stack/sheet/metal
 	var/buildstackamount = 2
@@ -61,7 +61,7 @@
 	icon = 'icons/obj/rollerbed.dmi'
 	icon_state = "down"
 	anchored = 0
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 	var/foldabletype = /obj/item/roller

 /obj/structure/bed/roller/MouseDrop(over_object, src_location, over_location)
@@ -6,7 +6,7 @@
 	anchored = 1
 	can_buckle = 1
 	buckle_lying = 0 //you sit in a chair, not lay
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 	var/buildstacktype = /obj/item/stack/sheet/metal
 	var/buildstackamount = 1
 	var/item_chair = /obj/item/chair // if null it can't be picked up
@@ -118,7 +118,7 @@
 	icon_state = "wooden_chair"
 	name = "wooden chair"
 	desc = "Old is never too old to not be in fashion."
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 20
 	buildstacktype = /obj/item/stack/sheet/mineral/wood
 	buildstackamount = 3
@@ -139,7 +139,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 = FLAMMABLE
+	resistance_flags = 0
 	burntime = 30
 	buildstackamount = 2
 	var/image/armrest = null
@@ -308,7 +308,7 @@
 	name = "wooden chair"
 	icon_state = "wooden_chair_toppled"
 	item_state = "woodenchair"
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 20
 	hitsound = 'sound/weapons/genhit1.ogg'
 	origin_type = /obj/structure/chair/wood
@@ -17,7 +17,7 @@ LINEN BINS
 	throw_range = 2
 	w_class = 1
 	item_color = "white"
-	burn_state = FLAMMABLE
+	resistance_flags = 0

 	dog_fashion = /datum/dog_fashion/head/ghost

@@ -205,7 +205,7 @@ LINEN BINS
 	icon = 'icons/obj/structures.dmi'
 	icon_state = "linenbin-full"
 	anchored = 1
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 20
 	var/amount = 10
 	var/list/sheets = list()
@@ -4,7 +4,7 @@
 	icon_state = "cardboard"
 	health = 10
 	mob_storage_capacity = 1
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 20
 	can_weld_shut = 0
 	cutting_tool = /obj/item/weapon/wirecutters
@@ -61,7 +61,7 @@
 	icon_state = "metalbox"
 	health = 500
 	mob_storage_capacity = 5
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 	move_speed_multiplier = 2
 	cutting_tool = /obj/item/weapon/weldingtool
 	open_sound = 'sound/machines/click.ogg'
@@ -2,7 +2,7 @@
 	name = "cabinet"
 	desc = "Old will forever be in fashion."
 	icon_state = "cabinet"
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 20

 /obj/structure/closet/acloset
@@ -72,7 +72,7 @@
 		new /obj/item/weapon/storage/box/flashbangs(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/head/helmet/thunderdome(src)
-	
+
 /obj/structure/closet/thunderdome/tdgreen
 	name = "green-team Thunderdome closet"
 	icon_door = "green"
@@ -91,7 +91,7 @@
 		new /obj/item/weapon/storage/box/flashbangs(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/head/helmet/thunderdome(src)
-	
+
 /obj/structure/closet/malf/suits
 	desc = "It's a storage unit for operational gear."
 	icon_state = "syndicate"
@@ -119,7 +119,7 @@
 	name = "coffin"
 	desc = "It's a burial receptacle for the dearly departed."
 	icon_state = "coffin"
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 20

 /obj/structure/closet/wardrobe/red
@@ -2,7 +2,7 @@
 	name = "booze storage"
 	req_access = list(access_bar)
 	icon_state = "cabinet"
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	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 = FLAMMABLE
+	resistance_flags = 0
 	burntime = 20

 /obj/structure/closet/secure_closet/personal/cabinet/New()
@@ -157,7 +157,7 @@
 	name = "\proper detective's cabinet"
 	req_access = list(access_forensics_lockers)
 	icon_state = "cabinet"
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 20

 /obj/structure/closet/secure_closet/detective/New()
@@ -5,7 +5,7 @@
 	desc = "A display case for prized possessions."
 	density = 1
 	anchored = 1
-	unacidable = 1//Dissolving the case would also delete the gun.
+	resistance_flags = FIRE_PROOF | ACID_PROOF
 	var/health = 30
 	var/destroyed = 0
 	var/obj/item/showpiece = null
@@ -6,6 +6,7 @@
 	icon_state = "fireaxe"
 	anchored = 1
 	density = 0
+	armor = list(melee = 50, bullet = 20, laser = 0, energy = 100, bomb = 10, bio = 100, rad = 100, fire = 0, acid = 0)
 	var/locked = 1
 	var/open = 0
 	var/health = 60
@@ -10,7 +10,7 @@
 	density = FALSE
 	anchored = TRUE
 	pixel_x = -16
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 	var/lit = FALSE

 	var/fuel_added = 0
@@ -1,5 +1,5 @@
 /obj/structure/flora
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 30
 	anchored = 1

@@ -290,7 +290,7 @@
 	icon_state = "basalt"
 	desc = "A volcanic rock"
 	icon = 'icons/obj/flora/rocks.dmi'
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 	density = 1

 /obj/structure/flora/rock/New()
@@ -9,6 +9,7 @@
 	pressure_resistance = 5*ONE_ATMOSPHERE
 	layer = BELOW_OBJ_LAYER
 	var/health = 10
+	armor = list(melee = 50, bullet = 70, laser = 70, energy = 100, bomb = 10, bio = 100, rad = 100, fire = 0, acid = 0)
 	var/destroyed = 0
 	var/obj/item/stack/rods/stored

@@ -5,6 +5,7 @@
 	icon_state = "lattice"
 	density = 0
 	anchored = 1
+	armor = list(melee = 100, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
 	layer = LATTICE_LAYER //under pipes
 	var/obj/item/stack/rods/stored
 	canSmoothWith = list(/obj/structure/lattice,
@@ -243,5 +243,5 @@
 	openSound = 'sound/effects/doorcreaky.ogg'
 	closeSound = 'sound/effects/doorcreaky.ogg'
 	sheetType = /obj/item/stack/sheet/mineral/wood
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 30
@@ -87,7 +87,7 @@
 	icon = 'icons/obj/decals.dmi'
 	icon_state = "backing"
 	w_class = 3
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	var/sign_path = /obj/structure/sign/basic //the type of sign that will be created when placed on a turf

 /obj/item/sign_backing/afterattack(atom/target, mob/user, proximity)
@@ -96,7 +96,7 @@
 	icon_state = "wood_frame"
 	framestack = /obj/item/stack/sheet/mineral/wood
 	framestackamount = 2
-	burn_state = FLAMMABLE
+	resistance_flags = 0

 /obj/structure/table_frame/wood/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/stack/sheet/mineral/wood))
@@ -315,7 +315,7 @@
 	frame = /obj/structure/table_frame/wood
 	framestack = /obj/item/stack/sheet/mineral/wood
 	buildstack = /obj/item/stack/sheet/mineral/wood
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 20
 	canSmoothWith = list(/obj/structure/table/wood,
 		/obj/structure/table/wood/poker,
@@ -364,6 +364,7 @@
 	buildstack = /obj/item/stack/sheet/plasteel
 	canSmoothWith = list(/obj/structure/table/reinforced, /obj/structure/table)
 	health = 200
+	armor = list(melee = 10, bullet = 10, laser = 10, energy = 100, bomb = 20, bio = 0, rad = 0, fire = 0, acid = 70)

 /obj/structure/table/reinforced/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/weldingtool))
@@ -434,6 +434,7 @@
 	name = "reinforced window"
 	icon_state = "rwindow"
 	reinf = 1
+	armor = list(melee = 50, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 100, fire = 0, acid = 0)
 	maxhealth = 50
 	explosion_block = 1

@@ -494,6 +495,7 @@
 	wtype = "shuttle"
 	fulltile = 1
 	reinf = 1
+	armor = list(melee = 50, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 100, fire = 0, acid = 0)
 	smooth = SMOOTH_TRUE
 	canSmoothWith = null
 	explosion_block = 1