diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm
index e032b936ab5..7678a12606c 100644
--- a/code/defines/obj/supplypacks.dm
+++ b/code/defines/obj/supplypacks.dm
@@ -3,6 +3,7 @@
 //NOTE: hidden packs only show up when the computer has been hacked.
 //ANOTER NOTE: Contraband is obtainable through modified supplycomp circuitboards.
 //BIG NOTE: Don't add living things to crates, that's bad, it will break the shuttle.
+
 /datum/supply_packs/specialops
 	name = "Special Ops supplies"
 	contains = list("/obj/item/weapon/storage/emp_kit",
@@ -41,17 +42,6 @@
 	containertype = "/obj/structure/closet/crate/freezer"
 	containername = "Monkey crate"
 
-/*
-/datum/supply_packs/shotgun
-	name = "Shotgun crate"
-	contains = list("/obj/item/weapon/gun/projectile/shotgun",
-					"/obj/item/ammo_casing/shotgun/beanbag",
-					"/obj/item/ammo_casing/shotgun/beanbag")
-	cost = 25
-	containertype = "/obj/structure/closet/crate"
-	containername = "Shotgun crate"
-//APPARENTLY OP?
-*/
 
 /datum/supply_packs/beanbagammo
 	name = "Beanbag shells"
@@ -276,18 +266,6 @@
 	containername = "Virus crate"
 	access = access_cmo
 
-/datum/supply_packs/surgery
-	name = "Surgery crate"
-	contains = list("/obj/item/weapon/hemostat",
-					"/obj/item/weapon/surgicaldrill",
-					"/obj/item/weapon/retractor",
-					"/obj/item/weapon/cautery",
-					"/obj/item/weapon/circular_saw",
-					"/obj/item/weapon/scalpel")
-	cost = 20
-	containertype = "/obj/structure/closet/crate/medical"
-	containername = "Surgery crate"
-
 /datum/supply_packs/metal50
 	name = "50 Metal Sheets"
 	contains = list("/obj/item/stack/sheet/metal")
@@ -326,9 +304,9 @@
 					"/obj/item/clothing/suit/hazardvest",
 					"/obj/item/clothing/suit/hazardvest",
 					"/obj/item/clothing/suit/hazardvest",
-					"/obj/item/clothing/head/helmet/welding",
-					"/obj/item/clothing/head/helmet/welding",
-					"/obj/item/clothing/head/helmet/hardhat")
+					"/obj/item/clothing/head/welding",
+					"/obj/item/clothing/head/welding",
+					"/obj/item/clothing/head/hardhat")
 	cost = 10
 	containertype = "/obj/structure/closet/crate"
 	containername = "Mechanical maintenance crate"
@@ -599,7 +577,8 @@
 
 /datum/supply_packs/randomised/contraband
 	num_contained = 5
-	contains = list("/obj/item/weapon/contraband/poster", "/obj/item/weapon/cigpacket/dromedaryco")
+	contains = list("/obj/item/weapon/contraband/poster",
+					"/obj/item/weapon/cigpacket/dromedaryco")
 	name = "Contraband crate"
 	cost = 30
 	containertype = "/obj/structure/closet/crate"
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index b8694849826..e2a278759fe 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -1388,6 +1388,8 @@
 	desc = "Retracts stuff."
 	icon = 'surgery.dmi'
 	icon_state = "retractor"
+	m_amt = 10000
+	g_amt = 5000
 	flags = FPRINT | TABLEPASS | CONDUCT
 	w_class = 1.0
 	origin_tech = "materials=1;biotech=1"
@@ -1397,6 +1399,8 @@
 	desc = "You think you have seen this before."
 	icon = 'surgery.dmi'
 	icon_state = "hemostat"
+	m_amt = 5000
+	g_amt = 2500
 	flags = FPRINT | TABLEPASS | CONDUCT
 	w_class = 1.0
 	origin_tech = "materials=1;biotech=1"
@@ -1406,6 +1410,8 @@
 	desc = "This stops bleeding."
 	icon = 'surgery.dmi'
 	icon_state = "cautery"
+	m_amt = 5000
+	g_amt = 2500
 	flags = FPRINT | TABLEPASS | CONDUCT
 	w_class = 1.0
 	origin_tech = "materials=1;biotech=1"
@@ -1416,6 +1422,8 @@
 	icon = 'surgery.dmi'
 	icon_state = "drill"
 	hitsound = 'circsawhit.ogg'
+	m_amt = 15000
+	g_amt = 10000
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 15.0
 	w_class = 1.0
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index dddebebb828..aea7297902f 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -23,6 +23,9 @@ var/global/list/autolathe_recipes = list( \
 		new /obj/item/weapon/kitchenknife(), \
 		new /obj/item/weapon/scalpel(), \
 		new /obj/item/weapon/circular_saw(), \
+		new /obj/item/weapon/surgicaldrill(),\
+		new /obj/item/weapon/retractor(),\
+		new /obj/item/weapon/cautery(),\
 		new /obj/item/weapon/reagent_containers/glass/beaker(), \
 		new /obj/item/weapon/reagent_containers/glass/large(), \
 		new /obj/item/ammo_casing/shotgun/blank(), \