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

Conflicts:
	code/modules/mining/mine_items.dm

code/modules/mining/equipment_locker.dm

@@ -586,6 +586,7 @@
 	ranged_cooldown_cap = 3
 	projectiletype = /obj/item/projectile/kinetic
 	projectilesound = 'sound/weapons/Gunshot4.ogg'
+	speak_emote = list("states")
 	wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver,
 						  /obj/item/weapon/ore/plasma,  /obj/item/weapon/ore/uranium,    /obj/item/weapon/ore/iron,
 						  /obj/item/weapon/ore/bananium)

code/modules/mining/mine_items.dm

@@ -130,6 +130,9 @@
 	desc = "An integrated electric mining drill."
 	var/warned = 0
 
+/obj/item/weapon/pickaxe/drill/cyborg/attack_self(mob/user)
+	return //can't remove the drill's cell
+
 /obj/item/weapon/pickaxe/drill/cyborg/proc/use_robot_power(var/mob/living/silicon/robot/R)
 	if(!bcell.use(drillcost))
 		if(!warned)