Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

# Conflicts:
#	code/game/atoms.dm
#	code/game/gamemodes/nuclear/nuclearbomb.dm

code/modules/mining/equipment.dm

@@ -417,6 +417,7 @@
 				for(var/turf/closed/mineral/M in minerals)
 					var/turf/F = get_turf(M)
 					var/image/I = image('icons/turf/smoothrocks.dmi', loc = F, icon_state = M.scan_state, layer = FLASH_LAYER)
+					I.plane = FULLSCREEN_PLANE
 					C.images += I
 					spawn(30)
 						if(C)

code/modules/mining/lavaland/ash_flora.dm

@@ -212,7 +212,7 @@
 //what you can craft with these things
 /datum/crafting_recipe/mushroom_bowl
 	name = "Mushroom Bowl"
-	result = /obj/item/reagent_containers/food/drinks/mushroom_bowl
+	result = /obj/item/weapon/reagent_containers/food/drinks/mushroom_bowl
 	reqs = list(/obj/item/weapon/reagent_containers/food/snacks/ash_flora/shavings = 5)
 	time = 30
 	category = CAT_PRIMAL

code/modules/mining/machine_redemption.dm

@@ -268,6 +268,7 @@
 			s.use(s.max_amount)
 		s.loc = loc
 		s.layer = initial(s.layer)
+		s.plane = initial(s.plane)
 
 /obj/machinery/mineral/ore_redemption/power_change()
 	..()