[MIRROR] Caseless rifle and protolathe boards (#12542)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>

code/modules/research/tg/designs/boards/science.dm

@@ -214,3 +214,36 @@
 		RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_RESEARCH
 	)
 	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
+
+///Protolathe boards
+
+/datum/design_techweb/board/protolathe
+	name = "Protolathe Board - Science"
+	id = "protolathe_science"
+	build_path = /obj/item/circuitboard/machine/protolathe/department/science
+
+/datum/design_techweb/board/protolathe/service
+	name = "Protolathe Board - Service"
+	id = "protolathe_service"
+	build_path = /obj/item/circuitboard/machine/protolathe/department/service
+
+/datum/design_techweb/board/protolathe/medical
+	name = "Protolathe Board - Medical"
+	id = "protolathe_medical"
+	build_path = /obj/item/circuitboard/machine/protolathe/department/medical
+
+/datum/design_techweb/board/protolathe/cargo
+	name = "Protolathe Board - Cargo"
+	id = "protolathe_cargo"
+	build_path = /obj/item/circuitboard/machine/protolathe/department/cargo
+
+/datum/design_techweb/board/protolathe/engineering
+	name = "Protolathe Board - Engineering"
+	id = "protolathe_engineering"
+	build_path = /obj/item/circuitboard/machine/protolathe/department/engineering
+	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING //Engineering gets an exception in that they can produce their own, since engineering often expands operations.
+
+/datum/design_techweb/board/protolathe/security
+	name = "Protolathe Board - Security"
+	id = "protolathe_security"
+	build_path = /obj/item/circuitboard/machine/protolathe/department/security

code/modules/research/tg/designs/chomp_designs.dm

@@ -215,16 +215,6 @@
 	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SECURITY
 
 //Leathals And any new CHOMP weapons.
-/datum/design_techweb/caselessrifle_prototype
-	name = "Caseless Rifle"
-	id = "caselessrifle"
-	materials = list(MAT_STEEL = 7000, MAT_TITANIUM = 4000)
-	build_path = /obj/item/gun/projectile/caseless/prototype
-	build_type = PROTOLATHE
-	category = list(
-		RND_CATEGORY_WEAPONS
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SECURITY
 
 /datum/design_techweb/lasercannon
 	name = "Laser Cannon"
@@ -238,18 +228,6 @@
 	)
 	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SECURITY
 
-/datum/design_techweb/cyrogun
-	name = "Cryo Gun"
-	desc = "An improperly researched and poorly built weapon, specialized in utlizing frost offensively.."
-	id = "cryogun"
-	materials = list(MAT_GLASS = 3000, MAT_MORPHIUM = 4000, MAT_DURASTEEL = 6000, MAT_LEAD = 6000, MAT_METALHYDROGEN = 3000)
-	build_path = /obj/item/gun/energy/freezegun
-	build_type = PROTOLATHE
-	category = list(
-		RND_CATEGORY_WEAPONS
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SECURITY
-
 /datum/design_techweb/mechfab/modsuit/phase
 	name = "hardsuit phase rifle"
 	desc = "A compact phase rifle for a hardsuit."

code/modules/research/tg/designs/weapon_designs.dm

@@ -56,6 +56,39 @@
 	)
 	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
 
+/datum/design_techweb/caselessrifle_prototype
+	name = "Caseless Rifle"
+	id = "caselessrifle"
+	materials = list(MAT_STEEL = 7000, MAT_TITANIUM = 4000)
+	build_path = /obj/item/gun/projectile/caseless/prototype
+	build_type = PROTOLATHE
+	category = list(
+		RND_CATEGORY_WEAPONS
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SECURITY
+
+/datum/design_techweb/caselessrifle_ammo
+	name = "Caseless Ammo"
+	id = "caselessrifle_ammo"
+	materials = list(MAT_PHORON = 10000, MAT_STEEL = 4000)
+	build_path = /obj/item/ammo_magazine/m5mmcaseless
+	build_type = PROTOLATHE
+	category = list(
+		RND_CATEGORY_WEAPONS
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SECURITY
+
+/datum/design_techweb/caselessrifle_ammo_stun
+	name = "Caseless Ammo - Stun"
+	id = "caselessrifle_ammo_stun"
+	materials = list(MAT_PHORON = 10000, MAT_STEEL = 4000)
+	build_path = /obj/item/ammo_magazine/m5mmcaseless/stun
+	build_type = PROTOLATHE
+	category = list(
+		RND_CATEGORY_WEAPONS
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SECURITY
+
 /datum/design_techweb/lasercannon
 	name = "Laser Cannon"
 	desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core."
@@ -69,6 +102,20 @@
 	)
 	departmental_flags = DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_SCIENCE
 
+/**/ //CHOMPEnable
+/datum/design_techweb/cyrogun
+	name = "Cryo Gun"
+	desc = "An improperly researched and poorly built weapon, specialized in utlizing frost offensively.."
+	id = "cryogun"
+	materials = list(MAT_GLASS = 3000, MAT_MORPHIUM = 4000, MAT_DURASTEEL = 6000, MAT_LEAD = 6000, MAT_METALHYDROGEN = 3000)
+	build_path = /obj/item/gun/energy/freezegun
+	build_type = PROTOLATHE
+	category = list(
+		RND_CATEGORY_WEAPONS
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SECURITY
+/**/ //CHOMPEnable
+
 /datum/design_techweb/decloner
 	name = "Decloner"
 	id = "decloner"

code/modules/research/tg/techwebs/nodes/research_nodes.dm

@@ -20,6 +20,20 @@
 		// "portadrive_super",
 	)
 
+/datum/techweb_node/protolathe_boards
+	id = TECHWEB_NODE_PROTOLATHE_BOARDS
+	starting_node = TRUE
+	display_name = "Protolathe Boards"
+	description = "The fundamental technology required for production of more experimental protolathe boards."
+	design_ids = list(
+		"protolathe_science",
+		"protolathe_service",
+		"protolathe_medical",
+		"protolathe_cargo",
+		"protolathe_engineering",
+		"protolathe_security",
+	)
+
 /datum/techweb_node/bluespace_theory
 	id = TECHWEB_NODE_BLUESPACE_THEORY
 	display_name = "Bluespace Theory"

code/modules/research/tg/techwebs/nodes/security_nodes.dm

@@ -190,7 +190,8 @@
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS) //They mostly work on mobs.
 	announce_channels = list(CHANNEL_SECURITY) //CHOMPEdit End - Adds Phase Weaponry
 
-/datum/techweb_node/cryogun //CHOMPEdit Start
+//CHOMPEnable Start
+/datum/techweb_node/cryogun
 	id = TECHWEB_NODE_CRYOGUN
 	display_name = "Cryogenic Gun"
 	description = "Specialized gun that allows for cooling down a target."
@@ -201,6 +202,8 @@
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS) //It's actually laughably weak.
 	announce_channels = list(CHANNEL_SECURITY)
 
+//CHOMPEnable End
+
 /datum/techweb_node/caseless_rifle
 	id = TECHWEB_NODE_CASELESS_RIFLE
 	display_name = "Caseless rifle"
@@ -208,11 +211,13 @@
 	prereq_ids = list(TECHWEB_NODE_EXOTIC_AMMO)
 	design_ids = list(
 		"caselessrifle",
+		"caselessrifle_ammo",
+		"caselessrifle_ammo_stun",
 	)
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
 	announce_channels = list(CHANNEL_SECURITY)
 
-/datum/techweb_node/metamorphosis_ray
+/datum/techweb_node/metamorphosis_ray //CHOMPEdit Start
 	id = TECHWEB_NODE_METAMORPHOSIS_RAY
 	display_name = "Metamorposis Ray"
 	description = "A Specialized weapon that allows transforming the target into various simple creatures."