Bay Merge 05NOV2014

Known errors:

* A set of errors tied to updating the fire overlays.
* A single error related to a dischephency between new and old slime
code
* A set of errors related to the recharging of stun batons
* A single error due to old machinery code coming from your grav
generator file
* A single error error from your space cooler code, due to old
atmopsherics code
* A playerpanel warning
* An error tied to extinguishing and old atmos code.

code/modules/mining/mine_items.dm

@@ -170,8 +170,7 @@ proc/move_mining_shuttle()
 	name = "lantern"
 	icon_state = "lantern"
 	desc = "A mining lantern."
-	m_amt = 1000
-	g_amt = 500
+	matter = list("glass" = 500,"metal" = 1000)
 	brightness_on = 6			// luminosity when on
 
 /*****************************Pickaxe********************************/
@@ -186,7 +185,7 @@ proc/move_mining_shuttle()
 	throwforce = 4.0
 	item_state = "pickaxe"
 	w_class = 4.0
-	m_amt = 3750 //one sheet, but where can you make them?
+	matter = list("metal" = 3750)
 	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("hit", "pierced", "sliced", "attacked")
@@ -284,7 +283,7 @@ proc/move_mining_shuttle()
 	throwforce = 4.0
 	item_state = "shovel"
 	w_class = 3.0
-	m_amt = 50
+	matter = list("metal" = 50)
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")