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

# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm

code/modules/research/designs/autolathe_designs.dm

@@ -323,6 +323,14 @@
 	build_path = /obj/item/weapon/canvas/twentythreeXnineteen
 	category = list("initial", "Miscellaneous")
 
+/datum/design/foambox
+		name = "Box of Foam Force darts"
+		id = "foamforce"
+		build_type = AUTOLATHE
+		materials = list(MAT_METAL = 2000)
+		build_path = /obj/item/ammo_box/foambox
+		category = list("initial", "Miscellaneous")
+
 /datum/design/canvas/twentythreeXtwentythree
 	name = "23px by 23px Canvas"
 	id = "canvas23x23"

code/modules/research/designs/machine_designs.dm

@@ -492,6 +492,17 @@
 	build_path = /obj/item/weapon/circuitboard/prize_counter
 	category = list("Misc. Machinery")
 
+/datum/design/gameboard
+	name = "Machine Design (Virtual Gameboard)"
+	desc = "The circuit board for a Virtual Gameboard."
+	id = "gameboard"
+	req_tech = list("programming" = 2)
+	build_type = IMPRINTER
+	materials = list(MAT_GLASS=1000, "sacid"=20)
+	build_path = /obj/item/weapon/circuitboard/gameboard
+	category = list("Misc. Machinery")
+
+
 /datum/design/botany_extractor
 	name = "Machine Design (Lysis-Isolation Centrifuge)"
 	desc = "The circuit board for a lysis-isolation centrifuge."