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

code/modules/research/designs/autobotter_designs.dm

@@ -151,97 +151,97 @@
 	name = "Export Design (Wine)"
 	desc = "Allows for the blowing, and bottling of Wine bottles."
 	id = "wine_export"
-	reagents_list = list("wine" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/wine = 100)
 	build_path = /obj/item/export/bottle/wine
 
 /datum/design/bottle/export/rum
 	name = "Export Design (Rum)"
 	desc = "Allows for the blowing, and bottling of Rum bottles."
 	id = "rum_export"
-	reagents_list = list("rum" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/rum = 100)
 	build_path = /obj/item/export/bottle/rum
 
 /datum/design/bottle/export/gin
 	name = "Export Design (Gin)"
 	desc = "Allows for the blowing, and bottling of Gin bottles."
 	id = "gin_export"
-	reagents_list = list("gin" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/gin = 100)
 	build_path = /obj/item/export/bottle/gin
 
 /datum/design/bottle/export/whiskey
 	name = "Export Design (Whiskey)"
 	desc = "Allows for the blowing, and bottling of Whiskey bottles."
 	id = "whiskey_export"
-	reagents_list = list("whiskey" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/whiskey = 100)
 	build_path = /obj/item/export/bottle/whiskey
 
 /datum/design/bottle/export/vodka
 	name = "Export Design (Vodka)"
 	desc = "Allows for the blowing, and bottling of 99% Vodka bottles."
 	id = "vodka_export"
-	reagents_list = list("vodka" = 99, "water" = 1)
+	reagents_list = list(/datum/reagent/consumable/ethanol/vodka = 99, /datum/reagent/water = 1)
 	build_path = /obj/item/export/bottle/vodka
 
 /datum/design/bottle/export/tequila
 	name = "Export Design (Tequila)"
 	desc = "Allows for the blowing, and bottling of Tequila bottles."
 	id = "tequila_export"
-	reagents_list = list("tequila" = 80, "lemon_juice" = 20)
+	reagents_list = list(/datum/reagent/consumable/ethanol/tequila = 80, /datum/reagent/consumable/lemonjuice = 20)
 	build_path = /obj/item/export/bottle/tequila
 
 /datum/design/bottle/export/patron
 	name = "Export Design (Patron)"
 	desc = "Allows for the blowing, and bottling of Patron bottles."
 	id = "patron_export"
-	reagents_list = list("patron" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/patron = 100)
 	build_path = /obj/item/export/bottle/patron
 
 /datum/design/bottle/export/kahlua
 	name = "Export Design (Kahlua)"
 	desc = "Allows for the blowing, and bottling of Kahlua bottles."
 	id = "kahlua_export"
-	reagents_list = list("kahlua" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/kahlua = 100)
 	build_path = /obj/item/export/bottle/kahlua
 
 /datum/design/bottle/export/sake
 	name = "Export Design (Sake)"
 	desc = "Allows for the blowing, and bottling of Sake bottles."
 	id = "sake_export"
-	reagents_list = list("sake" = 80, "rice" = 10, "sugar" = 10)
+	reagents_list = list(/datum/reagent/consumable/ethanol/sake = 80, /datum/reagent/consumable/rice = 10, /datum/reagent/consumable/sugar = 10)
 	build_path = /obj/item/export/bottle/sake
 
 /datum/design/bottle/export/vermouth
 	name = "Export Design (Vermouth)"
 	desc = "Allows for the blowing, and bottling of Vermouth bottles."
 	id = "vermouth_export"
-	reagents_list = list("vermouth" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/vermouth = 100)
 	build_path = /obj/item/export/bottle/vermouth
 
 /datum/design/bottle/export/goldschlager
 	name = "Export Design (Goldschlager)"
 	desc = "Allows for the blowing, and bottling of Goldschlager bottles."
 	id = "goldschlager_export"
-	reagents_list = list("goldschlager" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/goldschlager = 100)
 	build_path = /obj/item/export/bottle/goldschlager
 
 /datum/design/bottle/export/hcider
 	name = "Export Design (Cider)"
 	desc = "Allows for the blowing, and bottling of Cider bottles."
 	id = "hcider_export"
-	reagents_list = list("hcider" = 30, "water" = 20)
+	reagents_list = list(/datum/reagent/consumable/ethanol/hcider = 30, /datum/reagent/water = 20)
 	build_path = /obj/item/export/bottle/hcider
 
 /datum/design/bottle/export/cognac
 	name = "Export Design (Cognac)"
 	desc = "Allows for the blowing, and bottling of Cognac bottles."
 	id = "cognac_export"
-	reagents_list = list("cognac" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/cognac = 100)
 	build_path = /obj/item/export/bottle/cognac
 
 /datum/design/bottle/export/absinthe
 	name = "Export Design (Absinthe)"
 	desc = "Allows for the blowing, and bottling of Absinthe bottles."
-	reagents_list = list("absinthe" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/absinthe = 100)
 	id = "absinthe_export"
 	build_path = /obj/item/export/bottle/absinthe
 
@@ -249,49 +249,49 @@
 	name = "Export Design (Grappa)"
 	desc = "Allows for the blowing, and bottling of Grappa bottles."
 	id = "grappa_export"
-	reagents_list = list("grappa" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/grappa = 100)
 	build_path = /obj/item/export/bottle/grappa
 
 /datum/design/bottle/export/fernet
 	name = "Export Design (Fernet)"
 	desc = "Allows for the blowing, and bottling of Fernet bottles."
 	id = "fernet_export"
-	reagents_list = list("fernet" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/fernet = 100)
 	build_path = /obj/item/export/bottle/fernet
 
 /datum/design/bottle/export/applejack
 	name = "Export Design (Applejack)"
 	desc = "Allows for the blowing, and bottling of Applejack bottles."
 	id = "applejack_export"
-	reagents_list = list("applejack" = 50, "gin" = 10)
+	reagents_list = list(/datum/reagent/consumable/ethanol/applejack = 50, /datum/reagent/consumable/ethanol/gin = 10)
 	build_path = /obj/item/export/bottle/applejack
 
 /datum/design/bottle/export/champagne
 	name = "Export Design (Champagne)"
 	desc = "Allows for the blowing, and bottling of Champagne bottles."
 	id = "champagne_export"
-	reagents_list = list("champagne" = 90, "co2" = 10)
+	reagents_list = list(/datum/reagent/consumable/ethanol/champagne = 90, /datum/reagent/carbondioxide = 10)
 	build_path = /obj/item/export/bottle/champagne
 
 /datum/design/bottle/export/blazaam
 	name = "Export Design (Blazaam)"
 	desc = "Allows for the blowing, and bottling of Blazaam bottles."
 	id = "blazaam_export"
-	reagents_list = list("blazaam" = 80, "holywater" = 20)
+	reagents_list = list(/datum/reagent/consumable/ethanol/blazaam = 80, /datum/reagent/water/holywater = 20)
 	build_path = /obj/item/export/bottle/blazaam
 
 /datum/design/bottle/export/trappist
 	name = "Export Design (Trappist)"
 	desc = "Allows for the blowing, and bottling of Trappist bottles."
 	id = "trappist_export"
-	reagents_list = list("trappist" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/trappist = 100)
 	build_path = /obj/item/export/bottle/trappist
 
 /datum/design/bottle/export/grenadine
 	name = "Export Design (Grenadine)"
 	desc = "Allows for the blowing, and bottling of Grenadine bottles."
 	id = "grenadine_export"
-	reagents_list = list("grenadine" = 100)
+	reagents_list = list(/datum/reagent/consumable/grenadine = 100)
 	build_path = /obj/item/export/bottle/grenadine
 
 /datum/design/bottle/export/minikeg
@@ -299,7 +299,7 @@
 	desc = "Allows for the fabication, and bottling of Minikeg of craft beer."
 	id = "minikeg"
 	category = list("Beers")
-	reagents_list = list("light_beer" = 100)
+	reagents_list = list(/datum/reagent/consumable/ethanol/beer/light = 100)
 	build_path = /obj/item/export/bottle/minikeg
 
 /datum/design/bottle/export/blooddrop
@@ -307,7 +307,7 @@
 	desc = "Allows for the blowing, and bottling of Blooddrop bottles."
 	id = "blooddrop"
 	category = list("Wines")
-	reagents_list = list("champagne" = 30, "co2" = 30, "wine" = 10, "grape_juice" = 30)
+	reagents_list = list(/datum/reagent/consumable/ethanol/champagne = 30, /datum/reagent/carbondioxide = 30, /datum/reagent/consumable/ethanol/wine = 10, /datum/reagent/consumable/grapejuice = 30)
 	build_path = /obj/item/export/bottle/blooddrop
 
 /datum/design/bottle/export/slim_gold
@@ -315,7 +315,7 @@
 	desc = "Allows for the blowing, and bottling of Slim Gold bottles."
 	id = "slim_gold"
 	category = list("Beers")
-	reagents_list = list("gold" = 10, "co2" = 10, "rum" = 30, "beer" = 40)
+	reagents_list = list(/datum/reagent/gold = 10, /datum/reagent/carbondioxide = 10, /datum/reagent/consumable/ethanol/rum = 30, /datum/reagent/consumable/ethanol/beer = 40)
 	build_path = /obj/item/export/bottle/slim_gold
 
 /datum/design/bottle/export/white_bloodmoon
@@ -323,13 +323,13 @@
 	desc = "Allows for the blowing, and bottling of White Bloodmoon bottles."
 	id = "white_bloodmoon"
 	category = list("Wines")
-	reagents_list = list("synthflesh" = 50, "blood" = 50, "gib" = 10)
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 50, /datum/reagent/blood = 50, /datum/reagent/liquidgibs = 10)
 	build_path = /obj/item/export/bottle/white_bloodmoon
 
 /datum/design/bottle/export/greenroad
 	name = "Export Design (Greenroad)"
 	desc = "Allows for the blowing, and bottling of Greenroad bottles."
 	id = "greenroad"
-	reagents_list = list("vitfro" = 50, "rum" = 50, "ash" = 10)
+	reagents_list = list(/datum/reagent/consumable/vitfro = 50, /datum/reagent/consumable/ethanol/rum = 50, /datum/reagent/ash = 10)
 	category = list("Beers")
 	build_path = /obj/item/export/bottle/greenroad

code/modules/research/designs/autoylathe_designs.dm

@@ -0,0 +1,708 @@
+/datum/design/autoylathe
+	build_type = AUTOYLATHE
+
+/datum/design/autoylathe/mech
+	category = list("initial", "Figurines")
+
+/datum/design/autoylathe/mech/contraband
+	category = list("hacked", "Figurines")
+
+/datum/design/autoylathe/figure
+	category = list("initial", "Figurines")
+
+/datum/design/autoylathe/balloon
+	name = "Empty Water balloon"
+	id = "waterballoon"
+	materials = list(MAT_PLASTIC = 50)
+	build_path = /obj/item/toy/balloon
+	category = list("initial", "Toys")
+
+/datum/design/autoylathe/spinningtoy
+	name = "Toy Singularity"
+	id = "singuloutoy"
+	materials = list(MAT_PLASTIC = 500)
+	build_path = /obj/item/toy/spinningtoy
+	category = list("initial", "Toys")
+
+/datum/design/autoylathe/capgun
+	name = "Cap Gun"
+	id = "capgun"
+	materials = list(MAT_PLASTIC = 500)
+	build_path = /obj/item/toy/gun
+	category = list("initial", "Pistols")
+
+/datum/design/autoylathe/capgunammo
+	name = "Capgun Ammo"
+	id = "capgunammo"
+	materials = list(MAT_PLASTIC = 50)
+	build_path = /obj/item/toy/ammo/gun
+	category = list("initial", "misc")
+
+/datum/design/autoylathe/toysword
+	name = "Toy Sword"
+	id = "toysword"
+	materials = list(MAT_PLASTIC = 500)
+	build_path = /obj/item/toy/sword
+	category = list("initial", "Melee")
+
+/datum/design/autoylathe/foamblade
+	name = "Foam Armblade"
+	id = "foamblade"
+	materials = list(MAT_PLASTIC = 500)
+	build_path = /obj/item/toy/foamblade
+	category = list("initial", "Melee")
+
+/datum/design/autoylathe/windupbox
+	name = "Wind Up Toolbox"
+	id = "windupbox"
+	materials = list(MAT_PLASTIC = 500)
+	build_path = /obj/item/toy/windupToolbox
+	category = list("initial", "Toys")
+
+/datum/design/autoylathe/toydualsword
+	name = "Double-Bladed Toy Sword"
+	id = "dbtoysword"
+	materials = list(MAT_PLASTIC = 1000)
+	build_path = /obj/item/twohanded/dualsaber/toy
+	category = list("initial", "Melee")
+
+/datum/design/autoylathe/toykatana
+	name = "Replica Katana"
+	id = "toykatana"
+	materials = list(MAT_PLASTIC = 50, MAT_METAL = 450)
+	build_path = /obj/item/toy/katana
+	category = list("initial", "Melee")
+
+/datum/design/autoylathe/snappop
+	name = "Snap Pop"
+	id = "snappop_phoenix"
+	materials = list(MAT_PLASTIC = 50)
+	build_path = /obj/item/toy/snappop
+	category = list("initial", "Toys")
+
+/datum/design/autoylathe/mech/model1
+	name = "Toy Ripley"
+	id = "toymech1"
+	materials = list(MAT_PLASTIC = 250)
+	build_path = /obj/item/toy/prize/ripley
+
+/datum/design/autoylathe/mech/model2
+	name = "Toy Firefighter Ripley"
+	id = "toymech2"
+	materials = list(MAT_PLASTIC = 250)
+	build_path = /obj/item/toy/prize/fireripley
+
+/datum/design/autoylathe/mech/contraband/model3
+	name = "Toy Deathsquad fireripley "
+	id = "toymech3"
+	materials = list(MAT_PLASTIC = 250)
+	build_path = /obj/item/toy/prize/deathripley
+
+/datum/design/autoylathe/mech/model4
+	name = "Toy Gygax"
+	id = "toymech4"
+	materials = list(MAT_PLASTIC = 250)
+	build_path = /obj/item/toy/prize/gygax
+
+/datum/design/autoylathe/mech/model5
+	name = "Toy Durand"
+	id = "toymech5"
+	materials = list(MAT_PLASTIC = 250)
+	build_path = /obj/item/toy/prize/durand
+
+/datum/design/autoylathe/mech/contraband/model6
+	name = "Toy H.O.N.K."
+	id = "toymech6"
+	materials = list(MAT_PLASTIC = 250)
+	build_path = /obj/item/toy/prize/honk
+
+/datum/design/autoylathe/mech/contraband/model7
+	name = "Toy Marauder"
+	id = "toymech7"
+	materials = list(MAT_PLASTIC = 250)
+	build_path = /obj/item/toy/prize/marauder
+
+/datum/design/autoylathe/mech/contraband/model8
+	name = "Toy Seraph"
+	id = "toymech8"
+	materials = list(MAT_PLASTIC = 250)
+	build_path = /obj/item/toy/prize/seraph
+
+/datum/design/autoylathe/mech/contraband/model9
+	name = "Toy Mauler"
+	id = "toymech9"
+	materials = list(MAT_PLASTIC = 250)
+	build_path = /obj/item/toy/prize/mauler
+
+/datum/design/autoylathe/mech/model10
+	name = "Toy Odysseus"
+	id = "toymech10"
+	materials = list(MAT_PLASTIC = 250)
+	build_path = /obj/item/toy/prize/odysseus
+
+/datum/design/autoylathe/mech/model11
+	name = "Toy Phazon"
+	id = "toymech11"
+	materials = list(MAT_PLASTIC = 250)
+	build_path = /obj/item/toy/prize/phazon
+
+/datum/design/autoylathe/mech/contraband/model12
+	name = "Toy Reticence"
+	id = "toymech12"
+	materials = list(MAT_PLASTIC = 250)
+	build_path = /obj/item/toy/prize/reticence
+	category = list("hacked", "Figurines")
+
+/datum/design/autoylathe/talking/AI
+	name = "Toy AI"
+	id = "ToyAICore"
+	materials = list(MAT_PLASTIC = 250, MAT_METAL = 50)
+	build_path = /obj/item/toy/talking/AI
+	category = list("initial", "Toys")
+
+/datum/design/autoylathe/talking/codex_gigas
+	name = "Toy Codex Gigas"
+	id = "ToyCodex"
+	materials = list(MAT_PLASTIC = 250, MAT_METAL = 50)
+	build_path = /obj/item/toy/talking/codex_gigas
+	category = list("initial", "Toys")
+
+/datum/design/autoylathe/talking/owl
+	name = "Owl Action Figure"
+	id = "owlactionfig"
+	materials = list(MAT_PLASTIC = 250, MAT_METAL = 50)
+	build_path = /obj/item/toy/talking/owl
+
+/datum/design/autoylathe/talking/griffin
+	name = "Griffon Action Figure"
+	id = "griffinactionfig"
+	materials = list(MAT_PLASTIC = 250, MAT_METAL = 50)
+	build_path = /obj/item/toy/talking/griffin
+
+/datum/design/autoylathe/cards
+	name = "Deck of Cards"
+	id = "carddeck"
+	materials = list(MAT_PLASTIC = 250)
+	build_path = /obj/item/toy/cards/deck
+	category = list("initial", "Toys")
+
+/datum/design/autoylathe/nuke
+	name = "Nuclear Fission Explosive Toy"
+	id = "nuketoy"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/nuke
+	category = list("initial", "Toys")
+
+/datum/design/autoylathe/minimeteor
+	name = "Mini-Meteor"
+	id = "meattoy"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/minimeteor
+	category = list("hacked", "Misc")
+
+/datum/design/autoylathe/redbutton
+	name = "Big Red Button"
+	id = "redbutton"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/redbutton
+	category = list("initial", "Toys")
+
+/datum/design/autoylathe/beach_ball
+	name = "Beach Ball"
+	id = "beachball"
+	materials = list(MAT_PLASTIC = 500)
+	build_path = /obj/item/toy/beach_ball
+	category = list("initial", "Toys")
+
+/datum/design/autoylathe/clockwork_watch
+	name = "Clockwork Watch"
+	id = "clockwatch"
+	materials = list(MAT_PLASTIC = 1000)
+	build_path = /obj/item/toy/clockwork_watch
+	category = list("initial", "misc")
+
+/datum/design/autoylathe/dagger
+	name = "Toy Dagger"
+	id = "toydagger"
+	materials = list(MAT_PLASTIC = 1000)
+	build_path = /obj/item/toy/toy_dagger
+	category = list("initial", "Melee")
+
+/datum/design/autoylathe/xeno
+	name = "Xenomorph"
+	id = "xenomorph"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/toy_xeno
+
+/datum/design/autoylathe/cattoy
+	name = "Toy Mouse"
+	id = "cattoy"
+	materials = list(MAT_PLASTIC = 500)
+	build_path = /obj/item/toy/cattoy
+	category = list("initial", "Toys")
+
+/datum/design/autoylathe/figure/assistant
+	name = "Assistant"
+	id = "assfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/assistant
+
+/datum/design/autoylathe/figure/atmos
+	name = "Atmos Tech"
+	id = "atmfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/atmos
+
+/datum/design/autoylathe/figure/bartender
+	name = "Bartender"
+	id = "barfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/bartender
+
+/datum/design/autoylathe/figure/botanist
+	name = "Botanist"
+	id = "botfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/botanist
+
+/datum/design/autoylathe/figure/captain
+	name = "Captain"
+	id = "capfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/captain
+
+/datum/design/autoylathe/figure/cargotech
+	name = "Cargo Technician"
+	id = "carfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/cargotech
+
+/datum/design/autoylathe/figure/ce
+	name = "Chief Engineer"
+	id = "cefigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/ce
+
+/datum/design/autoylathe/figure/chaplain
+	name = "Chaplain"
+	id = "chafigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/chaplain
+
+/datum/design/autoylathe/figure/chef
+	name = "Chef"
+	id = "chefigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/chef
+
+/datum/design/autoylathe/figure/chemist
+	name = "Chemist"
+	id = "chmfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/chemist
+
+/datum/design/autoylathe/figure/clown
+	name = "Clown"
+	id = "clnfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/clown
+
+/datum/design/autoylathe/figure/cmo
+	name = "Chief Medical Officer"
+	id = "cmofigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/cmo
+
+/datum/design/autoylathe/figure/curator
+	name = "Curator"
+	id = "curfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/curator
+
+/datum/design/autoylathe/figure/borg
+	name = "Cyborg"
+	id = "cybfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/borg
+
+/datum/design/autoylathe/figure/detective
+	name = "Detective"
+	id = "detfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/detective
+
+/datum/design/autoylathe/figure/engineer
+	name = "Engineer"
+	id = "engfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/engineer
+
+/datum/design/autoylathe/figure/geneticist
+	name = "Geneticist"
+	id = "genfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/geneticist
+
+/datum/design/autoylathe/figure/hop
+	name = "Head of Personnel"
+	id = "hopfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/hop
+
+/datum/design/autoylathe/figure/hos
+	name = "Head of Security"
+	id = "hosfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/hos
+
+/datum/design/autoylathe/figure/janitor
+	name = "Janitor"
+	id = "janfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/janitor
+
+/datum/design/autoylathe/figure/lawyer
+	name = "Lawyer"
+	id = "lawfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/lawyer
+
+/datum/design/autoylathe/figure/md
+	name = "Medical Doctor"
+	id = "medfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/md
+
+/datum/design/autoylathe/figure/mime
+	name = "Mime"
+	id = "mimfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/mime
+
+/datum/design/autoylathe/figure/miner
+	name = "Miner"
+	id = "minfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/miner
+
+/datum/design/autoylathe/figure/rd
+	name = "Research Director"
+	id = "rdfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/rd
+
+/datum/design/autoylathe/figure/robotocist
+	name = "Robotocist"
+	id = "robfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/roboticist
+
+/datum/design/autoylathe/figure/qm
+	name = "Quartermaster"
+	id = "qtmfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/qm
+
+/datum/design/autoylathe/figure/scientist
+	name = "Scientist"
+	id = "scifigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/scientist
+
+/datum/design/autoylathe/figure/secofficer
+	name = "Security Officer"
+	id = "secfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/secofficer
+
+/datum/design/autoylathe/figure/virologist
+	name = "Virologist"
+	id = "virfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/virologist
+
+/datum/design/autoylathe/figure/warden
+	name = "Warden"
+	id = "warfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/warden
+
+/datum/design/autoylathe/figure/dsquad
+	name = "Deathsquad"
+	id = "dsqfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/dsquad
+	category = list("hacked", "Figurines")
+
+/datum/design/autoylathe/figure/ian
+	name = "Ian"
+	id = "ianfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/ian
+	category = list("hacked", "Figurines")
+
+/datum/design/autoylathe/figure/ninja
+	name = "Ninja"
+	id = "ninfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/ninja
+	category = list("hacked", "Figurines")
+
+/datum/design/autoylathe/figure/syndie
+	name = "Nuclear Operative"
+	id = "nucfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/syndie
+	category = list("hacked", "Figurines")
+
+/datum/design/autoylathe/figure/wizard
+	name = "Wizard"
+	id = "wizfigure"
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 50)
+	build_path = /obj/item/toy/figure/wizard
+	category = list("hacked", "Figurines")
+
+/datum/design/autoylathe/dildo
+	name = "Customizable Dildo"
+	id = "dildo"
+	materials = list(MAT_PLASTIC = 2000)
+	build_path = /obj/item/dildo/custom
+	category = list("initial", "Adult")
+
+/datum/design/autoylathe/collar
+	name = "Collar"
+	id = "collar"
+	materials = list(MAT_PLASTIC = 250, MAT_METAL = 50)
+	build_path = /obj/item/clothing/neck/petcollar
+	category = list("initial", "Adult")
+
+/datum/design/autoylathe/lastag/blue/gun
+	name = "Blue Lasertag Rifle"
+	id = "lastagrifleblue"
+	materials = list(MAT_PLASTIC = 2000, MAT_METAL = 500, MAT_GLASS = 500)
+	build_path = /obj/item/gun/energy/laser/bluetag
+	category = list("initial", "Rifles")
+
+/datum/design/autoylathe/lastag/red/gun
+	name = "Red Lasertag Rifle"
+	id = "lastagriflered"
+	materials = list(MAT_PLASTIC = 2000, MAT_METAL = 500, MAT_GLASS = 500)
+	build_path = /obj/item/gun/energy/laser/redtag
+	category = list("initial", "Rifles")
+
+/datum/design/autoylathe/lastag/blue/hat
+	name = "Blue Lasertag Helmet"
+	id = "lastaghatblue"
+	materials = list(MAT_PLASTIC = 4000, MAT_METAL = 1000, MAT_GLASS = 500)
+	build_path = /obj/item/clothing/head/helmet/bluetaghelm
+	category = list("initial", "Armor")
+
+/datum/design/autoylathe/lastag/blue/armor
+	name = "Blue Lasertag Armor"
+	id = "lastagarmorblue"
+	materials = list(MAT_PLASTIC = 8000, MAT_METAL = 2000, MAT_GLASS = 100)
+	build_path = /obj/item/clothing/suit/bluetag
+	category = list("initial", "Armor")
+
+/datum/design/autoylathe/lastag/red/hat
+	name = "Red Lasertag Helmet"
+	id = "lastaghelmetred"
+	materials = list(MAT_PLASTIC = 4000, MAT_METAL = 1000, MAT_GLASS = 500)
+	build_path = /obj/item/clothing/head/helmet/redtaghelm
+	category = list("initial", "Armor")
+
+/datum/design/autoylathe/lastag/red/armor
+	name = "Red Lasertag Armor"
+	id = "lastagarmorred"
+	materials = list(MAT_PLASTIC = 8000, MAT_METAL = 2000, MAT_GLASS = 1000)
+	build_path = /obj/item/clothing/suit/redtag
+	category = list("initial", "Armor")
+
+//because why not make a boxed kit with all of the lastag shit?
+/obj/item/storage/box/blueteam
+	name = "Blue Team Kit"
+
+/obj/item/storage/box/blueteam/PopulateContents()
+	new /obj/item/clothing/head/helmet/bluetaghelm(src)
+	new /obj/item/clothing/suit/bluetag(src)
+	new /obj/item/gun/energy/laser/bluetag(src)
+	new /obj/item/clothing/gloves/color/blue(src)
+	new /obj/item/clothing/shoes/sneakers/blue(src)
+	new /obj/item/clothing/under/color/blue(src)
+
+/obj/item/storage/box/redteam
+	name = "Red Team Kit"
+
+/obj/item/storage/box/redteam/PopulateContents()
+	new /obj/item/clothing/head/helmet/redtaghelm(src)
+	new /obj/item/clothing/suit/redtag(src)
+	new /obj/item/gun/energy/laser/redtag(src)
+	new /obj/item/clothing/gloves/color/red(src)
+	new /obj/item/clothing/shoes/sneakers/red(src)
+	new /obj/item/clothing/under/color/red(src)
+
+/datum/design/autoylathe/lastag/blue
+	name = "Blue Lasertag Kit"
+	id = "lastagkitblue"
+	materials = list(MAT_PLASTIC = 16000, MAT_METAL = 4000, MAT_GLASS = 2000)
+	build_path = /obj/item/storage/box/blueteam
+	category = list("initial", "Misc")
+
+/datum/design/autoylathe/lastag/red
+	name = "Red Lasertag Kit"
+	id = "lastagkitred"
+	materials = list(MAT_PLASTIC = 16000, MAT_METAL = 4000, MAT_GLASS = 2000)
+	build_path = /obj/item/storage/box/redteam
+	category = list("initial", "Misc")
+
+/datum/design/foam_x9
+	name = "Foam Force X9 Rifle"
+	id = "foam_x9"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 4000, MAT_METAL = 500)
+	build_path = /obj/item/gun/ballistic/automatic/x9/toy
+	category = list("initial", "Rifles")
+
+/datum/design/foam_dart
+	name = "Box of Foam Darts"
+	id = "foam_dart"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 100)
+	build_path = /obj/item/ammo_box/foambox
+	category = list("initial", "Misc")
+
+/datum/design/foam_magpistol
+	name = "Foam Force Magpistol"
+	id = "magfoam_launcher"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 2000, MAT_METAL = 250)
+	build_path = /obj/item/gun/ballistic/shotgun/toy/mag
+	category = list("initial", "Pistols")
+
+/datum/design/foam_magrifle
+	name = "Foam Force MagRifle"
+	id = "foam_magrifle"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 4000, MAT_METAL = 500)
+	build_path = /obj/item/gun/ballistic/automatic/magrifle/toy
+	category = list("initial", "Rifles")
+
+/datum/design/foam_hyperburst
+	name = "MagTag Hyper Rifle"
+	id = "foam_hyperburst"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 4000, MAT_METAL = 2000, MAT_GLASS = 1000)
+	build_path = /obj/item/gun/energy/laser/practice/hyperburst
+	category = list("initial", "Rifles")
+
+/datum/design/foam_sp
+	name = "Foam Force Stealth Pistol"
+	id = "foam_sp"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 2000, MAT_METAL = 1000)
+	build_path = /obj/item/gun/ballistic/automatic/toy/pistol/stealth
+	category = list("initial", "Pistols")
+
+/datum/design/toyray
+	name = "RayTag Gun"
+	id = "toyray"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 2000, MAT_METAL = 1000, MAT_GLASS = 1000)
+	build_path = /obj/item/gun/energy/laser/practice/raygun
+	category = list("initial", "Pistols")
+
+/datum/design/am4c
+	name = "Foam Force AM4-C Rifle"
+	id = "foam_am4c"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 4000, MAT_METAL = 500)
+	build_path = /obj/item/gun/ballistic/automatic/AM4C
+	category = list("initial", "Rifles")
+
+/datum/design/foam_f3
+	name = "Replica F3 Justicar"
+	id = "foam_f3"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 2000, MAT_METAL = 250)
+	build_path = /obj/item/toy/gun/justicar
+	category = list("initial", "Pistols")
+
+/datum/design/toy_blaster
+	name = "pump-action plastic blaster"
+	id = "toy_blaster"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 2000, MAT_METAL = 750, MAT_GLASS = 1000)
+	build_path = /obj/item/gun/energy/pumpaction/toy
+	category = list("initial", "Rifles")
+
+/datum/design/capammo
+	name = "Box of Caps"
+	id = "capammo"
+	build_type = AUTOYLATHE
+	materials = list(MAT_METAL = 10, MAT_GLASS = 10)
+	build_path = /obj/item/toy/ammo/gun
+	category = list("initial", "Misc")
+
+/datum/design/foam_smg
+	name = "Foam Force SMG"
+	id = "foam_smg"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 2000, MAT_METAL = 250)
+	build_path = /obj/item/gun/ballistic/automatic/toy/unrestricted
+	category = list("initial", "Pistols")
+
+/datum/design/foam_pistol
+	name = "Foam Force Pistol"
+	id = "foam_pistol"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 2000, MAT_METAL = 250)
+	build_path = /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted
+	category = list("initial", "Pistols")
+
+/datum/design/foam_shotgun
+	name = "Foam Force Shotgun"
+	id = "foam_shotgun"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 4000, MAT_METAL = 500)
+	build_path = /obj/item/gun/ballistic/shotgun/toy/unrestricted
+	category = list("initial", "Rifles")
+
+/datum/design/foam_dartred
+	name = "Box of Lastag Red Foam Darts"
+	id = "redfoam_dart"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 100)
+	build_path = /obj/item/ammo_box/foambox/tag/red
+	category = list("initial", "Misc")
+
+/datum/design/foam_dartblue
+	name = "Box of Lastag Blue Foam Darts"
+	id = "bluefoam_dart"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 500, MAT_METAL = 100)
+	build_path = /obj/item/ammo_box/foambox/tag/blue
+	category = list("initial", "Misc")
+
+/datum/design/foam_bow
+	name = "Foam Force Crossbow"
+	id = "foam_bow"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 2000, MAT_METAL = 250)
+	build_path = /obj/item/gun/ballistic/shotgun/toy/crossbow
+	category = list("initial", "Pistols")
+
+/datum/design/foam_c20
+	name = "Donksoft C20R"
+	id = "foam_c20"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 4000, MAT_METAL = 500)
+	build_path = /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted
+	category = list("hacked", "Rifles")
+
+/datum/design/foam_l6
+	name = "Donksoft LMG"
+	id = "foam_LMG"
+	build_type = AUTOYLATHE
+	materials = list(MAT_PLASTIC = 4000, MAT_METAL = 500)
+	build_path = /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted
+	category = list("hacked", "Rifles")

code/modules/research/designs/biogenerator_designs.dm

@@ -7,7 +7,7 @@
 	id = "milk"
 	build_type = BIOGENERATOR
 	materials = list(MAT_BIOMASS = 20)
-	make_reagents = list("milk" = 10)
+	make_reagents = list(/datum/reagent/consumable/milk = 10)
 	category = list("initial","Food")
 
 /datum/design/cream
@@ -15,7 +15,7 @@
 	id = "cream"
 	build_type = BIOGENERATOR
 	materials = list(MAT_BIOMASS = 30)
-	make_reagents = list("cream" = 10)
+	make_reagents = list(/datum/reagent/consumable/cream = 10)
 	category = list("initial","Food")
 
 /datum/design/milk_carton
@@ -39,7 +39,7 @@
 	id = "black_pepper"
 	build_type = BIOGENERATOR
 	materials = list(MAT_BIOMASS = 25)
-	make_reagents = list("blackpepper" = 10)
+	make_reagents = list(/datum/reagent/consumable/blackpepper = 10)
 	category = list("initial","Food")
 
 /datum/design/pepper_mill
@@ -51,6 +51,22 @@
 	make_reagents = list()
 	category = list("initial","Food")
 
+/datum/design/enzyme
+	name = "10u Universal Enzyme"
+	id = "enzyme"
+	build_type = BIOGENERATOR
+	materials = list(MAT_BIOMASS = 30)
+	make_reagents = list("enzyme" = 10)
+	category = list("initial","Food")
+
+/datum/design/flour_sack
+	name = "Flour Sack"
+	id = "flour_sack"
+	build_type = BIOGENERATOR
+	materials = list(MAT_BIOMASS = 150)
+	build_path = /obj/item/reagent_containers/food/condiment/flour
+	category = list("initial","Food")
+
 /datum/design/monkey_cube
 	name = "Monkey Cube"
 	id = "mcube"

code/modules/research/designs/limbgrower_designs.dm

@@ -6,7 +6,7 @@
 	name = "Left Arm"
 	id = "leftarm"
 	build_type = LIMBGROWER
-	reagents_list = list("synthflesh" = 25)
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
 	build_path = /obj/item/bodypart/l_arm
 	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
 
@@ -14,7 +14,7 @@
 	name = "Right Arm"
 	id = "rightarm"
 	build_type = LIMBGROWER
-	reagents_list = list("synthflesh" = 25)
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
 	build_path = /obj/item/bodypart/r_arm
 	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
 
@@ -22,7 +22,7 @@
 	name = "Left Leg"
 	id = "leftleg"
 	build_type = LIMBGROWER
-	reagents_list = list("synthflesh" = 25)
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
 	build_path = /obj/item/bodypart/l_leg
 	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
 
@@ -30,7 +30,7 @@
 	name = "Right Leg"
 	id = "rightleg"
 	build_type = LIMBGROWER
-	reagents_list = list("synthflesh" = 25)
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 25)
 	build_path = /obj/item/bodypart/r_leg
 	category = list("initial","human","lizard","fly","insect","plasmaman","mammal","xeno")
 
@@ -38,6 +38,6 @@
 	name = "Arm Blade"
 	id = "armblade"
 	build_type = LIMBGROWER
-	reagents_list = list("synthflesh" = 75)
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 75)
 	build_path = /obj/item/melee/synthetic_arm_blade
 	category = list("other","emagged")

code/modules/research/designs/mechfabricator_designs.dm

@@ -624,12 +624,21 @@
 	construction_time = 120
 	category = list("Cyborg Upgrade Modules")
 
-/datum/design/borg_upgrade_holding
-	name = "Cyborg Upgrade (Ore Satchel of Holding)"
-	id = "borg_upgrade_holding"
+/datum/design/borg_upgrade_advcutter
+	name = "Cyborg Upgrade (Advanced Plasma Cutter)"
+	id = "borg_upgrade_advcutter"
 	build_type = MECHFAB
-	build_path = /obj/item/borg/upgrade/soh
-	materials = list(MAT_METAL = 10000, MAT_GOLD = 250, MAT_URANIUM = 500)
+	build_path = /obj/item/borg/upgrade/advcutter
+	materials = list(MAT_METAL=8000, MAT_PLASMA=2000, MAT_GOLD= 2000)
+	construction_time = 120
+	category = list("Cyborg Upgrade Modules")
+
+/datum/design/borg_upgrade_premiumka
+	name = "Cyborg Upgrade (Premium Kinetic Accelerator)"
+	id = "borg_upgrade_premiumka"
+	build_type = MECHFAB
+	build_path = /obj/item/borg/upgrade/premiumka
+	materials = list(MAT_METAL=8000, MAT_GLASS=4000, MAT_TITANIUM=2000)
 	construction_time = 120
 	category = list("Cyborg Upgrade Modules")
 

code/modules/research/designs/nanite_designs.dm

@@ -25,6 +25,20 @@
 	program_type = /datum/nanite_program/viral
 	category = list("Utility Nanites")
 
+/datum/design/nanites/research
+	name = "Distributed Computing"
+	desc = "The nanites aid the research servers by performing a portion of its calculations, increasing research point generation."
+	id = "research_nanites"
+	program_type = /datum/nanite_program/research
+	category = list("Utility Nanites")
+
+/datum/design/nanites/researchplus
+	name = "Neural Network"
+	desc = "The nanites link the host's brains together forming a neural research network, that becomes more efficient with the amount of total hosts. Can be overloaded to increase research output."
+	id = "researchplus_nanites"
+	program_type = /datum/nanite_program/researchplus
+	category = list("Utility Nanites")
+
 /datum/design/nanites/monitoring
 	name = "Monitoring"
 	desc = "The nanites monitor the host's vitals and location, sending them to the suit sensor network."
@@ -39,6 +53,13 @@
 	program_type = /datum/nanite_program/triggered/self_scan
 	category = list("Utility Nanites")
 
+/datum/design/nanites/dermal_button
+	name = "Dermal Button"
+	desc = "Displays a button on the host's skin, which can be used to send a signal to the nanites."
+	id = "dermal_button_nanites"
+	program_type = /datum/nanite_program/dermal_button
+	category = list("Utility Nanites")
+
 /datum/design/nanites/stealth
 	name = "Stealth"
 	desc = "The nanites hide their activity and programming from superficial scans."
@@ -46,6 +67,15 @@
 	program_type = /datum/nanite_program/stealth
 	category = list("Utility Nanites")
 
+
+/datum/design/nanites/reduced_diagnostics
+	name = "Reduced Diagnostics"
+	desc = "Disables some high-cost diagnostics in the nanites, making them unable to communicate their program list to portable scanners. \
+	Doing so saves some power, slightly increasing their replication speed."
+	id = "red_diag_nanites"
+	program_type = /datum/nanite_program/reduced_diagnostics
+	category = list("Utility Nanites")
+
 /datum/design/nanites/access
 	name = "Subdermal ID"
 	desc = "The nanites store the host's ID access rights in a subdermal magnetic strip. Updates when triggered, copying the host's current access."

code/modules/research/designs/weapon_designs.dm

@@ -237,7 +237,7 @@
 	id = "decloner"
 	build_type = PROTOLATHE
 	materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000)
-	reagents_list = list("mutagen" = 40)
+	reagents_list = list(/datum/reagent/toxin/mutagen = 40)
 	build_path = /obj/item/gun/energy/decloner
 	category = list("Weapons")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -268,7 +268,7 @@
 	id = "flora_gun"
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 2000, MAT_GLASS = 500)
-	reagents_list = list("radium" = 20)
+	reagents_list = list(/datum/reagent/radium = 20)
 	build_path = /obj/item/gun/energy/floragun
 	category = list("Weapons")
 	departmental_flags = DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_SCIENCE