Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/modules/mining/equipment/survival_pod.dm

@@ -202,7 +202,7 @@
 		var/obj/item/reagent_containers/food/snacks/donkpocket/warm/W = new(src)
 		load(W)
 	if(prob(50))
-		var/obj/item/storage/box/dice/D = new(src)
+		var/obj/item/storage/dice/D = new(src)
 		load(D)
 	else
 		var/obj/item/instrument/guitar/G = new(src)

code/modules/mining/lavaland/necropolis_chests.dm

@@ -766,6 +766,7 @@
 /obj/item/melee/transforming/cleaving_saw
 	name = "cleaving saw"
 	desc = "This saw, effective at drawing the blood of beasts, transforms into a long cleaver that makes use of centrifugal force."
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	force = 12
 	force_on = 20 //force when active
 	throwforce = 20
@@ -1183,6 +1184,7 @@
 /obj/item/gun/ballistic/revolver/doublebarrel/super
 	name = "super combat shotgun"
 	desc = "From the belly of the beast - or rather, demon. Twice as lethal as a less-than-super shotgun, but a tad bulkier."
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	icon_state = "heckgun"
 	slot_flags = null
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/heck
@@ -1213,6 +1215,7 @@
 /obj/item/hierophant_club
 	name = "hierophant club"
 	desc = "The strange technology of this large club allows various nigh-magical feats. It used to beat you, but now you can set the beat."
+	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	icon_state = "hierophant_club_ready_beacon"
 	item_state = "hierophant_club_ready_beacon"
 	icon = 'icons/obj/lavaland/artefacts.dmi'