Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into logic

code/modules/research/designs/autolathe_designs.dm

@@ -251,6 +251,14 @@
 	build_path = /obj/item/device/assembly/voice
 	category = list("initial", "Miscellaneous")
 
+/datum/design/videocam
+	name = "Video Camera"
+	id = "videocam"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 120, MAT_GLASS = 60)
+	build_path = /obj/item/device/videocam
+	category = list("initial", "Miscellaneous")
+
 /datum/design/canvas
 	name = "11px by 11px Canvas"
 	id = "canvas"
@@ -439,6 +447,22 @@
 	build_path = /obj/item/weapon/bonesetter
 	category = list("initial", "Medical")
 
+/datum/design/fixovein
+	name = "FixOVein"
+	id = "fixovein"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 5000, MAT_GLASS = 3000)
+	build_path = /obj/item/weapon/FixOVein
+	category = list("initial", "Medical")
+
+/datum/design/bonegel
+	name = "Bone Gel"
+	id = "bonegel"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 1000, MAT_GLASS = 6000)
+	build_path = /obj/item/weapon/bonegel
+	category = list("initial", "Medical")
+
 /datum/design/syringe
 	name = "Syringe"
 	id = "syringe"

code/modules/research/designs/comp_board_designs.dm

@@ -182,6 +182,16 @@
 	build_path = /obj/item/weapon/circuitboard/operating
 	category = list("Computer Boards")
 
+/datum/design/pandemic
+	name = "Computer Design (PanD.E.M.I.C. 2200)"
+	desc = "Allows for the construction of circuit boards used to build a PanD.E.M.I.C. 2200 console."
+	id = "pandemic"
+	req_tech = list("programming" = 2, "biotech" = 2)
+	build_type = IMPRINTER
+	materials = list(MAT_GLASS = 1000, "sacid" = 20)
+	build_path = /obj/item/weapon/circuitboard/pandemic
+	category = list("Computer Boards")
+
 /datum/design/powermonitor
 	name = "Console Board (Power Monitor)"
 	desc = "Allows for the construction of circuit boards used to build a new power monitor"