From 17d56d7033de90746ba783721a14ae5894eda73f Mon Sep 17 00:00:00 2001
From: "n3ophyt3@gmail.com"
 <n3ophyt3@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Thu, 24 Mar 2011 03:10:28 +0000
Subject: [PATCH] Added silver, gold, and diamond pickaxes to the R&D system.
 They mine faster than regular pickaxes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1259 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/WorkInProgress/mining.dm | 22 +++++++++++++++++++--
 code/game/research/designs.dm | 36 ++++++++++++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm
index f1b54731df9..4a66fd07616 100644
--- a/code/WorkInProgress/mining.dm
+++ b/code/WorkInProgress/mining.dm
@@ -778,8 +778,7 @@ proc/move_mining_shuttle()
 		user << "\red You start picking."
 		//playsound(src.loc, 'Welder.ogg', 100, 1)
 
-		sleep(40)
-		if ((user.loc == T && user.equipped() == W))
+		if(do_after(user,W:digspeed))
 			user << "\blue You finish cutting into the rock."
 			gets_drilled()
 
@@ -2522,6 +2521,25 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
 	item_state = "wrench"
 	w_class = 4.0
 	m_amt = 50
+	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
+
+	silver
+		name = "Silver Pickaxe"
+		digspeed = 30
+		origin_tech = "materials=3"
+		desc = "This makes no metallurgic sense."
+
+	gold
+		name = "Golden Pickaxe"
+		digspeed = 20
+		origin_tech = "materials=4"
+		desc = "This makes no metallurgic sense."
+
+	diamond
+		name = "Diamond Pickaxe"
+		digspeed = 10
+		origin_tech = "materials=6"
+		desc = "This makes no metallurgic sense."
 
 /*****************************Shovel********************************/
 
diff --git a/code/game/research/designs.dm b/code/game/research/designs.dm
index c725df69b2a..cd5bdf8e9f5 100644
--- a/code/game/research/designs.dm
+++ b/code/game/research/designs.dm
@@ -785,6 +785,40 @@ datum
 			reliability_base = 79
 			build_path = "/obj/item/weapon/chem_grenade/large"
 
+/////////////////////////////////////////
+/////////////////Mining//////////////////
+/////////////////////////////////////////
+
+		pick_silver
+			name = "Silver Pickaxe"
+			desc = "This makes no metallurgic sense."
+			id = "pick_silver"
+			req_tech = list("materials" = 3)
+			build_type = PROTOLATHE
+			materials = list("$silver" = 3000)
+			reliability_base = 79
+			build_path = "/obj/item/weapon/pickaxe/silver"
+
+		pick_gold
+			name = "Golden Pickaxe"
+			desc = "This makes no metallurgic sense."
+			id = "pick_gold"
+			req_tech = list("materials" = 4)
+			build_type = PROTOLATHE
+			materials = list("$gold" = 3000)
+			reliability_base = 79
+			build_path = "/obj/item/weapon/pickaxe/gold"
+
+		pick_diamond
+			name = "Diamond Pickaxe"
+			desc = "This makes no metallurgic sense."
+			id = "pick_diamond"
+			req_tech = list("materials" = 6)
+			build_type = PROTOLATHE
+			materials = list("$diamond" = 3000)
+			reliability_base = 79
+			build_path = "/obj/item/weapon/pickaxe/diamond"
+
 /////////////////////////////////////////
 //////////////Blue Space/////////////////
 /////////////////////////////////////////
@@ -795,7 +829,7 @@ datum
 			id = "bag_holding"
 			req_tech = list("bluespace" = 4)
 			build_type = PROTOLATHE
-			materials = list("$gold" = 1000, "$diamond" = 500, "$uranium" = 250)
+			materials = list("$gold" = 3000, "$diamond" = 1500, "$uranium" = 250)
 			reliability_base = 80
 			build_path = "/obj/item/weapon/storage/backpack/holding"