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

FUCK SPACES

Merge branch 'AIcode'

Merge branch 'Foodstuffssss'

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

Merge branch 'girderwrenchtime'

Merge branch 'Chamjumpsuit'

Merge branch 'Bookcasefix'

Merge branch 'Assemblyfix'

Merge branch 'metroidbegone'

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

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

FUCKING ABSOLUTE PATHS

code/modules/mining/mine_items.dm

@@ -72,75 +72,75 @@
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("hit", "pierced", "sliced", "attacked")
 
-	hammer
-		name = "sledgehammer"
-		//icon_state = "sledgehammer" Waiting on sprite
-		desc = "A mining hammer made of reinforced metal. You feel like smashing your boss in the face with this."
+/obj/item/weapon/pickaxe/hammer
+	name = "sledgehammer"
+	//icon_state = "sledgehammer" Waiting on sprite
+	desc = "A mining hammer made of reinforced metal. You feel like smashing your boss in the face with this."
 
-	silver
-		name = "silver pickaxe"
-		icon_state = "spickaxe"
-		item_state = "spickaxe"
-		digspeed = 30
-		origin_tech = "materials=3"
-		desc = "This makes no metallurgic sense."
+/obj/item/weapon/pickaxe/silver
+	name = "silver pickaxe"
+	icon_state = "spickaxe"
+	item_state = "spickaxe"
+	digspeed = 30
+	origin_tech = "materials=3"
+	desc = "This makes no metallurgic sense."
 
-	drill
-		name = "mining drill" // Can dig sand as well!
-		icon_state = "handdrill"
-		item_state = "jackhammer"
-		digspeed = 30
-		origin_tech = "materials=2;powerstorage=3;engineering=2"
-		desc = "Yours is the drill that will pierce through the rock walls."
+/obj/item/weapon/pickaxe/drill
+	name = "mining drill" // Can dig sand as well!
+	icon_state = "handdrill"
+	item_state = "jackhammer"
+	digspeed = 30
+	origin_tech = "materials=2;powerstorage=3;engineering=2"
+	desc = "Yours is the drill that will pierce through the rock walls."
 
-	jackhammer
-		name = "sonic jackhammer"
-		icon_state = "jackhammer"
-		item_state = "jackhammer"
-		digspeed = 15 //faster than drill, but cannot dig
-		origin_tech = "materials=3;powerstorage=2;engineering=2"
-		desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
+/obj/item/weapon/pickaxe/jackhammer
+	name = "sonic jackhammer"
+	icon_state = "jackhammer"
+	item_state = "jackhammer"
+	digspeed = 15 //faster than drill, but cannot dig
+	origin_tech = "materials=3;powerstorage=2;engineering=2"
+	desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
 
-	gold
-		name = "golden pickaxe"
-		icon_state = "gpickaxe"
-		item_state = "gpickaxe"
-		digspeed = 20
-		origin_tech = "materials=4"
-		desc = "This makes no metallurgic sense."
+/obj/item/weapon/pickaxe/gold
+	name = "golden pickaxe"
+	icon_state = "gpickaxe"
+	item_state = "gpickaxe"
+	digspeed = 20
+	origin_tech = "materials=4"
+	desc = "This makes no metallurgic sense."
 
-	plasmacutter
-		name = "plasma cutter"
-		icon_state = "plasmacutter"
-		item_state = "gun"
-		w_class = 3.0 //it is smaller than the pickaxe
-		damtype = "fire"
-		digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire
-		origin_tech = "materials=4;plasmatech=3;engineering=3"
-		desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
+/obj/item/weapon/pickaxe/plasmacutter
+	name = "plasma cutter"
+	icon_state = "plasmacutter"
+	item_state = "gun"
+	w_class = 3.0 //it is smaller than the pickaxe
+	damtype = "fire"
+	digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire
+	origin_tech = "materials=4;plasmatech=3;engineering=3"
+	desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
 
-	diamond
-		name = "diamond pickaxe"
-		icon_state = "dpickaxe"
-		item_state = "dpickaxe"
-		digspeed = 10
-		origin_tech = "materials=6;engineering=4"
-		desc = "A pickaxe with a diamond pick head, this is just like minecraft."
+/obj/item/weapon/pickaxe/diamond
+	name = "diamond pickaxe"
+	icon_state = "dpickaxe"
+	item_state = "dpickaxe"
+	digspeed = 10
+	origin_tech = "materials=6;engineering=4"
+	desc = "A pickaxe with a diamond pick head, this is just like minecraft."
 
-	diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
-		name = "diamond mining drill"
-		icon_state = "diamonddrill"
-		item_state = "jackhammer"
-		digspeed = 5 //Digs through walls, girders, and can dig up sand
-		origin_tech = "materials=6;powerstorage=4;engineering=5"
-		desc = "Yours is the drill that will pierce the heavens!"
+/obj/item/weapon/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
+	name = "diamond mining drill"
+	icon_state = "diamonddrill"
+	item_state = "jackhammer"
+	digspeed = 5 //Digs through walls, girders, and can dig up sand
+	origin_tech = "materials=6;powerstorage=4;engineering=5"
+	desc = "Yours is the drill that will pierce the heavens!"
 
-	borgdrill
-		name = "cyborg mining drill"
-		icon_state = "jackhammer"
-		item_state = "jackhammer"
-		digspeed = 15
-		desc = ""
+/obj/item/weapon/pickaxe/borgdrill
+	name = "cyborg mining drill"
+	icon_state = "jackhammer"
+	item_state = "jackhammer"
+	digspeed = 15
+	desc = ""
 
 /*****************************Shovel********************************/