diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm
index fc1de63d1d3..31f80e1d95d 100644
--- a/code/WorkInProgress/mining.dm
+++ b/code/WorkInProgress/mining.dm
@@ -2530,9 +2530,13 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
 	throwforce = 4.0
 	item_state = "pickaxe"
 	w_class = 4.0
-	m_amt = 3000 //mamking them on par with the require materials to make silver, gold, and diamond picks
+	m_amt = 3000 //making them on par with the require materials to make silver, gold, and diamond picks
 	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
 
+	hammer
+		name = "Mining Sledge Hammer"
+		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"
@@ -2541,6 +2545,22 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
 		origin_tech = "materials=3"
 		desc = "This makes no metallurgic sense."
 
+	jackhammer
+		name = "Sonic Jackhammer"
+		icon_state = "jackhammer"
+		item_state = "jackhammer"
+		digspeed = 30
+		origin_tech = "materials=3; powerstorage=2"
+		desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
+
+	drill
+		name = "Mining Drill"
+		icon_state = "jackhammer"
+		item_state = "handdrill"
+		digspeed = 30
+		origin_tech = "materials=3; powerstorage=2"
+		desc = "Yours is the drill that will pierce through the rock walls."
+
 	gold
 		name = "Golden Pickaxe"
 		icon_state = "gpickaxe"
@@ -2549,43 +2569,32 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
 		origin_tech = "materials=4"
 		desc = "This makes no metallurgic sense."
 
+	plasmacutter
+		name = "Plasma Cutter"
+		icon_state = "plasmacutter"
+		icon_state = "gun"
+		w_class = 3.0 //it is smaller than the pickaxe
+		force = 10.0 //Also, weaker
+		digspeed = 20
+		origin_tech = "materials=4; plasmatech=2"
+		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"
-		desc = "This makes perfect sense."
+		desc = "A pickaxe with a diamond pick head, this is just like minecraft."
 
-	plasmacutter
-		name = "Plasma Cutter"
-		icon_state = "plasmacutter"
-		icon_state = "gun"
+	diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
+		name = "Diamond Mining Drill"
+		icon_state = "jackhammer"
+		item_state = "diamonddrill"
 		digspeed = 0
-		origin_tech = "materials=6; plasmatech=3"
-		desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff."
-
-/obj/item/weapon/pickaxe/radius // For the side project to make radius cutting devices
-
-	hammer
-		name = "Mining Sledge Hammer"
-		desc = "You feel like smashing your boss in the face with this."
-
-	jackhammer
-		name = "Jackhammer"
-		icon_state = "jackhammer"
-		item_state = "jackhammer"
-		digspeed = 30
-		desc = "The perfect weapon to kill space lizard with in the mines, includes bicycle pump."
-
-	drill
-		name = "Turbo Drill"
-		icon_state = "jackhammer"
-		item_state = "handdrill"
-		digspeed = 10
+		origin_tech = "materials=6; powerstorage=4"
 		desc = "Yours is the drill that will pierce the heavens!"
 
-
 /*****************************Shovel********************************/
 
 /obj/item/weapon/shovel
diff --git a/code/defines/obj/radio.dm b/code/defines/obj/radio.dm
index 02457b91460..ec97f8e9ee4 100644
--- a/code/defines/obj/radio.dm
+++ b/code/defines/obj/radio.dm
@@ -34,6 +34,7 @@
 	icon_state = "beacon"
 	item_state = "signaler"
 	var/code = "electronic"
+	origin_tech = "bluespace=1"
 
 /obj/item/device/radio/courtroom_beacon
 	name = "Tracking Beacon"
@@ -99,7 +100,7 @@
 	name = "Robotics Radio Headset"
 	icon_state = "rob_headset"
 	item_state = "headset"
-	channels = list("Engineering" = 1)
+	channels = list("Engineering" = 1, "Science" = 1)
 
 /obj/item/device/radio/headset/headset_med // -- TLE
 	name = "Medical Radio Headset"
@@ -107,18 +108,24 @@
 	item_state = "headset"
 	channels = list("Medical" = 1)
 
-/obj/item/device/radio/headset/headset_com // -- TLE
-	name = "Command Radio Headset"
-	icon_state = "com_headset"
-	item_state = "headset"
-	channels = list("Command" = 1)
-
 /obj/item/device/radio/headset/headset_sci // -- Bar
 	name = "Science Radio Headset"
 	icon_state = "com_headset"
 	item_state = "headset"
 	channels = list("Science" = 1)
 
+/obj/item/device/radio/headset/headset_medsci // -- Micro
+	name = "Medical Research Radio Headset"
+	icon_state = "med_headset"
+	item_state = "headset"
+	channels = list("Medical" = 1, "Science" = 1)
+
+/obj/item/device/radio/headset/headset_com // -- TLE
+	name = "Command Radio Headset"
+	icon_state = "com_headset"
+	item_state = "headset"
+	channels = list("Command" = 1)
+
 /obj/item/device/radio/headset/heads/captain // -- Bar
 	name = "Captain's Headset"
 	icon_state = "com_headset"
@@ -141,7 +148,7 @@
 	name = "Chief Engineer's Headset"
 	icon_state = "com_headset"
 	item_state = "headset"
-	channels = list("Engineering" = 1, "Command" = 1, "Mining" = 1)
+	channels = list("Engineering" = 1, "Command" = 1)
 
 /obj/item/device/radio/headset/heads/cmo // -- Bar
 	name = "Chief Medical Officer's Headset"
@@ -153,7 +160,7 @@
 	name = "Head of Personnel's Headset"
 	icon_state = "com_headset"
 	item_state = "headset"
-	channels = list("Command" = 1, "Security" = 1, "Cargo" = 1)
+	channels = list("Command" = 1, "Security" = 0, "Cargo" = 1, "Mining" = 0)
 
 /obj/item/device/radio/headset/headset_mine // -- rastaf0
 	name = "Mining Radio Headset"
@@ -171,4 +178,4 @@
 	name = "Quartermaster's Headset"
 	icon_state = "cargo_headset"
 	item_state = "headset"
-	channels = list("Cargo" = 1)
+	channels = list("Cargo" = 1, "Mining" = 1)
diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm
index 159137d0942..227b42aac94 100644
--- a/code/game/jobs/jobprocs.dm
+++ b/code/game/jobs/jobprocs.dm
@@ -310,7 +310,7 @@
 				B.deity_name = new_deity
 
 		if ("Geneticist")
-			src.equip_if_possible(new /obj/item/device/radio/headset/headset_med (src), slot_ears) // -- TLE
+			src.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/geneticist(src), slot_w_uniform)
@@ -319,7 +319,7 @@
 			src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_s_store)
 
 		if ("Chemist")
-			src.equip_if_possible(new /obj/item/device/radio/headset/headset_med (src), slot_ears) // -- TLE
+			src.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/device/pda/toxins(src), slot_belt)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/chemist(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/shoes/white(src), slot_shoes)
@@ -582,7 +582,7 @@
 			src.equip_if_possible(new /obj/item/device/flashlight/pen(src), slot_s_store)
 
 		if ("Virologist")
-			src.equip_if_possible(new /obj/item/device/radio/headset/headset_med (src), slot_ears) // -- TLE
+			src.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/medical(src), slot_w_uniform)
diff --git a/code/game/research/designs.dm b/code/game/research/designs.dm
index 887a627f724..04400224db8 100644
--- a/code/game/research/designs.dm
+++ b/code/game/research/designs.dm
@@ -907,29 +907,39 @@ datum
 /////////////////Mining//////////////////
 /////////////////////////////////////////
 
-		pick_silver
-			name = "Silver Pickaxe"
-			desc = "This makes no metallurgic sense."
-			id = "pick_silver"
-			req_tech = list("materials" = 3)
+		jackhammer
+			name = "Sonic Jackhammer"
+			desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
+			id = "pick_jackhammer"
+			req_tech = list("materials" = 3, "powerstorage" = 2)
 			build_type = PROTOLATHE
-			materials = list("$silver" = 3000)
+			materials = list("$metal" = 2000, "$glass" = 500, "$silver" = 500)
 			reliability_base = 79
-			build_path = "/obj/item/weapon/pickaxe/silver"
+			build_path = "/obj/item/weapon/pickaxe/jackhammer"
 
-		pick_gold
-			name = "Golden Pickaxe"
-			desc = "This makes no metallurgic sense."
-			id = "pick_gold"
-			req_tech = list("materials" = 4)
+		drill
+			name = "Mining Drill"
+			desc = "Yours is the drill that will pierce through the rock walls."
+			id = "pick_jackhammer"
+			req_tech = list("materials" = 3, "powerstorage" = 2)
 			build_type = PROTOLATHE
-			materials = list("$gold" = 3000)
+			materials = list("$metal" = 6000, "$glass" = 1000) //expensive, but no need for miners.
 			reliability_base = 79
-			build_path = "/obj/item/weapon/pickaxe/gold"
+			build_path = "/obj/item/weapon/pickaxe/drill"
+
+		plasmacutter
+			name = "Plasma Cutter"
+			desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff."
+			id = "pick_plasmacutter"
+			req_tech = list("materials" = 4, "plasmatech" = 2)
+			build_type = PROTOLATHE
+			materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$plasma" = 500)
+			reliability_base = 79
+			build_path = "/obj/item/weapon/pickaxe/plasmacutter"
 
 		pick_diamond
 			name = "Diamond Pickaxe"
-			desc = "This makes no metallurgic sense."
+			desc = "A pickaxe with a diamond pick head, this is just like minecraft."
 			id = "pick_diamond"
 			req_tech = list("materials" = 6)
 			build_type = PROTOLATHE
@@ -937,10 +947,29 @@ datum
 			reliability_base = 79
 			build_path = "/obj/item/weapon/pickaxe/diamond"
 
+		drill_diamond
+			name = "Diamond Mining Drill"
+			desc = "Yours is the drill that will pierce the heavens!"
+			id = "drill_diamond"
+			req_tech = list("materials" = 6, "powerstorage" = 4)
+			build_type = PROTOLATHE
+			materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed.
+			reliability_base = 79
+			build_path = "/obj/item/weapon/pickaxe/diamonddrill"
+
 /////////////////////////////////////////
 //////////////Blue Space/////////////////
 /////////////////////////////////////////
 
+		beacon
+			name = "Tracking Beacon"
+			desc = "A blue space tracking beacon."
+			id = "beacon"
+			req_tech = list("bluespace" = 1)
+			build_type = PROTOLATHE
+			materials = list ("$metal" = 20, "$glass" = 10)
+			build_path = "/obj/item/device/radio/beacon"
+
 		bag_holding
 			name = "Bag of Holding"
 			desc = "A backpack that opens into a localized pocket of Blue Space."
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 9cc84fe3888..e2083199339 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -154,7 +154,7 @@ obj/item/weapon/robot_module/syndicate
 
 /obj/item/weapon/robot_module/miner/New()
 	..()
-	src.modules += new /obj/item/weapon/pickaxe/radius/jackhammer(src)
+	src.modules += new /obj/item/weapon/pickaxe/jackhammer(src)
 	src.modules += new /obj/item/weapon/shovel(src)
 	src.modules += new /obj/item/weapon/satchel(src)
 	src.modules += new /obj/item/weapon/borg/sight/meson(src)
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index e3c45e0a7e4..45a38386673 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ