sweet merciful FUCK what is this merge

code/modules/research/designs.dm

@@ -37,9 +37,9 @@ other types of metals and chemistry for reagents).
 	var/list/materials = list()			//List of materials. Format: "id" = amount.
 	var/construction_time				//Amount of time required for building the object
 	var/build_path = null				//The file path of the object that gets created
-	var/list/make_reagents = list()			//Reagents produced. Format: "id" = amount. Currently only supported by the biogenerator.
+	var/list/make_reagents = list()			//Reagents produced. Format: type = amount. Currently only supported by the biogenerator.
 	var/list/category = null 			//Primarily used for Mech Fabricators, but can be used for anything
-	var/list/reagents_list = list()			//List of reagents. Format: "id" = amount.
+	var/list/reagents_list = list()			//List of reagents. Format: type = amount.
 	var/maxstack = 1
 	var/lathe_time_factor = 1			//How many times faster than normal is this to build on the protolathe
 	var/dangerous_construction = FALSE	//notify and log for admin investigations if this is printed.

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

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/machine_desings/machine_designs_medical.dm

@@ -24,7 +24,15 @@
 	id = "sleeper"
 	build_path = /obj/item/circuitboard/machine/sleeper
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_ENGINEERING
-	category = list ("Medical Machinery")
+	category = list("Medical Machinery")
+
+/datum/design/board/syndiesleeper
+	name = "Machine Design (Syndicate Sleeper Board)"
+	desc = "The circuit board for a Syndicate sleeper, with controls inside."
+	id = "syndiesleeper"
+	build_path = /obj/item/circuitboard/machine/sleeper/syndie
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_ENGINEERING
+	category = list("Medical Machinery")
 
 /datum/design/board/cryotube
 	name = "Machine Design (Cryotube Board)"

code/modules/research/designs/misc_designs.dm

@@ -393,6 +393,16 @@
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
 
+/datum/design/holosignfirelock
+	name = "ATMOS Holofirelock Projector"
+	desc = "A holographic projector that creates holographic barriers that prevent changes in temperature conditions."
+	id = "holosignfirelock"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 5000, MAT_GLASS = 1000, MAT_GOLD = 1000, MAT_SILVER = 1000)
+	build_path = /obj/item/holosign_creator/firelock
+	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."

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

code/modules/research/experimentor.dm

@@ -271,7 +271,7 @@
 				if(!T.density)
 					if(prob(EFFECT_PROB_VERYHIGH) && !(locate(/obj/effect/decal/cleanable/greenglow) in T))
 						var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T)
-						reagentdecal.reagents.add_reagent("radium", 7)
+						reagentdecal.reagents.add_reagent(/datum/reagent/radium, 7)
 		else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
 			var/savedName = "[exp_on]"
 			ejectItem(TRUE)
@@ -291,7 +291,9 @@
 			new /obj/item/stack/sheet/mineral/plasma(get_turf(pick(oview(1,src))))
 		else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
 			visible_message("<span class='danger'>[src] destroys [exp_on], leaking dangerous gas!</span>")
-			chosenchem = pick("carbon","radium","toxin","condensedcapsaicin","mushroomhallucinogen","space_drugs","ethanol","beepskysmash")
+			chosenchem = pick(/datum/reagent/carbon,/datum/reagent/radium,/datum/reagent/toxin,
+							/datum/reagent/consumable/condensedcapsaicin,/datum/reagent/drug/mushroomhallucinogen,
+							/datum/reagent/drug/space_drugs,/datum/reagent/consumable/ethanol,/datum/reagent/consumable/ethanol/beepsky_smash)
 			var/datum/reagents/R = new/datum/reagents(50)
 			R.my_atom = src
 			R.add_reagent(chosenchem , 50)
@@ -304,7 +306,7 @@
 			ejectItem(TRUE)
 		else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
 			visible_message("<span class='danger'>[src]'s chemical chamber has sprung a leak!</span>")
-			chosenchem = pick("mutationtoxin","nanomachines","sacid")
+			chosenchem = pick(/datum/reagent/mutationtoxin,/datum/reagent/nanomachines,/datum/reagent/toxin/acid)
 			var/datum/reagents/R = new/datum/reagents(50)
 			R.my_atom = src
 			R.add_reagent(chosenchem , 50)
@@ -331,7 +333,7 @@
 			visible_message("<span class='warning'>[src]'s emergency coolant system gives off a small ding!</span>")
 			playsound(src, 'sound/machines/ding.ogg', 50, 1)
 			var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
-			chosenchem = pick("plasma","capsaicin","ethanol")
+			chosenchem = pick(/datum/reagent/toxin/plasma,/datum/reagent/consumable/capsaicin,/datum/reagent/consumable/ethanol)
 			C.reagents.remove_any(25)
 			C.reagents.add_reagent(chosenchem , 50)
 			C.name = "Cup of Suspicious Liquid"
@@ -380,7 +382,7 @@
 			visible_message("<span class='warning'>[src]'s emergency coolant system gives off a small ding!</span>")
 			var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
 			playsound(src, 'sound/machines/ding.ogg', 50, 1) //Ding! Your death coffee is ready!
-			chosenchem = pick("uranium","frostoil","ephedrine")
+			chosenchem = pick(/datum/reagent/uranium,/datum/reagent/consumable/frostoil,/datum/reagent/medicine/ephedrine)
 			C.reagents.remove_any(25)
 			C.reagents.add_reagent(chosenchem , 50)
 			C.name = "Cup of Suspicious Liquid"
@@ -390,7 +392,7 @@
 			visible_message("<span class='danger'>[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!</span>")
 			var/datum/reagents/R = new/datum/reagents(50)
 			R.my_atom = src
-			R.add_reagent("frostoil" , 50)
+			R.add_reagent(/datum/reagent/consumable/frostoil, 50)
 			investigate_log("Experimentor has released frostoil gas.", INVESTIGATE_EXPERIMENTOR)
 			var/datum/effect_system/smoke_spread/chem/smoke = new
 			smoke.set_up(R, 0, src, silent = TRUE)

code/modules/research/machinery/_production.dm

@@ -222,7 +222,7 @@
 	l += "<h3>Chemical Storage:</h3>"
 	for(var/datum/reagent/R in reagents.reagent_list)
 		l += "[R.name]: [R.volume]"
-		l += "<A href='?src=[REF(src)];dispose=[R.id]'>Purge</A>"
+		l += "<A href='?src=[REF(src)];dispose=[R.type]'>Purge</A>"
 	l += "</div>"
 	return l
 

code/modules/research/nanites/nanite_programs/buffing.dm

@@ -35,7 +35,7 @@
 	host_mob.adjustStaminaLoss(-10) //stimulants give stamina heal now
 	host_mob.lying = 0
 	host_mob.update_canmove()
-	host_mob.reagents.add_reagent("stimulants", 1.5)
+	host_mob.reagents.add_reagent(/datum/reagent/medicine/stimulants, 1.5)
 
 /datum/nanite_program/hardening
 	name = "Dermal Hardening"

code/modules/research/nanites/nanite_programs/healing.dm

@@ -61,10 +61,10 @@
 /datum/nanite_program/purging/active_effect()
 	host_mob.adjustToxLoss(-1)
 	for(var/datum/reagent/R in host_mob.reagents.reagent_list)
-		if(R.id == "nanite_b_gone")
+		if(R.type == /datum/reagent/fermi/nanite_b_gone)
 			host_mob.adjustToxLoss(4)
 			continue
-		host_mob.reagents.remove_reagent(R.id,1)
+		host_mob.reagents.remove_reagent(R.type,1)
 
 /datum/nanite_program/brain_heal
 	name = "Neural Regeneration"
@@ -164,7 +164,7 @@
 /datum/nanite_program/purging_advanced/active_effect()
 	host_mob.adjustToxLoss(-1, forced = TRUE)
 	for(var/datum/reagent/toxin/R in host_mob.reagents.reagent_list)
-		host_mob.reagents.remove_reagent(R.id,1)
+		host_mob.reagents.remove_reagent(R.type,1)
 
 /datum/nanite_program/regenerative_advanced
 	name = "Bio-Reconstruction"

code/modules/research/rdconsole.dm

@@ -394,7 +394,7 @@ Nothing else in the console has ID requirements.
 	l += "<h3>Chemical Storage:</h3>"
 	for(var/datum/reagent/R in linked_lathe.reagents.reagent_list)
 		l += "[R.name]: [R.volume]"
-		l += "<A href='?src=[REF(src)];disposeP=[R.id]'>Purge</A>"
+		l += "<A href='?src=[REF(src)];disposeP=[R]'>Purge</A>"
 	l += "</div>"
 	return l
 
@@ -497,7 +497,7 @@ Nothing else in the console has ID requirements.
 	l += "<h3>Chemical Storage:</h3>"
 	for(var/datum/reagent/R in linked_imprinter.reagents.reagent_list)
 		l += "[R.name]: [R.volume]"
-		l += "<A href='?src=[REF(src)];disposeI=[R.id]'>Purge</A>"
+		l += "<A href='?src=[REF(src)];disposeI=[R]'>Purge</A>"
 	return l
 
 /obj/machinery/computer/rdconsole/proc/ui_circuit_materials()	//Legacy code!

code/modules/research/techweb/all_nodes.dm

@@ -200,7 +200,7 @@
 	display_name = "Advanced Engineering"
 	description = "Pushing the boundaries of physics, one chainsaw-fist at a time."
 	prereq_ids = list("engineering", "emp_basic")
-	design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask", "tray_goggles_prescription", "engine_goggles_prescription", "mesons_prescription", "rcd_upgrade")
+	design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask" , "rcd_loaded", "rpd", "tray_goggles_prescription", "engine_goggles_prescription", "mesons_prescription", "rcd_upgrade_frames", "rcd_upgrade_simple_circuits")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000)
 	export_price = 5000
 
@@ -430,7 +430,7 @@
 	display_name = "Electromagnetic Theory"
 	description = "Study into usage of frequencies in the electromagnetic spectrum."
 	prereq_ids = list("base")
-	design_ids = list("holosign", "holosignsec", "holosignengi", "holosignatmos", "inducer", "tray_goggles", "holopad")
+	design_ids = list("holosign", "holosignsec", "holosignengi", "holosignatmos", "holosignfirelock", "inducer", "tray_goggles", "holopad")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 	export_price = 5000
 
@@ -1099,7 +1099,7 @@
 	display_name = "Illegal Technology"
 	description = "Dangerous research used to create dangerous objects."
 	prereq_ids = list("adv_engi", "adv_weaponry", "explosive_weapons")
-	design_ids = list("decloner", "borg_syndicate_module", "ai_cam_upgrade", "suppressor", "largecrossbow", "donksofttoyvendor", "donksoft_refill")
+	design_ids = list("decloner", "borg_syndicate_module", "ai_cam_upgrade", "suppressor", "largecrossbow", "donksofttoyvendor", "donksoft_refill", "syndiesleeper")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
 	export_price = 5000
 	hidden = TRUE

code/modules/research/xenobiology/crossbreeding/__corecross.dm

@@ -114,19 +114,19 @@ To add a crossbreed:
 	name = "blood extract"
 	desc = "A sphere of liquid blood, somehow managing to stay together."
 	color = "#FF0000"
-	list_reagents = list("blood" = 50)
+	list_reagents = list(/datum/reagent/blood = 50)
 
 /obj/item/slimecrossbeaker/pax //5u synthpax.
 	name = "peace-inducing extract"
 	desc = "A small blob of synthetic pax."
 	color = "#FFCCCC"
-	list_reagents = list("synthpax" = 5)
+	list_reagents = list(/datum/reagent/pax/peaceborg = 5)
 
 /obj/item/slimecrossbeaker/omnizine //15u omnizine.
 	name = "healing extract"
 	desc = "A gelatinous extract of pure omnizine."
 	color = "#FF00FF"
-	list_reagents = list("omnizine" = 15)
+	list_reagents = list(/datum/reagent/medicine/omnizine = 15)
 
 /obj/item/slimecrossbeaker/autoinjector //As with the above, but automatically injects whomever it is used on with contents.
 	var/ignore_flags = FALSE
@@ -160,7 +160,7 @@ To add a crossbreed:
 	name = "mending solution"
 	desc = "A strange glob of sweet-smelling semifluid, which seems to stick to skin rather easily."
 	color = "#FF00FF"
-	list_reagents = list("regen_jelly" = 20)
+	list_reagents = list(/datum/reagent/medicine/regen_jelly = 20)
 
 /obj/item/slimecrossbeaker/autoinjector/slimejelly //Primarily for slimepeople, but you do you.
 	self_use_only = TRUE
@@ -168,13 +168,13 @@ To add a crossbreed:
 	name = "slime jelly bubble"
 	desc = "A sphere of slime jelly. It seems to stick to your skin, but avoids other surfaces."
 	color = "#00FF00"
-	list_reagents = list("slimejelly" = 50)
+	list_reagents = list(/datum/reagent/toxin/slimejelly = 50)
 
 /obj/item/slimecrossbeaker/autoinjector/peaceandlove
 	name = "peaceful distillation"
 	desc = "A light pink gooey sphere. Simply touching it makes you a little dizzy."
 	color = "#DDAAAA"
-	list_reagents = list("synthpax" = 10, "space_drugs" = 15) //Peace, dudes
+	list_reagents = list(/datum/reagent/pax/peaceborg = 10, /datum/reagent/drug/space_drugs = 15) //Peace, dudes
 
 /obj/item/slimecrossbeaker/autoinjector/peaceandlove/Initialize()
 	. = ..()
@@ -184,4 +184,4 @@ To add a crossbreed:
 	name = "invigorating gel"
 	desc = "A bubbling purple mixture, designed to heal and boost movement."
 	color = "#FF00FF"
-	list_reagents = list("regen_jelly" = 30, "methamphetamine" = 9)
+	list_reagents = list(/datum/reagent/medicine/regen_jelly = 30, /datum/reagent/drug/methamphetamine = 9)

code/modules/research/xenobiology/crossbreeding/_misc.dm

@@ -50,7 +50,7 @@
 	filling_color = "#964B00"
 	tastes = list("cardboard" = 3, "sadness" = 3)
 	foodtype = null //Don't ask what went into them. You're better off not knowing.
-	list_reagents = list("stabilizednutriment" = 10, "nutriment" = 2) //Won't make you fat. Will make you question your sanity.
+	list_reagents = list(/datum/reagent/consumable/nutriment/stabilized = 10, /datum/reagent/consumable/nutriment = 2) //Won't make you fat. Will make you question your sanity.
 
 /obj/item/reagent_containers/food/snacks/rationpack/checkLiked(fraction, mob/M)	//Nobody likes rationpacks. Nobody.
 	if(last_check_time + 50 < world.time)

code/modules/research/xenobiology/crossbreeding/_status_effects.dm

@@ -910,9 +910,9 @@ datum/status_effect/stabilized/blue/on_remove()
 /datum/status_effect/stabilized/lightpink/tick()
 	owner.adjustStaminaLoss(-4.5)
 	for(var/mob/living/carbon/human/H in range(1, get_turf(owner)))
-		if(H != owner && H.stat != DEAD && H.health <= 0 && !H.reagents.has_reagent("epinephrine"))
+		if(H != owner && H.stat != DEAD && H.health <= 0 && !H.reagents.has_reagent(/datum/reagent/medicine/epinephrine))
 			to_chat(owner, "[linked_extract] pulses in sync with [H]'s heartbeat, trying to keep [H.p_them()] alive.")
-			H.reagents.add_reagent("epinephrine",5)
+			H.reagents.add_reagent(/datum/reagent/medicine/epinephrine,5)
 	return ..()
 
 /datum/status_effect/stabilized/lightpink/on_remove()

code/modules/research/xenobiology/crossbreeding/burning.dm

@@ -14,10 +14,10 @@ Burning extracts:
 	create_reagents(10, INJECTABLE | DRAWABLE)
 
 /obj/item/slimecross/burning/attack_self(mob/user)
-	if(!reagents.has_reagent("plasma",10))
+	if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10))
 		to_chat(user, "<span class='warning'>This extract needs to be full of plasma to activate!</span>")
 		return
-	reagents.remove_reagent("plasma",10)
+	reagents.remove_reagent(/datum/reagent/toxin/plasma,10)
 	to_chat(user, "<span class='notice'>You squeeze the extract, and it absorbs the plasma!</span>")
 	playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
 	playsound(src, 'sound/magic/fireball.ogg', 50, 1)
@@ -44,7 +44,7 @@ Burning extracts:
 /obj/item/slimecross/burning/orange/do_effect(mob/user)
 	user.visible_message("<span class='danger'>[src] boils over with a caustic gas!</span>")
 	var/datum/reagents/R = new/datum/reagents(100)
-	R.add_reagent("condensedcapsaicin", 100)
+	R.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 100)
 
 	var/datum/effect_system/smoke_spread/chem/smoke = new
 	smoke.set_up(R, 7, get_turf(user))
@@ -113,8 +113,8 @@ Burning extracts:
 /obj/item/slimecross/burning/darkblue/do_effect(mob/user)
 	user.visible_message("<span class='danger'>[src] releases a burst of chilling smoke!</span>")
 	var/datum/reagents/R = new/datum/reagents(100)
-	R.add_reagent("frostoil", 40)
-	user.reagents.add_reagent("cryoxadone",10)
+	R.add_reagent(/datum/reagent/consumable/frostoil, 40)
+	user.reagents.add_reagent(/datum/reagent/medicine/cryoxadone,10)
 	var/datum/effect_system/smoke_spread/chem/smoke = new
 	smoke.set_up(R, 7, get_turf(user))
 	smoke.start()
@@ -131,7 +131,7 @@ Burning extracts:
 	for(var/i = 0, i < amount, i++)
 		var/path = get_random_food()
 		var/obj/item/O = new path(pick(turfs))
-		O.reagents.add_reagent("slimejelly",5) //Oh god it burns
+		O.reagents.add_reagent(/datum/reagent/toxin/slimejelly, 5) //Oh god it burns
 		if(prob(50))
 			O.desc += " It smells strange..."
 	user.visible_message("<span class='danger'>[src] produces a few pieces of food!</span>")
@@ -268,7 +268,7 @@ Burning extracts:
 /obj/item/slimecross/burning/lightpink/do_effect(mob/user)
 	user.visible_message("<span class='danger'>[src] lets off a hypnotizing pink glow!</span>")
 	for(var/mob/living/carbon/C in view(7, get_turf(user)))
-		C.reagents.add_reagent("pax",5)
+		C.reagents.add_reagent(/datum/reagent/pax, 5)
 	..()
 
 /obj/item/slimecross/burning/adamantine

code/modules/research/xenobiology/crossbreeding/charged.dm

@@ -15,10 +15,10 @@ Charged extracts:
 	create_reagents(10, INJECTABLE | DRAWABLE)
 
 /obj/item/slimecross/charged/attack_self(mob/user)
-	if(!reagents.has_reagent("plasma",10))
+	if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10))
 		to_chat(user, "<span class='warning'>This extract needs to be full of plasma to activate!</span>")
 		return
-	reagents.remove_reagent("plasma",10)
+	reagents.remove_reagent(/datum/reagent/toxin/plasma,10)
 	to_chat(user, "<span class='notice'>You squeeze the extract, and it absorbs the plasma!</span>")
 	playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
 	playsound(src, 'sound/effects/light_flicker.ogg', 50, 1)

code/modules/research/xenobiology/crossbreeding/chilling.dm

@@ -14,10 +14,10 @@ Chilling extracts:
 	create_reagents(10, INJECTABLE | DRAWABLE)
 
 /obj/item/slimecross/chilling/attack_self(mob/user)
-	if(!reagents.has_reagent("plasma",10))
+	if(!reagents.has_reagent(/datum/reagent/toxin/plasma,10))
 		to_chat(user, "<span class='warning'>This extract needs to be full of plasma to activate!</span>")
 		return
-	reagents.remove_reagent("plasma",10)
+	reagents.remove_reagent(/datum/reagent/toxin/plasma,10)
 	to_chat(user, "<span class='notice'>You squeeze the extract, and it absorbs the plasma!</span>")
 	playsound(src, 'sound/effects/bubbles.ogg', 50, 1)
 	playsound(src, 'sound/effects/glassbr1.ogg', 50, 1)
@@ -56,7 +56,7 @@ Chilling extracts:
 		return
 	user.visible_message("<span class='notice'>[src] shatters, and a healing aura fills the room briefly.</span>")
 	for(var/mob/living/carbon/C in A)
-		C.reagents.add_reagent("regen_jelly",10)
+		C.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10)
 	..()
 
 /obj/item/slimecross/chilling/blue

code/modules/research/xenobiology/crossbreeding/consuming.dm

@@ -20,7 +20,7 @@ Consuming extracts:
 		if(last_produced + cooldown > world.time)
 			to_chat(user, "<span class='warning'>[src] is still digesting after its last meal!<span>")
 			return
-		var/datum/reagent/N = O.reagents.has_reagent("nutriment")
+		var/datum/reagent/N = O.reagents.has_reagent(/datum/reagent/consumable/nutriment)
 		if(N)
 			nutriment_eaten += N.volume
 			to_chat(user, "<span class='notice'>[src] opens up and swallows [O] whole!</span>")
@@ -73,7 +73,7 @@ Consuming extracts:
 		to_chat(M, "Tastes like [taste].")
 		playsound(get_turf(M), 'sound/items/eatfood.ogg', 20, 1)
 		if(nutrition)
-			M.reagents.add_reagent("nutriment",nutrition)
+			M.reagents.add_reagent(/datum/reagent/consumable/nutriment,nutrition)
 		do_effect(M, user)
 		qdel(src)
 		return
@@ -199,7 +199,7 @@ Consuming extracts:
 	nutrition = 0 //We don't want normal nutriment
 
 /obj/item/slime_cookie/silver/do_effect(mob/living/M, mob/user)
-	M.reagents.add_reagent("stabilizednutriment",10)
+	M.reagents.add_reagent(/datum/reagent/consumable/nutriment/stabilized, 10)
 
 /obj/item/slimecross/consuming/bluespace
 	colour = "bluespace"

code/modules/research/xenobiology/crossbreeding/industrial.dm

@@ -30,13 +30,13 @@ Industrial extracts:
 
 /obj/item/slimecross/industrial/process()
 	var/IsWorking = FALSE
-	if(reagents.has_reagent("plasma",amount = 2) && plasmarequired > 1) //Can absorb as much as 2
+	if(reagents.has_reagent(/datum/reagent/toxin/plasma,amount = 2) && plasmarequired > 1) //Can absorb as much as 2
 		IsWorking = TRUE
-		reagents.remove_reagent("plasma",2)
+		reagents.remove_reagent(/datum/reagent/toxin/plasma,2)
 		plasmaabsorbed += 2
-	else if(reagents.has_reagent("plasma",amount = 1)) //Can absorb as little as 1
+	else if(reagents.has_reagent(/datum/reagent/toxin/plasma,amount = 1)) //Can absorb as little as 1
 		IsWorking = TRUE
-		reagents.remove_reagent("plasma",1)
+		reagents.remove_reagent(/datum/reagent/toxin/plasma,1)
 		plasmaabsorbed += 1
 
 	if(plasmaabsorbed >= plasmarequired)

code/modules/research/xenobiology/crossbreeding/regenerative.dm

@@ -51,7 +51,7 @@ Regenerative extracts:
 	colour = "purple"
 
 /obj/item/slimecross/regenerative/purple/core_effect(mob/living/target, mob/user)
-	target.reagents.add_reagent("regen_jelly",10)
+	target.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10)
 
 /obj/item/slimecross/regenerative/blue
 	colour = "blue"
@@ -174,7 +174,7 @@ Regenerative extracts:
 
 /obj/item/slimecross/regenerative/red/core_effect(mob/living/target, mob/user)
 	to_chat(target, "<span class='notice'>You feel... <i>faster.</i></span>")
-	target.reagents.add_reagent("ephedrine",3)
+	target.reagents.add_reagent(/datum/reagent/medicine/ephedrine,3)
 
 /obj/item/slimecross/regenerative/green
 	colour = "green"
@@ -185,7 +185,7 @@ Regenerative extracts:
 		var/mob/living/simple_animal/slime/S = target
 		S.random_colour()
 	if(isjellyperson(target))
-		target.reagents.add_reagent("slime_toxin",5)
+		target.reagents.add_reagent(/datum/reagent/slime_toxin,5)
 
 
 /obj/item/slimecross/regenerative/pink
@@ -193,7 +193,7 @@ Regenerative extracts:
 
 /obj/item/slimecross/regenerative/pink/core_effect(mob/living/target, mob/user)
 	to_chat(target, "<span class='notice'>You feel more calm.</span>")
-	target.reagents.add_reagent("krokodil",4)
+	target.reagents.add_reagent(/datum/reagent/drug/krokodil,4)
 
 /obj/item/slimecross/regenerative/gold
 	colour = "gold"

code/modules/research/xenobiology/crossbreeding/selfsustaining.dm

@@ -38,10 +38,10 @@ Self-sustaining extracts:
 		return
 	if(reagentselect == "lesser plasma")
 		amount = 4
-		reagentselect = "plasma"
+		reagentselect = /datum/reagent/toxin/plasma
 	if(reagentselect == "holy water and uranium")
-		reagentselect = "holywater"
-		secondary = "uranium"
+		reagentselect = /datum/reagent/water/holywater
+		secondary = /datum/reagent/uranium
 	extract.forceMove(user.drop_location())
 	qdel(src)
 	user.put_in_active_hand(extract)

code/modules/research/xenobiology/xenobiology.dm

@@ -42,7 +42,7 @@
 
 /obj/item/slime_extract/on_grind()
 	if(Uses)
-		grind_results["slimejelly"] = 20
+		grind_results[/datum/reagent/toxin/slimejelly] = 20
 
 //Effect when activated by a Luminescent. Separated into a minor and major effect. Returns cooldown in deciseconds.
 /obj/item/slime_extract/proc/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
@@ -78,7 +78,7 @@
 	name = "grey slime extract"
 	icon_state = "grey slime extract"
 	effectmod = "reproductive"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/grey/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -103,7 +103,7 @@
 	name = "gold slime extract"
 	icon_state = "gold slime extract"
 	effectmod = "symbiont"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/gold/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -132,7 +132,7 @@
 	name = "silver slime extract"
 	icon_state = "silver slime extract"
 	effectmod = "consuming"
-	activate_reagents = list("plasma","water")
+	activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/silver/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -157,7 +157,7 @@
 	name = "metal slime extract"
 	icon_state = "metal slime extract"
 	effectmod = "industrial"
-	activate_reagents = list("plasma","water")
+	activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/metal/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -181,7 +181,7 @@
 	name = "purple slime extract"
 	icon_state = "purple slime extract"
 	effectmod = "regenerative"
-	activate_reagents = list("blood","plasma")
+	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/purple/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -193,14 +193,14 @@
 
 		if(SLIME_ACTIVATE_MAJOR)
 			to_chat(user, "<span class='notice'>You activate [src], and it releases regenerative chemicals!</span>")
-			user.reagents.add_reagent("regen_jelly",10)
+			user.reagents.add_reagent(/datum/reagent/medicine/regen_jelly,10)
 			return 600
 
 /obj/item/slime_extract/darkpurple
 	name = "dark purple slime extract"
 	icon_state = "dark purple slime extract"
 	effectmod = "self-sustaining"
-	activate_reagents = list("plasma")
+	activate_reagents = list(/datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/darkpurple/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -223,19 +223,19 @@
 	name = "orange slime extract"
 	icon_state = "orange slime extract"
 	effectmod = "burning"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/orange/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
 		if(SLIME_ACTIVATE_MINOR)
 			to_chat(user, "<span class='notice'>You activate [src]. You start feeling hot!</span>")
-			user.reagents.add_reagent("capsaicin",10)
+			user.reagents.add_reagent(/datum/reagent/consumable/capsaicin,10)
 			return 150
 
 		if(SLIME_ACTIVATE_MAJOR)
-			user.reagents.add_reagent("phosphorus",5)//
-			user.reagents.add_reagent("potassium",5) // = smoke, along with any reagents inside mr. slime
-			user.reagents.add_reagent("sugar",5)     //
+			user.reagents.add_reagent(/datum/reagent/phosphorus,5)
+			user.reagents.add_reagent(/datum/reagent/potassium,5) // = smoke, along with any reagents inside mr. slime
+			user.reagents.add_reagent(/datum/reagent/consumable/sugar,5)
 			to_chat(user, "<span class='warning'>You activate [src], and a cloud of smoke bursts out of your skin!</span>")
 			return 450
 
@@ -243,7 +243,7 @@
 	name = "yellow slime extract"
 	icon_state = "yellow slime extract"
 	effectmod = "charged"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/yellow/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -266,13 +266,13 @@
 	name = "red slime extract"
 	icon_state = "red slime extract"
 	effectmod = "sanguine"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
 /obj/item/slime_extract/red/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
 		if(SLIME_ACTIVATE_MINOR)
 			to_chat(user, "<span class='notice'>You activate [src]. You start feeling fast!</span>")
-			user.reagents.add_reagent("ephedrine",5)
+			user.reagents.add_reagent(/datum/reagent/medicine/ephedrine,5)
 			return 450
 
 		if(SLIME_ACTIVATE_MAJOR)
@@ -286,15 +286,15 @@
 	name = "blue slime extract"
 	icon_state = "blue slime extract"
 	effectmod = "stabilized"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma, /datum/reagent/water)
 
 /obj/item/slime_extract/blue/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
 		if(SLIME_ACTIVATE_MINOR)
 			to_chat(user, "<span class='notice'>You activate [src]. Your genome feels more stable!</span>")
 			user.adjustCloneLoss(-15)
-			user.reagents.add_reagent("mutadone", 10)
-			user.reagents.add_reagent("potass_iodide", 10)
+			user.reagents.add_reagent(/datum/reagent/medicine/mutadone, 10)
+			user.reagents.add_reagent(/datum/reagent/medicine/potass_iodide, 10)
 			return 250
 
 		if(SLIME_ACTIVATE_MAJOR)
@@ -310,7 +310,7 @@
 	name = "dark blue slime extract"
 	icon_state = "dark blue slime extract"
 	effectmod = "chilling"
-	activate_reagents = list("plasma","water")
+	activate_reagents = list(/datum/reagent/toxin/plasma, /datum/reagent/water)
 
 /obj/item/slime_extract/darkblue/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -318,8 +318,8 @@
 			to_chat(user, "<span class='notice'>You activate [src]. You start feeling colder!</span>")
 			user.ExtinguishMob()
 			user.adjust_fire_stacks(-20)
-			user.reagents.add_reagent("frostoil",4)
-			user.reagents.add_reagent("cryoxadone",5)
+			user.reagents.add_reagent(/datum/reagent/consumable/frostoil,4)
+			user.reagents.add_reagent(/datum/reagent/medicine/cryoxadone,5)
 			return 100
 
 		if(SLIME_ACTIVATE_MAJOR)
@@ -333,7 +333,7 @@
 	name = "pink slime extract"
 	icon_state = "pink slime extract"
 	effectmod = "gentle"
-	activate_reagents = list("blood","plasma")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/pink/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -354,14 +354,14 @@
 			user.visible_message("<span class='warning'>[user]'s skin starts flashing hypnotically...</span>", "<span class='notice'>Your skin starts forming odd patterns, pacifying creatures around you.</span>")
 			for(var/mob/living/carbon/C in viewers(user, null))
 				if(C != user)
-					C.reagents.add_reagent("pax",2)
+					C.reagents.add_reagent(/datum/reagent/pax,2)
 			return 600
 
 /obj/item/slime_extract/green
 	name = "green slime extract"
 	icon_state = "green slime extract"
 	effectmod = "mutative"
-	activate_reagents = list("blood","plasma","radium")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma, /datum/reagent/radium)
 
 /obj/item/slime_extract/green/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -385,7 +385,7 @@
 	name = "light pink slime extract"
 	icon_state = "light pink slime extract"
 	effectmod = "loyal"
-	activate_reagents = list("plasma")
+	activate_reagents = list(/datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/lightpink/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -409,7 +409,7 @@
 	name = "black slime extract"
 	icon_state = "black slime extract"
 	effectmod = "transformative"
-	activate_reagents = list("plasma")
+	activate_reagents = list(/datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/black/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -430,7 +430,7 @@
 	name = "oil slime extract"
 	icon_state = "oil slime extract"
 	effectmod = "detonating"
-	activate_reagents = list("blood","plasma")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/oil/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -453,7 +453,7 @@
 	name = "adamantine slime extract"
 	icon_state = "adamantine slime extract"
 	effectmod = "crystalline"
-	activate_reagents = list("plasma")
+	activate_reagents = list(/datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/adamantine/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -482,7 +482,7 @@
 	name = "bluespace slime extract"
 	icon_state = "bluespace slime extract"
 	effectmod = "warping"
-	activate_reagents = list("blood","plasma")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
 	var/teleport_ready = FALSE
 	var/teleport_x = 0
 	var/teleport_y = 0
@@ -518,7 +518,7 @@
 	name = "pyrite slime extract"
 	icon_state = "pyrite slime extract"
 	effectmod = "prismatic"
-	activate_reagents = list("blood","plasma")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/pyrite/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -545,12 +545,12 @@
 	name = "cerulean slime extract"
 	icon_state = "cerulean slime extract"
 	effectmod = "recurring"
-	activate_reagents = list("blood","plasma")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma)
 
 /obj/item/slime_extract/cerulean/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
 		if(SLIME_ACTIVATE_MINOR)
-			user.reagents.add_reagent("salbutamol",15)
+			user.reagents.add_reagent(/datum/reagent/medicine/salbutamol,15)
 			to_chat(user, "<span class='notice'>You feel like you don't need to breathe!</span>")
 			return 150
 
@@ -565,7 +565,7 @@
 	name = "sepia slime extract"
 	icon_state = "sepia slime extract"
 	effectmod = "lengthened"
-	activate_reagents = list("blood","plasma","water")
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma, /datum/reagent/water)
 
 /obj/item/slime_extract/sepia/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)
@@ -587,7 +587,7 @@
 	name = "rainbow slime extract"
 	icon_state = "rainbow slime extract"
 	effectmod = "hyperchromatic"
-	activate_reagents = list("blood","plasma","lesser plasma","slimejelly","holy water and uranium") //Curse this snowflake reagent list.
+	activate_reagents = list(/datum/reagent/blood, /datum/reagent/toxin/plasma,"lesser plasma", /datum/reagent/toxin/slimejelly,"holy water and uranium") //Curse this snowflake reagent list.
 
 /obj/item/slime_extract/rainbow/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
 	switch(activation_type)