diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
index 282ab3e27c4..fb03b4b0b2f 100644
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -196,7 +196,7 @@
 	shoes = /obj/item/clothing/shoes/black
 	l_ear = /obj/item/device/radio/headset/headset_mining
 
-	l_hand = /obj/item/storage/toolbox/ka
+	l_hand = /obj/item/coin/mining
 
 	backpack_contents = list(
 		/obj/item/storage/bag/ore = 1
diff --git a/code/modules/custom_ka/frames.dm b/code/modules/custom_ka/frames.dm
index 5223d52c1df..8f53d1397a1 100644
--- a/code/modules/custom_ka/frames.dm
+++ b/code/modules/custom_ka/frames.dm
@@ -184,6 +184,10 @@
 	installed_barrel = /obj/item/custom_ka_upgrade/barrels/barrel03
 	installed_upgrade_chip = /obj/item/custom_ka_upgrade/upgrade_chips/focusing
 
+/obj/item/gun/custom_ka/frame03/prebuilt/shaft_miner
+	name = "class C-M kinetic accelerator"
+	installed_upgrade_chip = /obj/item/custom_ka_upgrade/upgrade_chips/damage
+
 /obj/item/gun/custom_ka/frame04/prebuilt
 	name = "class B kinetic accelerator"
 	installed_cell = /obj/item/custom_ka_upgrade/cells/cell04
diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm
index bd11c51009d..47b7267cd8f 100644
--- a/code/modules/mining/coins.dm
+++ b/code/modules/mining/coins.dm
@@ -65,6 +65,12 @@
 	icon_state = "coin_battlemonsters_heads"
 	cmineral = "battlemonsters"
 
+/obj/item/coin/mining
+	name = "mining coin"
+	desc = "A flat disc or piece of metal with an official stamp. This coin can be used at a mining vendor to gain access to additional equipment."
+	icon_state = "coin_mining_heads"
+	cmineral = "mining"
+
 /obj/item/coin/attackby(obj/item/W, mob/user)
 	if(W.iscoil())
 		var/obj/item/stack/cable_coil/CC = W
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index da9774fa6fd..46a6fe37e2a 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -204,7 +204,22 @@ var/global/list/minevendor_list = list( //keep in order of price
 	return
 
 /obj/machinery/mineral/equipment_vendor/attackby(obj/item/I, mob/user, params)
-	if(istype(I,/obj/item/card/id))
+	if(istype(I, /obj/item/coin/mining))
+		var/choice = input(user, "Which special equipment would you like to dispense from \the [src]?", capitalize_first_letters(name)) as null|anything in list("Enhanced Power Converter", "Hand-held Drill")
+		if(!choice || !I || !Adjacent(user))
+			return
+		var/obj/dispensed_equipment
+		switch(choice)
+			if("Enhanced Power Converter")
+				dispensed_equipment = new /obj/item/custom_ka_upgrade/barrels/barrel02(src)
+			if("Hand-held Drill")
+				dispensed_equipment = new /obj/item/pickaxe/drill/weak(src)
+		if(dispensed_equipment)
+			to_chat(user, SPAN_NOTICE("\The [src] accepts your coin and dispenses \a [dispensed_equipment]."))
+			qdel(I)
+			user.put_in_hands(dispensed_equipment)
+		return
+	else if(istype(I,/obj/item/card/id))
 		var/obj/item/card/id/C = usr.get_active_hand()
 		if(istype(C) && !istype(inserted_id))
 			usr.drop_from_inventory(C,src)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 0b82e3599db..09028917de6 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -240,10 +240,12 @@
 
 /obj/item/pickaxe/drill
 	name = "mining drill" // Can dig sand as well!
+	desc = "Yours is the drill that will pierce through the rock walls."
+	icon = 'icons/obj/contained_items/tools/drills.dmi'
 	icon_state = "miningdrill"
 	item_state = "miningdrill"
+	contained_sprite = TRUE
 	origin_tech = list(TECH_MATERIAL = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
-	desc = "Yours is the drill that will pierce through the rock walls."
 	drill_verb = "drilling"
 	autodrill = TRUE
 	drill_sound = 'sound/weapons/drill.ogg'
@@ -257,12 +259,24 @@
 
 	action_button_name = null
 
+/obj/item/pickaxe/drill/weak
+	name = "shaft drill"
+	desc = "Baby's first mining drill. Slow, but reliable."
+	icon_state = "babydrill"
+	item_state = "babydrill"
+	digspeed = 5
+	digspeed_unwielded = 10
+	excavation_amount = 80
+	force = 10
+
 /obj/item/pickaxe/jackhammer
 	name = "sonic jackhammer"
+	desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
+	icon = 'icons/obj/contained_items/tools/drills.dmi'
 	icon_state = "jackhammer"
 	item_state = "jackhammer"
+	contained_sprite = TRUE
 	origin_tech = list(TECH_MATERIAL = 3, TECH_POWER = 2, TECH_ENGINEERING = 2)
-	desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
 	drill_verb = "hammering"
 	autodrill = TRUE
 	drill_sound = 'sound/weapons/sonic_jackhammer.ogg'
@@ -302,8 +316,10 @@
 
 /obj/item/pickaxe/diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
 	name = "diamond mining drill"
+	icon = 'icons/obj/contained_items/tools/drills.dmi'
 	icon_state = "diamonddrill"
 	item_state = "diamonddrill"
+	contained_sprite = TRUE
 	digspeed = 3 //Digs through walls, girders, and can dig up sand
 	origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 4, TECH_ENGINEERING = 5)
 	desc = "Yours is the drill that will pierce the heavens!"
diff --git a/html/changelogs/geeves-shaft_miner_kit.yml b/html/changelogs/geeves-shaft_miner_kit.yml
new file mode 100644
index 00000000000..ee7516fc41e
--- /dev/null
+++ b/html/changelogs/geeves-shaft_miner_kit.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes: 
+  - rscadd: "Shaft miners now start with a mining coin that can be redeemed at a mining vendor to get enhanced equipment, such as a starter hand-held mining drill or an upgraded power converter, instead of spawning with a non-functional upgrade in a toolbox."
diff --git a/icons/mob/items/lefthand_mining.dmi b/icons/mob/items/lefthand_mining.dmi
index 883649d31a3..99f33acd11e 100644
Binary files a/icons/mob/items/lefthand_mining.dmi and b/icons/mob/items/lefthand_mining.dmi differ
diff --git a/icons/mob/items/righthand_mining.dmi b/icons/mob/items/righthand_mining.dmi
index 1062f2988a7..ae366c4493a 100644
Binary files a/icons/mob/items/righthand_mining.dmi and b/icons/mob/items/righthand_mining.dmi differ
diff --git a/icons/obj/coins.dmi b/icons/obj/coins.dmi
index e1a54b48bab..b7ae69cbd09 100644
Binary files a/icons/obj/coins.dmi and b/icons/obj/coins.dmi differ
diff --git a/icons/obj/contained_items/tools/drills.dmi b/icons/obj/contained_items/tools/drills.dmi
new file mode 100644
index 00000000000..dc500373743
Binary files /dev/null and b/icons/obj/contained_items/tools/drills.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index 46c4cf4b686..d904c06ec7a 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ