Merge branch 'master' into upstream-merge-8298

code/modules/mining/drilling/drill.dm

@@ -295,7 +295,7 @@
 		if(supports.len >= braces_needed)
 			supported = 1
 		else for(var/obj/machinery/mining/brace/check in supports)
-			if(check.brace_tier > 3)
+			if(check.brace_tier >= 3)
 				supported = 1
 		for(var/obj/machinery/mining/brace/check in supports)
 			total_brace_tier += check.brace_tier

code/modules/mining/mine_items.dm

@@ -128,6 +128,26 @@
 	edge = TRUE
 	var/digspeed = 40
 
+/obj/item/weapon/shovel/wood
+	icon_state = "whiteshovel"
+	item_state = "whiteshovel"
+	var/datum/material/material
+
+/obj/item/weapon/shovel/wood/Initialize(var/ml, var/_mat)
+	. = ..()
+	material = get_material_by_name(_mat)
+	if(!istype(material))
+		material = null
+	else
+		name = "[material.display_name] shovel"
+		matter = list("[material.name]" = 50)
+		update_icon()
+
+/obj/item/weapon/shovel/wood/update_icon()
+	. = ..()
+	color = material ? material.icon_colour : initial(color)
+	alpha = min(max(255 * material.opacity, 80), 255)
+
 /obj/item/weapon/shovel/spade
 	name = "spade"
 	desc = "A small tool for digging and moving dirt."

code/modules/mining/mine_turfs.dm

@@ -6,24 +6,25 @@ var/list/mining_overlay_cache = list()
 	icon = 'icons/turf/walls.dmi'
 	icon_state = "rock-dark"
 	density = TRUE
-
+	
 /turf/simulated/mineral //wall piece
 	name = "rock"
 	icon = 'icons/turf/walls.dmi'
 	icon_state = "rock"
-	var/rock_side_icon_state = "rock_side"
-	var/sand_icon_state = "asteroid"
-	var/rock_icon_state = "rock"
-	var/random_icon = 0
 	oxygen = 0
 	nitrogen = 0
 	opacity = 1
 	density = TRUE
 	blocks_air = 1
 	temperature = T0C
-
 	can_dirty = FALSE
 
+	var/floor_name = "sand"
+	var/rock_side_icon_state = "rock_side"
+	var/sand_icon_state = "asteroid"
+	var/rock_icon_state = "rock"
+	var/random_icon = 0
+
 	var/ore/mineral
 	var/sand_dug
 	var/mined_ore = 0
@@ -65,6 +66,10 @@ var/list/mining_overlay_cache = list()
 
 	has_resources = 1
 
+/turf/simulated/mineral/ChangeTurf(turf/N, tell_universe, force_lighting_update, preserve_outdoors)
+	clear_ore_effects()
+	. = ..()
+
 // Alternative rock wall sprites.
 /turf/simulated/mineral/light
 	icon_state = "rock-light"
@@ -109,6 +114,14 @@ var/list/mining_overlay_cache = list()
 	blocks_air = 0
 	can_build_into_floor = TRUE
 
+/turf/simulated/mineral/floor/mud
+	icon_state = "mud"
+	sand_icon_state = "mud"
+
+/turf/simulated/mineral/floor/dirt
+	icon_state = "dirt"
+	sand_icon_state = "dirt"
+
 //Alternative sand floor sprite.
 /turf/simulated/mineral/floor/light
 	icon_state = "sand-light"
@@ -140,6 +153,7 @@ var/list/mining_overlay_cache = list()
 	opacity = 0
 	blocks_air = 0
 	can_build_into_floor = TRUE
+	clear_ore_effects()
 	update_general()
 
 /turf/simulated/mineral/proc/make_wall()
@@ -223,7 +237,7 @@ var/list/mining_overlay_cache = list()
 
 	//We are a sand floor
 	else
-		name = "sand"
+		name = floor_name
 		icon = 'icons/turf/flooring/asteroid.dmi'
 		icon_state = sand_icon_state
 
@@ -611,8 +625,8 @@ var/list/mining_overlay_cache = list()
 				if(prob(50))
 					M.Stun(5)
 			SSradiation.flat_radiate(src, 25, 100)
-			if(prob(25))
-				excavate_find(prob(5), finds[1])
+		if(prob(25))
+			excavate_find(prob(5), finds[1])
 	else if(rand(1,500) == 1)
 		visible_message("<span class='notice'>An old dusty crate was buried within!</span>")
 		new /obj/structure/closet/crate/secure/loot(src)

code/modules/mining/mine_turfs_vr.dm

@@ -14,6 +14,16 @@
 /turf/simulated/mineral/floor/ignore_cavegen
 	ignore_cavegen = TRUE
 
+/turf/simulated/mineral/ignore_cavegen/cave
+	oxygen = MOLES_O2STANDARD
+	nitrogen = MOLES_N2STANDARD
+	temperature	= T20C
+
+/turf/simulated/mineral/floor/ignore_cavegen/cave
+	oxygen = MOLES_O2STANDARD
+	nitrogen = MOLES_N2STANDARD
+	temperature	= T20C
+
 /turf/simulated/mineral/vacuum
 	oxygen = 0
 	nitrogen = 0

code/modules/mining/ore_redemption_machine/equipment_vendor.dm

@@ -123,12 +123,13 @@
 		EQUIPMENT("KA Cooldown Decrease",		/obj/item/borg/upgrade/modkit/cooldown,							1200),
 		EQUIPMENT("KA Range Increase",			/obj/item/borg/upgrade/modkit/range,							1000),
 		EQUIPMENT("KA Temperature Modulator",	/obj/item/borg/upgrade/modkit/heater,							1000),
-		EQUIPMENT("KA Off-Station Modulator",	/obj/item/borg/upgrade/modkit/indoors/offsite, 					1500),
+		EQUIPMENT("KA Off-Station Modulator",	/obj/item/borg/upgrade/modkit/offsite, 							1750),
 		EQUIPMENT("KA Holster",					/obj/item/clothing/accessory/holster/waist/kinetic_accelerator,	350),
 		EQUIPMENT("KA Super Chassis",			/obj/item/borg/upgrade/modkit/chassis_mod,						250),
 		EQUIPMENT("KA Hyper Chassis",			/obj/item/borg/upgrade/modkit/chassis_mod/orange,				300),
 		EQUIPMENT("KA Adjustable Tracer Rounds",/obj/item/borg/upgrade/modkit/tracer/adjustable,				175),
 		EQUIPMENT("KA White Tracer Rounds",		/obj/item/borg/upgrade/modkit/tracer,							125),
+		EQUIPMENT("Premium Kinetic Accelerator",/obj/item/weapon/gun/energy/kinetic_accelerator/premiumka,		12000),
 	)
 	prize_list["Digging Tools"] = list(
 		// EQUIPMENT("Diamond Pickaxe",	/obj/item/weapon/pickaxe/diamond,				2000),
@@ -166,6 +167,7 @@
 		EQUIPMENT("Plush Toy",					/obj/random/plushie,												300),
 		EQUIPMENT("Soap",						/obj/item/weapon/soap/nanotrasen,									200),
 		EQUIPMENT("Thalers - 100",				/obj/item/weapon/spacecash/c100,									1000),
+		EQUIPMENT("Thalers - 1000",				/obj/item/weapon/spacecash/c1000,									10000),
 		EQUIPMENT("Umbrella",					/obj/item/weapon/melee/umbrella/random,								200),
 		EQUIPMENT("Whiskey",					/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey,		125),
 	)
@@ -285,7 +287,10 @@
 				return
 
 			remove_points(inserted_id, prize.cost)
-			new prize.equipment_path(loc)
+			//VOREStation Edit Start
+			var/obj/I = new prize.equipment_path(loc)
+			I.persist_storable = FALSE
+			//VOREStation Edit End
 			flick(icon_vend, src) //VOREStation Add
 		else
 			flick(icon_deny, src) //VOREStation Add