Merge branch 'master' into upstream-merge-29747

code/modules/mining/equipment/kinetic_crusher.dm

@@ -284,7 +284,7 @@
 		L.adjustBruteLoss(bonus_value)
 
 /obj/item/crusher_trophy/tail_spike/proc/pushback(mob/living/target, mob/living/user)
-	if(!target.anchored || ismegafauna(target)) //megafauna will always be pushed
+	if(!QDELETED(target) && !QDELETED(user) && (!target.anchored || ismegafauna(target))) //megafauna will always be pushed
 		step(target, get_dir(user, target))
 
 //bubblegum

code/modules/mining/minebot.dm

@@ -170,6 +170,7 @@
 
 /datum/action/innate/minedrone
 	check_flags = AB_CHECK_CONSCIOUS
+	icon_icon = 'icons/mob/actions/actions_mecha.dmi'
 	background_icon_state = "bg_default"
 
 /datum/action/innate/minedrone/toggle_light