diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
index 43f43608dc9..1633ebadc60 100644
--- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
+++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
@@ -477,6 +477,7 @@
anchored = 1
light_range = 1
mouse_opacity = MOUSE_OPACITY_ICON
+ var/health = 30
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
light_color = LIGHT_COLOR_CYAN
max_integrity = 30
diff --git a/code/game/gamemodes/shadowling/shadowling_items.dm b/code/game/gamemodes/shadowling/shadowling_items.dm
index ff46474450c..431d986bfcd 100644
--- a/code/game/gamemodes/shadowling/shadowling_items.dm
+++ b/code/game/gamemodes/shadowling/shadowling_items.dm
@@ -8,7 +8,7 @@
flags = ABSTRACT | NODROP
has_sensor = 0
displays_id = 0
- unacidable = 1
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/item/clothing/suit/space/shadowling
@@ -21,7 +21,7 @@
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
flags_inv = HIDEGLOVES | HIDESHOES | HIDEJUMPSUIT
slowdown = 0
- unacidable = 1
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
heat_protection = null //You didn't expect a light-sensitive creature to have heat resistance, did you?
max_heat_protection_temperature = null
armor = list(melee = 25, bullet = 0, laser = 0, energy = 0, bomb = 25, bio = 100, rad = 100, fire = 100, acid = 100)
@@ -32,7 +32,7 @@
name = "chitin feet"
desc = "Charred-looking feet. They have minature hooks that latch onto flooring."
icon_state = "golem"
- unacidable = 1
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags = NOSLIP | ABSTRACT | NODROP
@@ -43,7 +43,7 @@
item_state = "golem"
origin_tech = null
siemens_coefficient = 0
- unacidable = 1
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags = ABSTRACT | NODROP
@@ -54,7 +54,7 @@
item_state = null
origin_tech = null
siemens_coefficient = 0
- unacidable = 1
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags = ABSTRACT | NODROP
@@ -68,7 +68,7 @@
heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
origin_tech = null
- unacidable = 1
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags = ABSTRACT | NODROP | STOPSPRESSUREDMAGE
/obj/item/clothing/glasses/shadowling
@@ -78,7 +78,7 @@
icon_state = null
item_state = null
origin_tech = null
- unacidable = 1
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flash_protect = -1
vision_flags = SEE_MOBS
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index a0d6efc5d1f..618138d8146 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -359,7 +359,7 @@
name = "gamma level hatch"
hackProof = 1
aiControlDisabled = 1
- unacidable = 1
+ resistance_flags = FIRE_PROOF | ACID_PROOF
is_special = 1
/obj/machinery/door/airlock/hatch/gamma/attackby(obj/C, mob/user, params)
diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm
index e0a49fdfc8c..62fbae71c78 100644
--- a/code/game/machinery/embedded_controller/embedded_controller_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm
@@ -52,7 +52,7 @@
var/frequency = 1379
var/radio_filter = null
var/datum/radio_frequency/radio_connection
- unacidable = 1
+ resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/machinery/embedded_controller/radio/Initialize()
..()
diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
index 445d6377513..bd237fbfdb6 100644
--- a/code/game/objects/effects/misc.dm
+++ b/code/game/objects/effects/misc.dm
@@ -70,7 +70,6 @@
desc = "A stand with the empty body of a cyborg bolted to it."
density = 1
anchored = 1
- unacidable = 1//temporary until I decide whether the borg can be removed. -veyveyr
/obj/effect/spawner
name = "object spawner"
diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm
index 121b0214b5a..81ea26c2cf9 100644
--- a/code/game/objects/items/flag.dm
+++ b/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("[user] lights [src] with [W].", "You light [src] with [W].", "You hear a low whoosh.")
fire_act()
@@ -35,11 +35,11 @@
item_state = icon_state
if(rolled)
icon_state = "[icon_state]_rolled"
- if(burn_state == ON_FIRE)
+ if(resistance_flags & ON_FIRE)
item_state = "[item_state]_fire"
- if(burn_state == ON_FIRE && rolled)
+ if((resistance_flags & ON_FIRE) && rolled)
overlays += image('icons/obj/flag.dmi', src , "fire_rolled")
- else if(burn_state == ON_FIRE && !rolled)
+ else if((resistance_flags & ON_FIRE) && !rolled)
overlays += image('icons/obj/flag.dmi', src , "fire")
if(ismob(loc))
var/mob/M = loc
@@ -254,7 +254,7 @@
..()
/obj/item/flag/chameleon/attackby(obj/item/W, mob/user, params)
- if(is_hot(W) && burn_state != ON_FIRE && boobytrap && trapper)
+ if(is_hot(W) && !(resistance_flags & ON_FIRE) && boobytrap && trapper)
var/turf/bombturf = get_turf(src)
var/area/A = get_area(bombturf)
message_admins("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] (JMP).")
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index a94a3159c31..564010b1aed 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -193,7 +193,7 @@
icon_state = "tile_space"
turf_type = /turf/simulated/floor/carpet/arcade
merge_type = /obj/item/stack/tile/arcade_carpet
- burn_state = FLAMMABLE
+ resistance_flags = FLAMMABLE
/obj/item/stack/tile/arcade_carpet/loaded
amount = 20
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index d8595348368..905fada215e 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -795,7 +795,7 @@ obj/item/toy/cards/deck/syndicate/black
item_state = "egg4"
w_class = WEIGHT_CLASS_TINY
var/cooldown = 0
- burn_state = FLAMMABLE
+ resistance_flags = FLAMMABLE
/obj/item/toy/therapy/New()
if(item_color)
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 742bceb524a..724503afbd6 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -10,7 +10,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
resistance_flags = FLAMMABLE
- burntime = 5
+ max_integrity = 40
var/active = 0
var/det_time = 50
var/display_timer = 1
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 4d67900a872..b0c290474d2 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -16,7 +16,7 @@
max_combined_w_class = 21
storage_slots = 21
resistance_flags = NONE
- burntime = 20
+ max_integrity = 300
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/back.dmi',
"Vox Armalis" = 'icons/mob/species/armalis/back.dmi',
@@ -152,7 +152,7 @@
desc = "It's a special backpack made exclusively for Nanotrasen officers."
icon_state = "captainpack"
item_state = "captainpack"
- burn_state = FIRE_PROOF
+ resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/industrial
name = "industrial backpack"
@@ -190,7 +190,7 @@
desc = "A specially designed backpack. It's fire resistant and smells vaguely of plasma."
icon_state = "toxpack"
item_state = "toxpack"
- burn_state = FIRE_PROOF
+ resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/virology
name = "virology backpack"
@@ -274,7 +274,7 @@
name = "scientist satchel"
desc = "Useful for holding research materials."
icon_state = "satchel-tox"
- burn_state = FIRE_PROOF
+ resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/satchel_sec
name = "security satchel"
@@ -290,7 +290,7 @@
name = "captain's satchel"
desc = "An exclusive satchel for Nanotrasen officers."
icon_state = "satchel-cap"
- burn_state = FIRE_PROOF
+ resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/satchel_flat
name = "smuggler's satchel"
@@ -468,7 +468,7 @@
desc = "A duffelbag designed to hold large quantities of condoms."
icon_state = "duffel-captain"
item_state = "duffel-captain"
- burn_state = FIRE_PROOF
+ resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/duffel/security
name = "security duffelbag"
@@ -518,7 +518,7 @@
desc = "A duffelbag designed to hold tools. This one is specially designed for atmospherics."
icon_state = "duffel-atmos"
item_state = "duffel-atmos"
- burn_state = FIRE_PROOF
+ resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/duffel/hydro
name = "hydroponics duffelbag"
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index db34f3ae2c8..a79674d3217 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/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"
diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm
index b8f43de47de..8ba79674ab9 100644
--- a/code/game/objects/items/weapons/storage/briefcase.dm
+++ b/code/game/objects/items/weapons/storage/briefcase.dm
@@ -13,7 +13,7 @@
max_combined_w_class = 21
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
resistance_flags = FLAMMABLE
- burntime = 20
+ max_integrity = 150
/obj/item/storage/briefcase/sniperbundle
desc = "Its label reads \"genuine hardened Captain leather\", but suspiciously has no other tags or branding. Smells like L'Air du Temps."
diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm
index 7fa0357cfaf..68c3840256e 100644
--- a/code/game/objects/structures/lamarr_cage.dm
+++ b/code/game/objects/structures/lamarr_cage.dm
@@ -5,7 +5,7 @@
desc = "A glass lab container for storing interesting creatures."
density = 1
anchored = 1
- unacidable = 1//Dissolving the case would also delete Lamarr
+ resistance_flags = ACID_PROOF
var/health = 30
var/occupied = 1
var/destroyed = 0
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index ff0446c3b4a..268c3010cbe 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -496,7 +496,7 @@
icon = 'icons/goonstation/objects/clothing/mask.dmi'
icon_state = "cursedclown"
item_state = "cclown_hat"
- unacidable = 1 // HUNKE
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
icon_override = 'icons/goonstation/mob/clothing/mask.dmi'
lefthand_file = 'icons/goonstation/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi'
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index d3943936ae5..9c7d8bac080 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -238,6 +238,7 @@
icon_override = 'icons/goonstation/mob/clothing/feet.dmi'
lefthand_file = 'icons/goonstation/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi'
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags = NODROP
shoe_sound = "clownstep"
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index 4b68909f899..44d9946dfd6 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -76,7 +76,7 @@ obj/item/clothing/head/helmet/space/syndicate/black/strike
desc = "A heavily armored black helmet that is only given to high-ranking Syndicate operatives."
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100) //Matches DS gear.
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- unacidable = 1
+ resistance_flags = ACID_PROOF
/obj/item/clothing/suit/space/syndicate/black
name = "Black Space Suit"
@@ -88,7 +88,7 @@ obj/item/clothing/suit/space/syndicate/black/strike
desc = "A heavily armored, black space suit that is only given to high-ranking Syndicate operatives."
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100) //Matches DS gear.
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- unacidable = 1
+ resistance_flags = ACID_PROOF
//Black-green syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/green
@@ -149,7 +149,7 @@ obj/item/clothing/head/helmet/space/syndicate/black/red/strike
desc = "A heavily armored, black and red space helmet that is only given to elite Syndicate operatives, it looks particularly menacing."
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100) //Matches DS gear.
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- unacidable = 1
+ resistance_flags = ACID_PROOF
/obj/item/clothing/suit/space/syndicate/black/red
name = "Black and Red Space Suit"
@@ -161,7 +161,7 @@ obj/item/clothing/suit/space/syndicate/black/red/strike
desc = "A heavily armored, black and red space suit that is only given to elite Syndicate operatives, it looks particularly menacing."
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100) //Matches DS gear.
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- unacidable = 1
+ resistance_flags = ACID_PROOF
//Black with yellow/red engineering syndicate space suit
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index b2ccb715a7f..9ec99bd7742 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -753,6 +753,7 @@
lefthand_file = 'icons/goonstation/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi'
flags = NODROP
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags_size = ONESIZEFITSALL
has_sensor = 0 // HUNKE
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index e21d0f80c76..edd0165d213 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -433,7 +433,7 @@
sallet.max_heat_protection_temperature = helm.max_heat_protection_temperature
sallet.strip_delay = helm.strip_delay
sallet.put_on_delay = helm.put_on_delay
- sallet.burn_state = helm.burn_state
+ sallet.resistance_flags = helm.resistance_flags
sallet.flags_cover = helm.flags_cover
sallet.visor_flags = helm.visor_flags
sallet.visor_flags_inv = helm.visor_flags_inv
diff --git a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
index cd158c70e74..afd6d950c91 100644
--- a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm
@@ -9,7 +9,7 @@
light_color = LIGHT_COLOR_LIGHTBLUE
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change()
- if(!isShotFlammable() && burn_state == ON_FIRE)
+ if(!isShotFlammable() && (resistance_flags & ON_FIRE))
extinguish()
update_icon()
@@ -29,14 +29,14 @@
filling.icon += mix_color_from_reagents(reagents.reagent_list)
overlays += filling
name = "shot glass of " + reagents.get_master_reagent_name() //No matter what, the glass will tell you the reagent's name. Might be too abusable in the future.
- if(burn_state == ON_FIRE)
+ if(resistance_flags & ON_FIRE)
overlays += "shotglass_fire"
name = "flaming [name]"
else
name = "shot glass"
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/proc/clumsilyDrink(mob/living/carbon/human/user) //Clowns beware
- if(burn_state != ON_FIRE)
+ if(!(resistance_flags & ON_FIRE))
return
user.visible_message("[user] pours [src] all over [user.p_them()]self!", "You pour [src] all over yourself!", "You hear a 'whoompf' and a sizzle.")
extinguish(TRUE)
@@ -52,7 +52,7 @@
return TRUE
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = FALSE)
- if(!isShotFlammable() || burn_state == ON_FIRE) //You can't light a shot that's not flammable!
+ if(!isShotFlammable() || (resistance_flags & ON_FIRE)) //You can't light a shot that's not flammable!
return
..()
set_light(light_intensity, null, light_color)
@@ -70,7 +70,7 @@
return
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/attack(mob/living/carbon/human/user)
- if((CLUMSY in user.mutations) && prob(50) && burn_state == ON_FIRE)
+ if((CLUMSY in user.mutations) && prob(50) && (resistance_flags & ON_FIRE))
clumsilyDrink(user)
else
..()
@@ -85,7 +85,7 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/attack_self(mob/living/carbon/human/user)
..()
- if(burn_state != ON_FIRE)
+ if(!(resistance_flags & ON_FIRE))
return
if((CLUMSY in user.mutations) && prob(50))
clumsilyDrink(user)
@@ -96,7 +96,7 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/MouseDrop(mob/living/carbon/human/user)
if(!ishuman(user))
return
- if((CLUMSY in user.mutations) && prob(50) && burn_state == ON_FIRE)
+ if((CLUMSY in user.mutations) && prob(50) && (resistance_flags & ON_FIRE))
clumsilyDrink(user)
else
..()
diff --git a/code/modules/logic/logic_base.dm b/code/modules/logic/logic_base.dm
index 952001e87f7..68f356cd7b7 100644
--- a/code/modules/logic/logic_base.dm
+++ b/code/modules/logic/logic_base.dm
@@ -40,7 +40,7 @@
/obj/machinery/logic_gate/New()
if(tamperproof) //doing this during New so we don't have to worry about forgetting to set these vars during editting / defining
- unacidable = 1
+ resistance_flags |= ACID_PROOF
..()
if(SSradio)
set_frequency(frequency)
diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm
index 98ff5dda52d..672e546184c 100644
--- a/code/modules/mob/living/carbon/human/species/golem.dm
+++ b/code/modules/mob/living/carbon/human/species/golem.dm
@@ -727,7 +727,8 @@
item_color = "golem"
has_sensor = 0
flags = ABSTRACT | NODROP
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 100)
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 100)
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/item/clothing/suit/golem
name = "golem shell"
@@ -742,13 +743,15 @@
flags_size = ONESIZEFITSALL
cold_protection = HEAD | UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 0, fire = 0, acid = 100)
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 0, fire = 100, acid = 100)
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/item/clothing/shoes/golem
name = "golem's feet"
desc = "sturdy golem feet"
icon_state = "golem"
item_state = "golem"
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags = ABSTRACT | NODROP
/obj/item/clothing/mask/gas/golem
@@ -756,7 +759,7 @@
desc = "the imposing face of a golem"
icon_state = "golem"
item_state = "golem"
- unacidable = 1
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags = ABSTRACT | NODROP
flags_inv = HIDEEARS | HIDEEYES
@@ -765,4 +768,5 @@
desc = "strong golem hands"
icon_state = "golem"
item_state = null
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags = ABSTRACT | NODROP
diff --git a/code/modules/mob/living/simple_animal/tribbles.dm b/code/modules/mob/living/simple_animal/tribbles.dm
index 56085bb1cc5..da8e783cf5f 100644
--- a/code/modules/mob/living/simple_animal/tribbles.dm
+++ b/code/modules/mob/living/simple_animal/tribbles.dm
@@ -132,7 +132,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
desc = "A glass lab container for storing interesting creatures."
density = 1
anchored = 1
- unacidable = 1//Dissolving the case would also delete tribble
+ resistance_flags = ACID_PROOF
var/health = 30
var/occupied = 1
var/destroyed = 0
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index caf1de6f025..2b2c2b2cdf9 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -364,13 +364,13 @@
return
else
var/melted_something = FALSE
- if(H.wear_mask && !H.wear_mask.unacidable)
+ if(H.wear_mask && !(H.wear_mask.resistance_flags & ACID_PROOF))
qdel(H.wear_mask)
H.update_inv_wear_mask()
to_chat(H, "Your [H.wear_mask] melts away!")
melted_something = TRUE
- if(H.head && !H.head.unacidable)
+ if(H.head && !(H.head.resistance_flags & ACID_PROOF))
qdel(H.head)
H.update_inv_head()
to_chat(H, "Your [H.head] melts away!")
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 6fa01280c68..d3c2740b7f6 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -417,7 +417,7 @@
layer = FLY_LAYER
pixel_x = -64
pixel_y = -64
- unacidable = 1
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/mob/living/immune = list() // the one who creates the timestop is immune
var/list/stopped_atoms = list()
diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm
index 0bc9a074179..8628ad88bbd 100644
--- a/code/modules/spacepods/spacepod.dm
+++ b/code/modules/spacepods/spacepod.dm
@@ -19,7 +19,7 @@
opacity = 0
anchored = 1
- unacidable = 1
+ resistance_flags = ACID_PROOF
layer = 3.9
infra_luminosity = 15