[MIRROR] Industrial Expansion

code/datums/autolathe/arms.dm

@@ -326,6 +326,15 @@
 	category = list("Arms and Ammunition")
 	hidden = 1*/
 
+/*
+ * High Caliber
+ */
+
+/datum/category_item/autolathe/arms/rifle_145
+	name = "14.5mm round (sabot)"
+	path = /obj/item/ammo_casing/a145/highvel
+	hidden = 1
+
 ///////////////////////////////
 /*Ammo clips and Speedloaders*/
 ///////////////////////////////

code/datums/autolathe/autolathe.dm

@@ -1,6 +1,13 @@
 /datum/category_item/autolathe/New()
 	..()
-	var/obj/item/I = new path()
+	var/obj/item/I
+	if(path)
+		I = new path()
+
+	if(!I)	// Something has gone horribly wrong, or right.
+		log_debug("[name] created an Autolathe design without an assigned path. This is expected for only the Material Sheet generation.")
+		return
+
 	if(I.matter && !resources)
 		resources = list()
 		for(var/material in I.matter)
@@ -57,6 +64,42 @@
 	name = "Tools"
 	category_item_type = /datum/category_item/autolathe/tools
 
+/datum/category_group/autolathe/materials
+	name = "Materials"
+	category_item_type = /datum/category_item/autolathe/materials
+
+/datum/category_group/autolathe/materials/New()
+	..()
+
+	for(var/Name in name_to_material)
+		var/datum/material/M = name_to_material[Name]
+
+		if(!M.stack_type)	// Shouldn't happen, but might. Never know.
+			continue
+
+		if(istype(M, /datum/material/alienalloy))
+			continue
+
+		var/obj/item/stack/material/Mat = new M.stack_type()
+
+		if(Mat.name in items_by_name)
+			qdel(Mat)
+			continue
+
+		var/datum/category_item/autolathe/materials/WorkDat = new(src)
+
+		WorkDat.name = "[Mat.name]"
+		WorkDat.resources = Mat.matter.Copy()
+		WorkDat.is_stack = TRUE
+		WorkDat.no_scale = TRUE
+		WorkDat.max_stack = Mat.max_amount
+		WorkDat.path = M.stack_type
+
+		qdel(Mat)
+
+		items |= WorkDat
+		items_by_name[WorkDat.name] = WorkDat
+
 /*******************
 * Category entries *
 *******************/

code/datums/autolathe/general.dm

@@ -85,44 +85,6 @@
 	name = "welding mask"
 	path =/obj/item/clothing/head/welding
 
-/datum/category_item/autolathe/general/metal
-	name = "steel sheets"
-	path =/obj/item/stack/material/steel
-	is_stack = TRUE
-	no_scale = TRUE //prevents material duplication exploits
-
-/datum/category_item/autolathe/general/glass
-	name = "glass sheets"
-	path =/obj/item/stack/material/glass
-	is_stack = TRUE
-	no_scale = TRUE //prevents material duplication exploits
-
-/datum/category_item/autolathe/general/rglass
-	name = "reinforced glass sheets"
-	path =/obj/item/stack/material/glass/reinforced
-	is_stack = TRUE
-	no_scale = TRUE //prevents material duplication exploits
-
-/datum/category_item/autolathe/general/rods
-	name = "metal rods"
-	path =/obj/item/stack/rods
-	is_stack = TRUE
-	no_scale = TRUE //prevents material duplication exploits
-
-/datum/category_item/autolathe/general/plasteel
-	name = "plasteel sheets"
-	path =/obj/item/stack/material/plasteel
-	is_stack = TRUE
-	no_scale = TRUE //prevents material duplication exploits
-	resources = list(MAT_PLASTEEL = 2000)
-
-/datum/category_item/autolathe/general/plastic
-	name = "plastic sheets"
-	path =/obj/item/stack/material/plastic
-	is_stack = TRUE
-	no_scale = TRUE //prevents material duplication exploits
-	resources = list(MAT_PLASTIC = 2000)
-
 //TFF 24/12/19 - Let people print more spray bottles if needed.
 /datum/category_item/autolathe/general/spraybottle
 	name = "spray bottle"

code/datums/autolathe/materials.dm

@@ -0,0 +1,38 @@
+
+/datum/category_item/autolathe/materials/metal
+	name = "steel sheets"
+	path =/obj/item/stack/material/steel
+	is_stack = TRUE
+	no_scale = TRUE //prevents material duplication exploits
+
+/datum/category_item/autolathe/materials/glass
+	name = "glass sheets"
+	path =/obj/item/stack/material/glass
+	is_stack = TRUE
+	no_scale = TRUE //prevents material duplication exploits
+
+/datum/category_item/autolathe/materials/rglass
+	name = "reinforced glass sheets"
+	path =/obj/item/stack/material/glass/reinforced
+	is_stack = TRUE
+	no_scale = TRUE //prevents material duplication exploits
+
+/datum/category_item/autolathe/materials/rods
+	name = "metal rods"
+	path =/obj/item/stack/rods
+	is_stack = TRUE
+	no_scale = TRUE //prevents material duplication exploits
+
+/datum/category_item/autolathe/materials/plasteel
+	name = "plasteel sheets"
+	path =/obj/item/stack/material/plasteel
+	is_stack = TRUE
+	no_scale = TRUE //prevents material duplication exploits
+	resources = list(MAT_PLASTEEL = 2000)
+
+/datum/category_item/autolathe/materials/plastic
+	name = "plastic sheets"
+	path =/obj/item/stack/material/plastic
+	is_stack = TRUE
+	no_scale = TRUE //prevents material duplication exploits
+	resources = list(MAT_PLASTIC = 2000)

code/datums/supplypacks/materials.dm

@@ -35,6 +35,13 @@
 	containertype = /obj/structure/closet/crate/grayson
 	containername = "Plastic sheets crate"
 
+/datum/supply_pack/materials/copper50
+	name = "50 copper ingots"
+	contains = list(/obj/fiftyspawner/copper)
+	cost = 60
+	containertype = /obj/structure/closet/crate/grayson
+	containername = "Copper ingots crate"
+
 /datum/supply_pack/materials/cardboard_sheets
 	contains = list(/obj/fiftyspawner/cardboard)
 	name = "50 cardboard sheets"