Merge pull request #20726 from phil235/PreliminaryDamageRefactor

Some preliminary changes before the damage refactor PR.

code/modules/mining/equipment.dm

@@ -12,7 +12,7 @@
 	heat_protection = CHEST|GROIN|LEGS|ARMS
 	hooded = 1
 	hoodtype = /obj/item/clothing/head/explorer
-	armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 100, rad = 50)
+	armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 100, rad = 50, fire = 50, acid = 50)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals, /obj/item/weapon/resonator, /obj/item/device/mining_scanner, /obj/item/device/t_scanner/adv_mining_scanner, /obj/item/weapon/gun/energy/kinetic_accelerator, /obj/item/weapon/pickaxe)
 
 /obj/item/clothing/head/explorer
@@ -24,7 +24,7 @@
 	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
 	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
 	max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
-	armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 100, rad = 50)
+	armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 100, rad = 50, fire = 50, acid = 50)
 
 /obj/item/clothing/mask/gas/explorer
 	name = "explorer gas mask"
@@ -34,7 +34,7 @@
 	visor_flags_inv = HIDEFACIALHAIR
 	visor_flags_cover = MASKCOVERSMOUTH
 	actions_types = list(/datum/action/item_action/adjust)
-	armor = list(melee = 10, bullet = 5, laser = 5, energy = 5, bomb = 0, bio = 50, rad = 0)
+	armor = list(melee = 10, bullet = 5, laser = 5, energy = 5, bomb = 0, bio = 50, rad = 0, fire = 20, acid = 40)
 
 /obj/item/clothing/mask/gas/explorer/attack_self(mob/user)
 	adjustmask(user)

code/modules/mining/lavaland/ash_flora.dm

@@ -152,7 +152,7 @@
 	icon = 'icons/obj/lavaland/ash_flora.dmi'
 	icon_state = "mushroom_shavings"
 	w_class = 1
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 30
 	var/prepared = FALSE
 	var/prepared_type = /obj/item/ash_flora/shavings
@@ -240,7 +240,7 @@
 	icon = 'icons/obj/lavaland/ash_flora.dmi'
 	icon_state = "mushroom_bowl"
 	w_class = 2
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 40
 
 //what you can craft with these things

code/modules/mining/lavaland/necropolis_chests.dm

@@ -4,7 +4,7 @@
 	name = "necropolis chest"
 	desc = "It's watching you closely."
 	icon_state = "necrocrate"
-	burn_state = LAVA_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 
 /obj/structure/closet/crate/necropolis/tendril
 	desc = "It's watching you suspiciously."
@@ -252,7 +252,7 @@
 /obj/effect/immortality_talisman
 	icon_state = "blank"
 	icon = 'icons/effects/effects.dmi'
-	burn_state = LAVA_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	var/can_destroy = FALSE
 
 /obj/effect/immortality_talisman/attackby()
@@ -355,7 +355,7 @@
 	icon_state = "goliath_boat"
 	icon = 'icons/obj/lavaland/dragonboat.dmi'
 	keytype = /obj/item/weapon/oar
-	burn_state = LAVA_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF
 
 /obj/vehicle/lavaboat/relaymove(mob/user, direction)
 	var/turf/next = get_step(src, direction)
@@ -375,7 +375,7 @@
 	desc = "Not to be confused with the kind Research hassles you for."
 	force = 12
 	w_class = 3
-	burn_state = LAVA_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF
 
 /datum/crafting_recipe/oar
 	name = "goliath bone oar"
@@ -633,7 +633,7 @@
 	w_class = 4
 	force = 25
 	damtype = BURN
-	burn_state = LAVA_PROOF
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	hitsound = 'sound/weapons/sear.ogg'
 	var/turf_type = /turf/open/floor/plating/lava/smooth
 	var/transform_string = "lava"

code/modules/mining/mine_items.dm

@@ -4,7 +4,6 @@
 /obj/effect/light_emitter
 	name = "Light emitter"
 	anchored = 1
-	unacidable = 1
 	invisibility = 101
 	var/set_luminosity = 8
 	var/set_cap = 0

code/modules/mining/money_bag.dm

@@ -5,7 +5,7 @@
 	icon_state = "moneybag"
 	force = 10
 	throwforce = 0
-	burn_state = FLAMMABLE
+	resistance_flags = 0
 	burntime = 20
 	w_class = 4
 	max_w_class = 3