Merge pull request #5569 from CHOMPStation2/Razgriz1032-ammolathe

Ammolathe

code/modules/projectiles/ammunition/zz_autolathe_ch.dm

@@ -38,10 +38,25 @@
 	path = /obj/item/ammo_magazine/a57/rubber
 
 /datum/category_item/autolathe/arms/smg_p90
-	name = "large capacity top mounted magazine (5.7x28mm armor-piercing)"
+	name = "large capacity top mounted magazine (5.7x28mm standard)"
 	path = /obj/item/ammo_magazine/m9mmp90
 	hidden = 1
 
+/datum/category_item/autolathe/arms/smg_p90/ap
+	name = "large capacity top mounted magazine (5.7x28mm armor-piercing)"
+	path = /obj/item/ammo_magazine/m9mmp90/ap
+	hidden = 1
+
+/datum/category_item/autolathe/arms/smg_p90/rubber
+	name = "large capacity top mounted magazine (5.7x28mm rubber)"
+	path = /obj/item/ammo_magazine/m9mmp90/rubber
+	hidden = 1
+
+/datum/category_item/autolathe/arms/smg_p90/hp
+	name = "large capacity top mounted magazine (5.7x28mm hollow-point)"
+	path = /obj/item/ammo_magazine/m9mmp90/hp
+	hidden = 1
+
 /datum/category_item/autolathe/arms/svd_762
 	name = "SVD magazine (7.62x54mmR)"
 	path = /obj/item/ammo_magazine/m762svd
@@ -325,12 +340,12 @@
 	name = "RPK Drum magazine(7.62x39mm standard)"
 	path = /obj/item/ammo_magazine/akm/drum
 	hidden = 1
-	
+
 /datum/category_item/autolathe/arms/s45lc
 	name = "speedloader(.45 LC)"
 	path = /obj/item/ammo_magazine/s45lc
 	hidden = 1
-	
+
 /datum/category_item/autolathe/arms/s45lc/rubber
 	name = "speedloader(.45 LC Rubber)"
 	path = /obj/item/ammo_magazine/s45lc/rubber
@@ -345,4 +360,4 @@
 	name = ".45 LC"
 	path = /obj/item/ammo_casing/a45lc
 	hidden = 1
-	
+

code/modules/projectiles/ammunition/zz_magazines_ch.dm

@@ -1,9 +1,24 @@
 //Overrides
 /obj/item/ammo_magazine/m9mmp90	//congratulations you are now being converted 5.7x28mm, a.k.a the round the p90 actually uses.
-	name = "large capacity top mounted magazine (5.7x28mm armor-piercing)"	//Ugh, we'll leave it AP I guess
-	ammo_type = /obj/item/ammo_casing/a57/ap
+	name = "large capacity top mounted magazine (5.7x28mm standard)" //Standard boolet. Cheaper to make.
+	ammo_type = /obj/item/ammo_casing/a57
+	matter = list(MAT_STEEL = 2700)
 	caliber = "5.7x28mm"
 
+/obj/item/ammo_magazine/m9mmp90/hp
+	name = "large capacity top mounted magazine (5.7x28mm armor-piercing)"
+	ammo_type = /obj/item/ammo_casing/a57/ap
+	matter = list(MAT_STEEL = 3000)
+
+/obj/item/ammo_magazine/m9mmp90/rubber
+	name = "large capacity top mounted magazine (5.7x28mm rubber)"
+	ammo_type = /obj/item/ammo_casing/a57/rubber
+
+/obj/item/ammo_magazine/m9mmp90/ap
+	name = "large capacity top mounted magazine (5.7x28mm hollow-point)"
+	ammo_type = /obj/item/ammo_casing/a57/hp
+	matter = list(MAT_STEEL = 3000)
+
 /obj/item/ammo_magazine/m762svd	//You are now being converted to 7.62x54mmR :3
 	name = "\improper SVD magazine (7.62x54mmR)"
 	icon = 'icons/obj/ammo_ch.dmi'

modular_chomp/code/game/machinery/autolathe_armory.dm

@@ -0,0 +1,30 @@
+/obj/machinery/autolathe/armory
+	name = "ammolathe"
+	desc = "An autolathe that produces ammunition using metal and glass."
+	hacked = 1
+
+/obj/machinery/autolathe/armory/tgui_static_data(mob/user)
+	var/list/data = ..()
+
+	var/list/categories = list()
+	var/list/recipes = list()
+	for(var/datum/category_group/autolathe/A in autolathe_recipes.categories)
+		categories += A.name
+		for(var/datum/category_item/autolathe/arms/M in A.items)
+			if(M.hidden && !hacked)
+				continue
+			if(M.man_rating > man_rating)
+				continue
+			recipes.Add(list(list(
+				"category" = A.name,
+				"name" = M.name,
+				"ref" = REF(M),
+				"requirements" = M.resources,
+				"hidden" = M.hidden,
+				"coeff_applies" = !M.no_scale,
+				"is_stack" = M.is_stack,
+			)))
+	data["recipes"] = recipes
+	data["categories"] = categories
+
+	return data

vorestation.dme

@@ -4516,6 +4516,7 @@
 #include "modular_chomp\code\game\jobs\job\noncrew.dm"
 #include "modular_chomp\code\game\jobs\job\silicon.dm"
 #include "modular_chomp\code\game\machinery\airconditioner_ch.dm"
+#include "modular_chomp\code\game\machinery\autolathe_armory.dm"
 #include "modular_chomp\code\game\objects\items\clockwork\ratvarian_spear.dm"
 #include "modular_chomp\code\game\objects\structures\loot_pile.dm"
 #include "modular_chomp\code\game\objects\structures\watercloset_ch.dm"