Merge remote-tracking branch 'upstream/master' into lavaland-udpate-split

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**************************/