diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index ba25d9bb856..1b561b72edc 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -434,7 +434,6 @@ var/global/list/rockTurfEdgeCache
 		if(do_after(user,P.digspeed, target = src))
 			if(istype(src, /turf/simulated/mineral)) //sanity check against turf being deleted during digspeed delay
 				user << "<span class='notice'>You finish cutting into the rock.</span>"
-				P.update_icon()
 				gets_drilled(user)
 				feedback_add_details("pick_used_mining","[P.name]")
 	else
@@ -548,31 +547,14 @@ var/global/list/rockTurfEdgeCache
 	//note that this proc does not call ..()
 	if(!W || !user)
 		return 0
-
+	var/digging_speed = 0;
 	if ((istype(W, /obj/item/weapon/shovel)))
 		var/obj/item/weapon/shovel/S = W
-		var/turf/T = user.loc
-		
-		if (!( istype(T, /turf) ))
-			return
-
-		if (dug)
-			user << "<span class='warning'>This area has already been dug!</span>"
-			return
-
-		user << "<span class='notice'>You start digging...</span>"
-		playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE
-		
-		if(do_after(user,S.digspeed, target = src))
-			if(istype(src, /turf/simulated/floor/plating/asteroid)) //sanity check against turf being deleted during digspeed delay
-				user << "<span class='notice'>You dig a hole.</span>"
-				S.update_icon()
-				gets_dug()
-				feedback_add_details("pick_used_mining","[S.name]")
-		
-
-	if ((istype(W, /obj/item/weapon/pickaxe)))
+		digging_speed = S.digspeed
+	else if ((istype(W, /obj/item/weapon/pickaxe)))
 		var/obj/item/weapon/pickaxe/P = W
+		digging_speed = P.digspeed
+	if (digging_speed)
 		var/turf/T = user.loc
 		if (!( istype(T, /turf) ))
 			return
@@ -584,14 +566,12 @@ var/global/list/rockTurfEdgeCache
 		user << "<span class='notice'>You start digging...</span>"
 		playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE
 		
-		if(do_after(user,P.digspeed, target = src))
+		if(do_after(user, digging_speed, target = src))
 			if(istype(src, /turf/simulated/floor/plating/asteroid)) //sanity check against turf being deleted during digspeed delay
 				user << "<span class='notice'>You dig a hole.</span>"
-				P.update_icon()
 				gets_dug()
-				feedback_add_details("pick_used_mining","[P.name]")
+				feedback_add_details("pick_used_mining","[W.name]")
 		
-
 	if(istype(W,/obj/item/weapon/storage/bag/ore))
 		var/obj/item/weapon/storage/bag/ore/S = W
 		if(S.collection_mode == 1)