Merge with upstream/master

Fixes conflicts

code/modules/mining/equipment_locker.dm

@@ -324,7 +324,7 @@
 		var/list/L = list()
 		for(var/obj/item/device/radio/beacon/B in world)
 			var/turf/T = get_turf(B)
-			if(T.z == 1)
+			if((T.z in config.station_levels))
 				L += B
 		if(!L.len)
 			user << "<span class='notice'>The [src.name] failed to create a wormhole.</span>"

code/modules/mining/laborcamp/laborstacker.dm

@@ -63,9 +63,10 @@
 /obj/machinery/mineral/labor_claim_console/attackby(obj/item/I as obj, mob/user as mob)
 	if(istype(I, /obj/item/weapon/card/id))
 		return attack_hand(user)
-	else if(istype(I, /obj/item/weapon/card/emag))
-		return emag(user)
 	..()
+	
+/obj/machinery/mineral/labor_claim_console/emag_act(user as mob)
+	emag(user)
 
 /obj/machinery/mineral/labor_claim_console/proc/emag(mob/user as mob)
 	if(!emagged)

code/modules/mining/mine_items.dm

@@ -55,19 +55,22 @@
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 15.0
-	throwforce = 4.0
+	throwforce = 10.0
 	item_state = "pickaxe"
 	w_class = 4.0
 	m_amt = 3750 //one sheet, but where can you make them?
 	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("hit", "pierced", "sliced", "attacked")
-	var/drill_sound = 'sound/weapons/Genhit.ogg'
+	var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg')
 	var/drill_verb = "picking"
 	sharp = 1
 
 	var/excavation_amount = 100
 
+	proc/playDigSound()
+		playsound(src, pick(digsound),20,1)
+
 	hammer
 		name = "sledgehammer"
 		//icon_state = "sledgehammer" Waiting on sprite
@@ -86,6 +89,8 @@
 		icon_state = "handdrill"
 		item_state = "jackhammer"
 		digspeed = 30
+		hitsound = 'sound/weapons/drill.ogg'
+		digsound = list('sound/weapons/drill.ogg')
 		origin_tech = "materials=2;powerstorage=3;engineering=2"
 		desc = "Yours is the drill that will pierce through the rock walls."
 
@@ -94,6 +99,8 @@
 		icon_state = "jackhammer"
 		item_state = "jackhammer"
 		digspeed = 15 //faster than drill, but cannot dig
+		hitsound = 'sound/weapons/sonic_jackhammer.ogg'
+		digsound = list('sound/weapons/sonic_jackhammer.ogg')
 		origin_tech = "materials=3;powerstorage=2;engineering=2"
 		desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
 
@@ -112,6 +119,8 @@
 		w_class = 3.0 //it is smaller than the pickaxe
 		damtype = "fire"
 		digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire
+		hitsound = 'sound/weapons/plasma_cutter.ogg'
+		digsound = list('sound/weapons/plasma_cutter.ogg')
 		origin_tech = "materials=4;plasmatech=3;engineering=3"
 		desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
 
@@ -129,6 +138,8 @@
 		item_state = "jackhammer"
 		digspeed = 5 //Digs through walls, girders, and can dig up sand
 		origin_tech = "materials=6;powerstorage=4;engineering=5"
+		hitsound = 'sound/weapons/drill.ogg'
+		digsound = list('sound/weapons/drill.ogg')
 		desc = "Yours is the drill that will pierce the heavens!"
 
 		traitor //Pocket-sized traitor diamond drill.
@@ -143,6 +154,8 @@
 		icon_state = "jackhammer"
 		item_state = "jackhammer"
 		digspeed = 15
+		hitsound = 'sound/weapons/drill.ogg'
+		digsound = list('sound/weapons/drill.ogg')
 		desc = ""
 
 /*****************************Shovel********************************/

code/modules/mining/mine_turfs.dm

@@ -137,7 +137,7 @@
 				return
 			last_act = world.time
 
-			playsound(user, P.drill_sound, 20, 1)
+			P.playDigSound()
 
 			//handle any archaeological finds we might uncover
 			var/fail_message

code/modules/mining/ore.dm

@@ -84,7 +84,7 @@
 /obj/item/weapon/ore/New()
 	pixel_x = rand(0,16)-8
 	pixel_y = rand(0,8)-8
-	if(src.z == 5) score_oremined++ //When ore spawns, increment score.  Only include ore spawned on mining asteroid (No Clown Planet)
+	if(src.z == ASTEROID_Z) score_oremined++ //When ore spawns, increment score.  Only include ore spawned on mining asteroid (No Clown Planet)
 
 /obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W,/obj/item/device/core_sampler))