Merge pull request #718 from SplinterGP/holdelta

Autolathe fixes

code/__defines/research.dm

@@ -18,4 +18,4 @@
 #define MECHFAB		0x0004	//Mechfab
 #define CHASSIS		0x0008	//For protolathe, but differently
 #define PROSFAB		0x0010  //For prosthetics fab
-#define AUTOLATHE   0x0012
+#define AUTOLATHE   12  //YW add, for autolathe

code/datums/autolathe/arms_1.dm

@@ -202,11 +202,6 @@
 	build_path = /obj/item/ammo_magazine/m10mm
 	materials = list(DEFAULT_WALL_MATERIAL = 1875)
 
-/datum/design/item/autolathe/arms/pistol_44
-	name = "pistol magazine (.44)"
-	id = "pistol_44"
-	build_path = /obj/item/ammo_magazine/m44
-	materials = list(DEFAULT_WALL_MATERIAL = 1575)
 
 /////// 5.45mm
 /datum/design/item/autolathe/arms/rifle_545

code/datums/autolathe/autolathe_yw.dm

@@ -39,7 +39,7 @@
 	var/temp_search
 	var/selected_category
 	var/screen = 1
-	var/list/categories = list("Arms and Ammunition", "Devices", "Engineering", "General", "Security", "Medical", "Tools")
+	var/list/categories = list("Arms and Ammunition", "Devices", "Engineering", "General", "Medical", "Tools")
 
 	var/datum/wires/autolathe/wires = null
 
@@ -102,7 +102,7 @@
 			var/list/designs = list()
 			data["designs"] = designs
 			for(var/datum/design/item/autolathe/D in files.known_designs)
-				if(D.hidden && !hacked || selected_category != D.category)
+				if(!D.build_path || D.hidden && !hacked || selected_category != D.category)
 					continue
 				var/list/design = list()
 				designs[++designs.len] = design

code/datums/autolathe/general_1.dm

@@ -142,7 +142,7 @@
 /datum/design/item/autolathe/general/spraybottle
 	name = "empty spray bottle"
 	id = "spraybottle"
-	build_path = /obj/item/stack/rods
+	build_path = /obj/item/weapon/reagent_containers/spray
 	materials = list(DEFAULT_WALL_MATERIAL = 375, "glass" = 375)
 
 /datum/design/item/autolathe/general/knife