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

code/modules/mining/equipment_locker.dm

@@ -474,7 +474,7 @@
 
 /obj/item/weapon/resonator/proc/CreateResonance(var/target, var/creator)
 	if(cooldown <= 0)
-		playsound(src,'sound/effects/stealthoff.ogg',50,1)
+		playsound(src,'sound/weapons/resonator_fire.ogg',50,1)
 		var/obj/effect/resonance/R = new /obj/effect/resonance(get_turf(target))
 		R.creator = creator
 		cooldown = 1
@@ -507,7 +507,7 @@
 		return
 	if(istype(proj_turf, /turf/simulated/mineral))
 		var/turf/simulated/mineral/M = proj_turf
-		playsound(src,'sound/effects/sparks4.ogg',50,1)
+		playsound(src,'sound/weapons/resonator_blast.ogg',50,1)
 		M.gets_drilled()
 		spawn(5)
 			qdel(src)
@@ -518,7 +518,7 @@
 			name = "strong resonance field"
 			resonance_damage = 45
 		spawn(50)
-			playsound(src,'sound/effects/sparks4.ogg',50,1)
+			playsound(src,'sound/weapons/resonator_blast.ogg',50,1)
 			if(creator)
 				for(var/mob/living/L in src.loc)
 					add_logs(creator, L, "used a resonator field on", object="resonator")

code/modules/mining/laborcamp/laborstacker.dm

@@ -59,15 +59,14 @@
 
 
 /obj/machinery/mineral/labor_claim_console/attackby(obj/item/I as obj, mob/user as mob)
-	if(istype(I, /obj/item/weapon/card/emag))
-		emagged = 1
-		user << "<span class='warning'>PZZTTPFFFT</span>"
-		return
-	else if(istype(I, /obj/item/weapon/card/id))
+	if(istype(I, /obj/item/weapon/card/id))
 		return attack_hand(user)
 	..()
 
-
+/obj/machinery/mineral/labor_claim_console/emag_act(mob/user as mob)
+	if(!emagged)
+		emagged = 1
+		user << "<span class='warning'>PZZTTPFFFT</span>"
 
 
 

code/modules/mining/mine_items.dm

@@ -69,9 +69,13 @@
 	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
+	var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg')
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("hit", "pierced", "sliced", "attacked")
 
+/obj/item/weapon/pickaxe/proc/playDigSound()
+	playsound(src, pick(digsound),20,1)
+
 /obj/item/weapon/pickaxe/silver
 	name = "silver pickaxe"
 	icon_state = "spickaxe"
@@ -85,17 +89,32 @@
 	icon_state = "handdrill"
 	item_state = "jackhammer"
 	digspeed = 30
+	digsound = list('sound/weapons/drill.ogg')
+	hitsound = 'sound/weapons/drill.ogg'
 	origin_tech = "materials=2;powerstorage=3;engineering=2"
 	desc = "Yours is the drill that will pierce through the rock walls."
 
+/obj/item/weapon/pickaxe/drill/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME! making it a child of drill to stop copypasta
+	name = "diamond mining drill"
+	icon_state = "diamonddrill"
+	digspeed = 5 //Digs through walls, girders, and can dig up sand
+	origin_tech = "materials=6;powerstorage=4;engineering=5"
+	desc = "Yours is the drill that will pierce the heavens!"
+
 /obj/item/weapon/pickaxe/jackhammer
 	name = "sonic jackhammer"
 	icon_state = "jackhammer"
 	item_state = "jackhammer"
 	digspeed = 15 //faster than drill, but cannot dig
 	origin_tech = "materials=3;powerstorage=2;engineering=2"
+	digsound = list('sound/weapons/sonic_jackhammer.ogg')
+	hitsound = 'sound/weapons/sonic_jackhammer.ogg'
 	desc = "Cracks rocks with sonic blasts, perfect for clearing large areas of rock."
 
+/obj/item/weapon/pickaxe/jackhammer/borgdrill // making it a parrent of jackhammer to prevent copypasta
+	name = "cyborg mining drill"
+	desc = ""
+
 /obj/item/weapon/pickaxe/gold
 	name = "golden pickaxe"
 	icon_state = "gpickaxe"
@@ -111,6 +130,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
+	digsound = list('sound/weapons/plasma_cutter.ogg')
+	hitsound = '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."
 
@@ -122,20 +143,9 @@
 	origin_tech = "materials=6;engineering=4"
 	desc = "A pickaxe with a diamond pick head, this is just like minecraft."
 
-/obj/item/weapon/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
-	name = "diamond mining drill"
-	icon_state = "diamonddrill"
-	item_state = "jackhammer"
-	digspeed = 5 //Digs through walls, girders, and can dig up sand
-	origin_tech = "materials=6;powerstorage=4;engineering=5"
-	desc = "Yours is the drill that will pierce the heavens!"
 
-/obj/item/weapon/pickaxe/borgdrill
-	name = "cyborg mining drill"
-	icon_state = "jackhammer"
-	item_state = "jackhammer"
-	digspeed = 15
-	desc = ""
+
+
 
 /*****************************Shovel********************************/
 

code/modules/mining/mine_turfs.dm

@@ -371,13 +371,13 @@
 				new /mob/living/simple_animal/hostile/asteroid/hivelord(T)
 	return
 
-/turf/simulated/mineral/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/turf/simulated/mineral/attackby(var/obj/item/weapon/pickaxe/P as obj, mob/user as mob)
 
 	if (!user.IsAdvancedToolUser())
 		usr << "<span class='danger'>You don't have the dexterity to do this!</span>"
 		return
 
-	if (istype(W, /obj/item/weapon/pickaxe))
+	if (istype(P, /obj/item/weapon/pickaxe))
 		var/turf/T = user.loc
 		if (!( istype(T, /turf) ))
 			return
@@ -388,13 +388,14 @@
 			return
 */
 //Watch your tabbing, microwave. --NEO
-		if(last_act+W:digspeed > world.time)//prevents message spam
+		if(last_act+P.digspeed > world.time)//prevents message spam
 			return
 		last_act = world.time
 		user << "<span class='danger'>You start picking.</span>"
-		playsound(user, 'sound/weapons/Genhit.ogg', 20, 1)
+		//playsound(user, 'sound/weapons/Genhit.ogg', 20, 1)
+		P.playDigSound()
 
-		if(do_after(user,W:digspeed))
+		if(do_after(user,P.digspeed))
 			user << "<span class='notice'>You finish cutting into the rock.</span>"
 			gets_drilled()
 	else
@@ -420,6 +421,7 @@
 			if (src.mineralName == "Bananium")
 				new /obj/item/weapon/ore/bananium(src)
 	var/turf/simulated/floor/plating/asteroid/airless/N = ChangeTurf(/turf/simulated/floor/plating/asteroid/airless)
+	playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction
 	N.fullUpdateMineralOverlays()
 	return
 
@@ -507,7 +509,7 @@
 	return
 
 /turf/simulated/floor/plating/asteroid/attackby(obj/item/weapon/W as obj, mob/user as mob)
-
+	//note that this proc does not call ..()
 	if(!W || !user)
 		return 0
 
@@ -521,7 +523,7 @@
 			return
 
 		user << "<span class='danger'>You start digging.</span>"
-		playsound(src, 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better
+		playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE
 
 		sleep(40)
 		if ((user.loc == T && user.get_active_hand() == W))
@@ -539,14 +541,14 @@
 			return
 
 		user << "<span class='danger'>You start digging.</span>"
-		playsound(src, 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better
+		playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE
 
 		sleep(30)
 		if ((user.loc == T && user.get_active_hand() == W))
 			user << "<span class='notice'>You dug a hole.</span>"
 			gets_dug()
 
-	if ((istype(W,/obj/item/weapon/pickaxe/diamonddrill)) || (istype(W,/obj/item/weapon/pickaxe/borgdrill)))
+	if ((istype(W,/obj/item/weapon/pickaxe/drill/diamonddrill)) || (istype(W,/obj/item/weapon/pickaxe/jackhammer/borgdrill)))
 		var/turf/T = user.loc
 		if (!( istype(T, /turf) ))
 			return
@@ -556,7 +558,7 @@
 			return
 
 		user << "<span class='danger'>You start digging.</span>"
-		playsound(src, 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better
+		playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE
 
 		sleep(0)
 		if ((user.loc == T && user.get_active_hand() == W))
@@ -570,10 +572,6 @@
 				O.attackby(W,user)
 				return
 
-	else
-		..(W,user)
-	return
-
 /turf/simulated/floor/plating/asteroid/proc/gets_dug()
 	if(dug)
 		return

code/modules/mining/ores_coins.dm

@@ -152,7 +152,7 @@
 		if(triggered_by_explosive)
 			log_game("An explosion has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])")
 		else
-			user.visible_message("<span class='warning'>[user] strikes the [src], causing a chain reaction!</span>")
+			user.visible_message("<span class='warning'>[user] strikes \the [src], causing a chain reaction!</span>")
 			log_game("[key_name(usr)] has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])")
 		spawn(det_time)
 		if(primed)