Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm

@@ -103,7 +103,17 @@
 /datum/design/rcd_ammo
 	name = "Compressed Matter Cartridge"
 	id = "rcd_ammo"
-	build_type = AUTOLATHE
+	build_type = AUTOLATHE | PROTOLATHE
 	materials = list(/datum/material/iron = 12000, /datum/material/glass=8000)
 	build_path = /obj/item/rcd_ammo
-	category = list("initial","Construction")
+	category = list("initial","Construction","Tool Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/rcd_ammo_large
+	name = "Large Compressed Matter Cartridge"
+	id = "rcd_ammo_large"
+	build_type = AUTOLATHE | PROTOLATHE
+	materials = list(MAT_METAL = 48000, MAT_GLASS = 32000)
+	build_path = /obj/item/rcd_ammo/large
+	category = list("Tool Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING

code/modules/research/designs/misc_designs.dm

@@ -403,6 +403,16 @@
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
 
+/datum/design/holosigncombifan
+	name = "ATMOS Holo-Combifan Projector"
+	desc = "A holographic projector that creates holographic barriesr that prevent changes in atmospheric and temperature conditions."
+	id = "holosigncombifan"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 7500, MAT_GLASS = 2500, MAT_SILVER = 2500, MAT_GOLD = 2500, MAT_TITANIUM = 1750)
+	build_path = /obj/item/holosign_creator/combifan
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
 /datum/design/forcefield_projector
 	name = "Forcefield Projector"
 	desc = "A device which can project temporary forcefields to seal off an area."