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

code/modules/research/designs.dm

@@ -1,88 +1,88 @@
-/***************************************************************
-**						Design Datums						  **
-**	All the data for building stuff.						  **
-***************************************************************/
-/*
-For the materials datum, it assumes you need reagents unless specified otherwise. To designate a material that isn't a reagent,
-you use one of the material IDs below. These are NOT ids in the usual sense (they aren't defined in the object or part of a datum),
-they are simply references used as part of a "has materials?" type proc. They all start with a $ to denote that they aren't reagents.
-The currently supporting non-reagent materials. All material amounts are set as the define MINERAL_MATERIAL_AMOUNT, which defaults to 2000
-- MAT_METAL (/obj/item/stack/metal).
-- MAT_GLASS (/obj/item/stack/glass).
-- MAT_PLASMA (/obj/item/stack/plasma).
-- MAT_SILVER (/obj/item/stack/silver).
-- MAT_GOLD (/obj/item/stack/gold).
-- MAT_URANIUM (/obj/item/stack/uranium).
-- MAT_DIAMOND (/obj/item/stack/diamond).
-- MAT_BANANIUM (/obj/item/stack/bananium).
-(Insert new ones here)
-
-Don't add new keyword/IDs if they are made from an existing one (such as rods which are made from metal). Only add raw materials.
-
-Design Guidelines
-- When adding new designs, check rdreadme.dm to see what kind of things have already been made and where new stuff is needed.
-- A single sheet of anything is 2000 units of material. Materials besides metal/glass require help from other jobs (mining for
-other types of metals and chemistry for reagents).
-- Add the AUTOLATHE tag to
-*/
-
-//DESIGNS ARE GLOBAL. DO NOT CREATE OR DESTROY THEM AT RUNTIME OUTSIDE OF INIT, JUST REFERENCE THEM TO WHATEVER YOU'RE DOING! //why are you yelling?
-//DO NOT REFERENCE OUTSIDE OF SSRESEARCH. USE THE PROCS IN SSRESEARCH TO OBTAIN A REFERENCE.
-
-/datum/design						//Datum for object designs, used in construction
-	var/name = "Name"					//Name of the created object.
-	var/desc = "Desc"					//Description of the created object.
-	var/id = DESIGN_ID_IGNORE						//ID of the created object for easy refernece. Alphanumeric, lower-case, no symbols
-	var/build_type = null				//Flag as to what kind machine the design is built in. See defines.
-	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/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/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.
-	var/departmental_flags = ALL			//bitflags for deplathes.
-	var/list/datum/techweb_node/unlocked_by = list()
-	var/research_icon					//Replaces the item icon in the research console
-	var/research_icon_state
-	var/icon_cache
-
-/datum/design/error_design
-	name = "ERROR"
-	desc = "This usually means something in the database has corrupted. If this doesn't go away automatically, inform Central Command so their techs can fix this ASAP(tm)"
-
-/datum/design/Destroy()
-	SSresearch.techweb_designs -= id
-	return ..()
-
-/datum/design/proc/icon_html(client/user)
-	var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/research_designs)
-	sheet.send(user)
-	return sheet.icon_tag(id)
-
-////////////////////////////////////////
-//Disks for transporting design datums//
-////////////////////////////////////////
-
-/obj/item/disk/design_disk
-	name = "Component Design Disk"
-	desc = "A disk for storing device design data for construction in lathes."
-	icon_state = "datadisk1"
-	materials = list(MAT_METAL=300, MAT_GLASS=100)
-	var/list/blueprints = list()
-	var/max_blueprints = 1
-
-/obj/item/disk/design_disk/Initialize()
-	. = ..()
-	pixel_x = rand(-5, 5)
-	pixel_y = rand(-5, 5)
-	for(var/i in 1 to max_blueprints)
-		blueprints += null
-
-/obj/item/disk/design_disk/adv
-	name = "Advanced Component Design Disk"
-	desc = "A disk for storing device design data for construction in lathes. This one has extra storage space."
-	materials = list(MAT_METAL=300, MAT_GLASS=100, MAT_SILVER = 50)
-	max_blueprints = 5
+/***************************************************************
+**						Design Datums						  **
+**	All the data for building stuff.						  **
+***************************************************************/
+/*
+For the materials datum, it assumes you need reagents unless specified otherwise. To designate a material that isn't a reagent,
+you use one of the material IDs below. These are NOT ids in the usual sense (they aren't defined in the object or part of a datum),
+they are simply references used as part of a "has materials?" type proc. They all start with a $ to denote that they aren't reagents.
+The currently supporting non-reagent materials. All material amounts are set as the define MINERAL_MATERIAL_AMOUNT, which defaults to 2000
+- MAT_METAL (/obj/item/stack/metal).
+- MAT_GLASS (/obj/item/stack/glass).
+- MAT_PLASMA (/obj/item/stack/plasma).
+- MAT_SILVER (/obj/item/stack/silver).
+- MAT_GOLD (/obj/item/stack/gold).
+- MAT_URANIUM (/obj/item/stack/uranium).
+- MAT_DIAMOND (/obj/item/stack/diamond).
+- MAT_BANANIUM (/obj/item/stack/bananium).
+(Insert new ones here)
+
+Don't add new keyword/IDs if they are made from an existing one (such as rods which are made from metal). Only add raw materials.
+
+Design Guidelines
+- When adding new designs, check rdreadme.dm to see what kind of things have already been made and where new stuff is needed.
+- A single sheet of anything is 2000 units of material. Materials besides metal/glass require help from other jobs (mining for
+other types of metals and chemistry for reagents).
+- Add the AUTOLATHE tag to
+*/
+
+//DESIGNS ARE GLOBAL. DO NOT CREATE OR DESTROY THEM AT RUNTIME OUTSIDE OF INIT, JUST REFERENCE THEM TO WHATEVER YOU'RE DOING! //why are you yelling?
+//DO NOT REFERENCE OUTSIDE OF SSRESEARCH. USE THE PROCS IN SSRESEARCH TO OBTAIN A REFERENCE.
+
+/datum/design						//Datum for object designs, used in construction
+	var/name = "Name"					//Name of the created object.
+	var/desc = "Desc"					//Description of the created object.
+	var/id = DESIGN_ID_IGNORE						//ID of the created object for easy refernece. Alphanumeric, lower-case, no symbols
+	var/build_type = null				//Flag as to what kind machine the design is built in. See defines.
+	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: 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: 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.
+	var/departmental_flags = ALL			//bitflags for deplathes.
+	var/list/datum/techweb_node/unlocked_by = list()
+	var/research_icon					//Replaces the item icon in the research console
+	var/research_icon_state
+	var/icon_cache
+
+/datum/design/error_design
+	name = "ERROR"
+	desc = "This usually means something in the database has corrupted. If this doesn't go away automatically, inform Central Command so their techs can fix this ASAP(tm)"
+
+/datum/design/Destroy()
+	SSresearch.techweb_designs -= id
+	return ..()
+
+/datum/design/proc/icon_html(client/user)
+	var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/research_designs)
+	sheet.send(user)
+	return sheet.icon_tag(id)
+
+////////////////////////////////////////
+//Disks for transporting design datums//
+////////////////////////////////////////
+
+/obj/item/disk/design_disk
+	name = "Component Design Disk"
+	desc = "A disk for storing device design data for construction in lathes."
+	icon_state = "datadisk1"
+	materials = list(MAT_METAL=300, MAT_GLASS=100)
+	var/list/blueprints = list()
+	var/max_blueprints = 1
+
+/obj/item/disk/design_disk/Initialize()
+	. = ..()
+	pixel_x = rand(-5, 5)
+	pixel_y = rand(-5, 5)
+	for(var/i in 1 to max_blueprints)
+		blueprints += null
+
+/obj/item/disk/design_disk/adv
+	name = "Advanced Component Design Disk"
+	desc = "A disk for storing device design data for construction in lathes. This one has extra storage space."
+	materials = list(MAT_METAL=300, MAT_GLASS=100, MAT_SILVER = 50)
+	max_blueprints = 5

code/modules/research/designs/autobotter_designs.dm

@@ -151,97 +151,96 @@
 	name = "Export Design (Wine)"
 	desc = "Allows for the blowing, and bottling of Wine bottles."
 	id = "wine_export"
-	reagents_list = list("wine" = 50)
+	reagents_list = list(/datum/reagent/consumable/ethanol/wine = 50)
 	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" = 50)
+	reagents_list = list(/datum/reagent/consumable/ethanol/rum = 50)
 	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" = 50)
 	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" = 50)
+	reagents_list = list(/datum/reagent/consumable/ethanol/whiskey = 50)
 	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" = 45, "water" = 1)
+	reagents_list = list(/datum/reagent/consumable/ethanol/vodka = 45, /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" = 40, "lemon_juice" = 10)
+	reagents_list = list(/datum/reagent/consumable/ethanol/tequila = 40, /datum/reagent/consumable/lemonjuice = 10)
 	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" = 50)
+	reagents_list = list(/datum/reagent/consumable/ethanol/patron = 50)
 	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" = 50)
+	reagents_list = list(/datum/reagent/consumable/ethanol/kahlua = 50)
 	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" = 40, "rice" = 10, "sugar" = 10)
+	reagents_list = list(/datum/reagent/consumable/ethanol/sake = 40, /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" = 50)
+	reagents_list = list(/datum/reagent/consumable/ethanol/vermouth = 50)
 	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" = 50)
+	reagents_list = list(/datum/reagent/consumable/ethanol/goldschlager = 50)
 	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" = 15, "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" = 50)
+	reagents_list = list(/datum/reagent/consumable/ethanol/cognac = 50)
 	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" = 50)
+	reagents_list = list(/datum/reagent/consumable/ethanol/absinthe = 50)
 	id = "absinthe_export"
 	build_path = /obj/item/export/bottle/absinthe
 
@@ -249,49 +248,49 @@
 	name = "Export Design (Grappa)"
 	desc = "Allows for the blowing, and bottling of Grappa bottles."
 	id = "grappa_export"
-	reagents_list = list("grappa" = 50)
+	reagents_list = list(/datum/reagent/consumable/ethanol/grappa = 50)
 	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" = 50)
+	reagents_list = list(/datum/reagent/consumable/ethanol/fernet = 50)
 	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" = 25, "gin" = 5)
+	reagents_list = list(/datum/reagent/consumable/ethanol/applejack = 35, /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" = 30, "co2" = 10)
+	reagents_list = list(/datum/reagent/consumable/ethanol/champagne = 30, /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" = 40, "holywater" = 20)
+	reagents_list = list(/datum/reagent/consumable/ethanol/blazaam = 40, /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" = 50)
+	reagents_list = list(/datum/reagent/consumable/ethanol/trappist = 50)
 	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" = 50)
+	reagents_list = list(/datum/reagent/consumable/grenadine = 50)
 	build_path = /obj/item/export/bottle/grenadine
 
 /datum/design/bottle/export/minikeg
@@ -299,7 +298,7 @@
 	desc = "Allows for the fabication, and bottling of Minikeg of craft beer."
 	id = "minikeg"
 	category = list("Beers")
-	reagents_list = list("light_beer" = 50)
+	reagents_list = list(/datum/reagent/consumable/ethanol/beer/light = 50)
 	build_path = /obj/item/export/bottle/minikeg
 
 /datum/design/bottle/export/blooddrop
@@ -307,7 +306,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, "grapejuice" = 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 +314,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" = 15, "beer" = 20)
+	reagents_list = list(/datum/reagent/gold = 10, /datum/reagent/carbondioxide = 10, /datum/reagent/consumable/ethanol/rum = 15, /datum/reagent/consumable/ethanol/beer = 20)
 	build_path = /obj/item/export/bottle/slim_gold
 
 /datum/design/bottle/export/white_bloodmoon
@@ -323,13 +322,13 @@
 	desc = "Allows for the blowing, and bottling of White Bloodmoon bottles."
 	id = "white_bloodmoon"
 	category = list("Wines")
-	reagents_list = list("synthflesh" = 20, "blood" = 30, "liquidgibs" = 10)
+	reagents_list = list(/datum/reagent/medicine/synthflesh = 20, /datum/reagent/blood = 30, /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" = 30, "ash" = 10)
+	reagents_list = list(/datum/reagent/consumable/vitfro = 50, /datum/reagent/consumable/ethanol/rum = 30, /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/bluespace_designs.dm

@@ -1,86 +1,86 @@
-
-/////////////////////////////////////////
-//////////////Blue Space/////////////////
-/////////////////////////////////////////
-
-/datum/design/beacon
-	name = "Tracking Beacon"
-	desc = "A blue space tracking beacon."
-	id = "beacon"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 150, MAT_GLASS = 100)
-	build_path = /obj/item/beacon
-	category = list("Bluespace Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SECURITY
-
-/datum/design/bag_holding
-	name = "Bag of Holding"
-	desc = "A backpack that opens into a localized pocket of bluespace."
-	id = "bag_holding"
-	build_type = PROTOLATHE
-	materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 1500, MAT_URANIUM = 250, MAT_BLUESPACE = 2000)
-	build_path = /obj/item/storage/backpack/holding
-	category = list("Bluespace Designs")
-	dangerous_construction = TRUE
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/satchel_holding
-	name = "Satchel of Holding"
-	desc = "A satchel that opens into a localized pocket of bluespace."
-	id = "satchel_holding"
-	build_type = PROTOLATHE
-	materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 1500, MAT_URANIUM = 250, MAT_BLUESPACE = 2000)
-	build_path = /obj/item/storage/backpack/holding/satchel
-	category = list("Bluespace Designs")
-	dangerous_construction = TRUE
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/biobag_holding
-	name = "Bio Bag of Holding"
-	desc = "A chemical holding thingy. Mostly used for xenobiology."
-	id = "biobag_holding"
-	build_type = PROTOLATHE
-	materials = list(MAT_GOLD = 1500, MAT_DIAMOND = 750, MAT_URANIUM = 250, MAT_BLUESPACE = 1000)
-	build_path = /obj/item/storage/bag/bio/holding
-	category = list("Bluespace Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/bluespace_crystal
-	name = "Artificial Bluespace Crystal"
-	desc = "A small blue crystal with mystical properties."
-	id = "bluespace_crystal"
-	build_type = PROTOLATHE
-	materials = list(MAT_DIAMOND = 1500, MAT_PLASMA = 1500)
-	build_path = /obj/item/stack/ore/bluespace_crystal/artificial
-	category = list("Bluespace Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/telesci_gps
-	name = "GPS Device"
-	desc = "Little thingie that can track its position at all times."
-	id = "telesci_gps"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 500, MAT_GLASS = 1000)
-	build_path = /obj/item/gps
-	category = list("Bluespace Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/desynchronizer
-	name = "Desynchronizer"
-	desc = "A device that can desynchronize the user from spacetime."
-	id = "desynchronizer"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 1000, MAT_GLASS = 500, MAT_SILVER = 1500, MAT_BLUESPACE = 1000)
-	build_path = /obj/item/desynchronizer
-	category = list("Bluespace Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/miningsatchel_holding
-	name = "Mining Satchel of Holding"
-	desc = "A mining satchel that can hold an infinite amount of ores."
-	id = "minerbag_holding"
-	build_type = PROTOLATHE
-	materials = list(MAT_GOLD = 250, MAT_URANIUM = 500) //quite cheap, for more convenience
-	build_path = /obj/item/storage/bag/ore/holding
-	category = list("Bluespace Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/////////////////////////////////////////
+//////////////Blue Space/////////////////
+/////////////////////////////////////////
+
+/datum/design/beacon
+	name = "Tracking Beacon"
+	desc = "A blue space tracking beacon."
+	id = "beacon"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 150, MAT_GLASS = 100)
+	build_path = /obj/item/beacon
+	category = list("Bluespace Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/bag_holding
+	name = "Bag of Holding"
+	desc = "A backpack that opens into a localized pocket of bluespace."
+	id = "bag_holding"
+	build_type = PROTOLATHE
+	materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 1500, MAT_URANIUM = 250, MAT_BLUESPACE = 2000)
+	build_path = /obj/item/storage/backpack/holding
+	category = list("Bluespace Designs")
+	dangerous_construction = TRUE
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/satchel_holding
+	name = "Satchel of Holding"
+	desc = "A satchel that opens into a localized pocket of bluespace."
+	id = "satchel_holding"
+	build_type = PROTOLATHE
+	materials = list(MAT_GOLD = 3000, MAT_DIAMOND = 1500, MAT_URANIUM = 250, MAT_BLUESPACE = 2000)
+	build_path = /obj/item/storage/backpack/holding/satchel
+	category = list("Bluespace Designs")
+	dangerous_construction = TRUE
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/biobag_holding
+	name = "Bio Bag of Holding"
+	desc = "A chemical holding thingy. Mostly used for xenobiology."
+	id = "biobag_holding"
+	build_type = PROTOLATHE
+	materials = list(MAT_GOLD = 1500, MAT_DIAMOND = 750, MAT_URANIUM = 250, MAT_BLUESPACE = 1000)
+	build_path = /obj/item/storage/bag/bio/holding
+	category = list("Bluespace Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/bluespace_crystal
+	name = "Artificial Bluespace Crystal"
+	desc = "A small blue crystal with mystical properties."
+	id = "bluespace_crystal"
+	build_type = PROTOLATHE
+	materials = list(MAT_DIAMOND = 1500, MAT_PLASMA = 1500)
+	build_path = /obj/item/stack/ore/bluespace_crystal/artificial
+	category = list("Bluespace Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/telesci_gps
+	name = "GPS Device"
+	desc = "Little thingie that can track its position at all times."
+	id = "telesci_gps"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 500, MAT_GLASS = 1000)
+	build_path = /obj/item/gps
+	category = list("Bluespace Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/desynchronizer
+	name = "Desynchronizer"
+	desc = "A device that can desynchronize the user from spacetime."
+	id = "desynchronizer"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 1000, MAT_GLASS = 500, MAT_SILVER = 1500, MAT_BLUESPACE = 1000)
+	build_path = /obj/item/desynchronizer
+	category = list("Bluespace Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/miningsatchel_holding
+	name = "Mining Satchel of Holding"
+	desc = "A mining satchel that can hold an infinite amount of ores."
+	id = "minerbag_holding"
+	build_type = PROTOLATHE
+	materials = list(MAT_GOLD = 250, MAT_URANIUM = 500) //quite cheap, for more convenience
+	build_path = /obj/item/storage/bag/ore/holding
+	category = list("Bluespace Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO

code/modules/research/designs/comp_board_designs/comp_board_designs_cargo.dm

@@ -40,4 +40,4 @@
 	id = "miningshuttle"
 	build_path = /obj/item/circuitboard/computer/mining_shuttle
 	category = list("Computer Boards")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO

code/modules/research/designs/electronics_designs.dm

@@ -1,160 +1,160 @@
-
-///////////////////////////////////
-/////Non-Board Computer Stuff//////
-///////////////////////////////////
-
-/datum/design/intellicard
-	name = "Intellicard AI Transportation System"
-	desc = "Allows for the construction of an intellicard."
-	id = "intellicard"
-	build_type = PROTOLATHE
-	materials = list(MAT_GLASS = 1000, MAT_GOLD = 200)
-	build_path = /obj/item/aicard
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/paicard
-	name = "Personal Artificial Intelligence Card"
-	desc = "Allows for the construction of a pAI Card."
-	id = "paicard"
-	build_type = PROTOLATHE
-	materials = list(MAT_GLASS = 500, MAT_METAL = 500)
-	build_path = /obj/item/paicard
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_ALL
-
-///////////////////////////////////
-//////////Nanite Devices///////////
-///////////////////////////////////
-/datum/design/nanite_remote
-	name = "Nanite Remote"
-	desc = "Allows for the construction of a nanite remote."
-	id = "nanite_remote"
-	build_type = PROTOLATHE
-	materials = list(MAT_GLASS = 500, MAT_METAL = 500)
-	build_path = /obj/item/nanite_remote
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/nanite_scanner
-	name = "Nanite Scanner"
-	desc = "Allows for the construction of a nanite scanner."
-	id = "nanite_scanner"
-	build_type = PROTOLATHE
-	materials = list(MAT_GLASS = 500, MAT_METAL = 500)
-	build_path = /obj/item/nanite_scanner
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-////////////////////////////////////////
-//////////Disk Construction Disks///////
-////////////////////////////////////////
-/datum/design/design_disk
-	name = "Design Storage Disk"
-	desc = "Produce additional disks for storing device designs."
-	id = "design_disk"
-	build_type = PROTOLATHE | AUTOLATHE
-	materials = list(MAT_METAL = 300, MAT_GLASS = 100)
-	build_path = /obj/item/disk/design_disk
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/design_disk_adv
-	name = "Advanced Design Storage Disk"
-	desc = "Produce additional disks for storing device designs."
-	id = "design_disk_adv"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 300, MAT_GLASS = 100, MAT_SILVER=50)
-	build_path = /obj/item/disk/design_disk/adv
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/tech_disk
-	name = "Technology Data Storage Disk"
-	desc = "Produce additional disks for storing technology data."
-	id = "tech_disk"
-	build_type = PROTOLATHE | AUTOLATHE
-	materials = list(MAT_METAL = 300, MAT_GLASS = 100)
-	build_path = /obj/item/disk/tech_disk
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/nanite_disk
-	name = "Nanite Program Disk"
-	desc = "Stores nanite programs."
-	id = "nanite_disk"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 300, MAT_GLASS = 100)
-	build_path = /obj/item/disk/nanite_program
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/integrated_printer
-	name = "Integrated circuit printer"
-	desc = "This machine provides all necessary things for circuitry."
-	id = "icprinter"
-	build_type = PROTOLATHE
-	materials = list(MAT_GLASS = 5000, MAT_METAL = 10000)
-	build_path = /obj/item/integrated_circuit_printer
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/IC_printer_upgrade_advanced
-	name = "Integrated circuit printer upgrade: Advanced Designs"
-	desc = "This disk allows for integrated circuit printers to print advanced circuitry designs."
-	id = "icupgadv"
-	build_type = PROTOLATHE
-	materials = list(MAT_GLASS = 10000, MAT_METAL = 10000)
-	build_path = /obj/item/disk/integrated_circuit/upgrade/advanced
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/IC_printer_upgrade_clone
-	name = "Integrated circuit printer upgrade: Instant Cloning"
-	desc = "This disk allows for integrated circuit printers to clone designs instantaneously."
-	id = "icupgclo"
-	build_type = PROTOLATHE
-	materials = list(MAT_GLASS = 10000, MAT_METAL = 10000)
-	build_path = /obj/item/disk/integrated_circuit/upgrade/clone
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-//CIT ADDITIONS
-/datum/design/drone_shell
-	name = "Drone Shell"
-	desc = "A shell of a maintenance drone, an expendable robot built to perform station repairs."
-	id = "drone_shell"
-	build_type = MECHFAB | PROTOLATHE
-	materials = list(MAT_METAL = 800, MAT_GLASS = 350)
-	construction_time = 150
-	build_path = /obj/item/drone_shell
-	category = list("Misc")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/xenobio_upgrade
-	name = "owo"
-	desc = "someone's bussin"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 300, MAT_GLASS = 100)
-	category = list("Electronics")
-	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-
-/datum/design/xenobio_upgrade/xenobiomonkeys
-	name = "Xenobiology console monkey upgrade disk"
-	desc = "This disk will add the ability to remotely recycle monkeys via the Xenobiology console."
-	id = "xenobio_monkeys"
-	build_path = /obj/item/disk/xenobio_console_upgrade/monkey
-
-/datum/design/xenobio_upgrade/xenobioslimebasic
-	name = "Xenobiology console basic slime upgrade disk"
-	desc = "This disk will add the ability to remotely manipulate slimes via the Xenobiology console."
-	id = "xenobio_slimebasic"
-	build_path = /obj/item/disk/xenobio_console_upgrade/slimebasic
-
-/datum/design/xenobio_upgrade/xenobioslimeadv
-	name = "Xenobiology console advanced slime upgrade disk"
-	desc = "This disk will add the ability to remotely feed slimes potions via the Xenobiology console, and lift the restrictions on the number of slimes that can be stored inside the Xenobiology console. This includes the contents of the basic slime upgrade disk."
-	id = "xenobio_slimeadv"
-	build_path = /obj/item/disk/xenobio_console_upgrade/slimeadv
-
-
+
+///////////////////////////////////
+/////Non-Board Computer Stuff//////
+///////////////////////////////////
+
+/datum/design/intellicard
+	name = "Intellicard AI Transportation System"
+	desc = "Allows for the construction of an intellicard."
+	id = "intellicard"
+	build_type = PROTOLATHE
+	materials = list(MAT_GLASS = 1000, MAT_GOLD = 200)
+	build_path = /obj/item/aicard
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/paicard
+	name = "Personal Artificial Intelligence Card"
+	desc = "Allows for the construction of a pAI Card."
+	id = "paicard"
+	build_type = PROTOLATHE
+	materials = list(MAT_GLASS = 500, MAT_METAL = 500)
+	build_path = /obj/item/paicard
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_ALL
+
+///////////////////////////////////
+//////////Nanite Devices///////////
+///////////////////////////////////
+/datum/design/nanite_remote
+	name = "Nanite Remote"
+	desc = "Allows for the construction of a nanite remote."
+	id = "nanite_remote"
+	build_type = PROTOLATHE
+	materials = list(MAT_GLASS = 500, MAT_METAL = 500)
+	build_path = /obj/item/nanite_remote
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/nanite_scanner
+	name = "Nanite Scanner"
+	desc = "Allows for the construction of a nanite scanner."
+	id = "nanite_scanner"
+	build_type = PROTOLATHE
+	materials = list(MAT_GLASS = 500, MAT_METAL = 500)
+	build_path = /obj/item/nanite_scanner
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+////////////////////////////////////////
+//////////Disk Construction Disks///////
+////////////////////////////////////////
+/datum/design/design_disk
+	name = "Design Storage Disk"
+	desc = "Produce additional disks for storing device designs."
+	id = "design_disk"
+	build_type = PROTOLATHE | AUTOLATHE
+	materials = list(MAT_METAL = 300, MAT_GLASS = 100)
+	build_path = /obj/item/disk/design_disk
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/design_disk_adv
+	name = "Advanced Design Storage Disk"
+	desc = "Produce additional disks for storing device designs."
+	id = "design_disk_adv"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 300, MAT_GLASS = 100, MAT_SILVER=50)
+	build_path = /obj/item/disk/design_disk/adv
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/tech_disk
+	name = "Technology Data Storage Disk"
+	desc = "Produce additional disks for storing technology data."
+	id = "tech_disk"
+	build_type = PROTOLATHE | AUTOLATHE
+	materials = list(MAT_METAL = 300, MAT_GLASS = 100)
+	build_path = /obj/item/disk/tech_disk
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/nanite_disk
+	name = "Nanite Program Disk"
+	desc = "Stores nanite programs."
+	id = "nanite_disk"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 300, MAT_GLASS = 100)
+	build_path = /obj/item/disk/nanite_program
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/integrated_printer
+	name = "Integrated circuit printer"
+	desc = "This machine provides all necessary things for circuitry."
+	id = "icprinter"
+	build_type = PROTOLATHE
+	materials = list(MAT_GLASS = 5000, MAT_METAL = 10000)
+	build_path = /obj/item/integrated_circuit_printer
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/IC_printer_upgrade_advanced
+	name = "Integrated circuit printer upgrade: Advanced Designs"
+	desc = "This disk allows for integrated circuit printers to print advanced circuitry designs."
+	id = "icupgadv"
+	build_type = PROTOLATHE
+	materials = list(MAT_GLASS = 10000, MAT_METAL = 10000)
+	build_path = /obj/item/disk/integrated_circuit/upgrade/advanced
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/IC_printer_upgrade_clone
+	name = "Integrated circuit printer upgrade: Instant Cloning"
+	desc = "This disk allows for integrated circuit printers to clone designs instantaneously."
+	id = "icupgclo"
+	build_type = PROTOLATHE
+	materials = list(MAT_GLASS = 10000, MAT_METAL = 10000)
+	build_path = /obj/item/disk/integrated_circuit/upgrade/clone
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+//CIT ADDITIONS
+/datum/design/drone_shell
+	name = "Drone Shell"
+	desc = "A shell of a maintenance drone, an expendable robot built to perform station repairs."
+	id = "drone_shell"
+	build_type = MECHFAB | PROTOLATHE
+	materials = list(MAT_METAL = 800, MAT_GLASS = 350)
+	construction_time = 150
+	build_path = /obj/item/drone_shell
+	category = list("Misc")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/xenobio_upgrade
+	name = "owo"
+	desc = "someone's bussin"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 300, MAT_GLASS = 100)
+	category = list("Electronics")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/xenobio_upgrade/xenobiomonkeys
+	name = "Xenobiology console monkey upgrade disk"
+	desc = "This disk will add the ability to remotely recycle monkeys via the Xenobiology console."
+	id = "xenobio_monkeys"
+	build_path = /obj/item/disk/xenobio_console_upgrade/monkey
+
+/datum/design/xenobio_upgrade/xenobioslimebasic
+	name = "Xenobiology console basic slime upgrade disk"
+	desc = "This disk will add the ability to remotely manipulate slimes via the Xenobiology console."
+	id = "xenobio_slimebasic"
+	build_path = /obj/item/disk/xenobio_console_upgrade/slimebasic
+
+/datum/design/xenobio_upgrade/xenobioslimeadv
+	name = "Xenobiology console advanced slime upgrade disk"
+	desc = "This disk will add the ability to remotely feed slimes potions via the Xenobiology console, and lift the restrictions on the number of slimes that can be stored inside the Xenobiology console. This includes the contents of the basic slime upgrade disk."
+	id = "xenobio_slimeadv"
+	build_path = /obj/item/disk/xenobio_console_upgrade/slimeadv
+
+

code/modules/research/designs/equipment_designs.dm

@@ -1,55 +1,55 @@
-/*
-/datum/design/flightsuit
-	name = "Flight Suit"
-	desc = "A specialized hardsuit that is able to attach a flightpack and accessories.."
-	id = "flightsuit"
-	build_type = PROTOLATHE
-	build_path = /obj/item/clothing/suit/space/hardsuit/flightsuit
-	materials = list(MAT_METAL=16000, MAT_GLASS = 8000, MAT_DIAMOND = 200, MAT_GOLD = 3000, MAT_SILVER = 3000, MAT_TITANIUM = 16000)	//This expensive enough for you?
-	construction_time = 250
-	category = list("Misc")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/flightpack
-	name = "Flight Pack"
-	desc = "An advanced back-worn system that has dual ion engines powerful enough to grant a humanoid flight. Contains an internal self-recharging high-current capacitor for short, powerful boosts."
-	id = "flightpack"
-	build_type = PROTOLATHE
-	build_path = /obj/item/flightpack
-	materials = list(MAT_METAL=16000, MAT_GLASS = 8000, MAT_DIAMOND = 4000, MAT_GOLD = 12000, MAT_SILVER = 12000, MAT_URANIUM = 20000, MAT_PLASMA = 16000, MAT_TITANIUM = 16000)	//This expensive enough for you?
-	construction_time = 250
-	category = list("Misc")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/flightshoes
-	name = "Flight Shoes"
-	desc = "Flight shoes, attachable to a flight suit to provide additional functions."
-	id = "flightshoes"
-	build_type = PROTOLATHE
-	build_path = /obj/item/clothing/shoes/flightshoes
-	materials = list(MAT_METAL = 5000, MAT_GLASS = 5000, MAT_GOLD = 1500, MAT_SILVER = 1500, MAT_PLASMA = 2000, MAT_TITANIUM = 2000)
-	construction_time = 100
-	category = list("Misc")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING */
-
-/datum/design/constructionhardsuit
-	name = "Construction Hardsuit"
-	desc = "A hardsuit, designed for EVA construction and hazardous material transportation"
-	id = "chardsuit"
-	build_type = PROTOLATHE
-	build_path = /obj/item/clothing/suit/space/hardsuit/engine
-	materials = list(MAT_METAL=16000, MAT_GLASS = 8000, MAT_DIAMOND = 200, MAT_GOLD = 3000, MAT_SILVER = 3000, MAT_TITANIUM = 16000)
-	construction_time = 100
-	category = list("Misc")
-	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
-/datum/design/integratedjpack
-	name = "Hardsuit Jetpack Upgrade"
-	desc = "A modular upgrade for any hardsuit, giving it an integrated jetpack."
-	id = "hardsuitjpack"
-	build_type = PROTOLATHE
-	build_path = /obj/item/tank/jetpack/suit
-	materials = list(MAT_METAL=16000, MAT_GLASS = 8000, MAT_DIAMOND = 2000, MAT_GOLD = 6000, MAT_SILVER = 6000, MAT_URANIUM = 10000, MAT_PLASMA = 8000, MAT_TITANIUM = 16000)
-	construction_time = 100
-	category = list("Misc")
+/*
+/datum/design/flightsuit
+	name = "Flight Suit"
+	desc = "A specialized hardsuit that is able to attach a flightpack and accessories.."
+	id = "flightsuit"
+	build_type = PROTOLATHE
+	build_path = /obj/item/clothing/suit/space/hardsuit/flightsuit
+	materials = list(MAT_METAL=16000, MAT_GLASS = 8000, MAT_DIAMOND = 200, MAT_GOLD = 3000, MAT_SILVER = 3000, MAT_TITANIUM = 16000)	//This expensive enough for you?
+	construction_time = 250
+	category = list("Misc")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/flightpack
+	name = "Flight Pack"
+	desc = "An advanced back-worn system that has dual ion engines powerful enough to grant a humanoid flight. Contains an internal self-recharging high-current capacitor for short, powerful boosts."
+	id = "flightpack"
+	build_type = PROTOLATHE
+	build_path = /obj/item/flightpack
+	materials = list(MAT_METAL=16000, MAT_GLASS = 8000, MAT_DIAMOND = 4000, MAT_GOLD = 12000, MAT_SILVER = 12000, MAT_URANIUM = 20000, MAT_PLASMA = 16000, MAT_TITANIUM = 16000)	//This expensive enough for you?
+	construction_time = 250
+	category = list("Misc")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/flightshoes
+	name = "Flight Shoes"
+	desc = "Flight shoes, attachable to a flight suit to provide additional functions."
+	id = "flightshoes"
+	build_type = PROTOLATHE
+	build_path = /obj/item/clothing/shoes/flightshoes
+	materials = list(MAT_METAL = 5000, MAT_GLASS = 5000, MAT_GOLD = 1500, MAT_SILVER = 1500, MAT_PLASMA = 2000, MAT_TITANIUM = 2000)
+	construction_time = 100
+	category = list("Misc")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING */
+
+/datum/design/constructionhardsuit
+	name = "Construction Hardsuit"
+	desc = "A hardsuit, designed for EVA construction and hazardous material transportation"
+	id = "chardsuit"
+	build_type = PROTOLATHE
+	build_path = /obj/item/clothing/suit/space/hardsuit/engine
+	materials = list(MAT_METAL=16000, MAT_GLASS = 8000, MAT_DIAMOND = 200, MAT_GOLD = 3000, MAT_SILVER = 3000, MAT_TITANIUM = 16000)
+	construction_time = 100
+	category = list("Misc")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/integratedjpack
+	name = "Hardsuit Jetpack Upgrade"
+	desc = "A modular upgrade for any hardsuit, giving it an integrated jetpack."
+	id = "hardsuitjpack"
+	build_type = PROTOLATHE
+	build_path = /obj/item/tank/jetpack/suit
+	materials = list(MAT_METAL=16000, MAT_GLASS = 8000, MAT_DIAMOND = 2000, MAT_GOLD = 6000, MAT_SILVER = 6000, MAT_URANIUM = 10000, MAT_PLASMA = 8000, MAT_TITANIUM = 16000)
+	construction_time = 100
+	category = list("Misc")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING

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/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/mining_designs.dm

@@ -1,133 +1,133 @@
-
-/////////////////////////////////////////
-/////////////////Mining//////////////////
-/////////////////////////////////////////
-/datum/design/cargo_express
-	name = "Computer Design (Express Supply Console)"//shes beautiful
-	desc = "Allows for the construction of circuit boards used to build an Express Supply Console."//who?
-	id = "cargoexpress"//the coder reading this
-	build_type = IMPRINTER
-	materials = list(MAT_GLASS = 1000)
-	build_path = /obj/item/circuitboard/computer/cargo/express
-	category = list("Mining Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/bluespace_pod
-	name = "Supply Drop Pod Upgrade Disk"
-	desc = "Allows the Cargo Express Console to call down the Bluespace Drop Pod, greatly increasing user safety."//who?
-	id = "bluespace_pod"//the coder reading this
-	build_type = PROTOLATHE
-	materials = list(MAT_GLASS = 1000)
-	build_path = /obj/item/disk/cargo/bluespace_pod
-	category = list("Mining Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/drill
-	name = "Mining Drill"
-	desc = "Yours is the drill that will pierce through the rock walls."
-	id = "drill"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 6000, MAT_GLASS = 1000) //expensive, but no need for miners.
-	build_path = /obj/item/pickaxe/drill
-	category = list("Mining Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/drill_diamond
-	name = "Diamond-Tipped Mining Drill"
-	desc = "Yours is the drill that will pierce the heavens!"
-	id = "drill_diamond"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 6000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) //Yes, a whole diamond is needed.
-	build_path = /obj/item/pickaxe/drill/diamonddrill
-	category = list("Mining Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/plasmacutter
-	name = "Plasma Cutter"
-	desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff."
-	id = "plasmacutter"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 1500, MAT_GLASS = 500, MAT_PLASMA = 400)
-	build_path = /obj/item/gun/energy/plasmacutter
-	category = list("Mining Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/plasmacutter_adv
-	name = "Advanced Plasma Cutter"
-	desc = "It's an advanced plasma cutter, oh my god."
-	id = "plasmacutter_adv"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 3000, MAT_GLASS = 1000, MAT_PLASMA = 2000, MAT_GOLD = 500)
-	build_path = /obj/item/gun/energy/plasmacutter/adv
-	category = list("Mining Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/jackhammer
-	name = "Sonic Jackhammer"
-	desc = "Essentially a handheld planet-cracker. Can drill through walls with ease as well."
-	id = "jackhammer"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 6000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_DIAMOND = 6000)
-	build_path = /obj/item/pickaxe/drill/jackhammer
-	category = list("Mining Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/superresonator
-	name = "Upgraded Resonator"
-	desc = "An upgraded version of the resonator that allows more fields to be active at once."
-	id = "superresonator"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 4000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_URANIUM = 1000)
-	build_path = /obj/item/resonator/upgraded
-	category = list("Mining Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/trigger_guard_mod
-	name = "Kinetic Accelerator Trigger Guard Mod"
-	desc = "A device which allows kinetic accelerators to be wielded by any organism."
-	id = "triggermod"
-	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_GOLD = 1500, MAT_URANIUM = 1000)
-	build_path = /obj/item/borg/upgrade/modkit/trigger_guard
-	category = list("Mining Designs")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/damage_mod
-	name = "Kinetic Accelerator Damage Mod"
-	desc = "A device which allows kinetic accelerators to deal more damage."
-	id = "damagemod"
-	build_type = PROTOLATHE | MECHFAB
-	materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_GOLD = 1500, MAT_URANIUM = 1000)
-	build_path = /obj/item/borg/upgrade/modkit/damage
-	category = list("Mining Designs", "Cyborg Upgrade Modules")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/cooldown_mod
-	name = "Kinetic Accelerator Cooldown Mod"
-	desc = "A device which decreases the cooldown of a Kinetic Accelerator."
-	id = "cooldownmod"
-	build_type = PROTOLATHE | MECHFAB
-	materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_GOLD = 1500, MAT_URANIUM = 1000)
-	build_path = /obj/item/borg/upgrade/modkit/cooldown
-	category = list("Mining Designs", "Cyborg Upgrade Modules")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/range_mod
-	name = "Kinetic Accelerator Range Mod"
-	desc = "A device which allows kinetic accelerators to fire at a further range."
-	id = "rangemod"
-	build_type = PROTOLATHE | MECHFAB
-	materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_GOLD = 1500, MAT_URANIUM = 1000)
-	build_path = /obj/item/borg/upgrade/modkit/range
-	category = list("Mining Designs", "Cyborg Upgrade Modules")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
-
-/datum/design/hyperaccelerator
-	name = "Kinetic Accelerator Mining AoE Mod"
-	desc = "A modification kit for Kinetic Accelerators which causes it to fire AoE blasts that destroy rock."
-	id = "hypermod"
-	build_type = PROTOLATHE | MECHFAB
-	materials = list(MAT_METAL = 8000, MAT_GLASS = 1500, MAT_SILVER = 2000, MAT_GOLD = 2000, MAT_DIAMOND = 2000)
-	build_path = /obj/item/borg/upgrade/modkit/aoe/turfs
-	category = list("Mining Designs", "Cyborg Upgrade Modules")
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/////////////////////////////////////////
+/////////////////Mining//////////////////
+/////////////////////////////////////////
+/datum/design/cargo_express
+	name = "Computer Design (Express Supply Console)"//shes beautiful
+	desc = "Allows for the construction of circuit boards used to build an Express Supply Console."//who?
+	id = "cargoexpress"//the coder reading this
+	build_type = IMPRINTER
+	materials = list(MAT_GLASS = 1000)
+	build_path = /obj/item/circuitboard/computer/cargo/express
+	category = list("Mining Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/bluespace_pod
+	name = "Supply Drop Pod Upgrade Disk"
+	desc = "Allows the Cargo Express Console to call down the Bluespace Drop Pod, greatly increasing user safety."//who?
+	id = "bluespace_pod"//the coder reading this
+	build_type = PROTOLATHE
+	materials = list(MAT_GLASS = 1000)
+	build_path = /obj/item/disk/cargo/bluespace_pod
+	category = list("Mining Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/drill
+	name = "Mining Drill"
+	desc = "Yours is the drill that will pierce through the rock walls."
+	id = "drill"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 6000, MAT_GLASS = 1000) //expensive, but no need for miners.
+	build_path = /obj/item/pickaxe/drill
+	category = list("Mining Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/drill_diamond
+	name = "Diamond-Tipped Mining Drill"
+	desc = "Yours is the drill that will pierce the heavens!"
+	id = "drill_diamond"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 6000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) //Yes, a whole diamond is needed.
+	build_path = /obj/item/pickaxe/drill/diamonddrill
+	category = list("Mining Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/plasmacutter
+	name = "Plasma Cutter"
+	desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff."
+	id = "plasmacutter"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 1500, MAT_GLASS = 500, MAT_PLASMA = 400)
+	build_path = /obj/item/gun/energy/plasmacutter
+	category = list("Mining Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/plasmacutter_adv
+	name = "Advanced Plasma Cutter"
+	desc = "It's an advanced plasma cutter, oh my god."
+	id = "plasmacutter_adv"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 3000, MAT_GLASS = 1000, MAT_PLASMA = 2000, MAT_GOLD = 500)
+	build_path = /obj/item/gun/energy/plasmacutter/adv
+	category = list("Mining Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/jackhammer
+	name = "Sonic Jackhammer"
+	desc = "Essentially a handheld planet-cracker. Can drill through walls with ease as well."
+	id = "jackhammer"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 6000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_DIAMOND = 6000)
+	build_path = /obj/item/pickaxe/drill/jackhammer
+	category = list("Mining Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/superresonator
+	name = "Upgraded Resonator"
+	desc = "An upgraded version of the resonator that allows more fields to be active at once."
+	id = "superresonator"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 4000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_URANIUM = 1000)
+	build_path = /obj/item/resonator/upgraded
+	category = list("Mining Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/trigger_guard_mod
+	name = "Kinetic Accelerator Trigger Guard Mod"
+	desc = "A device which allows kinetic accelerators to be wielded by any organism."
+	id = "triggermod"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_GOLD = 1500, MAT_URANIUM = 1000)
+	build_path = /obj/item/borg/upgrade/modkit/trigger_guard
+	category = list("Mining Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/damage_mod
+	name = "Kinetic Accelerator Damage Mod"
+	desc = "A device which allows kinetic accelerators to deal more damage."
+	id = "damagemod"
+	build_type = PROTOLATHE | MECHFAB
+	materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_GOLD = 1500, MAT_URANIUM = 1000)
+	build_path = /obj/item/borg/upgrade/modkit/damage
+	category = list("Mining Designs", "Cyborg Upgrade Modules")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/cooldown_mod
+	name = "Kinetic Accelerator Cooldown Mod"
+	desc = "A device which decreases the cooldown of a Kinetic Accelerator."
+	id = "cooldownmod"
+	build_type = PROTOLATHE | MECHFAB
+	materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_GOLD = 1500, MAT_URANIUM = 1000)
+	build_path = /obj/item/borg/upgrade/modkit/cooldown
+	category = list("Mining Designs", "Cyborg Upgrade Modules")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/range_mod
+	name = "Kinetic Accelerator Range Mod"
+	desc = "A device which allows kinetic accelerators to fire at a further range."
+	id = "rangemod"
+	build_type = PROTOLATHE | MECHFAB
+	materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_GOLD = 1500, MAT_URANIUM = 1000)
+	build_path = /obj/item/borg/upgrade/modkit/range
+	category = list("Mining Designs", "Cyborg Upgrade Modules")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/hyperaccelerator
+	name = "Kinetic Accelerator Mining AoE Mod"
+	desc = "A modification kit for Kinetic Accelerators which causes it to fire AoE blasts that destroy rock."
+	id = "hypermod"
+	build_type = PROTOLATHE | MECHFAB
+	materials = list(MAT_METAL = 8000, MAT_GLASS = 1500, MAT_SILVER = 2000, MAT_GOLD = 2000, MAT_DIAMOND = 2000)
+	build_path = /obj/item/borg/upgrade/modkit/aoe/turfs
+	category = list("Mining Designs", "Cyborg Upgrade Modules")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO

code/modules/research/designs/misc_designs.dm

@@ -364,6 +364,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."
@@ -379,13 +389,23 @@
 ////////////Tools//////////////
 ///////////////////////////////
 
-/datum/design/rcd_upgrade
-	name = "Advanced RCD designs upgrade"
+/datum/design/rcd_upgrade/frames
+	name = "RCD frames designs upgrade"
 	desc = "Adds the computer frame and machine frame to the RCD."
-	id = "rcd_upgrade"
+	id = "rcd_upgrade_frames"
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 5000, MAT_GLASS = 2500, MAT_SILVER = 1500, MAT_TITANIUM = 2000)
-	build_path = /obj/item/rcd_upgrade
+	build_path = /obj/item/rcd_upgrade/frames
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/rcd_upgrade/simple_circuits
+	name = "RCD simple circuits designs upgrade"
+	desc = "Adds the simple circuits to the RCD."
+	id = "rcd_upgrade_simple_circuits"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 5000, MAT_GLASS = 2500, MAT_SILVER = 1500, MAT_TITANIUM = 2000)
+	build_path = /obj/item/rcd_upgrade/simple_circuits
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
 
@@ -419,6 +439,26 @@
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
 
+/datum/design/rcd_loaded
+	name = "Rapid Construction Device"
+	desc = "A tool that can construct and deconstruct walls, airlocks and floors on the fly."
+	id = "rcd_loaded"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)  // costs more than what it did in the autolathe, this one comes loaded.
+	build_path = /obj/item/construction/rcd/loaded
+	category = list("Equipment")
+	departmental_flags =  DEPARTMENTAL_FLAG_ENGINEERING
+
+/datum/design/rpd
+	name = "Rapid Pipe Dispenser"
+	desc = "A tool that can construct and deconstruct pipes on the fly."
+	id = "rpd"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 75000, MAT_GLASS = 37500)
+	build_path = /obj/item/pipe_dispenser
+	category = list("Equipment")
+	departmental_flags =  DEPARTMENTAL_FLAG_ENGINEERING
+
 /datum/design/alienwrench
 	name = "Alien Wrench"
 	desc = "An advanced wrench obtained through Abductor technology."

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/destructive_analyzer.dm

@@ -1,154 +1,154 @@
-
-
-/*
-Destructive Analyzer
-
-It is used to destroy hand-held objects and advance technological research. Controls are in the linked R&D console.
-
-Note: Must be placed within 3 tiles of the R&D Console
-*/
-/obj/machinery/rnd/destructive_analyzer
-	name = "destructive analyzer"
-	desc = "Learn science by destroying things!"
-	icon_state = "d_analyzer"
-	circuit = /obj/item/circuitboard/machine/destructive_analyzer
-	var/decon_mod = 0
-
-/obj/machinery/rnd/destructive_analyzer/RefreshParts()
-	var/T = 0
-	for(var/obj/item/stock_parts/S in component_parts)
-		T += S.rating
-	decon_mod = T
-
-
-/obj/machinery/rnd/destructive_analyzer/proc/ConvertReqString2List(list/source_list)
-	var/list/temp_list = params2list(source_list)
-	for(var/O in temp_list)
-		temp_list[O] = text2num(temp_list[O])
-	return temp_list
-
-/obj/machinery/rnd/destructive_analyzer/disconnect_console()
-	linked_console.linked_destroy = null
-	..()
-
-/obj/machinery/rnd/destructive_analyzer/Insert_Item(obj/item/O, mob/user)
-	if(user.a_intent != INTENT_HARM)
-		. = 1
-		if(!is_insertion_ready(user))
-			return
-		if(!user.transferItemToLoc(O, src))
-			to_chat(user, "<span class='warning'>\The [O] is stuck to your hand, you cannot put it in the [src.name]!</span>")
-			return
-		busy = TRUE
-		loaded_item = O
-		to_chat(user, "<span class='notice'>You add the [O.name] to the [src.name]!</span>")
-		flick("d_analyzer_la", src)
-		addtimer(CALLBACK(src, .proc/finish_loading), 10)
-		if (linked_console)
-			linked_console.updateUsrDialog()
-
-/obj/machinery/rnd/destructive_analyzer/proc/finish_loading()
-	update_icon()
-	reset_busy()
-
-/obj/machinery/rnd/destructive_analyzer/update_icon()
-	if(loaded_item)
-		icon_state = "d_analyzer_l"
-	else
-		icon_state = initial(icon_state)
-
-/obj/machinery/rnd/destructive_analyzer/proc/reclaim_materials_from(obj/item/thing)
-	. = 0
-	var/datum/component/material_container/storage = linked_console?.linked_lathe?.materials.mat_container
-	if(storage) //Also sends salvaged materials to a linked protolathe, if any.
-		for(var/material in thing.materials)
-			var/can_insert = min((storage.max_amount - storage.total_amount), (max(thing.materials[material]*(decon_mod/10), thing.materials[material])))
-			storage.insert_amount(can_insert, material)
-			. += can_insert
-		if (.)
-			linked_console.linked_lathe.materials.silo_log(src, "reclaimed", 1, "[thing.name]", thing.materials)
-
-/obj/machinery/rnd/destructive_analyzer/proc/destroy_item(obj/item/thing, innermode = FALSE)
-	if(QDELETED(thing) || QDELETED(src) || QDELETED(linked_console))
-		return FALSE
-	if(!innermode)
-		flick("d_analyzer_process", src)
-		busy = TRUE
-		addtimer(CALLBACK(src, .proc/reset_busy), 24)
-		use_power(250)
-		if(thing == loaded_item)
-			loaded_item = null
-		var/list/food = thing.GetDeconstructableContents()
-		for(var/obj/item/innerthing in food)
-			destroy_item(innerthing, TRUE)
-	reclaim_materials_from(thing)
-	for(var/mob/M in thing)
-		M.death()
-	if(istype(thing, /obj/item/stack/sheet))
-		var/obj/item/stack/sheet/S = thing
-		if(S.amount > 1 && !innermode)
-			S.amount--
-			loaded_item = S
-		else
-			qdel(S)
-	else
-		qdel(thing)
-	if (!innermode)
-		update_icon()
-	return TRUE
-
-/obj/machinery/rnd/destructive_analyzer/proc/user_try_decon_id(id, mob/user)
-	if(!istype(loaded_item) || !istype(linked_console))
-		return FALSE
-
-	if (id && id != RESEARCH_MATERIAL_RECLAMATION_ID)
-		var/datum/techweb_node/TN = SSresearch.techweb_node_by_id(id)
-		if(!istype(TN))
-			return FALSE
-		var/dpath = loaded_item.type
-		var/list/worths = TN.boost_item_paths[dpath]
-		var/list/differences = list()
-		var/list/already_boosted = linked_console.stored_research.boosted_nodes[TN.id]
-		for(var/i in worths)
-			var/used = already_boosted? already_boosted[i] : 0
-			var/value = min(worths[i], TN.research_costs[i]) - used
-			if(value > 0)
-				differences[i] = value
-		if(length(worths) && !length(differences))
-			return FALSE
-		var/choice = input("Are you sure you want to destroy [loaded_item] to [!length(worths) ? "reveal [TN.display_name]" : "boost [TN.display_name] by [json_encode(differences)] point\s"]?") in list("Proceed", "Cancel")
-		if(choice == "Cancel")
-			return FALSE
-		if(QDELETED(loaded_item) || QDELETED(linked_console) || !user.Adjacent(linked_console) || QDELETED(src))
-			return FALSE
-		SSblackbox.record_feedback("nested tally", "item_deconstructed", 1, list("[TN.id]", "[loaded_item.type]"))
-		if(destroy_item(loaded_item))
-			linked_console.stored_research.boost_with_path(SSresearch.techweb_node_by_id(TN.id), dpath)
-
-	else
-		var/list/point_value = techweb_item_point_check(loaded_item)
-		if(linked_console.stored_research.deconstructed_items[loaded_item.type])
-			point_value = list()
-		var/user_mode_string = ""
-		if(length(point_value))
-			user_mode_string = " for [json_encode(point_value)] points"
-		else if(loaded_item.materials.len)
-			user_mode_string = " for material reclamation"
-		var/choice = input("Are you sure you want to destroy [loaded_item][user_mode_string]?") in list("Proceed", "Cancel")
-		if(choice == "Cancel")
-			return FALSE
-		if(QDELETED(loaded_item) || QDELETED(linked_console) || !user.Adjacent(linked_console) || QDELETED(src))
-			return FALSE
-		var/loaded_type = loaded_item.type
-		if(destroy_item(loaded_item))
-			linked_console.stored_research.add_point_list(point_value)
-			linked_console.stored_research.deconstructed_items[loaded_type] = point_value
-	return TRUE
-
-/obj/machinery/rnd/destructive_analyzer/proc/unload_item()
-	if(!loaded_item)
-		return FALSE
-	loaded_item.forceMove(get_turf(src))
-	loaded_item = null
-	update_icon()
-	return TRUE
+
+
+/*
+Destructive Analyzer
+
+It is used to destroy hand-held objects and advance technological research. Controls are in the linked R&D console.
+
+Note: Must be placed within 3 tiles of the R&D Console
+*/
+/obj/machinery/rnd/destructive_analyzer
+	name = "destructive analyzer"
+	desc = "Learn science by destroying things!"
+	icon_state = "d_analyzer"
+	circuit = /obj/item/circuitboard/machine/destructive_analyzer
+	var/decon_mod = 0
+
+/obj/machinery/rnd/destructive_analyzer/RefreshParts()
+	var/T = 0
+	for(var/obj/item/stock_parts/S in component_parts)
+		T += S.rating
+	decon_mod = T
+
+
+/obj/machinery/rnd/destructive_analyzer/proc/ConvertReqString2List(list/source_list)
+	var/list/temp_list = params2list(source_list)
+	for(var/O in temp_list)
+		temp_list[O] = text2num(temp_list[O])
+	return temp_list
+
+/obj/machinery/rnd/destructive_analyzer/disconnect_console()
+	linked_console.linked_destroy = null
+	..()
+
+/obj/machinery/rnd/destructive_analyzer/Insert_Item(obj/item/O, mob/user)
+	if(user.a_intent != INTENT_HARM)
+		. = 1
+		if(!is_insertion_ready(user))
+			return
+		if(!user.transferItemToLoc(O, src))
+			to_chat(user, "<span class='warning'>\The [O] is stuck to your hand, you cannot put it in the [src.name]!</span>")
+			return
+		busy = TRUE
+		loaded_item = O
+		to_chat(user, "<span class='notice'>You add the [O.name] to the [src.name]!</span>")
+		flick("d_analyzer_la", src)
+		addtimer(CALLBACK(src, .proc/finish_loading), 10)
+		if (linked_console)
+			linked_console.updateUsrDialog()
+
+/obj/machinery/rnd/destructive_analyzer/proc/finish_loading()
+	update_icon()
+	reset_busy()
+
+/obj/machinery/rnd/destructive_analyzer/update_icon()
+	if(loaded_item)
+		icon_state = "d_analyzer_l"
+	else
+		icon_state = initial(icon_state)
+
+/obj/machinery/rnd/destructive_analyzer/proc/reclaim_materials_from(obj/item/thing)
+	. = 0
+	var/datum/component/material_container/storage = linked_console?.linked_lathe?.materials.mat_container
+	if(storage) //Also sends salvaged materials to a linked protolathe, if any.
+		for(var/material in thing.materials)
+			var/can_insert = min((storage.max_amount - storage.total_amount), (max(thing.materials[material]*(decon_mod/10), thing.materials[material])))
+			storage.insert_amount(can_insert, material)
+			. += can_insert
+		if (.)
+			linked_console.linked_lathe.materials.silo_log(src, "reclaimed", 1, "[thing.name]", thing.materials)
+
+/obj/machinery/rnd/destructive_analyzer/proc/destroy_item(obj/item/thing, innermode = FALSE)
+	if(QDELETED(thing) || QDELETED(src) || QDELETED(linked_console))
+		return FALSE
+	if(!innermode)
+		flick("d_analyzer_process", src)
+		busy = TRUE
+		addtimer(CALLBACK(src, .proc/reset_busy), 24)
+		use_power(250)
+		if(thing == loaded_item)
+			loaded_item = null
+		var/list/food = thing.GetDeconstructableContents()
+		for(var/obj/item/innerthing in food)
+			destroy_item(innerthing, TRUE)
+	reclaim_materials_from(thing)
+	for(var/mob/M in thing)
+		M.death()
+	if(istype(thing, /obj/item/stack/sheet))
+		var/obj/item/stack/sheet/S = thing
+		if(S.amount > 1 && !innermode)
+			S.amount--
+			loaded_item = S
+		else
+			qdel(S)
+	else
+		qdel(thing)
+	if (!innermode)
+		update_icon()
+	return TRUE
+
+/obj/machinery/rnd/destructive_analyzer/proc/user_try_decon_id(id, mob/user)
+	if(!istype(loaded_item) || !istype(linked_console))
+		return FALSE
+
+	if (id && id != RESEARCH_MATERIAL_RECLAMATION_ID)
+		var/datum/techweb_node/TN = SSresearch.techweb_node_by_id(id)
+		if(!istype(TN))
+			return FALSE
+		var/dpath = loaded_item.type
+		var/list/worths = TN.boost_item_paths[dpath]
+		var/list/differences = list()
+		var/list/already_boosted = linked_console.stored_research.boosted_nodes[TN.id]
+		for(var/i in worths)
+			var/used = already_boosted? already_boosted[i] : 0
+			var/value = min(worths[i], TN.research_costs[i]) - used
+			if(value > 0)
+				differences[i] = value
+		if(length(worths) && !length(differences))
+			return FALSE
+		var/choice = input("Are you sure you want to destroy [loaded_item] to [!length(worths) ? "reveal [TN.display_name]" : "boost [TN.display_name] by [json_encode(differences)] point\s"]?") in list("Proceed", "Cancel")
+		if(choice == "Cancel")
+			return FALSE
+		if(QDELETED(loaded_item) || QDELETED(linked_console) || !user.Adjacent(linked_console) || QDELETED(src))
+			return FALSE
+		SSblackbox.record_feedback("nested tally", "item_deconstructed", 1, list("[TN.id]", "[loaded_item.type]"))
+		if(destroy_item(loaded_item))
+			linked_console.stored_research.boost_with_path(SSresearch.techweb_node_by_id(TN.id), dpath)
+
+	else
+		var/list/point_value = techweb_item_point_check(loaded_item)
+		if(linked_console.stored_research.deconstructed_items[loaded_item.type])
+			point_value = list()
+		var/user_mode_string = ""
+		if(length(point_value))
+			user_mode_string = " for [json_encode(point_value)] points"
+		else if(loaded_item.materials.len)
+			user_mode_string = " for material reclamation"
+		var/choice = input("Are you sure you want to destroy [loaded_item][user_mode_string]?") in list("Proceed", "Cancel")
+		if(choice == "Cancel")
+			return FALSE
+		if(QDELETED(loaded_item) || QDELETED(linked_console) || !user.Adjacent(linked_console) || QDELETED(src))
+			return FALSE
+		var/loaded_type = loaded_item.type
+		if(destroy_item(loaded_item))
+			linked_console.stored_research.add_point_list(point_value)
+			linked_console.stored_research.deconstructed_items[loaded_type] = point_value
+	return TRUE
+
+/obj/machinery/rnd/destructive_analyzer/proc/unload_item()
+	if(!loaded_item)
+		return FALSE
+	loaded_item.forceMove(get_turf(src))
+	loaded_item = null
+	update_icon()
+	return TRUE

code/modules/research/machinery/_production.dm

@@ -1,365 +1,365 @@
-/obj/machinery/rnd/production
-	name = "technology fabricator"
-	desc = "Makes researched and prototype items with materials and energy."
-	layer = BELOW_OBJ_LAYER
-	var/consoleless_interface = FALSE			//Whether it can be used without a console.
-	var/efficiency_coeff = 1				//Materials needed / coeff = actual.
-	var/list/categories = list()
-	var/datum/component/remote_materials/materials
-	var/allowed_department_flags = ALL
-	var/production_animation				//What's flick()'d on print.
-	var/allowed_buildtypes = NONE
-	var/list/datum/design/cached_designs
-	var/list/datum/design/matching_designs
-	var/department_tag = "Unidentified"			//used for material distribution among other things.
-	var/datum/techweb/stored_research
-	var/datum/techweb/host_research
-
-	var/screen = RESEARCH_FABRICATOR_SCREEN_MAIN
-	var/selected_category
-
-/obj/machinery/rnd/production/Initialize(mapload)
-	. = ..()
-	create_reagents(0, OPENCONTAINER)
-	matching_designs = list()
-	cached_designs = list()
-	stored_research = new
-	host_research = SSresearch.science_tech
-	update_research()
-	materials = AddComponent(/datum/component/remote_materials, "lathe", mapload)
-	RefreshParts()
-
-/obj/machinery/rnd/production/proc/update_research()
-	host_research.copy_research_to(stored_research, TRUE)
-	update_designs()
-
-/obj/machinery/rnd/production/proc/update_designs()
-	cached_designs.Cut()
-	for(var/i in stored_research.researched_designs)
-		var/datum/design/d = SSresearch.techweb_design_by_id(i)
-		if((isnull(allowed_department_flags) || (d.departmental_flags & allowed_department_flags)) && (d.build_type & allowed_buildtypes))
-			cached_designs |= d
-
-/obj/machinery/rnd/production/RefreshParts()
-	calculate_efficiency()
-
-/obj/machinery/rnd/production/ui_interact(mob/user)
-	if(!consoleless_interface)
-		return ..()
-	user.set_machine(src)
-	var/datum/browser/popup = new(user, "rndconsole", name, 460, 550)
-	popup.set_content(generate_ui())
-	popup.open()
-
-/obj/machinery/rnd/production/Destroy()
-	QDEL_NULL(stored_research)
-	return ..()
-
-/obj/machinery/rnd/production/proc/calculate_efficiency()
-	efficiency_coeff = 1
-	if(reagents)		//If reagents/materials aren't initialized, don't bother, we'll be doing this again after reagents init anyways.
-		reagents.maximum_volume = 0
-		for(var/obj/item/reagent_containers/glass/G in component_parts)
-			reagents.maximum_volume += G.volume
-			G.reagents.trans_to(src, G.reagents.total_volume)
-	if(materials)
-		var/total_storage = 0
-		for(var/obj/item/stock_parts/matter_bin/M in component_parts)
-			total_storage += M.rating * 75000
-		materials.set_local_size(total_storage)
-	var/total_rating = 0
-	for(var/obj/item/stock_parts/manipulator/M in component_parts)
-		total_rating += M.rating
-	total_rating = max(1, total_rating)
-	efficiency_coeff = total_rating
-
-//we eject the materials upon deconstruction.
-/obj/machinery/rnd/production/on_deconstruction()
-	for(var/obj/item/reagent_containers/glass/G in component_parts)
-		reagents.trans_to(G, G.reagents.maximum_volume)
-	return ..()
-
-/obj/machinery/rnd/production/proc/do_print(path, amount, list/matlist, notify_admins, mob/user)
-	if(notify_admins)
-		message_admins("[ADMIN_LOOKUPFLW(user)] has built [amount] of [path] at a [src]([type]).")
-	for(var/i in 1 to amount)
-		var/obj/O = new path(get_turf(src))
-		if(efficient_with(O.type) && isitem(O))
-			var/obj/item/I = O
-			I.materials = matlist.Copy()
-	SSblackbox.record_feedback("nested tally", "item_printed", amount, list("[type]", "[path]"))
-	investigate_log("[key_name(user)] built [amount] of [path] at [src]([type]).", INVESTIGATE_RESEARCH)
-
-/obj/machinery/rnd/production/proc/check_mat(datum/design/being_built, M)	// now returns how many times the item can be built with the material
-	if (!materials.mat_container)  // no connected silo
-		return 0
-	var/list/all_materials = being_built.reagents_list + being_built.materials
-
-	var/A = materials.mat_container.amount(M)
-	if(!A)
-		A = reagents.get_reagent_amount(M)
-
-	// these types don't have their .materials set in do_print, so don't allow
-	// them to be constructed efficiently
-	var/ef = efficient_with(being_built.build_path) ? efficiency_coeff : 1
-	return round(A / max(1, all_materials[M] / ef))
-
-/obj/machinery/rnd/production/proc/efficient_with(path)
-	return !ispath(path, /obj/item/stack/sheet) && !ispath(path, /obj/item/stack/ore/bluespace_crystal)
-
-/obj/machinery/rnd/production/proc/user_try_print_id(id, amount)
-	if((!istype(linked_console) && requires_console) || !id)
-		return FALSE
-	if(istext(amount))
-		amount = text2num(amount)
-	if(isnull(amount))
-		amount = 1
-	var/datum/design/D = (linked_console || requires_console)? (linked_console.stored_research.researched_designs[id]? SSresearch.techweb_design_by_id(id) : null) : SSresearch.techweb_design_by_id(id)
-	if(!istype(D))
-		return FALSE
-	if(!(isnull(allowed_department_flags) || (D.departmental_flags & allowed_department_flags)))
-		say("Warning: Printing failed: This fabricator does not have the necessary keys to decrypt design schematics. Please update the research data with the on-screen button and contact Nanotrasen Support!")
-		return FALSE
-	if(D.build_type && !(D.build_type & allowed_buildtypes))
-		say("This machine does not have the necessary manipulation systems for this design. Please contact Nanotrasen Support!")
-		return FALSE
-	if(!materials.mat_container)
-		say("No connection to material storage, please contact the quartermaster.")
-		return FALSE
-	if(materials.on_hold())
-		say("Mineral access is on hold, please contact the quartermaster.")
-		return FALSE
-	var/power = 1000
-	amount = CLAMP(amount, 1, 50)
-	for(var/M in D.materials)
-		power += round(D.materials[M] * amount / 35)
-	power = min(3000, power)
-	use_power(power)
-	var/coeff = efficient_with(D.build_path) ? efficiency_coeff : 1
-	var/list/efficient_mats = list()
-	for(var/MAT in D.materials)
-		efficient_mats[MAT] = D.materials[MAT]/coeff
-	if(!materials.mat_container.has_materials(efficient_mats, amount))
-		say("Not enough materials to complete prototype[amount > 1? "s" : ""].")
-		return FALSE
-	for(var/R in D.reagents_list)
-		if(!reagents.has_reagent(R, D.reagents_list[R]*amount/coeff))
-			say("Not enough reagents to complete prototype[amount > 1? "s" : ""].")
-			return FALSE
-	materials.mat_container.use_amount(efficient_mats, amount)
-	materials.silo_log(src, "built", -amount, "[D.name]", efficient_mats)
-	for(var/R in D.reagents_list)
-		reagents.remove_reagent(R, D.reagents_list[R]*amount/coeff)
-	busy = TRUE
-	if(production_animation)
-		flick(production_animation, src)
-	var/timecoeff = D.lathe_time_factor / efficiency_coeff
-	addtimer(CALLBACK(src, .proc/reset_busy), (30 * timecoeff * amount) ** 0.5)
-	addtimer(CALLBACK(src, .proc/do_print, D.build_path, amount, efficient_mats, D.dangerous_construction, usr), (32 * timecoeff * amount) ** 0.8)
-	return TRUE
-
-/obj/machinery/rnd/production/proc/search(string)
-	matching_designs.Cut()
-	for(var/v in stored_research.researched_designs)
-		var/datum/design/D = SSresearch.techweb_design_by_id(v)
-		if(!(D.build_type & allowed_buildtypes) || !(isnull(allowed_department_flags) || (D.departmental_flags & allowed_department_flags)))
-			continue
-		if(findtext(D.name,string))
-			matching_designs.Add(D)
-
-/obj/machinery/rnd/production/proc/generate_ui()
-	var/list/ui = list()
-	ui += ui_header()
-	switch(screen)
-		if(RESEARCH_FABRICATOR_SCREEN_MATERIALS)
-			ui += ui_screen_materials()
-		if(RESEARCH_FABRICATOR_SCREEN_CHEMICALS)
-			ui += ui_screen_chemicals()
-		if(RESEARCH_FABRICATOR_SCREEN_SEARCH)
-			ui += ui_screen_search()
-		if(RESEARCH_FABRICATOR_SCREEN_CATEGORYVIEW)
-			ui += ui_screen_category_view()
-		else
-			ui += ui_screen_main()
-	for(var/i in 1 to length(ui))
-		if(!findtextEx(ui[i], RDSCREEN_NOBREAK))
-			ui[i] += "<br>"
-		ui[i] = replacetextEx(ui[i], RDSCREEN_NOBREAK, "")
-	return ui.Join("")
-
-/obj/machinery/rnd/production/proc/ui_header()
-	var/list/l = list()
-	l += "<div class='statusDisplay'><b>[host_research.organization] [department_tag] Department Lathe</b>"
-	l += "Security protocols: [(obj_flags & EMAGGED)? "<font color='red'>Disabled</font>" : "<font color='green'>Enabled</font>"]"
-	if (materials.mat_container)
-		l += "<A href='?src=[REF(src)];switch_screen=[RESEARCH_FABRICATOR_SCREEN_MATERIALS]'><B>Material Amount:</B> [materials.format_amount()]</A>"
-	else
-		l += "<font color='red'>No material storage connected, please contact the quartermaster.</font>"
-	l += "<A href='?src=[REF(src)];switch_screen=[RESEARCH_FABRICATOR_SCREEN_CHEMICALS]'><B>Chemical volume:</B> [reagents.total_volume] / [reagents.maximum_volume]</A>"
-	l += "<a href='?src=[REF(src)];sync_research=1'>Synchronize Research</a>"
-	l += "<a href='?src=[REF(src)];switch_screen=[RESEARCH_FABRICATOR_SCREEN_MAIN]'>Main Screen</a></div>[RDSCREEN_NOBREAK]"
-	return l
-
-/obj/machinery/rnd/production/proc/ui_screen_materials()
-	if (!materials.mat_container)
-		screen = RESEARCH_FABRICATOR_SCREEN_MAIN
-		return ui_screen_main()
-	var/list/l = list()
-	l += "<div class='statusDisplay'><h3>Material Storage:</h3>"
-	for(var/mat_id in materials.mat_container.materials)
-		var/datum/material/M = materials.mat_container.materials[mat_id]
-		l += "* [M.amount] of [M.name]: "
-		if(M.amount >= MINERAL_MATERIAL_AMOUNT) l += "<A href='?src=[REF(src)];ejectsheet=[M.id];eject_amt=1'>Eject</A> [RDSCREEN_NOBREAK]"
-		if(M.amount >= MINERAL_MATERIAL_AMOUNT*5) l += "<A href='?src=[REF(src)];ejectsheet=[M.id];eject_amt=5'>5x</A> [RDSCREEN_NOBREAK]"
-		if(M.amount >= MINERAL_MATERIAL_AMOUNT) l += "<A href='?src=[REF(src)];ejectsheet=[M.id];eject_amt=50'>All</A>[RDSCREEN_NOBREAK]"
-		l += ""
-	l += "</div>[RDSCREEN_NOBREAK]"
-	return l
-
-/obj/machinery/rnd/production/proc/ui_screen_chemicals()
-	var/list/l = list()
-	l += "<div class='statusDisplay'><A href='?src=[REF(src)];disposeall=1'>Disposal All Chemicals in Storage</A>"
-	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 += "</div>"
-	return l
-
-/obj/machinery/rnd/production/proc/ui_screen_search()
-	var/list/l = list()
-	var/coeff = efficiency_coeff
-	l += "<h2>Search Results:</h2>"
-	l += "<form name='search' action='?src=[REF(src)]'>\
-	<input type='hidden' name='src' value='[REF(src)]'>\
-	<input type='hidden' name='search' value='to_search'>\
-	<input type='text' name='to_search'>\
-	<input type='submit' value='Search'>\
-	</form><HR>"
-	for(var/datum/design/D in matching_designs)
-		l += design_menu_entry(D, coeff)
-	l += "</div>"
-	return l
-
-/obj/machinery/rnd/production/proc/design_menu_entry(datum/design/D, coeff)
-	if(!istype(D))
-		return
-	if(!coeff)
-		coeff = efficiency_coeff
-	if(!efficient_with(D.build_path))
-		coeff = 1
-	var/list/l = list()
-	var/temp_material
-	var/c = 50
-	var/t
-	var/all_materials = D.materials + D.reagents_list
-	for(var/M in all_materials)
-		t = check_mat(D, M)
-		temp_material += " | "
-		if (t < 1)
-			temp_material += "<span class='bad'>[all_materials[M]/coeff] [CallMaterialName(M)]</span>"
-		else
-			temp_material += " [all_materials[M]/coeff] [CallMaterialName(M)]"
-		c = min(c,t)
-
-	if (c >= 1)
-		l += "<A href='?src=[REF(src)];build=[D.id];amount=1'>[D.name]</A>[RDSCREEN_NOBREAK]"
-		if(c >= 5)
-			l += "<A href='?src=[REF(src)];build=[D.id];amount=5'>x5</A>[RDSCREEN_NOBREAK]"
-		if(c >= 10)
-			l += "<A href='?src=[REF(src)];build=[D.id];amount=10'>x10</A>[RDSCREEN_NOBREAK]"
-		l += "[temp_material][RDSCREEN_NOBREAK]"
-	else
-		l += "<span class='linkOff'>[D.name]</span>[temp_material][RDSCREEN_NOBREAK]"
-	l += ""
-	return l
-
-/obj/machinery/rnd/production/Topic(raw, ls)
-	if(..())
-		return
-	add_fingerprint(usr)
-	usr.set_machine(src)
-	if(ls["switch_screen"])
-		screen = text2num(ls["switch_screen"])
-	if(ls["build"]) //Causes the Protolathe to build something.
-		if(busy)
-			say("Warning: Fabricators busy!")
-		else
-			user_try_print_id(ls["build"], ls["amount"])
-	if(ls["search"]) //Search for designs with name matching pattern
-		search(ls["to_search"])
-		screen = RESEARCH_FABRICATOR_SCREEN_SEARCH
-	if(ls["sync_research"])
-		update_research()
-		say("Synchronizing research with host technology database.")
-	if(ls["category"])
-		selected_category = ls["category"]
-	if(ls["dispose"])  //Causes the protolathe to dispose of a single reagent (all of it)
-		reagents.del_reagent(ls["dispose"])
-	if(ls["disposeall"]) //Causes the protolathe to dispose of all it's reagents.
-		reagents.clear_reagents()
-	if(ls["ejectsheet"]) //Causes the protolathe to eject a sheet of material
-		eject_sheets(ls["ejectsheet"], ls["eject_amt"])
-	updateUsrDialog()
-
-/obj/machinery/rnd/production/proc/eject_sheets(eject_sheet, eject_amt)
-	var/datum/component/material_container/mat_container = materials.mat_container
-	if (!mat_container)
-		say("No access to material storage, please contact the quartermaster.")
-		return 0
-	if (materials.on_hold())
-		say("Mineral access is on hold, please contact the quartermaster.")
-		return 0
-	var/count = mat_container.retrieve_sheets(text2num(eject_amt), eject_sheet, drop_location())
-	var/list/matlist = list()
-	matlist[eject_sheet] = MINERAL_MATERIAL_AMOUNT
-	materials.silo_log(src, "ejected", -count, "sheets", matlist)
-	return count
-
-/obj/machinery/rnd/production/proc/ui_screen_main()
-	var/list/l = list()
-	l += "<form name='search' action='?src=[REF(src)]'>\
-	<input type='hidden' name='src' value='[REF(src)]'>\
-	<input type='hidden' name='search' value='to_search'>\
-	<input type='hidden' name='type' value='proto'>\
-	<input type='text' name='to_search'>\
-	<input type='submit' value='Search'>\
-	</form><HR>"
-
-	l += list_categories(categories, RESEARCH_FABRICATOR_SCREEN_CATEGORYVIEW)
-
-	return l
-
-/obj/machinery/rnd/production/proc/ui_screen_category_view()
-	if(!selected_category)
-		return ui_screen_main()
-	var/list/l = list()
-	l += "<div class='statusDisplay'><h3>Browsing [selected_category]:</h3>"
-	var/coeff = efficiency_coeff
-	for(var/v in stored_research.researched_designs)
-		var/datum/design/D = SSresearch.techweb_design_by_id(v)
-		if(!(selected_category in D.category)|| !(D.build_type & allowed_buildtypes))
-			continue
-		if(!(isnull(allowed_department_flags) || (D.departmental_flags & allowed_department_flags)))
-			continue
-		l += design_menu_entry(D, coeff)
-	l += "</div>"
-	return l
-
-/obj/machinery/rnd/production/proc/list_categories(list/categories, menu_num)
-	if(!categories)
-		return
-
-	var/line_length = 1
-	var/list/l = "<table style='width:100%' align='center'><tr>"
-
-	for(var/C in categories)
-		if(line_length > 2)
-			l += "</tr><tr>"
-			line_length = 1
-
-		l += "<td><A href='?src=[REF(src)];category=[C];switch_screen=[menu_num]'>[C]</A></td>"
-		line_length++
-
-	l += "</tr></table></div>"
-	return l
+/obj/machinery/rnd/production
+	name = "technology fabricator"
+	desc = "Makes researched and prototype items with materials and energy."
+	layer = BELOW_OBJ_LAYER
+	var/consoleless_interface = FALSE			//Whether it can be used without a console.
+	var/efficiency_coeff = 1				//Materials needed / coeff = actual.
+	var/list/categories = list()
+	var/datum/component/remote_materials/materials
+	var/allowed_department_flags = ALL
+	var/production_animation				//What's flick()'d on print.
+	var/allowed_buildtypes = NONE
+	var/list/datum/design/cached_designs
+	var/list/datum/design/matching_designs
+	var/department_tag = "Unidentified"			//used for material distribution among other things.
+	var/datum/techweb/stored_research
+	var/datum/techweb/host_research
+
+	var/screen = RESEARCH_FABRICATOR_SCREEN_MAIN
+	var/selected_category
+
+/obj/machinery/rnd/production/Initialize(mapload)
+	. = ..()
+	create_reagents(0, OPENCONTAINER)
+	matching_designs = list()
+	cached_designs = list()
+	stored_research = new
+	host_research = SSresearch.science_tech
+	update_research()
+	materials = AddComponent(/datum/component/remote_materials, "lathe", mapload)
+	RefreshParts()
+
+/obj/machinery/rnd/production/proc/update_research()
+	host_research.copy_research_to(stored_research, TRUE)
+	update_designs()
+
+/obj/machinery/rnd/production/proc/update_designs()
+	cached_designs.Cut()
+	for(var/i in stored_research.researched_designs)
+		var/datum/design/d = SSresearch.techweb_design_by_id(i)
+		if((isnull(allowed_department_flags) || (d.departmental_flags & allowed_department_flags)) && (d.build_type & allowed_buildtypes))
+			cached_designs |= d
+
+/obj/machinery/rnd/production/RefreshParts()
+	calculate_efficiency()
+
+/obj/machinery/rnd/production/ui_interact(mob/user)
+	if(!consoleless_interface)
+		return ..()
+	user.set_machine(src)
+	var/datum/browser/popup = new(user, "rndconsole", name, 460, 550)
+	popup.set_content(generate_ui())
+	popup.open()
+
+/obj/machinery/rnd/production/Destroy()
+	QDEL_NULL(stored_research)
+	return ..()
+
+/obj/machinery/rnd/production/proc/calculate_efficiency()
+	efficiency_coeff = 1
+	if(reagents)		//If reagents/materials aren't initialized, don't bother, we'll be doing this again after reagents init anyways.
+		reagents.maximum_volume = 0
+		for(var/obj/item/reagent_containers/glass/G in component_parts)
+			reagents.maximum_volume += G.volume
+			G.reagents.trans_to(src, G.reagents.total_volume)
+	if(materials)
+		var/total_storage = 0
+		for(var/obj/item/stock_parts/matter_bin/M in component_parts)
+			total_storage += M.rating * 75000
+		materials.set_local_size(total_storage)
+	var/total_rating = 0
+	for(var/obj/item/stock_parts/manipulator/M in component_parts)
+		total_rating += M.rating
+	total_rating = max(1, total_rating)
+	efficiency_coeff = total_rating
+
+//we eject the materials upon deconstruction.
+/obj/machinery/rnd/production/on_deconstruction()
+	for(var/obj/item/reagent_containers/glass/G in component_parts)
+		reagents.trans_to(G, G.reagents.maximum_volume)
+	return ..()
+
+/obj/machinery/rnd/production/proc/do_print(path, amount, list/matlist, notify_admins, mob/user)
+	if(notify_admins)
+		message_admins("[ADMIN_LOOKUPFLW(user)] has built [amount] of [path] at a [src]([type]).")
+	for(var/i in 1 to amount)
+		var/obj/O = new path(get_turf(src))
+		if(efficient_with(O.type) && isitem(O))
+			var/obj/item/I = O
+			I.materials = matlist.Copy()
+	SSblackbox.record_feedback("nested tally", "item_printed", amount, list("[type]", "[path]"))
+	investigate_log("[key_name(user)] built [amount] of [path] at [src]([type]).", INVESTIGATE_RESEARCH)
+
+/obj/machinery/rnd/production/proc/check_mat(datum/design/being_built, M)	// now returns how many times the item can be built with the material
+	if (!materials.mat_container)  // no connected silo
+		return 0
+	var/list/all_materials = being_built.reagents_list + being_built.materials
+
+	var/A = materials.mat_container.amount(M)
+	if(!A)
+		A = reagents.get_reagent_amount(M)
+
+	// these types don't have their .materials set in do_print, so don't allow
+	// them to be constructed efficiently
+	var/ef = efficient_with(being_built.build_path) ? efficiency_coeff : 1
+	return round(A / max(1, all_materials[M] / ef))
+
+/obj/machinery/rnd/production/proc/efficient_with(path)
+	return !ispath(path, /obj/item/stack/sheet) && !ispath(path, /obj/item/stack/ore/bluespace_crystal)
+
+/obj/machinery/rnd/production/proc/user_try_print_id(id, amount)
+	if((!istype(linked_console) && requires_console) || !id)
+		return FALSE
+	if(istext(amount))
+		amount = text2num(amount)
+	if(isnull(amount))
+		amount = 1
+	var/datum/design/D = (linked_console || requires_console)? (linked_console.stored_research.researched_designs[id]? SSresearch.techweb_design_by_id(id) : null) : SSresearch.techweb_design_by_id(id)
+	if(!istype(D))
+		return FALSE
+	if(!(isnull(allowed_department_flags) || (D.departmental_flags & allowed_department_flags)))
+		say("Warning: Printing failed: This fabricator does not have the necessary keys to decrypt design schematics. Please update the research data with the on-screen button and contact Nanotrasen Support!")
+		return FALSE
+	if(D.build_type && !(D.build_type & allowed_buildtypes))
+		say("This machine does not have the necessary manipulation systems for this design. Please contact Nanotrasen Support!")
+		return FALSE
+	if(!materials.mat_container)
+		say("No connection to material storage, please contact the quartermaster.")
+		return FALSE
+	if(materials.on_hold())
+		say("Mineral access is on hold, please contact the quartermaster.")
+		return FALSE
+	var/power = 1000
+	amount = CLAMP(amount, 1, 50)
+	for(var/M in D.materials)
+		power += round(D.materials[M] * amount / 35)
+	power = min(3000, power)
+	use_power(power)
+	var/coeff = efficient_with(D.build_path) ? efficiency_coeff : 1
+	var/list/efficient_mats = list()
+	for(var/MAT in D.materials)
+		efficient_mats[MAT] = D.materials[MAT]/coeff
+	if(!materials.mat_container.has_materials(efficient_mats, amount))
+		say("Not enough materials to complete prototype[amount > 1? "s" : ""].")
+		return FALSE
+	for(var/R in D.reagents_list)
+		if(!reagents.has_reagent(R, D.reagents_list[R]*amount/coeff))
+			say("Not enough reagents to complete prototype[amount > 1? "s" : ""].")
+			return FALSE
+	materials.mat_container.use_amount(efficient_mats, amount)
+	materials.silo_log(src, "built", -amount, "[D.name]", efficient_mats)
+	for(var/R in D.reagents_list)
+		reagents.remove_reagent(R, D.reagents_list[R]*amount/coeff)
+	busy = TRUE
+	if(production_animation)
+		flick(production_animation, src)
+	var/timecoeff = D.lathe_time_factor / efficiency_coeff
+	addtimer(CALLBACK(src, .proc/reset_busy), (30 * timecoeff * amount) ** 0.5)
+	addtimer(CALLBACK(src, .proc/do_print, D.build_path, amount, efficient_mats, D.dangerous_construction, usr), (32 * timecoeff * amount) ** 0.8)
+	return TRUE
+
+/obj/machinery/rnd/production/proc/search(string)
+	matching_designs.Cut()
+	for(var/v in stored_research.researched_designs)
+		var/datum/design/D = SSresearch.techweb_design_by_id(v)
+		if(!(D.build_type & allowed_buildtypes) || !(isnull(allowed_department_flags) || (D.departmental_flags & allowed_department_flags)))
+			continue
+		if(findtext(D.name,string))
+			matching_designs.Add(D)
+
+/obj/machinery/rnd/production/proc/generate_ui()
+	var/list/ui = list()
+	ui += ui_header()
+	switch(screen)
+		if(RESEARCH_FABRICATOR_SCREEN_MATERIALS)
+			ui += ui_screen_materials()
+		if(RESEARCH_FABRICATOR_SCREEN_CHEMICALS)
+			ui += ui_screen_chemicals()
+		if(RESEARCH_FABRICATOR_SCREEN_SEARCH)
+			ui += ui_screen_search()
+		if(RESEARCH_FABRICATOR_SCREEN_CATEGORYVIEW)
+			ui += ui_screen_category_view()
+		else
+			ui += ui_screen_main()
+	for(var/i in 1 to length(ui))
+		if(!findtextEx(ui[i], RDSCREEN_NOBREAK))
+			ui[i] += "<br>"
+		ui[i] = replacetextEx(ui[i], RDSCREEN_NOBREAK, "")
+	return ui.Join("")
+
+/obj/machinery/rnd/production/proc/ui_header()
+	var/list/l = list()
+	l += "<div class='statusDisplay'><b>[host_research.organization] [department_tag] Department Lathe</b>"
+	l += "Security protocols: [(obj_flags & EMAGGED)? "<font color='red'>Disabled</font>" : "<font color='green'>Enabled</font>"]"
+	if (materials.mat_container)
+		l += "<A href='?src=[REF(src)];switch_screen=[RESEARCH_FABRICATOR_SCREEN_MATERIALS]'><B>Material Amount:</B> [materials.format_amount()]</A>"
+	else
+		l += "<font color='red'>No material storage connected, please contact the quartermaster.</font>"
+	l += "<A href='?src=[REF(src)];switch_screen=[RESEARCH_FABRICATOR_SCREEN_CHEMICALS]'><B>Chemical volume:</B> [reagents.total_volume] / [reagents.maximum_volume]</A>"
+	l += "<a href='?src=[REF(src)];sync_research=1'>Synchronize Research</a>"
+	l += "<a href='?src=[REF(src)];switch_screen=[RESEARCH_FABRICATOR_SCREEN_MAIN]'>Main Screen</a></div>[RDSCREEN_NOBREAK]"
+	return l
+
+/obj/machinery/rnd/production/proc/ui_screen_materials()
+	if (!materials.mat_container)
+		screen = RESEARCH_FABRICATOR_SCREEN_MAIN
+		return ui_screen_main()
+	var/list/l = list()
+	l += "<div class='statusDisplay'><h3>Material Storage:</h3>"
+	for(var/mat_id in materials.mat_container.materials)
+		var/datum/material/M = materials.mat_container.materials[mat_id]
+		l += "* [M.amount] of [M.name]: "
+		if(M.amount >= MINERAL_MATERIAL_AMOUNT) l += "<A href='?src=[REF(src)];ejectsheet=[M.id];eject_amt=1'>Eject</A> [RDSCREEN_NOBREAK]"
+		if(M.amount >= MINERAL_MATERIAL_AMOUNT*5) l += "<A href='?src=[REF(src)];ejectsheet=[M.id];eject_amt=5'>5x</A> [RDSCREEN_NOBREAK]"
+		if(M.amount >= MINERAL_MATERIAL_AMOUNT) l += "<A href='?src=[REF(src)];ejectsheet=[M.id];eject_amt=50'>All</A>[RDSCREEN_NOBREAK]"
+		l += ""
+	l += "</div>[RDSCREEN_NOBREAK]"
+	return l
+
+/obj/machinery/rnd/production/proc/ui_screen_chemicals()
+	var/list/l = list()
+	l += "<div class='statusDisplay'><A href='?src=[REF(src)];disposeall=1'>Disposal All Chemicals in Storage</A>"
+	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.type]'>Purge</A>"
+	l += "</div>"
+	return l
+
+/obj/machinery/rnd/production/proc/ui_screen_search()
+	var/list/l = list()
+	var/coeff = efficiency_coeff
+	l += "<h2>Search Results:</h2>"
+	l += "<form name='search' action='?src=[REF(src)]'>\
+	<input type='hidden' name='src' value='[REF(src)]'>\
+	<input type='hidden' name='search' value='to_search'>\
+	<input type='text' name='to_search'>\
+	<input type='submit' value='Search'>\
+	</form><HR>"
+	for(var/datum/design/D in matching_designs)
+		l += design_menu_entry(D, coeff)
+	l += "</div>"
+	return l
+
+/obj/machinery/rnd/production/proc/design_menu_entry(datum/design/D, coeff)
+	if(!istype(D))
+		return
+	if(!coeff)
+		coeff = efficiency_coeff
+	if(!efficient_with(D.build_path))
+		coeff = 1
+	var/list/l = list()
+	var/temp_material
+	var/c = 50
+	var/t
+	var/all_materials = D.materials + D.reagents_list
+	for(var/M in all_materials)
+		t = check_mat(D, M)
+		temp_material += " | "
+		if (t < 1)
+			temp_material += "<span class='bad'>[all_materials[M]/coeff] [CallMaterialName(M)]</span>"
+		else
+			temp_material += " [all_materials[M]/coeff] [CallMaterialName(M)]"
+		c = min(c,t)
+
+	if (c >= 1)
+		l += "<A href='?src=[REF(src)];build=[D.id];amount=1'>[D.name]</A>[RDSCREEN_NOBREAK]"
+		if(c >= 5)
+			l += "<A href='?src=[REF(src)];build=[D.id];amount=5'>x5</A>[RDSCREEN_NOBREAK]"
+		if(c >= 10)
+			l += "<A href='?src=[REF(src)];build=[D.id];amount=10'>x10</A>[RDSCREEN_NOBREAK]"
+		l += "[temp_material][RDSCREEN_NOBREAK]"
+	else
+		l += "<span class='linkOff'>[D.name]</span>[temp_material][RDSCREEN_NOBREAK]"
+	l += ""
+	return l
+
+/obj/machinery/rnd/production/Topic(raw, ls)
+	if(..())
+		return
+	add_fingerprint(usr)
+	usr.set_machine(src)
+	if(ls["switch_screen"])
+		screen = text2num(ls["switch_screen"])
+	if(ls["build"]) //Causes the Protolathe to build something.
+		if(busy)
+			say("Warning: Fabricators busy!")
+		else
+			user_try_print_id(ls["build"], ls["amount"])
+	if(ls["search"]) //Search for designs with name matching pattern
+		search(ls["to_search"])
+		screen = RESEARCH_FABRICATOR_SCREEN_SEARCH
+	if(ls["sync_research"])
+		update_research()
+		say("Synchronizing research with host technology database.")
+	if(ls["category"])
+		selected_category = ls["category"]
+	if(ls["dispose"])  //Causes the protolathe to dispose of a single reagent (all of it)
+		reagents.del_reagent(ls["dispose"])
+	if(ls["disposeall"]) //Causes the protolathe to dispose of all it's reagents.
+		reagents.clear_reagents()
+	if(ls["ejectsheet"]) //Causes the protolathe to eject a sheet of material
+		eject_sheets(ls["ejectsheet"], ls["eject_amt"])
+	updateUsrDialog()
+
+/obj/machinery/rnd/production/proc/eject_sheets(eject_sheet, eject_amt)
+	var/datum/component/material_container/mat_container = materials.mat_container
+	if (!mat_container)
+		say("No access to material storage, please contact the quartermaster.")
+		return 0
+	if (materials.on_hold())
+		say("Mineral access is on hold, please contact the quartermaster.")
+		return 0
+	var/count = mat_container.retrieve_sheets(text2num(eject_amt), eject_sheet, drop_location())
+	var/list/matlist = list()
+	matlist[eject_sheet] = MINERAL_MATERIAL_AMOUNT
+	materials.silo_log(src, "ejected", -count, "sheets", matlist)
+	return count
+
+/obj/machinery/rnd/production/proc/ui_screen_main()
+	var/list/l = list()
+	l += "<form name='search' action='?src=[REF(src)]'>\
+	<input type='hidden' name='src' value='[REF(src)]'>\
+	<input type='hidden' name='search' value='to_search'>\
+	<input type='hidden' name='type' value='proto'>\
+	<input type='text' name='to_search'>\
+	<input type='submit' value='Search'>\
+	</form><HR>"
+
+	l += list_categories(categories, RESEARCH_FABRICATOR_SCREEN_CATEGORYVIEW)
+
+	return l
+
+/obj/machinery/rnd/production/proc/ui_screen_category_view()
+	if(!selected_category)
+		return ui_screen_main()
+	var/list/l = list()
+	l += "<div class='statusDisplay'><h3>Browsing [selected_category]:</h3>"
+	var/coeff = efficiency_coeff
+	for(var/v in stored_research.researched_designs)
+		var/datum/design/D = SSresearch.techweb_design_by_id(v)
+		if(!(selected_category in D.category)|| !(D.build_type & allowed_buildtypes))
+			continue
+		if(!(isnull(allowed_department_flags) || (D.departmental_flags & allowed_department_flags)))
+			continue
+		l += design_menu_entry(D, coeff)
+	l += "</div>"
+	return l
+
+/obj/machinery/rnd/production/proc/list_categories(list/categories, menu_num)
+	if(!categories)
+		return
+
+	var/line_length = 1
+	var/list/l = "<table style='width:100%' align='center'><tr>"
+
+	for(var/C in categories)
+		if(line_length > 2)
+			l += "</tr><tr>"
+			line_length = 1
+
+		l += "<td><A href='?src=[REF(src)];category=[C];switch_screen=[menu_num]'>[C]</A></td>"
+		line_length++
+
+	l += "</tr></table></div>"
+	return l

code/modules/research/machinery/circuit_imprinter.dm

@@ -1,32 +1,32 @@
-/obj/machinery/rnd/production/circuit_imprinter
-	name = "circuit imprinter"
-	desc = "Manufactures circuit boards for the construction of machines."
-	icon_state = "circuit_imprinter"
-	circuit = /obj/item/circuitboard/machine/circuit_imprinter
-	categories = list(
-								"AI Modules",
-								"Computer Boards",
-								"Teleportation Machinery",
-								"Medical Machinery",
-								"Engineering Machinery",
-								"Exosuit Modules",
-								"Hydroponics Machinery",
-								"Subspace Telecomms",
-								"Research Machinery",
-								"Misc. Machinery",
-								"Computer Parts"
-								)
-	production_animation = "circuit_imprinter_ani"
-	allowed_buildtypes = IMPRINTER
-
-/obj/machinery/rnd/production/circuit_imprinter/disconnect_console()
-	linked_console.linked_imprinter = null
-	..()
-
-/obj/machinery/rnd/production/circuit_imprinter/calculate_efficiency()
-	. = ..()
-	var/total_rating = 0
-	for(var/obj/item/stock_parts/manipulator/M in component_parts)
-		total_rating += M.rating * 2			//There is only one.
-	total_rating = max(1, total_rating)
-	efficiency_coeff = total_rating
+/obj/machinery/rnd/production/circuit_imprinter
+	name = "circuit imprinter"
+	desc = "Manufactures circuit boards for the construction of machines."
+	icon_state = "circuit_imprinter"
+	circuit = /obj/item/circuitboard/machine/circuit_imprinter
+	categories = list(
+								"AI Modules",
+								"Computer Boards",
+								"Teleportation Machinery",
+								"Medical Machinery",
+								"Engineering Machinery",
+								"Exosuit Modules",
+								"Hydroponics Machinery",
+								"Subspace Telecomms",
+								"Research Machinery",
+								"Misc. Machinery",
+								"Computer Parts"
+								)
+	production_animation = "circuit_imprinter_ani"
+	allowed_buildtypes = IMPRINTER
+
+/obj/machinery/rnd/production/circuit_imprinter/disconnect_console()
+	linked_console.linked_imprinter = null
+	..()
+
+/obj/machinery/rnd/production/circuit_imprinter/calculate_efficiency()
+	. = ..()
+	var/total_rating = 0
+	for(var/obj/item/stock_parts/manipulator/M in component_parts)
+		total_rating += M.rating * 2			//There is only one.
+	total_rating = max(1, total_rating)
+	efficiency_coeff = total_rating

code/modules/research/machinery/departmental_circuit_imprinter.dm

@@ -1,13 +1,13 @@
-/obj/machinery/rnd/production/circuit_imprinter/department
-	name = "department circuit imprinter"
-	desc = "A special circuit imprinter with a built in interface meant for departmental usage, with built in ExoSync receivers allowing it to print designs researched that match its ROM-encoded department type."
-	icon_state = "circuit_imprinter"
-	circuit = /obj/item/circuitboard/machine/circuit_imprinter/department
-	requires_console = FALSE
-	consoleless_interface = TRUE
-
-/obj/machinery/rnd/production/circuit_imprinter/department/science
-	name = "department circuit imprinter (Science)"
-	circuit = /obj/item/circuitboard/machine/circuit_imprinter/department/science
-	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE
+/obj/machinery/rnd/production/circuit_imprinter/department
+	name = "department circuit imprinter"
+	desc = "A special circuit imprinter with a built in interface meant for departmental usage, with built in ExoSync receivers allowing it to print designs researched that match its ROM-encoded department type."
+	icon_state = "circuit_imprinter"
+	circuit = /obj/item/circuitboard/machine/circuit_imprinter/department
+	requires_console = FALSE
+	consoleless_interface = TRUE
+
+/obj/machinery/rnd/production/circuit_imprinter/department/science
+	name = "department circuit imprinter (Science)"
+	circuit = /obj/item/circuitboard/machine/circuit_imprinter/department/science
+	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE
 	department_tag = "Science"

code/modules/research/machinery/departmental_protolathe.dm

@@ -1,43 +1,43 @@
-/obj/machinery/rnd/production/protolathe/department
-	name = "department protolathe"
-	desc = "A special protolathe with a built in interface meant for departmental usage, with built in ExoSync receivers allowing it to print designs researched that match its ROM-encoded department type."
-	icon_state = "protolathe"
-	circuit = /obj/item/circuitboard/machine/protolathe/department
-	requires_console = FALSE
-	consoleless_interface = TRUE
-
-/obj/machinery/rnd/production/protolathe/department/engineering
-	name = "department protolathe (Engineering)"
-	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_ENGINEERING
-	department_tag = "Engineering"
-	circuit = /obj/item/circuitboard/machine/protolathe/department/engineering
-
-/obj/machinery/rnd/production/protolathe/department/service
-	name = "department protolathe (Service)"
-	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SERVICE
-	department_tag = "Service"
-	circuit = /obj/item/circuitboard/machine/protolathe/department/service
-
-/obj/machinery/rnd/production/protolathe/department/medical
-	name = "department protolathe (Medical)"
-	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_MEDICAL
-	department_tag = "Medical"
-	circuit = /obj/item/circuitboard/machine/protolathe/department/medical
-
-/obj/machinery/rnd/production/protolathe/department/cargo
-	name = "department protolathe (Cargo)"
-	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_CARGO
-	department_tag = "Cargo"
-	circuit = /obj/item/circuitboard/machine/protolathe/department/cargo
-
-/obj/machinery/rnd/production/protolathe/department/science
-	name = "department protolathe (Science)"
-	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE
-	department_tag = "Science"
-	circuit = /obj/item/circuitboard/machine/protolathe/department/science
-
-/obj/machinery/rnd/production/protolathe/department/security
-	name = "department protolathe (Security)"
-	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SECURITY
-	department_tag = "Security"
+/obj/machinery/rnd/production/protolathe/department
+	name = "department protolathe"
+	desc = "A special protolathe with a built in interface meant for departmental usage, with built in ExoSync receivers allowing it to print designs researched that match its ROM-encoded department type."
+	icon_state = "protolathe"
+	circuit = /obj/item/circuitboard/machine/protolathe/department
+	requires_console = FALSE
+	consoleless_interface = TRUE
+
+/obj/machinery/rnd/production/protolathe/department/engineering
+	name = "department protolathe (Engineering)"
+	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_ENGINEERING
+	department_tag = "Engineering"
+	circuit = /obj/item/circuitboard/machine/protolathe/department/engineering
+
+/obj/machinery/rnd/production/protolathe/department/service
+	name = "department protolathe (Service)"
+	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SERVICE
+	department_tag = "Service"
+	circuit = /obj/item/circuitboard/machine/protolathe/department/service
+
+/obj/machinery/rnd/production/protolathe/department/medical
+	name = "department protolathe (Medical)"
+	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_MEDICAL
+	department_tag = "Medical"
+	circuit = /obj/item/circuitboard/machine/protolathe/department/medical
+
+/obj/machinery/rnd/production/protolathe/department/cargo
+	name = "department protolathe (Cargo)"
+	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_CARGO
+	department_tag = "Cargo"
+	circuit = /obj/item/circuitboard/machine/protolathe/department/cargo
+
+/obj/machinery/rnd/production/protolathe/department/science
+	name = "department protolathe (Science)"
+	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE
+	department_tag = "Science"
+	circuit = /obj/item/circuitboard/machine/protolathe/department/science
+
+/obj/machinery/rnd/production/protolathe/department/security
+	name = "department protolathe (Security)"
+	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SECURITY
+	department_tag = "Security"
 	circuit = /obj/item/circuitboard/machine/protolathe/department/security

code/modules/research/machinery/departmental_techfab.dm

@@ -1,41 +1,41 @@
-/obj/machinery/rnd/production/techfab/department
-	name = "department techfab"
-	desc = "An advanced fabricator designed to print out the latest prototypes and circuits researched from Science. Contains hardware to sync to research networks. This one is department-locked and only possesses a limited set of decryption keys."
-	icon_state = "protolathe"
-	circuit = /obj/item/circuitboard/machine/techfab/department
-
-/obj/machinery/rnd/production/techfab/department/engineering
-	name = "department techfab (Engineering)"
-	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_ENGINEERING
-	department_tag = "Engineering"
-	circuit = /obj/item/circuitboard/machine/techfab/department/engineering
-
-/obj/machinery/rnd/production/techfab/department/service
-	name = "department techfab (Service)"
-	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SERVICE
-	department_tag = "Service"
-	circuit = /obj/item/circuitboard/machine/techfab/department/service
-
-/obj/machinery/rnd/production/techfab/department/medical
-	name = "department techfab (Medical)"
-	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_MEDICAL
-	department_tag = "Medical"
-	circuit = /obj/item/circuitboard/machine/techfab/department/medical
-
-/obj/machinery/rnd/production/techfab/department/cargo
-	name = "department techfab (Cargo)"
-	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_CARGO
-	department_tag = "Cargo"
-	circuit = /obj/item/circuitboard/machine/techfab/department/cargo
-
-/obj/machinery/rnd/production/techfab/department/science
-	name = "department techfab (Science)"
-	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE
-	department_tag = "Science"
-	circuit = /obj/item/circuitboard/machine/techfab/department/science
-
-/obj/machinery/rnd/production/techfab/department/security
-	name = "department techfab (Security)"
-	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SECURITY
-	department_tag = "Security"
+/obj/machinery/rnd/production/techfab/department
+	name = "department techfab"
+	desc = "An advanced fabricator designed to print out the latest prototypes and circuits researched from Science. Contains hardware to sync to research networks. This one is department-locked and only possesses a limited set of decryption keys."
+	icon_state = "protolathe"
+	circuit = /obj/item/circuitboard/machine/techfab/department
+
+/obj/machinery/rnd/production/techfab/department/engineering
+	name = "department techfab (Engineering)"
+	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_ENGINEERING
+	department_tag = "Engineering"
+	circuit = /obj/item/circuitboard/machine/techfab/department/engineering
+
+/obj/machinery/rnd/production/techfab/department/service
+	name = "department techfab (Service)"
+	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SERVICE
+	department_tag = "Service"
+	circuit = /obj/item/circuitboard/machine/techfab/department/service
+
+/obj/machinery/rnd/production/techfab/department/medical
+	name = "department techfab (Medical)"
+	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_MEDICAL
+	department_tag = "Medical"
+	circuit = /obj/item/circuitboard/machine/techfab/department/medical
+
+/obj/machinery/rnd/production/techfab/department/cargo
+	name = "department techfab (Cargo)"
+	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_CARGO
+	department_tag = "Cargo"
+	circuit = /obj/item/circuitboard/machine/techfab/department/cargo
+
+/obj/machinery/rnd/production/techfab/department/science
+	name = "department techfab (Science)"
+	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE
+	department_tag = "Science"
+	circuit = /obj/item/circuitboard/machine/techfab/department/science
+
+/obj/machinery/rnd/production/techfab/department/security
+	name = "department techfab (Security)"
+	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SECURITY
+	department_tag = "Security"
 	circuit = /obj/item/circuitboard/machine/techfab/department/security

code/modules/research/machinery/protolathe.dm

@@ -1,24 +1,24 @@
-/obj/machinery/rnd/production/protolathe
-	name = "protolathe"
-	desc = "Converts raw materials into useful objects."
-	icon_state = "protolathe"
-	circuit = /obj/item/circuitboard/machine/protolathe
-	categories = list(
-								"Power Designs",
-								"Medical Designs",
-								"Bluespace Designs",
-								"Stock Parts",
-								"Equipment",
-								"Mining Designs",
-								"Electronics",
-								"Weapons",
-								"Ammo",
-								"Firing Pins",
-								"Computer Parts"
-								)
-	production_animation = "protolathe_n"
-	allowed_buildtypes = PROTOLATHE
-
-/obj/machinery/rnd/production/protolathe/disconnect_console()
-	linked_console.linked_lathe = null
+/obj/machinery/rnd/production/protolathe
+	name = "protolathe"
+	desc = "Converts raw materials into useful objects."
+	icon_state = "protolathe"
+	circuit = /obj/item/circuitboard/machine/protolathe
+	categories = list(
+								"Power Designs",
+								"Medical Designs",
+								"Bluespace Designs",
+								"Stock Parts",
+								"Equipment",
+								"Mining Designs",
+								"Electronics",
+								"Weapons",
+								"Ammo",
+								"Firing Pins",
+								"Computer Parts"
+								)
+	production_animation = "protolathe_n"
+	allowed_buildtypes = PROTOLATHE
+
+/obj/machinery/rnd/production/protolathe/disconnect_console()
+	linked_console.linked_lathe = null
 	..()

code/modules/research/machinery/techfab.dm

@@ -1,34 +1,34 @@
-/obj/machinery/rnd/production/techfab
-	name = "technology fabricator"
-	desc = "Produces researched prototypes with raw materials and energy."
-	icon_state = "protolathe"
-	circuit = /obj/item/circuitboard/machine/techfab
-	categories = list(
-								"Power Designs",
-								"Medical Designs",
-								"Bluespace Designs",
-								"Stock Parts",
-								"Equipment",
-								"Mining Designs",
-								"Electronics",
-								"Weapons",
-								"Ammo",
-								"Firing Pins",
-								"Computer Parts",
-								"AI Modules",
-								"Computer Boards",
-								"Teleportation Machinery",
-								"Medical Machinery",
-								"Engineering Machinery",
-								"Exosuit Modules",
-								"Hydroponics Machinery",
-								"Subspace Telecomms",
-								"Research Machinery",
-								"Misc. Machinery",
-								"Computer Parts"
-								)
-	console_link = FALSE
-	production_animation = "protolathe_n"
-	requires_console = FALSE
-	consoleless_interface = TRUE
+/obj/machinery/rnd/production/techfab
+	name = "technology fabricator"
+	desc = "Produces researched prototypes with raw materials and energy."
+	icon_state = "protolathe"
+	circuit = /obj/item/circuitboard/machine/techfab
+	categories = list(
+								"Power Designs",
+								"Medical Designs",
+								"Bluespace Designs",
+								"Stock Parts",
+								"Equipment",
+								"Mining Designs",
+								"Electronics",
+								"Weapons",
+								"Ammo",
+								"Firing Pins",
+								"Computer Parts",
+								"AI Modules",
+								"Computer Boards",
+								"Teleportation Machinery",
+								"Medical Machinery",
+								"Engineering Machinery",
+								"Exosuit Modules",
+								"Hydroponics Machinery",
+								"Subspace Telecomms",
+								"Research Machinery",
+								"Misc. Machinery",
+								"Computer Parts"
+								)
+	console_link = FALSE
+	production_animation = "protolathe_n"
+	requires_console = FALSE
+	consoleless_interface = TRUE
 	allowed_buildtypes = PROTOLATHE | IMPRINTER

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/rdmachines.dm

@@ -1,106 +1,106 @@
-
-//All devices that link into the R&D console fall into thise type for easy identification and some shared procs.
-
-
-/obj/machinery/rnd
-	name = "R&D Device"
-	icon = 'icons/obj/machines/research.dmi'
-	density = TRUE
-	use_power = IDLE_POWER_USE
-	var/busy = FALSE
-	var/hacked = FALSE
-	var/console_link = TRUE		//allow console link.
-	var/requires_console = TRUE
-	var/disabled = FALSE
-	var/obj/machinery/computer/rdconsole/linked_console
-	var/obj/item/loaded_item = null //the item loaded inside the machine (currently only used by experimentor and destructive analyzer)
-
-/obj/machinery/rnd/proc/reset_busy()
-	busy = FALSE
-
-/obj/machinery/rnd/Initialize()
-	. = ..()
-	wires = new /datum/wires/rnd(src)
-
-/obj/machinery/rnd/Destroy()
-	QDEL_NULL(wires)
-	return ..()
-
-/obj/machinery/rnd/proc/shock(mob/user, prb)
-	if(stat & (BROKEN|NOPOWER))		// unpowered, no shock
-		return FALSE
-	if(!prob(prb))
-		return FALSE
-	do_sparks(5, TRUE, src)
-	if (electrocute_mob(user, get_area(src), src, 0.7, TRUE))
-		return TRUE
-	else
-		return FALSE
-
-/obj/machinery/rnd/attackby(obj/item/O, mob/user, params)
-	if (default_deconstruction_screwdriver(user, "[initial(icon_state)]_t", initial(icon_state), O))
-		if(linked_console)
-			disconnect_console()
-		return
-	if(default_deconstruction_crowbar(O))
-		return
-	if(panel_open && is_wire_tool(O))
-		wires.interact(user)
-		return TRUE
-	if(is_refillable() && O.is_drainable())
-		return FALSE //inserting reagents into the machine
-	if(Insert_Item(O, user))
-		return TRUE
-	else
-		return ..()
-
-//to disconnect the machine from the r&d console it's linked to
-/obj/machinery/rnd/proc/disconnect_console()
-	linked_console = null
-
-//proc used to handle inserting items or reagents into rnd machines
-/obj/machinery/rnd/proc/Insert_Item(obj/item/I, mob/user)
-	return
-
-//whether the machine can have an item inserted in its current state.
-/obj/machinery/rnd/proc/is_insertion_ready(mob/user)
-	if(panel_open)
-		to_chat(user, "<span class='warning'>You can't load [src] while it's opened!</span>")
-		return FALSE
-	if(disabled)
-		to_chat(user, "<span class='warning'>The insertion belts of [src] won't engage!</span>")
-		return FALSE
-	if(requires_console && !linked_console)
-		to_chat(user, "<span class='warning'>[src] must be linked to an R&D console first!</span>")
-		return FALSE
-	if(busy)
-		to_chat(user, "<span class='warning'>[src] is busy right now.</span>")
-		return FALSE
-	if(stat & BROKEN)
-		to_chat(user, "<span class='warning'>[src] is broken.</span>")
-		return FALSE
-	if(stat & NOPOWER)
-		to_chat(user, "<span class='warning'>[src] has no power.</span>")
-		return FALSE
-	if(loaded_item)
-		to_chat(user, "<span class='warning'>[src] is already loaded.</span>")
-		return FALSE
-	return TRUE
-
-//we eject the loaded item when deconstructing the machine
-/obj/machinery/rnd/on_deconstruction()
-	if(loaded_item)
-		loaded_item.forceMove(loc)
-	..()
-
-/obj/machinery/rnd/proc/AfterMaterialInsert(type_inserted, id_inserted, amount_inserted)
-	var/stack_name
-	if(ispath(type_inserted, /obj/item/stack/ore/bluespace_crystal))
-		stack_name = "bluespace"
-		use_power(MINERAL_MATERIAL_AMOUNT / 10)
-	else
-		var/obj/item/stack/S = type_inserted
-		stack_name = initial(S.name)
-		use_power(min(1000, (amount_inserted / 100)))
-	add_overlay("protolathe_[stack_name]")
-	addtimer(CALLBACK(src, /atom/proc/cut_overlay, "protolathe_[stack_name]"), 10)
+
+//All devices that link into the R&D console fall into thise type for easy identification and some shared procs.
+
+
+/obj/machinery/rnd
+	name = "R&D Device"
+	icon = 'icons/obj/machines/research.dmi'
+	density = TRUE
+	use_power = IDLE_POWER_USE
+	var/busy = FALSE
+	var/hacked = FALSE
+	var/console_link = TRUE		//allow console link.
+	var/requires_console = TRUE
+	var/disabled = FALSE
+	var/obj/machinery/computer/rdconsole/linked_console
+	var/obj/item/loaded_item = null //the item loaded inside the machine (currently only used by experimentor and destructive analyzer)
+
+/obj/machinery/rnd/proc/reset_busy()
+	busy = FALSE
+
+/obj/machinery/rnd/Initialize()
+	. = ..()
+	wires = new /datum/wires/rnd(src)
+
+/obj/machinery/rnd/Destroy()
+	QDEL_NULL(wires)
+	return ..()
+
+/obj/machinery/rnd/proc/shock(mob/user, prb)
+	if(stat & (BROKEN|NOPOWER))		// unpowered, no shock
+		return FALSE
+	if(!prob(prb))
+		return FALSE
+	do_sparks(5, TRUE, src)
+	if (electrocute_mob(user, get_area(src), src, 0.7, TRUE))
+		return TRUE
+	else
+		return FALSE
+
+/obj/machinery/rnd/attackby(obj/item/O, mob/user, params)
+	if (default_deconstruction_screwdriver(user, "[initial(icon_state)]_t", initial(icon_state), O))
+		if(linked_console)
+			disconnect_console()
+		return
+	if(default_deconstruction_crowbar(O))
+		return
+	if(panel_open && is_wire_tool(O))
+		wires.interact(user)
+		return TRUE
+	if(is_refillable() && O.is_drainable())
+		return FALSE //inserting reagents into the machine
+	if(Insert_Item(O, user))
+		return TRUE
+	else
+		return ..()
+
+//to disconnect the machine from the r&d console it's linked to
+/obj/machinery/rnd/proc/disconnect_console()
+	linked_console = null
+
+//proc used to handle inserting items or reagents into rnd machines
+/obj/machinery/rnd/proc/Insert_Item(obj/item/I, mob/user)
+	return
+
+//whether the machine can have an item inserted in its current state.
+/obj/machinery/rnd/proc/is_insertion_ready(mob/user)
+	if(panel_open)
+		to_chat(user, "<span class='warning'>You can't load [src] while it's opened!</span>")
+		return FALSE
+	if(disabled)
+		to_chat(user, "<span class='warning'>The insertion belts of [src] won't engage!</span>")
+		return FALSE
+	if(requires_console && !linked_console)
+		to_chat(user, "<span class='warning'>[src] must be linked to an R&D console first!</span>")
+		return FALSE
+	if(busy)
+		to_chat(user, "<span class='warning'>[src] is busy right now.</span>")
+		return FALSE
+	if(stat & BROKEN)
+		to_chat(user, "<span class='warning'>[src] is broken.</span>")
+		return FALSE
+	if(stat & NOPOWER)
+		to_chat(user, "<span class='warning'>[src] has no power.</span>")
+		return FALSE
+	if(loaded_item)
+		to_chat(user, "<span class='warning'>[src] is already loaded.</span>")
+		return FALSE
+	return TRUE
+
+//we eject the loaded item when deconstructing the machine
+/obj/machinery/rnd/on_deconstruction()
+	if(loaded_item)
+		loaded_item.forceMove(loc)
+	..()
+
+/obj/machinery/rnd/proc/AfterMaterialInsert(type_inserted, id_inserted, amount_inserted)
+	var/stack_name
+	if(ispath(type_inserted, /obj/item/stack/ore/bluespace_crystal))
+		stack_name = "bluespace"
+		use_power(MINERAL_MATERIAL_AMOUNT / 10)
+	else
+		var/obj/item/stack/S = type_inserted
+		stack_name = initial(S.name)
+		use_power(min(1000, (amount_inserted / 100)))
+	add_overlay("protolathe_[stack_name]")
+	addtimer(CALLBACK(src, /atom/proc/cut_overlay, "protolathe_[stack_name]"), 10)

code/modules/research/research_disk.dm

@@ -1,40 +1,40 @@
-
-/obj/item/disk/tech_disk
-	name = "technology disk"
-	desc = "A disk for storing technology data for further research."
-	icon_state = "datadisk0"
-	materials = list(MAT_METAL=300, MAT_GLASS=100)
-	var/datum/techweb/stored_research
-
-/obj/item/disk/tech_disk/Initialize()
-	. = ..()
-	pixel_x = rand(-5, 5)
-	pixel_y = rand(-5, 5)
-	stored_research = new /datum/techweb
-
-/obj/item/disk/tech_disk/debug
-	name = "\improper CentCom technology disk"
-	desc = "A debug item for research"
-	materials = list()
-
-/obj/item/disk/tech_disk/debug/Initialize()
-	. = ..()
-	stored_research = new /datum/techweb/admin
-
-/obj/item/disk/tech_disk/illegal
-	name = "Illegal technology disk"
-	desc = "A technology disk containing schematics for syndicate inspired equipment."
-	materials = list()
-
-/obj/item/disk/tech_disk/illegal/Initialize()
-	. = ..()
-	stored_research = new /datum/techweb/syndicate
-
-/obj/item/disk/tech_disk/abductor
-	name = "Gray technology disk"
-	desc = "You feel like it's not Gray because of its color."
-	materials = list()
-
-/obj/item/disk/tech_disk/abductor/Initialize()
-	. = ..()
-	stored_research = new /datum/techweb/abductor
+
+/obj/item/disk/tech_disk
+	name = "technology disk"
+	desc = "A disk for storing technology data for further research."
+	icon_state = "datadisk0"
+	materials = list(MAT_METAL=300, MAT_GLASS=100)
+	var/datum/techweb/stored_research
+
+/obj/item/disk/tech_disk/Initialize()
+	. = ..()
+	pixel_x = rand(-5, 5)
+	pixel_y = rand(-5, 5)
+	stored_research = new /datum/techweb
+
+/obj/item/disk/tech_disk/debug
+	name = "\improper CentCom technology disk"
+	desc = "A debug item for research"
+	materials = list()
+
+/obj/item/disk/tech_disk/debug/Initialize()
+	. = ..()
+	stored_research = new /datum/techweb/admin
+
+/obj/item/disk/tech_disk/illegal
+	name = "Illegal technology disk"
+	desc = "A technology disk containing schematics for syndicate inspired equipment."
+	materials = list()
+
+/obj/item/disk/tech_disk/illegal/Initialize()
+	. = ..()
+	stored_research = new /datum/techweb/syndicate
+
+/obj/item/disk/tech_disk/abductor
+	name = "Gray technology disk"
+	desc = "You feel like it's not Gray because of its color."
+	materials = list()
+
+/obj/item/disk/tech_disk/abductor/Initialize()
+	. = ..()
+	stored_research = new /datum/techweb/abductor

code/modules/research/techweb/__techweb_helpers.dm

@@ -1,34 +1,34 @@
-/proc/count_unique_techweb_nodes()
-	var/static/list/L = typesof(/datum/techweb_node)
-	return L.len
-
-/proc/count_unique_techweb_designs()
-	var/static/list/L = typesof(/datum/design)
-	return L.len
-
-/proc/node_boost_error(id, message)
-	WARNING("Invalid boost information for node \[[id]\]: [message]")
-	SSresearch.invalid_node_boost[id] = message
-
-/proc/techweb_item_boost_check(obj/item/I)			//Returns an associative list of techweb node datums with values of the boost it gives.	var/list/returned = list()
-	if(SSresearch.techweb_boost_items[I.type])
-		return SSresearch.techweb_boost_items[I.type]		//It should already be formatted in node datum = list(point type = value)
-
-/proc/techweb_item_point_check(obj/item/I)
-	if(SSresearch.techweb_point_items[I.type])
-		return SSresearch.techweb_point_items[I.type]
-
-/proc/techweb_point_display_generic(pointlist)
-	var/list/ret = list()
-	for(var/i in pointlist)
-		if(SSresearch.point_types[i])
-			ret += "[SSresearch.point_types[i]]: [pointlist[i]]"
-		else
-			ret += "ERRORED POINT TYPE: [pointlist[i]]"
-	return ret.Join("<BR>")
-
-/proc/techweb_point_display_rdconsole(pointlist, last_pointlist)
-	var/list/ret = list()
-	for(var/i in pointlist)
-		ret += "[SSresearch.point_types[i] || "ERRORED POINT TYPE"]: [pointlist[i]] (+[(last_pointlist[i]) * ((SSresearch.flags & SS_TICKER)? (600 / (world.tick_lag * SSresearch.wait)) : (600 / SSresearch.wait))]/ minute)"
-	return ret.Join("<BR>")
+/proc/count_unique_techweb_nodes()
+	var/static/list/L = typesof(/datum/techweb_node)
+	return L.len
+
+/proc/count_unique_techweb_designs()
+	var/static/list/L = typesof(/datum/design)
+	return L.len
+
+/proc/node_boost_error(id, message)
+	WARNING("Invalid boost information for node \[[id]\]: [message]")
+	SSresearch.invalid_node_boost[id] = message
+
+/proc/techweb_item_boost_check(obj/item/I)			//Returns an associative list of techweb node datums with values of the boost it gives.	var/list/returned = list()
+	if(SSresearch.techweb_boost_items[I.type])
+		return SSresearch.techweb_boost_items[I.type]		//It should already be formatted in node datum = list(point type = value)
+
+/proc/techweb_item_point_check(obj/item/I)
+	if(SSresearch.techweb_point_items[I.type])
+		return SSresearch.techweb_point_items[I.type]
+
+/proc/techweb_point_display_generic(pointlist)
+	var/list/ret = list()
+	for(var/i in pointlist)
+		if(SSresearch.point_types[i])
+			ret += "[SSresearch.point_types[i]]: [pointlist[i]]"
+		else
+			ret += "ERRORED POINT TYPE: [pointlist[i]]"
+	return ret.Join("<BR>")
+
+/proc/techweb_point_display_rdconsole(pointlist, last_pointlist)
+	var/list/ret = list()
+	for(var/i in pointlist)
+		ret += "[SSresearch.point_types[i] || "ERRORED POINT TYPE"]: [pointlist[i]] (+[(last_pointlist[i]) * ((SSresearch.flags & SS_TICKER)? (600 / (world.tick_lag * SSresearch.wait)) : (600 / SSresearch.wait))]/ minute)"
+	return ret.Join("<BR>")

code/modules/research/techweb/_techweb.dm

@@ -1,389 +1,389 @@
-
-//Used \n[\s]*origin_tech[\s]*=[\s]*"[\S]+" to delete all origin techs.
-//Or \n[\s]*origin_tech[\s]*=[\s]list\([A-Z_\s=0-9,]*\)
-//Used \n[\s]*req_tech[\s]*=[\s]*list\(["a-z\s=0-9,]*\) to delete all req_techs.
-
-//Techweb datums are meant to store unlocked research, being able to be stored on research consoles, servers, and disks. They are NOT global.
-/datum/techweb
-	var/list/researched_nodes = list()		//Already unlocked and all designs are now available. Assoc list, id = TRUE
-	var/list/visible_nodes = list()			//Visible nodes, doesn't mean it can be researched. Assoc list, id = TRUE
-	var/list/available_nodes = list()		//Nodes that can immediately be researched, all reqs met. assoc list, id = TRUE
-	var/list/researched_designs = list()	//Designs that are available for use. Assoc list, id = TRUE
-	var/list/custom_designs = list()		//Custom inserted designs like from disks that should survive recalculation.
-	var/list/boosted_nodes = list()			//Already boosted nodes that can't be boosted again. node id = path of boost object.
-	var/list/hidden_nodes = list()			//Hidden nodes. id = TRUE. Used for unhiding nodes when requirements are met by removing the entry of the node.
-	var/list/deconstructed_items = list()						//items already deconstructed for a generic point boost. path = list(point_type = points)
-	var/list/research_points = list()										//Available research points. type = number
-	var/list/obj/machinery/computer/rdconsole/consoles_accessing = list()
-	var/id = "generic"
-	var/list/research_logs = list()								//IC logs.
-	var/largest_bomb_value = 0
-	var/organization = "Third-Party"							//Organization name, used for display.
-	var/list/last_bitcoins = list()								//Current per-second production, used for display only.
-	var/list/tiers = list()										//Assoc list, id = number, 1 is available, 2 is all reqs are 1, so on
-
-/datum/techweb/New()
-	for(var/i in SSresearch.techweb_nodes_starting)
-		var/datum/techweb_node/DN = SSresearch.techweb_node_by_id(i)
-		research_node(DN, TRUE, FALSE)
-	hidden_nodes = SSresearch.techweb_nodes_hidden.Copy()
-	return ..()
-
-/datum/techweb/admin
-	id = "ADMIN"
-	organization = "CentCom"
-
-/datum/techweb/admin/New()	//All unlocked.
-	. = ..()
-	for(var/i in SSresearch.techweb_nodes)
-		var/datum/techweb_node/TN = SSresearch.techweb_nodes[i]
-		research_node(TN, TRUE)
-	for(var/i in SSresearch.point_types)
-		research_points[i] = INFINITY
-	hidden_nodes = list()
-
-/datum/techweb/syndicate
-	id = "SYNDICATE"
-	organization = "Syndicate"
-
-/datum/techweb/syndicate/New()
-	var/datum/techweb_node/syndicate_basic/Node = new()
-	research_node(Node, TRUE)
-
-/datum/techweb/abductor
-	id = "ABDUCTOR"
-	organization = "Aliens"
-
-/datum/techweb/abductor/New()
-	var/datum/techweb_node/alientech/Node = new()
-	research_node(Node, TRUE)
-
-/datum/techweb/science	//Global science techweb for RND consoles.
-	id = "SCIENCE"
-	organization = "Nanotrasen"
-
-/datum/techweb/Destroy()
-	researched_nodes = null
-	researched_designs = null
-	available_nodes = null
-	visible_nodes = null
-	custom_designs = null
-	SSresearch.techwebs -= src
-	return ..()
-
-/datum/techweb/proc/recalculate_nodes(recalculate_designs = FALSE, wipe_custom_designs = FALSE)
-	var/list/datum/techweb_node/processing = list()
-	for(var/id in researched_nodes)
-		processing[id] = TRUE
-	for(var/id in visible_nodes)
-		processing[id] = TRUE
-	for(var/id in available_nodes)
-		processing[id] = TRUE
-	if(recalculate_designs)
-		researched_designs = custom_designs.Copy()
-		if(wipe_custom_designs)
-			custom_designs = list()
-	for(var/id in processing)
-		update_node_status(SSresearch.techweb_node_by_id(id), FALSE)
-		CHECK_TICK
-	for(var/v in consoles_accessing)
-		var/obj/machinery/computer/rdconsole/V = v
-		V.rescan_views()
-		V.updateUsrDialog()
-
-/datum/techweb/proc/add_point_list(list/pointlist)
-	for(var/i in pointlist)
-		if(SSresearch.point_types[i] && pointlist[i] > 0)
-			research_points[i] += pointlist[i]
-
-/datum/techweb/proc/add_points_all(amount)
-	var/list/l = SSresearch.point_types.Copy()
-	for(var/i in l)
-		l[i] = amount
-	add_point_list(l)
-
-/datum/techweb/proc/remove_point_list(list/pointlist)
-	for(var/i in pointlist)
-		if(SSresearch.point_types[i] && pointlist[i] > 0)
-			research_points[i] = max(0, research_points[i] - pointlist[i])
-
-/datum/techweb/proc/remove_points_all(amount)
-	var/list/l = SSresearch.point_types.Copy()
-	for(var/i in l)
-		l[i] = amount
-	remove_point_list(l)
-
-/datum/techweb/proc/modify_point_list(list/pointlist)
-	for(var/i in pointlist)
-		if(SSresearch.point_types[i] && pointlist[i] != 0)
-			research_points[i] = max(0, research_points[i] + pointlist[i])
-
-/datum/techweb/proc/modify_points_all(amount)
-	var/list/l = SSresearch.point_types.Copy()
-	for(var/i in l)
-		l[i] = amount
-	modify_point_list(l)
-
-/datum/techweb/proc/copy_research_to(datum/techweb/receiver, unlock_hidden = TRUE)				//Adds any missing research to theirs.
-	for(var/i in researched_nodes)
-		CHECK_TICK
-		receiver.research_node_id(i, TRUE, FALSE)
-	for(var/i in researched_designs)
-		CHECK_TICK
-		receiver.add_design_by_id(i)
-	if(unlock_hidden)
-		for(var/i in receiver.hidden_nodes)
-			CHECK_TICK
-			if(!hidden_nodes[i])
-				receiver.hidden_nodes -= i		//We can see it so let them see it too.
-	receiver.recalculate_nodes()
-
-/datum/techweb/proc/copy()
-	var/datum/techweb/returned = new()
-	returned.researched_nodes = researched_nodes.Copy()
-	returned.visible_nodes = visible_nodes.Copy()
-	returned.available_nodes = available_nodes.Copy()
-	returned.researched_designs = researched_designs.Copy()
-	returned.hidden_nodes = hidden_nodes.Copy()
-	return returned
-
-/datum/techweb/proc/get_visible_nodes()			//The way this is set up is shit but whatever.
-	return visible_nodes - hidden_nodes
-
-/datum/techweb/proc/get_available_nodes()
-	return available_nodes - hidden_nodes
-
-/datum/techweb/proc/get_researched_nodes()
-	return researched_nodes - hidden_nodes
-
-/datum/techweb/proc/add_point_type(type, amount)
-	if(!SSresearch.point_types[type] || (amount <= 0))
-		return FALSE
-	research_points[type] += amount
-	return TRUE
-
-/datum/techweb/proc/modify_point_type(type, amount)
-	if(!SSresearch.point_types[type])
-		return FALSE
-	research_points[type] = max(0, research_points[type] + amount)
-	return TRUE
-
-/datum/techweb/proc/remove_point_type(type, amount)
-	if(!SSresearch.point_types[type] || (amount <= 0))
-		return FALSE
-	research_points[type] = max(0, research_points[type] - amount)
-	return TRUE
-
-/datum/techweb/proc/add_design_by_id(id, custom = FALSE)
-	return add_design(SSresearch.techweb_design_by_id(id), custom)
-
-/datum/techweb/proc/add_design(datum/design/design, custom = FALSE)
-	if(!istype(design))
-		return FALSE
-	researched_designs[design.id] = design
-	researched_designs[design.id] = TRUE
-	if(custom)
-		custom_designs[design.id] = TRUE
-	return TRUE
-
-/datum/techweb/proc/remove_design_by_id(id, custom = FALSE)
-	return remove_design(SSresearch.techweb_design_by_id(id), custom)
-
-/datum/techweb/proc/remove_design(datum/design/design, custom = FALSE)
-	if(!istype(design))
-		return FALSE
-	if(custom_designs[design.id] && !custom)
-		return FALSE
-	custom_designs -= design.id
-	researched_designs -= design.id
-	return TRUE
-
-/datum/techweb/proc/can_afford(list/pointlist)
-	for(var/i in pointlist)
-		if(research_points[i] < pointlist[i])
-			return FALSE
-	return TRUE
-
-/datum/techweb/proc/printout_points()
-	return techweb_point_display_generic(research_points)
-
-/datum/techweb/proc/research_node_id(id, force, auto_update_points)
-	return research_node(SSresearch.techweb_node_by_id(id), force, auto_update_points)
-
-/datum/techweb/proc/research_node(datum/techweb_node/node, force = FALSE, auto_adjust_cost = TRUE)
-	if(!istype(node))
-		return FALSE
-	update_node_status(node)
-	if(!force)
-		if(!available_nodes[node.id] || (auto_adjust_cost && (!can_afford(node.get_price(src)))))
-			return FALSE
-	if(auto_adjust_cost)
-		remove_point_list(node.get_price(src))
-	researched_nodes[node.id] = TRUE				//Add to our researched list
-	for(var/id in node.unlock_ids)
-		visible_nodes[id] = TRUE
-		update_node_status(SSresearch.techweb_node_by_id(id))
-	for(var/id in node.design_ids)
-		add_design_by_id(id)
-	update_node_status(node)
-	return TRUE
-
-/datum/techweb/proc/unresearch_node_id(id)
-	return unresearch_node(SSresearch.techweb_node_by_id(id))
-
-/datum/techweb/proc/unresearch_node(datum/techweb_node/node)
-	if(!istype(node))
-		return FALSE
-	researched_nodes -= node.id
-	recalculate_nodes(TRUE)				//Fully rebuild the tree.
-
-/datum/techweb/proc/boost_with_path(datum/techweb_node/N, itempath)
-	if(!istype(N) || !ispath(itempath))
-		return FALSE
-	LAZYINITLIST(boosted_nodes[N.id])
-	for(var/i in N.boost_item_paths[itempath])
-		boosted_nodes[N.id][i] = max(boosted_nodes[N.id][i], N.boost_item_paths[itempath][i])
-	if(N.autounlock_by_boost)
-		hidden_nodes -= N.id
-	update_node_status(N)
-	return TRUE
-
-/datum/techweb/proc/update_tiers(datum/techweb_node/base)
-	var/list/current = list(base)
-	while (current.len)
-		var/list/next = list()
-		for (var/node_ in current)
-			var/datum/techweb_node/node = node_
-			var/tier = 0
-			if (!researched_nodes[node.id])  // researched is tier 0
-				for (var/id in node.prereq_ids)
-					var/prereq_tier = tiers[id]
-					tier = max(tier, prereq_tier + 1)
-
-			if (tier != tiers[node.id])
-				tiers[node.id] = tier
-				for (var/id in node.unlock_ids)
-					next += SSresearch.techweb_node_by_id(id)
-		current = next
-
-/datum/techweb/proc/update_node_status(datum/techweb_node/node, autoupdate_consoles = TRUE)
-	var/researched = FALSE
-	var/available = FALSE
-	var/visible = FALSE
-	if(researched_nodes[node.id])
-		researched = TRUE
-	var/needed = node.prereq_ids.len
-	for(var/id in node.prereq_ids)
-		if(researched_nodes[id])
-			visible = TRUE
-			needed--
-	if(!needed)
-		available = TRUE
-	researched_nodes -= node.id
-	available_nodes -= node.id
-	visible_nodes -= node.id
-	if(hidden_nodes[node.id])	//Hidden.
-		return
-	if(researched)
-		researched_nodes[node.id] = TRUE
-		for(var/id in node.design_ids)
-			add_design(SSresearch.techweb_design_by_id(id))
-	else
-		if(available)
-			available_nodes[node.id] = TRUE
-		else
-			if(visible)
-				visible_nodes[node.id] = TRUE
-	update_tiers(node)
-	if(autoupdate_consoles)
-		for(var/v in consoles_accessing)
-			var/obj/machinery/computer/rdconsole/V = v
-			V.rescan_views()
-			V.updateUsrDialog()
-
-//Laggy procs to do specific checks, just in case. Don't use them if you can just use the vars that already store all this!
-/datum/techweb/proc/designHasReqs(datum/design/D)
-	for(var/i in researched_nodes)
-		var/datum/techweb_node/N = SSresearch.techweb_node_by_id(i)
-		if(N.design_ids[D.id])
-			return TRUE
-	return FALSE
-
-/datum/techweb/proc/isDesignResearched(datum/design/D)
-	return isDesignResearchedID(D.id)
-
-/datum/techweb/proc/isDesignResearchedID(id)
-	return researched_designs[id]? SSresearch.techweb_design_by_id(id) : FALSE
-
-/datum/techweb/proc/isNodeResearched(datum/techweb_node/N)
-	return isNodeResearchedID(N.id)
-
-/datum/techweb/proc/isNodeResearchedID(id)
-	return researched_nodes[id]? SSresearch.techweb_node_by_id(id) : FALSE
-
-/datum/techweb/proc/isNodeVisible(datum/techweb_node/N)
-	return isNodeResearchedID(N.id)
-
-/datum/techweb/proc/isNodeVisibleID(id)
-	return visible_nodes[id]? SSresearch.techweb_node_by_id(id) : FALSE
-
-/datum/techweb/proc/isNodeAvailable(datum/techweb_node/N)
-	return isNodeAvailableID(N.id)
-
-/datum/techweb/proc/isNodeAvailableID(id)
-	return available_nodes[id]? SSresearch.techweb_node_by_id(id) : FALSE
-
-/datum/techweb/specialized
-	var/allowed_buildtypes = ALL
-
-/datum/techweb/specialized/add_design(datum/design/D)
-	if(!(D.build_type & allowed_buildtypes))
-		return FALSE
-	return ..()
-
-/datum/techweb/specialized/autounlocking
-	var/design_autounlock_buildtypes = NONE
-	var/design_autounlock_categories = list("initial")		//if a design has a buildtype that matches the abovea and either has a category in this or this is null, unlock it.
-	var/node_autounlock_ids = list()				//autounlock nodes of this type.
-
-/datum/techweb/specialized/autounlocking/New()
-	..()
-	autounlock()
-
-/datum/techweb/specialized/autounlocking/proc/autounlock()
-	for(var/id in node_autounlock_ids)
-		research_node_id(id, TRUE, FALSE)
-	for(var/id in SSresearch.techweb_designs)
-		var/datum/design/D = SSresearch.techweb_design_by_id(id)
-		if(D.build_type & design_autounlock_buildtypes)
-			for(var/i in D.category)
-				if(i in design_autounlock_categories)
-					add_design_by_id(D.id)
-					break
-
-/datum/techweb/specialized/autounlocking/autolathe
-	design_autounlock_buildtypes = AUTOLATHE
-	allowed_buildtypes = AUTOLATHE
-
-/datum/techweb/specialized/autounlocking/limbgrower
-	design_autounlock_buildtypes = LIMBGROWER
-	allowed_buildtypes = LIMBGROWER
-
-/datum/techweb/specialized/autounlocking/biogenerator
-	design_autounlock_buildtypes = BIOGENERATOR
-	allowed_buildtypes = BIOGENERATOR
-
-/datum/techweb/specialized/autounlocking/smelter
-	design_autounlock_buildtypes = SMELTER
-	allowed_buildtypes = SMELTER
-
-/datum/techweb/specialized/autounlocking/exofab
-	allowed_buildtypes = MECHFAB
-
-/datum/techweb/specialized/autounlocking/autoylathe
-	design_autounlock_buildtypes = AUTOYLATHE
-	allowed_buildtypes = AUTOYLATHE
-
-/datum/techweb/specialized/autounlocking/autobottler
-	design_autounlock_buildtypes = AUTOBOTTLER
+
+//Used \n[\s]*origin_tech[\s]*=[\s]*"[\S]+" to delete all origin techs.
+//Or \n[\s]*origin_tech[\s]*=[\s]list\([A-Z_\s=0-9,]*\)
+//Used \n[\s]*req_tech[\s]*=[\s]*list\(["a-z\s=0-9,]*\) to delete all req_techs.
+
+//Techweb datums are meant to store unlocked research, being able to be stored on research consoles, servers, and disks. They are NOT global.
+/datum/techweb
+	var/list/researched_nodes = list()		//Already unlocked and all designs are now available. Assoc list, id = TRUE
+	var/list/visible_nodes = list()			//Visible nodes, doesn't mean it can be researched. Assoc list, id = TRUE
+	var/list/available_nodes = list()		//Nodes that can immediately be researched, all reqs met. assoc list, id = TRUE
+	var/list/researched_designs = list()	//Designs that are available for use. Assoc list, id = TRUE
+	var/list/custom_designs = list()		//Custom inserted designs like from disks that should survive recalculation.
+	var/list/boosted_nodes = list()			//Already boosted nodes that can't be boosted again. node id = path of boost object.
+	var/list/hidden_nodes = list()			//Hidden nodes. id = TRUE. Used for unhiding nodes when requirements are met by removing the entry of the node.
+	var/list/deconstructed_items = list()						//items already deconstructed for a generic point boost. path = list(point_type = points)
+	var/list/research_points = list()										//Available research points. type = number
+	var/list/obj/machinery/computer/rdconsole/consoles_accessing = list()
+	var/id = "generic"
+	var/list/research_logs = list()								//IC logs.
+	var/largest_bomb_value = 0
+	var/organization = "Third-Party"							//Organization name, used for display.
+	var/list/last_bitcoins = list()								//Current per-second production, used for display only.
+	var/list/tiers = list()										//Assoc list, id = number, 1 is available, 2 is all reqs are 1, so on
+
+/datum/techweb/New()
+	for(var/i in SSresearch.techweb_nodes_starting)
+		var/datum/techweb_node/DN = SSresearch.techweb_node_by_id(i)
+		research_node(DN, TRUE, FALSE)
+	hidden_nodes = SSresearch.techweb_nodes_hidden.Copy()
+	return ..()
+
+/datum/techweb/admin
+	id = "ADMIN"
+	organization = "CentCom"
+
+/datum/techweb/admin/New()	//All unlocked.
+	. = ..()
+	for(var/i in SSresearch.techweb_nodes)
+		var/datum/techweb_node/TN = SSresearch.techweb_nodes[i]
+		research_node(TN, TRUE)
+	for(var/i in SSresearch.point_types)
+		research_points[i] = INFINITY
+	hidden_nodes = list()
+
+/datum/techweb/syndicate
+	id = "SYNDICATE"
+	organization = "Syndicate"
+
+/datum/techweb/syndicate/New()
+	var/datum/techweb_node/syndicate_basic/Node = new()
+	research_node(Node, TRUE)
+
+/datum/techweb/abductor
+	id = "ABDUCTOR"
+	organization = "Aliens"
+
+/datum/techweb/abductor/New()
+	var/datum/techweb_node/alientech/Node = new()
+	research_node(Node, TRUE)
+
+/datum/techweb/science	//Global science techweb for RND consoles.
+	id = "SCIENCE"
+	organization = "Nanotrasen"
+
+/datum/techweb/Destroy()
+	researched_nodes = null
+	researched_designs = null
+	available_nodes = null
+	visible_nodes = null
+	custom_designs = null
+	SSresearch.techwebs -= src
+	return ..()
+
+/datum/techweb/proc/recalculate_nodes(recalculate_designs = FALSE, wipe_custom_designs = FALSE)
+	var/list/datum/techweb_node/processing = list()
+	for(var/id in researched_nodes)
+		processing[id] = TRUE
+	for(var/id in visible_nodes)
+		processing[id] = TRUE
+	for(var/id in available_nodes)
+		processing[id] = TRUE
+	if(recalculate_designs)
+		researched_designs = custom_designs.Copy()
+		if(wipe_custom_designs)
+			custom_designs = list()
+	for(var/id in processing)
+		update_node_status(SSresearch.techweb_node_by_id(id), FALSE)
+		CHECK_TICK
+	for(var/v in consoles_accessing)
+		var/obj/machinery/computer/rdconsole/V = v
+		V.rescan_views()
+		V.updateUsrDialog()
+
+/datum/techweb/proc/add_point_list(list/pointlist)
+	for(var/i in pointlist)
+		if(SSresearch.point_types[i] && pointlist[i] > 0)
+			research_points[i] += pointlist[i]
+
+/datum/techweb/proc/add_points_all(amount)
+	var/list/l = SSresearch.point_types.Copy()
+	for(var/i in l)
+		l[i] = amount
+	add_point_list(l)
+
+/datum/techweb/proc/remove_point_list(list/pointlist)
+	for(var/i in pointlist)
+		if(SSresearch.point_types[i] && pointlist[i] > 0)
+			research_points[i] = max(0, research_points[i] - pointlist[i])
+
+/datum/techweb/proc/remove_points_all(amount)
+	var/list/l = SSresearch.point_types.Copy()
+	for(var/i in l)
+		l[i] = amount
+	remove_point_list(l)
+
+/datum/techweb/proc/modify_point_list(list/pointlist)
+	for(var/i in pointlist)
+		if(SSresearch.point_types[i] && pointlist[i] != 0)
+			research_points[i] = max(0, research_points[i] + pointlist[i])
+
+/datum/techweb/proc/modify_points_all(amount)
+	var/list/l = SSresearch.point_types.Copy()
+	for(var/i in l)
+		l[i] = amount
+	modify_point_list(l)
+
+/datum/techweb/proc/copy_research_to(datum/techweb/receiver, unlock_hidden = TRUE)				//Adds any missing research to theirs.
+	for(var/i in researched_nodes)
+		CHECK_TICK
+		receiver.research_node_id(i, TRUE, FALSE)
+	for(var/i in researched_designs)
+		CHECK_TICK
+		receiver.add_design_by_id(i)
+	if(unlock_hidden)
+		for(var/i in receiver.hidden_nodes)
+			CHECK_TICK
+			if(!hidden_nodes[i])
+				receiver.hidden_nodes -= i		//We can see it so let them see it too.
+	receiver.recalculate_nodes()
+
+/datum/techweb/proc/copy()
+	var/datum/techweb/returned = new()
+	returned.researched_nodes = researched_nodes.Copy()
+	returned.visible_nodes = visible_nodes.Copy()
+	returned.available_nodes = available_nodes.Copy()
+	returned.researched_designs = researched_designs.Copy()
+	returned.hidden_nodes = hidden_nodes.Copy()
+	return returned
+
+/datum/techweb/proc/get_visible_nodes()			//The way this is set up is shit but whatever.
+	return visible_nodes - hidden_nodes
+
+/datum/techweb/proc/get_available_nodes()
+	return available_nodes - hidden_nodes
+
+/datum/techweb/proc/get_researched_nodes()
+	return researched_nodes - hidden_nodes
+
+/datum/techweb/proc/add_point_type(type, amount)
+	if(!SSresearch.point_types[type] || (amount <= 0))
+		return FALSE
+	research_points[type] += amount
+	return TRUE
+
+/datum/techweb/proc/modify_point_type(type, amount)
+	if(!SSresearch.point_types[type])
+		return FALSE
+	research_points[type] = max(0, research_points[type] + amount)
+	return TRUE
+
+/datum/techweb/proc/remove_point_type(type, amount)
+	if(!SSresearch.point_types[type] || (amount <= 0))
+		return FALSE
+	research_points[type] = max(0, research_points[type] - amount)
+	return TRUE
+
+/datum/techweb/proc/add_design_by_id(id, custom = FALSE)
+	return add_design(SSresearch.techweb_design_by_id(id), custom)
+
+/datum/techweb/proc/add_design(datum/design/design, custom = FALSE)
+	if(!istype(design))
+		return FALSE
+	researched_designs[design.id] = design
+	researched_designs[design.id] = TRUE
+	if(custom)
+		custom_designs[design.id] = TRUE
+	return TRUE
+
+/datum/techweb/proc/remove_design_by_id(id, custom = FALSE)
+	return remove_design(SSresearch.techweb_design_by_id(id), custom)
+
+/datum/techweb/proc/remove_design(datum/design/design, custom = FALSE)
+	if(!istype(design))
+		return FALSE
+	if(custom_designs[design.id] && !custom)
+		return FALSE
+	custom_designs -= design.id
+	researched_designs -= design.id
+	return TRUE
+
+/datum/techweb/proc/can_afford(list/pointlist)
+	for(var/i in pointlist)
+		if(research_points[i] < pointlist[i])
+			return FALSE
+	return TRUE
+
+/datum/techweb/proc/printout_points()
+	return techweb_point_display_generic(research_points)
+
+/datum/techweb/proc/research_node_id(id, force, auto_update_points)
+	return research_node(SSresearch.techweb_node_by_id(id), force, auto_update_points)
+
+/datum/techweb/proc/research_node(datum/techweb_node/node, force = FALSE, auto_adjust_cost = TRUE)
+	if(!istype(node))
+		return FALSE
+	update_node_status(node)
+	if(!force)
+		if(!available_nodes[node.id] || (auto_adjust_cost && (!can_afford(node.get_price(src)))))
+			return FALSE
+	if(auto_adjust_cost)
+		remove_point_list(node.get_price(src))
+	researched_nodes[node.id] = TRUE				//Add to our researched list
+	for(var/id in node.unlock_ids)
+		visible_nodes[id] = TRUE
+		update_node_status(SSresearch.techweb_node_by_id(id))
+	for(var/id in node.design_ids)
+		add_design_by_id(id)
+	update_node_status(node)
+	return TRUE
+
+/datum/techweb/proc/unresearch_node_id(id)
+	return unresearch_node(SSresearch.techweb_node_by_id(id))
+
+/datum/techweb/proc/unresearch_node(datum/techweb_node/node)
+	if(!istype(node))
+		return FALSE
+	researched_nodes -= node.id
+	recalculate_nodes(TRUE)				//Fully rebuild the tree.
+
+/datum/techweb/proc/boost_with_path(datum/techweb_node/N, itempath)
+	if(!istype(N) || !ispath(itempath))
+		return FALSE
+	LAZYINITLIST(boosted_nodes[N.id])
+	for(var/i in N.boost_item_paths[itempath])
+		boosted_nodes[N.id][i] = max(boosted_nodes[N.id][i], N.boost_item_paths[itempath][i])
+	if(N.autounlock_by_boost)
+		hidden_nodes -= N.id
+	update_node_status(N)
+	return TRUE
+
+/datum/techweb/proc/update_tiers(datum/techweb_node/base)
+	var/list/current = list(base)
+	while (current.len)
+		var/list/next = list()
+		for (var/node_ in current)
+			var/datum/techweb_node/node = node_
+			var/tier = 0
+			if (!researched_nodes[node.id])  // researched is tier 0
+				for (var/id in node.prereq_ids)
+					var/prereq_tier = tiers[id]
+					tier = max(tier, prereq_tier + 1)
+
+			if (tier != tiers[node.id])
+				tiers[node.id] = tier
+				for (var/id in node.unlock_ids)
+					next += SSresearch.techweb_node_by_id(id)
+		current = next
+
+/datum/techweb/proc/update_node_status(datum/techweb_node/node, autoupdate_consoles = TRUE)
+	var/researched = FALSE
+	var/available = FALSE
+	var/visible = FALSE
+	if(researched_nodes[node.id])
+		researched = TRUE
+	var/needed = node.prereq_ids.len
+	for(var/id in node.prereq_ids)
+		if(researched_nodes[id])
+			visible = TRUE
+			needed--
+	if(!needed)
+		available = TRUE
+	researched_nodes -= node.id
+	available_nodes -= node.id
+	visible_nodes -= node.id
+	if(hidden_nodes[node.id])	//Hidden.
+		return
+	if(researched)
+		researched_nodes[node.id] = TRUE
+		for(var/id in node.design_ids)
+			add_design(SSresearch.techweb_design_by_id(id))
+	else
+		if(available)
+			available_nodes[node.id] = TRUE
+		else
+			if(visible)
+				visible_nodes[node.id] = TRUE
+	update_tiers(node)
+	if(autoupdate_consoles)
+		for(var/v in consoles_accessing)
+			var/obj/machinery/computer/rdconsole/V = v
+			V.rescan_views()
+			V.updateUsrDialog()
+
+//Laggy procs to do specific checks, just in case. Don't use them if you can just use the vars that already store all this!
+/datum/techweb/proc/designHasReqs(datum/design/D)
+	for(var/i in researched_nodes)
+		var/datum/techweb_node/N = SSresearch.techweb_node_by_id(i)
+		if(N.design_ids[D.id])
+			return TRUE
+	return FALSE
+
+/datum/techweb/proc/isDesignResearched(datum/design/D)
+	return isDesignResearchedID(D.id)
+
+/datum/techweb/proc/isDesignResearchedID(id)
+	return researched_designs[id]? SSresearch.techweb_design_by_id(id) : FALSE
+
+/datum/techweb/proc/isNodeResearched(datum/techweb_node/N)
+	return isNodeResearchedID(N.id)
+
+/datum/techweb/proc/isNodeResearchedID(id)
+	return researched_nodes[id]? SSresearch.techweb_node_by_id(id) : FALSE
+
+/datum/techweb/proc/isNodeVisible(datum/techweb_node/N)
+	return isNodeResearchedID(N.id)
+
+/datum/techweb/proc/isNodeVisibleID(id)
+	return visible_nodes[id]? SSresearch.techweb_node_by_id(id) : FALSE
+
+/datum/techweb/proc/isNodeAvailable(datum/techweb_node/N)
+	return isNodeAvailableID(N.id)
+
+/datum/techweb/proc/isNodeAvailableID(id)
+	return available_nodes[id]? SSresearch.techweb_node_by_id(id) : FALSE
+
+/datum/techweb/specialized
+	var/allowed_buildtypes = ALL
+
+/datum/techweb/specialized/add_design(datum/design/D)
+	if(!(D.build_type & allowed_buildtypes))
+		return FALSE
+	return ..()
+
+/datum/techweb/specialized/autounlocking
+	var/design_autounlock_buildtypes = NONE
+	var/design_autounlock_categories = list("initial")		//if a design has a buildtype that matches the abovea and either has a category in this or this is null, unlock it.
+	var/node_autounlock_ids = list()				//autounlock nodes of this type.
+
+/datum/techweb/specialized/autounlocking/New()
+	..()
+	autounlock()
+
+/datum/techweb/specialized/autounlocking/proc/autounlock()
+	for(var/id in node_autounlock_ids)
+		research_node_id(id, TRUE, FALSE)
+	for(var/id in SSresearch.techweb_designs)
+		var/datum/design/D = SSresearch.techweb_design_by_id(id)
+		if(D.build_type & design_autounlock_buildtypes)
+			for(var/i in D.category)
+				if(i in design_autounlock_categories)
+					add_design_by_id(D.id)
+					break
+
+/datum/techweb/specialized/autounlocking/autolathe
+	design_autounlock_buildtypes = AUTOLATHE
+	allowed_buildtypes = AUTOLATHE
+
+/datum/techweb/specialized/autounlocking/limbgrower
+	design_autounlock_buildtypes = LIMBGROWER
+	allowed_buildtypes = LIMBGROWER
+
+/datum/techweb/specialized/autounlocking/biogenerator
+	design_autounlock_buildtypes = BIOGENERATOR
+	allowed_buildtypes = BIOGENERATOR
+
+/datum/techweb/specialized/autounlocking/smelter
+	design_autounlock_buildtypes = SMELTER
+	allowed_buildtypes = SMELTER
+
+/datum/techweb/specialized/autounlocking/exofab
+	allowed_buildtypes = MECHFAB
+
+/datum/techweb/specialized/autounlocking/autoylathe
+	design_autounlock_buildtypes = AUTOYLATHE
+	allowed_buildtypes = AUTOYLATHE
+
+/datum/techweb/specialized/autounlocking/autobottler
+	design_autounlock_buildtypes = AUTOBOTTLER
 	allowed_buildtypes = AUTOBOTTLER

code/modules/research/techweb/_techweb_node.dm

@@ -1,97 +1,97 @@
-
-//Techweb nodes are GLOBAL, there should only be one instance of them in the game. Persistant changes should never be made to them in-game.
-//USE SSRESEARCH PROCS TO OBTAIN REFERENCES. DO NOT REFERENCE OUTSIDE OF SSRESEARCH OR YOU WILL FUCK UP GC.
-
-/datum/techweb_node
-	var/id
-	var/display_name = "Errored Node"
-	var/description = "Why are you seeing this?"
-	var/hidden = FALSE			//Whether it starts off hidden.
-	var/starting_node = FALSE	//Whether it's available without any research.
-	var/list/prereq_ids = list()
-	var/list/design_ids = list()
-	var/list/unlock_ids = list()			//CALCULATED FROM OTHER NODE'S PREREQUISITES. Assoc list id = TRUE.
-	var/list/boost_item_paths = list()		//Associative list, path = list(point type = point_value).
-	var/autounlock_by_boost = TRUE			//boosting this will autounlock this node.
-	var/export_price = 0					//Cargo export price.
-	var/list/research_costs = list()		//Point cost to research. type = amount
-	var/category = "Misc"				//Category
-
-/datum/techweb_node/error_node
-	id = "ERROR"
-	display_name = "ERROR"
-	description = "This usually means something in the database has corrupted. If it doesn't go away automatically, inform Central Command for their techs to fix it ASAP(tm)"
-
-/datum/techweb_node/proc/Initialize()
-	//Make lists associative for lookup
-	for(var/id in prereq_ids)
-		prereq_ids[id] = TRUE
-	for(var/id in design_ids)
-		design_ids[id] = TRUE
-	for(var/id in unlock_ids)
-		unlock_ids[id] = TRUE
-
-/datum/techweb_node/Destroy()
-	SSresearch.techweb_nodes -= id
-	return ..()
-
-/datum/techweb_node/serialize_list(list/options)
-	. = list()
-	VARSET_TO_LIST(., id)
-	VARSET_TO_LIST(., display_name)
-	VARSET_TO_LIST(., hidden)
-	VARSET_TO_LIST(., starting_node)
-	VARSET_TO_LIST(., assoc_list_strip_value(prereq_ids))
-	VARSET_TO_LIST(., assoc_list_strip_value(design_ids))
-	VARSET_TO_LIST(., assoc_list_strip_value(unlock_ids))
-	VARSET_TO_LIST(., boost_item_paths)
-	VARSET_TO_LIST(., autounlock_by_boost)
-	VARSET_TO_LIST(., export_price)
-	VARSET_TO_LIST(., research_costs)
-	VARSET_TO_LIST(., category)
-
-/datum/techweb_node/deserialize_list(list/input, list/options)
-	if(!input["id"])
-		return
-	VARSET_FROM_LIST(input, id)
-	VARSET_FROM_LIST(input, display_name)
-	VARSET_FROM_LIST(input, hidden)
-	VARSET_FROM_LIST(input, starting_node)
-	VARSET_FROM_LIST(input, prereq_ids)
-	VARSET_FROM_LIST(input, design_ids)
-	VARSET_FROM_LIST(input, unlock_ids)
-	VARSET_FROM_LIST(input, boost_item_paths)
-	VARSET_FROM_LIST(input, autounlock_by_boost)
-	VARSET_FROM_LIST(input, export_price)
-	VARSET_FROM_LIST(input, research_costs)
-	VARSET_FROM_LIST(input, category)
-	Initialize()
-	return src
-
-/datum/techweb_node/proc/on_design_deletion(datum/design/D)
-	prune_design_id(D.id)
-
-/datum/techweb_node/proc/on_node_deletion(datum/techweb_node/TN)
-	prune_node_id(TN.id)
-
-/datum/techweb_node/proc/prune_design_id(design_id)
-	design_ids -= design_id
-
-/datum/techweb_node/proc/prune_node_id(node_id)
-	prereq_ids -= node_id
-	unlock_ids -= node_id
-
-/datum/techweb_node/proc/get_price(datum/techweb/host)
-	if(host)
-		var/list/actual_costs = research_costs
-		if(host.boosted_nodes[id])
-			var/list/L = host.boosted_nodes[id]
-			for(var/i in L)
-				if(actual_costs[i])
-					actual_costs[i] -= L[i]
-		return actual_costs
-	else
-		return research_costs
-
-/datum/techweb_node/proc/price_display(datum/techweb/TN)
-	return techweb_point_display_generic(get_price(TN))
+
+//Techweb nodes are GLOBAL, there should only be one instance of them in the game. Persistant changes should never be made to them in-game.
+//USE SSRESEARCH PROCS TO OBTAIN REFERENCES. DO NOT REFERENCE OUTSIDE OF SSRESEARCH OR YOU WILL FUCK UP GC.
+
+/datum/techweb_node
+	var/id
+	var/display_name = "Errored Node"
+	var/description = "Why are you seeing this?"
+	var/hidden = FALSE			//Whether it starts off hidden.
+	var/starting_node = FALSE	//Whether it's available without any research.
+	var/list/prereq_ids = list()
+	var/list/design_ids = list()
+	var/list/unlock_ids = list()			//CALCULATED FROM OTHER NODE'S PREREQUISITES. Assoc list id = TRUE.
+	var/list/boost_item_paths = list()		//Associative list, path = list(point type = point_value).
+	var/autounlock_by_boost = TRUE			//boosting this will autounlock this node.
+	var/export_price = 0					//Cargo export price.
+	var/list/research_costs = list()		//Point cost to research. type = amount
+	var/category = "Misc"				//Category
+
+/datum/techweb_node/error_node
+	id = "ERROR"
+	display_name = "ERROR"
+	description = "This usually means something in the database has corrupted. If it doesn't go away automatically, inform Central Command for their techs to fix it ASAP(tm)"
+
+/datum/techweb_node/proc/Initialize()
+	//Make lists associative for lookup
+	for(var/id in prereq_ids)
+		prereq_ids[id] = TRUE
+	for(var/id in design_ids)
+		design_ids[id] = TRUE
+	for(var/id in unlock_ids)
+		unlock_ids[id] = TRUE
+
+/datum/techweb_node/Destroy()
+	SSresearch.techweb_nodes -= id
+	return ..()
+
+/datum/techweb_node/serialize_list(list/options)
+	. = list()
+	VARSET_TO_LIST(., id)
+	VARSET_TO_LIST(., display_name)
+	VARSET_TO_LIST(., hidden)
+	VARSET_TO_LIST(., starting_node)
+	VARSET_TO_LIST(., assoc_list_strip_value(prereq_ids))
+	VARSET_TO_LIST(., assoc_list_strip_value(design_ids))
+	VARSET_TO_LIST(., assoc_list_strip_value(unlock_ids))
+	VARSET_TO_LIST(., boost_item_paths)
+	VARSET_TO_LIST(., autounlock_by_boost)
+	VARSET_TO_LIST(., export_price)
+	VARSET_TO_LIST(., research_costs)
+	VARSET_TO_LIST(., category)
+
+/datum/techweb_node/deserialize_list(list/input, list/options)
+	if(!input["id"])
+		return
+	VARSET_FROM_LIST(input, id)
+	VARSET_FROM_LIST(input, display_name)
+	VARSET_FROM_LIST(input, hidden)
+	VARSET_FROM_LIST(input, starting_node)
+	VARSET_FROM_LIST(input, prereq_ids)
+	VARSET_FROM_LIST(input, design_ids)
+	VARSET_FROM_LIST(input, unlock_ids)
+	VARSET_FROM_LIST(input, boost_item_paths)
+	VARSET_FROM_LIST(input, autounlock_by_boost)
+	VARSET_FROM_LIST(input, export_price)
+	VARSET_FROM_LIST(input, research_costs)
+	VARSET_FROM_LIST(input, category)
+	Initialize()
+	return src
+
+/datum/techweb_node/proc/on_design_deletion(datum/design/D)
+	prune_design_id(D.id)
+
+/datum/techweb_node/proc/on_node_deletion(datum/techweb_node/TN)
+	prune_node_id(TN.id)
+
+/datum/techweb_node/proc/prune_design_id(design_id)
+	design_ids -= design_id
+
+/datum/techweb_node/proc/prune_node_id(node_id)
+	prereq_ids -= node_id
+	unlock_ids -= node_id
+
+/datum/techweb_node/proc/get_price(datum/techweb/host)
+	if(host)
+		var/list/actual_costs = research_costs
+		if(host.boosted_nodes[id])
+			var/list/L = host.boosted_nodes[id]
+			for(var/i in L)
+				if(actual_costs[i])
+					actual_costs[i] -= L[i]
+		return actual_costs
+	else
+		return research_costs
+
+/datum/techweb_node/proc/price_display(datum/techweb/TN)
+	return techweb_point_display_generic(get_price(TN))

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
 
@@ -365,7 +365,7 @@
 	display_name = "Advanced Robotics Research"
 	description = "It can even do the dishes!"
 	prereq_ids = list("robotics")
-	design_ids = list("borg_upgrade_diamonddrill", "borg_upgrade_advancedmop")
+	design_ids = list("borg_upgrade_diamonddrill", "borg_upgrade_advancedmop", "borg_upgrade_advcutter", "borg_upgrade_premiumka")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000)
 	export_price = 5000
 
@@ -391,7 +391,7 @@
 	display_name = "Cyborg Upgrades: Utility"
 	description = "Utility upgrades for cyborgs."
 	prereq_ids = list("engineering", "robotics")
-	design_ids = list("borg_upgrade_holding", "borg_upgrade_lavaproof", "borg_upgrade_thrusters", "borg_upgrade_selfrepair", "borg_upgrade_expand", "borg_upgrade_rped")
+	design_ids = list("borg_upgrade_lavaproof", "borg_upgrade_thrusters", "borg_upgrade_selfrepair", "borg_upgrade_expand", "borg_upgrade_rped")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
 	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
 
@@ -1081,7 +1081,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", "suppressor", "largecrossbow", "donksofttoyvendor")
+	design_ids = list("decloner", "borg_syndicate_module", "suppressor", "largecrossbow", "donksofttoyvendor", "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)