Merge pull request #12245 from Fox-McCloud/universal-damage

Universal Object Damage

code/game/objects/items/ashtray.dm

@@ -1,133 +1,94 @@
 /obj/item/ashtray
 	icon = 'icons/ashtray.dmi'
-	var/
-		max_butts 	= 0
-		empty_desc 	= ""
-		icon_empty 	= ""
-		icon_half  	= ""
-		icon_full  	= ""
-		icon_broken	= ""
+	var/max_butts = 0
+	var/icon_half = ""
+	var/icon_full = ""
 
-/obj/item/ashtray/New()
-	..()
-	src.pixel_y = rand(-5, 5)
-	src.pixel_x = rand(-6, 6)
-	return
+/obj/item/ashtray/Initialize(mapload)
+	. = ..()
+	pixel_y = rand(-5, 5)
+	pixel_x = rand(-6, 6)
 
-/obj/item/ashtray/attackby(obj/item/W as obj, mob/user as mob, params)
-	if(health < 1)
-		return
-	if(istype(W,/obj/item/cigbutt) || istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/match))
+/obj/item/ashtray/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/cigbutt) || istype(I, /obj/item/clothing/mask/cigarette) || istype(I, /obj/item/match))
 		if(contents.len >= max_butts)
 			to_chat(user, "This ashtray is full.")
 			return
-		user.unEquip(W)
-		W.loc = src
+		if(!user.unEquip(I))
+			return
+		I.forceMove(src)
 
-		if(istype(W,/obj/item/clothing/mask/cigarette))
-			var/obj/item/clothing/mask/cigarette/cig = W
+		if(istype(I, /obj/item/clothing/mask/cigarette))
+			var/obj/item/clothing/mask/cigarette/cig = I
 			if(cig.lit == 1)
-				src.visible_message("[user] crushes [cig] in [src], putting it out.")
+				visible_message("[user] crushes [cig] in [src], putting it out.")
 				var/obj/item/butt = new cig.type_butt(src)
 				cig.transfer_fingerprints_to(butt)
 				qdel(cig)
 			else if(cig.lit == 0)
 				to_chat(user, "You place [cig] in [src] without even smoking it. Why would you do that?")
 
-		src.visible_message("[user] places [W] in [src].")
-		user.update_inv_l_hand()
-		user.update_inv_r_hand()
+		visible_message("[user] places [I] in [src].")
 		add_fingerprint(user)
-		if(contents.len == max_butts)
-			icon_state = icon_full
-			desc = empty_desc + " It's stuffed full."
-		else if(contents.len > max_butts/2)
-			icon_state = icon_half
-			desc = empty_desc + " It's half-filled."
+		update_icon()
 	else
-		health = max(0,health - W.force)
-		to_chat(user, "You hit [src] with [W].")
-		if(health < 1)
-			die()
-	return
+		return ..()
+
+/obj/item/ashtray/update_icon()
+	if(contents.len == max_butts)
+		icon_state = icon_full
+		desc = initial(desc) + " It's stuffed full."
+	if(contents.len > max_butts * 0.5)
+		icon_state = icon_half
+		desc = initial(desc) + " It's half-filled."
+	else
+		icon_state = initial(icon_state)
+		desc = initial(desc)
+
+/obj/item/ashtray/deconstruct()
+	empty_tray()
+	qdel(src)
+
+/obj/item/ashtray/proc/empty_tray()
+	for(var/obj/item/I in contents)
+		I.forceMove(loc)
+	update_icon()
 
 /obj/item/ashtray/throw_impact(atom/hit_atom)
-	if(health > 0)
-		health = max(0,health - 3)
-		if(health < 1)
-			die()
-			return
-		if(contents.len)
-			src.visible_message("<span class='warning'>[src] slams into [hit_atom] spilling its contents!</span>")
-		for(var/obj/item/clothing/mask/cigarette/O in contents)
-			O.loc = src.loc
-		icon_state = icon_empty
+	if(contents.len)
+		visible_message("<span class='warning'>[src] slams into [hit_atom] spilling its contents!</span>")
+	empty_tray()
 	return ..()
 
-/obj/item/ashtray/proc/die()
-	src.visible_message("<span class='warning'>[src] shatters spilling its contents!</span>")
-	for(var/obj/item/clothing/mask/cigarette/O in contents)
-		O.loc = src.loc
-	icon_state = icon_broken
-
 /obj/item/ashtray/plastic
 	name = "plastic ashtray"
 	desc = "Cheap plastic ashtray."
 	icon_state = "ashtray_bl"
-	icon_empty = "ashtray_bl"
 	icon_half  = "ashtray_half_bl"
 	icon_full  = "ashtray_full_bl"
-	icon_broken  = "ashtray_bork_bl"
-	max_butts = 14
-	health = 24.0
+	max_butts = 8
+	max_integrity = 8
 	materials = list(MAT_METAL=30, MAT_GLASS=30)
-	empty_desc = "Cheap plastic ashtray."
-	throwforce = 3.0
-	die()
-		..()
-		name = "pieces of plastic"
-		desc = "Pieces of plastic with ash on them."
-		return
-
+	throwforce = 3
 
 /obj/item/ashtray/bronze
 	name = "bronze ashtray"
 	desc = "Massive bronze ashtray."
 	icon_state = "ashtray_br"
-	icon_empty = "ashtray_br"
 	icon_half  = "ashtray_half_br"
 	icon_full  = "ashtray_full_br"
-	icon_broken  = "ashtray_bork_br"
-	max_butts = 10
-	health = 72.0
+	max_butts = 16
+	max_integrity = 16
 	materials = list(MAT_METAL=80)
-	empty_desc = "Massive bronze ashtray."
-	throwforce = 10.0
-
-	die()
-		..()
-		name = "pieces of bronze"
-		desc = "Pieces of bronze with ash on them."
-		return
-
+	throwforce = 10
 
 /obj/item/ashtray/glass
 	name = "glass ashtray"
 	desc = "Glass ashtray. Looks fragile."
 	icon_state = "ashtray_gl"
-	icon_empty = "ashtray_gl"
 	icon_half  = "ashtray_half_gl"
 	icon_full  = "ashtray_full_gl"
-	icon_broken  = "ashtray_bork_gl"
 	max_butts = 12
-	health = 12.0
+	max_integrity = 12
 	materials = list(MAT_GLASS=60)
-	empty_desc = "Glass ashtray. Looks fragile."
-	throwforce = 6.0
-
-	die()
-		..()
-		name = "shards of glass"
-		desc = "Shards of glass with ash on them."
-		playsound(src, "shatter", 30, 1)
-		return
+	throwforce = 6

code/game/objects/items/blueprints.dm

@@ -92,6 +92,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "blueprints"
 	fluffnotice = "Property of Nanotrasen. For heads of staff only. Store in high-secure storage."
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	w_class = WEIGHT_CLASS_NORMAL
 	var/list/showing = list()
 	var/client/viewing

code/game/objects/items/bodybag.dm

@@ -22,6 +22,7 @@
 	sound = 'sound/items/zip.ogg'
 	var/item_path = /obj/item/bodybag
 	density = 0
+	integrity_failure = 0
 
 
 /obj/structure/closet/body_bag/attackby(W as obj, mob/user as mob, params)
@@ -38,13 +39,13 @@
 			src.overlays += image(src.icon, "bodybag_label")
 		else
 			src.name = "body bag"
-	//..() //Doesn't need to run the parent. Since when can fucking bodybags be welded shut? -Agouri
 		return
-	else if(istype(W, /obj/item/wirecutters))
+	if(istype(W, /obj/item/wirecutters))
 		to_chat(user, "You cut the tag off the bodybag")
 		src.name = "body bag"
 		src.overlays.Cut()
 		return
+	return ..()
 
 
 /obj/structure/closet/body_bag/close()

code/game/objects/items/candle.dm

@@ -32,29 +32,33 @@
 
 
 /obj/item/candle/attackby(obj/item/W, mob/user, params)
-	..()
 	if(istype(W, /obj/item/weldingtool))
 		var/obj/item/weldingtool/WT = W
 		if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool
 			light("<span class='notice'>[user] casually lights [src] with [WT], what a badass.")
-	else if(istype(W, /obj/item/lighter))
+		return
+	if(istype(W, /obj/item/lighter))
 		var/obj/item/lighter/L = W
 		if(L.lit)
 			light("<span class='notice'>After some fiddling, [user] manages to light [src] with [L].</span>")
-	else if(istype(W, /obj/item/match))
+		return
+	if(istype(W, /obj/item/match))
 		var/obj/item/match/M = W
 		if(M.lit)
 			light("<span class='notice'>[user] lights [src] with [M]</span>")
-	else if(istype(W, /obj/item/candle))
+		return
+	if(istype(W, /obj/item/candle))
 		var/obj/item/candle/C = W
 		if(C.lit)
 			light("<span class='notice'>[user] tilts [C] and lights [src] with it.</span>")
+		return
+	return ..()
 
 
 /obj/item/candle/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
-	..()
 	if(!lit)
 		light() //honk
+	return ..()
 
 /obj/item/candle/proc/light(show_message)
 	if(!lit)

code/game/objects/items/cardboard_cutouts.dm

@@ -4,7 +4,7 @@
 	desc = "A vaguely humanoid cardboard cutout. It's completely blank."
 	icon = 'icons/obj/cardboard_cutout.dmi'
 	icon_state = "cutout_basic"
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 	w_class = WEIGHT_CLASS_BULKY
 	var/list/possible_appearances = list("Assistant", "Clown", "Mime",
 		"Traitor", "Nuke Op", "Cultist", "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer",
@@ -63,7 +63,7 @@
 			push_over()
 
 /obj/item/cardboard_cutout/bullet_act(obj/item/projectile/P)
-	visible_message("<span class='danger'>[src] has been hit by [P]!</span>")
+	visible_message("<span class='danger'>[src] is hit by [P]!</span>")
 	playsound(src, 'sound/weapons/slice.ogg', 50, 1)
 	if(prob(P.damage))
 		push_over()

code/game/objects/items/devices/aicard.dm

@@ -104,13 +104,4 @@
 		to_chat(user, "<span class='notice'>You [AI.control_disabled ? "disable" : "enable"] the AI's wireless interface.</span>")
 		update_icon()
 
-	return 1
-
-/obj/item/aicard/ex_act(severity)
-	switch(severity)
-		if(1.0)
-			qdel(src)
-		if(2.0)
-			if(prob(50)) qdel(src)
-		if(3.0)
-			if(prob(25)) qdel(src)
+	return 1

code/game/objects/items/devices/chameleonproj.dm

@@ -112,7 +112,16 @@
 		to_chat(M, "<span class='danger'>Your chameleon-projector deactivates.</span>")
 	master.disrupt()
 
-/obj/effect/dummy/chameleon/ex_act(var/severity) //no longer bomb-proof
+/obj/effect/dummy/chameleon/attack_animal()
+	master.disrupt()
+
+/obj/effect/dummy/chameleon/attack_slime()
+	master.disrupt()
+
+/obj/effect/dummy/chameleon/attack_alien()
+	master.disrupt()
+
+/obj/effect/dummy/chameleon/ex_act(severity) //no longer bomb-proof
 	for(var/mob/M in src)
 		to_chat(M, "<span class='danger'>Your chameleon-projector deactivates.</span>")
 		spawn()

code/game/objects/items/devices/flashlight.dm

@@ -394,5 +394,4 @@
 	on = TRUE
 	anchored = TRUE
 	var/range = null
-	unacidable = TRUE
-	burn_state = LAVA_PROOF
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF

code/game/objects/items/devices/instruments.dm

@@ -4,7 +4,8 @@
 	icon = 'icons/obj/musician.dmi'
 	lefthand_file = 'icons/mob/inhands/equipment/instruments_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/instruments_righthand.dmi'
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
+	max_integrity = 100
 	var/datum/song/handheld/song
 	var/instrumentId = "generic"
 	var/instrumentExt = "mid"
@@ -55,7 +56,7 @@
 	desc = "A golden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
 	icon_state = "golden_violin"
 	item_state = "golden_violin"
-	burn_state = LAVA_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 
 /obj/item/instrument/piano_synth
 	name = "synthesizer"

code/game/objects/items/devices/paicard.dm

@@ -12,6 +12,7 @@
 	var/looking_for_personality = 0
 	var/mob/living/silicon/pai/pai
 	var/list/faction = list("neutral") // The factions the pAI will inherit from the card
+	resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE
 
 /obj/item/paicard/syndicate
 	name = "syndicate personal AI device"
@@ -334,12 +335,6 @@
 		M.emp_act(severity)
 	..()
 
-/obj/item/paicard/ex_act(severity)
-	if(pai)
-		pai.ex_act(severity)
-	else
-		qdel(src)
-
 /obj/item/paicard/extinguish_light()
 	pai.extinguish_light()
-	set_light(0)
+	set_light(0)

code/game/objects/items/documents.dm

@@ -10,6 +10,7 @@
 	throw_speed = 1
 	layer = 4
 	pressure_resistance = 2
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 
 /obj/item/documents/nanotrasen
 	desc = "\"Top Secret\" Nanotrasen documents printed on special copy-protected paper. It is filled with complex diagrams and lists of names, dates and coordinates."

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
@@ -251,16 +251,16 @@
 		boobytrap = null
 		trapper = null
 	else
-		..()
+		return ..()
 
 /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>.")
 		log_game("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).")
 		investigate_log("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB)
-	..()
+	return ..()
 
 /obj/item/flag/chameleon/burn()
 	if(boobytrap)

code/game/objects/items/latexballoon.dm

@@ -40,14 +40,16 @@
 /obj/item/latexballon/ex_act(severity)
 	burst()
 	switch(severity)
-		if(1)
+		if (1)
 			qdel(src)
-		if(2)
-			if(prob(50))
+		if (2)
+			if (prob(50))
 				qdel(src)
 
-/obj/item/latexballon/bullet_act()
-	burst()
+/obj/item/latexballon/bullet_act(obj/item/projectile/P)
+	if(!P.nodamage)
+		burst()
+	return ..()
 
 /obj/item/latexballon/temperature_expose(datum/gas_mixture/air, temperature, volume)
 	..()

code/game/objects/items/mountable_frames/apc_frame.dm

@@ -6,23 +6,26 @@
 	mount_reqs = list("simfloor", "nospace")
 
 /obj/item/mounted/frame/apc_frame/try_build(turf/on_wall, mob/user)
-	if(..())
-		var/turf/turf_loc = get_turf(user)
-		var/area/area_loc = turf_loc.loc
-		if(area_loc.get_apc())
-			to_chat(user, "<span class='warning'>This area already has an APC.</span>")
-			return //only one APC per area
-		for(var/obj/machinery/power/terminal/T in turf_loc)
-			if(T.master)
-				to_chat(user, "<span class='warning'>There is another network terminal here.</span>")
-				return
-			else
-				var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(turf_loc)
-				C.amount = 10
-				to_chat(user, "You cut the cables and disassemble the unused power terminal.")
-				qdel(T)
-		return 1
-	return
+	if(!..())
+		return
+	var/turf/T = get_turf(user)
+	var/area/A = get_area(T)
+	if(A.get_apc())
+		to_chat(user, "<span class='warning'>This area already has an APC!</span>")
+		return //only one APC per area
+	if(!A.requires_power)
+		to_chat(user, "<span class='warning'>You cannot place [src] in this area!</span>")
+		return //can't place apcs in areas with no power requirement
+	for(var/obj/machinery/power/terminal/E in T)
+		if(E.master)
+			to_chat(user, "<span class='warning'>There is another network terminal here!</span>")
+			return
+		else
+			var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(T)
+			C.amount = 10
+			to_chat(user, "<span class='notice'>You cut the cables and disassemble the unused power terminal.</span>")
+			qdel(E)
+	return TRUE
 
 /obj/item/mounted/frame/apc_frame/do_build(turf/on_wall, mob/user)
 	new /obj/machinery/power/apc(get_turf(src), get_dir(user, on_wall), 1)

code/game/objects/items/stacks/medical.dm

@@ -7,6 +7,8 @@
 	w_class = WEIGHT_CLASS_TINY
 	throw_speed = 3
 	throw_range = 7
+	resistance_flags = FLAMMABLE
+	max_integrity = 40
 	var/heal_brute = 0
 	var/heal_burn = 0
 	var/self_delay = 20

code/game/objects/items/stacks/sheets/glass.dm

@@ -28,6 +28,8 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 	singular_name = "glass sheet"
 	icon_state = "sheet-glass"
 	materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100)
+	resistance_flags = ACID_PROOF
 	origin_tech = "materials=1"
 	created_window = /obj/structure/window/basic
 	full_window = /obj/structure/window/full/basic
@@ -87,6 +89,8 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
 	singular_name = "reinforced glass sheet"
 	icon_state = "sheet-rglass"
 	materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100)
+	resistance_flags = ACID_PROOF
 	origin_tech = "materials=2"
 	created_window = /obj/structure/window/reinforced
 	full_window = /obj/structure/window/full/reinforced
@@ -112,6 +116,8 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
 	icon_state = "sheet-plasmaglass"
 	item_state = "sheet-rglass"
 	materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT*2)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 100)
+	resistance_flags = ACID_PROOF
 	origin_tech = "plasmatech=2;materials=2"
 	created_window = /obj/structure/window/plasmabasic
 	full_window = /obj/structure/window/full/plasmabasic
@@ -153,10 +159,11 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
 	icon_state = "sheet-plasmarglass"
 	item_state = "sheet-rglass"
 	materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT*2)
+	armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
+	resistance_flags = ACID_PROOF
 	origin_tech = "plasmatech=2;materials=2"
 	created_window = /obj/structure/window/plasmareinforced
 	full_window = /obj/structure/window/full/plasmareinforced
-	armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0)
 	point_value = 23
 
 /obj/item/stack/sheet/plasmarglass/New(loc, amount)
@@ -174,6 +181,8 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
 	icon_state = "sheet-titaniumglass"
 	item_state = "sheet-rglass"
 	materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
+	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/titaniumglass
 	full_window = /obj/structure/window/full/shuttle
 
@@ -192,6 +201,8 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
 	icon_state = "sheet-plastitaniumglass"
 	item_state = "sheet-rglass"
 	materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_PLASMA=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
+	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/plastitaniumglass
 	full_window = /obj/structure/window/plastitanium
 

code/game/objects/items/stacks/sheets/leather.dm

@@ -133,52 +133,41 @@ var/global/list/datum/stack_recipe/sinew_recipes = list ( \
 	flags = NOBLUDGEON
 	w_class = WEIGHT_CLASS_NORMAL
 	layer = MOB_LAYER
-	var/static/list/can_strengthen_clothing
-
-/obj/item/stack/sheet/animalhide/goliath_hide/Initialize(mapload)
-	. = ..()
-	if(!can_strengthen_clothing)
-		can_strengthen_clothing = typecacheof(list(
+	var/static/list/goliath_platable_armor_typecache = typecacheof(list(
 			/obj/item/clothing/suit/space/hardsuit/mining,
 			/obj/item/clothing/head/helmet/space/hardsuit/mining,
 			/obj/item/clothing/suit/hooded/explorer,
 			/obj/item/clothing/head/hooded/explorer,
-			/obj/item/clothing/head/helmet/space/plasmaman/mining
-		))
+			/obj/item/clothing/head/helmet/space/plasmaman/mining))
 
 /obj/item/stack/sheet/animalhide/goliath_hide/afterattack(atom/target, mob/user, proximity_flag)
-	if(proximity_flag)
-		if(is_type_in_typecache(target, can_strengthen_clothing))
-			var/obj/item/clothing/C = target
-			var/current_armor = C.armor
-			if(current_armor["melee"] < 60)
-				current_armor["melee"] = min(current_armor["melee"] + 10, 60)
-				to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
-				use(1)
+	if(!proximity_flag)
+		return
+	if(is_type_in_typecache(target, goliath_platable_armor_typecache))
+		var/obj/item/clothing/C = target
+		var/list/current_armor = C.armor
+		if(current_armor["melee"] < 60)
+			current_armor["melee"] = min(current_armor["melee"] + 10, 60)
+			to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
+			use(1)
+		else
+			to_chat(user, "<span class='warning'>You can't improve [C] any further!</span>")
+	else if(istype(target, /obj/mecha/working/ripley))
+		var/obj/mecha/working/ripley/D = target
+		if(D.hides < 3)
+			D.hides++
+			D.armor["melee"] = min(D.armor["melee"] + 10, 70)
+			D.armor["bullet"] = min(D.armor["bullet"] + 5, 50)
+			D.armor["laser"] = min(D.armor["laser"] + 5, 50)
+			to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
+			D.update_icon()
+			if(D.hides == 3)
+				D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - its pilot must be an experienced monster hunter."
 			else
-				to_chat(user, "<span class='info'>You can't improve [C] any further.</span>")
-				return
-		if(istype(target, /obj/mecha/working/ripley))
-			var/obj/mecha/D = target
-			if(D.icon_state != "ripley-open")
-				to_chat(user, "<span class='info'>You can't add armour onto the mech while someone is inside!</span>")
-				return
-			var/list/damage_absorption = D.damage_absorption
-			if(damage_absorption["brute"] > 0.3)
-				damage_absorption["brute"] = max(damage_absorption["brute"] - 0.1, 0.3)
-				damage_absorption["bullet"] = damage_absorption["bullet"] - 0.05
-				damage_absorption["fire"] = damage_absorption["fire"] - 0.05
-				damage_absorption["laser"] = damage_absorption["laser"] - 0.025
-				to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
-				use(1)
-				D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-open")
 				D.desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates."
-				if(damage_absorption["brute"] == 0.3)
-					D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-full-open")
-					D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - the pilot must be an experienced monster hunter."
-			else
-				to_chat(user, "<span class='warning'>You can't improve [D] any further!</span>")
-				return
+			use(1)
+		else
+			to_chat(user, "<span class='warning'>You can't improve [D] any further!</span>")
 
 /obj/item/stack/sheet/animalhide/ashdrake
 	name = "ash drake hide"

code/game/objects/items/stacks/sheets/mineral.dm

@@ -208,8 +208,8 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
 	origin_tech = "plasmatech=2;materials=2"
 	sheettype = "plasma"
 	materials = list(MAT_PLASMA=MINERAL_MATERIAL_AMOUNT)
-	burn_state = FLAMMABLE
-	burntime = 5
+	resistance_flags = FLAMMABLE
+	max_integrity = 100
 	point_value = 20
 
 /obj/item/stack/sheet/mineral/plasma/New()

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -104,6 +104,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
 	materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT)
 	throwforce = 10.0
 	flags = CONDUCT
+	resistance_flags = FIRE_PROOF
 	origin_tech = "materials=1"
 	merge_type = /obj/item/stack/sheet/metal
 	point_value = 2
@@ -149,6 +150,8 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list(
 	icon_state = "sheet-plasteel"
 	item_state = "sheet-metal"
 	materials = list(MAT_METAL=2000, MAT_PLASMA=2000)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80)
+	resistance_flags = FIRE_PROOF
 	throwforce = 10.0
 	flags = CONDUCT
 	origin_tech = "materials=2"
@@ -175,6 +178,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 	new /datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40),
 	new /datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1),
+	new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE),
 	new /datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40),
 	new /datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),
 	new /datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),
@@ -194,7 +198,8 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 	singular_name = "wood plank"
 	icon_state = "sheet-wood"
 	origin_tech = "materials=1;biotech=1"
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
 	merge_type = /obj/item/stack/sheet/wood
 
 /obj/item/stack/sheet/wood/New(var/loc, var/amount=null)
@@ -237,7 +242,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 = FLAMMABLE
 	force = 0
 	throwforce = 0
 	merge_type = /obj/item/stack/sheet/cloth
@@ -262,7 +267,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
 	singular_name = "durathread roll"
 	icon_state = "sheet-durathread"
 	item_state = "sheet-cloth"
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 	force = 0
 	throwforce = 0
 	merge_type = /obj/item/stack/sheet/durathread
@@ -276,7 +281,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
 	desc = "A bundle of raw cotton ready to be spun on the loom."
 	singular_name = "raw cotton ball"
 	icon_state = "sheet-cotton"
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 	force = 0
 	throwforce = 0
 	merge_type = /obj/item/stack/sheet/cotton
@@ -327,7 +332,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 = FLAMMABLE
 	merge_type = /obj/item/stack/sheet/cardboard
 
 /obj/item/stack/sheet/cardboard/New(var/loc, var/amt = null)
@@ -407,7 +412,7 @@ var/global/list/datum/stack_recipe/brass_recipes = list (\
 	singular_name = "brass sheet"
 	icon_state = "sheet-brass"
 	icon = 'icons/obj/items.dmi'
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF | ACID_PROOF
 	throwforce = 10
 	max_amount = 50
 	throw_speed = 1

code/game/objects/items/stacks/stack.dm

@@ -38,10 +38,10 @@
 		merge(O)
 	..()
 
-/obj/item/stack/hitby(atom/movable/AM, skipcatch, hitpush)
+/obj/item/stack/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
 	if(istype(AM, merge_type) && !(amount >= max_amount))
 		merge(AM)
-	..()
+	. = ..()
 
 /obj/item/stack/Destroy()
 	if(usr && usr.machine == src)
@@ -130,7 +130,7 @@
 			if(R.max_res_amount > 1 && max_multiplier > 1)
 				max_multiplier = min(max_multiplier, round(R.max_res_amount / R.res_amount))
 				t1 += " |"
-				
+
 				var/list/multipliers = list(5, 10, 25)
 				for(var/n in multipliers)
 					if(max_multiplier >= n)

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

@@ -81,7 +81,7 @@
 	icon_state = "tile_grass"
 	origin_tech = "biotech=1"
 	turf_type = /turf/simulated/floor/grass
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 //Wood
 /obj/item/stack/tile/wood
@@ -92,7 +92,7 @@
 	icon_state = "tile-wood"
 	origin_tech = "biotech=1"
 	turf_type = /turf/simulated/floor/wood
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 //Carpets
 /obj/item/stack/tile/carpet
@@ -101,7 +101,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 = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/stack/tile/carpet/black
 	name = "black carpet"
@@ -123,6 +123,8 @@
 	flags = CONDUCT
 	turf_type = /turf/simulated/floor/plasteel
 	mineralType = "metal"
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
+	resistance_flags = FIRE_PROOF
 
 //Light
 /obj/item/stack/tile/light
@@ -143,7 +145,7 @@
 	desc = "A piece of carpet with a convincing star pattern."
 	icon_state = "tile_space"
 	turf_type = /turf/simulated/floor/fakespace
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 	merge_type = /obj/item/stack/tile/fakespace
 
 /obj/item/stack/tile/fakespace/loaded
@@ -191,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

@@ -404,8 +404,8 @@
 
 
 obj/item/toy/cards
-	burn_state = FLAMMABLE
-	burntime = 5
+	resistance_flags = FLAMMABLE
+	max_integrity = 50
 	var/parentdeck = null
 	var/deckstyle = "nanotrasen"
 	var/card_hitsound = null
@@ -627,6 +627,7 @@ obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/t
 	newobj.card_throw_speed = sourceobj.card_throw_speed
 	newobj.card_throw_range = sourceobj.card_throw_range
 	newobj.card_attack_verb = sourceobj.card_attack_verb
+	newobj.resistance_flags = sourceobj.resistance_flags
 
 
 obj/item/toy/cards/singlecard
@@ -753,7 +754,7 @@ obj/item/toy/cards/deck/syndicate
 	card_throw_speed = 3
 	card_throw_range = 20
 	card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
-	burn_state = FIRE_PROOF
+	resistance_flags = NONE
 
 /*
 || Custom card decks ||
@@ -795,7 +796,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)
@@ -891,7 +892,7 @@ obj/item/toy/cards/deck/syndicate/black
 	icon_state = "carpplushie"
 	attack_verb = list("bitten", "eaten", "fin slapped")
 	var/bitesound = 'sound/weapons/bite.ogg'
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 // Attack mob
 /obj/item/toy/carpplushie/attack(mob/M as mob, mob/user as mob)
@@ -954,7 +955,7 @@ obj/item/toy/cards/deck/syndicate/black
 	icon = 'icons/obj/toy.dmi'
 	var/poof_sound = 'sound/weapons/thudswoosh.ogg'
 	attack_verb = list("poofed", "bopped", "whapped","cuddled","fluffed")
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/toy/plushie/attack(mob/M as mob, mob/user as mob)
 	playsound(loc, poof_sound, 20, 1)	// Play the whoosh sound in local area
@@ -1106,7 +1107,7 @@ obj/item/toy/cards/deck/syndicate/black
  	item_state = "arm_blade"
  	attack_verb = list("pricked", "absorbed", "gored")
  	w_class = WEIGHT_CLASS_SMALL
- 	burn_state = FLAMMABLE
+ 	resistance_flags = FLAMMABLE
 
 /*
  * Toy/fake flash
@@ -1507,7 +1508,7 @@ obj/item/toy/cards/deck/syndicate/black
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "toy_mouse"
 	w_class = WEIGHT_CLASS_SMALL
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 	var/cooldown = 0
 
 /*

code/game/objects/items/trash.dm

@@ -6,7 +6,7 @@
 	icon = 'icons/obj/trash.dmi'
 	w_class = WEIGHT_CLASS_TINY
 	desc = "This is rubbish."
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/trash/raisins
 	name = "4no raisins"
@@ -43,7 +43,7 @@
 /obj/item/trash/plate
 	name = "Plate"
 	icon_state = "plate"
-	burn_state = FIRE_PROOF
+	resistance_flags = NONE
 
 /obj/item/trash/snack_bowl
 	name = "Snack bowl"
@@ -60,7 +60,7 @@
 /obj/item/trash/tray
 	name = "Tray"
 	icon_state = "tray"
-	burn_state = FIRE_PROOF
+	resistance_flags = NONE
 
 /obj/item/trash/candle
 	name = "candle"
@@ -76,7 +76,7 @@
 	icon_state = "cola"
 	var/is_glass = 0
 	var/is_plastic = 0
-	burn_state = FIRE_PROOF
+	resistance_flags = NONE
 
 /obj/item/trash/gum
 	name = "chewed gum"

code/game/objects/items/weapons/RCD.dm

@@ -49,7 +49,8 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
 	usesound = 'sound/items/deconstruct.ogg'
 	flags_2 = NO_MAT_REDEMPTION_2
 	req_access = list(access_engine)
-
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	resistance_flags = FIRE_PROOF
 	// Important shit
 	var/datum/effect_system/spark_spread/spark_system
 	var/matter = 0

code/game/objects/items/weapons/RSF.dm

@@ -13,6 +13,7 @@ RSF
 	anchored = 0.0
 	var/matter = 0
 	var/mode = 1
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	w_class = WEIGHT_CLASS_NORMAL
 	var/list/configured_items = list()
 

code/game/objects/items/weapons/cards_ids.dm

@@ -89,6 +89,8 @@
 	var/list/access = list()
 	var/registered_name = "Unknown" // The name registered_name on the card
 	slot_flags = SLOT_ID
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	resistance_flags = FIRE_PROOF | ACID_PROOF
 	var/untrackable // Can not be tracked by AI's
 
 	var/blood_type = "\[UNSET\]"

code/game/objects/items/weapons/cash.dm

@@ -9,7 +9,7 @@
 	throw_speed = 1
 	throw_range = 7
 	w_class = WEIGHT_CLASS_TINY
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 	singular_name = "credit"
 	max_amount = 1000000
 	merge_type = /obj/item/stack/spacecash

code/game/objects/items/weapons/chrono_eraser.dm

@@ -52,7 +52,7 @@
 	can_charge = 0
 	fire_delay = 50
 	var/obj/item/chrono_eraser/TED = null
-	var/obj/effect/chrono_field/field = null
+	var/obj/structure/chrono_field/field = null
 	var/turf/startpos = null
 
 /obj/item/gun/energy/chrono_gun/New(var/obj/item/chrono_eraser/T)
@@ -79,7 +79,7 @@
 		field_disconnect(field)
 	return ..()
 
-/obj/item/gun/energy/chrono_gun/proc/field_connect(var/obj/effect/chrono_field/F)
+/obj/item/gun/energy/chrono_gun/proc/field_connect(obj/structure/chrono_field/F)
 	var/mob/living/user = src.loc
 	if(F.gun)
 		if(isliving(user) && F.captured)
@@ -93,7 +93,7 @@
 			to_chat(user, "<span class='notice'>Connection established with target: <b>[F.captured]</b></span>")
 
 
-/obj/item/gun/energy/chrono_gun/proc/field_disconnect(var/obj/effect/chrono_field/F)
+/obj/item/gun/energy/chrono_gun/proc/field_disconnect(obj/structure/chrono_field/F)
 	if(F && field == F)
 		var/mob/living/user = src.loc
 		if(F.gun == src)
@@ -103,7 +103,7 @@
 	field = null
 	startpos = null
 
-/obj/item/gun/energy/chrono_gun/proc/field_check(var/obj/effect/chrono_field/F)
+/obj/item/gun/energy/chrono_gun/proc/field_check(obj/structure/chrono_field/F)
 	if(F)
 		if(field == F)
 			var/turf/currentpos = get_turf(src)
@@ -135,7 +135,7 @@
 
 /obj/item/projectile/energy/chrono_beam/on_hit(atom/target)
 	if(target && gun && isliving(target))
-		var/obj/effect/chrono_field/F = new(target.loc, target, gun)
+		var/obj/structure/chrono_field/F = new(target.loc, target, gun)
 		gun.field_connect(F)
 
 /obj/item/ammo_casing/energy/chrono_beam
@@ -144,26 +144,27 @@
 	icon_state = "chronobolt"
 	e_cost = 0
 
-/obj/effect/chrono_field
+/obj/structure/chrono_field
 	name = "eradication field"
 	desc = "An aura of time-bluespace energy."
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "chronofield"
-	density = 1
-	anchored = 1
-	unacidable = 1
+	density = FALSE
+	anchored = TRUE
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
+	move_resist = INFINITY
 	blend_mode = BLEND_MULTIPLY
 	var/mob/living/captured = null
 	var/obj/item/gun/energy/chrono_gun/gun = null
-	var/tickstokill = 30
-	var/image/mob_underlay = null
+	var/tickstokill = 15
+	var/mutable_appearance/mob_underlay
 	var/preloaded = 0
 	var/RPpos = null
 
-/obj/effect/chrono_field/New(loc, var/mob/living/target, var/obj/item/gun/energy/chrono_gun/G)
+/obj/structure/chrono_field/New(loc, mob/living/target, obj/item/gun/energy/chrono_gun/G)
 	if(target && isliving(target) && G)
-		target.loc = src
-		src.captured = target
+		target.forceMove(src)
+		captured = target
 		var/icon/mob_snapshot = getFlatIcon(target)
 		var/icon/cached_icon = new()
 
@@ -173,18 +174,19 @@
 			mob_icon.Blend(removing_frame, ICON_MULTIPLY)
 			cached_icon.Insert(mob_icon, "frame[i]")
 
-		mob_underlay = new(cached_icon, "frame1")
+		mob_underlay = mutable_appearance(cached_icon, "frame1")
 		update_icon()
 
 		desc = initial(desc) + "<br><span class='info'>It appears to contain [target.name].</span>"
 	START_PROCESSING(SSobj, src)
+	return ..()
 
-/obj/effect/chrono_field/Destroy()
+/obj/structure/chrono_field/Destroy()
 	if(gun && gun.field_check(src))
 		gun.field_disconnect(src)
 	return ..()
 
-/obj/effect/chrono_field/update_icon()
+/obj/structure/chrono_field/update_icon()
 	var/ttk_frame = 1 - (tickstokill / initial(tickstokill))
 	ttk_frame = Clamp(Ceiling(ttk_frame * CHRONO_FRAME_COUNT), 1, CHRONO_FRAME_COUNT)
 	if(ttk_frame != RPpos)
@@ -193,11 +195,11 @@
 		underlays = list() //hack: BYOND refuses to update the underlay to match the icon_state otherwise
 		underlays += mob_underlay
 
-/obj/effect/chrono_field/process()
+/obj/structure/chrono_field/process()
 	if(captured)
 		if(tickstokill > initial(tickstokill))
 			for(var/atom/movable/AM in contents)
-				AM.loc = loc
+				AM.forceMove(drop_location())
 			qdel(src)
 		else if(tickstokill <= 0)
 			to_chat(captured, "<span class='boldnotice'>As the last essence of your being is erased from time, you begin to re-experience your most enjoyable memory. You feel happy...</span>")
@@ -211,12 +213,8 @@
 			qdel(src)
 		else
 			captured.Paralyse(4)
-			if(captured.reagents)
-				captured.reagents.del_reagent("synaptizine") //you pesky thing you
-			if(captured.loc != src) //If they manage to escape, immediately kill them, this is so that even if there IS a way to get out, they won't use it
-				captured.loc = src
-				tickstokill = 0
-				return .()
+			if(captured.loc != src)
+				captured.forceMove(src)
 			update_icon()
 			if(gun)
 				if(gun.field_check(src))
@@ -229,7 +227,8 @@
 	else
 		qdel(src)
 
-/obj/effect/chrono_field/bullet_act(var/obj/item/projectile/P)
+
+/obj/structure/chrono_field/bullet_act(obj/item/projectile/P)
 	if(istype(P, /obj/item/projectile/energy/chrono_beam))
 		var/obj/item/projectile/energy/chrono_beam/beam = P
 		var/obj/item/gun/energy/chrono_gun/Pgun = beam.gun
@@ -238,28 +237,28 @@
 	else
 		return 0
 
-/obj/effect/chrono_field/assume_air()
+/obj/structure/chrono_field/assume_air()
 	return 0
 
-/obj/effect/chrono_field/return_air() //we always have nominal air and temperature
+/obj/structure/chrono_field/return_air() //we always have nominal air and temperature
 	var/datum/gas_mixture/GM = new
 	GM.oxygen = MOLES_O2STANDARD
 	GM.nitrogen = MOLES_N2STANDARD
 	GM.temperature = T20C
 	return GM
 
-/obj/effect/chrono_field/Move()
+/obj/structure/chrono_field/Move()
 	return
 
-/obj/effect/chrono_field/singularity_act()
+/obj/structure/chrono_field/singularity_act()
 	return
 
-/obj/effect/chrono_field/ex_act()
+/obj/structure/chrono_field/ex_act()
 	return
 
-/obj/effect/chrono_field/blob_act()
+/obj/structure/chrono_field/blob_act(obj/structure/blob/B)
 	return
 
 
 #undef CHRONO_BEAM_RANGE
-#undef CHRONO_FRAME_COUNT
+#undef CHRONO_FRAME_COUNT

code/game/objects/items/weapons/courtroom.dm

@@ -11,7 +11,7 @@
 	throwforce = 6.0
 	w_class = WEIGHT_CLASS_SMALL
 	attack_verb = list("bashed", "battered", "judged", "whacked")
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/gavelhammer/suicide_act(mob/user)
 	user.visible_message("<span class='warning'>[user] has sentenced [user.p_them()]self to death with the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
@@ -26,7 +26,7 @@
 	force = 2.0
 	throwforce = 2.0
 	w_class = WEIGHT_CLASS_TINY
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/gavelblock/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/gavelhammer))

code/game/objects/items/weapons/defib.dm

@@ -11,6 +11,7 @@
 	w_class = WEIGHT_CLASS_BULKY
 	origin_tech = "biotech=4"
 	actions_types = list(/datum/action/item_action/toggle_paddles)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/back.dmi'
 		)
@@ -259,6 +260,7 @@
 	force = 0
 	throwforce = 6
 	w_class = WEIGHT_CLASS_BULKY
+	resistance_flags = INDESTRUCTIBLE
 	toolspeed = 1
 
 	var/revivecost = 1000

code/game/objects/items/weapons/extinguisher.dm

@@ -15,9 +15,11 @@
 	materials = list(MAT_METAL=90)
 	attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
 	dog_fashion = /datum/dog_fashion/back
+	resistance_flags = FIRE_PROOF
 	var/max_water = 50
 	var/last_use = 1.0
 	var/safety = 1
+	var/refilling = FALSE
 	var/sprite_name = "fire_extinguisher"
 	var/power = 5 //Maximum distance launched water will travel
 	var/precision = 0 //By default, turfs picked from a spray are random, set to 1 to make it always have at least one water effect per row
@@ -54,6 +56,13 @@
 	to_chat(user, "The safety is [safety ? "on" : "off"].")
 	return
 
+/obj/item/extinguisher/attack_obj(obj/O, mob/living/user)
+	if(AttemptRefill(O, user))
+		refilling = TRUE
+		return FALSE
+	else
+		return ..()
+
 /obj/item/extinguisher/proc/AttemptRefill(atom/target, mob/user)
 	if(istype(target, /obj/structure/reagent_dispensers/watertank) && target.Adjacent(user))
 		var/safety_save = safety
@@ -77,11 +86,15 @@
 		return 0
 
 /obj/item/extinguisher/afterattack(atom/target, mob/user , flag)
+	. = ..()
 	//TODO; Add support for reagents in water.
 	if(target.loc == user)//No more spraying yourself when putting your extinguisher away
 		return
-	if(AttemptRefill(target, user))
+
+	if(refilling)
+		refilling = FALSE
 		return
+
 	if(!safety)
 		if(src.reagents.total_volume < 1)
 			to_chat(usr, "<span class='danger'>\The [src] is empty.</span>")

code/game/objects/items/weapons/flamethrower.dm

@@ -13,6 +13,7 @@
 	throw_range = 5
 	w_class = WEIGHT_CLASS_NORMAL
 	materials = list(MAT_METAL=500)
+	resistance_flags = FIRE_PROOF
 	origin_tech = "combat=1;plasmatech=2;engineering=2"
 	var/status = FALSE
 	var/lit = FALSE	//on or off

code/game/objects/items/weapons/gift_wrappaper.dm

@@ -13,7 +13,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "gift1"
 	item_state = "gift1"
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/a_gift/New()
 	..()
@@ -33,11 +33,6 @@
 	else
 		to_chat(user, "<span class='notice'>The gift was empty!</span>")
 	qdel(src)
-	return
-
-/obj/item/a_gift/ex_act()
-	qdel(src)
-	return
 
 /obj/effect/spresent/relaymove(mob/user as mob)
 	if(user.stat)
@@ -139,7 +134,7 @@
 	flags = NOBLUDGEON
 	amount = 25
 	max_amount = 25
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/stack/wrapping_paper/attack_self(mob/user)
 	to_chat(user, "<span class='notice'>You need to use it on a package that has already been wrapped!</span>")

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

@@ -22,8 +22,7 @@
 
 	for(var/obj/structure/blob/B in hear(8, flashbang_turf))     		//Blob damage here
 		var/damage = round(30 / (get_dist(B, get_turf(src)) + 1))
-		B.health -= damage
-		B.update_icon()
+		B.take_damage(damage, BURN, "melee", 0)
 
 	spawn(light_time)
 		qdel(src)

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

@@ -9,12 +9,18 @@
 	throw_range = 20
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	burn_state = FLAMMABLE
-	burntime = 5
+	resistance_flags = FLAMMABLE
+	max_integrity = 40
 	var/active = 0
 	var/det_time = 50
 	var/display_timer = 1
 
+/obj/item/grenade/deconstruct(disassembled = TRUE)
+	if(!disassembled)
+		prime()
+	if(!QDELETED(src))
+		qdel(src)
+
 /obj/item/grenade/proc/clown_check(var/mob/living/user)
 	if((CLUMSY in user.mutations) && prob(50))
 		to_chat(user, "<span class='warning'>Huh? How does this thing work?</span>")

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

@@ -31,8 +31,7 @@
 
 	for(var/obj/structure/blob/B in view(8,src))
 		var/damage = round(30/(get_dist(B,src)+1))
-		B.health -= damage
-		B.update_icon()
+		B.take_damage(damage, BURN, "melee", 0)
 	sleep(80)
 	qdel(src)
 	return

code/game/objects/items/weapons/handcuffs.dm

@@ -13,6 +13,7 @@
 	materials = list(MAT_METAL=500)
 	origin_tech = "engineering=3;combat=3"
 	breakouttime = 600 //Deciseconds = 60s = 1 minutes
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	var/cuffsound = 'sound/weapons/handcuffs.ogg'
 	var/trashtype = null //For disposable cuffs
 	var/ignoresClumsy = FALSE
@@ -32,9 +33,9 @@
 		to_chat(user, "<span class='warning'>Uh... how do those things work?!</span>")
 		apply_cuffs(user, user)
 		return
-	
+
 	cuff(C, user)
-	
+
 /obj/item/restraints/handcuffs/proc/cuff(mob/living/carbon/C, mob/user, remove_src = TRUE)
 	if(ishuman(C))
 		var/mob/living/carbon/human/H = C

code/game/objects/items/weapons/kitchen.dm

@@ -31,6 +31,7 @@
 	flags = CONDUCT
 	attack_verb = list("attacked", "stabbed", "poked")
 	hitsound = 'sound/weapons/bladeslice.ogg'
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
 	sharp = 0
 	var/max_contents = 1
 
@@ -116,6 +117,7 @@
 	materials = list(MAT_METAL=12000)
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	sharp = TRUE
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	var/bayonet = FALSE	//Can this be attached to a gun?
 
 /obj/item/kitchen/knife/suicide_act(mob/user)
@@ -199,6 +201,7 @@
 	materials = list()
 	origin_tech = "biotech=3;combat=2"
 	attack_verb = list("shanked", "shivved")
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 
 
 /*

code/game/objects/items/weapons/lighters.dm

@@ -14,6 +14,7 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	attack_verb = null
+	resistance_flags = FIRE_PROOF
 	var/lit = 0
 
 /obj/item/lighter/zippo

code/game/objects/items/weapons/melee/energy.dm

@@ -10,6 +10,9 @@
 	var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	hitsound = 'sound/weapons/blade1.ogg' // Probably more appropriate than the previous hitsound. -- Dave
 	usesound = 'sound/weapons/blade1.ogg'
+	max_integrity = 200
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+	resistance_flags = FIRE_PROOF
 	toolspeed = 1
 	light_power = 2
 	var/brightness_on = 2

code/game/objects/items/weapons/mop.dm

@@ -9,7 +9,7 @@
 	throw_range = 7
 	w_class = WEIGHT_CLASS_NORMAL
 	attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 	var/mopping = 0
 	var/mopcount = 0
 	var/mopcap = 5

code/game/objects/items/weapons/paint.dm

@@ -8,8 +8,8 @@
 	item_state = "paintcan"
 	materials = list(MAT_METAL=200)
 	w_class = WEIGHT_CLASS_NORMAL
-	burn_state = FLAMMABLE
-	burntime = 5
+	resistance_flags = FLAMMABLE
+	max_integrity = 100
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(5,10,20,30,50,70)
 	volume = 70

code/game/objects/items/weapons/pneumaticCannon.dm

@@ -9,6 +9,7 @@
 	item_state = "bulldog"
 	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 50)
 	var/maxWeightClass = 20 //The max weight of items that can fit into the cannon
 	var/loadedWeightClass = 0 //The weight of items currently in the cannon
 	var/obj/item/tank/tank = null //The gas tank that is drawn from to fire things

code/game/objects/items/weapons/powerfist.dm

@@ -9,6 +9,8 @@
 	throwforce = 10
 	throw_range = 7
 	w_class = WEIGHT_CLASS_NORMAL
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 40)
+	resistance_flags = FIRE_PROOF
 	origin_tech = "combat=5;powerstorage=3;syndicate=3"
 	var/click_delay = 1.5
 	var/fisto_setting = 1

code/game/objects/items/weapons/rpd.dm

@@ -23,6 +23,8 @@
 	throw_range = 5
 	w_class = WEIGHT_CLASS_NORMAL
 	materials = list(MAT_METAL = 75000, MAT_GLASS = 37500)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	resistance_flags = FIRE_PROOF
 	origin_tech = "engineering=4;materials=2"
 	var/datum/effect_system/spark_spread/spark_system
 	var/lastused

code/game/objects/items/weapons/scrolls.dm

@@ -9,7 +9,7 @@
 	throw_speed = 4
 	throw_range = 20
 	origin_tech = "bluespace=6"
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/teleportation_scroll/apprentice
 	name = "lesser scroll of teleportation"

code/game/objects/items/weapons/shards.dm

@@ -12,7 +12,9 @@
 	materials = list(MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
 	attack_verb = list("stabbed", "slashed", "sliced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
-	armor = list("melee" = 100, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0)
+	armor = list("melee" = 100, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100)
+	max_integrity = 40
+	resistance_flags = ACID_PROOF
 	sharp = TRUE
 	var/cooldown = 0
 	var/icon_prefix

code/game/objects/items/weapons/shields.dm

@@ -1,7 +1,7 @@
 /obj/item/shield
 	name = "shield"
 	block_chance = 50
-	armor = list(melee = 50, bullet = 50, laser = 50, energy = 0, bomb = 30, bio = 0, rad = 0)
+	armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
 
 /obj/item/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	if(attack_type == THROWN_PROJECTILE_ATTACK)
@@ -53,7 +53,7 @@
 	item_state = "buckler"
 	materials = list()
 	origin_tech = "materials=1;combat=3;biotech=2"
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 	block_chance = 30
 
 /obj/item/shield/energy

code/game/objects/items/weapons/signs.dm

@@ -6,7 +6,7 @@
 	force = 5
 	w_class = WEIGHT_CLASS_BULKY
 	attack_verb = list("bashed","smacked")
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 	var/delayed = 0 //used to do delays
 

code/game/objects/items/weapons/staff.dm

@@ -10,7 +10,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	armour_penetration = 100
 	attack_verb = list("bludgeoned", "whacked", "disciplined")
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/twohanded/staff/broom
 	name = "broom"

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

@@ -15,8 +15,8 @@
 	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 21
 	storage_slots = 21
-	burn_state = FLAMMABLE
-	burntime = 20
+	resistance_flags = NONE
+	max_integrity = 300
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/back.dmi',
 		"Vox Armalis" = 'icons/mob/species/armalis/back.dmi',
@@ -56,9 +56,10 @@
 	item_state = "holdingpack"
 	max_w_class = WEIGHT_CLASS_HUGE
 	max_combined_w_class = 35
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 	flags_2 = NO_MAT_REDEMPTION_2
 	cant_hold = list(/obj/item/storage/backpack/holding)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 50)
 
 /obj/item/storage/backpack/holding/New()
 	..()
@@ -86,7 +87,6 @@
 /obj/item/storage/backpack/holding/singularity_act(current_size)
 	var/dist = max((current_size - 2),1)
 	explosion(src.loc,(dist),(dist*2),(dist*4))
-	return
 
 /obj/item/storage/backpack/santabag
 	name = "Santa's Gift Bag"
@@ -151,14 +151,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/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/storage/backpack/explorer
 	name = "explorer bag"
@@ -189,7 +189,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"
@@ -205,7 +205,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
 	var/strap_side_straight = FALSE
 
 /obj/item/storage/backpack/satchel/verb/switch_strap()
@@ -241,7 +241,7 @@
 	name = "industrial satchel"
 	desc = "A tough satchel with extra pockets."
 	icon_state = "satchel-eng"
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 
 /obj/item/storage/backpack/satchel/explorer
 	name = "explorer satchel"
@@ -273,7 +273,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"
@@ -289,7 +289,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"
@@ -335,6 +335,7 @@
 	origin_tech = "syndicate=1"
 	silent = 1
 	slowdown = 0
+	resistance_flags = FIRE_PROOF
 
 /obj/item/storage/backpack/duffel/syndie/med
 	name = "suspicious duffelbag"
@@ -466,7 +467,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"
@@ -509,14 +510,14 @@
 	desc = "A duffelbag designed to hold tools."
 	icon_state = "duffel-eng"
 	item_state = "duffel-eng"
-	burn_state = FIRE_PROOF
+	resistance_flags = FIRE_PROOF
 
 /obj/item/storage/backpack/duffel/atmos
 	name = "atmospherics duffelbag"
 	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"
@@ -536,6 +537,7 @@
 	desc = "A spacious backpack with lots of pockets, used by members of the Nanotrasen Emergency Response Team."
 	icon_state = "ert_commander"
 	item_state = "backpack"
+	resistance_flags = FIRE_PROOF
 
 //Commander
 /obj/item/storage/backpack/ert/commander

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

@@ -169,7 +169,7 @@
 	max_w_class = WEIGHT_CLASS_NORMAL
 	w_class = WEIGHT_CLASS_TINY
 	can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/reagent_containers/food/snacks/grown/ash_flora)
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /obj/item/storage/bag/plants/portaseeder
 	name = "portable seed extractor"
@@ -364,7 +364,7 @@
 	max_w_class = WEIGHT_CLASS_NORMAL
 	w_class = WEIGHT_CLASS_BULKY //Bigger than a book because physics
 	can_hold = list(/obj/item/book, /obj/item/storage/bible, /obj/item/tome, /obj/item/spellbook)
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 
 /*
  * Trays - Agouri
@@ -486,7 +486,7 @@
 	max_combined_w_class = 200
 	w_class = WEIGHT_CLASS_TINY
 	can_hold = list(/obj/item/reagent_containers/food/pill,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/bottle)
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 /*
  *  Biowaste bag (mostly for xenobiologists)
  */
@@ -500,4 +500,4 @@
 	max_combined_w_class = 200
 	w_class = WEIGHT_CLASS_TINY
 	can_hold = list(/obj/item/slime_extract,/obj/item/reagent_containers/food/snacks/monkeycube,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/iv_bag,/obj/item/reagent_containers/hypospray/autoinjector)
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE

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

@@ -8,6 +8,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi'
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
+	max_integrity = 300
 	var/use_item_overlays = 0 // Do we have overlays for items held inside the belt?
 
 /obj/item/storage/belt/update_icon()
@@ -293,6 +294,7 @@
 	icon_state = "militarybelt"
 	item_state = "military"
 	max_w_class = WEIGHT_CLASS_SMALL
+	resistance_flags = FIRE_PROOF
 
 /obj/item/storage/belt/military/sst
 	icon_state = "assaultbelt"

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/boxes.dm

@@ -24,7 +24,7 @@
 	desc = "It's just an ordinary box."
 	icon_state = "box"
 	item_state = "syringe_kit"
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 	var/foldable = /obj/item/stack/sheet/cardboard
 	var/amt = 1
 
@@ -964,6 +964,7 @@
 	desc = "A sack neatly crafted out of paper."
 	icon_state = "paperbag_None"
 	item_state = "paperbag_None"
+	resistance_flags = FLAMMABLE
 	foldable = null
 	var/design = NODESIGN
 

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

@@ -12,8 +12,8 @@
 	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
-	burn_state = FLAMMABLE
-	burntime = 20
+	resistance_flags = FLAMMABLE
+	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."

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

@@ -17,7 +17,7 @@
 	icon = 'icons/obj/food/containers.dmi'
 	icon_state = "donutbox6"
 	name = "donut box"
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 	var/icon_type = "donut"
 
 /obj/item/storage/fancy/update_icon(var/itemremoved = 0)

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

@@ -317,7 +317,7 @@
 	return 1
 
 //Call this proc to handle the removal of an item from the storage item. The item will be moved to the atom sent as new_target
-/obj/item/storage/proc/remove_from_storage(obj/item/W as obj, atom/new_location, burn = 0)
+/obj/item/storage/proc/remove_from_storage(obj/item/W as obj, atom/new_location)
 	if(!istype(W)) return 0
 
 	if(istype(src, /obj/item/storage/fancy))
@@ -351,17 +351,19 @@
 	W.on_exit_storage(src)
 	update_icon()
 	W.mouse_opacity = initial(W.mouse_opacity)
-	if(burn)
-		W.fire_act()
 	return 1
 
 /obj/item/storage/Exited(atom/A, loc)
 	remove_from_storage(A, loc) //worry not, comrade; this only gets called once
 	..()
 
-/obj/item/storage/empty_object_contents(burn, loc)
-	for(var/obj/item/Item in contents)
-		remove_from_storage(Item, loc, burn)
+/obj/item/storage/deconstruct(disassembled = TRUE)
+	var/drop_loc = loc
+	if(ismob(loc))
+		drop_loc = get_turf(src)
+	for(var/obj/item/I in contents)
+		remove_from_storage(I, drop_loc)
+	qdel(src)
 
 //This proc is called when you want to place an item into the storage item.
 /obj/item/storage/attackby(obj/item/I, mob/user, params)

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

@@ -121,6 +121,7 @@
 	desc = "A huge brass box with several indentations in its surface."
 	icon_state = "brassbox"
 	item_state = null
+	resistance_flags = FIRE_PROOF | ACID_PROOF
 	w_class = WEIGHT_CLASS_HUGE
 	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 28

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

@@ -5,7 +5,7 @@
 	icon = 'icons/obj/wallets.dmi'
 	icon_state = "wallet"
 	w_class = WEIGHT_CLASS_SMALL
-	burn_state = FLAMMABLE
+	resistance_flags = FLAMMABLE
 	can_hold = list(
 		/obj/item/stack/spacecash,
 		/obj/item/card,

code/game/objects/items/weapons/stunbaton.dm

@@ -10,6 +10,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	origin_tech = "combat=2"
 	attack_verb = list("beaten")
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
 	var/stunforce = 7
 	var/status = 0
 	var/obj/item/stock_parts/cell/high/bcell = null

code/game/objects/items/weapons/tanks/jetpack.dm

@@ -120,6 +120,7 @@
 	item_state = "jetpack-captain"
 	volume = 90
 	w_class = WEIGHT_CLASS_NORMAL
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF //steal objective items are hard to destroy.
 
 /obj/item/tank/jetpack/oxygen/harness
 	name = "jet harness (oxygen)"

code/game/objects/items/weapons/tanks/tanks.dm

@@ -12,7 +12,7 @@
 	throwforce = 10.0
 	throw_speed = 1
 	throw_range = 4
-	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 30)
 	actions_types = list(/datum/action/item_action/set_internals)
 	var/datum/gas_mixture/air_contents = null
 	var/distribute_pressure = ONE_ATMOSPHERE
@@ -105,10 +105,10 @@
 
 	. += "<span class='notice'>\The [bicon(icon)][src] feels [descriptive]</span>"
 
-/obj/item/tank/blob_act()
-	if(prob(50))
-		var/turf/location = loc
-		if(!( istype(location, /turf) ))
+/obj/item/tank/blob_act(obj/structure/blob/B)
+	if(B && B.loc == loc)
+		var/turf/location = get_turf(src)
+		if(!location)
 			qdel(src)
 
 		if(air_contents)
@@ -116,6 +116,15 @@
 
 		qdel(src)
 
+/obj/item/tank/deconstruct(disassembled = TRUE)
+	if(!disassembled)
+		var/turf/T = get_turf(src)
+		if(T)
+			T.assume_air(air_contents)
+			air_update_turf()
+		playsound(src.loc, 'sound/effects/spray.ogg', 10, TRUE, -3)
+	qdel(src)
+
 /obj/item/tank/attackby(obj/item/W as obj, mob/user as mob, params)
 	..()
 

code/game/objects/items/weapons/tanks/watertank.dm

@@ -9,6 +9,9 @@
 	slot_flags = SLOT_BACK
 	slowdown = 1
 	actions_types = list(/datum/action/item_action/toggle_mister)
+	max_integrity = 200
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+	resistance_flags = FIRE_PROOF
 
 	var/obj/item/noz
 	var/on = 0

code/game/objects/items/weapons/teleportation.dm

@@ -22,6 +22,7 @@
 	throw_speed = 4
 	throw_range = 20
 	materials = list(MAT_METAL=400)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
 	origin_tech = "magnets=3;bluespace=2"
 
 /obj/item/locator/attack_self(mob/user as mob)
@@ -103,7 +104,8 @@ Frequency:
 	throw_range = 5
 	materials = list(MAT_METAL=10000)
 	origin_tech = "magnets=3;bluespace=4"
-	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 30, bio = 0, rad = 0)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	var/active_portals = 0
 
 /obj/item/hand_tele/attack_self(mob/user as mob)

code/game/objects/items/weapons/tools.dm

@@ -28,6 +28,7 @@
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
 	toolspeed = 1
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
 
 /obj/item/wrench/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -44,6 +45,7 @@
 	desc = "A brass wrench. It's faintly warm to the touch."
 	icon_state = "wrench_brass"
 	toolspeed = 0.5
+	resistance_flags = FIRE_PROOF | ACID_PROOF
 
 /obj/item/wrench/abductor
 	name = "alien wrench"
@@ -133,6 +135,7 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	usesound = 'sound/items/screwdriver.ogg'
 	toolspeed = 1
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
 	var/random_color = TRUE //if the screwdriver uses random coloring
 
 /obj/item/screwdriver/nuke
@@ -170,6 +173,7 @@
 	icon_state = "screwdriver_brass"
 	toolspeed = 0.5
 	random_color = FALSE
+	resistance_flags = FIRE_PROOF | ACID_PROOF
 
 /obj/item/screwdriver/abductor
 	name = "alien screwdriver"
@@ -233,6 +237,7 @@
 	usesound = 'sound/items/wirecutter.ogg'
 	sharp = 1
 	toolspeed = 1
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
 	var/random_color = TRUE
 
 /obj/item/wirecutters/New(loc, param_color = null)
@@ -264,6 +269,7 @@
 	icon_state = "cutters_brass"
 	toolspeed = 0.5
 	random_color = FALSE
+	resistance_flags = FIRE_PROOF | ACID_PROOF
 
 /obj/item/wirecutters/abductor
 	name = "alien wirecutters"
@@ -326,6 +332,8 @@
 	var/acti_sound = 'sound/items/welderactivate.ogg'
 	var/deac_sound = 'sound/items/welderdeactivate.ogg'
 	w_class = WEIGHT_CLASS_SMALL
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+	resistance_flags = FIRE_PROOF
 	materials = list(MAT_METAL=70, MAT_GLASS=30)
 	origin_tech = "engineering=1;plasmatech=1"
 	toolspeed = 1
@@ -658,6 +666,7 @@
 	desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch."
 	icon_state = "brasswelder"
 	item_state = "brasswelder"
+	resistance_flags = FIRE_PROOF | ACID_PROOF
 
 obj/item/weldingtool/experimental/process()
 	..()
@@ -683,6 +692,7 @@ obj/item/weldingtool/experimental/process()
 	origin_tech = "engineering=1;combat=1"
 	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
 	toolspeed = 1
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
 
 /obj/item/crowbar/red
 	icon_state = "crowbar_red"
@@ -695,6 +705,7 @@ obj/item/weldingtool/experimental/process()
 	icon_state = "crowbar_brass"
 	item_state = "crowbar_brass"
 	toolspeed = 0.5
+	resistance_flags = FIRE_PROOF | ACID_PROOF
 
 /obj/item/crowbar/abductor
 	name = "alien crowbar"

code/game/objects/items/weapons/twohanded.dm

@@ -115,6 +115,7 @@
 	icon_state = "offhand"
 	name = "offhand"
 	flags = ABSTRACT
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 
 /obj/item/twohanded/offhand/unwield()
 	if(!QDELETED(src))
@@ -181,6 +182,9 @@
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	usesound = 'sound/items/crowbar.ogg'
+	max_integrity = 200
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+	resistance_flags = FIRE_PROOF
 
 /obj/item/twohanded/fireaxe/update_icon()  //Currently only here to fuck with the on-mob icons.
 	icon_state = "fireaxe[wielded]"
@@ -190,12 +194,10 @@
 	if(!proximity)
 		return
 	if(wielded) //destroys windows and grilles in one hit
-		if(istype(A, /obj/structure/window))
-			var/obj/structure/window/W = A
-			W.take_damage(200, BRUTE, "melee", 0)
-		else if(istype(A, /obj/structure/grille))
-			var/obj/structure/grille/G = A
-			G.take_damage(40, BRUTE, "melee", 0)
+		if(istype(A, /obj/structure/window) || istype(A, /obj/structure/grille))
+			var/obj/structure/W = A
+			W.obj_destruction("fireaxe")
+
 
 /obj/item/twohanded/fireaxe/boneaxe  // Blatant imitation of the fireaxe, but made out of bone.
 	icon_state = "bone_axe0"
@@ -230,6 +232,9 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 75
 	sharp_when_wielded = TRUE // only sharp when wielded
+	max_integrity = 200
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
+	resistance_flags = FIRE_PROOF
 	light_power = 2
 	var/brightness_on = 2
 	var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE)
@@ -337,6 +342,8 @@
 	sharp = TRUE
 	no_spin_thrown = TRUE
 	var/obj/item/grenade/explosive = null
+	max_integrity = 200
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
 	var/icon_prefix = "spearglass"
 
 /obj/item/twohanded/spear/update_icon()
@@ -585,7 +592,8 @@
 	throwforce = 15
 	throw_range = 1
 	w_class = WEIGHT_CLASS_HUGE
-	armor = list(melee = 50, bullet = 50, laser = 50, energy = 0, bomb = 50, bio = 0, rad = 0)
+	armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	resistance_flags = FIRE_PROOF | ACID_PROOF
 	var/charged = 5
 	origin_tech = "combat=4;bluespace=4;plasmatech=7"
 
@@ -759,6 +767,7 @@
 	force_wielded = 30
 	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
 	var/charged = 1
 
 /obj/item/twohanded/energizedfireaxe/update_icon()
@@ -805,6 +814,9 @@
 	force_wielded = 15
 	attack_verb = list("attacked", "impaled", "pierced")
 	hitsound = 'sound/weapons/bladeslice.ogg'
+	max_integrity = 200
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
+	resistance_flags = FIRE_PROOF
 
 /obj/item/twohanded/pitchfork/demonic
 	name = "demonic pitchfork"

code/game/objects/items/weapons/vending_items.dm

@@ -13,6 +13,7 @@
 	throw_speed = 1
 	throw_range = 7
 	w_class = WEIGHT_CLASS_BULKY
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 30)
 
 	// Built automatically from the corresponding vending machine.
 	// If null, considered to be full. Otherwise, is list(/typepath = amount).

code/game/objects/items/weapons/weaponry.dm

@@ -9,6 +9,9 @@
 	throw_speed = 7
 	throw_range = 15
 	attack_verb = list("banned")
+	max_integrity = 200
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
+	resistance_flags = FIRE_PROOF
 
 
 /obj/item/banhammer/suicide_act(mob/user)
@@ -46,6 +49,9 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 50
+	max_integrity = 200
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	resistance_flags = FIRE_PROOF
 
 /obj/item/claymore/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is falling on the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
@@ -70,6 +76,9 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	block_chance = 50
+	max_integrity = 200
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	resistance_flags = FIRE_PROOF
 
 /obj/item/katana/cursed
 	slot_flags = null
@@ -146,6 +155,7 @@
 	embedded_fall_chance = 0 //Hahaha!
 	sharp = 1
 	materials = list(MAT_METAL=500, MAT_GLASS=500)
+	resistance_flags = FIRE_PROOF
 
 /obj/item/spear/kidan
 	icon_state = "kidanspear"