Merge branch 'master' into reagentToDefines

code/modules/research/designs/circuits/circuits.dm

@@ -123,6 +123,13 @@ CIRCUITS BELOW
 	build_path = /obj/item/circuitboard/crew
 	sort_string = "FAGAI"
 
+/datum/design/circuit/pandemic
+	name = "PanD.E.M.I.C 2200"
+	id = "pandemic"
+	req_tech = list(TECH_DATA = 2, TECH_BIO = 2)
+	build_path = /obj/item/circuitboard/pandemic
+	sort_string = "FAGAJ"
+
 /datum/design/circuit/teleconsole
 	name = "teleporter control console"
 	id = "teleconsole"

code/modules/research/prosfab_designs.dm

@@ -83,6 +83,7 @@
 		H.b_skin = 0
 		H.dna.ResetUIFrom(H)
 
+		H.allow_spontaneous_tf = TRUE // Allows vore customization of synthmorphs
 		H.real_name = "Synthmorph #[rand(100,999)]"
 		H.name = H.real_name
 		H.dir = 2