Merge pull request #12230 from Fox-McCloud/tendril-refactor

Refactors Spawners/Tendrils

code/modules/awaymissions/mission_code/ruins/oldstation.dm

@@ -160,7 +160,7 @@
 	item_state = "anc_helm"
 	armor = list("melee" = 30, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 75)
 	item_color = "ancient"
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF
 	sprite_sheets = null
 
 /obj/item/clothing/suit/space/hardsuit/ancient
@@ -170,7 +170,7 @@
 	item_state = "anc_hardsuit"
 	armor = list("melee" = 30, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 75)
 	slowdown = 3
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF
 	sprite_sheets = null
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ancient
 	var/footstep = 1

code/modules/clothing/masks/gasmask.dm

@@ -46,7 +46,7 @@
 	icon_state = "gas_mining"
 	actions_types = list(/datum/action/item_action/adjust)
 	armor = list("melee" = 10, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 0, "bio" = 50, "rad" = 0)
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF
 
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/mask.dmi',

code/modules/clothing/shoes/miscellaneous.dm

@@ -126,7 +126,7 @@
 	name = "mining boots"
 	desc = "Steel-toed mining boots for mining in hazardous environments. Very good at keeping toes uncrushed."
 	icon_state = "explorer"
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF
 
 /obj/item/clothing/shoes/winterboots
 	name = "winter boots"
@@ -310,7 +310,7 @@
 	icon_state = "jetboots"
 	item_state = "jetboots"
 	item_color = "hosred"
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF
 	actions_types = list(/datum/action/item_action/bhop)
 	permeability_coefficient = 0.05
 	can_cut_open = FALSE

code/modules/clothing/spacesuits/plasmamen.dm

@@ -8,7 +8,7 @@
 	flash_protect = 2
 	tint = 2
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 0)
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF
 	var/brightness_on = 4 //luminosity when the light is on
 	var/on = FALSE
 	var/smile = FALSE

code/modules/clothing/suits/armor.dm

@@ -501,7 +501,7 @@
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF
 
 /obj/item/clothing/head/hooded/drake
 	name = "drake helmet"
@@ -511,7 +511,7 @@
 	armor = list("melee" = 70, "bullet" = 30, "laser" = 50, "energy" = 40, "bomb" = 70, "bio" = 60, "rad" = 50, "fire" = 100, "acid" = 100)
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF
 	flags = BLOCKHAIR
 	flags_cover = HEADCOVERSEYES
 

code/modules/food_and_drinks/food/foods/meat.dm

@@ -239,7 +239,7 @@
 /obj/item/reagent_containers/food/snacks/goliath_steak
 	name = "goliath steak"
 	desc = "A delicious, lava cooked steak."
-	resistance_flags = LAVA_PROOF | FIRE_PROOF
+	burn_state = LAVA_PROOF
 	icon_state = "goliathsteak"
 	trash = null
 	list_reagents = list("protein" = 6, "vitamin" = 2)

code/modules/mining/equipment/explorer_gear.dm

@@ -12,7 +12,7 @@
 	hoodtype = /obj/item/clothing/head/hooded/explorer
 	armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
 	allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF
 	hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
 
 	sprite_sheets = list(
@@ -34,7 +34,7 @@
 	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, "fire" = 50, "acid" = 50)
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF
 
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/head.dmi',
@@ -50,7 +50,7 @@
 	item_state = "hostile_env"
 	flags = THICKMATERIAL //not spaceproof
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
-	burn_state = FIRE_PROOF | LAVA_PROOF
+	burn_state = LAVA_PROOF
 	slowdown = 0
 	armor = list(melee = 70, bullet = 40, laser = 10, energy = 10, bomb = 50, bio = 100, rad = 100)
 	allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
@@ -82,7 +82,7 @@
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	flags = THICKMATERIAL // no space protection
 	armor = list(melee = 70, bullet = 40, laser = 10, energy = 10, bomb = 50, bio = 100, rad = 100)
-	burn_state = FIRE_PROOF | LAVA_PROOF
+	burn_state = LAVA_PROOF
 
 /obj/item/clothing/head/helmet/space/hostile_environment/New()
 	..()

code/modules/mining/equipment/survival_pod.dm

@@ -295,7 +295,8 @@
 
 /obj/structure/fans/tiny/invisible
 	name = "air flow blocker"
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF
+	resistance_flags = INDESTRUCTIBLE
+	burn_state = LAVA_PROOF
 	unacidable = TRUE
 	invisibility = INVISIBILITY_ABSTRACT
 

code/modules/mining/lavaland/loot/ashdragon_loot.dm

@@ -168,7 +168,7 @@
 	force = 25
 	damtype = BURN
 	hitsound = 'sound/weapons/sear.ogg'
-	burn_state = LAVA_PROOF | FIRE_PROOF
+	burn_state = LAVA_PROOF
 	unacidable = 1
 	var/turf_type = /turf/simulated/floor/plating/lava/smooth
 	var/transform_string = "lava"

code/modules/mining/lavaland/loot/colossus_loot.dm

@@ -27,7 +27,7 @@
 	luminosity = 8
 	max_n_of_items = INFINITY
 	unacidable = 1
-	burn_state = LAVA_PROOF | FIRE_PROOF
+	burn_state = LAVA_PROOF
 	pixel_y = -4
 	use_power = NO_POWER_USE
 	var/memory_saved = FALSE
@@ -116,7 +116,7 @@
 	luminosity = 8
 	use_power = NO_POWER_USE
 	density = 1
-	burn_state = LAVA_PROOF | FIRE_PROOF
+	burn_state = LAVA_PROOF
 	unacidable = 1
 	var/activation_method = "touch"
 	var/activation_damage_type = null

code/modules/mining/lavaland/loot/tendril_loot.dm

@@ -164,8 +164,7 @@
 	icon_state = "goliath_boat"
 	icon = 'icons/obj/lavaland/dragonboat.dmi'
 	keytype = /obj/item/oar
-	burn_state = LAVA_PROOF | FIRE_PROOF
-	resistance_flags = LAVA_PROOF | FIRE_PROOF
+	burn_state = LAVA_PROOF
 
 /obj/vehicle/lavaboat/relaymove(mob/user, direction)
 	var/turf/next = get_step(src, direction)
@@ -185,7 +184,7 @@
 	desc = "Not to be confused with the kind Research hassles you for."
 	force = 12
 	w_class = WEIGHT_CLASS_NORMAL
-	burn_state = LAVA_PROOF | FIRE_PROOF
+	burn_state = LAVA_PROOF
 
 /datum/crafting_recipe/oar
 	name = "goliath bone oar"
@@ -208,7 +207,7 @@
 	desc = "A tiny ship inside a bottle."
 	icon = 'icons/obj/lavaland/artefacts.dmi'
 	icon_state = "ship_bottle"
-	resistance_flags = LAVA_PROOF | FIRE_PROOF
+	burn_state = LAVA_PROOF
 
 /obj/item/ship_in_a_bottle/attack_self(mob/user)
 	to_chat(user, "You're not sure how they get the ships in these things, but you're pretty sure you know how to get it out.")

code/modules/mining/lavaland/necropolis_chests.dm

@@ -6,7 +6,7 @@
 	icon_state = "necrocrate"
 	icon_opened = "necrocrateopen"
 	icon_closed = "necrocrate"
-	burn_state = LAVA_PROOF | FIRE_PROOF
+	burn_state = LAVA_PROOF
 	unacidable = 1
 
 /obj/structure/closet/crate/necropolis/tendril

code/modules/mining/mine_items.dm

@@ -2,12 +2,22 @@
 
 //this item is intended to give the effect of entering the mine, so that light gradually fades
 /obj/effect/light_emitter
-	name = "Light emtter"
-	anchored = 1
+	name = "Light emitter"
+	anchored = TRUE
 	invisibility = 101
-	unacidable = 1
-	light_range = 8
-	light_power = 0
+	unacidable = TRUE
+	var/set_luminosity = 8
+	var/set_cap = 0
+
+/obj/effect/light_emitter/Initialize(mapload)
+	. = ..()
+	set_light(set_luminosity, set_cap)
+
+/obj/effect/light_emitter/singularity_pull()
+	return
+
+/obj/effect/light_emitter/singularity_act()
+	return
 
 /**********************Miner Lockers**************************/
 

code/modules/mob/living/simple_animal/hostile/mining/necropolis_tendril.dm

@@ -1,81 +0,0 @@
-/mob/living/simple_animal/hostile/spawner/lavaland
-	name = "necropolis tendril"
-	desc = "A vile tendril of corruption, originating deep underground. Terrible monsters are pouring out of it."
-	icon = 'icons/mob/nest.dmi'
-	icon_state = "tendril"
-	icon_living = "tendril"
-	icon_dead = "tendril"
-	faction = list("mining")
-	weather_immunities = list("lava","ash")
-	luminosity = 1
-	health = 250
-	maxHealth = 250
-	max_mobs = 3
-	spawn_time = 300 //30 seconds default
-	mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril)
-	spawn_text = "emerges from"
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 0
-	maxbodytemp = INFINITY
-	move_resist = INFINITY
-	anchored = TRUE
-	loot = list(/obj/effect/collapse, /obj/structure/closet/crate/necropolis/tendril)
-	del_on_death = 1
-	var/gps = null
-
-/mob/living/simple_animal/hostile/spawner/lavaland/New()
-	..()
-	//for(var/F in RANGE_TURFS(1, src)) TODO: Uncomment
-		//if(ismineralturf(F))
-			//var/turf/simulated/mineral/M = F 
-			//M.ChangeTurf(M.turf_type, FALSE, TRUE)
-	gps = new /obj/item/gps/internal(src)
-
-/mob/living/simple_animal/hostile/spawner/lavaland/Destroy()
-	qdel(gps)
-	. = ..()
-
-/mob/living/simple_animal/hostile/spawner/lavaland/death()
-	var/last_tendril = TRUE
-	for(var/mob/living/simple_animal/hostile/spawner/lavaland/other in GLOB.mob_list)
-		if(other != src)
-			last_tendril = FALSE
-			break
-	if(last_tendril && !admin_spawned)
-		if(SSmedals.hub_enabled)
-			for(var/mob/living/L in view(7,src))
-				if(L.stat || !L.client)
-					continue
-				SSmedals.UnlockMedal("[BOSS_MEDAL_TENDRIL] [ALL_KILL_MEDAL]", L.client)
-				SSmedals.SetScore(TENDRIL_CLEAR_SCORE, L.client, 1)
-	..()
-
-/obj/effect/collapse
-	name = "collapsing necropolis tendril"
-	desc = "Get clear!"
-	luminosity = 1
-	layer = ABOVE_OPEN_TURF_LAYER
-	icon = 'icons/mob/nest.dmi'
-	icon_state = "tendril"
-	anchored = TRUE
-
-/obj/effect/collapse/New()
-	..()
-	visible_message("<span class='boldannounce'>The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!</span>")
-	visible_message("<span class='warning'>Something falls free of the tendril!</span>")
-	playsound(get_turf(src),'sound/effects/tendril_destroyed.ogg', 200, 0, 50, 1, 1)
-	spawn(50)
-		for(var/mob/M in range(7,src))
-			shake_camera(M, 15, 1)
-		playsound(get_turf(src),'sound/effects/explosionfar.ogg', 200, 1)
-		visible_message("<span class='boldannounce'>The tendril falls inward, the ground around it widening into a yawning chasm!</span>")
-		for(var/turf/T in range(2,src))
-			if(!T.density)
-				T.TerraformTurf(/turf/simulated/floor/chasm/straight_down/lava_land_surface)
-		qdel(src)
-
-/mob/living/simple_animal/hostile/spawner/lavaland/goliath
-	mob_types = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/tendril)
-
-/mob/living/simple_animal/hostile/spawner/lavaland/legion
-	mob_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril)

code/modules/mob/living/simple_animal/hostile/netherworld.dm

@@ -64,12 +64,11 @@
 	attacktext = "punches"
 	deathmessage = "falls apart into a fine dust."
 
-/mob/living/simple_animal/hostile/spawner/nether
+/obj/structure/spawner/nether
 	name = "netherworld link"
 	desc = null //see examine()
 	icon_state = "nether"
-	health = 50
-	maxHealth = 50
+	max_integrity = 50
 	spawn_time = 600 //1 minute
 	max_mobs = 15
 	icon = 'icons/mob/nest.dmi'
@@ -77,31 +76,30 @@
 	mob_types = list(/mob/living/simple_animal/hostile/netherworld/migo, /mob/living/simple_animal/hostile/netherworld, /mob/living/simple_animal/hostile/netherworld/blankbody)
 	faction = list("nether")
 
-/mob/living/simple_animal/hostile/spawner/nether/death()
-	. = ..()
-	qdel(src)
+/obj/structure/spawner/nether/Initialize(mapload)
+	.=..()
+	START_PROCESSING(SSprocessing, src)
 
-/mob/living/simple_animal/hostile/spawner/nether/examine(mob/user)
+/obj/structure/spawner/nether/examine(mob/user)
 	..()
-	if(isskeleton(user))
+	if(isskeleton(user) || iszombie(user))
 		to_chat(user, "A direct link to another dimension full of creatures very happy to see you. <span class='nicegreen'>You can see your house from here!</span>")
 	else
 		to_chat(user, "A direct link to another dimension full of creatures not very happy to see you. <span class='warning'>Entering the link would be a very bad idea.</span>")
 
-/mob/living/simple_animal/hostile/spawner/nether/attack_hand(mob/user)
+/obj/structure/spawner/nether/attack_hand(mob/user)
 	. = ..()
-	if(isskeleton(user))
+	if(isskeleton(user) || iszombie(user))
 		to_chat(user, "<span class='notice'>You don't feel like going home yet...</span>")
 	else
 		user.visible_message("<span class='warning'>[user] is violently pulled into the link!</span>", \
 							"<span class='userdanger'>Touching the portal, you are quickly pulled through into a world of unimaginable horror!</span>")
 		contents.Add(user)
 
-/mob/living/simple_animal/hostile/spawner/nether/Life()
-	. = ..()
+/obj/structure/spawner/nether/process()
 	for(var/mob/living/M in contents)
 		if(M)
-			playsound(src, 'sound/magic/demon_consume.ogg', 50, 1)
+			playsound(src, 'sound/magic/demon_consume.ogg', 50, TRUE)
 			M.adjustBruteLoss(60)
 			new /obj/effect/gibspawner/generic(get_turf(M), M)
 			if(M.stat == DEAD)

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -76,7 +76,7 @@
 
 	var/mob/living/carbon/human/master_commander = null //holding var for determining who own/controls a sentient simple animal (for sentience potions).
 
-	var/mob/living/simple_animal/hostile/spawner/nest
+	var/datum/component/spawner/nest
 
 	var/sentience_type = SENTIENCE_ORGANIC // Sentience type, for slime potions
 

code/modules/mob/living/simple_animal/spawner.dm

@@ -1,85 +0,0 @@
-/mob/living/simple_animal/hostile/spawner
-	name = "monster nest"
-	icon = 'icons/mob/animal.dmi'
-	health = 100
-	maxHealth = 100
-	var/list/spawned_mobs = list()
-	var/max_mobs = 5
-	var/spawn_delay = 0
-	var/spawn_time = 300 //30 seconds default
-	var/mob_types = list(/mob/living/simple_animal/hostile/carp)
-	var/spawn_text = "emerges from"
-	status_flags = 0
-	move_resist = MOVE_FORCE_VERY_STRONG
-	AIStatus = AI_OFF
-	a_intent = INTENT_HARM
-	stop_automated_movement = 1
-	wander = 0
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 0
-	maxbodytemp = 350
-	layer = MOB_LAYER-0.1
-	sentience_type = SENTIENCE_BOSS
-
-
-/mob/living/simple_animal/hostile/spawner/Destroy()
-	for(var/mob/living/simple_animal/L in spawned_mobs)
-		if(L.nest == src)
-			L.nest = null
-	spawned_mobs = null
-	return ..()
-
-/mob/living/simple_animal/hostile/spawner/Life()
-	..()
-	spawn_mob()
-
-/mob/living/simple_animal/hostile/spawner/proc/spawn_mob()
-	if(spawned_mobs.len >= max_mobs)
-		return 0
-	if(spawn_delay > world.time)
-		return 0
-	spawn_delay = world.time + spawn_time
-	var/chosen_type = pick(mob_types)
-	var/mob/living/simple_animal/L = new chosen_type(loc)
-	L.admin_spawned = admin_spawned	//If we were admin spawned, lets have our children count as that as well.
-	spawned_mobs += L
-	L.nest = src
-	L.faction = src.faction
-	visible_message("<span class='danger'>[L] [spawn_text] [src].</span>")
-
-/mob/living/simple_animal/hostile/spawner/syndicate
-	name = "warp beacon"
-	icon = 'icons/obj/device.dmi'
-	icon_state = "syndbeacon"
-	spawn_text = "warps in from"
-	mob_types = list(/mob/living/simple_animal/hostile/syndicate/ranged)
-	faction = list("syndicate")
-
-/mob/living/simple_animal/hostile/spawner/mining
-	name = "monster den"
-	desc = "A hole dug into the ground, harboring all kinds of monsters found within most caves or mining areas."
-	icon_state = "hole"
-	icon_living = "hole"
-	health = 200
-	maxHealth = 200
-	max_mobs = 3
-	icon = 'icons/mob/nest.dmi'
-	spawn_text = "crawls out of"
-	mob_types = list(/mob/living/simple_animal/hostile/asteroid/goldgrub)
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	faction = list("mining")
-
-/mob/living/simple_animal/hostile/spawner/mining/goliath
-	name = "goliath den"
-	desc = "A den housing a nest of goliaths, oh god why?"
-	mob_types = list(/mob/living/simple_animal/hostile/asteroid/goliath)
-
-/mob/living/simple_animal/hostile/spawner/mining/hivelord
-	name = "hivelord den"
-	desc = "A den housing a nest of hivelords."
-	mob_types = list(/mob/living/simple_animal/hostile/asteroid/hivelord)
-
-/mob/living/simple_animal/hostile/spawner/mining/basilisk
-	name = "basilisk den"
-	desc = "A den housing a nest of basilisks, bring a coat."
-	mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk)

code/modules/ruins/lavalandruin_code/ash_walker_den.dm

@@ -9,7 +9,7 @@
 	anchored = TRUE
 	density = TRUE
 
-	resistance_flags = FIRE_PROOF | LAVA_PROOF
+	burn_state = LAVA_PROOF
 	max_integrity = 200
 
 	var/faction = list("ashwalker")

code/modules/ruins/lavalandruin_code/dead_ratvar.dm

@@ -13,7 +13,8 @@
 	bound_height = 64
 	pixel_y = -10
 	unacidable = TRUE
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF
+	resistance_flags = INDESTRUCTIBLE
+	burn_state = LAVA_PROOF
 
 // An "overlay" used by clockwork walls and floors to appear normal to mesons.
 /obj/effect/clockwork/overlay
@@ -78,7 +79,7 @@
 	anchored = TRUE
 	density = TRUE
 	unacidable = TRUE
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF
 	desc = "A massive brass gear. You could probably secure or unsecure it with a wrench, or just climb over it."
 
 /obj/structure/clockwork/wall_gear/displaced
@@ -149,7 +150,7 @@
 	desc = "Broken shards of some oddly malleable metal. They occasionally move and seem to glow."
 	icon = 'icons/obj/clockwork_objects.dmi'
 	icon_state = "alloy_shards"
-	resistance_flags = LAVA_PROOF | FIRE_PROOF
+	burn_state = LAVA_PROOF
 	unacidable = TRUE
 	var/randomsinglesprite = FALSE
 	var/randomspritemax = 2

code/modules/ruins/lavalandruin_code/syndicate_base.dm

@@ -18,7 +18,7 @@
 	                /obj/item/grenade/chem_grenade/adv_release = 5,
 					/obj/item/reagent_containers/food/drinks/bottle/holywater = 1)
 	product_slogans = "It's not pyromania if you're getting paid!;You smell that? Plasma, son. Nothing else in the world smells like that.;I love the smell of Plasma in the morning."
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF
 
 // Spawners
 /obj/effect/mob_spawn/human/lavaland_syndicate
@@ -63,7 +63,7 @@
 
 /obj/effect/mob_spawn/human/lavaland_syndicate/comms/space
 	flavour_text = "<span class='big bold'>You are a syndicate agent,</span><b> assigned to a small listening post station situated near your hated enemy's top secret research facility: Space Station 13. <b>Monitor enemy activity as best you can, and try to keep a low profile. Do not abandon the base.</b> Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!</b> \
-	<br><i>You are free to attack anyone not aligned with the Syndicate in the vicinity of your base. <font size=6>DO NOT</font> work against Syndicate personnel (such as traitors or nuclear operatives). You may work with or against non-Syndicate antagonists on a case-by-case basis. <font size=6>DO NOT</font> leave your base without admin permission.</i>" 
+	<br><i>You are free to attack anyone not aligned with the Syndicate in the vicinity of your base. <font size=6>DO NOT</font> work against Syndicate personnel (such as traitors or nuclear operatives). You may work with or against non-Syndicate antagonists on a case-by-case basis. <font size=6>DO NOT</font> leave your base without admin permission.</i>"
 
 /obj/effect/mob_spawn/human/lavaland_syndicate/comms/space/Initialize(mapload)
 	. = ..()

code/modules/ruins/objects_and_mobs/necropolis_gate.dm

@@ -11,7 +11,8 @@
 	density = TRUE
 	pixel_x = -32
 	pixel_y = -32
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF
+	resistance_flags = INDESTRUCTIBLE
+	burn_state = LAVA_PROOF
 	unacidable = 1
 	light_range = 8
 	light_color = LIGHT_COLOR_LAVA
@@ -213,7 +214,8 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
 	anchored = TRUE
 	pixel_x = -64
 	pixel_y = -40
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF
+	resistance_flags = INDESTRUCTIBLE
+	burn_state = LAVA_PROOF
 	unacidable = TRUE
 	var/open = FALSE
 	var/static/mutable_appearance/top_overlay
@@ -245,7 +247,8 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
 	icon_state = "pristine_tile1"
 	layer = ABOVE_OPEN_TURF_LAYER
 	anchored = TRUE
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF
+	resistance_flags = INDESTRUCTIBLE
+	burn_state = LAVA_PROOF
 	unacidable = TRUE
 	var/tile_key = "pristine_tile"
 	var/tile_random_sprite_max = 24

code/modules/zombie/items.dm

@@ -5,7 +5,7 @@
 		sustain the zombie, forcing open airlock doors and opening \
 		child-safe caps on bottles."
 	flags = NODROP|ABSTRACT|DROPDEL
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF
+	resistance_flags = INDESTRUCTIBLE
 	burn_state = LAVA_PROOF
 	unacidable = TRUE
 	icon = 'icons/effects/blood.dmi'