From 4628bb7a1512c0d78e6df422883a39b5e343cc52 Mon Sep 17 00:00:00 2001
From: GunHog <gunhog24@yahoo.com>
Date: Sat, 9 May 2015 11:49:11 -0500
Subject: [PATCH] Conflict resolution

With myself. I have internal demons.
---
 code/modules/mining/mine_items.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 2d97e1fb80c..3ba4b0cdea6 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -85,11 +85,6 @@
 	desc = "An integrated electric mining drill."
 	flags = NODROP
 
-/obj/item/weapon/pickaxe/drill/cyborg/diamond
-	name = "diamond-tipped cyborg mining drill"
-	icon_state = "diamonddrill"
-	digspeed = 10
-
 /obj/item/weapon/pickaxe/drill/diamonddrill
 	name = "diamond-tipped mining drill"
 	icon_state = "diamonddrill"