From 37441437d14518ef951e44a3022402a366575502 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sat, 28 Dec 2019 23:02:28 +0100
Subject: [PATCH] a

---
 code/game/machinery/Sleeper.dm                |   2 +-
 .../objects/items/devices/dogborg_sleeper.dm  |   2 +-
 code/modules/food_and_drinks/drinks/drinks.dm |  42 +-
 .../food_and_drinks/drinks/drinks/bottle.dm   | 109 ++-
 .../drinks/drinks/drinkingglass.dm            |   6 +-
 .../modules/food_and_drinks/food/condiment.dm |  33 +-
 .../food_and_drinks/food/snacks/meat.dm       |  20 +-
 .../food_and_drinks/food/snacks_bread.dm      |   4 +-
 .../food_and_drinks/food/snacks_burgers.dm    |  38 +-
 .../food_and_drinks/food/snacks_cake.dm       |  20 +-
 .../food_and_drinks/food/snacks_egg.dm        |   2 +-
 .../food_and_drinks/food/snacks_frozen.dm     |  42 +-
 .../food_and_drinks/food/snacks_meat.dm       |   8 +-
 .../food_and_drinks/food/snacks_other.dm      |  28 +-
 .../food_and_drinks/food/snacks_pastry.dm     |  64 +-
 .../food_and_drinks/food/snacks_pie.dm        |   8 +-
 .../food_and_drinks/food/snacks_pizza.dm      |  10 +-
 .../food_and_drinks/food/snacks_salad.dm      |   4 +-
 .../food/snacks_sandwichtoast.dm              |  24 +-
 .../food_and_drinks/food/snacks_soup.dm       |  32 +-
 .../food_and_drinks/food/snacks_spaghetti.dm  |   8 +-
 .../food_and_drinks/food/snacks_vend.dm       |   2 +-
 .../food_and_drinks/recipes/drinks_recipes.dm | 752 +++++++++---------
 .../food_and_drinks/recipes/food_mixtures.dm  |  72 +-
 .../recipes/tablecraft/recipes_pastry.dm      |   6 +-
 code/modules/holiday/halloween/jacqueen.dm    |   1 -
 code/modules/hydroponics/beekeeping/beebox.dm |   4 +-
 code/modules/hydroponics/grown/ambrosia.dm    |   6 +-
 code/modules/hydroponics/grown/apple.dm       |   4 +-
 code/modules/hydroponics/grown/banana.dm      |  12 +-
 code/modules/hydroponics/grown/beans.dm       |   6 +-
 code/modules/hydroponics/grown/berries.dm     |  10 +-
 code/modules/hydroponics/grown/cereals.dm     |   6 +-
 code/modules/hydroponics/grown/citrus.dm      |   4 +-
 .../hydroponics/grown/cocoa_vanilla.dm        |   5 +-
 code/modules/hydroponics/grown/corn.dm        |   2 +-
 code/modules/hydroponics/grown/eggplant.dm    |   2 +-
 code/modules/hydroponics/grown/flowers.dm     |   6 +-
 code/modules/hydroponics/grown/misc.dm        |   2 +-
 code/modules/hydroponics/grown/mushrooms.dm   |   2 +-
 code/modules/hydroponics/grown/potato.dm      |   4 +-
 code/modules/hydroponics/grown/tea_coffee.dm  |   2 +-
 code/modules/hydroponics/grown/tobacco.dm     |   2 +-
 code/modules/hydroponics/grown/tomato.dm      |   8 +-
 code/modules/hydroponics/hydroitemdefines.dm  |  14 +-
 code/modules/hydroponics/plant_genes.dm       |   2 +-
 .../subtypes/reagents.dm                      |  10 +-
 .../mining/lavaland/necropolis_chests.dm      |   1 -
 code/modules/mob/living/blood.dm              |  12 +-
 .../mob/living/carbon/human/species.dm        |   2 +-
 .../carbon/human/species_types/golems.dm      |   2 +-
 .../carbon/human/species_types/jellypeople.dm |   2 +-
 .../mob/living/simple_animal/hostile/bees.dm  |   2 +-
 .../simple_animal/hostile/jungle/leaper.dm    |   1 -
 code/modules/projectiles/projectile.dm        |   2 +-
 code/modules/reagents/chem_wiki_render.dm     | 138 +---
 .../chemistry/machinery/chem_dispenser.dm     |   2 +-
 .../chemistry/machinery/chem_master.dm        |   4 +-
 .../chemistry/machinery/chem_synthesizer.dm   |   2 +-
 code/modules/reagents/chemistry/reagents.dm   |  23 +-
 .../chemistry/reagents/alcohol_reagents.dm    | 127 +--
 .../chemistry/reagents/blob_reagents.dm       |  21 +-
 .../chemistry/reagents/drink_reagents.dm      |  78 +-
 .../chemistry/reagents/drug_reagents.dm       |  35 +-
 .../chemistry/reagents/food_reagents.dm       |  46 --
 .../chemistry/reagents/impure_reagents.dm     |   1 -
 .../chemistry/reagents/medicine_reagents.dm   |  86 +-
 .../chemistry/reagents/other_reagents.dm      | 183 +----
 .../reagents/pyrotechnic_reagents.dm          |  17 -
 .../chemistry/reagents/toxin_reagents.dm      |  62 +-
 .../reagents/chemistry/recipes/medicine.dm    |   2 +-
 .../reagents/chemistry/recipes/others.dm      |  10 +-
 .../chemistry/recipes/pyrotechnics.dm         |   2 +-
 .../reagents/chemistry/recipes/toxins.dm      |   2 +-
 code/modules/reagents/reagent_containers.dm   |   2 +-
 .../reagents/reagent_containers/dropper.dm    |   2 +-
 .../reagents/reagent_containers/glass.dm      |   2 +-
 .../nanites/nanite_programs/healing.dm        |   2 +-
 code/modules/vore/eating/voreitems.dm         |   1 -
 code/modules/vore/resizing/sizechemicals.dm   |   1 -
 icons/obj/food/containers.dmi                 | Bin 11417 -> 11617 bytes
 .../reagents/chemistry/reagents/MKUltra.dm    |   6 +-
 .../reagents/chemistry/reagents/SDGF.dm       |  22 +-
 .../reagents/chemistry/reagents/astrogen.dm   |   1 -
 .../chemistry/reagents/eigentstasium.dm       |   3 +-
 .../chemistry/reagents/enlargement.dm         |   8 +-
 .../chemistry/reagents/fermi_reagents.dm      |  14 +-
 .../reagents/chemistry/reagents/healing.dm    |   3 -
 .../chemistry/reagents/other_reagents.dm      |   1 -
 .../reagents/chemistry/recipes/fermi.dm       |   4 +-
 .../modules/reagents/reagents/cit_reagents.dm |   6 -
 91 files changed, 873 insertions(+), 1522 deletions(-)

diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 2b043822f3..fa9b515a81 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -217,7 +217,7 @@
 	for(var/chem in available_chems)
 		var/datum/reagent/R = reagents.has_reagent(chem)
 		R = GLOB.chemical_reagents_list[chem]
-		data["synthchems"] += list(list("name" = R.name, "id" = R.id, "synth_allowed" = synth_allowed(chem)))
+		data["synthchems"] += list(list("name" = R.name, "id" = R.type, "synth_allowed" = synth_allowed(chem)))
 	for(var/datum/reagent/R in reagents.reagent_list)
 		data["chems"] += list(list("name" = R.name, "id" = R.type, "vol" = R.volume, "purity" = R.purity, "allowed" = chem_allowed(R.type)))
 
diff --git a/code/game/objects/items/devices/dogborg_sleeper.dm b/code/game/objects/items/devices/dogborg_sleeper.dm
index db2b03f2e8..748c494737 100644
--- a/code/game/objects/items/devices/dogborg_sleeper.dm
+++ b/code/game/objects/items/devices/dogborg_sleeper.dm
@@ -184,7 +184,7 @@
 		data["chem"] = list()
 		for(var/chem in injection_chems)
 			var/datum/reagent/R = GLOB.chemical_reagents_list[chem]
-			data["chem"] += list(list("name" = R.name, "id" = R.id))
+			data["chem"] += list(list("name" = R.name, "id" = R.type))
 
 	data["occupant"] = list()
 	var/mob/living/mob_occupant = patient
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index ef39115ccd..bf070a9e59 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -211,7 +211,7 @@
 	name = "ice cup"
 	desc = "Careful, cold ice, do not chew."
 	icon_state = "coffee"
-	list_reagents = list("ice" = 30)
+	list_reagents = list(/datum/reagent/consumable/ice = 30)
 	spillable = TRUE
 	isGlass = FALSE
 
@@ -231,12 +231,12 @@
 /obj/item/reagent_containers/food/drinks/mug/tea
 	name = "Duke Purple tea"
 	desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
-	list_reagents = list("tea" = 30)
+	list_reagents = list(/datum/reagent/consumable/tea = 30)
 
 /obj/item/reagent_containers/food/drinks/mug/coco
 	name = "Dutch hot coco"
 	desc = "Made in Space South America."
-	list_reagents = list("hot_coco" = 30, /datum/reagent/consumable/sugar = 5)
+	list_reagents = list(/datum/reagent/consumable/hot_coco = 30, /datum/reagent/consumable/sugar = 5)
 	foodtype = SUGAR
 	resistance_flags = FREEZE_PROOF
 
@@ -244,7 +244,7 @@
 	name = "cup ramen"
 	desc = "Just add 10ml of water, self heats! A taste that reminds you of your school years."
 	icon_state = "ramen"
-	list_reagents = list("dry_ramen" = 30)
+	list_reagents = list(/datum/reagent/consumable/dry_ramen = 30)
 	foodtype = GRAIN
 	isGlass = FALSE
 
@@ -252,20 +252,20 @@
 	name = "space beer"
 	desc = "Beer. In space."
 	icon_state = "beer"
-	list_reagents = list("beer" = 30)
+	list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30)
 	foodtype = GRAIN | ALCOHOL
 
 /obj/item/reagent_containers/food/drinks/beer/light
 	name = "Carp Lite"
 	desc = "Brewed with \"Pure Ice Asteroid Spring Water\"."
-	list_reagents = list("light_beer" = 30)
+	list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30)
 
 /obj/item/reagent_containers/food/drinks/ale
 	name = "Magm-Ale"
 	desc = "A true dorf's drink of choice."
 	icon_state = "alebottle"
 	item_state = "beer"
-	list_reagents = list("ale" = 30)
+	list_reagents = list(/datum/reagent/consumable/ethanol/ale = 30)
 	foodtype = GRAIN | ALCOHOL
 
 /obj/item/reagent_containers/food/drinks/sillycup
@@ -382,7 +382,7 @@
 	name = "detective's flask"
 	desc = "The detective's only true friend."
 	icon_state = "detflask"
-	list_reagents = list("whiskey" = 30)
+	list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 30)
 
 /obj/item/reagent_containers/food/drinks/britcup
 	name = "cup"
@@ -438,20 +438,20 @@
 	name = "T-Borg's tonic water"
 	desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
 	icon_state = "tonic"
-	list_reagents = list("tonic" = 50)
+	list_reagents = list(/datum/reagent/consumable/tonic = 50)
 	foodtype = ALCOHOL
 
 /obj/item/reagent_containers/food/drinks/soda_cans/sodawater
 	name = "soda water"
 	desc = "A can of soda water. Why not make a scotch and soda?"
 	icon_state = "sodawater"
-	list_reagents = list("sodawater" = 50)
+	list_reagents = list(/datum/reagent/consumable/sodawater = 50)
 
 /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime
 	name = "orange soda"
 	desc = "You wanted ORANGE. It gave you Lemon Lime."
 	icon_state = "lemon-lime"
-	list_reagents = list("lemon_lime" = 30)
+	list_reagents = list(/datum/reagent/consumable/lemon_lime = 30)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize()
@@ -462,62 +462,62 @@
 	name = "Space-Up!"
 	desc = "Tastes like a hull breach in your mouth."
 	icon_state = "space-up"
-	list_reagents = list("space_up" = 30)
+	list_reagents = list(/datum/reagent/consumable/space_up = 30)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/starkist
 	name = "Star-kist"
 	desc = "The taste of a star in liquid form. And, a bit of tuna...?"
 	icon_state = "starkist"
-	list_reagents = list(/datum/reagent/consumable/space_cola = 15, "orangejuice" = 15)
+	list_reagents = list(/datum/reagent/consumable/space_cola = 15, /datum/reagent/consumable/orangejuice = 15)
 	foodtype = SUGAR | FRUIT | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind
 	name = "Space Mountain Wind"
 	desc = "Blows right through you like a space wind."
 	icon_state = "space_mountain_wind"
-	list_reagents = list("spacemountainwind" = 30)
+	list_reagents = list(/datum/reagent/consumable/spacemountainwind = 30)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko
 	name = "Thirteen Loko"
 	desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly."
 	icon_state = "thirteen_loko"
-	list_reagents = list("thirteenloko" = 30)
+	list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb
 	name = "Dr. Gibb"
 	desc = "A delicious mixture of 42 different flavors."
 	icon_state = "dr_gibb"
-	list_reagents = list("dr_gibb" = 30)
+	list_reagents = list(/datum/reagent/consumable/dr_gibb = 30)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game
 	name = "Pwr Game"
 	desc = "The only drink with the PWR that true gamers crave."
 	icon_state = "purple_can"
-	list_reagents = list("pwr_game" = 30)
+	list_reagents = list(/datum/reagent/consumable/pwr_game = 30)
 
 /obj/item/reagent_containers/food/drinks/soda_cans/shamblers
 	name = "Shambler's juice"
 	desc = "~Shake me up some of that Shambler's Juice!~"
 	icon_state = "shamblers"
-	list_reagents = list("shamblers" = 30)
+	list_reagents = list(/datum/reagent/consumable/shamblers = 30)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/buzz_fuzz
 	name = "Buzz Fuzz"
 	desc = "The sister drink of Shambler's Juice! Uses real honey, making it a sweet tooth's dream drink. The slogan reads ''A Hive of Flavour'', there's also a label about how it is adddicting."
 	icon_state = "honeysoda_can"
-	list_reagents = list("buzz_fuzz" = 25, "honey" = 5)
+	list_reagents = list(/datum/reagent/consumable/buzz_fuzz = 25, /datum/reagent/consumable/honey = 5)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull
 	name = "Grey Bull"
 	desc = "Grey Bull, it gives you gloves!"
 	icon_state = "energy_drink"
-	list_reagents = list("grey_bull" = 20)
+	list_reagents = list(/datum/reagent/consumable/grey_bull = 20)
 	foodtype = SUGAR | JUNKFOOD
 
 /obj/item/reagent_containers/food/drinks/soda_cans/air
@@ -530,5 +530,5 @@
 	name = "Monkey Energy"
 	desc = "Unleash the ape!"
 	icon_state = "monkey_energy"
-	list_reagents = list("monkey_energy" = 50)
+	list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
 	foodtype = SUGAR | JUNKFOOD
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 271ff93b15..757af11b62 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -131,88 +131,87 @@
 	name = "Griffeater gin"
 	desc = "A bottle of high quality gin, produced in the New London Space Station."
 	icon_state = "ginbottle"
-	list_reagents = list("gin" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/gin = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/gin/empty
-	list_reagents = list("gin" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/whiskey
 	name = "Uncle Git's special reserve"
 	desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES."
 	icon_state = "whiskeybottle"
-	list_reagents = list("whiskey" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/whiskey/empty
-	list_reagents = list("whiskey" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/vodka
 	name = "Tunguska triple distilled"
 	desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide."
 	icon_state = "vodkabottle"
-	list_reagents = list("vodka" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/vodka/empty
-	list_reagents = list("vodka" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka
 	name = "Badminka vodka"
 	desc = "The label's written in Cyrillic. All you can make out is the name and a word that looks vaguely like 'Vodka'."
 	icon_state = "badminka"
-	list_reagents = list("vodka" = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/tequila
 	name = "Caccavo guaranteed quality tequila"
 	desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
 	icon_state = "tequilabottle"
-	list_reagents = list("tequila" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/tequila = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/tequila/empty
-	list_reagents = list("tequila" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
 	name = "bottle of nothing"
 	desc = "A bottle filled with nothing."
 	icon_state = "bottleofnothing"
-	list_reagents = list("nothing" = 100)
+	list_reagents = list(/datum/reagent/consumable/nothing = 100)
 	foodtype = NONE
 
 /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing/empty
-	list_reagents = list("nothing" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/patron
 	name = "Wrapp Artiste Patron"
 	desc = "Silver laced tequila, served in space night clubs across the galaxy."
 	icon_state = "patronbottle"
-	list_reagents = list("patron" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/patron = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/patron/empty
-	list_reagents = list("patron" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/rum
 	name = "Captain Pete's Cuban spiced rum"
 	desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle."
 	icon_state = "rumbottle"
-	list_reagents = list("rum" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/rum = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/rum/empty
-	list_reagents = list("rum" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/holywater
 	name = "flask of holy water"
 	desc = "A flask of the chaplain's holy water."
 	icon_state = "holyflask"
-	list_reagents = list("holywater" = 100)
+	list_reagents = list(/datum/reagent/water/holywater = 100)
 	foodtype = NONE
 
 /obj/item/reagent_containers/food/drinks/bottle/holywater/hell
 	desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
-	list_reagents = list("hell_water" = 100)
+	list_reagents = list(/datum/reagent/hellwater = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/holyoil
 	name = "flask of zelus oil"
 	desc = "A brass flask of Zelus oil, a viscous fluid scenting of brass. Can be thrown to deal damage from afar."
 	icon_state = "zelusflask"
-	list_reagents = list("holyoil" = 30)
+	list_reagents = list(/datum/reagent/fuel/holyoil = 30)
 	volume = 30
 	foodtype = NONE
 	force = 18
@@ -220,63 +219,63 @@
 	knockdown_duration = 18
 
 /obj/item/reagent_containers/food/drinks/bottle/holyoil/empty
-	list_reagents = list("holyoil" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/vermouth
 	name = "Goldeneye vermouth"
 	desc = "Sweet, sweet dryness~"
 	icon_state = "vermouthbottle"
-	list_reagents = list("vermouth" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/vermouth = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/vermouth/empty
-	list_reagents = list("vermouth" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/kahlua
 	name = "Robert Robust's coffee liqueur"
 	desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK."
 	icon_state = "kahluabottle"
-	list_reagents = list("kahlua" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/kahlua = 100)
 	foodtype = VEGETABLES
 
 /obj/item/reagent_containers/food/drinks/bottle/kahlua/empty
-	list_reagents = list("kahlua" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/goldschlager
 	name = "College Girl goldschlager"
 	desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
 	icon_state = "goldschlagerbottle"
-	list_reagents = list("goldschlager" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/goldschlager = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/goldschlager/empty
-	list_reagents = list("goldschlager" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/cognac
 	name = "Chateau de Baton premium cognac"
 	desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time."
 	icon_state = "cognacbottle"
-	list_reagents = list("cognac" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/cognac = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/cognac/empty
-	list_reagents = list("cognac" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/wine
 	name = "Doublebeard's bearded special wine"
 	desc = "A faint aura of unease and asspainery surrounds the bottle."
 	icon_state = "winebottle"
-	list_reagents = list("wine" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/wine = 100)
 	foodtype = FRUIT | ALCOHOL
 
 /obj/item/reagent_containers/food/drinks/bottle/wine/empty
-	list_reagents = list("wine" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/absinthe
 	name = "extra-strong absinthe"
 	desc = "An strong alcoholic drink brewed and distributed by"
 	icon_state = "absinthebottle"
-	list_reagents = list("absinthe" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/absinthe/empty
-	list_reagents = list("absinthe" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize()
 	. = ..()
@@ -329,7 +328,7 @@
 	name = "bottle of lizard wine"
 	desc = "An alcoholic beverage from Space China, made by infusing lizard tails in ethanol. Inexplicably popular among command staff."
 	icon_state = "lizardwine"
-	list_reagents = list("lizardwine" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/lizardwine = 100)
 	foodtype = FRUIT | ALCOHOL
 
 /obj/item/reagent_containers/food/drinks/bottle/hcider
@@ -337,28 +336,28 @@
 	desc = "Apple juice for adults."
 	icon_state = "hcider"
 	volume = 50
-	list_reagents = list("hcider" = 50)
+	list_reagents = list(/datum/reagent/consumable/ethanol/hcider = 50)
 
 /obj/item/reagent_containers/food/drinks/bottle/hcider/empty
-	list_reagents = list("hcider" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/grappa
 	name = "Phillipes well-aged Grappa"
 	desc = "Bottle of Grappa."
 	icon_state = "grappabottle"
-	list_reagents = list("grappa" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/grappa = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/grappa/empty
-	list_reagents = list("grappa" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/sake
 	name = "Ryo's traditional sake"
 	desc = "Sweet as can be, and burns like fire going down."
 	icon_state = "sakebottle"
-	list_reagents = list("sake" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/sake = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/sake/empty
-	list_reagents = list("sake" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/sake/Initialize()
 	. = ..()
@@ -375,48 +374,48 @@
 	name = "Fernet Bronca"
 	desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station"
 	icon_state = "fernetbottle"
-	list_reagents = list("fernet" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/fernet = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/fernet/empty
-	list_reagents = list("fernet" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/applejack
 	name = "Buckin' Bronco's Applejack"
 	desc = "Kicks like a horse, tastes like an apple!"
 	icon_state = "applejack_bottle"
-	list_reagents = list("applejack" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/applejack = 100)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/drinks/bottle/applejack/empty
-	list_reagents = list("applejack" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/champagne
 	name = "Eau d' Dandy Brut Champagne"
 	desc = "Finely sourced from only the most pretentious French vineyards."
 	icon_state = "champagne_bottle"
-	list_reagents = list("champagne" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/champagne/empty
-	list_reagents = list("champagne" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/blazaam
 	name = "Ginbad's Blazaam"
 	desc = "You feel like you should give the bottle a good rub before opening."
 	icon_state = "blazaambottle"
-	list_reagents = list("blazaam" = 100)
+	list_reagents = list(/datum/reagent/consumable/ethanol/blazaam = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/blazaam/empty
-	list_reagents = list("blazaam" = 0)
+	list_reagents = null
 
 /obj/item/reagent_containers/food/drinks/bottle/trappist
 	name = "Mont de Requin Trappistes Bleu"
 	desc = "Brewed in space-Belgium. Fancy!"
 	icon_state = "trappistbottle"
 	volume = 50
-	list_reagents = list("trappist" = 50)
+	list_reagents = list(/datum/reagent/consumable/ethanol/trappist = 50)
 
 /obj/item/reagent_containers/food/drinks/bottle/trappist/empty
-	list_reagents = list("trappist" = 0)
+	list_reagents = null
 
 //////////////////////////JUICES AND STUFF ///////////////////////
 
@@ -428,7 +427,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	isGlass = FALSE
-	list_reagents = list("orangejuice" = 100)
+	list_reagents = list(/datum/reagent/consumable/orangejuice = 100)
 	foodtype = FRUIT| BREAKFAST
 
 /obj/item/reagent_containers/food/drinks/bottle/cream
@@ -439,7 +438,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	isGlass = FALSE
-	list_reagents = list("cream" = 100)
+	list_reagents = list(/datum/reagent/consumable/cream = 100)
 	foodtype = DAIRY
 
 /obj/item/reagent_containers/food/drinks/bottle/tomatojuice
@@ -450,7 +449,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	isGlass = FALSE
-	list_reagents = list("tomatojuice" = 100)
+	list_reagents = list(/datum/reagent/consumable/tomatojuice = 100)
 	foodtype = VEGETABLES
 
 /obj/item/reagent_containers/food/drinks/bottle/limejuice
@@ -461,7 +460,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	isGlass = FALSE
-	list_reagents = list("limejuice" = 100)
+	list_reagents = list(/datum/reagent/consumable/limejuice = 100)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/drinks/bottle/menthol
@@ -472,18 +471,18 @@
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	isGlass = FALSE
-	list_reagents = list("menthol" = 100)
+	list_reagents = list(/datum/reagent/consumable/menthol = 100)
 
 /obj/item/reagent_containers/food/drinks/bottle/grenadine
 	name = "Jester Grenadine"
 	desc = "Contains 0% real cherries!"
 	icon_state = "grenadine"
 	isGlass = TRUE
-	list_reagents = list("grenadine" = 100)
+	list_reagents = list(/datum/reagent/consumable/grenadine = 100)
 	foodtype = FRUIT
 
 /obj/item/reagent_containers/food/drinks/bottle/grenadine/empty
-	list_reagents = list("grenadine" = 0)
+	list_reagents = null
 
 ////////////////////////// MOLOTOV ///////////////////////
 /obj/item/reagent_containers/food/drinks/bottle/molotov
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 9c6fddac5d..0d769932db 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -81,7 +81,7 @@
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda
 	name = "Soda Water"
-	list_reagents = list("sodawater" = 50)
+	list_reagents = list(/datum/reagent/consumable/sodawater = 50)
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola
 	name = "Space Cola"
@@ -89,11 +89,11 @@
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
 	name = "Nuka Cola"
-	list_reagents = list("nuka_cola" = 50)
+	list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb
 	name = "Syndicat Bomb"
-	list_reagents = list("syndicatebomb" = 50)
+	list_reagents = list(/datum/reagent/consumable/ethanol/syndicatebomb = 50)
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/reagent_containers/food/snacks/egg)) //breaking eggs
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 9a69c1b3d1..d8dafb7b8e 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -16,7 +16,6 @@
 	//Possible_states has the reagent id as key and a list of, in order, the icon_state, the name and the desc as values. Used in the on_reagent_change(changetype) to change names, descs and sprites.
 	var/list/possible_states = list(
 	 /datum/reagent/consumable/ketchup = list("ketchup", "ketchup bottle", "You feel more American already."),
-	 /datum/reagent/consumable/mustard = list("mustard", "mustard bottle", "A spice mixed with enzymes and water."),
 	 /datum/reagent/consumable/capsaicin = list("hotsauce", "hotsauce bottle", "You can almost TASTE the stomach ulcers now!"),
 	 /datum/reagent/consumable/enzyme = list("enzyme", "universal enzyme bottle", "Used in cooking various dishes"),
 	 /datum/reagent/consumable/soysauce = list("soysauce", "soy sauce bottle", "A salty soy-based flavoring"),
@@ -26,7 +25,7 @@
 	 /datum/reagent/consumable/cornoil = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),
 	 /datum/reagent/consumable/sugar = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"),
 	 /datum/reagent/consumable/mayonnaise = list("mayonnaise", "mayonnaise jar", "An oily condiment made from egg yolks."),
-	 /datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "Hand wipes not included."),
+	 /datum/reagent/consumable/bbqsauce = list("bbqsauce", "BBQ sauce", "Hand wipes not included."),
 	 /datum/reagent/consumable/peanut_butter = list("peanutbutter", "peanut butter jar", "A deliciously and sticky spread made from peanuts."))
 	var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
 
@@ -193,7 +192,7 @@
 	desc = "A big bag of flour. Good for baking!"
 	icon_state = "flour"
 	item_state = "flour"
-	list_reagents = list("flour" = 30)
+	list_reagents = list(/datum/reagent/consumable/flour = 30)
 	possible_states = list()
 
 /obj/item/reagent_containers/food/condiment/soymilk
@@ -203,7 +202,7 @@
 	item_state = "carton"
 	lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
-	list_reagents = list("soymilk" = 50)
+	list_reagents = list(/datum/reagent/consumable/soymilk = 50)
 	possible_states = list()
 
 /obj/item/reagent_containers/food/condiment/rice
@@ -211,21 +210,21 @@
 	desc = "A big bag of rice. Good for cooking!"
 	icon_state = "rice"
 	item_state = "flour"
-	list_reagents = list("rice" = 30)
+	list_reagents = list(/datum/reagent/consumable/rice = 30)
 	possible_states = list()
 
 /obj/item/reagent_containers/food/condiment/soysauce
 	name = "soy sauce"
 	desc = "A salty soy-based flavoring."
 	icon_state = "soysauce"
-	list_reagents = list("soysauce" = 50)
+	list_reagents = list(/datum/reagent/consumable/soysauce = 50)
 	possible_states = list()
 
 /obj/item/reagent_containers/food/condiment/mayonnaise
 	name = "mayonnaise"
 	desc = "An oily condiment made from egg yolks."
 	icon_state = "mayonnaise"
-	list_reagents = list("mayonnaise" = 50)
+	list_reagents = list(/datum/reagent/consumable/mayonnaise = 50)
 	possible_states = list()
 
 
@@ -239,7 +238,17 @@
 	volume = 10
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list()
-	possible_states = list("ketchup" = list("condi_ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "soysauce" = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"), "blackpepper" = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), "sugar" = list("condi_sugar", "Sugar", "Tasty spacey sugar!"), "astrotame" = list("condi_astrotame", "Astrotame", "The sweetness of a thousand sugars but none of the calories."))
+	possible_states = list(/datum/reagent/consumable/ketchup = list("condi_ketchup", "Ketchup", "You feel more American already."),
+						/datum/reagent/consumable/capsaicin = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"),
+						/datum/reagent/consumable/soysauce = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"),
+						/datum/reagent/consumable/frostoil = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"),
+						/datum/reagent/consumable/sodiumchloride = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"),
+						/datum/reagent/consumable/blackpepper = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"),
+						/datum/reagent/consumable/cornoil = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"),
+						/datum/reagent/consumable/sugar = list("condi_sugar", "Sugar", "Tasty spacey sugar!"),
+						/datum/reagent/consumable/astrotame = list("condi_astrotame", "Astrotame", "The sweetness of a thousand sugars but none of the calories."),
+						/datum/reagent/consumable/mustard = list("condi_mustard", "Mustard", "A spice mixed with enzymes and water."),
+						/datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "Hand wipes not included."))
 
 /obj/item/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
 	return
@@ -282,13 +291,13 @@
 /obj/item/reagent_containers/food/condiment/pack/ketchup
 	name = "ketchup pack"
 	originalname = "ketchup"
-	list_reagents = list("ketchup" = 10)
+	list_reagents = list(/datum/reagent/consumable/ketchup = 10)
 
 //Mustard
 /obj/item/reagent_containers/food/condiment/pack/mustard
 	name = "mustard pack"
 	originalname = "mustard"
-	list_reagents = list("mustard" = 10)
+	list_reagents = list(/datum/reagent/consumable/mustard = 10)
 
 //Hot sauce
 /obj/item/reagent_containers/food/condiment/pack/hotsauce
@@ -299,9 +308,9 @@
 /obj/item/reagent_containers/food/condiment/pack/astrotame
 	name = "astrotame pack"
 	originalname = "astrotame"
-	list_reagents = list("astrotame" = 5)
+	list_reagents = list(/datum/reagent/consumable/astrotame = 5)
 
 /obj/item/reagent_containers/food/condiment/pack/bbqsauce
 	name = "bbq sauce pack"
 	originalname = "bbq sauce"
-	list_reagents = list("bbqsauce" = 10)
+	list_reagents = list(/datum/reagent/consumable/bbqsauce = 10)
diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm
index 59a9141ca8..28fb2edf61 100644
--- a/code/modules/food_and_drinks/food/snacks/meat.dm
+++ b/code/modules/food_and_drinks/food/snacks/meat.dm
@@ -8,7 +8,7 @@
 	icon_state = "meat"
 	dried_type = /obj/item/reagent_containers/food/snacks/sosjerky/healthy
 	bitesize = 3
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, "cooking_oil" = 2) //Meat has fats that a food processor can process into cooking oil
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2) //Meat has fats that a food processor can process into cooking oil
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain
 	slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain
 	slices_num = 3
@@ -63,7 +63,7 @@
 	icon_state = "crabmeatraw"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/crab
 	bitesize = 3
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "cooking_oil" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cooking_oil = 3)
 	filling_color = "#EAD079"
 	tastes = list("raw crab" = 1)
 	foodtype = RAW | MEAT
@@ -73,7 +73,7 @@
 	desc = "Some deliciously cooked crab meat."
 	icon_state = "crabmeat"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, "cooking_oil" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/cooking_oil = 2)
 	filling_color = "#DFB73A"
 	tastes = list("crab" = 1)
 	foodtype = MEAT
@@ -225,7 +225,7 @@
 	name = "bear meat"
 	desc = "A very manly slab of meat."
 	icon_state = "bearmeat"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/medicine/morphine = 5, /datum/reagent/consumable/nutriment/vitamin = 2, "cooking_oil" = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/medicine/morphine = 5, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/cooking_oil = 6)
 	filling_color = "#FFB6C1"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/bear
 	slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/bear
@@ -258,7 +258,7 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/goliath
 	name = "goliath meat"
 	desc = "A slab of goliath meat. It's not very edible now, but it cooks great in lava."
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin = 5, "cooking_oil" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin = 5, /datum/reagent/consumable/cooking_oil = 3)
 	icon_state = "goliathmeat"
 	tastes = list("meat" = 1)
 	foodtype = RAW | MEAT | TOXIC
@@ -271,7 +271,7 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/meatwheat
 	name = "meatwheat clump"
 	desc = "This doesn't look like meat, but your standards aren't <i>that</i> high to begin with."
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/blood = 5, "cooking_oil" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/blood = 5, /datum/reagent/consumable/cooking_oil = 1)
 	filling_color = rgb(150, 0, 0)
 	icon_state = "meatwheat_clump"
 	bitesize = 4
@@ -281,7 +281,7 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/gorilla
 	name = "gorilla meat"
 	desc = "Much meatier than monkey meat."
-	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1, "cooking_oil" = 5) //Plenty of fat!
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/cooking_oil = 5) //Plenty of fat!
 
 /obj/item/reagent_containers/food/snacks/meat/rawbacon
 	name = "raw piece of bacon"
@@ -289,7 +289,7 @@
 	icon_state = "bacon"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/bacon
 	bitesize = 2
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "cooking_oil" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cooking_oil = 3)
 	filling_color = "#B22222"
 	tastes = list("bacon" = 1)
 	foodtype = RAW | MEAT
@@ -299,7 +299,7 @@
 	desc = "A delicious piece of bacon."
 	icon_state = "baconcooked"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 2)
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, "cooking_oil" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/consumable/cooking_oil = 2)
 	filling_color = "#854817"
 	tastes = list("bacon" = 1)
 	foodtype = MEAT | BREAKFAST
@@ -307,7 +307,7 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/gondola
 	name = "gondola meat"
 	desc = "According to legends of old, consuming raw gondola flesh grants one inner peace."
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, "tranquility" = 5, "cooking_oil" = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/tranquility = 5, /datum/reagent/consumable/cooking_oil = 3)
 	tastes = list("meat" = 4, "tranquility" = 1)
 	filling_color = "#9A6750"
 	cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/gondola
diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm
index 4f72405c8a..b18dfc7968 100644
--- a/code/modules/food_and_drinks/food/snacks_bread.dm
+++ b/code/modules/food_and_drinks/food/snacks_bread.dm
@@ -149,7 +149,7 @@
 	icon_state = "mimanabread"
 	slice_path = /obj/item/reagent_containers/food/snacks/breadslice/mimana
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 20, "mutetoxin" = 5, "nothing" = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/toxin/mutetoxin = 5, /datum/reagent/consumable/nothing = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("bread" = 10, "silence" = 10)
 	foodtype = GRAIN | FRUIT
 
@@ -158,7 +158,7 @@
 	desc = "A slice of silence!"
 	icon_state = "mimanabreadslice"
 	filling_color = "#C0C0C0"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 2, "mutetoxin" = 1, "nothing" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/mutetoxin = 1, /datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | FRUIT
 
 /obj/item/reagent_containers/food/snacks/breadslice/custom
diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm
index 073162da96..35b17e67f0 100644
--- a/code/modules/food_and_drinks/food/snacks_burgers.dm
+++ b/code/modules/food_and_drinks/food/snacks_burgers.dm
@@ -81,8 +81,8 @@
 	name = "roburger"
 	desc = "The lettuce is the only organic component. Beep."
 	icon_state = "roburger"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, "nanomachines" = 2, /datum/reagent/consumable/nutriment/vitamin = 5)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 6, "nanomachines" = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/nanomachines = 2, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/nanomachines = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1)
 	foodtype = GRAIN | TOXIC
 
@@ -91,8 +91,8 @@
 	desc = "This massive patty looks like poison. Beep."
 	icon_state = "roburger"
 	volume = 120
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, "nanomachines" = 70, /datum/reagent/consumable/nutriment/vitamin = 10)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 6, "nanomachines" = 70, /datum/reagent/consumable/nutriment/vitamin = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/nanomachines = 70, /datum/reagent/consumable/nutriment/vitamin = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/nanomachines = 70, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("bun" = 4, "lettuce" = 2, "sludge" = 1)
 	foodtype = GRAIN | TOXIC
 
@@ -122,7 +122,7 @@
 	name = "mime burger"
 	desc = "Its taste defies language."
 	icon_state = "mimeburger"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6, "nothing" = 6)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/nothing = 6)
 	foodtype = GRAIN
 
 /obj/item/reagent_containers/food/snacks/burger/brain
@@ -188,7 +188,7 @@
 	desc = "Perfect for hiding the fact it's burnt to a crisp."
 	icon_state = "cburger"
 	color = "#DA0000FF"
-	bonus_reagents = list("redcrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/red = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/orange
@@ -196,7 +196,7 @@
 	desc = "Contains 0% juice."
 	icon_state = "cburger"
 	color = "#FF9300FF"
-	bonus_reagents = list("orangecrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/orange = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/yellow
@@ -204,7 +204,7 @@
 	desc = "Bright to the last bite."
 	icon_state = "cburger"
 	color = "#FFF200FF"
-	bonus_reagents = list("yellowcrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/yellow = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/green
@@ -212,7 +212,7 @@
 	desc = "It's not tainted meat, it's painted meat!"
 	icon_state = "cburger"
 	color = "#A8E61DFF"
-	bonus_reagents = list("greencrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/green = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/blue
@@ -220,7 +220,7 @@
 	desc = "Is this blue rare?"
 	icon_state = "cburger"
 	color = "#00B7EFFF"
-	bonus_reagents = list("bluecrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/blue = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/purple
@@ -228,7 +228,7 @@
 	desc = "Regal and low class at the same time."
 	icon_state = "cburger"
 	color = "#DA00FFFF"
-	bonus_reagents = list("purplecrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/purple = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/black
@@ -236,7 +236,7 @@
 	desc = "This is overcooked."
 	icon_state = "cburger"
 	color = "#1C1C1C"
-	bonus_reagents = list("blackcrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/black = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/white
@@ -244,7 +244,7 @@
 	desc = "Delicous Titanium!"
 	icon_state = "cburger"
 	color = "#FFFFFF"
-	bonus_reagents = list("whitecrayonpowder" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
+	bonus_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/white = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/spell
@@ -277,8 +277,8 @@
 	foodtype = GRAIN | TOXIC
 
 /obj/item/reagent_containers/food/snacks/burger/jelly/cherry
-	bonus_reagents = list("cherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 6, "cherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | FRUIT
 
 /obj/item/reagent_containers/food/snacks/burger/superbite
@@ -298,7 +298,7 @@
 	desc = "HOT! HOT!"
 	icon_state = "fivealarmburger"
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 5)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/capsaicin = 5, "condensedcapsaicin" = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/capsaicin = 5, /datum/reagent/consumable/condensedcapsaicin = 5, /datum/reagent/consumable/nutriment/vitamin = 1)
 	foodtype = GRAIN | MEAT
 
 /obj/item/reagent_containers/food/snacks/burger/rat
@@ -335,7 +335,7 @@
 	name = "mcrib"
 	desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it."
 	icon_state = "mcrib"
-	bonus_reagents = list("bbqsauce" = 5, /datum/reagent/consumable/nutriment/vitamin = 3)
+	bonus_reagents = list(/datum/reagent/consumable/bbqsauce = 5, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("bun" = 2, "pork patty" = 4)
 	foodtype = GRAIN | MEAT
 
@@ -344,7 +344,7 @@
 	desc = "A cheap and greasy imitation of an eggs benedict."
 	icon_state = "mcguffin"
 	tastes = list("muffin" = 2, "bacon" = 3)
-	bonus_reagents = list("eggyolk" = 3, /datum/reagent/consumable/nutriment = 1)
+	bonus_reagents = list(/datum/reagent/consumable/eggyolk = 3, /datum/reagent/consumable/nutriment = 1)
 	foodtype = GRAIN | MEAT | BREAKFAST
 
 /obj/item/reagent_containers/food/snacks/burger/chicken
@@ -352,7 +352,7 @@
 	desc = "A delicious chicken sandwich, it is said the proceeds from this treat helps criminalize homosexuality on the space frontier."
 	icon_state = "chickenburger"
 	tastes = list("bun" = 2, "chicken" = 4, "God's covenant" = 1)
-	bonus_reagents = list("mayonnaise" = 3, "cooking_oil" = 2, /datum/reagent/consumable/nutriment = 2)
+	bonus_reagents = list(/datum/reagent/consumable/mayonnaise = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/nutriment = 2)
 	foodtype = GRAIN | MEAT | FRIED
 
 /obj/item/reagent_containers/food/snacks/burger/cheese
diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm
index 0ecc5e07a7..bb37ec9b5d 100644
--- a/code/modules/food_and_drinks/food/snacks_cake.dm
+++ b/code/modules/food_and_drinks/food/snacks_cake.dm
@@ -40,8 +40,8 @@
 	icon_state = "carrotcake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/carrot
 	slices_num = 5
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, "oculine" = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 20, "oculine" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/oculine = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/medicine/oculine = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
 	foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
 
@@ -50,7 +50,7 @@
 	desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie."
 	icon_state = "carrotcake_slice"
 	filling_color = "#FFA500"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 4, "oculine" = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/medicine/oculine = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
 	foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
 
@@ -171,8 +171,8 @@
 	icon_state = "birthdaycake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/birthday
 	slices_num = 5
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 7, "sprinkles" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 20, "sprinkles" = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/sprinkles = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/sprinkles = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("cake" = 5, "sweetness" = 1)
 	foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
 
@@ -181,7 +181,7 @@
 	desc = "A slice of your birthday."
 	icon_state = "birthdaycakeslice"
 	filling_color = "#DC143C"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 4, "sprinkles" = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sprinkles = 2, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("cake" = 5, "sweetness" = 1)
 	foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
 
@@ -282,7 +282,7 @@
 	desc = "A cake made for angels and chaplains alike! Contains holy water."
 	icon_state = "holy_cake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/holy_cake_slice
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3, "holy_water" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/water/holywater = 10)
 	tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
 	foodtype = GRAIN | DAIRY | SUGAR
 
@@ -351,7 +351,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
 	desc = "A funny cake with a clown face on it."
 	icon_state = "clowncake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/clown_slice
-	bonus_reagents = list(/datum/reagent/consumable/sugar = 15, "laugher" = 15)
+	bonus_reagents = list(/datum/reagent/consumable/sugar = 15, /datum/reagent/consumable/laughter = 15)
 	tastes = list("cake" = 1, "sugar" = 1, "joy" = 10)
 	foodtype = GRAIN | SUGAR | DAIRY
 
@@ -368,7 +368,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
 	desc = "A peach filled cake."
 	icon_state = "peachcake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/peach_slice
-	bonus_reagents = list(/datum/reagent/consumable/sugar = 5, "peachjuice" = 15)
+	bonus_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/consumable/peachjuice = 15)
 	tastes = list("cake" = 1, "sugar" = 1, "peachjuice" = 10)
 	foodtype = GRAIN | SUGAR | DAIRY
 
@@ -385,7 +385,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
 	desc = "A spaceman's trumpet frosted cake."
 	icon_state = "trumpetcake"
 	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/trumpet
-	bonus_reagents = list("polypyr" = 15, "cream" = 5, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/berryjuice = 5)
+	bonus_reagents = list(/datum/reagent/medicine/polypyr = 15, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/berryjuice = 5)
 	filling_color = "#7A3D80"
 	tastes = list("cake" = 4, "violets" = 2, "jam" = 2)
 	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm
index ab52c78e0f..183e64ff7e 100644
--- a/code/modules/food_and_drinks/food/snacks_egg.dm
+++ b/code/modules/food_and_drinks/food/snacks_egg.dm
@@ -15,7 +15,7 @@
 	name = "egg"
 	desc = "An egg!"
 	icon_state = "egg"
-	list_reagents = list("eggyolk" = 5)
+	list_reagents = list(/datum/reagent/consumable/eggyolk = 5)
 	cooked_type = /obj/item/reagent_containers/food/snacks/boiledegg
 	filling_color = "#F0E68C"
 	foodtype = MEAT
diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm
index d68e88c116..96f173f58c 100644
--- a/code/modules/food_and_drinks/food/snacks_frozen.dm
+++ b/code/modules/food_and_drinks/food/snacks_frozen.dm
@@ -3,8 +3,8 @@
 	desc = "Portable Ice-cream in its own packaging."
 	icon = 'icons/obj/food/food.dmi'
 	icon_state = "icecreamsandwich"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "ice" = 2)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 2, "ice" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/ice = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/ice = 2)
 	tastes = list("ice cream" = 1)
 	foodtype = GRAIN | DAIRY
 
@@ -56,7 +56,7 @@
 	desc = "Cherries mixed with ice-cream, known for its filling tastes"
 	icon_state = "cherryshake"
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, "cherryshake" = 15)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/cherryshake = 15)
 	filling_color = "#FFFACD"
 	tastes = list("ice cream" = 1, "charries" = 1)
 	foodtype = FRUIT | DAIRY | SUGAR
@@ -67,7 +67,7 @@
 	desc = "Cherries mixed with ice-cream, known for its filling tastes. This one is a exotic blue!"
 	icon_state = "bluecherryshake"
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, "bluecherryshake" = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/bluecherryshake = 10)
 	filling_color = "#FFFACD"
 	tastes = list("ice cream" = 1, "blue cherries" = 1)
 	foodtype = FRUIT | DAIRY | SUGAR
@@ -77,7 +77,7 @@
 	desc = "The best icecream in space."
 	icon_state = "spacefreezy"
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 6, "bluecherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/bluecherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
 	filling_color = "#87CEFA"
 	tastes = list("blue cherries" = 2, "ice cream" = 2)
 	foodtype = FRUIT | DAIRY
@@ -101,7 +101,7 @@
 	name = "lime snowcone"
 	desc = "Lime syrup drizzled over a snowball in a paper cup."
 	icon_state = "lime_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "limejuice" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/limejuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "limes" = 5)
 	foodtype = FRUIT
 
@@ -109,7 +109,7 @@
 	name = "lemon snowcone"
 	desc = "Lemon syrup drizzled over a snowball in a paper cup."
 	icon_state = "lemon_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "lemonjuice" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/lemonjuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "lemons" = 5)
 	foodtype = FRUIT
 
@@ -117,7 +117,7 @@
 	name = "apple snowcone"
 	desc = "Apple syrup drizzled over a snowball in a paper cup."
 	icon_state = "amber_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "applejuice" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/applejuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "apples" = 5)
 	foodtype = FRUIT
 
@@ -125,7 +125,7 @@
 	name = "grape snowcone"
 	desc = "Grape syrup drizzled over a snowball in a paper cup."
 	icon_state = "grape_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "grapejuice" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/grapejuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "grape" = 5)
 	foodtype = FRUIT
 
@@ -133,7 +133,7 @@
 	name = "orange snowcone"
 	desc = "Orange syrup drizzled over a snowball in a paper cup."
 	icon_state = "orange_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "orangejuice" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/orangejuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "orange" = 5)
 	foodtype = FRUIT
 
@@ -141,7 +141,7 @@
 	name = "bluecherry snowcone"
 	desc = "Bluecherry syrup drizzled over a snowball in a paper cup, how rare!"
 	icon_state = "blue_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "bluecherryjelly" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/bluecherryjelly = 5)
 	tastes = list("ice" = 1, "water" = 1, "blue" = 5, "cherries" = 5)
 	foodtype = FRUIT
 
@@ -149,7 +149,7 @@
 	name = "cherry snowcone"
 	desc = "Cherry syrup drizzled over a snowball in a paper cup."
 	icon_state = "red_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "cherryjelly" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cherryjelly = 5)
 	tastes = list("ice" = 1, "water" = 1, "red" = 5, "cherries" = 5)
 	foodtype = FRUIT
 
@@ -165,7 +165,7 @@
 	name = "peach snowcone"
 	desc = "A peach snowball in a paper cup."
 	icon_state = "peach_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "peachjuice" = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/peachjuice = 10)
 	tastes = list("ice" = 1, "water" = 1, " peach" = 5)
 	foodtype = FRUIT
 
@@ -189,7 +189,7 @@
 	name = "fruit salad snowcone"
 	desc = "A delightful mix of citrus syrups drizzled over a snowball in a paper cup."
 	icon_state = "fruitsalad_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "lemonjuice" = 5, "limejuice" = 5, "orangejuice" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/lemonjuice = 5, /datum/reagent/consumable/limejuice = 5, /datum/reagent/consumable/orangejuice = 5)
 	tastes = list("ice" = 1, "water" = 1, "oranges" = 5, "limes" = 5, "lemons" = 5, "citrus" = 5, "salad" = 5)
 	foodtype = FRUIT
 
@@ -205,47 +205,47 @@
 	name = "mime snowcone"
 	desc = "..."
 	icon_state = "mime_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "nothing" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nothing = 5)
 	tastes = list("ice" = 1, "water" = 1, "nothing" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/clown
 	name = "clown snowcone"
 	desc = "Laughter drizzled over a snowball in a paper cup."
 	icon_state = "clown_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "laughter" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/laughter = 5)
 	tastes = list("ice" = 1, "water" = 1, "jokes" = 5, "brainfreeze" = 5, "joy" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/soda
 	name = "space cola snowcone"
 	desc = "Space Cola drizzled over a snowball in a paper cup."
 	icon_state = "soda_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "space_cola" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/space_cola = 5)
 	tastes = list("ice" = 1, "water" = 1, "cola" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind
 	name = "Space Mountain Wind snowcone"
 	desc = "Space Mountain Wind drizzled over a snowball in a paper cup."
 	icon_state = "kiwi_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "spacemountainwind" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/spacemountainwind = 5)
 	tastes = list("ice" = 1, "water" = 1, "mountain wind" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/pwrgame
 	name = "pwrgame snowcone"
 	desc = "Pwrgame soda drizzled over a snowball in a paper cup."
 	icon_state = "pwrgame_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "pwr_game" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/pwr_game = 5)
 	tastes = list("ice" = 1, "water" = 1, "valid" = 5, "salt" = 5, "wats" = 5)
 
 /obj/item/reagent_containers/food/snacks/snowcones/honey
 	name = "honey snowcone"
 	desc = "Honey drizzled over a snowball in a paper cup."
 	icon_state = "amber_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "honey" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/honey = 5)
 	tastes = list("ice" = 1, "water" = 1, "flowers" = 5, "sweetness" = 5, "wax" = 1)
 
 /obj/item/reagent_containers/food/snacks/snowcones/rainbow
 	name = "rainbow snowcone"
 	desc = "A very colorful snowball in a paper cup."
 	icon_state = "rainbow_sc"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 5, "laughter" = 25)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/laughter = 25)
 	tastes = list("ice" = 1, "water" = 1, "sunlight" = 5, "light" = 5, "slime" = 5, "paint" = 3, "clouds" = 3)
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm
index a32180798d..5103418e6b 100644
--- a/code/modules/food_and_drinks/food/snacks_meat.dm
+++ b/code/modules/food_and_drinks/food/snacks_meat.dm
@@ -19,7 +19,7 @@
 	name = "carp fillet"
 	desc = "A fillet of spess carp meat."
 	icon_state = "fishfillet"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, "carpotoxin" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin/carpotoxin = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
 	bitesize = 6
 	filling_color = "#FA8072"
 	tastes = list("fish" = 1)
@@ -128,7 +128,7 @@
 	icon_state = "bearsteak"
 	trash = /obj/item/trash/plate
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 5, "manlydorf" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/ethanol/manly_dorf = 5)
 	tastes = list("meat" = 1, "salmon" = 1)
 	foodtype = MEAT | ALCOHOL
 
@@ -328,7 +328,7 @@
 	icon_state = "dorndog"
 	trash = /obj/item/trash/plate/alt
 	tastes = list("hotdog" = 2, "mustard and ketchup" = 1, "fryed bread" = 1)
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2, "mustard" = 5, "ketchup" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/mustard = 5, /datum/reagent/consumable/ketchup = 5)
 
 /obj/item/reagent_containers/food/snacks/kebab/rat
 	name = "rat-kebab"
@@ -356,7 +356,7 @@
 	desc = "BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist."
 	icon_state = "ribs"
 	w_class = WEIGHT_CLASS_NORMAL
-	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2, "bbqsauce" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/bbqsauce = 5)
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("meat" = 3, "smokey sauce" = 1)
 	foodtype = MEAT
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index da4d329239..b269ab16a3 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -28,7 +28,7 @@
 	filling_color = "#FF1493"
 	tastes = list("watermelon" = 1)
 	foodtype = FRUIT
-	juice_results = list("watermelonjuice" = 5)
+	juice_results = list(/datum/reagent/consumable/watermelonjuice = 5)
 
 /obj/item/reagent_containers/food/snacks/candy_corn
 	name = "candy corn"
@@ -129,7 +129,7 @@
 	name = "burned mess"
 	desc = "Someone should be demoted from cook for this."
 	icon_state = "badrecipe"
-	list_reagents = list("bad_food" = 30)
+	list_reagents = list(/datum/reagent/toxin/bad_food = 30)
 	filling_color = "#8B4513"
 	foodtype = GROSS
 	dunkable = TRUE
@@ -139,7 +139,7 @@
 	desc = "Tasty fries from fresh Carrots."
 	icon_state = "carrotfries"
 	trash = /obj/item/trash/plate
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, "oculine" = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/oculine = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#FFA500"
 	tastes = list("carrots" = 3, "salt" = 1)
 	foodtype = VEGETABLES
@@ -161,7 +161,7 @@
 	icon_state = "mint"
 	bitesize = 1
 	trash = /obj/item/trash/plate
-	list_reagents = list("minttoxin" = 2)
+	list_reagents = list(/datum/reagent/toxin/minttoxin = 2)
 	filling_color = "#800000"
 	foodtype = TOXIC | SUGAR
 
@@ -380,7 +380,7 @@
 	desc = "Who knew vodka was a fruit?"
 	icon_state = "melonkeg"
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 3)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 9, "vodka" = 15, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/ethanol/vodka = 15, /datum/reagent/consumable/nutriment/vitamin = 4)
 	filling_color = "#FFD700"
 	volume = 80
 	bitesize = 5
@@ -391,8 +391,8 @@
 	name = "honey nut bar"
 	desc = "Oats and nuts compressed together into a bar, held together with a honey glaze."
 	icon_state = "honeybar"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, "honey" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 5, "honey" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/honey = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/honey = 5)
 	filling_color = "#F2CE91"
 	tastes = list("oats" = 3, "nuts" = 2, "honey" = 1)
 	foodtype = FRUIT | SUGAR
@@ -401,8 +401,8 @@
 	name = "stuffed legion"
 	desc = "The former skull of a damned human, filled with goliath meat. It has a decorative lava pool made of ketchup and hotsauce."
 	icon_state = "stuffed_legion"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/consumable/capsaicin = 1, "tricordrazine" = 5)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/capsaicin = 2, "tricordrazine" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/consumable/capsaicin = 1, /datum/reagent/medicine/tricordrazine = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/capsaicin = 2, /datum/reagent/medicine/tricordrazine = 10)
 	tastes = list("death" = 2, "rock" = 1, "meat" = 1, "hot peppers" = 1)
 	foodtype = MEAT
 
@@ -411,7 +411,7 @@
 	desc = "With great power, comes great crepes.  It looks like a pancake filled with jelly but packs quite a punch."
 	icon_state = "powercrepe"
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/iron = 10)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 5, "cherryjelly" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/cherryjelly = 5)
 	force = 20
 	throwforce = 10
 	block_chance = 50
@@ -468,7 +468,7 @@
 	desc = "A colorful, sugary gumball."
 	icon = 'icons/obj/lollipop.dmi'
 	icon_state = "gumball"
-	list_reagents = list(/datum/reagent/consumable/sugar = 5, "bicaridine" = 2, "kelotane" = 2)	//Kek
+	list_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/bicaridine = 2, /datum/reagent/medicine/kelotane = 2)	//Kek
 	tastes = list("candy")
 	foodtype = JUNKFOOD
 
@@ -549,7 +549,7 @@
 	name = "chocolate"
 	desc = "A tiny and sweet chocolate. Has a 'strawberry' filling!"
 	icon_state = "tiny_chocolate"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/coco = 1, "aphro" = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/coco = 1, /datum/reagent/drug/aphrodisiac = 1)
 	filling_color = "#A0522D"
 	tastes = list("chocolate" = 1)
 	foodtype = JUNKFOOD | SUGAR
@@ -567,7 +567,7 @@
 	name = "Canned Peaches"
 	desc = "Just a nice can of ripe peaches swimming in their own juices."
 	icon_state = "peachcan"
-	list_reagents = list("peachjuice" = 20, /datum/reagent/consumable/sugar = 8, /datum/reagent/consumable/nutriment = 2)
+	list_reagents = list(/datum/reagent/consumable/peachjuice = 20, /datum/reagent/consumable/sugar = 8, /datum/reagent/consumable/nutriment = 2)
 	filling_color = "#ffdf26"
 	w_class = WEIGHT_CLASS_NORMAL
 	tastes = list("peaches" = 7, "tin" = 1)
@@ -605,7 +605,7 @@
 	icon_state = "boritos"
 	trash = /obj/item/trash/boritos
 	bitesize = 2
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, "cooking_oil" = 2, /datum/reagent/consumable/sodiumchloride = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/sodiumchloride = 3)
 	filling_color = "#ECA735"
 	tastes = list("fried corn" = 1)
 	foodtype = JUNKFOOD | FRIED
diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm
index 3e27d5fcb4..be406f6399 100644
--- a/code/modules/food_and_drinks/food/snacks_pastry.dm
+++ b/code/modules/food_and_drinks/food/snacks_pastry.dm
@@ -9,7 +9,7 @@
 	icon_state = "donut"
 	bitesize = 5
 	bonus_reagents = list(/datum/reagent/consumable/sugar = 1)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, "sprinkles" = 1, /datum/reagent/consumable/sugar = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/sugar = 2)
 	filling_color = "#D2691E"
 	tastes = list("donut" = 1)
 	foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR | BREAKFAST
@@ -68,8 +68,8 @@
 	name = "Meat Donut"
 	desc = "Tastes as gross as it looks."
 	icon_state = "donut_meat"
-	bonus_reagents = list("ketchup" = 1)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, "ketchup" = 2)
+	bonus_reagents = list(/datum/reagent/consumable/ketchup = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/ketchup = 2)
 	tastes = list("meat" = 1)
 	foodtype = JUNKFOOD | MEAT | GROSS | FRIED | BREAKFAST
 
@@ -77,7 +77,7 @@
 	name = "pink donut"
 	desc = "Goes great with a soy latte."
 	icon_state = "donut_pink"
-	bonus_reagents = list(/datum/reagent/consumable/berryjuice = 3, "sprinkles" = 1) //Extra sprinkles to reward frosting
+	bonus_reagents = list(/datum/reagent/consumable/berryjuice = 3, /datum/reagent/consumable/sprinkles = 1) //Extra sprinkles to reward frosting
 	filling_color = "#E57d9A"
 	decorated_icon = "donut_homer"
 
@@ -85,7 +85,7 @@
 	name = "spaceman's donut"
 	desc = "Goes great with a cold beaker of malk."
 	icon_state = "donut_purple"
-	bonus_reagents = list("polypyr" = 3, "sprinkles" = 1)
+	bonus_reagents = list(/datum/reagent/medicine/polypyr = 3, /datum/reagent/consumable/sprinkles = 1)
 	tastes = list("donut" = 3, "violets" = 1)
 	is_decorated = TRUE
 	filling_color = "#8739BF"
@@ -94,7 +94,7 @@
 	name = "apple donut"
 	desc = "Goes great with a shot of cinnamon schnapps."
 	icon_state = "donut_green"
-	bonus_reagents = list("applejuice" = 3, "sprinkles" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/applejuice = 3, /datum/reagent/consumable/sprinkles = 1)
 	tastes = list("donut" = 3, "green apples" = 1)
 	is_decorated = TRUE
 	filling_color = "#6ABE30"
@@ -103,7 +103,7 @@
 	name = "caramel donut"
 	desc = "Goes great with a mug of hot coco."
 	icon_state = "donut_beige"
-	bonus_reagents = list("caramel" = 3, "sprinkles" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/caramel = 3, /datum/reagent/consumable/sprinkles = 1)
 	tastes = list("donut" = 3, "buttery sweetness" = 1)
 	is_decorated = TRUE
 	filling_color = "#D4AD5B"
@@ -112,7 +112,7 @@
 	name = "chocolate donut"
 	desc = "Goes great with a glass of warm milk."
 	icon_state = "donut_choc"
-	bonus_reagents = list("hot_coco" = 3, "sprinkles" = 1) //the coco reagent is just bitter.
+	bonus_reagents = list(/datum/reagent/consumable/hot_coco = 3, /datum/reagent/consumable/sprinkles = 1) //the coco reagent is just bitter.
 	tastes = list("donut" = 4, "bitterness" = 1)
 	decorated_icon = "donut_choc_sprinkles"
 	filling_color = "#4F230D"
@@ -121,7 +121,7 @@
 	name = "blumpkin donut"
 	desc = "Goes great with a mug of soothing drunken blumpkin."
 	icon_state = "donut_blue"
-	bonus_reagents = list("blumpkinjuice" = 3, "sprinkles" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/blumpkinjuice = 3, /datum/reagent/consumable/sprinkles = 1)
 	tastes = list("donut" = 2, "blumpkin" = 1)
 	is_decorated = TRUE
 	filling_color = "#2788C4"
@@ -130,7 +130,7 @@
 	name = "bungo donut"
 	desc = "Goes great with a mason jar of hippie's delight."
 	icon_state = "donut_yellow"
-	bonus_reagents = list("bungojuice" = 3, "sprinkles" = 1)
+	bonus_reagents = list(/datum/reagent/consumable/bungojuice = 3, /datum/reagent/consumable/sprinkles = 1)
 	tastes = list("donut" = 3, "tropical sweetness" = 1)
 	is_decorated = TRUE
 	filling_color = "#DEC128"
@@ -139,7 +139,7 @@
 	name = "matcha donut"
 	desc = "Goes great with a cup of tea."
 	icon_state = "donut_olive"
-	bonus_reagents = list("teapowder = 3", "sprinkles" = 1)
+	bonus_reagents = list(/datum/reagent/toxin/teapowder = 3, /datum/reagent/consumable/sprinkles = 1)
 	tastes = list("donut" = 3, "matcha" = 1)
 	is_decorated = TRUE
 	filling_color = "#879630"
@@ -167,7 +167,7 @@
 	name = "pink jelly donut"
 	desc = "Goes great with a soy latte."
 	icon_state = "jelly_pink"
-	bonus_reagents = list(/datum/reagent/consumable/berryjuice = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //Extra sprinkles to reward frosting.
+	bonus_reagents = list(/datum/reagent/consumable/berryjuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //Extra sprinkles to reward frosting.
 	filling_color = "#E57d9A"
 	decorated_icon = "jelly_homer"
 
@@ -175,7 +175,7 @@
 	name = "spaceman's jelly donut"
 	desc = "Goes great with a cold beaker of malk."
 	icon_state = "jelly_purple"
-	bonus_reagents = list("polypyr" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/medicine/polypyr = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "violets" = 1)
 	is_decorated = TRUE
 	filling_color = "#8739BF"
@@ -184,7 +184,7 @@
 	name = "apple jelly donut"
 	desc = "Goes great with a shot of cinnamon schnapps."
 	icon_state = "jelly_green"
-	bonus_reagents = list("applejuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/consumable/applejuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "green apples" = 1)
 	is_decorated = TRUE
 	filling_color = "#6ABE30"
@@ -193,7 +193,7 @@
 	name = "caramel jelly donut"
 	desc = "Goes great with a mug of hot coco."
 	icon_state = "jelly_beige"
-	bonus_reagents = list("caramel" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/consumable/caramel = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "buttery sweetness" = 1)
 	is_decorated = TRUE
 	filling_color = "#D4AD5B"
@@ -202,7 +202,7 @@
 	name = "chocolate jelly donut"
 	desc = "Goes great with a glass of warm milk."
 	icon_state = "jelly_choc"
-	bonus_reagents = list("hot_coco" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //the coco reagent is just bitter.
+	bonus_reagents = list(/datum/reagent/consumable/hot_coco = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //the coco reagent is just bitter.
 	tastes = list("jelly" = 1, "donut" = 4, "bitterness" = 1)
 	decorated_icon = "jelly_choc_sprinkles"
 	filling_color = "#4F230D"
@@ -211,7 +211,7 @@
 	name = "blumpkin jelly donut"
 	desc = "Goes great with a mug of soothing drunken blumpkin."
 	icon_state = "jelly_blue"
-	bonus_reagents = list("blumpkinjuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/consumable/blumpkinjuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 2, "blumpkin" = 1)
 	is_decorated = TRUE
 	filling_color = "#2788C4"
@@ -220,7 +220,7 @@
 	name = "bungo jelly donut"
 	desc = "Goes great with a mason jar of hippie's delight."
 	icon_state = "jelly_yellow"
-	bonus_reagents = list("bungojuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/consumable/bungojuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "tropical sweetness" = 1)
 	is_decorated = TRUE
 	filling_color = "#DEC128"
@@ -229,7 +229,7 @@
 	name = "matcha jelly donut"
 	desc = "Goes great with a cup of tea."
 	icon_state = "jelly_olive"
-	bonus_reagents = list("teapowder" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/toxin/teapowder = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "matcha" = 1)
 	is_decorated = TRUE
 	filling_color = "#879630"
@@ -249,14 +249,14 @@
 	name = "pink jelly donut"
 	desc = "Goes great with a soy latte."
 	icon_state = "jelly_pink"
-	bonus_reagents = list(/datum/reagent/consumable/berryjuice = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //Extra sprinkles to reward frosting
+	bonus_reagents = list(/datum/reagent/consumable/berryjuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //Extra sprinkles to reward frosting
 	filling_color = "#E57d9A"
 
 /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet
 	name = "spaceman's jelly donut"
 	desc = "Goes great with a cold beaker of malk."
 	icon_state = "jelly_purple"
-	bonus_reagents = list("polypyr" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/medicine/polypyr = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "violets" = 1)
 	is_decorated = TRUE
 	filling_color = "#8739BF"
@@ -265,7 +265,7 @@
 	name = "apple jelly donut"
 	desc = "Goes great with a shot of cinnamon schnapps."
 	icon_state = "jelly_green"
-	bonus_reagents = list("applejuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/consumable/applejuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "green apples" = 1)
 	is_decorated = TRUE
 	filling_color = "#6ABE30"
@@ -274,7 +274,7 @@
 	name = "caramel jelly donut"
 	desc = "Goes great with a mug of hot coco."
 	icon_state = "jelly_beige"
-	bonus_reagents = list("caramel" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/consumable/caramel = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "buttery sweetness" = 1)
 	is_decorated = TRUE
 	filling_color = "#D4AD5B"
@@ -283,7 +283,7 @@
 	name = "chocolate jelly donut"
 	desc = "Goes great with a glass of warm milk."
 	icon_state = "jelly_choc"
-	bonus_reagents = list("hot_coco" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //the coco reagent is just bitter.
+	bonus_reagents = list(/datum/reagent/consumable/hot_coco = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1) //the coco reagent is just bitter.
 	tastes = list("jelly" = 1, "donut" = 4, "bitterness" = 1)
 	decorated_icon = "jelly_choc_sprinkles"
 	filling_color = "#4F230D"
@@ -292,7 +292,7 @@
 	name = "blumpkin jelly donut"
 	desc = "Goes great with a mug of soothing drunken blumpkin."
 	icon_state = "jelly_blue"
-	bonus_reagents = list("blumpkinjuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/consumable/blumpkinjuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 2, "blumpkin" = 1)
 	is_decorated = TRUE
 	filling_color = "#2788C4"
@@ -301,7 +301,7 @@
 	name = "bungo jelly donut"
 	desc = "Goes great with a mason jar of hippie's delight."
 	icon_state = "jelly_yellow"
-	bonus_reagents = list("bungojuice" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/consumable/bungojuice = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "tropical sweetness" = 1)
 	is_decorated = TRUE
 	filling_color = "#DEC128"
@@ -310,7 +310,7 @@
 	name = "matcha jelly donut"
 	desc = "Goes great with a cup of tea."
 	icon_state = "jelly_olive"
-	bonus_reagents = list("teapowder" = 3, "sprinkles" = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+	bonus_reagents = list(/datum/reagent/toxin/teapowder = 3, /datum/reagent/consumable/sprinkles = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
 	tastes = list("jelly" = 1, "donut" = 3, "matcha" = 1)
 	is_decorated = TRUE
 	filling_color = "#879630"
@@ -405,7 +405,7 @@
 	trash = /obj/item/trash/waffles
 	bitesize = 4
 	bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 2)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 8, "mushroomhallucinogen" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/drug/mushroomhallucinogen = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
 	filling_color = "#00BFFF"
 	tastes = list("waffle" = 1, "mushrooms" = 1)
 	foodtype = GRAIN | VEGETABLES | SUGAR | BREAKFAST
@@ -447,7 +447,7 @@
 	name = "\improper Dank-pocket"
 	desc = "The food of choice for the seasoned botanist."
 	icon_state = "dankpocket"
-	list_reagents = list("lipolicide" = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4)
+	list_reagents = list(/datum/reagent/toxin/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4)
 	filling_color = "#00FF00"
 	tastes = list("meat" = 2, "dough" = 2)
 	foodtype = GRAIN | VEGETABLES
@@ -509,7 +509,7 @@
 	icon_state = "hotdog"
 	bitesize = 3
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 3)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 6, "ketchup" = 3, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/ketchup = 3, /datum/reagent/consumable/nutriment/vitamin = 3)
 	filling_color = "#8B0000"
 	tastes = list("bun" = 3, "meat" = 2)
 	foodtype = GRAIN | MEAT | VEGETABLES
@@ -610,8 +610,8 @@
 	name = "honey bun"
 	desc = "A sticky pastry bun glazed with honey."
 	icon_state = "honeybun"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "honey" = 1)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 5, "honey" = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/honey = 1)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/honey = 5)
 	filling_color = "#F2CE91"
 	tastes = list("pastry" = 1, "sweetness" = 1)
 	foodtype = GRAIN | SUGAR
diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm
index 3cc30ba9b7..357a921c66 100644
--- a/code/modules/food_and_drinks/food/snacks_pie.dm
+++ b/code/modules/food_and_drinks/food/snacks_pie.dm
@@ -61,7 +61,7 @@
 	qdel(src)
 
 /obj/item/reagent_containers/food/snacks/pie/cream/nostun
-	list_reagents = list("laughter" = 15)
+	list_reagents = list(/datum/reagent/consumable/laughter = 15)
 	stunning = FALSE
 
 /obj/item/reagent_containers/food/snacks/pie/cream/body
@@ -128,7 +128,7 @@
 	icon_state = "amanita_pie"
 	bitesize = 4
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 6, "amatoxin" = 3, "mushroomhallucinogen" = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/toxin/amatoxin = 3, /datum/reagent/drug/mushroomhallucinogen = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("pie" = 1, "mushroom" = 1)
 	foodtype = GRAIN | VEGETABLES | TOXIC | GROSS
 
@@ -223,7 +223,7 @@
 	name = "mime tart"
 	desc = "..."
 	icon_state = "mimetart"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4, "nothing" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/nothing = 10)
 	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("pie" = 1, "nothing" = 1)
 	foodtype = GRAIN
@@ -329,6 +329,6 @@
 	name = "peach pie"
 	desc = "A pie with peach filling."
 	icon_state = "strawberrypie"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 6, "peachjuice" = 15)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/peachjuice = 15)
 	tastes = list("peach" = 1, "pie" = 1)
 	foodtype = GRAIN | FRUIT
diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm
index ebb6393e0b..ebc67a28c1 100644
--- a/code/modules/food_and_drinks/food/snacks_pizza.dm
+++ b/code/modules/food_and_drinks/food/snacks_pizza.dm
@@ -6,7 +6,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	slices_num = 6
 	volume = 80
-	list_reagents = list(/datum/reagent/consumable/nutriment = 30, "tomatojuice" = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
 	foodtype = GRAIN | DAIRY | VEGETABLES
 
@@ -42,7 +42,7 @@
 	icon_state = "meatpizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/meat
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 8)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 30, "tomatojuice" = 6, /datum/reagent/consumable/nutriment/vitamin = 8)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 30, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 8)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
 	foodtype = GRAIN | VEGETABLES| DAIRY | MEAT
 
@@ -78,7 +78,7 @@
 	icon_state = "vegetablepizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/vegetable
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 25, "tomatojuice" = 6, "oculine" = 12, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/oculine = 12, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1)
 	foodtype = GRAIN | VEGETABLES | DAIRY
 
@@ -96,7 +96,7 @@
 	icon_state = "donkpocketpizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/donkpocket
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 25, "tomatojuice" = 6, /datum/reagent/medicine/omnizine = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/medicine/omnizine = 10, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1)
 	foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD
 
@@ -114,7 +114,7 @@
 	icon_state = "dankpizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/dank
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 6)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 25, "doctorsdelight" = 5, "tomatojuice" = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
 	foodtype = GRAIN | VEGETABLES | FRUIT | DAIRY
 
diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm
index 59c4022507..e272733235 100644
--- a/code/modules/food_and_drinks/food/snacks_salad.dm
+++ b/code/modules/food_and_drinks/food/snacks_salad.dm
@@ -35,8 +35,8 @@
 	name = "valid salad"
 	desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it."
 	icon_state = "validsalad"
-	bonus_reagents = list("doctorsdelight" = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 8, "doctorsdelight" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	bonus_reagents = list(/datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/doctor_delight = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("leaves" = 1, "potato" = 1, "meat" = 1, "valids" = 1)
 	foodtype = VEGETABLES | MEAT | FRIED | JUNKFOOD | FRUIT
 
diff --git a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
index 276c085b54..3cc4cfe63f 100644
--- a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
+++ b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
@@ -48,8 +48,8 @@
 	foodtype  = GRAIN | TOXIC
 
 /obj/item/reagent_containers/food/snacks/jellysandwich/cherry
-	bonus_reagents = list("cherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 2, "cherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	bonus_reagents = list(/datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype = GRAIN | FRUIT
 
 /obj/item/reagent_containers/food/snacks/jellysandwich/pbj
@@ -59,13 +59,13 @@
 	tastes = list("bread" = 1, "jelly" = 1, "peanuts" = 1)
 
 /obj/item/reagent_containers/food/snacks/jellysandwich/pbj/cherry
-	bonus_reagents = list("cherryjelly" = 5, "peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 2, "cherryjelly" = 5, "peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	bonus_reagents = list(/datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype = GRAIN | FRUIT
 
 /obj/item/reagent_containers/food/snacks/jellysandwich/pbj/slime
-	bonus_reagents = list(/datum/reagent/toxin/slimejelly = 5, "peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/slimejelly = 5, "peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	bonus_reagents = list(/datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/slimejelly = 5, /datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype  = GRAIN | TOXIC
 
 /obj/item/reagent_containers/food/snacks/peanutbutter_sandwich
@@ -75,8 +75,8 @@
 	icon_state = "peanutbuttersandwich"
 	trash = /obj/item/trash/plate
 	bitesize = 3
-	bonus_reagents = list("peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 2, "peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	bonus_reagents = list(/datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype  = GRAIN
 
 /obj/item/reagent_containers/food/snacks/notasandwich
@@ -101,8 +101,8 @@
 	foodtype = GRAIN
 
 /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
-	bonus_reagents = list("cherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "cherryjelly" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	bonus_reagents = list(/datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/cherryjelly = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype = GRAIN | FRUIT | SUGAR
 
 /obj/item/reagent_containers/food/snacks/jelliedtoast/slime
@@ -117,8 +117,8 @@
 	icon_state = "peanutbuttertoast"
 	trash = /obj/item/trash/plate
 	bitesize = 3
-	bonus_reagents = list("peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 1, "peanut_butter" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	bonus_reagents = list(/datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("toast" = 1, "peanuts" = 1)
 	foodtype = GRAIN
 
diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm
index 8049a5813f..a0e1ebcb39 100644
--- a/code/modules/food_and_drinks/food/snacks_soup.dm
+++ b/code/modules/food_and_drinks/food/snacks_soup.dm
@@ -62,7 +62,7 @@
 	icon_state = "wingfangchu"
 	trash = /obj/item/reagent_containers/glass/bowl
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 6, "soysauce" = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/soysauce = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("soy" = 1)
 	foodtype = MEAT
 
@@ -70,8 +70,8 @@
 	name = "clown's tears"
 	desc = "Not very funny."
 	icon_state = "clownstears"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 8, "clownstears" = 10)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/banana = 5, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 8, "clownstears" = 10)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/banana = 5, /datum/reagent/consumable/nutriment/vitamin = 8, /datum/reagent/consumable/clownstears = 10)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/banana = 5, /datum/reagent/water = 5, /datum/reagent/consumable/nutriment/vitamin = 8, /datum/reagent/consumable/clownstears = 10)
 	tastes = list("a bad joke" = 1)
 	foodtype = FRUIT | SUGAR
 
@@ -111,8 +111,8 @@
 	name = "hot chili"
 	desc = "A five alarm Texan Chili!"
 	icon_state = "hotchili"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "tomatojuice" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/capsaicin = 1, "tomatojuice" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("hot peppers" = 1)
 	foodtype = VEGETABLES
 
@@ -120,8 +120,8 @@
 	name = "cold chili"
 	desc = "This slush is barely a liquid!"
 	icon_state = "coldchili"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "tomatojuice" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/frostoil = 1, "tomatojuice" = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/frostoil = 1, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
 	tastes = list("tomato" = 1, "mint" = 1)
 	foodtype = VEGETABLES
 
@@ -138,8 +138,8 @@
 	name = "tomato soup"
 	desc = "Drinking this feels like being a vampire! A tomato vampire..."
 	icon_state = "tomatosoup"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "tomatojuice" = 10, /datum/reagent/consumable/nutriment/vitamin = 3)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 5, "tomatojuice" = 10, /datum/reagent/consumable/nutriment/vitamin = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 3)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 3)
 	tastes = list("tomato" = 1)
 	foodtype = VEGETABLES
 
@@ -147,7 +147,7 @@
 	name = "eyeball soup"
 	desc = "It looks back at you..."
 	icon_state = "eyeballsoup"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "liquidgibs" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/liquidgibs = 3)
 	tastes = list("tomato" = 1, "squirming" = 1)
 	foodtype = MEAT | GROSS
 
@@ -187,7 +187,7 @@
 	icon_state = "spacylibertyduff"
 	bitesize = 3
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 6, "mushroomhallucinogen" = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/drug/mushroomhallucinogen = 6)
 	tastes = list("jelly" = 1, "mushroom" = 1)
 	foodtype = VEGETABLES
 
@@ -197,7 +197,7 @@
 	icon_state = "amanitajelly"
 	bitesize = 3
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 6, "mushroomhallucinogen" = 3, "amatoxin" = 6)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/drug/mushroomhallucinogen = 3, /datum/reagent/toxin/amatoxin = 6)
 	tastes = list("jelly" = 1, "mushroom" = 1)
 	foodtype = VEGETABLES | TOXIC
 
@@ -205,8 +205,8 @@
 	name = "stew"
 	desc = "A nice and warm stew. Healthy and strong."
 	icon_state = "stew"
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "tomatojuice" = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 10, "oculine" = 5, "tomatojuice" = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/medicine/oculine = 5, /datum/reagent/consumable/tomatojuice = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
 	bitesize = 7
 	volume = 100
 	tastes = list("tomato" = 1, "carrot" = 1)
@@ -232,8 +232,8 @@
 	name = "electron soup"
 	desc = "A gastronomic curiosity of ethereal origin. It is famed for the minature weather system formed over a properly prepared soup."
 	icon_state = "electronsoup"
-	list_reagents = list(/datum/reagent/consumable/nutriment = 3, "liquidelectricity" = 5)
-	tastes = list("mushroom" = 1, "electrons" = 4, "shockingly good")
+	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/liquidelectricity = 5)
+	tastes = list("mushroom" = 1, "electrons" = 4, "shockingly good" = 1)
 	filling_color = "#CC2B52"
 	foodtype = VEGETABLES | TOXIC
 
diff --git a/code/modules/food_and_drinks/food/snacks_spaghetti.dm b/code/modules/food_and_drinks/food/snacks_spaghetti.dm
index 28a48c8730..d54ba6f030 100644
--- a/code/modules/food_and_drinks/food/snacks_spaghetti.dm
+++ b/code/modules/food_and_drinks/food/snacks_spaghetti.dm
@@ -30,8 +30,8 @@
 	icon_state = "pastatomato"
 	trash = /obj/item/trash/plate
 	bitesize = 4
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, "tomatojuice" = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 6, "tomatojuice" = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4)
 	filling_color = "#DC143C"
 	tastes = list("pasta" = 1, "tomato" = 1)
 	foodtype = GRAIN | VEGETABLES
@@ -44,7 +44,7 @@
 	trash = /obj/item/trash/plate
 	bitesize = 4
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
-	list_reagents = list(/datum/reagent/consumable/nutriment = 12, "tomatojuice" = 20, /datum/reagent/consumable/nutriment/vitamin = 8)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 12, /datum/reagent/consumable/tomatojuice = 20, /datum/reagent/consumable/nutriment/vitamin = 8)
 	filling_color = "#DC143C"
 	tastes = list("pasta" = 1, "tomato" = 1)
 	foodtype = GRAIN | VEGETABLES
@@ -90,7 +90,7 @@
 	icon = 'icons/obj/food/pizzaspaghetti.dmi'
 	icon_state = "beefnoodle"
 	trash = /obj/item/reagent_containers/glass/bowl
-	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 6, "liquidgibs" = 3)
+	bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/liquidgibs = 3)
 	tastes = list("noodle" = 1, "meat" = 1)
 	foodtype = GRAIN | MEAT
 
diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm
index 6427a5eefc..239dd433b0 100644
--- a/code/modules/food_and_drinks/food/snacks_vend.dm
+++ b/code/modules/food_and_drinks/food/snacks_vend.dm
@@ -85,7 +85,7 @@
 	icon_state = "syndi_cakes"
 	desc = "An extremely moist snack cake that tastes just as good after being nuked."
 	trash = /obj/item/trash/syndi_cakes
-	list_reagents = list(/datum/reagent/consumable/nutriment = 4, "doctorsdelight" = 5)
+	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/doctor_delight = 5)
 	filling_color = "#F5F5DC"
 	tastes = list("sweetness" = 3, "cake" = 1)
 	foodtype = GRAIN | FRUIT | VEGETABLES
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index 5c54f63a2f..9df650500a 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -2,385 +2,385 @@
 
 /datum/chemical_reaction/goldschlager
 	name = "Goldschlager"
-	id = "goldschlager"
-	results = list("goldschlager" = 10)
-	required_reagents = list("vodka" = 10, /datum/reagent/gold = 1)
+	id = /datum/reagent/consumable/ethanol/goldschlager
+	results = list(/datum/reagent/consumable/ethanol/goldschlager = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 10, /datum/reagent/gold = 1)
 
 /datum/chemical_reaction/patron
 	name = "Patron"
-	id = "patron"
-	results = list("patron" = 10)
-	required_reagents = list("tequila" = 10, /datum/reagent/silver = 1)
+	id = /datum/reagent/consumable/ethanol/patron
+	results = list(/datum/reagent/consumable/ethanol/patron = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 10, /datum/reagent/silver = 1)
 
 /datum/chemical_reaction/bilk
 	name = "Bilk"
-	id = "bilk"
-	results = list("bilk" = 2)
-	required_reagents = list(/datum/reagent/consumable/milk = 1, "beer" = 1)
+	id = /datum/reagent/consumable/ethanol/bilk
+	results = list(/datum/reagent/consumable/ethanol/bilk = 2)
+	required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/ethanol/beer = 1)
 
 /datum/chemical_reaction/icetea
 	name = "Iced Tea"
-	id = "icetea"
-	results = list("icetea" = 4)
-	required_reagents = list("ice" = 1, "tea" = 3)
+	id = /datum/reagent/consumable/icetea
+	results = list(/datum/reagent/consumable/icetea = 4)
+	required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/tea = 3)
 
 /datum/chemical_reaction/icecoffee
 	name = "Iced Coffee"
-	id = "icecoffee"
-	results = list("icecoffee" = 4)
-	required_reagents = list("ice" = 1, "coffee" = 3)
+	id = /datum/reagent/consumable/icecoffee
+	results = list(/datum/reagent/consumable/icecoffee = 4)
+	required_reagents = list(/datum/reagent/consumable/ice = 1, /datum/reagent/consumable/coffee = 3)
 
 /datum/chemical_reaction/nuka_cola
 	name = "Nuka Cola"
-	id = "nuka_cola"
-	results = list("nuka_cola" = 6)
+	id = /datum/reagent/consumable/nuka_cola
+	results = list(/datum/reagent/consumable/nuka_cola = 6)
 	required_reagents = list(/datum/reagent/uranium = 1, /datum/reagent/consumable/space_cola = 6)
 
 /datum/chemical_reaction/moonshine
 	name = "Moonshine"
-	id = "moonshine"
-	results = list("moonshine" = 10)
+	id = /datum/reagent/consumable/ethanol/moonshine
+	results = list(/datum/reagent/consumable/ethanol/moonshine = 10)
 	required_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 5)
 	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/wine
 	name = "Wine"
-	id = "wine"
-	results = list("wine" = 10)
-	required_reagents = list("grapejuice" = 10)
+	id = /datum/reagent/consumable/ethanol/wine
+	results = list(/datum/reagent/consumable/ethanol/wine = 10)
+	required_reagents = list(/datum/reagent/consumable/grapejuice = 10)
 	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/spacebeer
 	name = "Space Beer"
-	id = "spacebeer"
-	results = list("beer" = 10)
-	required_reagents = list("flour" = 10)
+	id = /datum/reagent/consumable/ethanol/beer
+	results = list(/datum/reagent/consumable/ethanol/beer = 10)
+	required_reagents = list(/datum/reagent/consumable/flour = 10)
 	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/vodka
 	name = "Vodka"
-	id = "vodka"
-	results = list("vodka" = 10)
-	required_reagents = list("potato" = 10)
+	id = /datum/reagent/consumable/ethanol/vodka
+	results = list(/datum/reagent/consumable/ethanol/vodka = 10)
+	required_reagents = list(/datum/reagent/consumable/potato_juice = 10)
 	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/kahlua
 	name = "Kahlua"
-	id = "kahlua"
-	results = list("kahlua" = 5)
-	required_reagents = list("coffee" = 5, /datum/reagent/consumable/sugar = 5)
+	id = /datum/reagent/consumable/ethanol/kahlua
+	results = list(/datum/reagent/consumable/ethanol/kahlua = 5)
+	required_reagents = list(/datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/sugar = 5)
 	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/gin_tonic
 	name = "Gin and Tonic"
-	id = "gintonic"
-	results = list("gintonic" = 3)
-	required_reagents = list("gin" = 2, "tonic" = 1)
+	id = /datum/reagent/consumable/ethanol/gintonic
+	results = list(/datum/reagent/consumable/ethanol/gintonic = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/gin = 2, /datum/reagent/consumable/tonic = 1)
 
 /datum/chemical_reaction/rum_coke
 	name = "Rum and Coke"
-	id = "rumcoke"
-	results = list("rumcoke" = 3)
-	required_reagents = list("rum" = 2, /datum/reagent/consumable/space_cola = 1)
+	id = /datum/reagent/consumable/ethanol/rum_coke
+	results = list(/datum/reagent/consumable/ethanol/rum_coke = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/space_cola = 1)
 
 /datum/chemical_reaction/cuba_libre
 	name = "Cuba Libre"
-	id = "cubalibre"
-	results = list("cubalibre" = 4)
-	required_reagents = list("rumcoke" = 3, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/cuba_libre
+	results = list(/datum/reagent/consumable/ethanol/cuba_libre = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum_coke = 3, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/martini
 	name = "Classic Martini"
-	id = "martini"
-	results = list("martini" = 3)
-	required_reagents = list("gin" = 2, "vermouth" = 1)
+	id = /datum/reagent/consumable/ethanol/martini
+	results = list(/datum/reagent/consumable/ethanol/martini = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/gin = 2, /datum/reagent/consumable/ethanol/vermouth = 1)
 
 /datum/chemical_reaction/vodkamartini
 	name = "Vodka Martini"
-	id = "vodkamartini"
-	results = list("vodkamartini" = 3)
-	required_reagents = list("vodka" = 2, "vermouth" = 1)
+	id = /datum/reagent/consumable/ethanol/vodkamartini
+	results = list(/datum/reagent/consumable/ethanol/vodkamartini = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 2, /datum/reagent/consumable/ethanol/vermouth = 1)
 
 /datum/chemical_reaction/white_russian
 	name = "White Russian"
-	id = "whiterussian"
-	results = list("whiterussian" = 5)
-	required_reagents = list("blackrussian" = 3, "cream" = 2)
+	id = /datum/reagent/consumable/ethanol/white_russian
+	results = list(/datum/reagent/consumable/ethanol/white_russian = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/black_russian = 3, /datum/reagent/consumable/cream = 2)
 
 /datum/chemical_reaction/whiskey_cola
 	name = "Whiskey Cola"
-	id = "whiskeycola"
-	results = list("whiskeycola" = 3)
-	required_reagents = list("whiskey" = 2, /datum/reagent/consumable/space_cola = 1)
+	id = /datum/reagent/consumable/ethanol/whiskey_cola
+	results = list(/datum/reagent/consumable/ethanol/whiskey_cola = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/consumable/space_cola = 1)
 
 /datum/chemical_reaction/screwdriver
 	name = "Screwdriver"
-	id = "screwdrivercocktail"
-	results = list("screwdrivercocktail" = 3)
-	required_reagents = list("vodka" = 2, "orangejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/screwdrivercocktail
+	results = list(/datum/reagent/consumable/ethanol/screwdrivercocktail = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 2, /datum/reagent/consumable/orangejuice = 1)
 
 /datum/chemical_reaction/bloody_mary
 	name = "Bloody Mary"
-	id = "bloodymary"
-	results = list("bloodymary" = 4)
-	required_reagents = list("vodka" = 1, "tomatojuice" = 2, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/bloody_mary
+	results = list(/datum/reagent/consumable/ethanol/bloody_mary = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/tomatojuice = 2, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/gargle_blaster
 	name = "Pan-Galactic Gargle Blaster"
-	id = "gargleblaster"
-	results = list("gargleblaster" = 5)
-	required_reagents = list("vodka" = 1, "gin" = 1, "whiskey" = 1, "cognac" = 1, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/gargle_blaster
+	results = list(/datum/reagent/consumable/ethanol/gargle_blaster = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/ethanol/gin = 1, /datum/reagent/consumable/ethanol/whiskey = 1, /datum/reagent/consumable/ethanol/cognac = 1, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/brave_bull
 	name = "Brave Bull"
-	id = "bravebull"
-	results = list("bravebull" = 3)
-	required_reagents = list("tequila" = 2, "kahlua" = 1)
+	id = /datum/reagent/consumable/ethanol/brave_bull
+	results = list(/datum/reagent/consumable/ethanol/brave_bull = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 2, /datum/reagent/consumable/ethanol/kahlua = 1)
 
 /datum/chemical_reaction/tequila_sunrise
 	name = "Tequila Sunrise"
-	id = "tequilasunrise"
-	results = list("tequilasunrise" = 5)
-	required_reagents = list("tequila" = 2, "orangejuice" = 2, "grenadine" = 1)
+	id = /datum/reagent/consumable/ethanol/tequila_sunrise
+	results = list(/datum/reagent/consumable/ethanol/tequila_sunrise = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 2, /datum/reagent/consumable/orangejuice = 2, /datum/reagent/consumable/grenadine = 1)
 
 /datum/chemical_reaction/toxins_special
 	name = "Toxins Special"
-	id = "toxinsspecial"
-	results = list("toxinsspecial" = 5)
-	required_reagents = list("rum" = 2, "vermouth" = 1, /datum/reagent/toxin/plasma = 2)
+	id = /datum/reagent/consumable/ethanol/toxins_special
+	results = list(/datum/reagent/consumable/ethanol/toxins_special = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/ethanol/vermouth = 1, /datum/reagent/toxin/plasma = 2)
 
 /datum/chemical_reaction/beepsky_smash
 	name = "Beepksy Smash"
-	id = "beepksysmash"
-	results = list("beepskysmash" = 5)
-	required_reagents = list("limejuice" = 2, "quadruple_sec" = 2, /datum/reagent/iron = 1)
+	id = /datum/reagent/consumable/ethanol/beepsky_smash
+	results = list(/datum/reagent/consumable/ethanol/beepsky_smash = 5)
+	required_reagents = list(/datum/reagent/consumable/limejuice = 2, /datum/reagent/consumable/ethanol/quadruple_sec = 2, /datum/reagent/iron = 1)
 
 /datum/chemical_reaction/doctor_delight
 	name = "The Doctor's Delight"
-	id = "doctordelight"
-	results = list("doctorsdelight" = 5)
-	required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1, "cryoxadone" = 1)
+	id = /datum/reagent/consumable/doctor_delight
+	results = list(/datum/reagent/consumable/doctor_delight = 5)
+	required_reagents = list(/datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/tomatojuice = 1, /datum/reagent/consumable/orangejuice = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/medicine/cryoxadone = 1)
 
 /datum/chemical_reaction/irish_cream
 	name = "Irish Cream"
-	id = "irishcream"
-	results = list("irishcream" = 3)
-	required_reagents = list("whiskey" = 2, "cream" = 1)
+	id = /datum/reagent/consumable/ethanol/irish_cream
+	results = list(/datum/reagent/consumable/ethanol/irish_cream = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/consumable/cream = 1)
 
 /datum/chemical_reaction/manly_dorf
 	name = "The Manly Dorf"
-	id = "manlydorf"
-	results = list("manlydorf" = 3)
-	required_reagents = list ("beer" = 1, "ale" = 2)
+	id = /datum/reagent/consumable/ethanol/manly_dorf
+	results = list(/datum/reagent/consumable/ethanol/manly_dorf = 3)
+	required_reagents = list (/datum/reagent/consumable/ethanol/beer = 1, /datum/reagent/consumable/ethanol/ale = 2)
 
 /datum/chemical_reaction/greenbeer
 	name = "Green Beer"
-	id = "greenbeer"
-	results = list("greenbeer" = 10)
-	required_reagents = list("greencrayonpowder" = 1, "beer" = 10)
+	id = /datum/reagent/consumable/ethanol/beer/green
+	results = list(/datum/reagent/consumable/ethanol/beer/green = 10)
+	required_reagents = list(/datum/reagent/colorful_reagent/crayonpowder/green = 1, /datum/reagent/consumable/ethanol/beer = 10)
 
 /datum/chemical_reaction/hooch
 	name = "Hooch"
-	id = "hooch"
-	results = list("hooch" = 3)
-	required_reagents = list ("ethanol" = 2, "welding_fuel" = 1)
+	id = /datum/reagent/consumable/ethanol/hooch
+	results = list(/datum/reagent/consumable/ethanol/hooch = 3)
+	required_reagents = list (/datum/reagent/consumable/ethanol = 2, /datum/reagent/fuel = 1)
 	required_catalysts = list(/datum/reagent/consumable/enzyme = 1)
 
 /datum/chemical_reaction/irish_coffee
 	name = "Irish Coffee"
-	id = "irishcoffee"
-	results = list("irishcoffee" = 2)
-	required_reagents = list("irishcream" = 1, "coffee" = 1)
+	id = /datum/reagent/consumable/ethanol/irishcoffee
+	results = list(/datum/reagent/consumable/ethanol/irishcoffee = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/irish_cream = 1, /datum/reagent/consumable/coffee = 1)
 
 /datum/chemical_reaction/b52
 	name = "B-52"
-	id = "b52"
-	results = list("b52" = 3)
-	required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1)
+	id = /datum/reagent/consumable/ethanol/b52
+	results = list(/datum/reagent/consumable/ethanol/b52 = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/irish_cream = 1, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/cognac = 1)
 
 /datum/chemical_reaction/atomicbomb
 	name = "Atomic Bomb"
-	id = "atomicbomb"
-	results = list("atomicbomb" = 10)
-	required_reagents = list("b52" = 10, /datum/reagent/uranium = 1)
+	id = /datum/reagent/consumable/ethanol/atomicbomb
+	results = list(/datum/reagent/consumable/ethanol/atomicbomb = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/b52 = 10, /datum/reagent/uranium = 1)
 
 /datum/chemical_reaction/margarita
 	name = "Margarita"
-	id = "margarita"
-	results = list("margarita" = 3)
-	required_reagents = list("tequila" = 2, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/margarita
+	results = list(/datum/reagent/consumable/ethanol/margarita = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 2, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/longislandicedtea
 	name = "Long Island Iced Tea"
-	id = "longislandicedtea"
-	results = list("longislandicedtea" = 4)
-	required_reagents = list("vodka" = 1, "gin" = 1, "tequila" = 1, "cubalibre" = 1)
+	id = /datum/reagent/consumable/ethanol/longislandicedtea
+	results = list(/datum/reagent/consumable/ethanol/longislandicedtea = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/ethanol/gin = 1, /datum/reagent/consumable/ethanol/tequila = 1, /datum/reagent/consumable/ethanol/cuba_libre = 1)
 
 /datum/chemical_reaction/threemileisland
 	name = "Three Mile Island Iced Tea"
-	id = "threemileisland"
-	results = list("threemileisland" = 10)
-	required_reagents = list("longislandicedtea" = 10, /datum/reagent/uranium = 1)
+	id = /datum/reagent/consumable/ethanol/threemileisland
+	results = list(/datum/reagent/consumable/ethanol/threemileisland = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/longislandicedtea = 10, /datum/reagent/uranium = 1)
 
 /datum/chemical_reaction/whiskeysoda
 	name = "Whiskey Soda"
-	id = "whiskeysoda"
-	results = list("whiskeysoda" = 3)
-	required_reagents = list("whiskey" = 2, "sodawater" = 1)
+	id = /datum/reagent/consumable/ethanol/whiskeysoda
+	results = list(/datum/reagent/consumable/ethanol/whiskeysoda = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/consumable/sodawater = 1)
 
 /datum/chemical_reaction/black_russian
 	name = "Black Russian"
-	id = "blackrussian"
-	results = list("blackrussian" = 5)
-	required_reagents = list("vodka" = 3, "kahlua" = 2)
+	id = /datum/reagent/consumable/ethanol/black_russian
+	results = list(/datum/reagent/consumable/ethanol/black_russian = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 3, /datum/reagent/consumable/ethanol/kahlua = 2)
 
 /datum/chemical_reaction/manhattan
 	name = "Manhattan"
-	id = "manhattan"
-	results = list("manhattan" = 3)
-	required_reagents = list("whiskey" = 2, "vermouth" = 1)
+	id = /datum/reagent/consumable/ethanol/manhattan
+	results = list(/datum/reagent/consumable/ethanol/manhattan = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/consumable/ethanol/vermouth = 1)
 
 /datum/chemical_reaction/manhattan_proj
 	name = "Manhattan Project"
-	id = "manhattan_proj"
-	results = list("manhattan_proj" = 10)
-	required_reagents = list("manhattan" = 10, /datum/reagent/uranium = 1)
+	id = /datum/reagent/consumable/ethanol/manhattan_proj
+	results = list(/datum/reagent/consumable/ethanol/manhattan_proj = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/manhattan = 10, /datum/reagent/uranium = 1)
 
 /datum/chemical_reaction/vodka_tonic
 	name = "Vodka and Tonic"
-	id = "vodkatonic"
-	results = list("vodkatonic" = 3)
-	required_reagents = list("vodka" = 2, "tonic" = 1)
+	id = /datum/reagent/consumable/ethanol/vodkatonic
+	results = list(/datum/reagent/consumable/ethanol/vodkatonic = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 2, /datum/reagent/consumable/tonic = 1)
 
 /datum/chemical_reaction/gin_fizz
 	name = "Gin Fizz"
-	id = "ginfizz"
-	results = list("ginfizz" = 4)
-	required_reagents = list("gin" = 2, "sodawater" = 1, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/ginfizz
+	results = list(/datum/reagent/consumable/ethanol/ginfizz = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/gin = 2, /datum/reagent/consumable/sodawater = 1, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/bahama_mama
 	name = "Bahama mama"
-	id = "bahama_mama"
-	results = list("bahama_mama" = 6)
-	required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1)
+	id = /datum/reagent/consumable/ethanol/bahama_mama
+	results = list(/datum/reagent/consumable/ethanol/bahama_mama = 6)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/orangejuice = 2, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/ice = 1)
 
 /datum/chemical_reaction/singulo
 	name = "Singulo"
-	id = "singulo"
-	results = list("singulo" = 10)
-	required_reagents = list("vodka" = 5, /datum/reagent/radium = 1, "wine" = 5)
+	id = /datum/reagent/consumable/ethanol/singulo
+	results = list(/datum/reagent/consumable/ethanol/singulo = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 5, /datum/reagent/radium = 1, /datum/reagent/consumable/ethanol/wine = 5)
 
 /datum/chemical_reaction/alliescocktail
 	name = "Allies Cocktail"
-	id = "alliescocktail"
-	results = list("alliescocktail" = 2)
-	required_reagents = list("martini" = 1, "vodka" = 1)
+	id = /datum/reagent/consumable/ethanol/alliescocktail
+	results = list(/datum/reagent/consumable/ethanol/alliescocktail = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/martini = 1, /datum/reagent/consumable/ethanol/vodka = 1)
 
 /datum/chemical_reaction/demonsblood
 	name = "Demons Blood"
-	id = "demonsblood"
-	results = list("demonsblood" = 4)
-	required_reagents = list("rum" = 1, "spacemountainwind" = 1, /datum/reagent/blood = 1, "dr_gibb" = 1)
+	id = /datum/reagent/consumable/ethanol/demonsblood
+	results = list(/datum/reagent/consumable/ethanol/demonsblood = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/spacemountainwind = 1, /datum/reagent/blood = 1, /datum/reagent/consumable/dr_gibb = 1)
 
 /datum/chemical_reaction/booger
 	name = "Booger"
-	id = "booger"
-	results = list("booger" = 4)
-	required_reagents = list("cream" = 1, "banana" = 1, "rum" = 1, "watermelonjuice" = 1)
+	id = /datum/reagent/consumable/ethanol/booger
+	results = list(/datum/reagent/consumable/ethanol/booger = 4)
+	required_reagents = list(/datum/reagent/consumable/cream = 1, /datum/reagent/consumable/banana = 1, /datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/watermelonjuice = 1)
 
 /datum/chemical_reaction/antifreeze
 	name = "Anti-freeze"
-	id = "antifreeze"
-	results = list("antifreeze" = 4)
-	required_reagents = list("vodka" = 2, "cream" = 1, "ice" = 1)
+	id = /datum/reagent/consumable/ethanol/antifreeze
+	results = list(/datum/reagent/consumable/ethanol/antifreeze = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 2, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/ice = 1)
 
 /datum/chemical_reaction/barefoot
 	name = "Barefoot"
-	id = "barefoot"
-	results = list("barefoot" = 3)
-	required_reagents = list(/datum/reagent/consumable/berryjuice = 1, "cream" = 1, "vermouth" = 1)
+	id = /datum/reagent/consumable/ethanol/barefoot
+	results = list(/datum/reagent/consumable/ethanol/barefoot = 3)
+	required_reagents = list(/datum/reagent/consumable/berryjuice = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/ethanol/vermouth = 1)
 
 
 ////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri/////
 
 /datum/chemical_reaction/sbiten
 	name = "Sbiten"
-	id = "sbiten"
-	results = list("sbiten" = 10)
-	required_reagents = list("vodka" = 10, /datum/reagent/consumable/capsaicin = 1)
+	id = /datum/reagent/consumable/ethanol/sbiten
+	results = list(/datum/reagent/consumable/ethanol/sbiten = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 10, /datum/reagent/consumable/capsaicin = 1)
 
 /datum/chemical_reaction/red_mead
 	name = "Red Mead"
-	id = "red_mead"
-	results = list("red_mead" = 2)
-	required_reagents = list(/datum/reagent/blood = 1, "mead" = 1)
+	id = /datum/reagent/consumable/ethanol/red_mead
+	results = list(/datum/reagent/consumable/ethanol/red_mead = 2)
+	required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/consumable/ethanol/mead = 1)
 
 /datum/chemical_reaction/mead
 	name = "Mead"
-	id = "mead"
-	results = list("mead" = 2)
-	required_reagents = list("honey" = 2)
+	id = /datum/reagent/consumable/ethanol/mead
+	results = list(/datum/reagent/consumable/ethanol/mead = 2)
+	required_reagents = list(/datum/reagent/consumable/honey = 2)
 	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/iced_beer
 	name = "Iced Beer"
-	id = "iced_beer"
-	results = list("iced_beer" = 6)
-	required_reagents = list("beer" = 5, "ice" = 1)
+	id = /datum/reagent/consumable/ethanol/iced_beer
+	results = list(/datum/reagent/consumable/ethanol/iced_beer = 6)
+	required_reagents = list(/datum/reagent/consumable/ethanol/beer = 5, /datum/reagent/consumable/ice = 1)
 
 /datum/chemical_reaction/grog
 	name = "Grog"
-	id = "grog"
-	results = list("grog" = 2)
-	required_reagents = list("rum" = 1, /datum/reagent/water = 1)
+	id = /datum/reagent/consumable/ethanol/grog
+	results = list(/datum/reagent/consumable/ethanol/grog = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/water = 1)
 
 /datum/chemical_reaction/soy_latte
 	name = "Soy Latte"
-	id = "soy_latte"
-	results = list("soy_latte" = 2)
-	required_reagents = list("coffee" = 1, "soymilk" = 1)
+	id = /datum/reagent/consumable/soy_latte
+	results = list(/datum/reagent/consumable/soy_latte = 2)
+	required_reagents = list(/datum/reagent/consumable/coffee = 1, /datum/reagent/consumable/soymilk = 1)
 
 /datum/chemical_reaction/cafe_latte
 	name = "Cafe Latte"
-	id = "cafe_latte"
-	results = list("cafe_latte" = 2)
-	required_reagents = list("coffee" = 1, /datum/reagent/consumable/milk = 1)
+	id = /datum/reagent/consumable/cafe_latte
+	results = list(/datum/reagent/consumable/cafe_latte = 2)
+	required_reagents = list(/datum/reagent/consumable/coffee = 1, /datum/reagent/consumable/milk = 1)
 
 /datum/chemical_reaction/acidspit
 	name = "Acid Spit"
-	id = "acidspit"
-	results = list("acidspit" = 6)
-	required_reagents = list(/datum/reagent/toxin/acid = 1, "wine" = 5)
+	id = /datum/reagent/consumable/ethanol/acid_spit
+	results = list(/datum/reagent/consumable/ethanol/acid_spit = 6)
+	required_reagents = list(/datum/reagent/toxin/acid = 1, /datum/reagent/consumable/ethanol/wine = 5)
 
 /datum/chemical_reaction/amasec
 	name = "Amasec"
-	id = "amasec"
-	results = list("amasec" = 10)
-	required_reagents = list(/datum/reagent/iron = 1, "wine" = 5, "vodka" = 5)
+	id = /datum/reagent/consumable/ethanol/amasec
+	results = list(/datum/reagent/consumable/ethanol/amasec = 10)
+	required_reagents = list(/datum/reagent/iron = 1, /datum/reagent/consumable/ethanol/wine = 5, /datum/reagent/consumable/ethanol/vodka = 5)
 
 /datum/chemical_reaction/changelingsting
 	name = "Changeling Sting"
-	id = "changelingsting"
-	results = list("changelingsting" = 5)
-	required_reagents = list("screwdrivercocktail" = 1, "lemon_lime" = 2)
+	id = /datum/reagent/consumable/ethanol/changelingsting
+	results = list(/datum/reagent/consumable/ethanol/changelingsting = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/screwdrivercocktail = 1, /datum/reagent/consumable/lemon_lime = 2)
 
 /datum/chemical_reaction/aloe
 	name = "Aloe"
-	id = "aloe"
-	results = list("aloe" = 2)
-	required_reagents = list("irishcream" = 1, "watermelonjuice" = 1)
+	id = /datum/reagent/consumable/ethanol/aloe
+	results = list(/datum/reagent/consumable/ethanol/aloe = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/irish_cream = 1, /datum/reagent/consumable/watermelonjuice = 1)
 
 /datum/chemical_reaction/andalusia
 	name = "Andalusia"
-	id = "andalusia"
-	results = list("andalusia" = 3)
-	required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1)
+	id = /datum/reagent/consumable/ethanol/andalusia
+	results = list(/datum/reagent/consumable/ethanol/andalusia = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/ethanol/whiskey = 1, /datum/reagent/consumable/lemonjuice = 1)
 
 /datum/chemical_reaction/neurotoxin
 	name = "Neurotoxin"
-	id = "neurotoxin"
-	results = list("neurotoxin" = 2)
-	required_reagents = list("gargleblaster" = 1, /datum/reagent/medicine/morphine = 1)
+	id = /datum/reagent/consumable/ethanol/neurotoxin
+	results = list(/datum/reagent/consumable/ethanol/neurotoxin = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/gargle_blaster = 1, /datum/reagent/medicine/morphine = 1)
 	//FermiChem vars: Easy to make, but hard to make potent
 	OptimalTempMin 		= 100 // Lower area of bell curve for determining heat based rate reactions
 	OptimalTempMax		= 950 // Upper end for above
@@ -414,415 +414,415 @@
 
 /datum/chemical_reaction/snowwhite
 	name = "Snow White"
-	id = "snowwhite"
-	results = list("snowwhite" = 2)
-	required_reagents = list("beer" = 1, "lemon_lime" = 1)
+	id = /datum/reagent/consumable/ethanol/snowwhite
+	results = list(/datum/reagent/consumable/ethanol/snowwhite = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/beer = 1, /datum/reagent/consumable/lemon_lime = 1)
 
 /datum/chemical_reaction/irishcarbomb
 	name = "Irish Car Bomb"
-	id = "irishcarbomb"
-	results = list("irishcarbomb" = 2)
-	required_reagents = list("ale" = 1, "irishcream" = 1)
+	id = /datum/reagent/consumable/ethanol/irishcarbomb
+	results = list(/datum/reagent/consumable/ethanol/irishcarbomb = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/ale = 1, /datum/reagent/consumable/ethanol/irish_cream = 1)
 
 /datum/chemical_reaction/syndicatebomb
 	name = "Syndicate Bomb"
-	id = "syndicatebomb"
-	results = list("syndicatebomb" = 2)
-	required_reagents = list("beer" = 1, "whiskeycola" = 1)
+	id = /datum/reagent/consumable/ethanol/syndicatebomb
+	results = list(/datum/reagent/consumable/ethanol/syndicatebomb = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/beer = 1, /datum/reagent/consumable/ethanol/whiskey_cola = 1)
 
 /datum/chemical_reaction/erikasurprise
 	name = "Erika Surprise"
-	id = "erikasurprise"
-	results = list("erikasurprise" = 5)
-	required_reagents = list("ale" = 1, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1)
+	id = /datum/reagent/consumable/ethanol/erikasurprise
+	results = list(/datum/reagent/consumable/ethanol/erikasurprise = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/ale = 1, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/ethanol/whiskey = 1, /datum/reagent/consumable/banana = 1, /datum/reagent/consumable/ice = 1)
 
 /datum/chemical_reaction/devilskiss
 	name = "Devils Kiss"
-	id = "devilskiss"
-	results = list("devilskiss" = 3)
-	required_reagents = list(/datum/reagent/blood = 1, "kahlua" = 1, "rum" = 1)
+	id = /datum/reagent/consumable/ethanol/devilskiss
+	results = list(/datum/reagent/consumable/ethanol/devilskiss = 3)
+	required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/consumable/ethanol/kahlua = 1, /datum/reagent/consumable/ethanol/rum = 1)
 
 /datum/chemical_reaction/hippiesdelight
 	name = "Hippies Delight"
-	id = "hippiesdelight"
-	results = list("hippiesdelight" = 2)
-	required_reagents = list("mushroomhallucinogen" = 1, "gargleblaster" = 1)
+	id = /datum/reagent/consumable/ethanol/hippies_delight
+	results = list(/datum/reagent/consumable/ethanol/hippies_delight = 2)
+	required_reagents = list(/datum/reagent/drug/mushroomhallucinogen = 1, /datum/reagent/consumable/ethanol/gargle_blaster = 1)
 
 /datum/chemical_reaction/bananahonk
 	name = "Banana Honk"
-	id = "bananahonk"
-	results = list("bananahonk" = 2)
-	required_reagents = list("laughter" = 1, "cream" = 1)
+	id = /datum/reagent/consumable/ethanol/bananahonk
+	results = list(/datum/reagent/consumable/ethanol/bananahonk = 2)
+	required_reagents = list(/datum/reagent/consumable/laughter = 1, /datum/reagent/consumable/cream = 1)
 
 /datum/chemical_reaction/silencer
 	name = "Silencer"
-	id = "silencer"
-	results = list("silencer" = 3)
-	required_reagents = list("nothing" = 1, "cream" = 1, /datum/reagent/consumable/sugar = 1)
+	id = /datum/reagent/consumable/ethanol/silencer
+	results = list(/datum/reagent/consumable/ethanol/silencer = 3)
+	required_reagents = list(/datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/cream = 1, /datum/reagent/consumable/sugar = 1)
 
 /datum/chemical_reaction/driestmartini
 	name = "Driest Martini"
-	id = "driestmartini"
-	results = list("driestmartini" = 2)
-	required_reagents = list("nothing" = 1, "gin" = 1)
+	id = /datum/reagent/consumable/ethanol/driestmartini
+	results = list(/datum/reagent/consumable/ethanol/driestmartini = 2)
+	required_reagents = list(/datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/ethanol/gin = 1)
 
 /datum/chemical_reaction/thirteenloko
 	name = "Thirteen Loko"
-	id = "thirteenloko"
-	results = list("thirteenloko" = 3)
-	required_reagents = list("vodka" = 1, "coffee" = 1, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/thirteenloko
+	results = list(/datum/reagent/consumable/ethanol/thirteenloko = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/coffee = 1, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/chocolatepudding
 	name = "Chocolate Pudding"
-	id = "chocolatepudding"
-	results = list("chocolatepudding" = 20)
-	required_reagents = list("chocolate_milk" = 10, "eggyolk" = 5)
+	id = /datum/reagent/consumable/chocolatepudding
+	results = list(/datum/reagent/consumable/chocolatepudding = 20)
+	required_reagents = list(/datum/reagent/consumable/milk/chocolate_milk = 10, /datum/reagent/consumable/eggyolk = 5)
 
 /datum/chemical_reaction/vanillapudding
 	name = "Vanilla Pudding"
-	id = "vanillapudding"
-	results = list("vanillapudding" = 20)
-	required_reagents = list(/datum/reagent/consumable/vanilla = 5, /datum/reagent/consumable/milk = 5, "eggyolk" = 5)
+	id = /datum/reagent/consumable/vanillapudding
+	results = list(/datum/reagent/consumable/vanillapudding = 20)
+	required_reagents = list(/datum/reagent/consumable/vanilla = 5, /datum/reagent/consumable/milk = 5, /datum/reagent/consumable/eggyolk = 5)
 
 /datum/chemical_reaction/drunkenblumpkin
 	name = "Drunken Blumpkin"
-	id = "drunkenblumpkin"
-	results = list("drunkenblumpkin" = 4)
-	required_reagents = list("blumpkinjuice" = 1, "irishcream" = 2, "ice" = 1)
+	id = /datum/reagent/consumable/ethanol/drunkenblumpkin
+	results = list(/datum/reagent/consumable/ethanol/drunkenblumpkin = 4)
+	required_reagents = list(/datum/reagent/consumable/blumpkinjuice = 1, /datum/reagent/consumable/ethanol/irish_cream = 2, /datum/reagent/consumable/ice = 1)
 
 /datum/chemical_reaction/pumpkin_latte
 	name = "Pumpkin space latte"
-	id = "pumpkin_latte"
-	results = list("pumpkin_latte" = 15)
-	required_reagents = list("pumpkinjuice" = 5, "coffee" = 5, "cream" = 5)
+	id = /datum/reagent/consumable/pumpkin_latte
+	results = list(/datum/reagent/consumable/pumpkin_latte = 15)
+	required_reagents = list(/datum/reagent/consumable/pumpkinjuice = 5, /datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/cream = 5)
 
 /datum/chemical_reaction/gibbfloats
 	name = "Gibb Floats"
-	id = "gibbfloats"
-	results = list("gibbfloats" = 15)
-	required_reagents = list("dr_gibb" = 5, "ice" = 5, "cream" = 5)
+	id = /datum/reagent/consumable/gibbfloats
+	results = list(/datum/reagent/consumable/gibbfloats = 15)
+	required_reagents = list(/datum/reagent/consumable/dr_gibb = 5, /datum/reagent/consumable/ice = 5, /datum/reagent/consumable/cream = 5)
 
 /datum/chemical_reaction/triple_citrus
 	name = "triple_citrus"
-	id = "triple_citrus"
-	results = list("triple_citrus" = 5)
-	required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1)
+	id = /datum/reagent/consumable/triple_citrus
+	results = list(/datum/reagent/consumable/triple_citrus = 5)
+	required_reagents = list(/datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/orangejuice = 1)
 
 /datum/chemical_reaction/grape_soda
 	name = "grape soda"
-	id = "grapesoda"
-	results = list("grapesoda" = 2)
-	required_reagents = list("grapejuice" = 1, "sodawater" = 1)
+	id = /datum/reagent/consumable/grape_soda
+	results = list(/datum/reagent/consumable/grape_soda = 2)
+	required_reagents = list(/datum/reagent/consumable/grapejuice = 1, /datum/reagent/consumable/sodawater = 1)
 
 /datum/chemical_reaction/grappa
 	name = "grappa"
-	id = "grappa"
-	results = list("grappa" = 10)
-	required_reagents = list ("wine" = 10)
-	required_catalysts = list ("enzyme" = 5)
+	id = /datum/reagent/consumable/ethanol/grappa
+	results = list(/datum/reagent/consumable/ethanol/grappa = 10)
+	required_reagents = list (/datum/reagent/consumable/ethanol/wine = 10)
+	required_catalysts = list (/datum/reagent/consumable/enzyme = 5)
 
 /datum/chemical_reaction/whiskey_sour
 	name = "Whiskey Sour"
-	id = "whiskey_sour"
-	results = list("whiskey_sour" = 3)
-	required_reagents = list("whiskey" = 1, "lemonjuice" = 1, /datum/reagent/consumable/sugar = 1)
+	id = /datum/reagent/consumable/ethanol/whiskey_sour
+	results = list(/datum/reagent/consumable/ethanol/whiskey_sour = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 1, /datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/sugar = 1)
 	mix_message = "The mixture darkens to a rich gold hue."
 
 /datum/chemical_reaction/fetching_fizz
 	name = "Fetching Fizz"
-	id = "fetching_fizz"
-	results = list("fetching_fizz" = 3)
-	required_reagents = list("nuka_cola" = 1, /datum/reagent/iron = 1) //Manufacturable from only the mining station
+	id = /datum/reagent/consumable/ethanol/fetching_fizz
+	results = list(/datum/reagent/consumable/ethanol/fetching_fizz = 3)
+	required_reagents = list(/datum/reagent/consumable/nuka_cola = 1, /datum/reagent/iron = 1) //Manufacturable from only the mining station
 	mix_message = "The mixture slightly vibrates before settling."
 
 /datum/chemical_reaction/hearty_punch
 	name = "Hearty Punch"
-	id = "hearty_punch"
-	results = list("hearty_punch" = 1)  //Very little, for balance reasons
-	required_reagents = list("bravebull" = 5, "syndicatebomb" = 5, "absinthe" = 5)
+	id = /datum/reagent/consumable/ethanol/hearty_punch
+	results = list(/datum/reagent/consumable/ethanol/hearty_punch = 1)  //Very little, for balance reasons
+	required_reagents = list(/datum/reagent/consumable/ethanol/brave_bull = 5, /datum/reagent/consumable/ethanol/syndicatebomb = 5, /datum/reagent/consumable/ethanol/absinthe = 5)
 	mix_message = "The mixture darkens to a healthy crimson."
 	required_temp = 315 //Piping hot!
 
 /datum/chemical_reaction/bacchus_blessing
 	name = "Bacchus' Blessing"
-	id = "bacchus_blessing"
-	results = list("bacchus_blessing" = 4)
-	required_reagents = list("hooch" = 1, "absinthe" = 1, "manlydorf" = 1, "syndicatebomb" = 1)
+	id = /datum/reagent/consumable/ethanol/bacchus_blessing
+	results = list(/datum/reagent/consumable/ethanol/bacchus_blessing = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/hooch = 1, /datum/reagent/consumable/ethanol/absinthe = 1, /datum/reagent/consumable/ethanol/manly_dorf = 1, /datum/reagent/consumable/ethanol/syndicatebomb = 1)
 	mix_message = "<span class='warning'>The mixture turns to a sickening froth.</span>"
 
 /datum/chemical_reaction/lemonade
 	name = "Lemonade"
-	id = "lemonade"
-	results = list("lemonade" = 5)
-	required_reagents = list("lemonjuice" = 2, /datum/reagent/water = 2, /datum/reagent/consumable/sugar = 1, "ice" = 1)
+	id = /datum/reagent/consumable/lemonade
+	results = list(/datum/reagent/consumable/lemonade = 5)
+	required_reagents = list(/datum/reagent/consumable/lemonjuice = 2, /datum/reagent/water = 2, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/ice = 1)
 	mix_message = "You're suddenly reminded of home."
 
 /datum/chemical_reaction/arnold_palmer
 	name = "Arnold Palmer"
-	id = "arnold_palmer"
-	results = list("arnold_palmer" = 2)
-	required_reagents = list("tea" = 1, "lemonade" = 1)
+	id = /datum/reagent/consumable/tea/arnold_palmer
+	results = list(/datum/reagent/consumable/tea/arnold_palmer = 2)
+	required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/consumable/lemonade = 1)
 	mix_message = "The smells of fresh green grass and sand traps waft through the air as the mixture turns a friendly yellow-orange."
 
 /datum/chemical_reaction/chocolate_milk
 	name = "chocolate milk"
-	id = "chocolate_milk"
-	results = list("chocolate_milk" = 2)
-	required_reagents = list(/datum/reagent/consumable/milk = 1, "cocoa" = 1)
+	id = /datum/reagent/consumable/milk/chocolate_milk
+	results = list(/datum/reagent/consumable/milk/chocolate_milk = 2)
+	required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/coco = 1)
 	mix_message = "The color changes as the mixture blends smoothly."
 
 /datum/chemical_reaction/eggnog
 	name = "eggnog"
-	id = "eggnog"
-	results = list("eggnog" = 15)
-	required_reagents = list("rum" = 5, "cream" = 5, "eggyolk" = 5)
+	id = /datum/reagent/consumable/ethanol/eggnog
+	results = list(/datum/reagent/consumable/ethanol/eggnog = 15)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 5, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/eggyolk = 5)
 
 /datum/chemical_reaction/narsour
 	name = "Nar'sour"
-	id = "narsour"
-	results = list("narsour" = 1)
-	required_reagents = list(/datum/reagent/blood = 1, "lemonjuice" = 1, "demonsblood" = 1)
+	id = /datum/reagent/consumable/ethanol/narsour
+	results = list(/datum/reagent/consumable/ethanol/narsour = 1)
+	required_reagents = list(/datum/reagent/blood = 1, /datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/ethanol/demonsblood = 1)
 	mix_message = "The mixture develops a sinister glow."
 	mix_sound = 'sound/effects/singlebeat.ogg'
 
 /datum/chemical_reaction/quadruplesec
 	name = "Quadruple Sec"
-	id = "quadruple_sec"
-	results = list("quadruple_sec" = 15)
-	required_reagents = list("triple_sec" = 5, "triple_citrus" = 5, "creme_de_menthe" = 5)
+	id = /datum/reagent/consumable/ethanol/quadruple_sec
+	results = list(/datum/reagent/consumable/ethanol/quadruple_sec = 15)
+	required_reagents = list(/datum/reagent/consumable/ethanol/triple_sec = 5, /datum/reagent/consumable/triple_citrus = 5, /datum/reagent/consumable/ethanol/creme_de_menthe = 5)
 	mix_message = "The snap of a taser emanates clearly from the mixture as it settles."
 	mix_sound = 'sound/weapons/taser.ogg'
 
 /datum/chemical_reaction/grasshopper
 	name = "Grasshopper"
-	id = "grasshopper"
-	results = list("grasshopper" = 15)
-	required_reagents = list("cream" = 5, "creme_de_menthe" = 5, "creme_de_cacao" = 5)
+	id = /datum/reagent/consumable/ethanol/grasshopper
+	results = list(/datum/reagent/consumable/ethanol/grasshopper = 15)
+	required_reagents = list(/datum/reagent/consumable/cream = 5, /datum/reagent/consumable/ethanol/creme_de_menthe = 5, /datum/reagent/consumable/ethanol/creme_de_cacao = 5)
 	mix_message = "A vibrant green bubbles forth as the mixture emulsifies."
 
 /datum/chemical_reaction/stinger
 	name = "Stinger"
-	id = "stinger"
-	results = list("stinger" = 15)
-	required_reagents = list("whiskey" = 10, "creme_de_menthe" = 5 )
+	id = /datum/reagent/consumable/ethanol/stinger
+	results = list(/datum/reagent/consumable/ethanol/stinger = 15)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 10, /datum/reagent/consumable/ethanol/creme_de_menthe = 5)
 
 /datum/chemical_reaction/quintuplesec
 	name = "Quintuple Sec"
-	id = "quintuple_sec"
-	results = list("quintuple_sec" = 15)
-	required_reagents = list("quadruple_sec" = 5, "clownstears" = 5, "syndicatebomb" = 5)
+	id = /datum/reagent/consumable/ethanol/quintuple_sec
+	results = list(/datum/reagent/consumable/ethanol/quintuple_sec = 15)
+	required_reagents = list(/datum/reagent/consumable/ethanol/quadruple_sec = 5, /datum/reagent/consumable/clownstears = 5, /datum/reagent/consumable/ethanol/syndicatebomb = 5)
 	mix_message = "Judgement is upon you."
 	mix_message = 'sound/items/airhorn2.ogg'
 
 /datum/chemical_reaction/bastion_bourbon
 	name = "Bastion Bourbon"
-	id = "bastion_bourbon"
-	results = list("bastion_bourbon" = 2)
-	required_reagents = list("tea" = 1, "creme_de_menthe" = 1, "triple_citrus" = 1, /datum/reagent/consumable/berryjuice = 1) //herbal and minty, with a hint of citrus and berry
+	id = /datum/reagent/consumable/ethanol/bastion_bourbon
+	results = list(/datum/reagent/consumable/ethanol/bastion_bourbon = 2)
+	required_reagents = list(/datum/reagent/consumable/tea = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/triple_citrus = 1, /datum/reagent/consumable/berryjuice = 1) //herbal and minty, with a hint of citrus and berry
 	mix_message = "You catch an aroma of hot tea and fruits as the mix blends into a blue-green color."
 
 /datum/chemical_reaction/squirt_cider
 	name = "Squirt Cider"
-	id = "squirt_cider"
-	results = list("squirt_cider" = 1)
-	required_reagents = list(/datum/reagent/water = 1, "tomatojuice" = 1, /datum/reagent/consumable/nutriment = 1)
+	id = /datum/reagent/consumable/ethanol/squirt_cider
+	results = list(/datum/reagent/consumable/ethanol/squirt_cider = 1)
+	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/consumable/tomatojuice = 1, /datum/reagent/consumable/nutriment = 1)
 	mix_message = "The mix swirls and turns a bright red that reminds you of an apple's skin."
 
 /datum/chemical_reaction/fringe_weaver
 	name = "Fringe Weaver"
-	id = "fringe_weaver"
-	results = list("fringe_weaver" = 10)
+	id = /datum/reagent/consumable/ethanol/fringe_weaver
+	results = list(/datum/reagent/consumable/ethanol/fringe_weaver = 10)
 	required_reagents = list(/datum/reagent/consumable/ethanol = 9, /datum/reagent/consumable/sugar = 1) //9 karmotrine, 1 adelhyde
 	mix_message = "The mix turns a pleasant cream color and foams up."
 
 /datum/chemical_reaction/sugar_rush
 	name = "Sugar Rush"
-	id = "sugar_rush"
-	results = list("sugar_rush" = 4)
-	required_reagents = list(/datum/reagent/consumable/sugar = 2, "lemonjuice" = 1, "wine" = 1) //2 adelhyde (sweet), 1 powdered delta (sour), 1 karmotrine (alcohol)
+	id = /datum/reagent/consumable/ethanol/sugar_rush
+	results = list(/datum/reagent/consumable/ethanol/sugar_rush = 4)
+	required_reagents = list(/datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/ethanol/wine = 1) //2 adelhyde (sweet), 1 powdered delta (sour), 1 karmotrine (alcohol)
 	mix_message = "The mixture bubbles and brightens into a girly pink."
 
 /datum/chemical_reaction/crevice_spike
 	name = "Crevice Spike"
-	id = "crevice_spike"
-	results = list("crevice_spike" = 6)
-	required_reagents = list("limejuice" = 2, /datum/reagent/consumable/capsaicin = 4) //2 powdered delta (sour), 4 flanergide (spicy)
+	id = /datum/reagent/consumable/ethanol/crevice_spike
+	results = list(/datum/reagent/consumable/ethanol/crevice_spike = 6)
+	required_reagents = list(/datum/reagent/consumable/limejuice = 2, /datum/reagent/consumable/capsaicin = 4) //2 powdered delta (sour), 4 flanergide (spicy)
 	mix_message = "The mixture stings your eyes as it settles."
 
 /datum/chemical_reaction/sake
 	name = "sake"
-	id = "sake"
-	results = list("sake" = 10)
-	required_reagents = list("rice" = 10)
+	id = /datum/reagent/consumable/ethanol/sake
+	results = list(/datum/reagent/consumable/ethanol/sake = 10)
+	required_reagents = list(/datum/reagent/consumable/rice = 10)
 	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 	mix_message = "The rice grains ferment into a clear, sweet-smelling liquid."
 
 /datum/chemical_reaction/peppermint_patty
 	name = "Peppermint Patty"
-	id = "peppermint_patty"
-	results = list("peppermint_patty" = 10)
-	required_reagents = list("hot_coco" = 6, "creme_de_cacao" = 1, "creme_de_menthe" = 1, "vodka" = 1, "menthol" = 1)
+	id = /datum/reagent/consumable/ethanol/peppermint_patty
+	results = list(/datum/reagent/consumable/ethanol/peppermint_patty = 10)
+	required_reagents = list(/datum/reagent/consumable/hot_coco = 6, /datum/reagent/consumable/ethanol/creme_de_cacao = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/menthol = 1)
 	mix_message = "The coco turns mint green just as the strong scent hits your nose."
 
 /datum/chemical_reaction/alexander
 	name = "Alexander"
-	id = "alexander"
-	results = list("alexander" = 3)
-	required_reagents = list("cognac" = 1, "creme_de_cacao" = 1, "cream" = 1)
+	id = /datum/reagent/consumable/ethanol/alexander
+	results = list(/datum/reagent/consumable/ethanol/alexander = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/cognac = 1, /datum/reagent/consumable/ethanol/creme_de_cacao = 1, /datum/reagent/consumable/cream = 1)
 
 /datum/chemical_reaction/sidecar
 	name = "Sidecar"
-	id = "sidecar"
-	results = list("sidecar" = 4)
-	required_reagents = list("cognac" = 2, "triple_sec" = 1, "lemonjuice" = 1)
+	id = /datum/reagent/consumable/ethanol/sidecar
+	results = list(/datum/reagent/consumable/ethanol/sidecar = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/cognac = 2, /datum/reagent/consumable/ethanol/triple_sec = 1, /datum/reagent/consumable/lemonjuice = 1)
 
 /datum/chemical_reaction/between_the_sheets
 	name = "Between the Sheets"
-	id = "between_the_sheets"
-	results = list("between_the_sheets" = 5)
-	required_reagents = list("rum" = 1, "sidecar" = 4)
+	id = /datum/reagent/consumable/ethanol/between_the_sheets
+	results = list(/datum/reagent/consumable/ethanol/between_the_sheets = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/ethanol/sidecar = 4)
 
 /datum/chemical_reaction/kamikaze
 	name = "Kamikaze"
-	id = "kamikaze"
-	results = list("kamikaze" = 3)
-	required_reagents = list("vodka" = 1, "triple_sec" = 1, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/kamikaze
+	results = list(/datum/reagent/consumable/ethanol/kamikaze = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 1, /datum/reagent/consumable/ethanol/triple_sec = 1, /datum/reagent/consumable/limejuice = 1)
 
 /datum/chemical_reaction/mojito
 	name = "Mojito"
-	id = "mojito"
-	results = list("mojito" = 5)
-	required_reagents = list("rum" = 1, /datum/reagent/consumable/sugar = 1, "limejuice" = 1, "sodawater" = 1, "menthol" = 1)
+	id = /datum/reagent/consumable/ethanol/mojito
+	results = list(/datum/reagent/consumable/ethanol/mojito = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/sodawater = 1, /datum/reagent/consumable/menthol = 1)
 
 /datum/chemical_reaction/fernet_cola
 	name = "Fernet Cola"
-	id = "fernet_cola"
-	results = list("fernet_cola" = 2)
-	required_reagents = list("fernet" = 1, /datum/reagent/consumable/space_cola = 1)
+	id = /datum/reagent/consumable/ethanol/fernet_cola
+	results = list(/datum/reagent/consumable/ethanol/fernet_cola = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/fernet = 1, /datum/reagent/consumable/space_cola = 1)
 
 /datum/chemical_reaction/fanciulli
 	name = "Fanciulli"
-	id = "fanciulli"
-	results = list("fanciulli" = 2)
-	required_reagents = list("manhattan" = 1, "fernet" = 1)
+	id = /datum/reagent/consumable/ethanol/fanciulli
+	results = list(/datum/reagent/consumable/ethanol/fanciulli = 2)
+	required_reagents = list(/datum/reagent/consumable/ethanol/manhattan = 1, /datum/reagent/consumable/ethanol/fernet = 1)
 
 /datum/chemical_reaction/branca_menta
 	name = "Branca Menta"
-	id = "branca_menta"
-	results = list("branca_menta" = 3)
-	required_reagents = list("fernet" = 1, "creme_de_menthe" = 1, "ice" = 1)
+	id = /datum/reagent/consumable/ethanol/branca_menta
+	results = list(/datum/reagent/consumable/ethanol/branca_menta = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/fernet = 1, /datum/reagent/consumable/ethanol/creme_de_menthe = 1, /datum/reagent/consumable/ice = 1)
 
 /datum/chemical_reaction/pwrgame
 	name = "Power Gamer"
-	id = "pwr_game"
-	results = list("pwr_game" = 5)
-	required_reagents = list("sodawater" = 1, "blackcrayonpowder" = 1, /datum/reagent/consumable/sodiumchloride = 1)
+	id = /datum/reagent/consumable/pwr_game
+	results = list(/datum/reagent/consumable/pwr_game = 5)
+	required_reagents = list(/datum/reagent/consumable/sodawater = 1, /datum/reagent/colorful_reagent/crayonpowder/black = 1, /datum/reagent/consumable/sodiumchloride = 1)
 
 /datum/chemical_reaction/pinkmilk
 	name = "Strawberry Milk"
-	id = "pinkmilk"
-	results = list("pinkmilk" = 5)
-	required_reagents = list("aphro+" = 1, /datum/reagent/consumable/milk = 1)
+	id = /datum/reagent/consumable/pinkmilk
+	results = list(/datum/reagent/consumable/pinkmilk = 5)
+	required_reagents = list(/datum/reagent/drug/aphrodisiacplus = 1, /datum/reagent/consumable/milk = 1)
 
 /datum/chemical_reaction/pinktea
 	name = "Strawberry Tea"
-	id = "pinktea"
-	results = list("pinktea" = 5)
-	required_reagents = list("aphro" = 1, "arnold_palmer" = 1, /datum/reagent/consumable/sugar = 1)
+	id = /datum/reagent/consumable/pinktea
+	results = list(/datum/reagent/consumable/pinktea = 5)
+	required_reagents = list(/datum/reagent/drug/aphrodisiac = 1, /datum/reagent/consumable/tea/arnold_palmer = 1, /datum/reagent/consumable/sugar = 1)
 
 /datum/chemical_reaction/blank_paper
 	name = "Blank Paper"
-	id = "blank_paper"
-	results = list("blank_paper" = 3)
-	required_reagents = list("silencer" = 1, "nothing" = 1, "nuka_cola" = 1)
+	id = /datum/reagent/consumable/ethanol/blank_paper
+	results = list(/datum/reagent/consumable/ethanol/blank_paper = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/silencer = 1, /datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/nuka_cola = 1)
 
 /datum/chemical_reaction/wizz_fizz
 	name = "Wizz Fizz"
-	id = "wizz_fizz"
-	results = list("wizz_fizz" = 3)
-	required_reagents = list("triple_sec" = 1, "sodawater" = 1, "champagne" = 1)
+	id = /datum/reagent/consumable/ethanol/wizz_fizz
+	results = list(/datum/reagent/consumable/ethanol/wizz_fizz = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/triple_sec = 1, /datum/reagent/consumable/sodawater = 1, /datum/reagent/consumable/ethanol/champagne = 1)
 	mix_message = "The beverage starts to froth with an almost mystical zeal!"
 	mix_sound = 'sound/effects/bubbles2.ogg'
 
 /datum/chemical_reaction/bug_spray
 	name = "Bug Spray"
-	id = "bug_spray"
-	results = list("bug_spray" = 5)
-	required_reagents = list("triple_sec" = 2, "lemon_lime" = 1, "rum" = 2, "vodka" = 1)
+	id = /datum/reagent/consumable/ethanol/bug_spray
+	results = list(/datum/reagent/consumable/ethanol/bug_spray = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/triple_sec = 2, /datum/reagent/consumable/lemon_lime = 1, /datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/ethanol/vodka = 1)
 	mix_message = "The faint aroma of summer camping trips wafts through the air; but what's that buzzing noise?"
 	mix_sound = 'sound/creatures/bee.ogg'
 
 /datum/chemical_reaction/jack_rose
 	name = "Jack Rose"
-	id = "jack_rose"
-	results = list("jack_rose" = 4)
-	required_reagents = list("grenadine" = 1, "applejack" = 2, "limejuice" = 1)
+	id = /datum/reagent/consumable/ethanol/jack_rose
+	results = list(/datum/reagent/consumable/ethanol/jack_rose = 4)
+	required_reagents = list(/datum/reagent/consumable/grenadine = 1, /datum/reagent/consumable/ethanol/applejack = 2, /datum/reagent/consumable/limejuice = 1)
 	mix_message = "As the grenadine incorporates, the beverage takes on a mellow, red-orange glow."
 
 /datum/chemical_reaction/turbo
 	name = "Turbo"
-	id = "turbo"
-	results = list("turbo" = 5)
-	required_reagents = list("moonshine" = 2, "nitrous_oxide" = 1, "sugar_rush" = 1, "pwr_game" = 1)
+	id = /datum/reagent/consumable/ethanol/turbo
+	results = list(/datum/reagent/consumable/ethanol/turbo = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 2, /datum/reagent/nitrous_oxide = 1, /datum/reagent/consumable/ethanol/sugar_rush = 1, /datum/reagent/consumable/pwr_game = 1)
 
 /datum/chemical_reaction/old_timer
 	name = "Old Timer"
-	id = "old_timer"
-	results = list("old_timer" = 6)
-	required_reagents = list("whiskeysoda" = 3, "parsnipjuice" = 2, "alexander" = 1)
+	id = /datum/reagent/consumable/ethanol/old_timer
+	results = list(/datum/reagent/consumable/ethanol/old_timer = 6)
+	required_reagents = list(/datum/reagent/consumable/ethanol/whiskeysoda = 3, /datum/reagent/consumable/parsnipjuice = 2, /datum/reagent/consumable/ethanol/alexander = 1)
 
 /datum/chemical_reaction/rubberneck
 	name = "Rubberneck"
-	id = "rubberneck"
-	results = list("rubberneck" = 10)
-	required_reagents = list(/datum/reagent/consumable/ethanol = 4, "grey_bull" = 5, "astrotame" = 1)
+	id = /datum/reagent/consumable/ethanol/rubberneck
+	results = list(/datum/reagent/consumable/ethanol/rubberneck = 10)
+	required_reagents = list(/datum/reagent/consumable/ethanol = 4, /datum/reagent/consumable/grey_bull = 5, /datum/reagent/consumable/astrotame = 1)
 
 /datum/chemical_reaction/duplex
 	name = "Duplex"
-	id = "duplex"
-	results = list("duplex" = 4)
-	required_reagents = list("hcider" = 2, "applejuice" = 1, /datum/reagent/consumable/berryjuice = 1)
+	id = /datum/reagent/consumable/ethanol/duplex
+	results = list(/datum/reagent/consumable/ethanol/duplex = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/hcider = 2, /datum/reagent/consumable/applejuice = 1, /datum/reagent/consumable/berryjuice = 1)
 
 /datum/chemical_reaction/trappist
 	name = "Trappist"
-	id = "trappist"
-	results = list("trappist" = 5)
-	required_reagents = list("ale" = 2, "holywater" = 2, /datum/reagent/consumable/sugar = 1)
+	id = /datum/reagent/consumable/ethanol/trappist
+	results = list(/datum/reagent/consumable/ethanol/trappist = 5)
+	required_reagents = list(/datum/reagent/consumable/ethanol/ale = 2, /datum/reagent/water/holywater = 2, /datum/reagent/consumable/sugar = 1)
 
 /datum/chemical_reaction/cream_soda
 	name = "Cream Soda"
-	id = "cream_soda"
-	results = list("cream_soda" = 4)
-	required_reagents = list(/datum/reagent/consumable/sugar = 2, "sodawater" = 2, /datum/reagent/consumable/vanilla = 1)
+	id = /datum/reagent/consumable/cream_soda
+	results = list(/datum/reagent/consumable/cream_soda = 4)
+	required_reagents = list(/datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/sodawater = 2, /datum/reagent/consumable/vanilla = 1)
 
 /datum/chemical_reaction/blazaam
 	name = "Blazaam"
-	id = "blazaam"
-	results = list("blazaam" = 3)
-	required_reagents = list("gin" = 2, "peachjuice" = 1, "bluespace" = 1)
+	id = /datum/reagent/consumable/ethanol/blazaam
+	results = list(/datum/reagent/consumable/ethanol/blazaam = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/gin = 2, /datum/reagent/consumable/peachjuice = 1, /datum/reagent/bluespace = 1)
 
 /datum/chemical_reaction/planet_cracker
 	name = "Planet Cracker"
-	id = "planet_cracker"
-	results = list("planet_cracker" = 4)
-	required_reagents = list("champagne" = 2, "lizardwine" = 2, "eggyolk" = 1, /datum/reagent/gold = 1)
+	id = /datum/reagent/consumable/ethanol/planet_cracker
+	results = list(/datum/reagent/consumable/ethanol/planet_cracker = 4)
+	required_reagents = list(/datum/reagent/consumable/ethanol/champagne = 2, /datum/reagent/consumable/ethanol/lizardwine = 2, /datum/reagent/consumable/eggyolk = 1, /datum/reagent/gold = 1)
 	mix_message = "The liquid's color starts shifting as the nanogold is alternately corroded and redeposited."
 
 /datum/chemical_reaction/red_queen
 	name = "Red Queen"
-	id = "red_queen"
-	results = list("red_queen" = 10)
-	required_reagents = list("tea" = 6, /datum/reagent/mercury = 2, "blackpepper" = 1, "growthserum" = 1)
+	id = /datum/reagent/consumable/red_queen
+	results = list(/datum/reagent/consumable/red_queen = 10)
+	required_reagents = list(/datum/reagent/consumable/tea = 6, /datum/reagent/mercury = 2, /datum/reagent/consumable/blackpepper = 1, /datum/reagent/growthserum = 1)
 
 /datum/chemical_reaction/catnip_tea
 	name = "Catnip Tea"
-	id = "catnip_tea"
-	results = list("catnip_tea" = 3)
-	required_reagents = list("tea" = 5, "catnip" = 2)
+	id = /datum/reagent/consumable/catnip_tea
+	results = list(/datum/reagent/consumable/catnip_tea = 3)
+	required_reagents = list(/datum/reagent/consumable/tea = 5, /datum/reagent/pax/catnip = 2)
 
 /datum/chemical_reaction/commander_and_chief
 	name = "Commander and Chief"
-	id = "commander_and_chief"
-	results = list("commander_and_chief" = 50)
-	required_reagents = list("alliescocktail" = 50, "champagne" = 20, "doctorsdelight" = 10, "quintuple_sec" = 10, "screwdrivercocktail" = 10)
+	id = /datum/reagent/consumable/ethanol/commander_and_chief
+	results = list(/datum/reagent/consumable/ethanol/commander_and_chief = 50)
+	required_reagents = list(/datum/reagent/consumable/ethanol/alliescocktail = 50, /datum/reagent/consumable/ethanol/champagne = 20, /datum/reagent/consumable/doctor_delight = 10, /datum/reagent/consumable/ethanol/quintuple_sec = 10, /datum/reagent/consumable/ethanol/screwdrivercocktail = 10)
 	mix_message = "When your powers combine, I am Captain Pl-..."
diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm
index 746f6fe8fb..4486bfbcba 100644
--- a/code/modules/food_and_drinks/recipes/food_mixtures.dm
+++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm
@@ -11,7 +11,7 @@
 /datum/chemical_reaction/tofu
 	name = "Tofu"
 	id = "tofu"
-	required_reagents = list("soymilk" = 10)
+	required_reagents = list(/datum/reagent/consumable/soymilk = 10)
 	required_catalysts = list(/datum/reagent/consumable/enzyme = 5)
 	mob_react = FALSE
 
@@ -24,7 +24,7 @@
 /datum/chemical_reaction/chocolate_bar
 	name = "Chocolate Bar"
 	id = "chocolate_bar"
-	required_reagents = list("soymilk" = 2, "cocoa" = 2, /datum/reagent/consumable/sugar = 2)
+	required_reagents = list(/datum/reagent/consumable/soymilk = 2, /datum/reagent/consumable/coco = 2, /datum/reagent/consumable/sugar = 2)
 
 /datum/chemical_reaction/chocolate_bar/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
@@ -35,8 +35,8 @@
 
 /datum/chemical_reaction/chocolate_bar2
 	name = "Chocolate Bar"
-	id = "chocolate_bar"
-	required_reagents = list("chocolate_milk" = 4, /datum/reagent/consumable/sugar = 2)
+	id = "chocolate_bar2"
+	required_reagents = list(/datum/reagent/consumable/milk/chocolate_milk = 4, /datum/reagent/consumable/sugar = 2)
 	mob_react = FALSE
 
 /datum/chemical_reaction/chocolate_bar2/on_reaction(datum/reagents/holder, created_volume)
@@ -47,39 +47,39 @@
 
 /datum/chemical_reaction/hot_coco
 	name = "Hot Coco"
-	id = "hot_coco"
-	results = list("hot_coco" = 5)
-	required_reagents = list(/datum/reagent/water = 5, "cocoa" = 1)
+	id = /datum/reagent/consumable/hot_coco
+	results = list(/datum/reagent/consumable/hot_coco = 5)
+	required_reagents = list(/datum/reagent/water = 5, /datum/reagent/consumable/coco = 1)
 
 /datum/chemical_reaction/coffee
 	name = "Coffee"
-	id = "coffee"
-	results = list("coffee" = 5)
-	required_reagents = list("coffeepowder" = 1, /datum/reagent/water = 5)
+	id = /datum/reagent/consumable/coffee
+	results = list(/datum/reagent/consumable/coffee = 5)
+	required_reagents = list(/datum/reagent/toxin/coffeepowder = 1, /datum/reagent/water = 5)
 
 /datum/chemical_reaction/tea
 	name = "Tea"
-	id = "tea"
-	results = list("tea" = 5)
-	required_reagents = list("teapowder" = 1, /datum/reagent/water = 5)
+	id = /datum/reagent/consumable/tea
+	results = list(/datum/reagent/consumable/tea = 5)
+	required_reagents = list(/datum/reagent/toxin/teapowder = 1, /datum/reagent/water = 5)
 
 /datum/chemical_reaction/soysauce
 	name = "Soy Sauce"
-	id = "soysauce"
-	results = list("soysauce" = 5)
-	required_reagents = list("soymilk" = 4, /datum/reagent/toxin/acid = 1)
+	id = /datum/reagent/consumable/soysauce
+	results = list(/datum/reagent/consumable/soysauce = 5)
+	required_reagents = list(/datum/reagent/consumable/soymilk = 4, /datum/reagent/toxin/acid = 1)
 
 /datum/chemical_reaction/corn_syrup
 	name = "corn_syrup"
-	id = "corn_syrup"
-	results = list("corn_syrup" = 5)
-	required_reagents = list("corn_starch" = 1, /datum/reagent/toxin/acid = 1)
+	id = /datum/reagent/consumable/corn_syrup
+	results = list(/datum/reagent/consumable/corn_syrup = 5)
+	required_reagents = list(/datum/reagent/consumable/corn_starch = 1, /datum/reagent/toxin/acid = 1)
 	required_temp = 374
 
 /datum/chemical_reaction/caramel
 	name = "Caramel"
-	id = "caramel"
-	results = list("caramel" = 1)
+	id = /datum/reagent/consumable/caramel
+	results = list(/datum/reagent/consumable/caramel = 1)
 	required_reagents = list(/datum/reagent/consumable/sugar = 1)
 	required_temp = 413
 	mob_react = FALSE
@@ -88,7 +88,7 @@
 	name = "Caramel burned"
 	id = "caramel_burned"
 	results = list(/datum/reagent/carbon = 1)
-	required_reagents = list("caramel" = 1)
+	required_reagents = list(/datum/reagent/consumable/caramel = 1)
 	required_temp = 483
 	mob_react = FALSE
 
@@ -106,7 +106,7 @@
 /datum/chemical_reaction/synthmeat
 	name = "synthmeat"
 	id = "synthmeat"
-	required_reagents = list(/datum/reagent/blood = 5, "cryoxadone" = 1)
+	required_reagents = list(/datum/reagent/blood = 5, /datum/reagent/medicine/cryoxadone = 1)
 	mob_react = FALSE
 
 /datum/chemical_reaction/synthmeat/on_reaction(datum/reagents/holder, created_volume)
@@ -116,15 +116,15 @@
 
 /datum/chemical_reaction/hot_ramen
 	name = "Hot Ramen"
-	id = "hot_ramen"
-	results = list("hot_ramen" = 3)
-	required_reagents = list(/datum/reagent/water = 1, "dry_ramen" = 3)
+	id = /datum/reagent/consumable/hot_ramen
+	results = list(/datum/reagent/consumable/hot_ramen = 3)
+	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/consumable/dry_ramen = 3)
 
 /datum/chemical_reaction/hell_ramen
 	name = "Hell Ramen"
-	id = "hell_ramen"
-	results = list("hell_ramen" = 6)
-	required_reagents = list(/datum/reagent/consumable/capsaicin = 1, "hot_ramen" = 6)
+	id = /datum/reagent/consumable/hell_ramen
+	results = list(/datum/reagent/consumable/hell_ramen = 6)
+	required_reagents = list(/datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/hot_ramen = 6)
 
 /datum/chemical_reaction/imitationcarpmeat
 	name = "Imitation Carpmeat"
@@ -142,7 +142,7 @@
 /datum/chemical_reaction/dough
 	name = "Dough"
 	id = "dough"
-	required_reagents = list(/datum/reagent/water = 10, "flour" = 15)
+	required_reagents = list(/datum/reagent/water = 10, /datum/reagent/consumable/flour = 15)
 	mix_message = "The ingredients form a dough."
 
 /datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume)
@@ -153,7 +153,7 @@
 /datum/chemical_reaction/cakebatter
 	name = "Cake Batter"
 	id = "cakebatter"
-	required_reagents = list("eggyolk" = 15, "flour" = 15, /datum/reagent/consumable/sugar = 5)
+	required_reagents = list(/datum/reagent/consumable/eggyolk = 15, /datum/reagent/consumable/flour = 15, /datum/reagent/consumable/sugar = 5)
 	mix_message = "The ingredients form a cake batter."
 
 /datum/chemical_reaction/cakebatter/on_reaction(datum/reagents/holder, created_volume)
@@ -163,12 +163,12 @@
 
 /datum/chemical_reaction/cakebatter/vegan
 	id = "vegancakebatter"
-	required_reagents = list("soymilk" = 15, "flour" = 15, /datum/reagent/consumable/sugar = 5)
+	required_reagents = list(/datum/reagent/consumable/soymilk = 15, /datum/reagent/consumable/flour = 15, /datum/reagent/consumable/sugar = 5)
 
 /datum/chemical_reaction/ricebowl
 	name = "Rice Bowl"
 	id = "ricebowl"
-	required_reagents = list("rice" = 10, /datum/reagent/water = 10)
+	required_reagents = list(/datum/reagent/consumable/rice = 10, /datum/reagent/water = 10)
 	required_container = /obj/item/reagent_containers/glass/bowl
 	mix_message = "The rice absorbs the water."
 
@@ -180,6 +180,6 @@
 
 /datum/chemical_reaction/bbqsauce
 	name = "BBQ Sauce"
-	id = "bbqsauce"
-	results = list("bbqsauce" = 5)
-	required_reagents = list("ash" = 1, "tomatojuice" = 1, "salglu_solution" = 3, "blackpepper" = 1)
\ No newline at end of file
+	id = /datum/reagent/consumable/bbqsauce
+	results = list(/datum/reagent/consumable/bbqsauce = 5)
+	required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/consumable/tomatojuice = 1, /datum/reagent/medicine/salglu_solution = 3, /datum/reagent/consumable/blackpepper = 1)
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
index 7977a715d8..f0fe936d05 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
@@ -108,7 +108,7 @@ datum/crafting_recipe/food/donut/meat
 /datum/crafting_recipe/food/donut/bungo
 	name = "Bungo Donut"
 	reqs = list(
-		/obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
+		/datum/reagent/consumable/bungojuice = 3,
 		/obj/item/reagent_containers/food/snacks/donut/plain = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/donut/bungo
@@ -175,7 +175,7 @@ datum/crafting_recipe/food/donut/meat
 /datum/crafting_recipe/food/donut/jelly/bungo
 	name = "Bungo Jelly Donut"
 	reqs = list(
-		/obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
+		/datum/reagent/consumable/bungojuice = 3,
 		/obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/donut/jelly/bungo
@@ -242,7 +242,7 @@ datum/crafting_recipe/food/donut/meat
 /datum/crafting_recipe/food/donut/slimejelly/bungo
 	name = "Bungo Slime Donut"
 	reqs = list(
-		/obj/item/reagent_containers/food/snacks/grown/bungofruit = 1,
+		/datum/reagent/consumable/bungojuice = 3,
 		/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
 	)
 	result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo
diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm
index f7294ff87a..bd4c26e0f2 100644
--- a/code/modules/holiday/halloween/jacqueen.dm
+++ b/code/modules/holiday/halloween/jacqueen.dm
@@ -411,7 +411,6 @@
 
 /datum/reagent/mutationtoxin/pumpkinhead
 	name = "Pumpkin head mutation toxin"
-	id = "pumpkinmutationtoxin"
 	race = /datum/species/dullahan/pumpkin
 	mutationtext = "<span class='spooky'>The pain subsides. You feel your head roll off your shoulders... and you smell pumpkin."
 	//I couldn't get the replace head sprite with a pumpkin to work so, it is what it is.
diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm
index 3c4ed776b7..a058601c39 100644
--- a/code/modules/hydroponics/beekeeping/beebox.dm
+++ b/code/modules/hydroponics/beekeeping/beebox.dm
@@ -65,7 +65,7 @@
 	var/datum/reagent/R = null
 	if(random_reagent)
 		R = pick(subtypesof(/datum/reagent))
-		R = GLOB.chemical_reagents_list[initial(R.id)]
+		R = GLOB.chemical_reagents_list[R]
 
 	queen_bee = new(src)
 	queen_bee.beehome = src
@@ -95,7 +95,7 @@
 				bee_resources = max(bee_resources-BEE_RESOURCE_HONEYCOMB_COST, 0)
 				var/obj/item/reagent_containers/honeycomb/HC = new(src)
 				if(queen_bee.beegent)
-					HC.set_reagent(queen_bee.beegent.id)
+					HC.set_reagent(queen_bee.beegent.type)
 				honeycombs += HC
 
 		if(bees.len < get_max_bees())
diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm
index 44291fa6ba..e84025208a 100644
--- a/code/modules/hydroponics/grown/ambrosia.dm
+++ b/code/modules/hydroponics/grown/ambrosia.dm
@@ -25,7 +25,7 @@
 	icon_dead = "ambrosia-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/ambrosia/deus)
-	reagents_add = list(/datum/reagent/drug/space_drugs = 0.15, "bicaridine" = 0.1, "kelotane" = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/toxin = 0.1)
+	reagents_add = list(/datum/reagent/drug/space_drugs = 0.15, /datum/reagent/medicine/bicaridine = 0.1, /datum/reagent/medicine/kelotane = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/toxin = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris
 	seed = /obj/item/seeds/ambrosia
@@ -42,7 +42,7 @@
 	plantname = "Ambrosia Deus"
 	product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus
 	mutatelist = list(/obj/item/seeds/ambrosia/gaia)
-	reagents_add = list(/datum/reagent/medicine/omnizine = 0.15, "synaptizine" = 0.15, /datum/reagent/drug/space_drugs = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
+	reagents_add = list(/datum/reagent/medicine/omnizine = 0.15, /datum/reagent/medicine/synaptizine = 0.15, /datum/reagent/drug/space_drugs = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
 	rarity = 40
 
 /obj/item/reagent_containers/food/snacks/grown/ambrosia/deus
@@ -62,7 +62,7 @@
 	plantname = "Ambrosia Gaia"
 	product = /obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia
 	mutatelist = list(/obj/item/seeds/ambrosia/deus)
-	reagents_add = list("earthsblood" = 0.05, /datum/reagent/consumable/nutriment = 0.06, /datum/reagent/consumable/nutriment/vitamin = 0.05)
+	reagents_add = list(/datum/reagent/medicine/earthsblood = 0.05, /datum/reagent/consumable/nutriment = 0.06, /datum/reagent/consumable/nutriment/vitamin = 0.05)
 	rarity = 30 //These are some pretty good plants right here
 	genes = list()
 	weed_rate = 4
diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm
index 6e9350aff3..f8e58aee1b 100644
--- a/code/modules/hydroponics/grown/apple.dm
+++ b/code/modules/hydroponics/grown/apple.dm
@@ -24,9 +24,9 @@
 	filling_color = "#FF4500"
 	bitesize = 100 // Always eat the apple in one bite
 	foodtype = FRUIT
-	juice_results = list("applejuice" = 0)
+	juice_results = list(/datum/reagent/consumable/applejuice = 0)
 	tastes = list("apple" = 1)
-	distill_reagent = "hcider"
+	distill_reagent = /datum/reagent/consumable/ethanol/hcider
 
 // Gold Apple
 /obj/item/seeds/apple/gold
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index 6072bae79b..7668d17ac1 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -24,8 +24,8 @@
 	filling_color = "#FFFF00"
 	bitesize = 5
 	foodtype = FRUIT
-	juice_results = list("banana" = 0)
-	distill_reagent = "bananahonk"
+	juice_results = list(/datum/reagent/consumable/banana = 0)
+	distill_reagent = /datum/reagent/consumable/ethanol/bananahonk
 
 /obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -70,7 +70,7 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/banana/mime
 	growthstages = 4
 	mutatelist = list()
-	reagents_add = list("nothing" = 0.1, "mutetoxin" = 0.1, /datum/reagent/consumable/nutriment = 0.02)
+	reagents_add = list(/datum/reagent/consumable/nothing = 0.1, /datum/reagent/toxin/mutetoxin = 0.1, /datum/reagent/consumable/nutriment = 0.02)
 	rarity = 15
 
 /obj/item/reagent_containers/food/snacks/grown/banana/mime
@@ -80,7 +80,7 @@
 	icon_state = "mimana"
 	trash = /obj/item/grown/bananapeel/mimanapeel
 	filling_color = "#FFFFEE"
-	distill_reagent = "silencer"
+	distill_reagent = /datum/reagent/consumable/ethanol/silencer
 
 /obj/item/grown/bananapeel/mimanapeel
 	seed = /obj/item/seeds/banana/mime
@@ -100,7 +100,7 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/banana/bluespace
 	mutatelist = list()
 	genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("bluespace" = 0.2, /datum/reagent/consumable/banana = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.02)
+	reagents_add = list(/datum/reagent/bluespace = 0.2, /datum/reagent/consumable/banana = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.02)
 	rarity = 30
 
 /obj/item/reagent_containers/food/snacks/grown/banana/bluespace
@@ -139,7 +139,7 @@
 	icon_state = "exoticbanana"
 	list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtype = GROSS | MEAT | RAW | FRUIT
-	grind_results = list(/datum/reagent/blood = 20, "liquidgibs" = 5)
+	grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5)
 	var/awakening = 0
 
 /obj/item/reagent_containers/food/snacks/grown/banana/banana_spider_spawnable/attack_self(mob/user)
diff --git a/code/modules/hydroponics/grown/beans.dm b/code/modules/hydroponics/grown/beans.dm
index 006f4a3f4d..3e5fee411f 100644
--- a/code/modules/hydroponics/grown/beans.dm
+++ b/code/modules/hydroponics/grown/beans.dm
@@ -15,7 +15,7 @@
 	icon_dead = "soybean-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/soya/koi)
-	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, "cooking_oil" = 0.03) //Vegetable oil!
+	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/consumable/cooking_oil = 0.03) //Vegetable oil!
 
 /obj/item/reagent_containers/food/snacks/grown/soybeans
 	seed = /obj/item/seeds/soya
@@ -26,7 +26,7 @@
 	filling_color = "#F0E68C"
 	bitesize_mod = 2
 	foodtype = VEGETABLES
-	grind_results = list("soymilk" = 0)
+	grind_results = list(/datum/reagent/consumable/soymilk = 0)
 	tastes = list("soy" = 1)
 	wine_power = 20
 
@@ -40,7 +40,7 @@
 	product = /obj/item/reagent_containers/food/snacks/grown/koibeans
 	potency = 10
 	mutatelist = list()
-	reagents_add = list("carpotoxin" = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
+	reagents_add = list(/datum/reagent/toxin/carpotoxin = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05)
 	rarity = 20
 
 /obj/item/reagent_containers/food/snacks/grown/koibeans
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index db885e373c..0646ae1a8c 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -28,7 +28,7 @@
 	foodtype = FRUIT
 	juice_results = list(/datum/reagent/consumable/berryjuice = 0)
 	tastes = list("berry" = 1)
-	distill_reagent = "gin"
+	distill_reagent = /datum/reagent/consumable/ethanol/gin
 
 // Poison Berries
 /obj/item/seeds/berry/poison
@@ -39,7 +39,7 @@
 	plantname = "Poison-Berry Bush"
 	product = /obj/item/reagent_containers/food/snacks/grown/berries/poison
 	mutatelist = list(/obj/item/seeds/berry/death)
-	reagents_add = list(/datum/reagent/toxin/cyanide = 0.15, "tirizene" = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
+	reagents_add = list(/datum/reagent/toxin/cyanide = 0.15, /datum/reagent/toxin/staminatoxin = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 	rarity = 10 // Mildly poisonous berries are common in reality
 
 /obj/item/reagent_containers/food/snacks/grown/berries/poison
@@ -49,7 +49,7 @@
 	icon_state = "poisonberrypile"
 	filling_color = "#C71585"
 	foodtype = FRUIT | TOXIC
-	juice_results = list("poisonberryjuice" = 0)
+	juice_results = list(/datum/reagent/consumable/poisonberryjuice = 0)
 	tastes = list("poison-berry" = 1)
 	distill_reagent = null
 	wine_power = 35
@@ -220,7 +220,7 @@
 	foodtype = FRUIT
 	juice_results = list(/datum/reagent/consumable/grapejuice = 0)
 	tastes = list("grape" = 1)
-	distill_reagent = "wine"
+	distill_reagent = /datum/reagent/consumable/ethanol/wine
 
 // Green Grapes
 /obj/item/seeds/grape/green
@@ -240,7 +240,7 @@
 	icon_state = "greengrapes"
 	filling_color = "#7FFF00"
 	tastes = list("green grape" = 1)
-	distill_reagent = "cognac"
+	distill_reagent = /datum/reagent/consumable/ethanol/cognac
 
 // Strawberry
 /obj/item/seeds/strawberry
diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm
index c64061698d..c5a7e0797a 100644
--- a/code/modules/hydroponics/grown/cereals.dm
+++ b/code/modules/hydroponics/grown/cereals.dm
@@ -24,7 +24,7 @@
 	foodtype = GRAIN
 	grind_results = list(/datum/reagent/consumable/flour = 0)
 	tastes = list("wheat" = 1)
-	distill_reagent = "beer"
+	distill_reagent = /datum/reagent/consumable/ethanol/beer
 
 // Oat
 /obj/item/seeds/wheat/oat
@@ -47,7 +47,7 @@
 	foodtype = GRAIN
 	grind_results = list(/datum/reagent/consumable/flour = 0)
 	tastes = list("oat" = 1)
-	distill_reagent = "ale"
+	distill_reagent = /datum/reagent/consumable/ethanol/ale
 
 // Rice
 /obj/item/seeds/wheat/rice
@@ -71,7 +71,7 @@
 	foodtype = GRAIN
 	grind_results = list(/datum/reagent/consumable/rice = 0)
 	tastes = list("rice" = 1)
-	distill_reagent = "sake"
+	distill_reagent = /datum/reagent/consumable/ethanol/sake
 
 //Meatwheat - grows into synthetic meat
 /obj/item/seeds/wheat/meat
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index 8c2ed3da23..851753da46 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -79,7 +79,7 @@
 	icon_state = "orange"
 	filling_color = "#FFA500"
 	juice_results = list(/datum/reagent/consumable/orangejuice = 0)
-	distill_reagent = "triple_sec"
+	distill_reagent = /datum/reagent/consumable/ethanol/triple_sec
 
 
 //3D Orange
@@ -107,7 +107,7 @@
 	icon_state = "orang"
 	filling_color = "#FFA500"
 	juice_results = list(/datum/reagent/consumable/orangejuice = 0)
-	distill_reagent = "triple_sec"
+	distill_reagent = /datum/reagent/consumable/ethanol/triple_sec
 	tastes = list("polygons" = 1, "oranges" = 1)
 
 /obj/item/reagent_containers/food/snacks/grown/citrus/orange_3d/pickup(mob/user)
diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm
index 1e96df5657..9ac705aa83 100644
--- a/code/modules/hydroponics/grown/cocoa_vanilla.dm
+++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm
@@ -27,7 +27,7 @@
 	bitesize_mod = 2
 	foodtype = FRUIT
 	tastes = list("cocoa" = 1)
-	distill_reagent = "creme_de_cacao"
+	distill_reagent = /datum/reagent/consumable/ethanol/creme_de_cacao
 
 // Vanilla Pod
 /obj/item/seeds/cocoapod/vanillapod
@@ -49,7 +49,7 @@
 	filling_color = "#FFD700"
 	foodtype = FRUIT
 	tastes = list("vanilla" = 1)
-	distill_reagent = "vanilla" //Takes longer, but you can get even more vanilla from it.
+	distill_reagent = /datum/reagent/consumable/vanilla //Takes longer, but you can get even more vanilla from it.
 
 /obj/item/seeds/cocoapod/bungotree
 	name = "pack of bungo tree seeds"
@@ -79,6 +79,7 @@
 	trash = /obj/item/reagent_containers/food/snacks/grown/bungopit
 	filling_color = "#E8C22F"
 	foodtype = FRUIT
+	juice_results = list(/datum/reagent/consumable/bungojuice = 0)
 	tastes = list("bungo" = 2, "tropical fruitiness" = 1)
 	distill_reagent = null
 
diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm
index 7ee0ec8dad..6c852c426d 100644
--- a/code/modules/hydroponics/grown/corn.dm
+++ b/code/modules/hydroponics/grown/corn.dm
@@ -27,7 +27,7 @@
 	foodtype = VEGETABLES
 	juice_results = list(/datum/reagent/consumable/corn_starch = 0)
 	tastes = list("corn" = 1)
-	distill_reagent = "whiskey"
+	distill_reagent = /datum/reagent/consumable/ethanol/whiskey
 
 /obj/item/grown/corncob
 	name = "corn cob"
diff --git a/code/modules/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm
index 3184dac5af..f893ad9e57 100644
--- a/code/modules/hydroponics/grown/eggplant.dm
+++ b/code/modules/hydroponics/grown/eggplant.dm
@@ -47,4 +47,4 @@
 	filling_color = "#F8F8FF"
 	bitesize_mod = 2
 	foodtype = MEAT
-	distill_reagent = "eggnog"
+	distill_reagent = /datum/reagent/consumable/ethanol/eggnog
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index 9d4f9be4e6..1f2baa59e6 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -27,7 +27,7 @@
 	bitesize_mod = 3
 	tastes = list("sesame seeds" = 1)
 	foodtype = VEGETABLES | GROSS
-	distill_reagent = "vermouth"
+	distill_reagent = /datum/reagent/consumable/ethanol/vermouth
 
 // Lily
 /obj/item/seeds/poppy/lily
@@ -130,7 +130,7 @@
 	slot_flags = ITEM_SLOT_HEAD
 	filling_color = "#E6E6FA"
 	bitesize_mod = 3
-	distill_reagent = "vermouth"
+	distill_reagent = /datum/reagent/consumable/ethanol/vermouth
 
 // Sunflower
 /obj/item/seeds/sunflower
@@ -195,7 +195,7 @@
 	slot_flags = ITEM_SLOT_HEAD
 	filling_color = "#E6E6FA"
 	bitesize_mod = 2
-	distill_reagent = "absinthe" //It's made from flowers.
+	distill_reagent = /datum/reagent/consumable/ethanol/absinthe //It's made from flowers.
 	tastes = list("glowbugs" = 1)
 
 // Novaflower
diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm
index 1a9247dc39..3b6833d2c1 100644
--- a/code/modules/hydroponics/grown/misc.dm
+++ b/code/modules/hydroponics/grown/misc.dm
@@ -153,7 +153,7 @@
 	filling_color = "#FFD700"
 	bitesize_mod = 2
 	foodtype = VEGETABLES | SUGAR
-	distill_reagent = "rum"
+	distill_reagent = /datum/reagent/consumable/ethanol/rum
 
 // Gatfruit
 /obj/item/seeds/gatfruit
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index 77057688ae..7e43911c5c 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -133,7 +133,7 @@
 	desc = "<I>Plumus Hellmus</I>: Plump, soft and s-so inviting~"
 	icon_state = "plumphelmet"
 	filling_color = "#9370DB"
-	distill_reagent = "manlydorf"
+	distill_reagent = /datum/reagent/consumable/ethanol/manly_dorf
 
 // Walking Mushroom
 /obj/item/seeds/plump/walkingmushroom
diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm
index 89f1dbdf2b..fad916030d 100644
--- a/code/modules/hydroponics/grown/potato.dm
+++ b/code/modules/hydroponics/grown/potato.dm
@@ -27,7 +27,7 @@
 	bitesize = 100
 	foodtype = VEGETABLES
 	juice_results = list(/datum/reagent/consumable/potato_juice = 0)
-	distill_reagent = "vodka"
+	distill_reagent = /datum/reagent/consumable/ethanol/vodka
 
 /obj/item/reagent_containers/food/snacks/grown/potato/wedges
 	name = "potato wedges"
@@ -64,4 +64,4 @@
 	name = "sweet potato"
 	desc = "It's sweet."
 	icon_state = "sweetpotato"
-	distill_reagent = "sbiten"
+	distill_reagent = /datum/reagent/consumable/ethanol/sbiten
diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm
index 359d216271..44e11c372d 100644
--- a/code/modules/hydroponics/grown/tea_coffee.dm
+++ b/code/modules/hydroponics/grown/tea_coffee.dm
@@ -90,7 +90,7 @@
 	bitesize_mod = 2
 	dry_grind = TRUE
 	grind_results = list(/datum/reagent/toxin/coffeepowder = 0)
-	distill_reagent = "kahlua"
+	distill_reagent = /datum/reagent/consumable/ethanol/kahlua
 
 // Coffee Robusta
 /obj/item/seeds/coffee/robusta
diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm
index aa4da49562..1e2d25d825 100644
--- a/code/modules/hydroponics/grown/tobacco.dm
+++ b/code/modules/hydroponics/grown/tobacco.dm
@@ -21,7 +21,7 @@
 	desc = "Dry them out to make some smokes."
 	icon_state = "tobacco_leaves"
 	filling_color = "#008000"
-	distill_reagent = "creme_de_menthe" //Menthol, I guess.
+	distill_reagent = /datum/reagent/consumable/ethanol/creme_de_menthe //Menthol, I guess.
 
 // Space Tobacco
 /obj/item/seeds/tobacco/space
diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm
index dde657e10d..53c3389695 100644
--- a/code/modules/hydroponics/grown/tomato.dm
+++ b/code/modules/hydroponics/grown/tomato.dm
@@ -25,7 +25,7 @@
 	foodtype = FRUIT
 	grind_results = list(/datum/reagent/consumable/ketchup = 0)
 	juice_results = list(/datum/reagent/consumable/tomatojuice = 0)
-	distill_reagent = "enzyme"
+	distill_reagent = /datum/reagent/consumable/enzyme
 
 // Blood Tomato
 /obj/item/seeds/tomato/blood
@@ -48,7 +48,7 @@
 	filling_color = "#FF0000"
 	foodtype = FRUIT | GROSS
 	grind_results = list(/datum/reagent/consumable/ketchup = 0, /datum/reagent/blood = 0)
-	distill_reagent = "bloodymary"
+	distill_reagent = /datum/reagent/consumable/ethanol/bloody_mary
 
 // Blue Tomato
 /obj/item/seeds/tomato/blue
@@ -72,7 +72,7 @@
 	icon_state = "bluetomato"
 	splat_type = /obj/effect/decal/cleanable/oil
 	filling_color = "#0000FF"
-	distill_reagent = "laughter"
+	distill_reagent = /datum/reagent/consumable/laughter
 
 // Bluespace Tomato
 /obj/item/seeds/tomato/blue/bluespace
@@ -120,7 +120,7 @@
 	icon_state = "killertomato"
 	var/awakening = 0
 	filling_color = "#FF0000"
-	distill_reagent = "demonsblood"
+	distill_reagent = /datum/reagent/consumable/ethanol/demonsblood
 
 /obj/item/reagent_containers/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone)
 	if(awakening)
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index 1ea0068a1a..9655b13862 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -24,7 +24,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
 	volume = 100
-	list_reagents = list("weedkiller" = 100)
+	list_reagents = list(/datum/reagent/toxin/plantbgone/weedkiller = 100)
 
 /obj/item/reagent_containers/spray/weedspray/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -39,7 +39,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
 	volume = 100
-	list_reagents = list("pestkiller" = 100)
+	list_reagents = list(/datum/reagent/toxin/pestkiller = 100)
 
 /obj/item/reagent_containers/spray/pestspray/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -164,17 +164,17 @@
 /obj/item/reagent_containers/glass/bottle/nutrient/ez
 	name = "bottle of E-Z-Nutrient"
 	desc = "Contains a fertilizer that causes mild mutations with each harvest."
-	list_reagents = list("eznutriment" = 50)
+	list_reagents = list(/datum/reagent/plantnutriment/eznutriment = 50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/l4z
 	name = "bottle of Left 4 Zed"
 	desc = "Contains a fertilizer that limits plant yields to no more than one and causes significant mutations in plants."
-	list_reagents = list("left4zednutriment" = 50)
+	list_reagents = list(/datum/reagent/plantnutriment/left4zednutriment = 50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/rh
 	name = "bottle of Robust Harvest"
 	desc = "Contains a fertilizer that increases the yield of a plant by 30% while causing no mutations."
-	list_reagents = list("robustharvestnutriment" = 50)
+	list_reagents = list(/datum/reagent/plantnutriment/robustharvestnutriment = 50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/empty
 	name = "bottle"
@@ -187,9 +187,9 @@
 /obj/item/reagent_containers/glass/bottle/killer/weedkiller
 	name = "bottle of weed killer"
 	desc = "Contains a herbicide."
-	list_reagents = list("weedkiller" = 50)
+	list_reagents = list(/datum/reagent/toxin/plantbgone/weedkiller = 50)
 
 /obj/item/reagent_containers/glass/bottle/killer/pestkiller
 	name = "bottle of pest spray"
 	desc = "Contains a pesticide."
-	list_reagents = list("pestkiller" = 50)
\ No newline at end of file
+	list_reagents = list(/datum/reagent/toxin/pestkiller = 50)
\ No newline at end of file
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index 65230d1f21..99fd873995 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -129,7 +129,7 @@
 	name = "UNKNOWN"
 
 	var/datum/reagent/R = GLOB.chemical_reagents_list[reag_id]
-	if(R && R.id == reagent_id)
+	if(R && R.type == reagent_id)
 		name = R.name
 
 /datum/plant_gene/reagent/New(reag_id = null, reag_rate = 0)
diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm
index 027a03650a..0fc9f58db8 100644
--- a/code/modules/integrated_electronics/subtypes/reagents.dm
+++ b/code/modules/integrated_electronics/subtypes/reagents.dm
@@ -424,7 +424,7 @@
 		if(1)
 			var/cont[0]
 			for(var/datum/reagent/RE in reagents.reagent_list)
-				cont += RE.id
+				cont += RE.type
 			set_pin_data(IC_OUTPUT, 3, cont)
 			push_data()
 		if(2)
@@ -492,11 +492,11 @@
 
 	for(var/datum/reagent/G in source.reagents.reagent_list)
 		if(!direction_mode)
-			if(G.id in demand)
-				source.reagents.trans_id_to(target, G.id, transfer_amount)
+			if(G.type in demand)
+				source.reagents.trans_id_to(target, G.type, transfer_amount)
 		else
-			if(!(G.id in demand))
-				source.reagents.trans_id_to(target, G.id, transfer_amount)
+			if(!(G.type in demand))
+				source.reagents.trans_id_to(target, G.type, transfer_amount)
 	activate_pin(2)
 	push_data()
 
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 0a1bfc7d84..4067bf0928 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -569,7 +569,6 @@
 
 /datum/reagent/flightpotion
 	name = "Flight Potion"
-	id = "flightpotion"
 	description = "Strange mutagenic compound of unknown origins."
 	reagent_state = LIQUID
 	color = "#FFEBEB"
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index 89c438f419..ade8158e02 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -175,7 +175,7 @@
 	return
 
 /mob/living/carbon/get_blood_data(blood_id)
-	if(blood_id == "blood" || blood_id == "jellyblood") //actual blood reagent
+	if(blood_id == /datum/reagent/blood || /datum/reagent/blood/jellyblood) //actual blood reagent
 		var/blood_data = list()
 		//set the blood data
 		blood_data["donor"] = src
@@ -191,7 +191,7 @@
 			blood_data["resistances"] = disease_resistances.Copy()
 		var/list/temp_chem = list()
 		for(var/datum/reagent/R in reagents.reagent_list)
-			temp_chem[R.id] = R.volume
+			temp_chem[R.type] = R.volume
 		blood_data["trace_chem"] = list2params(temp_chem)
 		if(mind)
 			blood_data["mind"] = mind
@@ -226,21 +226,21 @@
 
 /mob/living/simple_animal/get_blood_id()
 	if(blood_volume)
-		return "blood"
+		return /datum/reagent/blood
 
 /mob/living/carbon/monkey/get_blood_id()
 	if(!(HAS_TRAIT(src, TRAIT_NOCLONE)))
-		return "blood"
+		return /datum/reagent/blood
 
 /mob/living/carbon/get_blood_id()
 	if(isjellyperson(src))
-		return "jellyblood"
+		return /datum/reagent/blood/jellyblood
 	if(dna?.species?.exotic_blood)
 		return dna.species.exotic_blood
 	else if((NOBLOOD in dna.species.species_traits) || (HAS_TRAIT(src, TRAIT_NOCLONE)))
 		return
 	else
-		return "blood"
+		return /datum/reagent/blood
 
 // This is has more potential uses, and is probably faster than the old proc.
 /proc/get_safe_blood(bloodtype)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index fc87752bdf..0ec8cd5f87 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1267,7 +1267,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	H.update_mutant_bodyparts()
 
 /datum/species/proc/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
-	if(chem.id == exotic_blood)
+	if(chem.type == exotic_blood)
 		H.blood_volume = min(H.blood_volume + round(chem.volume, 0.1), BLOOD_VOLUME_MAXIMUM)
 		H.reagents.del_reagent(chem.type)
 		return 1
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 1f681cda9f..c247d14589 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -623,7 +623,7 @@
 		H.adjustFireLoss(4)
 		H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
 
-	if(chem.id == /datum/reagent/fuel/unholywater)
+	if(chem.type == /datum/reagent/fuel/unholywater)
 		H.adjustBruteLoss(-4)
 		H.adjustFireLoss(-4)
 		H.reagents.remove_reagent(chem.type, REAGENTS_METABOLISM)
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 5f91e3ae66..b63cd59173 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -12,7 +12,7 @@
 	inherent_traits = list(TRAIT_TOXINLOVER)
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime
 	gib_types = list(/obj/effect/gibspawner/slime, /obj/effect/gibspawner/slime/bodypartless)
-	exotic_blood = "jellyblood"
+	exotic_blood = /datum/reagent/blood/jellyblood
 	exotic_bloodtype = "GEL"
 	damage_overlay_type = ""
 	var/datum/action/innate/regenerate_limbs/regenerate_limbs
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index d0497bf6ce..bb1f1284b5 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -205,7 +205,7 @@
 /mob/living/simple_animal/hostile/poison/bees/toxin/Initialize()
 	. = ..()
 	var/datum/reagent/R = pick(typesof(/datum/reagent/toxin))
-	assign_reagent(GLOB.chemical_reagents_list[initial(R.id)])
+	assign_reagent(GLOB.chemical_reagents_list[R])
 
 /mob/living/simple_animal/hostile/poison/bees/queen
 	name = "queen bee"
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
index 68b5c123d7..34903a477b 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
@@ -105,7 +105,6 @@
 
 /datum/reagent/toxin/leaper_venom
 	name = "Leaper venom"
-	id = "leaper_venom"
 	description = "A toxin spat out by leapers that, while harmless in small doses, quickly creates a toxic reaction if too much is in the body."
 	color = "#801E28" // rgb: 128, 30, 40
 	toxpwr = 0
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 9141a6d299..04fffaf431 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -210,7 +210,7 @@
 	if(reagents && reagents.reagent_list)
 		reagent_note = " REAGENTS:"
 		for(var/datum/reagent/R in reagents.reagent_list)
-			reagent_note += R.id + " ("
+			reagent_note += R.type + " ("
 			reagent_note += num2text(R.volume) + ") "
 
 	if(ismob(firer))
diff --git a/code/modules/reagents/chem_wiki_render.dm b/code/modules/reagents/chem_wiki_render.dm
index 15a62825e7..e24da70d47 100644
--- a/code/modules/reagents/chem_wiki_render.dm
+++ b/code/modules/reagents/chem_wiki_render.dm
@@ -1,18 +1,11 @@
 //Generates a markdown txt file for use with the wiki
 
 /proc/find_reagent(input)
-	. = FALSE
-	if(GLOB.chemical_reagents_list[input]) //prefer IDs!
-		var/datum/reagent/R = GLOB.chemical_reagents_list[input]
-		return R
-	else
-		for(var/X in GLOB.chemical_reagents_list)
-			var/datum/reagent/R = GLOB.chemical_reagents_list[X]
-			if(input == replacetext(lowertext(R.name), " ", ""))
-				return R
-			if(input == replacetext(lowertext(R.id), " ", ""))
-				return R
-
+	//prefer types!
+	. = GLOB.chemical_reagents_list[text2path(input)]
+	if(.)
+		return
+	. = GLOB.name2reagent[ckey(input)]
 
 
 
@@ -24,7 +17,7 @@
 
 
 	var/prefix = "|Name | Reagents | Reaction vars | Description | Chem properties |\n|---|---|---|-----------|---|\n"
-	var/input_reagent = replacetext(lowertext(input("Input the name/id of a reagent to get it's description on it's own, or leave blank to parse every chem.", "Input") as text), " ", "") //95% of the time, the reagent id is a lowercase/no spaces version of the name
+	var/input_reagent = replacetext(lowertext(input("Input the name/type of a reagent to get it's description on it's own, or leave blank to parse every chem.", "Input") as text), " ", "") //95% of the time, the reagent type is a lowercase, no spaces / underscored version of the name
 	if(input_reagent)
 		var/input_reagent2 = find_reagent(input_reagent)
 		if(!input_reagent2)
@@ -68,98 +61,23 @@
 	var/impure = ""
 
 	//Chem_dispencer
-	var/list/dispensable_reagents = list(
-		"hydrogen",
-		"lithium",
-		"carbon",
-		"nitrogen",
-		"oxygen",
-		"fluorine",
-		"sodium",
-		"aluminium",
-		"silicon",
-		"phosphorus",
-		"sulfur",
-		"chlorine",
-		"potassium",
-		"iron",
-		"copper",
-		"mercury",
-		"radium",
-		"water",
-		"ethanol",
-		"sugar",
-		"sacid",
-		"welding_fuel",
-		"silver",
-		"iodine",
-		"bromine",
-		"stable_plasma"
-	)
-	var/list/components = list(
-		"oil",
-		"ammonia",
-		"ash",
-		"acetone",
-		"phenol",
-		"diethylamine",
-		"saltpetre",
-		"sodiumchloride",
-		"lye"
-	)
+	var/obj/machinery/chem_dispenser/C
+	var/list/dispensable_reagents = initial(C.dispensable_reagents)
+	var/list/components = initial(C.upgrade_reagents) + initial(C.upgrade_reagents2) + initial(C.upgrade_reagents3)
 
 	var/list/grind = list(
-		"bluespace",
-		"gold",
-		"plasma",
-		"uranium"
+		/datum/reagent/bluespace,
+		/datum/reagent/gold,
+		/datum/reagent/toxin/plasma,
+		/datum/reagent/uranium
 	)
 
 	//Bartender
-	var/dispence_drinks = list(
-		"water",
-		"ice",
-		"coffee",
-		"cream",
-		"tea",
-		"icetea",
-		"cola",
-		"spacemountainwind",
-		"dr_gibb",
-		"space_up",
-		"tonic",
-		"sodawater",
-		"lemon_lime",
-		"pwr_game",
-		"shamblers",
-		"sugar",
-		"orangejuice",
-		"grenadine",
-		"limejuice",
-		"tomatojuice",
-		"lemonjuice",
-		"menthol"
-	)
-	var/dispence_alco = list(
-		"beer",
-		"kahlua",
-		"whiskey",
-		"wine",
-		"vodka",
-		"gin",
-		"rum",
-		"tequila",
-		"vermouth",
-		"cognac",
-		"ale",
-		"absinthe",
-		"hcider",
-		"creme_de_menthe",
-		"creme_de_cacao",
-		"triple_sec",
-		"sake",
-		"applejack"
-	)
+	var/obj/machinery/chem_dispenser/drinks/D
+	var/dispence_drinks = initial(D.dispensable_reagents)
+
+	var/obj/machinery/chem_dispenser/drinks/beer/B
+	var/dispence_alco = initial(B.dispensable_reagents)
 
 	var/breakout = FALSE
 	for(var/i = 1, i <= 2, i+=1)
@@ -169,31 +87,31 @@
 				continue
 
 			for(var/Y in dispensable_reagents) //Why do you have to do this
-				if(R.id == Y)
+				if(R.type == Y)
 					basic += generate_chemwiki_line(R, X, processCR)
 					breakout = TRUE
 					continue
 
 			for(var/Y in components)
-				if(R.id == Y)
+				if(R.type == Y)
 					upgraded += generate_chemwiki_line(R, X, processCR)
 					breakout = TRUE
 					continue
 
 			for(var/Y in dispence_drinks)
-				if(R.id == Y)
+				if(R.type == Y)
 					drinks += generate_chemwiki_line(R, X, processCR)
 					breakout = TRUE
 					continue
 
 			for(var/Y in dispence_alco)
-				if(R.id == Y)
+				if(R.type == Y)
 					alco += generate_chemwiki_line(R, X, processCR)
 					breakout = TRUE
 					continue
 
 			for(var/Y in grind)
-				if(R.id == Y)
+				if(R.type == Y)
 					grinded += generate_chemwiki_line(R, X, processCR)
 					breakout = TRUE
 					continue
@@ -273,7 +191,7 @@
 /proc/generate_chemwiki_line(datum/reagent/R, X, processCR)
 	//name | Reagent pH | reagents | reaction temp | explosion temp | pH range | Kinetics | description | OD level | Addiction level | Metabolism rate | impure chem | inverse chem
 
-	var/datum/chemical_reaction/CR = get_chemical_reaction(R.id)
+	var/datum/chemical_reaction/CR = get_chemical_reaction(R.type)
 	if((!CR && processCR) || (CR && !processCR)) // Do reactions first.
 		return ""
 
@@ -284,11 +202,11 @@
 		outstring += "<ul>"
 		for(var/R2 in CR.required_reagents)
 			R3 = GLOB.chemical_reagents_list[R2]//What a convoluted mess
-			outstring += "<li><a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_reagents[R3.id]]u</li>"
+			outstring += "<li><a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_reagents[R3.type]]u</li>"
 		if(CR.required_catalysts)
 			for(var/R2 in CR.required_catalysts)
 				R3 = GLOB.chemical_reagents_list[R2]
-				outstring += "<li>Catalyst: <a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_catalysts[R3.id]]u</li>"
+				outstring += "<li>Catalyst: <a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_catalysts[R3.type]]u</li>"
 		outstring += "</ul> | "
 	else
 		outstring += "N/A | "
@@ -361,11 +279,11 @@
 	var/datum/reagent/R3
 	for(var/R2 in CR.required_reagents)
 		R3 = GLOB.chemical_reagents_list[R2]
-		outstring += "<li><a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_reagents[R3.id]]u</li>"
+		outstring += "<li><a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_reagents[R3.type]]u</li>"
 	if(CR.required_catalysts)
 		for(var/R2 in CR.required_catalysts)
 			R3 = GLOB.chemical_reagents_list[R2]
-			outstring += "<li>Catalyst: <a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_catalysts[R3.id]]u</li>"
+			outstring += "<li>Catalyst: <a href=\"#[R3.name]\">[R3.name]</a>: [CR.required_catalysts[R3.type]]u</li>"
 	outstring += "</ul> | <ul>"
 
 	//Reaction vars
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 256f86bb53..217c915a9e 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -227,7 +227,7 @@
 			var/chemname = temp.name
 			if(is_hallucinating && prob(5))
 				chemname = "[pick_list_replacements("hallucination.json", "chemicals")]"
-			chemicals.Add(list(list("title" = chemname, "id" = temp.id)))
+			chemicals.Add(list(list("title" = chemname, "id" = ckey(temp.name))))
 	for(var/recipe in saved_recipes)
 		recipes.Add(list(recipe))
 	data["chemicals"] = chemicals
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 4770e392cf..dfcd5b3876 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -186,13 +186,13 @@
 	var/beakerContents[0]
 	if(beaker)
 		for(var/datum/reagent/R in beaker.reagents.reagent_list)
-			beakerContents.Add(list(list("name" = R.name, "id" = R.id, "volume" = R.volume))) // list in a list because Byond merges the first list...
+			beakerContents.Add(list(list("name" = R.name, "id" = ckey(R.name), "volume" = R.volume))) // list in a list because Byond merges the first list...
 		data["beakerContents"] = beakerContents
 
 	var/bufferContents[0]
 	if(reagents.total_volume)
 		for(var/datum/reagent/N in reagents.reagent_list)
-			bufferContents.Add(list(list("name" = N.name, "id" = N.id, "volume" = N.volume))) // ^
+			bufferContents.Add(list(list("name" = N.name, "id" = ckey(N.name), "volume" = N.volume))) // ^
 		data["bufferContents"] = bufferContents
 
 	//Calculated at init time as it never changes
diff --git a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
index 5e0bc39368..ed23e7c75c 100644
--- a/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_synthesizer.dm
@@ -31,7 +31,7 @@
 				beaker = null
 				. = TRUE
 		if("input")
-			var/input_reagent = replacetext(lowertext(input("Enter the name of any reagent", "Input") as text), " ", "") //95% of the time, the reagent id is a lowercase/no spaces version of the name
+			var/input_reagent = replacetext(lowertext(input("Enter the name of any reagent", "Input") as text), " ", "") //95% of the time, the reagent types is a lowercase, no spaces / underscored version of the name
 			if(shortcuts[input_reagent])
 				input_reagent = shortcuts[input_reagent]
 			else
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index 007bcb145d..5eb2c135a8 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -15,7 +15,6 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
 
 /datum/reagent
 	var/name = "Reagent"
-	var/id = "reagent"
 	var/description = ""
 	var/specific_heat = SPECIFIC_HEAT_DEFAULT		//J/(K*mol)
 	var/taste_description = "metaphorical salt"
@@ -97,12 +96,12 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
 		return
 	var/mob/living/carbon/M = L
 	if (purity == 1)
-		log_game("CHEM: [L] ckey: [L.key] has ingested [volume]u of [id]")
+		log_game("CHEM: [L] ckey: [L.key] has ingested [volume]u of [type]")
 		return
 	if(cached_purity == 1)
 		cached_purity = purity
 	else if(purity < 0)
-		CRASH("Purity below 0 for chem: [id], Please let Fermis Know!")
+		CRASH("Purity below 0 for chem: [type], Please let Fermis Know!")
 	if(chemical_flags & REAGENT_DONOTSPLIT)
 		return
 
@@ -121,7 +120,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
 		if(!(chemical_flags & REAGENT_SPLITRETAINVOL))
 			M.reagents.remove_reagent(type, (impureVol), FALSE)
 		M.reagents.add_reagent(impure_chem, impureVol, FALSE, other_purity = 1-cached_purity)
-		log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume - impureVol]u of [id]")
+		log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume - impureVol]u of [type]")
 		log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume]u of [impure_chem]")
 	return
 
@@ -149,11 +148,11 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
 	if(!iscarbon(M))
 		return
 	if (purity == 1)
-		log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume]u of [id]")
+		log_game("FERMICHEM: [M] ckey: [M.key] has ingested [volume]u of [type]")
 		return
 	cached_purity = purity //purity SHOULD be precalculated from the add_reagent, update cache.
 	if (purity < 0)
-		CRASH("Purity below 0 for chem: [id], Please let Fermis Know!")
+		CRASH("Purity below 0 for chem: [type], Please let Fermis Know!")
 	if(chemical_flags & REAGENT_DONOTSPLIT)
 		return
 
@@ -172,7 +171,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
 		if(!(chemical_flags & REAGENT_SPLITRETAINVOL))
 			M.reagents.remove_reagent(type, impureVol, FALSE)
 		M.reagents.add_reagent(impure_chem, impureVol, FALSE, other_purity = 1-cached_purity)
-		log_game("FERMICHEM: [M] ckey: [M.key] has merged [volume - impureVol]u of [id]")
+		log_game("FERMICHEM: [M] ckey: [M.key] has merged [volume - impureVol]u of [type]")
 		log_game("FERMICHEM: [M] ckey: [M.key] has merged [volume]u of [impure_chem]")
 	return
 
@@ -189,29 +188,29 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
 
 /datum/reagent/proc/overdose_start(mob/living/M)
 	to_chat(M, "<span class='userdanger'>You feel like you took too much of [name]!</span>")
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/overdose, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/overdose, name)
 	return
 
 /datum/reagent/proc/addiction_act_stage1(mob/living/M)
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/withdrawal_light, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_light, name)
 	if(prob(30))
 		to_chat(M, "<span class='notice'>You feel like having some [name] right about now.</span>")
 	return
 
 /datum/reagent/proc/addiction_act_stage2(mob/living/M)
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/withdrawal_medium, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_medium, name)
 	if(prob(30))
 		to_chat(M, "<span class='notice'>You feel like you need [name]. You just can't get enough.</span>")
 	return
 
 /datum/reagent/proc/addiction_act_stage3(mob/living/M)
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/withdrawal_severe, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_severe, name)
 	if(prob(30))
 		to_chat(M, "<span class='danger'>You have an intense craving for [name].</span>")
 	return
 
 /datum/reagent/proc/addiction_act_stage4(mob/living/M)
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/withdrawal_critical, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/withdrawal_critical, name)
 	if(prob(30))
 		to_chat(M, "<span class='boldannounce'>You're not feeling good at all! You really need some [name].</span>")
 	return
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 5d24508b9e..52567b736f 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -8,7 +8,6 @@
 
 /datum/reagent/consumable/ethanol
 	name = "Ethanol"
-	id = "ethanol"
 	description = "A well-known alcohol with a variety of applications."
 	color = "#404030" // rgb: 64, 64, 48
 	nutriment_factor = 0
@@ -79,7 +78,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/beer
 	name = "Beer"
-	id = "beer"
 	description = "An alcoholic beverage brewed since ancient times on Old Earth. Still popular today."
 	color = "#664300" // rgb: 102, 67, 0
 	nutriment_factor = 1 * REAGENTS_METABOLISM
@@ -92,7 +90,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/beer/light
 	name = "Light Beer"
-	id = "light_beer"
 	description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety has reduced calorie and alcohol content."
 	boozepwr = 5 //Space Europeans hate it
 	taste_description = "dish water"
@@ -103,7 +100,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/beer/green
 	name = "Green Beer"
-	id = "greenbeer"
 	description = "An alcoholic beverage brewed since ancient times on Old Earth. This variety is dyed a festive green."
 	color = "#A8E61D"
 	taste_description = "green piss water"
@@ -123,7 +119,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/kahlua
 	name = "Kahlua"
-	id = "kahlua"
 	description = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
@@ -146,7 +141,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/whiskey
 	name = "Whiskey"
-	id = "whiskey"
 	description = "A superb and well-aged single-malt whiskey. Damn."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 75
@@ -160,7 +154,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/thirteenloko
 	name = "Thirteen Loko"
-	id = "thirteenloko"
 	description = "A potent mixture of caffeine and alcohol."
 	color = "#102000" // rgb: 16, 32, 0
 	nutriment_factor = 1 * REAGENTS_METABOLISM
@@ -225,7 +218,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/vodka
 	name = "Vodka"
-	id = "vodka"
 	description = "Number one drink AND fueling choice for Russians worldwide."
 	color = "#0064C8" // rgb: 0, 100, 200
 	boozepwr = 65
@@ -243,7 +235,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bilk
 	name = "Bilk"
-	id = "bilk"
 	description = "This appears to be beer mixed with milk. Disgusting."
 	color = "#895C4C" // rgb: 137, 92, 76
 	nutriment_factor = 2 * REAGENTS_METABOLISM
@@ -262,7 +253,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/threemileisland
 	name = "Three Mile Island Iced Tea"
-	id = "threemileisland"
 	description = "Made for a woman, strong enough for a man."
 	color = "#666340" // rgb: 102, 99, 64
 	boozepwr = 10
@@ -280,7 +270,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/gin
 	name = "Gin"
-	id = "gin"
 	description = "It's gin. In space. I say, good sir."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
@@ -293,7 +282,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/rum
 	name = "Rum"
-	id = "rum"
 	description = "Yohoho and all that."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 60
@@ -307,7 +295,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/tequila
 	name = "Tequila"
-	id = "tequila"
 	description = "A strong and mildly flavoured, Mexican produced spirit. Feeling thirsty, hombre?"
 	color = "#FFFF91" // rgb: 255, 255, 145
 	boozepwr = 70
@@ -321,7 +308,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/vermouth
 	name = "Vermouth"
-	id = "vermouth"
 	description = "You suddenly feel a craving for a martini..."
 	color = "#91FF91" // rgb: 145, 255, 145
 	boozepwr = 45
@@ -335,7 +321,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/wine
 	name = "Wine"
-	id = "wine"
 	description = "A premium alcoholic beverage made from distilled grape juice."
 	color = "#7E4043" // rgb: 126, 64, 67
 	boozepwr = 35
@@ -349,7 +334,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/lizardwine
 	name = "Lizard wine"
-	id = "lizardwine"
 	description = "An alcoholic beverage from Space China, made by infusing lizard tails in ethanol."
 	color = "#7E4043" // rgb: 126, 64, 67
 	boozepwr = 45
@@ -360,7 +344,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/grappa
 	name = "Grappa"
-	id = "grappa"
 	description = "A fine Italian brandy, for when regular wine just isn't alcoholic enough for you."
 	color = "#F8EBF1"
 	boozepwr = 60
@@ -373,7 +356,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/cognac
 	name = "Cognac"
-	id = "cognac"
 	description = "A sweet and strongly alcoholic drink, made after numerous distillations and years of maturing. Classy as fornication."
 	color = "#AB3C05" // rgb: 171, 60, 5
 	boozepwr = 75
@@ -387,7 +369,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/absinthe
 	name = "Absinthe"
-	id = "absinthe"
 	description = "A powerful alcoholic drink. Rumored to cause hallucinations but does not."
 	color = rgb(10, 206, 0)
 	boozepwr = 80 //Very strong even by default
@@ -405,7 +386,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/hooch
 	name = "Hooch"
-	id = "hooch"
 	description = "Either someone's failure at cocktail making or attempt in alcohol production. In any case, do you really want to drink that?"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 100
@@ -422,7 +402,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/ale
 	name = "Ale"
-	id = "ale"
 	description = "A dark alcoholic beverage made with malted barley and yeast."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 65
@@ -435,7 +414,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/goldschlager
 	name = "Goldschlager"
-	id = "goldschlager"
 	description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
 	color = "#FFFF91" // rgb: 255, 255, 145
 	boozepwr = 25
@@ -449,7 +427,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/patron
 	name = "Patron"
-	id = "patron"
 	description = "Tequila with silver in it, a favorite of alcoholic women in the club scene."
 	color = "#585840" // rgb: 88, 88, 64
 	boozepwr = 60
@@ -464,7 +441,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/gintonic
 	name = "Gin and Tonic"
-	id = "gintonic"
 	description = "An all time classic, mild cocktail."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 25
@@ -478,7 +454,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/rum_coke
 	name = "Rum and Coke"
-	id = "rumcoke"
 	description = "Rum, mixed with cola."
 	taste_description = "cola"
 	boozepwr = 40
@@ -492,7 +467,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/cuba_libre
 	name = "Cuba Libre"
-	id = "cubalibre"
 	description = "Viva la Revolucion! Viva Cuba Libre!"
 	color = "#3E1B00" // rgb: 62, 27, 0
 	boozepwr = 50
@@ -515,7 +489,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/whiskey_cola
 	name = "Whiskey Cola"
-	id = "whiskeycola"
 	description = "Whiskey, mixed with cola. Surprisingly refreshing."
 	color = "#3E1B00" // rgb: 62, 27, 0
 	boozepwr = 70
@@ -528,7 +501,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/martini
 	name = "Classic Martini"
-	id = "martini"
 	description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 60
@@ -541,7 +513,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/vodkamartini
 	name = "Vodka Martini"
-	id = "vodkamartini"
 	description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 65
@@ -555,7 +526,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/white_russian
 	name = "White Russian"
-	id = "whiterussian"
 	description = "That's just, like, your opinion, man..."
 	color = "#A68340" // rgb: 166, 131, 64
 	boozepwr = 50
@@ -568,7 +538,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/screwdrivercocktail
 	name = "Screwdriver"
-	id = "screwdrivercocktail"
 	description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious."
 	color = "#A68310" // rgb: 166, 131, 16
 	boozepwr = 55
@@ -586,7 +555,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/booger
 	name = "Booger"
-	id = "booger"
 	description = "Ewww..."
 	color = "#8CFF8C" // rgb: 140, 255, 140
 	boozepwr = 45
@@ -598,7 +566,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bloody_mary
 	name = "Bloody Mary"
-	id = "bloodymary"
 	description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 55
@@ -618,7 +585,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/brave_bull
 	name = "Brave Bull"
-	id = "bravebull"
 	description = "It's just as effective as Dutch-Courage!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 80
@@ -643,7 +609,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/tequila_sunrise
 	name = "Tequila Sunrise"
-	id = "tequilasunrise"
 	description = "Tequila, Grenadine, and Orange Juice."
 	color = "#FFE48C" // rgb: 255, 228, 140
 	boozepwr = 45
@@ -673,7 +638,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/toxins_special
 	name = "Toxins Special"
-	id = "toxinsspecial"
 	description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 25
@@ -691,7 +655,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/beepsky_smash
 	name = "Beepsky Smash"
-	id = "beepskysmash"
 	description = "Drink this and prepare for the LAW."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 90 //THE FIST OF THE LAW IS STRONG AND HARD
@@ -736,7 +699,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/irish_cream
 	name = "Irish Cream"
-	id = "irishcream"
 	description = "Whiskey-imbued cream, what else would you expect from the Irish?"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 50
@@ -749,7 +711,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/manly_dorf
 	name = "The Manly Dorf"
-	id = "manlydorf"
 	description = "Beer and Ale, brought together in a delicious mix. Intended for true men only."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 100 //For the manly only
@@ -777,7 +738,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/longislandicedtea
 	name = "Long Island Iced Tea"
-	id = "longislandicedtea"
 	description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
@@ -790,7 +750,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/moonshine
 	name = "Moonshine"
-	id = "moonshine"
 	description = "You've really hit rock bottom now... your liver packed its bags and left last night."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 95
@@ -802,7 +761,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/b52
 	name = "B-52"
-	id = "b52"
 	description = "Coffee, Irish Cream, and cognac. You will get bombed."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 85
@@ -819,7 +777,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/irishcoffee
 	name = "Irish Coffee"
-	id = "irishcoffee"
 	description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
@@ -832,7 +789,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/margarita
 	name = "Margarita"
-	id = "margarita"
 	description = "On the rocks with salt on the rim. Arriba~!"
 	color = "#8CFF8C" // rgb: 140, 255, 140
 	boozepwr = 35
@@ -845,7 +801,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/black_russian
 	name = "Black Russian"
-	id = "blackrussian"
 	description = "For the lactose-intolerant. Still as classy as a White Russian."
 	color = "#360000" // rgb: 54, 0, 0
 	boozepwr = 70
@@ -859,7 +814,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/manhattan
 	name = "Manhattan"
-	id = "manhattan"
 	description = "The Detective's undercover drink of choice. He never could stomach gin..."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 30
@@ -873,7 +827,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/manhattan_proj
 	name = "Manhattan Project"
-	id = "manhattan_proj"
 	description = "A scientist's drink of choice, for pondering ways to blow up the station."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
@@ -891,7 +844,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/whiskeysoda
 	name = "Whiskey Soda"
-	id = "whiskeysoda"
 	description = "For the more refined griffon."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 70
@@ -904,7 +856,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/antifreeze
 	name = "Anti-freeze"
-	id = "antifreeze"
 	description = "The ultimate refreshment. Not what it sounds like."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
@@ -921,7 +872,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/barefoot
 	name = "Barefoot"
-	id = "barefoot"
 	description = "Barefoot and pregnant."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
@@ -942,7 +892,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/snowwhite
 	name = "Snow White"
-	id = "snowwhite"
 	description = "A cold refreshment."
 	color = "#FFFFFF" // rgb: 255, 255, 255
 	boozepwr = 35
@@ -955,7 +904,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/demonsblood //Prevents the imbiber from being dragged into a pool of blood by a slaughter demon.
 	name = "Demon's Blood"
-	id = "demonsblood"
 	description = "AHHHH!!!!"
 	color = "#820000" // rgb: 130, 0, 0
 	boozepwr = 75
@@ -968,7 +916,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/devilskiss //If eaten by a slaughter demon, the demon will regret it.
 	name = "Devil's Kiss"
-	id = "devilskiss"
 	description = "Creepy time!"
 	color = "#A68310" // rgb: 166, 131, 16
 	boozepwr = 70
@@ -981,7 +928,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/vodkatonic
 	name = "Vodka and Tonic"
-	id = "vodkatonic"
 	description = "For when a gin and tonic isn't Russian enough."
 	color = "#0064C8" // rgb: 0, 100, 200
 	boozepwr = 70
@@ -994,7 +940,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/ginfizz
 	name = "Gin Fizz"
-	id = "ginfizz"
 	description = "Refreshingly lemony, deliciously dry."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
@@ -1007,7 +952,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bahama_mama
 	name = "Bahama Mama"
-	id = "bahama_mama"
 	description = "Tropical cocktail."
 	color = "#FF7F3B" // rgb: 255, 127, 59
 	boozepwr = 35
@@ -1020,7 +964,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/singulo
 	name = "Singulo"
-	id = "singulo"
 	description = "A blue-space beverage!"
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 35
@@ -1033,7 +976,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/sbiten
 	name = "Sbiten"
-	id = "sbiten"
 	description = "A spicy Vodka! Might be a little hot for the little guys!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 70
@@ -1050,7 +992,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/red_mead
 	name = "Red Mead"
-	id = "red_mead"
 	description = "The true Viking drink! Even though it has a strange red color."
 	color = "#C73C00" // rgb: 199, 60, 0
 	boozepwr = 31 //Red drinks are stronger
@@ -1063,7 +1004,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/mead
 	name = "Mead"
-	id = "mead"
 	description = "A Viking drink, though a cheap one."
 	color = "#664300" // rgb: 102, 67, 0
 	nutriment_factor = 1 * REAGENTS_METABOLISM
@@ -1077,7 +1017,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/iced_beer
 	name = "Iced Beer"
-	id = "iced_beer"
 	description = "A beer which is so cold the air around it freezes."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 15
@@ -1093,7 +1032,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/grog
 	name = "Grog"
-	id = "grog"
 	description = "Watered down rum, Nanotrasen approves!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 1 //Basically nothing
@@ -1105,7 +1043,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/aloe
 	name = "Aloe"
-	id = "aloe"
 	description = "So very, very, very good."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
@@ -1118,7 +1055,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/andalusia
 	name = "Andalusia"
-	id = "andalusia"
 	description = "A nice, strangely named drink."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 40
@@ -1131,7 +1067,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/alliescocktail
 	name = "Allies Cocktail"
-	id = "alliescocktail"
 	description = "A drink made from your allies. Not as sweet as those made from your enemies."
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
@@ -1144,7 +1079,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/acid_spit
 	name = "Acid Spit"
-	id = "acidspit"
 	description = "A drink for the daring, can be deadly if incorrectly prepared!"
 	color = "#365000" // rgb: 54, 80, 0
 	boozepwr = 80
@@ -1157,7 +1091,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/amasec
 	name = "Amasec"
-	id = "amasec"
 	description = "Official drink of the Nanotrasen Gun-Club!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
@@ -1170,7 +1103,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/changelingsting
 	name = "Changeling Sting"
-	id = "changelingsting"
 	description = "You take a tiny sip and feel a burning sensation..."
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 95
@@ -1191,7 +1123,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/irishcarbomb
 	name = "Irish Car Bomb"
-	id = "irishcarbomb"
 	description = "Mmm, tastes like chocolate cake..."
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 25
@@ -1204,7 +1135,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/syndicatebomb
 	name = "Syndicate Bomb"
-	id = "syndicatebomb"
 	description = "Tastes like terrorism!"
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 90
@@ -1222,7 +1152,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/erikasurprise
 	name = "Erika Surprise"
-	id = "erikasurprise"
 	description = "The surprise is, it's green!"
 	color = "#2E6671" // rgb: 46, 102, 113
 	boozepwr = 35
@@ -1235,7 +1164,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/driestmartini
 	name = "Driest Martini"
-	id = "driestmartini"
 	description = "Only for the experienced. You think you see sand floating in the glass."
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	color = "#2E6671" // rgb: 46, 102, 113
@@ -1249,7 +1177,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bananahonk
 	name = "Banana Honk"
-	id = "bananahonk"
 	description = "A drink from Clown Heaven."
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	color = "#FFFF91" // rgb: 255, 255, 140
@@ -1269,7 +1196,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/silencer
 	name = "Silencer"
-	id = "silencer"
 	description = "A drink from Mime Heaven."
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	color = "#664300" // rgb: 102, 67, 0
@@ -1289,7 +1215,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/drunkenblumpkin
 	name = "Drunken Blumpkin"
-	id = "drunkenblumpkin"
 	description = "A weird mix of whiskey and blumpkin juice."
 	color = "#1EA0FF" // rgb: 102, 67, 0
 	boozepwr = 50
@@ -1302,7 +1227,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/whiskey_sour //Requested since we had whiskey cola and soda but not sour.
 	name = "Whiskey Sour"
-	id = "whiskey_sour"
 	description = "Lemon juice/whiskey/sugar mixture. Moderate alcohol content."
 	color = rgb(255, 201, 49)
 	boozepwr = 35
@@ -1315,7 +1239,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/hcider
 	name = "Hard Cider"
-	id = "hcider"
 	description = "Apple juice, for adults."
 	color = "#CD6839"
 	nutriment_factor = 1 * REAGENTS_METABOLISM
@@ -1329,7 +1252,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/fetching_fizz //A reference to one of my favorite games of all time. Pulls nearby ores to the imbiber!
 	name = "Fetching Fizz"
-	id = "fetching_fizz"
 	description = "Whiskey sour/iron/uranium mixture resulting in a highly magnetic slurry. Mild alcohol content." //Requires no alcohol to make but has alcohol anyway because ~magic~
 	color = rgb(255, 91, 15)
 	boozepwr = 10
@@ -1349,7 +1271,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 //Another reference. Heals those in critical condition extremely quickly.
 /datum/reagent/consumable/ethanol/hearty_punch
 	name = "Hearty Punch"
-	id = "hearty_punch"
 	description = "Brave bull/syndicate bomb/absinthe mixture resulting in an energizing beverage. Mild alcohol content."
 	color = rgb(140, 0, 0)
 	boozepwr = 90
@@ -1373,7 +1294,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bacchus_blessing //An EXTREMELY powerful drink. Smashed in seconds, dead in minutes.
 	name = "Bacchus' Blessing"
-	id = "bacchus_blessing"
 	description = "Unidentifiable mixture. Unmeasurably high alcohol content."
 	color = rgb(51, 19, 3) //Sickly brown
 	boozepwr = 300 //I warned you
@@ -1386,7 +1306,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/atomicbomb
 	name = "Atomic Bomb"
-	id = "atomicbomb"
 	description = "Nuclear proliferation never tasted so good."
 	color = "#666300" // rgb: 102, 99, 0
 	boozepwr = 0 //custom drunk effect
@@ -1416,7 +1335,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/gargle_blaster
 	name = "Pan-Galactic Gargle Blaster"
-	id = "gargleblaster"
 	description = "Whoah, this stuff looks volatile!"
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 0 //custom drunk effect
@@ -1445,7 +1363,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/neurotoxin
 	name = "Neurotoxin"
-	id = "neurotoxin"
 	description = "A strong neurotoxin that puts the subject into a death-like state."
 	color = "#2E2E61" // rgb: 46, 46, 97
 	boozepwr = 50
@@ -1497,7 +1414,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/neuroweak
 	name = "Neuro-Smash"
-	id = "neuroweak"
 	description = "A mostly safe alcoholic drink for the true daredevils. Counteracts Neurotoxins."
 	boozepwr = 60
 	pH = 8
@@ -1517,7 +1433,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/hippies_delight
 	name = "Hippie's Delight"
-	id = "hippiesdelight"
 	description = "You just don't get it maaaan."
 	color = "#664300" // rgb: 102, 67, 0
 	nutriment_factor = 0
@@ -1563,7 +1478,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/eggnog
 	name = "Eggnog"
-	id = "eggnog"
 	description = "The traditional way to get absolutely hammered at a Christmas party."
 	color = "#fcfdc6" // rgb: 252, 253, 198
 	nutriment_factor = 2 * REAGENTS_METABOLISM
@@ -1578,7 +1492,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/narsour
 	name = "Nar'Sour"
-	id = "narsour"
 	description = "Side effects include self-mutilation and hoarding plasteel."
 	color = RUNE_COLOR_DARKRED
 	boozepwr = 10
@@ -1596,7 +1509,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/triple_sec
 	name = "Triple Sec"
-	id = "triple_sec"
 	description = "A sweet and vibrant orange liqueur."
 	color = "#ffcc66"
 	boozepwr = 30
@@ -1608,7 +1520,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/creme_de_menthe
 	name = "Creme de Menthe"
-	id = "creme_de_menthe"
 	description = "A minty liqueur excellent for refreshing, cool drinks."
 	color = "#00cc00"
 	boozepwr = 20
@@ -1620,7 +1531,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/creme_de_cacao
 	name = "Creme de Cacao"
-	id = "creme_de_cacao"
 	description = "A chocolatey liqueur excellent for adding dessert notes to beverages and bribing sororities."
 	color = "#996633"
 	boozepwr = 20
@@ -1632,7 +1542,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/quadruple_sec
 	name = "Quadruple Sec"
-	id = "quadruple_sec"
 	description = "Kicks just as hard as licking the powercell on a baton, but tastier."
 	color = "#cc0000"
 	boozepwr = 35
@@ -1652,7 +1561,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/quintuple_sec
 	name = "Quintuple Sec"
-	id = "quintuple_sec"
 	description = "Law, Order, Alcohol, and Police Brutality distilled into one single elixir of JUSTICE."
 	color = "#ff3300"
 	boozepwr = 80
@@ -1675,7 +1583,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/grasshopper
 	name = "Grasshopper"
-	id = "grasshopper"
 	description = "A fresh and sweet dessert shooter. Difficult to look manly while drinking this."
 	color = "00ff00"
 	boozepwr = 25
@@ -1688,7 +1595,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/stinger
 	name = "Stinger"
-	id = "stinger"
 	description = "A snappy way to end the day."
 	color = "ccff99"
 	boozepwr = 25
@@ -1701,7 +1607,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bastion_bourbon
 	name = "Bastion Bourbon"
-	id = "bastion_bourbon"
 	description = "Soothing hot herbal brew with restorative properties. Hints of citrus and berry flavors."
 	color = "#00FFFF"
 	boozepwr = 30
@@ -1741,7 +1646,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/squirt_cider
 	name = "Squirt Cider"
-	id = "squirt_cider"
 	description = "Fermented squirt extract with a nose of stale bread and ocean water. Whatever a squirt is."
 	color = "#FF0000"
 	boozepwr = 40
@@ -1760,7 +1664,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/fringe_weaver
 	name = "Fringe Weaver"
-	id = "fringe_weaver"
 	description = "Bubbly, classy, and undoubtedly strong - a Glitch City classic."
 	color = "#FFEAC4"
 	boozepwr = 90 //classy hooch, essentially, but lower pwr to make up for slightly easier access
@@ -1773,7 +1676,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/sugar_rush
 	name = "Sugar Rush"
-	id = "sugar_rush"
 	description = "Sweet, light, and fruity - as girly as it gets."
 	color = "#FF226C"
 	boozepwr = 10
@@ -1792,7 +1694,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/crevice_spike
 	name = "Crevice Spike"
-	id = "crevice_spike"
 	description = "Sour, bitter, and smashingly sobering."
 	color = "#5BD231"
 	boozepwr = -10 //sobers you up - ideally, one would drink to get hit with brute damage now to avoid alcohol problems later
@@ -1808,7 +1709,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/sake
 	name = "Sake"
-	id = "sake"
 	description = "A sweet rice wine of questionable legality and extreme potency."
 	color = "#DDDDDD"
 	boozepwr = 70
@@ -1820,7 +1720,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/peppermint_patty
 	name = "Peppermint Patty"
-	id = "peppermint_patty"
 	description = "This lightly alcoholic drink combines the benefits of menthol and cocoa."
 	color = "#45ca7a"
 	taste_description = "mint and chocolate"
@@ -1838,7 +1737,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/alexander
 	name = "Alexander"
-	id = "alexander"
 	description = "Named after a Greek hero, this mix is said to embolden a user's shield as if they were in a phalanx."
 	color = "#F5E9D3"
 	boozepwr = 80
@@ -1872,7 +1770,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/sidecar
 	name = "Sidecar"
-	id = "sidecar"
 	description = "The one ride you'll gladly give up the wheel for."
 	color = "#FFC55B"
 	boozepwr = 80
@@ -1885,7 +1782,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/between_the_sheets
 	name = "Between the Sheets"
-	id = "between_the_sheets"
 	description = "A provocatively named classic. Funny enough, doctors recommend drinking it before taking a nap."
 	color = "#F4C35A"
 	boozepwr = 80
@@ -1911,7 +1807,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/kamikaze
 	name = "Kamikaze"
-	id = "kamikaze"
 	description = "Divinely windy."
 	color = "#EEF191"
 	boozepwr = 60
@@ -1924,7 +1819,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/mojito
 	name = "Mojito"
-	id = "mojito"
 	description = "A drink that looks as refreshing as it tastes."
 	color = "#DFFAD9"
 	boozepwr = 30
@@ -1937,7 +1831,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/fernet
 	name = "Fernet"
-	id = "fernet"
 	description = "An incredibly bitter herbal liqueur used as a digestif."
 	color = "#1B2E24" // rgb: 27, 46, 36
 	boozepwr = 80
@@ -1955,7 +1848,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/fernet_cola
 	name = "Fernet Cola"
-	id = "fernet_cola"
 	description = "A very popular and bittersweet digestif, ideal after a heavy meal. Best served on a sawed-off cola bottle as per tradition."
 	color = "#390600" // rgb: 57, 6, 0
 	boozepwr = 25
@@ -1976,7 +1868,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 /datum/reagent/consumable/ethanol/fanciulli
 
 	name = "Fanciulli"
-	id = "fanciulli"
 	description = "What if the Manhattan coctail ACTUALLY used a bitter herb liquour? Helps you sobers up." //also causes a bit of stamina damage to symbolize the afterdrink lazyness
 	color = "#CA933F" // rgb: 202, 147, 63
 	boozepwr = -10
@@ -2001,7 +1892,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/branca_menta
 	name = "Branca Menta"
-	id = "branca_menta"
 	description = "A refreshing mixture of bitter Fernet with mint creme liquour."
 	color = "#4B5746" // rgb: 75, 87, 70
 	boozepwr = 35
@@ -2024,7 +1914,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/blank_paper
 	name = "Blank Paper"
-	id = "blank_paper"
 	description = "A bubbling glass of blank paper. Just looking at it makes you feel fresh."
 	nutriment_factor = 1 * REAGENTS_METABOLISM
 	color = "#DCDCDC" // rgb: 220, 220, 220
@@ -2044,7 +1933,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/champagne //How the hell did we not have champagne already!?
 	name = "Champagne"
-	id = "champagne"
 	description = "A sparkling wine known for its ability to strike fast and hard."
 	color = "#ffffc1"
 	boozepwr = 40
@@ -2056,7 +1944,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/wizz_fizz
 	name = "Wizz Fizz"
-	id = "wizz_fizz"
 	description = "A magical potion, fizzy and wild! However the taste, you will find, is quite mild."
 	color = "#4235d0" //Just pretend that the triple-sec was blue curacao.
 	boozepwr = 50
@@ -2077,7 +1964,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/bug_spray
 	name = "Bug Spray"
-	id = "bug_spray"
 	description = "A harsh, acrid, bitter drink, for those who need something to brace themselves."
 	color = "#33ff33"
 	boozepwr = 50
@@ -2101,7 +1987,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/applejack
 	name = "Applejack"
-	id = "applejack"
 	description = "The perfect beverage for when you feel the need to horse around."
 	color = "#ff6633"
 	boozepwr = 20
@@ -2113,7 +1998,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/jack_rose
 	name = "Jack Rose"
-	id = "jack_rose"
 	description = "A light cocktail perfect for sipping with a slice of pie."
 	color = "#ff6633"
 	boozepwr = 15
@@ -2126,7 +2010,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/turbo
 	name = "Turbo"
-	id = "turbo"
 	description = "A turbulent cocktail associated with outlaw hoverbike racing. Not for the faint of heart."
 	color = "#e94c3a"
 	boozepwr = 85
@@ -2145,7 +2028,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/old_timer
 	name = "Old Timer"
-	id = "old_timer"
 	description = "An archaic potation enjoyed by old coots of all ages."
 	color = "#996835"
 	boozepwr = 35
@@ -2166,7 +2048,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 				N.hair_color = "ccc"
 				N.update_hair()
 				if(N.age > 100)
-					N.become_nearsighted(id)
+					N.become_nearsighted(type)
 					if(N.gender == MALE)
 						N.facial_hair_style = "Beard (Very Long)"
 						N.update_hair()
@@ -2179,7 +2061,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/rubberneck
 	name = "Rubberneck"
-	id = "rubberneck"
 	description = "A quality rubberneck should not contain any gross natural ingredients."
 	color = "#ffe65b"
 	boozepwr = 60
@@ -2192,7 +2073,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/duplex
 	name = "Duplex"
-	id = "duplex"
 	description = "An inseparable combination of two fruity drinks."
 	color = "#50e5cf"
 	boozepwr = 25
@@ -2205,7 +2085,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/trappist
 	name = "Trappist Beer"
-	id = "trappist"
 	description = "A strong dark ale brewed by space-monks."
 	color = "#390c00"
 	boozepwr = 40
@@ -2225,7 +2104,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/blazaam
 	name = "Blazaam"
-	id = "blazaam"
 	description = "A strange drink that few people seem to remember existing. Doubles as a Berenstain remover."
 	boozepwr = 70
 	quality = DRINK_FANTASTIC
@@ -2249,7 +2127,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/planet_cracker
 	name = "Planet Cracker"
-	id = "planet_cracker"
 	description = "This jubilant drink celebrates humanity's triumph over the alien menace. May be offensive to non-human crewmembers."
 	boozepwr = 50
 	quality = DRINK_FANTASTIC
@@ -2261,7 +2138,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/commander_and_chief
 	name = "Commander and Chief"
-	id = "commander_and_chief"
 	description = "A cocktail for the captain on the go."
 	color = "#ffffc9"
 	boozepwr = 50
@@ -2285,7 +2161,6 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/fruit_wine
 	name = "Fruit Wine"
-	id = "fruit_wine"
 	description = "A wine made from grown plants."
 	color = "#FFFFFF"
 	boozepwr = 35
diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
index b5993a8783..fba0b47eb4 100644
--- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
@@ -47,7 +47,6 @@
 //does brute damage but can replicate when damaged and has a chance of expanding again
 /datum/reagent/blob/replicating_foam
 	name = "Replicating Foam"
-	id = "replicating_foam"
 	description = "will do medium brute damage and occasionally expand again when expanding."
 	shortdesc = "will do medium brute damage."
 	effectdesc = "will also expand when attacked with burn damage, but takes more brute damage."
@@ -78,7 +77,6 @@
 //does massive brute and burn damage, but can only expand manually
 /datum/reagent/blob/networked_fibers
 	name = "Networked Fibers"
-	id = "networked_fibers"
 	description = "will do high brute and burn damage and will generate resources quicker, but can only expand manually."
 	shortdesc = "will do high brute and burn damage."
 	taste_description = "efficiency"
@@ -112,7 +110,6 @@
 //does brute damage, shifts away when damaged
 /datum/reagent/blob/shifting_fragments
 	name = "Shifting Fragments"
-	id = "shifting_fragments"
 	description = "will do medium brute damage."
 	effectdesc = "will also cause blob parts to shift away when attacked."
 	taste_description = "something other-dimensional"
@@ -134,7 +131,7 @@
 	if((damage_flag == "melee" || damage_flag == "bullet" || damage_flag == "laser") && damage > 0 && B.obj_integrity - damage > 0 && prob(60-damage))
 		var/list/blobstopick = list()
 		for(var/obj/structure/blob/OB in orange(1, B))
-			if((istype(OB, /obj/structure/blob/normal) || (istype(OB, /obj/structure/blob/shield) && prob(25))) && OB.overmind && OB.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id)
+			if((istype(OB, /obj/structure/blob/normal) || (istype(OB, /obj/structure/blob/shield) && prob(25))) && OB.overmind && OB.overmind.blob_reagent_datum.type == B.overmind.blob_reagent_datum.type)
 				blobstopick += OB //as long as the blob picked is valid; ie, a normal or shield blob that has the same chemical as we do, we can swap with it
 		if(blobstopick.len)
 			var/obj/structure/blob/targeted = pick(blobstopick) //randomize the blob chosen, because otherwise it'd tend to the lower left
@@ -146,7 +143,6 @@
 //sets you on fire, does burn damage, explodes into flame when burnt, weak to water
 /datum/reagent/blob/blazing_oil
 	name = "Blazing Oil"
-	id = "blazing_oil"
 	description = "will do medium burn damage and set targets on fire."
 	effectdesc = "will also release bursts of flame when burnt, but takes damage from water."
 	taste_description = "burning oil"
@@ -174,7 +170,7 @@
 	if(damage_type == BURN && damage_flag != "energy")
 		for(var/turf/open/T in range(1, B))
 			var/obj/structure/blob/C = locate() in T
-			if(!(C && C.overmind && C.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id) && prob(80))
+			if(!(C && C.overmind && C.overmind.blob_reagent_datum.type == B.overmind.blob_reagent_datum.type) && prob(80))
 				new /obj/effect/hotspot(T)
 	if(damage_flag == "fire")
 		return 0
@@ -183,7 +179,6 @@
 //does toxin damage, hallucination, targets think they're not hurt at all
 /datum/reagent/blob/regenerative_materia
 	name = "Regenerative Materia"
-	id = "regenerative_materia"
 	description = "will do toxin damage and cause targets to believe they are fully healed."
 	analyzerdescdamage = "Does toxin damage and injects a toxin that causes the target to believe they are fully healed."
 	taste_description = "heaven"
@@ -213,7 +208,6 @@
 //kills sleeping targets and turns them into blob zombies, produces fragile spores when killed or on expanding
 /datum/reagent/blob/zombifying_pods
 	name = "Zombifying Pods"
-	id = "zombifying_pods"
 	description = "will do very low toxin damage and harvest sleeping targets for additional resources and a blob zombie."
 	effectdesc = "will also produce fragile spores when killed and on expanding."
 	taste_description = "fungi"
@@ -257,7 +251,6 @@
 //does tons of oxygen damage and a little stamina, immune to tesla bolts, weak to EMP
 /datum/reagent/blob/energized_jelly
 	name = "Energized Jelly"
-	id = "energized_jelly"
 	description = "will cause low stamina and high oxygen damage, and cause targets to be unable to breathe."
 	taste_description = "gelatin"
 	effectdesc = "will also conduct electricity, but takes damage from EMPs."
@@ -289,7 +282,6 @@
 //does aoe brute damage when hitting targets, is immune to explosions
 /datum/reagent/blob/explosive_lattice
 	name = "Explosive Lattice"
-	id = "explosive_lattice"
 	description = "will do brute damage in an area around targets."
 	taste_description = "the bomb"
 	effectdesc = "will also resist explosions, but takes increased damage from fire and other energy sources."
@@ -326,7 +318,6 @@
 //does brute, burn, and toxin damage, and cools targets down
 /datum/reagent/blob/cryogenic_poison
 	name = "Cryogenic Poison"
-	id = "cryogenic_poison"
 	description = "will inject targets with a freezing poison that does high damage over time."
 	analyzerdescdamage = "Injects targets with a freezing poison that will gradually solidify the target's internal organs."
 	color = "#8BA6E9"
@@ -354,7 +345,6 @@
 //does burn damage and EMPs, slightly fragile
 /datum/reagent/blob/electromagnetic_web
 	name = "Electromagnetic Web"
-	id = "electromagnetic_web"
 	description = "will do high burn damage and EMP targets."
 	taste_description = "pop rocks"
 	effectdesc = "will also take massively increased damage and release an EMP when killed."
@@ -391,7 +381,6 @@
 //does brute damage, bonus damage for each nearby blob, and spreads damage out
 /datum/reagent/blob/synchronous_mesh
 	name = "Synchronous Mesh"
-	id = "synchronous_mesh"
 	description = "will do massively increased brute damage for each blob near the target."
 	effectdesc = "will also spread damage between each blob near the attacked blob."
 	taste_description = "toxic mold"
@@ -415,10 +404,10 @@
 	if(damage_flag == "melee" || damage_flag == "bullet" || damage_flag == "laser") //the cause isn't fire or bombs, so split the damage
 		var/damagesplit = 1 //maximum split is 9, reducing the damage each blob takes to 11% but doing that damage to 9 blobs
 		for(var/obj/structure/blob/C in orange(1, B))
-			if(!istype(C, /obj/structure/blob/core) && !istype(C, /obj/structure/blob/node) && C.overmind && C.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id) //if it doesn't have the same chemical or is a core or node, don't split damage to it
+			if(!istype(C, /obj/structure/blob/core) && !istype(C, /obj/structure/blob/node) && C.overmind && C.overmind.blob_reagent_datum.type == B.overmind.blob_reagent_datum.type) //if it doesn't have the same chemical or is a core or node, don't split damage to it
 				damagesplit += 1
 		for(var/obj/structure/blob/C in orange(1, B))
-			if(!istype(C, /obj/structure/blob/core) && !istype(C, /obj/structure/blob/node) && C.overmind && C.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id) //only hurt blobs that have the same overmind chemical and aren't cores or nodes
+			if(!istype(C, /obj/structure/blob/core) && !istype(C, /obj/structure/blob/node) && C.overmind && C.overmind.blob_reagent_datum.type == B.overmind.blob_reagent_datum.type) //only hurt blobs that have the same overmind chemical and aren't cores or nodes
 				C.take_damage(damage/damagesplit, CLONE, 0, 0)
 		return damage / damagesplit
 	else
@@ -427,7 +416,6 @@
 //does brute damage through armor and bio resistance
 /datum/reagent/blob/reactive_spines
 	name = "Reactive Spines"
-	id = "reactive_spines"
 	description = "will do medium brute damage through armor and bio resistance."
 	taste_description = "rock"
 	effectdesc = "will also react when attacked with brute damage, attacking all near the attacked blob."
@@ -454,7 +442,6 @@
 //does low brute damage, oxygen damage, and stamina damage and wets tiles when damaged
 /datum/reagent/blob/pressurized_slime
 	name = "Pressurized Slime"
-	id = "pressurized_slime"
 	description = "will do low brute, oxygen, and stamina damage, and wet tiles under targets."
 	effectdesc = "will also wet tiles near blobs that are attacked or killed."
 	taste_description = "a sponge"
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 290c680ea8..4e1ba399ba 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -6,7 +6,6 @@
 
 /datum/reagent/consumable/orangejuice
 	name = "Orange Juice"
-	id = "orangejuice"
 	description = "Both delicious AND rich in Vitamin C, what more do you need?"
 	color = "#E78108" // rgb: 231, 129, 8
 	taste_description = "oranges"
@@ -23,7 +22,6 @@
 
 /datum/reagent/consumable/tomatojuice
 	name = "Tomato Juice"
-	id = "tomatojuice"
 	description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?"
 	color = "#731008" // rgb: 115, 16, 8
 	taste_description = "tomatoes"
@@ -39,7 +37,6 @@
 
 /datum/reagent/consumable/limejuice
 	name = "Lime Juice"
-	id = "limejuice"
 	description = "The sweet-sour juice of limes."
 	color = "#365E30" // rgb: 54, 94, 48
 	taste_description = "unbearable sourness"
@@ -56,7 +53,6 @@
 
 /datum/reagent/consumable/carrotjuice
 	name = "Carrot Juice"
-	id = "carrotjuice"
 	description = "It is just like a carrot but without crunching."
 	color = "#973800" // rgb: 151, 56, 0
 	taste_description = "carrots"
@@ -78,7 +74,6 @@
 
 /datum/reagent/consumable/berryjuice
 	name = "Berry Juice"
-	id = "berryjuice"
 	description = "A delicious blend of several different kinds of berries."
 	color = "#863333" // rgb: 134, 51, 51
 	taste_description = "berries"
@@ -88,7 +83,6 @@
 
 /datum/reagent/consumable/applejuice
 	name = "Apple Juice"
-	id = "applejuice"
 	description = "The sweet juice of an apple, fit for all ages."
 	color = "#ECFF56" // rgb: 236, 255, 86
 	taste_description = "apples"
@@ -96,7 +90,6 @@
 
 /datum/reagent/consumable/poisonberryjuice
 	name = "Poison Berry Juice"
-	id = "poisonberryjuice"
 	description = "A tasty juice blended from various kinds of very deadly and toxic berries."
 	color = "#863353" // rgb: 134, 51, 83
 	taste_description = "berries"
@@ -111,7 +104,6 @@
 
 /datum/reagent/consumable/watermelonjuice
 	name = "Watermelon Juice"
-	id = "watermelonjuice"
 	description = "Delicious juice made from watermelon."
 	color = "#863333" // rgb: 134, 51, 51
 	taste_description = "juicy watermelon"
@@ -121,7 +113,6 @@
 
 /datum/reagent/consumable/lemonjuice
 	name = "Lemon Juice"
-	id = "lemonjuice"
 	description = "This juice is VERY sour."
 	color = "#863333" // rgb: 175, 175, 0
 	taste_description = "sourness"
@@ -132,7 +123,6 @@
 
 /datum/reagent/consumable/banana
 	name = "Banana Juice"
-	id = "banana"
 	description = "The raw essence of a banana. HONK"
 	color = "#863333" // rgb: 175, 175, 0
 	taste_description = "banana"
@@ -148,7 +138,6 @@
 
 /datum/reagent/consumable/nothing
 	name = "Nothing"
-	id = "nothing"
 	description = "Absolutely nothing."
 	taste_description = "nothing"
 	glass_icon_state = "nothing"
@@ -164,7 +153,6 @@
 
 /datum/reagent/consumable/laughter
 	name = "Laughter"
-	id = "laughter"
 	description = "Some say that this is the best medicine, but recent studies have proven that to be untrue."
 	metabolization_rate = INFINITY
 	color = "#FF4DD2"
@@ -177,7 +165,6 @@
 
 /datum/reagent/consumable/superlaughter
 	name = "Super Laughter"
-	id = "superlaughter"
 	description = "Funny until you're the one laughing."
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
 	color = "#FF4DD2"
@@ -192,7 +179,6 @@
 
 /datum/reagent/consumable/potato_juice
 	name = "Potato Juice"
-	id = "potato"
 	description = "Juice of the potato. Bleh."
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	color = "#302000" // rgb: 48, 32, 0
@@ -203,14 +189,12 @@
 
 /datum/reagent/consumable/grapejuice
 	name = "Grape Juice"
-	id = "grapejuice"
 	description = "The juice of a bunch of grapes. Guaranteed non-alcoholic."
 	color = "#290029" // dark purple
 	taste_description = "grape soda"
 
 /datum/reagent/consumable/milk
 	name = "Milk"
-	id = "milk"
 	description = "An opaque white liquid produced by the mammary glands of mammals."
 	color = "#DFDFDF" // rgb: 223, 223, 223
 	taste_description = "milk"
@@ -233,7 +217,6 @@
 
 /datum/reagent/consumable/soymilk
 	name = "Soy Milk"
-	id = "soymilk"
 	description = "An opaque white liquid made from soybeans."
 	color = "#DFDFC7" // rgb: 223, 223, 199
 	taste_description = "soy milk"
@@ -249,7 +232,6 @@
 
 /datum/reagent/consumable/cream
 	name = "Cream"
-	id = "cream"
 	description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?"
 	color = "#DFD7AF" // rgb: 223, 215, 175
 	taste_description = "creamy milk"
@@ -265,7 +247,6 @@
 
 /datum/reagent/consumable/coffee
 	name = "Coffee"
-	id = "coffee"
 	description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant."
 	color = "#482000" // rgb: 72, 32, 0
 	nutriment_factor = 0
@@ -292,7 +273,6 @@
 
 /datum/reagent/consumable/tea
 	name = "Tea"
-	id = "tea"
 	description = "Tasty black tea, it has antioxidants, it's good for you!"
 	color = "#101000" // rgb: 16, 16, 0
 	nutriment_factor = 0
@@ -314,7 +294,6 @@
 
 /datum/reagent/consumable/lemonade
 	name = "Lemonade"
-	id = "lemonade"
 	description = "Sweet, tangy lemonade. Good for the soul."
 	quality = DRINK_NICE
 	taste_description = "sunshine and summertime"
@@ -324,7 +303,6 @@
 
 /datum/reagent/consumable/tea/arnold_palmer
 	name = "Arnold Palmer"
-	id = "arnold_palmer"
 	description = "Encourages the patient to go golfing."
 	color = "#FFB766"
 	quality = DRINK_NICE
@@ -342,7 +320,6 @@
 
 /datum/reagent/consumable/icecoffee
 	name = "Iced Coffee"
-	id = "icecoffee"
 	description = "Coffee and ice, refreshing and cool."
 	color = "#102838" // rgb: 16, 40, 56
 	nutriment_factor = 0
@@ -362,7 +339,6 @@
 
 /datum/reagent/consumable/icetea
 	name = "Iced Tea"
-	id = "icetea"
 	description = "No relation to a certain rap artist/actor."
 	color = "#104038" // rgb: 16, 64, 56
 	nutriment_factor = 0
@@ -383,7 +359,6 @@
 
 /datum/reagent/consumable/space_cola
 	name = "Cola"
-	id = "cola"
 	description = "A refreshing beverage."
 	color = "#100800" // rgb: 16, 8, 0
 	taste_description = "cola"
@@ -398,7 +373,6 @@
 
 /datum/reagent/consumable/nuka_cola
 	name = "Nuka Cola"
-	id = "nuka_cola"
 	description = "Cola, cola never changes."
 	color = "#100800" // rgb: 16, 8, 0
 	quality = DRINK_VERYGOOD
@@ -407,10 +381,6 @@
 	glass_name = "glass of Nuka Cola"
 	glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland."
 
-/datum/reagent/consumable/nuka_cola/on_mob_end_metabolize(mob/living/L)
-	L.remove_movespeed_modifier(id)
-	..()
-
 /datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/M)
 	M.Jitter(20)
 	M.set_drugginess(30)
@@ -423,7 +393,6 @@
 
 /datum/reagent/consumable/spacemountainwind
 	name = "SM Wind"
-	id = "spacemountainwind"
 	description = "Blows right through you like a space wind."
 	color = "#102000" // rgb: 16, 32, 0
 	taste_description = "sweet citrus soda"
@@ -441,7 +410,6 @@
 
 /datum/reagent/consumable/dr_gibb
 	name = "Dr. Gibb"
-	id = "dr_gibb"
 	description = "A delicious blend of 42 different flavours."
 	color = "#102000" // rgb: 16, 32, 0
 	taste_description = "cherry soda" // FALSE ADVERTISING
@@ -456,7 +424,6 @@
 
 /datum/reagent/consumable/space_up
 	name = "Space-Up"
-	id = "space_up"
 	description = "Tastes like a hull breach in your mouth."
 	color = "#00FF00" // rgb: 0, 255, 0
 	taste_description = "cherry soda"
@@ -472,7 +439,6 @@
 /datum/reagent/consumable/lemon_lime
 	name = "Lemon Lime"
 	description = "A tangy substance made of 0.5% natural citrus!"
-	id = "lemon_lime"
 	color = "#8CFF00" // rgb: 135, 255, 0
 	taste_description = "tangy lime and lemon soda"
 	glass_icon_state = "glass_yellow"
@@ -486,7 +452,6 @@
 /datum/reagent/consumable/pwr_game
 	name = "Pwr Game"
 	description = "The only drink with the PWR that true gamers crave."
-	id = "pwr_game"
 	color = "#9385bf" // rgb: 58, 52, 75
 	taste_description = "sweet and salty tang"
 	glass_icon_state = "glass_red"
@@ -500,7 +465,6 @@
 /datum/reagent/consumable/shamblers
 	name = "Shambler's Juice"
 	description = "~Shake me up some of that Shambler's Juice!~"
-	id = "shamblers"
 	color = "#f00060" // rgb: 94, 0, 38
 	taste_description = "carbonated metallic soda"
 	glass_icon_state = "glass_red"
@@ -514,7 +478,6 @@
 /datum/reagent/consumable/buzz_fuzz
 	name = "Buzz Fuzz"
 	description = "~A Hive of Flavour!~ NOTICE: Addicting."
-	id = "buzz_fuzz"
 	addiction_threshold = 26 //A can and a sip
 	color = "#8CFF00" // rgb: 135, 255, 0
 	taste_description = "carbonated honey and pollen"
@@ -558,7 +521,6 @@
 
 /datum/reagent/consumable/grey_bull
 	name = "Grey Bull"
-	id = "grey_bull"
 	description = "Grey Bull, it gives you gloves!"
 	color = "#EEFF00" // rgb: 238, 255, 0
 	quality = DRINK_VERYGOOD
@@ -569,10 +531,10 @@
 
 /datum/reagent/consumable/grey_bull/on_mob_metabolize(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_SHOCKIMMUNE, id)
+	ADD_TRAIT(L, TRAIT_SHOCKIMMUNE, type)
 
 /datum/reagent/consumable/grey_bull/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_SHOCKIMMUNE, id)
+	REMOVE_TRAIT(L, TRAIT_SHOCKIMMUNE, type)
 	..()
 
 /datum/reagent/consumable/grey_bull/on_mob_life(mob/living/carbon/M)
@@ -585,7 +547,6 @@
 
 /datum/reagent/consumable/sodawater
 	name = "Soda Water"
-	id = "sodawater"
 	description = "A can of club soda. Why not make a scotch and soda?"
 	color = "#619494" // rgb: 97, 148, 148
 	taste_description = "carbonated water"
@@ -601,7 +562,6 @@
 
 /datum/reagent/consumable/tonic
 	name = "Tonic Water"
-	id = "tonic"
 	description = "It tastes strange but at least the quinine keeps the Space Malaria at bay."
 	color = "#0064C8" // rgb: 0, 100, 200
 	taste_description = "tart and fresh"
@@ -619,7 +579,6 @@
 
 /datum/reagent/consumable/ice
 	name = "Ice"
-	id = "ice"
 	description = "Frozen water, your dentist wouldn't like you chewing this."
 	reagent_state = SOLID
 	color = "#619494" // rgb: 97, 148, 148
@@ -634,7 +593,6 @@
 
 /datum/reagent/consumable/soy_latte
 	name = "Soy Latte"
-	id = "soy_latte"
 	description = "A nice and tasty beverage while you are reading your hippie books."
 	color = "#664300" // rgb: 102, 67, 0
 	quality = DRINK_NICE
@@ -656,7 +614,6 @@
 
 /datum/reagent/consumable/cafe_latte
 	name = "Cafe Latte"
-	id = "cafe_latte"
 	description = "A nice, strong and tasty beverage while you are reading."
 	color = "#664300" // rgb: 102, 67, 0
 	quality = DRINK_NICE
@@ -678,7 +635,6 @@
 
 /datum/reagent/consumable/doctor_delight
 	name = "The Doctor's Delight"
-	id = "doctorsdelight"
 	description = "A gulp a day keeps the Medibot away! A mixture of juices that heals most damage types fairly quickly at the cost of hunger."
 	color = "#FF8CFF" // rgb: 255, 140, 255
 	quality = DRINK_VERYGOOD
@@ -700,7 +656,6 @@
 
 /datum/reagent/consumable/chocolatepudding
 	name = "Chocolate Pudding"
-	id = "chocolatepudding"
 	description = "A great dessert for chocolate lovers."
 	color = "#800000"
 	quality = DRINK_VERYGOOD
@@ -712,7 +667,6 @@
 
 /datum/reagent/consumable/vanillapudding
 	name = "Vanilla Pudding"
-	id = "vanillapudding"
 	description = "A great dessert for vanilla lovers."
 	color = "#FAFAD2"
 	quality = DRINK_VERYGOOD
@@ -724,7 +678,6 @@
 
 /datum/reagent/consumable/cherryshake
 	name = "Cherry Shake"
-	id = "cherryshake"
 	description = "A cherry flavored milkshake."
 	color = "#FFB6C1"
 	quality = DRINK_VERYGOOD
@@ -736,7 +689,6 @@
 
 /datum/reagent/consumable/bluecherryshake
 	name = "Blue Cherry Shake"
-	id = "bluecherryshake"
 	description = "An exotic milkshake."
 	color = "#00F1FF"
 	quality = DRINK_VERYGOOD
@@ -748,7 +700,6 @@
 
 /datum/reagent/consumable/pumpkin_latte
 	name = "Pumpkin Latte"
-	id = "pumpkin_latte"
 	description = "A mix of pumpkin juice and coffee."
 	color = "#F4A460"
 	quality = DRINK_VERYGOOD
@@ -760,7 +711,6 @@
 
 /datum/reagent/consumable/gibbfloats
 	name = "Gibb Floats"
-	id = "gibbfloats"
 	description = "Ice cream on top of a Dr. Gibb glass."
 	color = "#B22222"
 	quality = DRINK_NICE
@@ -772,21 +722,18 @@
 
 /datum/reagent/consumable/pumpkinjuice
 	name = "Pumpkin Juice"
-	id = "pumpkinjuice"
 	description = "Juiced from real pumpkin."
 	color = "#FFA500"
 	taste_description = "pumpkin"
 
 /datum/reagent/consumable/blumpkinjuice
 	name = "Blumpkin Juice"
-	id = "blumpkinjuice"
 	description = "Juiced from real blumpkin."
 	color = "#00BFFF"
 	taste_description = "a mouthful of pool water"
 
 /datum/reagent/consumable/triple_citrus
 	name = "Triple Citrus"
-	id = "triple_citrus"
 	description = "A solution."
 	color = "#fff12b"
 	quality = DRINK_NICE
@@ -797,7 +744,6 @@
 
 /datum/reagent/consumable/grape_soda
 	name = "Grape soda"
-	id = "grapesoda"
 	description = "Beloved of children and teetotalers."
 	color = "#E6CDFF"
 	taste_description = "grape soda"
@@ -810,7 +756,6 @@
 
 /datum/reagent/consumable/milk/chocolate_milk
 	name = "Chocolate Milk"
-	id = "chocolate_milk"
 	description = "Milk for cool kids."
 	color = "#7D4E29"
 	quality = DRINK_NICE
@@ -818,7 +763,6 @@
 
 /datum/reagent/consumable/menthol
 	name = "Menthol"
-	id = "menthol"
 	description = "Alleviates coughing symptoms one might have."
 	color = "#80AF9C"
 	taste_description = "mint"
@@ -832,7 +776,6 @@
 
 /datum/reagent/consumable/grenadine
 	name = "Grenadine"
-	id = "grenadine"
 	description = "Not cherry flavored!"
 	color = "#EA1D26"
 	taste_description = "sweet pomegranates"
@@ -841,7 +784,6 @@
 
 /datum/reagent/consumable/parsnipjuice
 	name = "Parsnip Juice"
-	id = "parsnipjuice"
 	description = "Why..."
 	color = "#FFA500"
 	taste_description = "parsnip"
@@ -849,7 +791,6 @@
 
 /datum/reagent/consumable/peachjuice //Intended to be extremely rare due to being the limiting ingredients in the blazaam drink
 	name = "Peach Juice"
-	id = "peachjuice"
 	description = "Just peachy."
 	color = "#E78108"
 	taste_description = "peaches"
@@ -857,7 +798,6 @@
 
 /datum/reagent/consumable/cream_soda
 	name = "Cream Soda"
-	id = "cream_soda"
 	description = "A classic space-American vanilla flavored soft drink."
 	color = "#dcb137"
 	quality = DRINK_VERYGOOD
@@ -872,7 +812,6 @@
 
 /datum/reagent/consumable/red_queen
 	name = "Red Queen"
-	id = "red_queen"
 	description = "DRINK ME."
 	color = "#e6ddc3"
 	quality = DRINK_GOOD
@@ -900,7 +839,6 @@
 
 /datum/reagent/consumable/pinkmilk
 	name = "Strawberry Milk"
-	id = "pinkmilk"
 	description = "A drink of a bygone era of milk and artificial sweetener back on a rock."
 	color = "#f76aeb"//rgb(247, 106, 235)
 	glass_icon_state = "pinkmilk"
@@ -917,7 +855,6 @@
 
 /datum/reagent/consumable/pinktea //Tiny Tim song
 	name = "Strawberry Tea"
-	id = "pinktea"
 	description = "A timeless classic!"
 	color = "#f76aeb"//rgb(247, 106, 235)
 	glass_icon_state = "pinktea"
@@ -934,7 +871,6 @@
 
 /datum/reagent/consumable/catnip_tea
 	name = "Catnip Tea"
-	id = "catnip_tea"
 	description = "A sleepy and tasty catnip tea!"
 	color = "#101000" // rgb: 16, 16, 0
 	nutriment_factor = 0
@@ -954,7 +890,6 @@
 
 /datum/reagent/consumable/monkey_energy
 	name = "Monkey Energy"
-	id = "monkey_energy"
 	description = "The only drink that will make you unleash the ape."
 	color = "#f39b03" // rgb: 243, 155, 3
 	taste_description = "barbecue and nostalgia"
@@ -969,3 +904,12 @@
 	M.AdjustSleeping(-40, FALSE)
 	M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
 	..()
+
+/datum/reagent/consumable/bungojuice
+	name = "Bungo Juice"
+	color = "#F9E43D"
+	description = "Exotic! You feel like you are on vactation already."
+	taste_description = "succulent bungo"
+	glass_icon_state = "glass_yellow"
+	glass_name = "glass of bungo juice"
+	glass_desc = "Exotic! You feel like you are on vacation already."
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index e956fcac36..a2e651d791 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -1,6 +1,5 @@
 /datum/reagent/drug
 	name = "Drug"
-	id = "drug"
 	value = 12
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
 	taste_description = "bitterness"
@@ -8,11 +7,10 @@
 
 /datum/reagent/drug/on_mob_end_metabolize(mob/living/M)
 	if(trippy)
-		SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "[id]_high")
+		SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "[type]_high")
 
 /datum/reagent/drug/space_drugs
 	name = "Space drugs"
-	id = "space_drugs"
 	value = 6
 	description = "An illegal chemical compound used as drug."
 	color = "#60A584" // rgb: 96, 165, 132
@@ -31,7 +29,7 @@
 
 /datum/reagent/drug/space_drugs/overdose_start(mob/living/M)
 	to_chat(M, "<span class='userdanger'>You start tripping hard!</span>")
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/overdose, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/overdose, name)
 
 /datum/reagent/drug/space_drugs/overdose_process(mob/living/M)
 	if(M.hallucination < volume && prob(20))
@@ -40,7 +38,6 @@
 
 /datum/reagent/drug/nicotine
 	name = "Nicotine"
-	id = "nicotine"
 	value = 0
 	description = "Slightly reduces stun times. If overdosed it will deal toxin and oxygen damage."
 	reagent_state = LIQUID
@@ -64,7 +61,6 @@
 
 /datum/reagent/drug/crank
 	name = "Crank"
-	id = "crank"
 	description = "Reduces stun times by about 200%. If overdosed or addicted it will deal significant Toxin, Brute and Brain damage."
 	reagent_state = LIQUID
 	color = "#FA00C8"
@@ -112,7 +108,6 @@
 
 /datum/reagent/drug/krokodil
 	name = "Krokodil"
-	id = "krokodil"
 	description = "Cools and calms you down. If overdosed it will deal significant Brain and Toxin damage. If addicted it will begin to deal fatal amounts of Brute damage as the subject's skin falls off."
 	reagent_state = LIQUID
 	color = "#0064B4"
@@ -164,7 +159,6 @@
 
 /datum/reagent/drug/methamphetamine
 	name = "Methamphetamine"
-	id = "methamphetamine"
 	description = "Reduces stun times by about 300%, and allows the user to quickly recover stamina while dealing a small amount of Brain damage. If overdosed the subject will move randomly, laugh randomly, drop items and suffer from Toxin and Brain damage. If addicted the subject will constantly jitter and drool, before becoming dizzy and losing motor control and eventually suffer heavy toxin damage."
 	reagent_state = LIQUID
 	color = "#FAFAFA"
@@ -178,10 +172,10 @@
 
 /datum/reagent/drug/methamphetamine/on_mob_metabolize(mob/living/L)
 	..()
-	L.ignore_slowdown(id)
+	L.ignore_slowdown(type)
 
 /datum/reagent/drug/methamphetamine/on_mob_end_metabolize(mob/living/L)
-	L.unignore_slowdown(id)
+	L.unignore_slowdown(type)
 	..()
 
 /datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/M)
@@ -252,7 +246,6 @@
 	. = 1
 
 /datum/reagent/drug/methamphetamine/changeling
-	id = "changelingmeth"
 	name = "Changeling Adrenaline"
 	addiction_threshold = 35
 	overdose_threshold = 35
@@ -261,7 +254,6 @@
 
 /datum/reagent/drug/bath_salts
 	name = "Bath Salts"
-	id = "bath_salts"
 	description = "Makes you impervious to stuns and grants a stamina regeneration buff, but you will be a nearly uncontrollable tramp-bearded raving lunatic."
 	reagent_state = LIQUID
 	color = "#FAFAFA"
@@ -273,16 +265,16 @@
 
 /datum/reagent/drug/bath_salts/on_mob_metabolize(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_STUNIMMUNE, id)
-	ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, id)
+	ADD_TRAIT(L, TRAIT_STUNIMMUNE, type)
+	ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
 	if(iscarbon(L))
 		var/mob/living/carbon/C = L
 		rage = new()
 		C.gain_trauma(rage, TRAUMA_RESILIENCE_ABSOLUTE)
 
 /datum/reagent/drug/bath_salts/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_STUNIMMUNE, id)
-	REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, id)
+	REMOVE_TRAIT(L, TRAIT_STUNIMMUNE, type)
+	REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
 	if(rage)
 		QDEL_NULL(rage)
 	..()
@@ -362,7 +354,6 @@
 
 /datum/reagent/drug/aranesp
 	name = "Aranesp"
-	id = "aranesp"
 	description = "Amps you up and gets you going, fixes all stamina damage you might have but can cause toxin and oxygen damage."
 	reagent_state = LIQUID
 	color = "#78FFF0"
@@ -382,7 +373,6 @@
 
 /datum/reagent/drug/happiness
 	name = "Happiness"
-	id = "happiness"
 	description = "Fills you with ecstasic numbness and causes minor brain damage. Highly addictive. If overdosed causes sudden mood swings."
 	reagent_state = LIQUID
 	color = "#FFF378"
@@ -392,11 +382,11 @@
 
 /datum/reagent/drug/happiness/on_mob_add(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_FEARLESS, id)
+	ADD_TRAIT(L, TRAIT_FEARLESS, type)
 	SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "happiness_drug", /datum/mood_event/happiness_drug)
 
 /datum/reagent/drug/happiness/on_mob_delete(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_FEARLESS, id)
+	REMOVE_TRAIT(L, TRAIT_FEARLESS, type)
 	SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "happiness_drug")
 	..()
 
@@ -460,7 +450,6 @@
 
 /datum/reagent/drug/skooma
 	name = "Skooma"
-	id = "skooma"
 	description = "An ancient, highly-addictive drug of long-forgotten times. It greatly improves the user's speed and strength, but heavily impedes their intelligence and agility."
 	reagent_state = LIQUID
 	color = "#F3E0F9"
@@ -472,7 +461,7 @@
 
 /datum/reagent/drug/skooma/on_mob_metabolize(mob/living/L)
 	. = ..()
-	L.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
+	L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
 	L.next_move_modifier *= 2
 	if(ishuman(L))
 		var/mob/living/carbon/human/H = L
@@ -483,7 +472,7 @@
 
 /datum/reagent/drug/skooma/on_mob_end_metabolize(mob/living/L)
 	. = ..()
-	L.remove_movespeed_modifier(id)
+	L.remove_movespeed_modifier(type)
 	L.next_move_modifier *= 0.5
 	if(ishuman(L))
 		var/mob/living/carbon/human/H = L
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index c57053386e..cd50acca1d 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -9,7 +9,6 @@
 
 /datum/reagent/consumable
 	name = "Consumable"
-	id = "consumable"
 	taste_description = "generic food"
 	taste_mult = 4
 	value = 0.1
@@ -39,7 +38,6 @@
 
 /datum/reagent/consumable/nutriment
 	name = "Nutriment"
-	id = "nutriment"
 	description = "All the vitamins, minerals, and carbohydrates the body needs in pure form."
 	reagent_state = SOLID
 	nutriment_factor = 15 * REAGENTS_METABOLISM
@@ -90,7 +88,6 @@
 
 /datum/reagent/consumable/nutriment/vitamin
 	name = "Vitamin"
-	id = "vitamin"
 	description = "All the best vitamins, minerals, and carbohydrates the body needs in pure form."
 	value = 0.5
 
@@ -104,7 +101,6 @@
 
 /datum/reagent/consumable/cooking_oil
 	name = "Cooking Oil"
-	id = "cooking_oil"
 	description = "A variety of cooking oil derived from fat or plants. Used in food preparation and frying."
 	color = "#EADD6B" //RGB: 234, 221, 107 (based off of canola oil)
 	taste_mult = 0.8
@@ -150,7 +146,6 @@
 
 /datum/reagent/consumable/sugar
 	name = "Sugar"
-	id = "sugar"
 	description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
 	reagent_state = SOLID
 	color = "#FFFFFF" // rgb: 255, 255, 255
@@ -173,7 +168,6 @@
 
 /datum/reagent/consumable/virus_food
 	name = "Virus Food"
-	id = "virusfood"
 	description = "A mixture of water and milk. Virus cells can use this mixture to reproduce."
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	color = "#899613" // rgb: 137, 150, 19
@@ -181,7 +175,6 @@
 
 /datum/reagent/consumable/soysauce
 	name = "Soysauce"
-	id = "soysauce"
 	description = "A salty sauce made from the soy plant."
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	color = "#792300" // rgb: 121, 35, 0
@@ -189,7 +182,6 @@
 
 /datum/reagent/consumable/ketchup
 	name = "Ketchup"
-	id = "ketchup"
 	description = "Ketchup, catsup, whatever. It's tomato paste."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#731008" // rgb: 115, 16, 8
@@ -197,7 +189,6 @@
 
 /datum/reagent/consumable/mustard
 	name = "Mustard"
-	id = "mustard"
 	description = "Mustard, mostly used on hotdogs, corndogs and burgers."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#DDED26" // rgb: 221, 237, 38
@@ -205,7 +196,6 @@
 
 /datum/reagent/consumable/capsaicin
 	name = "Capsaicin Oil"
-	id = "capsaicin"
 	description = "This is what makes chilis hot."
 	color = "#B31008" // rgb: 179, 16, 8
 	taste_description = "hot peppers"
@@ -237,7 +227,6 @@
 
 /datum/reagent/consumable/frostoil
 	name = "Frost Oil"
-	id = "frostoil"
 	description = "A special oil that noticably chills the body. Extracted from Icepeppers and slimes."
 	color = "#8BA6E9" // rgb: 139, 166, 233
 	taste_description = "mint"
@@ -284,7 +273,6 @@
 
 /datum/reagent/consumable/condensedcapsaicin
 	name = "Condensed Capsaicin"
-	id = "condensedcapsaicin"
 	description = "A chemical agent used for self-defense and in police work."
 	color = "#B31008" // rgb: 179, 16, 8
 	taste_description = "scorching agony"
@@ -358,7 +346,6 @@
 
 /datum/reagent/consumable/sodiumchloride
 	name = "Table Salt"
-	id = "sodiumchloride"
 	description = "A salt made of sodium chloride. Commonly used to season food."
 	reagent_state = SOLID
 	color = "#FFFFFF" // rgb: 255,255,255
@@ -379,7 +366,6 @@
 
 /datum/reagent/consumable/blackpepper
 	name = "Black Pepper"
-	id = "blackpepper"
 	description = "A powder ground from peppercorns. *AAAACHOOO*"
 	reagent_state = SOLID
 	// no color (ie, black)
@@ -387,7 +373,6 @@
 
 /datum/reagent/consumable/coco
 	name = "Coco Powder"
-	id = "cocoa"
 	description = "A fatty, bitter paste made from coco beans."
 	reagent_state = SOLID
 	nutriment_factor = 5 * REAGENTS_METABOLISM
@@ -396,7 +381,6 @@
 
 /datum/reagent/consumable/hot_coco
 	name = "Hot Chocolate"
-	id = "hot_coco"
 	description = "Made with love! And coco beans."
 	nutriment_factor = 3 * REAGENTS_METABOLISM
 	color = "#403010" // rgb: 64, 48, 16
@@ -411,7 +395,6 @@
 
 /datum/reagent/drug/mushroomhallucinogen
 	name = "Mushroom Hallucinogen"
-	id = "mushroomhallucinogen"
 	description = "A strong hallucinogenic drug derived from certain species of mushroom."
 	color = "#E700E7" // rgb: 231, 0, 231
 	metabolization_rate = 0.2 * REAGENTS_METABOLISM
@@ -442,7 +425,6 @@
 
 /datum/reagent/consumable/sprinkles
 	name = "Sprinkles"
-	id = "sprinkles"
 	value = 3
 	description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops."
 	color = "#FF00FF" // rgb: 255, 0, 255
@@ -456,7 +438,6 @@
 
 /datum/reagent/consumable/peanut_butter
 	name = "Peanut Butter"
-	id = "peanut_butter"
 	description = "A popular food paste made from ground dry-roasted peanuts."
 	color = "#C29261"
 	value = 3
@@ -465,7 +446,6 @@
 
 /datum/reagent/consumable/cornoil
 	name = "Corn Oil"
-	id = "cornoil"
 	description = "An oil derived from various types of corn."
 	nutriment_factor = 20 * REAGENTS_METABOLISM
 	value = 4
@@ -486,7 +466,6 @@
 
 /datum/reagent/consumable/enzyme
 	name = "Universal Enzyme"
-	id = "enzyme"
 	value = 1
 	description = "A universal enzyme used in the preperation of certain chemicals and foods."
 	color = "#365E30" // rgb: 54, 94, 48
@@ -494,7 +473,6 @@
 
 /datum/reagent/consumable/dry_ramen
 	name = "Dry Ramen"
-	id = "dry_ramen"
 	description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water."
 	reagent_state = SOLID
 	color = "#302000" // rgb: 48, 32, 0
@@ -502,7 +480,6 @@
 
 /datum/reagent/consumable/hot_ramen
 	name = "Hot Ramen"
-	id = "hot_ramen"
 	description = "The noodles are boiled, the flavors are artificial, just like being back in school."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#302000" // rgb: 48, 32, 0
@@ -514,7 +491,6 @@
 
 /datum/reagent/consumable/hell_ramen
 	name = "Hell Ramen"
-	id = "hell_ramen"
 	description = "The noodles are boiled, the flavors are artificial, just like being back in school."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#302000" // rgb: 48, 32, 0
@@ -526,7 +502,6 @@
 
 /datum/reagent/consumable/flour
 	name = "Flour"
-	id = "flour"
 	value = 0.5
 	description = "This is what you rub all over yourself to pretend to be a ghost."
 	reagent_state = SOLID
@@ -542,7 +517,6 @@
 
 /datum/reagent/consumable/cherryjelly
 	name = "Cherry Jelly"
-	id = "cherryjelly"
 	description = "Totally the best. Only to be spread on foods with excellent lateral symmetry."
 	color = "#801E28" // rgb: 128, 30, 40
 	value = 1
@@ -550,7 +524,6 @@
 
 /datum/reagent/consumable/bluecherryjelly
 	name = "Blue Cherry Jelly"
-	id = "bluecherryjelly"
 	description = "Blue and tastier kind of cherry jelly."
 	color = "#00F0FF"
 	value = 12
@@ -558,7 +531,6 @@
 
 /datum/reagent/consumable/rice
 	name = "Rice"
-	id = "rice"
 	value = 0.5
 	description = "tiny nutritious grains"
 	reagent_state = SOLID
@@ -568,7 +540,6 @@
 
 /datum/reagent/consumable/vanilla
 	name = "Vanilla Powder"
-	id = "vanilla"
 	value = 1
 	description = "A fatty, bitter paste made from vanilla pods."
 	reagent_state = SOLID
@@ -578,7 +549,6 @@
 
 /datum/reagent/consumable/eggyolk
 	name = "Egg Yolk"
-	id = "eggyolk"
 	value = 1
 	description = "It's full of protein."
 	nutriment_factor = 3 * REAGENTS_METABOLISM
@@ -587,7 +557,6 @@
 
 /datum/reagent/consumable/corn_starch
 	name = "Corn Starch"
-	id = "corn_starch"
 	value = 2
 	description = "A slippery solution."
 	color = "#f7f6e4"
@@ -595,7 +564,6 @@
 
 /datum/reagent/consumable/corn_syrup
 	name = "Corn Syrup"
-	id = "corn_syrup"
 	value = 1
 	description = "Decays into sugar."
 	color = "#fff882"
@@ -608,7 +576,6 @@
 
 /datum/reagent/consumable/honey
 	name = "honey"
-	id = "honey"
 	description = "Sweet sweet honey that decays into sugar. Has antibacterial and natural healing properties."
 	color = "#d3a308"
 	value = 15
@@ -635,7 +602,6 @@
 
 /datum/reagent/consumable/mayonnaise
 	name = "Mayonnaise"
-	id = "mayonnaise"
 	description = "An white and oily mixture of mixed egg yolks."
 	color = "#DFDFDF"
 	value = 5
@@ -643,7 +609,6 @@
 
 /datum/reagent/consumable/tearjuice
 	name = "Tear Juice"
-	id = "tearjuice"
 	description = "A blinding substance extracted from certain onions."
 	color = "#c0c9a0"
 	taste_description = "bitterness"
@@ -682,7 +647,6 @@
 
 /datum/reagent/consumable/nutriment/stabilized
 	name = "Stabilized Nutriment"
-	id = "stabilizednutriment"
 	description = "A bioengineered protien-nutrient structure designed to decompose in high saturation. In layman's terms, it won't get you fat."
 	reagent_state = SOLID
 	nutriment_factor = 15 * REAGENTS_METABOLISM
@@ -698,7 +662,6 @@
 
 /datum/reagent/consumable/entpoly
 	name = "Entropic Polypnium"
-	id = "entpoly"
 	description = "An ichor, derived from a certain mushroom, makes for a bad time."
 	color = "#1d043d"
 	taste_description = "bitter mushroom"
@@ -719,7 +682,6 @@
 
 /datum/reagent/consumable/tinlux
 	name = "Tinea Luxor"
-	id = "tinlux"
 	description = "A stimulating ichor which causes luminescent fungi to grow on the skin. "
 	color = "#b5a213"
 	taste_description = "tingling mushroom"
@@ -733,7 +695,6 @@
 
 /datum/reagent/consumable/vitfro
 	name = "Vitrium Froth"
-	id = "vitfro"
 	description = "A bubbly paste that heals wounds of the skin."
 	color = "#d3a308"
 	nutriment_factor = 3 * REAGENTS_METABOLISM
@@ -749,7 +710,6 @@
 
 /datum/reagent/consumable/clownstears
 	name = "Clown's Tears"
-	id = "clownstears"
 	description = "The sorrow and melancholy of a thousand bereaved clowns, forever denied their Honkmechs."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#eef442" // rgb: 238, 244, 66
@@ -758,7 +718,6 @@
 
 /datum/reagent/consumable/liquidelectricity
 	name = "Liquid Electricity"
-	id = "liquidelectricity"
 	description = "The blood of Ethereals, and the stuff that keeps them going. Great for them, horrid for anyone else."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#97ee63"
@@ -782,7 +741,6 @@
 
 /datum/reagent/consumable/astrotame
 	name = "Astrotame"
-	id = "astrotame"
 	description = "A space age artifical sweetener."
 	nutriment_factor = 0
 	metabolization_rate = 2 * REAGENTS_METABOLISM
@@ -801,7 +759,6 @@
 
 /datum/reagent/consumable/caramel
 	name = "Caramel"
-	id = "caramel"
 	description = "Who would have guessed that heated sugar could be so delicious?"
 	nutriment_factor = 10 * REAGENTS_METABOLISM
 	color = "#D98736"
@@ -811,7 +768,6 @@
 
 /datum/reagent/consumable/secretsauce
 	name = "secret sauce"
-	id = "secret_sauce"
 	description = "What could it be."
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	color = "#792300"
@@ -823,7 +779,6 @@
 
 /datum/reagent/consumable/char
 	name = "Char"
-	id = "char"
 	description = "Essence of the grill. Has strange properties when overdosed."
 	reagent_state = LIQUID
 	nutriment_factor = 5 * REAGENTS_METABOLISM
@@ -838,7 +793,6 @@
 
 /datum/reagent/consumable/bbqsauce
 	name = "BBQ Sauce"
-	id = "bbqsauce"
 	description = "Sweet, Smokey, Savory, and gets everywhere. Perfect for Grilling."
 	nutriment_factor = 5 * REAGENTS_METABOLISM
 	color = "#78280A" // rgb: 120 40, 10
diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents.dm
index 4489088adc..63f62406b5 100644
--- a/code/modules/reagents/chemistry/reagents/impure_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/impure_reagents.dm
@@ -8,7 +8,6 @@
 
 /datum/reagent/impure/fermiTox
 	name = "Chemical Isomers"
-	id = "fermiTox"
 	description = "Toxic chemical isomers made from impure reactions. At low volumes will cause light toxin damage, but as the volume increases, it deals larger amounts, damages the liver, then eventually the heart. This is default impure chem for all chems, and changes only if stated."
 	data = "merge"
 	color = "FFFFFF"
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 2e2cdf2bf1..d8fc47d1b8 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -7,7 +7,6 @@
 
 /datum/reagent/medicine
 	name = "Medicine"
-	id = "medicine"
 	value = 2
 	taste_description = "bitterness"
 
@@ -17,7 +16,6 @@
 
 /datum/reagent/medicine/leporazine
 	name = "Leporazine"
-	id = "leporazine"
 	description = "Leporazine will effectively regulate a patient's body temperature, ensuring it never leaves safe levels."
 	pH = 8.4
 	color = "#82b8aa"
@@ -31,7 +29,6 @@
 
 /datum/reagent/medicine/adminordrazine //An OP chemical for admins
 	name = "Adminordrazine"
-	id = "adminordrazine"
 	description = "It's magic. We don't have to explain it."
 	color = "#ffffff"
 	can_synth = FALSE
@@ -79,13 +76,11 @@
 
 /datum/reagent/medicine/adminordrazine/quantum_heal
 	name = "Quantum Medicine"
-	id = "quantum_heal"
 	description = "Rare and experimental particles, that apparently swap the user's body with one from an alternate dimension where it's completely healthy."
 	taste_description = "science"
 
 /datum/reagent/medicine/synaptizine
 	name = "Synaptizine"
-	id = "synaptizine"
 	description = "Increases resistance to stuns as well as reducing drowsiness and hallucinations."
 	color = "#FF00FF"
 	pH = 4
@@ -105,7 +100,6 @@
 
 /datum/reagent/medicine/synaphydramine
 	name = "Diphen-Synaptizine"
-	id = "synaphydramine"
 	description = "Reduces drowsiness, hallucinations, and Histamine from body."
 	color = "#EC536D" // rgb: 236, 83, 109
 	pH = 5.2
@@ -124,7 +118,6 @@
 
 /datum/reagent/medicine/inacusiate
 	name = "Inacusiate"
-	id = "inacusiate"
 	description = "Instantly restores all hearing to the patient, but does not cure deafness."
 	color = "#6600FF" // rgb: 100, 165, 255
 	pH = 2
@@ -136,7 +129,6 @@
 
 /datum/reagent/medicine/cryoxadone
 	name = "Cryoxadone"
-	id = "cryoxadone"
 	description = "A chemical mixture with almost magical healing powers. Its main limitation is that the patient's body temperature must be under 270K for it to metabolise correctly."
 	color = "#0000C8"
 	taste_description = "sludge"
@@ -157,7 +149,6 @@
 
 /datum/reagent/medicine/clonexadone
 	name = "Clonexadone"
-	id = "clonexadone"
 	description = "A chemical that derives from Cryoxadone. It specializes in healing clone damage, but nothing else. Requires very cold temperatures to properly metabolize, and metabolizes quicker than cryoxadone."
 	color = "#0000C8"
 	taste_description = "muscle"
@@ -174,7 +165,6 @@
 
 /datum/reagent/medicine/pyroxadone
 	name = "Pyroxadone"
-	id = "pyroxadone"
 	description = "A mixture of cryoxadone and slime jelly, that apparently inverses the requirement for its activation."
 	color = "#f7832a"
 	taste_description = "spicy jelly"
@@ -204,7 +194,6 @@
 
 /datum/reagent/medicine/rezadone
 	name = "Rezadone"
-	id = "rezadone"
 	description = "A powder derived from fish toxin, Rezadone can effectively treat genetic damage as well as restoring minor wounds. Overdose will cause intense nausea and minor toxin damage."
 	reagent_state = SOLID
 	color = "#669900" // rgb: 102, 153, 0
@@ -229,7 +218,6 @@
 
 /datum/reagent/medicine/spaceacillin
 	name = "Spaceacillin"
-	id = "spaceacillin"
 	description = "Spaceacillin will prevent a patient from conventionally spreading any diseases they are currently infected with."
 	color = "#f2f2f2"
 	metabolization_rate = 0.1 * REAGENTS_METABOLISM
@@ -238,7 +226,6 @@
 //Goon Chems. Ported mainly from Goonstation. Easily mixable (or not so easily) and provide a variety of effects.
 /datum/reagent/medicine/silver_sulfadiazine
 	name = "Silver Sulfadiazine"
-	id = "silver_sulfadiazine"
 	description = "If used in touch-based applications, immediately restores burn wounds as well as restoring more over time. It is mildly poisonous taken orally or by injection. If overdosed, deals brute and minor liver damage."
 	reagent_state = LIQUID
 	pH = 7.2
@@ -277,7 +264,6 @@
 
 /datum/reagent/medicine/oxandrolone
 	name = "Oxandrolone"
-	id = "oxandrolone"
 	description = "Stimulates the healing of severe burns. Extremely rapidly heals severe burns and slowly heals minor ones. Overdose will worsen existing burns."
 	reagent_state = LIQUID
 	color = "#f7ffa5"
@@ -302,7 +288,6 @@
 
 /datum/reagent/medicine/styptic_powder
 	name = "Styptic Powder"
-	id = "styptic_powder"
 	description = "If used in touch-based applications, immediately restores bruising as well as restoring more over time. It is poisonous if taken orally or by injection. If overdosed, deals brute and minor liver damage."
 	reagent_state = LIQUID
 	color = "#FF9696"
@@ -342,7 +327,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/salglu_solution
 	name = "Saline-Glucose Solution"
-	id = "salglu_solution"
 	description = "Has a 33% chance per metabolism cycle to heal brute and burn damage. Can be used as a temporary blood substitute."
 	reagent_state = LIQUID
 	color = "#DCDCDC"
@@ -388,7 +372,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/mine_salve
 	name = "Miner's Salve"
-	id = "mine_salve"
 	description = "A powerful painkiller. Restores bruising and burns in addition to making the patient believe they are fully healed."
 	reagent_state = LIQUID
 	color = "#6D6374"
@@ -428,7 +411,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/synthflesh
 	name = "Synthflesh"
-	id = "synthflesh"
 	description = "Has a 100% chance of healing large amounts of brute and burn damage very quickly. One unit of the chemical will heal one point of damage. Touch application only."
 	reagent_state = LIQUID
 	color = "#FFEBEB"
@@ -461,7 +443,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/charcoal
 	name = "Charcoal"
-	id = "charcoal"
 	description = "Heals toxin damage as well as slowly removing any other chemicals the patient has in their bloodstream."
 	reagent_state = LIQUID
 	color = "#000000"
@@ -481,7 +462,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/omnizine
 	name = "Omnizine"
-	id = "omnizine"
 	description = "Slowly heals all damage types. Overdose will cause damage in all types instead."
 	reagent_state = LIQUID
 	color = "#DCDCDC"
@@ -508,7 +488,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/calomel
 	name = "Calomel"
-	id = "calomel"
 	description = "Quickly purges the body of all chemicals. Toxin damage is dealt if the patient is in good condition."
 	reagent_state = LIQUID
 	color = "#19C832"
@@ -528,7 +507,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/potass_iodide
 	name = "Potassium Iodide"
-	id = "potass_iodide"
 	description = "Efficiently restores low radiation damage."
 	reagent_state = LIQUID
 	color = "#14FF3C"
@@ -542,7 +520,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/prussian_blue
 	name = "Prussian Blue"
-	id = "prussian_blue"
 	description = "Efficiently restores heavy radiation damage."
 	reagent_state = LIQUID
 	color = "#003153" // RGB 0, 49, 83
@@ -556,7 +533,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/pen_acid
 	name = "Pentetic Acid"
-	id = "pen_acid"
 	description = "Reduces massive amounts of radiation and toxin damage while purging other chemicals from the body."
 	reagent_state = LIQUID
 	color = "#E6FFF0"
@@ -576,7 +552,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/pen_acid/pen_jelly
 	name = "Pentetic Jelly"
-	id = "pen_jelly"
 	description = "Reduces massive amounts of radiation and toxin damage while purging other chemicals from the body. Slimepeople friendly!"
 	color = "#91D865"
 	healtoxinlover = TRUE
@@ -584,7 +559,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/sal_acid
 	name = "Salicyclic Acid"
-	id = "sal_acid"
 	description = "Stimulates the healing of severe bruises. Extremely rapidly heals severe bruising and slowly heals minor ones. Overdose will worsen existing bruising."
 	reagent_state = LIQUID
 	color = "#D2D2D2"
@@ -609,7 +583,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/salbutamol
 	name = "Salbutamol"
-	id = "salbutamol"
 	description = "Rapidly restores oxygen deprivation as well as preventing more of it to an extent."
 	reagent_state = LIQUID
 	color = "#00FFFF"
@@ -625,7 +598,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/perfluorodecalin
 	name = "Perfluorodecalin"
-	id = "perfluorodecalin"
 	description = "Extremely rapidly restores oxygen deprivation, but inhibits speech. May also heal small amounts of bruising and burns."
 	reagent_state = LIQUID
 	color = "#FF6464"
@@ -643,7 +615,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/ephedrine
 	name = "Ephedrine"
-	id = "ephedrine"
 	description = "Increases stun resistance. Overdose deals toxin damage and inhibits breathing."
 	reagent_state = LIQUID
 	color = "#D2FFFA"
@@ -700,7 +671,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/diphenhydramine
 	name = "Diphenhydramine"
-	id = "diphenhydramine"
 	description = "Rapidly purges the body of Histamine and reduces jitteriness. Slight chance of causing drowsiness."
 	reagent_state = LIQUID
 	color = "#64FFE6"
@@ -716,7 +686,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/morphine
 	name = "Morphine"
-	id = "morphine"
 	description = "A painkiller that allows the patient to move at full speed even in bulky objects. Causes drowsiness and eventually unconsciousness in high doses. Overdose will cause a variety of effects, ranging from minor to lethal."
 	reagent_state = LIQUID
 	color = "#A9FBFB"
@@ -727,10 +696,10 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/morphine/on_mob_metabolize(mob/living/L)
 	..()
-	L.ignore_slowdown(id)
+	L.ignore_slowdown(type)
 
 /datum/reagent/medicine/morphine/on_mob_end_metabolize(mob/living/L)
-	L.unignore_slowdown(id)
+	L.unignore_slowdown(type)
 	..()
 
 /datum/reagent/medicine/morphine/on_mob_life(mob/living/carbon/M)
@@ -786,7 +755,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/oculine
 	name = "Oculine"
-	id = "oculine"
 	description = "Quickly restores eye damage, cures nearsightedness, and has a chance to restore vision to the blind."
 	reagent_state = LIQUID
 	color = "#FFFFFF"
@@ -817,7 +785,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/atropine
 	name = "Atropine"
-	id = "atropine"
 	description = "If a patient is in critical condition, rapidly heals all damage types as well as regulating oxygen in the body. Excellent for stabilizing wounded patients."
 	reagent_state = LIQUID
 	color = "#000000"
@@ -847,7 +814,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/epinephrine
 	name = "Epinephrine"
-	id = "epinephrine"
 	description = "Minor boost to stun resistance. Slowly heals damage if a patient is in critical condition, as well as regulating oxygen loss. Overdose causes weakness and toxin damage."
 	reagent_state = LIQUID
 	color = "#D2FFFA"
@@ -884,7 +850,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/strange_reagent
 	name = "Strange Reagent"
-	id = "strange_reagent"
 	description = "A miracle drug capable of bringing the dead back to life. Only functions when applied by patch or spray, if the target has less than 100 brute and burn damage (independent of one another) and hasn't been husked. Causes slight damage to the living."
 	reagent_state = LIQUID
 	color = "#A0E85E"
@@ -936,7 +901,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/mannitol
 	name = "Mannitol"
-	id = "mannitol"
 	description = "Efficiently restores brain damage."
 	color = "#DCDCFF"
 	pH = 10.4
@@ -949,7 +913,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/neurine
 	name = "Neurine"
-	id = "neurine"
 	description = "Reacts with neural tissue, helping reform damaged connections. Can cure minor traumas."
 	color = "#EEFF8F"
 
@@ -977,7 +940,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/mutadone
 	name = "Mutadone"
-	id = "mutadone"
 	description = "Removes jitteriness and restores genetic defects."
 	color = "#5096C8"
 	taste_description = "acid"
@@ -992,7 +954,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/antihol
 	name = "Antihol"
-	id = "antihol"
 	description = "Purges alcoholic substance from the patient's body and eliminates its side effects."
 	color = "#00B4C8"
 	taste_description = "raw egg"
@@ -1013,7 +974,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/stimulants
 	name = "Stimulants"
-	id = "stimulants"
 	description = "Increases stun resistance and movement speed in addition to restoring minor damage and weakness. Overdose causes weakness and toxin damage."
 	color = "#78008C"
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -1022,10 +982,10 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/stimulants/on_mob_metabolize(mob/living/L)
 	..()
-	L.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
+	L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
 
 /datum/reagent/medicine/stimulants/on_mob_end_metabolize(mob/living/L)
-	L.remove_movespeed_modifier(id)
+	L.remove_movespeed_modifier(type)
 	..()
 
 /datum/reagent/medicine/stimulants/on_mob_life(mob/living/carbon/M)
@@ -1051,7 +1011,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/insulin
 	name = "Insulin"
-	id = "insulin"
 	description = "Increases sugar depletion rates."
 	reagent_state = LIQUID
 	color = "#FFFFF0"
@@ -1067,7 +1026,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 //Trek Chems, used primarily by medibots. Only heals a specific damage type, but is very efficient.
 /datum/reagent/medicine/bicaridine
 	name = "Bicaridine"
-	id = "bicaridine"
 	description = "Restores bruising. Overdose causes it instead."
 	reagent_state = LIQUID
 	color = "#fc2626"
@@ -1086,7 +1044,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/dexalin
 	name = "Dexalin"
-	id = "dexalin"
 	description = "Restores oxygen loss. Overdose causes it instead."
 	reagent_state = LIQUID
 	color = "#13d2f0"
@@ -1105,7 +1062,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/kelotane
 	name = "Kelotane"
-	id = "kelotane"
 	description = "Restores fire damage. Overdose causes it instead."
 	reagent_state = LIQUID
 	color = "#ffc400"
@@ -1124,7 +1080,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/antitoxin
 	name = "Anti-Toxin"
-	id = "antitoxin"
 	description = "Heals toxin damage and removes toxins in the bloodstream. Overdose causes toxin damage."
 	reagent_state = LIQUID
 	color = "#6aff00"
@@ -1146,7 +1101,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/inaprovaline
 	name = "Inaprovaline"
-	id = "inaprovaline"
 	description = "Stabilizes the breathing of patients. Good for those in critical condition."
 	reagent_state = LIQUID
 	pH = 8.5
@@ -1159,7 +1113,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/tricordrazine
 	name = "Tricordrazine"
-	id = "tricordrazine"
 	description = "Has a high chance to heal all types of damage. Overdose instead causes it."
 	reagent_state = LIQUID
 	color = "#e650c0"
@@ -1185,7 +1138,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/regen_jelly
 	name = "Regenerative Jelly"
-	id = "regen_jelly"
 	description = "Gradually regenerates all types of damage, without harming slime anatomy."
 	reagent_state = LIQUID
 	color = "#91D865"
@@ -1201,7 +1153,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/syndicate_nanites //Used exclusively by Syndicate medical cyborgs
 	name = "Restorative Nanites"
-	id = "syndicate_nanites"
 	description = "Miniature medical robots that swiftly restore bodily damage."
 	reagent_state = SOLID
 	color = "#555555"
@@ -1222,7 +1173,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/lesser_syndicate_nanites // the one in the injector
 	name = "Regenerative Nanites"
-	id = "lesser_syndicate_nanites"
 	description = "Miniature medical robots that restore damage and get operatives back in the fight."
 	reagent_state = SOLID
 	color = "#555555"
@@ -1243,7 +1193,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/neo_jelly
 	name = "Neo Jelly"
-	id = "neo_jelly"
 	description = "Gradually regenerates all types of damage, without harming slime anatomy.Can OD"
 	reagent_state = LIQUID
 	metabolization_rate = 1 * REAGENTS_METABOLISM
@@ -1269,7 +1218,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/earthsblood //Created by ambrosia gaia plants
 	name = "Earthsblood"
-	id = "earthsblood"
 	description = "Ichor from an extremely powerful plant. Great for restoring wounds, but it's a little heavy on the brain."
 	color = rgb(255, 175, 0)
 	overdose_threshold = 25
@@ -1296,7 +1244,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/haloperidol
 	name = "Haloperidol"
-	id = "haloperidol"
 	description = "Increases depletion rates for most stimulating/hallucinogenic drugs. Reduces druggy effects and jitteriness. Severe stamina regeneration penalty, causes drowsiness. Small chance of brain damage."
 	reagent_state = LIQUID
 	color = "#27870a"
@@ -1319,7 +1266,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/lavaland_extract
 	name = "Lavaland Extract"
-	id = "lavaland_extract"
 	description = "An extract of lavaland atmospheric and mineral elements. Heals the user in small doses, but is extremely toxic otherwise."
 	color = "#a1a1a1"
 	overdose_threshold = 3 //To prevent people stacking massive amounts of a very strong healing reagent
@@ -1341,7 +1287,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 //used for changeling's adrenaline power
 /datum/reagent/medicine/changelingadrenaline
 	name = "Changeling Adrenaline"
-	id = "changelingadrenaline"
 	description = "Reduces the duration of unconciousness, knockdown and stuns. Restores stamina, but deals toxin damage when overdosed."
 	color = "#918e53"
 	overdose_threshold = 30
@@ -1362,17 +1307,16 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/changelinghaste
 	name = "Changeling Haste"
-	id = "changelinghaste"
 	description = "Drastically increases movement speed, but deals toxin damage."
 	color = "#669153"
 	metabolization_rate = 1
 
 /datum/reagent/medicine/changelinghaste/on_mob_metabolize(mob/living/L)
 	..()
-	L.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING))
+	L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING))
 
 /datum/reagent/medicine/changelinghaste/on_mob_end_metabolize(mob/living/L)
-	L.remove_movespeed_modifier(id)
+	L.remove_movespeed_modifier(type)
 	..()
 
 /datum/reagent/medicine/changelinghaste/on_mob_life(mob/living/carbon/M)
@@ -1384,7 +1328,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	// Heart attack code will not do damage if corazone is present
 	// because it's SPACE MAGIC ASPIRIN
 	name = "Corazone"
-	id = "corazone"
 	description = "A medication used to treat pain, fever, and inflammation, along with heart attacks."
 	color = "#F5F5F5"
 	self_consuming = TRUE
@@ -1402,20 +1345,18 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/muscle_stimulant
 	name = "Muscle Stimulant"
-	id = "muscle_stimulant"
 	description = "A potent chemical that allows someone under its influence to be at full physical ability even when under massive amounts of pain."
 
 /datum/reagent/medicine/muscle_stimulant/on_mob_metabolize(mob/living/M)
 	. = ..()
-	M.ignore_slowdown(id)
+	M.ignore_slowdown(type)
 
 /datum/reagent/medicine/muscle_stimulant/on_mob_end_metabolize(mob/living/M)
 	. = ..()
-	M.unignore_slowdown(id)
+	M.unignore_slowdown(type)
 
 /datum/reagent/medicine/modafinil
 	name = "Modafinil"
-	id = "modafinil"
 	description = "Long-lasting sleep suppressant that very slightly reduces stun and knockdown times. Overdosing has horrendous side effects and deals lethal oxygen damage, will knock you unconscious if not dealt with."
 	reagent_state = LIQUID
 	color = "#BEF7D8" // palish blue white
@@ -1426,11 +1367,11 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 	pH = 7.89
 
 /datum/reagent/medicine/modafinil/on_mob_metabolize(mob/living/M)
-	ADD_TRAIT(M, TRAIT_SLEEPIMMUNE, id)
+	ADD_TRAIT(M, TRAIT_SLEEPIMMUNE, type)
 	..()
 
 /datum/reagent/medicine/modafinil/on_mob_end_metabolize(mob/living/M)
-	REMOVE_TRAIT(M, TRAIT_SLEEPIMMUNE, id)
+	REMOVE_TRAIT(M, TRAIT_SLEEPIMMUNE, type)
 	..()
 
 /datum/reagent/medicine/modafinil/on_mob_life(mob/living/carbon/M)
@@ -1483,7 +1424,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/psicodine
 	name = "Psicodine"
-	id = "psicodine"
 	description = "Suppresses anxiety and other various forms of mental distress. Overdose causes hallucinations and minor toxin damage."
 	reagent_state = LIQUID
 	color = "#07E79E"
@@ -1493,10 +1433,10 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/psicodine/on_mob_add(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_FEARLESS, id)
+	ADD_TRAIT(L, TRAIT_FEARLESS, type)
 
 /datum/reagent/medicine/psicodine/on_mob_delete(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_FEARLESS, id)
+	REMOVE_TRAIT(L, TRAIT_FEARLESS, type)
 	..()
 
 /datum/reagent/medicine/psicodine/on_mob_life(mob/living/carbon/M)
@@ -1518,7 +1458,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/silibinin
 	name = "Silibinin"
-	id = "silibinin"
 	description = "A thistle derrived hepatoprotective flavolignan mixture that help reverse damage to the liver."
 	reagent_state = SOLID
 	color = "#FFFFD0"
@@ -1531,7 +1470,6 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
 
 /datum/reagent/medicine/polypyr  //This is intended to be an ingredient in advanced chems.
 	name = "Polypyrylium Oligomers"
-	id = "polypyr"
 	description = "A�purple mixture of short polyelectrolyte chains not easily synthesized in the laboratory. It is valued as an intermediate in the synthesis of the cutting edge pharmaceuticals."
 	reagent_state = SOLID
 	color = "#9423FF"
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 648435ba4d..21e629e365 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -1,7 +1,6 @@
 /datum/reagent/blood
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_HUMAN, "blood_type"= null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null,"quirks"=null)
 	name = "Blood"
-	id = "blood"
 	value = 1
 	color = BLOOD_COLOR_HUMAN // rgb: 200, 0, 0
 	description = "Blood from some creature."
@@ -30,7 +29,7 @@
 	if(iscarbon(L))
 		var/mob/living/carbon/C = L
 		var/blood_id = C.get_blood_id()
-		if((HAS_TRAIT(C, TRAIT_NOMARROW) || blood_id == "blood" || blood_id == "jellyblood") && (method == INJECT || (method == INGEST && C.dna && C.dna.species && (DRINKSBLOOD in C.dna.species.species_traits))))
+		if((HAS_TRAIT(C, TRAIT_NOMARROW) || blood_id == /datum/reagent/blood || blood_id == /datum/reagent/blood/jellyblood) && (method == INJECT || (method == INGEST && C.dna && C.dna.species && (DRINKSBLOOD in C.dna.species.species_traits))))
 			C.blood_volume = min(C.blood_volume + round(reac_volume, 0.1), BLOOD_VOLUME_MAXIMUM * C.blood_ratio)
 			// we don't care about bloodtype here, we're just refilling the mob
 
@@ -41,7 +40,7 @@
 	if((HAS_TRAIT(C, TRAIT_NOMARROW)))
 		return //We dont want vampires getting toxed from blood
 	var/blood_id = C.get_blood_id()
-	if((blood_id == "blood" || blood_id == "jellyblood"))
+	if((blood_id == /datum/reagent/blood || blood_id == /datum/reagent/blood/jellyblood))
 		if(!data || !(data["blood_type"] in get_safe_blood(C.dna.blood_type)))	//we only care about bloodtype here because this is where the poisoning should be
 			C.adjustToxLoss(rand(2,8)*REM, TRUE, TRUE)	//forced to ensure people don't use it to gain beneficial toxin as slime person
 	..()
@@ -132,14 +131,12 @@
 /datum/reagent/blood/synthetics
 	data = list("donor"=null,"viruses"=null,"blood_DNA"="REPLICATED", "bloodcolor" = BLOOD_COLOR_SYNTHETIC, "blood_type"="SY","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 	name = "Synthetic Blood"
-	id = "syntheticblood"
 	taste_description = "oily"
 	color = BLOOD_COLOR_SYNTHETIC // rgb: 11, 7, 48
 
 /datum/reagent/blood/lizard
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_LIZARD, "blood_type"="L","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 	name = "Lizard Blood"
-	id = "lizardblood"
 	taste_description = "spicy"
 	color = BLOOD_COLOR_LIZARD // rgb: 11, 7, 48
 	pH = 6.85
@@ -147,7 +144,6 @@
 /datum/reagent/blood/jellyblood
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_SLIME, "blood_type"="GEL","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 	name = "Slime Jelly Blood"
-	id = "jellyblood"
 	description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL."
 	color = BLOOD_COLOR_SLIME
 	taste_description = "slime"
@@ -157,7 +153,6 @@
 /datum/reagent/blood/xenomorph
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_XENO, "blood_type"="X*","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 	name = "Xenomorph Blood"
-	id = "xenoblood"
 	taste_description = "acidic heresy"
 	color = BLOOD_COLOR_XENO // greenish yellow ooze
 	shot_glass_icon_state = "shotglassgreen"
@@ -166,7 +161,6 @@
 /datum/reagent/blood/oil
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_OIL, "blood_type"="HF","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 	name = "Hydraulic Blood"
-	id = "oilblood"
 	taste_description = "burnt oil"
 	color = BLOOD_COLOR_OIL // dark, y'know, expected batman colors.
 	pH = 9.75
@@ -174,7 +168,6 @@
 /datum/reagent/blood/insect
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_BUG, "blood_type"="BUG","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 	name = "Insectoid Blood"
-	id = "bugblood"
 	taste_description = "waxy"
 	color = BLOOD_COLOR_BUG // Bug colored, I guess.
 	pH = 7.25
@@ -193,7 +186,6 @@
 
 /datum/reagent/liquidgibs
 	name = "Liquid gibs"
-	id = "liquidgibs"
 	color = BLOOD_COLOR_HUMAN
 	description = "You don't even want to think about what's in here."
 	taste_description = "gross iron"
@@ -203,7 +195,6 @@
 
 /datum/reagent/liquidgibs/xeno
 	name = "Liquid xeno gibs"
-	id = "liquidxenogibs"
 	color = BLOOD_COLOR_XENO
 	taste_description = "blended heresy"
 	shot_glass_icon_state = "shotglassgreen"
@@ -212,7 +203,6 @@
 
 /datum/reagent/liquidgibs/slime
 	name = "Slime sludge"
-	id = "liquidslimegibs"
 	color = BLOOD_COLOR_SLIME
 	taste_description = "slime"
 	shot_glass_icon_state = "shotglassgreen"
@@ -221,14 +211,12 @@
 
 /datum/reagent/liquidgibs/synth
 	name = "Synthetic sludge"
-	id = "liquidsyntheticgibs"
 	color = BLOOD_COLOR_SYNTHETIC
 	taste_description = "jellied plastic"
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_SYNTHETIC, "blood_type"="SY","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
 
 /datum/reagent/liquidgibs/oil
 	name = "Hydraulic sludge"
-	id = "liquidoilgibs"
 	color = BLOOD_COLOR_OIL
 	taste_description = "chunky burnt oil"
 	data = list("donor"=null,"viruses"=null,"blood_DNA"=null, "bloodcolor" = BLOOD_COLOR_OIL, "blood_type"="HF","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
@@ -237,7 +225,6 @@
 /datum/reagent/vaccine
 	//data must contain virus type
 	name = "Vaccine"
-	id = "vaccine"
 	color = "#C81040" // rgb: 200, 16, 64
 	taste_description = "slime"
 
@@ -255,7 +242,6 @@
 
 /datum/reagent/water
 	name = "Water"
-	id = "water"
 	description = "An ubiquitous chemical substance that is composed of hydrogen and oxygen."
 	color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha)
 	taste_description = "water"
@@ -327,7 +313,6 @@
 
 /datum/reagent/water/holywater
 	name = "Holy Water"
-	id = "holywater"
 	description = "Water blessed by some deity."
 	color = "#E0E8EF" // rgb: 224, 232, 239
 	glass_icon_state  = "glass_clear"
@@ -337,7 +322,7 @@
 
 /datum/reagent/water/holywater/on_mob_metabolize(mob/living/L)
 	. = ..()
-	ADD_TRAIT(L, TRAIT_HOLY, id)
+	ADD_TRAIT(L, TRAIT_HOLY, type)
 
 	if(is_servant_of_ratvar(L))
 		to_chat(L, "<span class='userdanger'>A fog spreads through your mind, purging the Justiciar's influence!</span>")
@@ -345,7 +330,7 @@
 		to_chat(L, "<span class='userdanger'>A fog spreads through your mind, weakening your connection to the veil and purging Nar-sie's influence</span>")
 
 /datum/reagent/water/holywater/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_HOLY, id)
+	REMOVE_TRAIT(L, TRAIT_HOLY, type)
 	if(iscultist(L))
 		for(var/datum/action/innate/cult/blood_magic/BM in L.actions)
 			BM.holy_dispel = FALSE
@@ -407,7 +392,6 @@
 
 /datum/reagent/fuel/unholywater	//if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
 	name = "Unholy Water"
-	id = "unholywater"
 	description = "Something that shouldn't exist on this plane of existence."
 	taste_description = "suffering"
 	pH = 6.5
@@ -442,7 +426,6 @@
 
 /datum/reagent/hellwater			//if someone has this in their system they've really pissed off an eldrich god
 	name = "Hell Water"
-	id = "hell_water"
 	description = "YOUR FLESH! IT BURNS!"
 	taste_description = "burning"
 
@@ -457,7 +440,6 @@
 
 /datum/reagent/fuel/holyoil		//Its oil
 	name = "Zelus Oil"
-	id = "holyoil"
 	description = "Oil blessed by a greater being."
 	taste_description = "metallic oil"
 
@@ -496,13 +478,11 @@
 
 /datum/reagent/medicine/omnizine/godblood
 	name = "Godblood"
-	id = "godblood"
 	description = "Slowly heals all damage types. Has a rather high overdose threshold. Glows with mysterious power."
 	overdose_threshold = 150
 
 /datum/reagent/lube
 	name = "Space Lube"
-	id = "lube"
 	description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity."
 	color = "#009CA8" // rgb: 0, 156, 168
 	taste_description = "cherry" // by popular demand
@@ -517,13 +497,11 @@
 ///Stronger kind of lube. Applies TURF_WET_SUPERLUBE.
 /datum/reagent/lube/superlube
 	name = "Super Duper Lube"
-	id = "superlube"
 	description = "This \[REDACTED\] has been outlawed after the incident on \[DATA EXPUNGED\]."
 	lube_kind = TURF_WET_SUPERLUBE
 
 /datum/reagent/spraytan
 	name = "Spray Tan"
-	id = "spraytan"
 	description = "A substance applied to the skin to darken the skin."
 	color = "#FFC080" // rgb: 255, 196, 128  Bright orange
 	metabolization_rate = 10 * REAGENTS_METABOLISM // very fast, so it can be applied rapidly.  But this changes on an overdose
@@ -620,7 +598,6 @@
 
 /datum/reagent/mutationtoxin
 	name = "Stable Mutation Toxin"
-	id = "stablemutationtoxin"
 	description = "A humanizing toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	metabolization_rate = INFINITY //So it instantly removes all of itself
@@ -651,7 +628,6 @@
 
 /datum/reagent/mutationtoxin/classic //The one from plasma on green slimes
 	name = "Mutation Toxin"
-	id = "mutationtoxin"
 	description = "A corruptive toxin."
 	color = "#13BC5E" // rgb: 19, 188, 94
 	race = /datum/species/jelly/slime
@@ -659,14 +635,12 @@
 
 /datum/reagent/mutationtoxin/felinid
 	name = "Felinid Mutation Toxin"
-	id = "felinidmutationtoxin"
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/human/felinid
 	mutationtext = "<span class='danger'>The pain subsides. You feel... like a degenerate.</span>"
 
 /datum/reagent/mutationtoxin/lizard
 	name = "Lizard Mutation Toxin"
-	id = "lizardmutationtoxin"
 	description = "A lizarding toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/lizard
@@ -674,7 +648,6 @@
 
 /datum/reagent/mutationtoxin/fly
 	name = "Fly Mutation Toxin"
-	id = "flymutationtoxin"
 	description = "An insectifying toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/fly
@@ -682,7 +655,6 @@
 
 /datum/reagent/mutationtoxin/insect
 	name = "Insect Mutation Toxin"
-	id = "mothmutationtoxin"
 	description = "A glowing toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/insect
@@ -690,7 +662,6 @@
 
 /datum/reagent/mutationtoxin/pod
 	name = "Podperson Mutation Toxin"
-	id = "podmutationtoxin"
 	description = "A vegetalizing toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/pod
@@ -698,7 +669,6 @@
 
 /datum/reagent/mutationtoxin/jelly
 	name = "Imperfect Mutation Toxin"
-	id = "jellymutationtoxin"
 	description = "An jellyfying toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/jelly
@@ -706,7 +676,6 @@
 
 /datum/reagent/mutationtoxin/golem
 	name = "Golem Mutation Toxin"
-	id = "golemmutationtoxin"
 	description = "A crystal toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/golem/random
@@ -714,7 +683,6 @@
 
 /datum/reagent/mutationtoxin/abductor
 	name = "Abductor Mutation Toxin"
-	id = "abductormutationtoxin"
 	description = "An alien toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/abductor
@@ -722,7 +690,6 @@
 
 /datum/reagent/mutationtoxin/android
 	name = "Android Mutation Toxin"
-	id = "androidmutationtoxin"
 	description = "A robotic toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/android
@@ -731,7 +698,6 @@
 //Citadel Races
 /datum/reagent/mutationtoxin/mammal
 	name = "Mammal Mutation Toxin"
-	id = "mammalmutationtoxin"
 	description = "A glowing toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/mammal
@@ -739,7 +705,6 @@
 
 /datum/reagent/mutationtoxin/insect
 	name = "Insect Mutation Toxin"
-	id = "insectmutationtoxin"
 	description = "A glowing toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/insect
@@ -747,7 +712,6 @@
 
 /datum/reagent/mutationtoxin/xenoperson
 	name = "Xeno-Hybrid Mutation Toxin"
-	id = "xenopersonmutationtoxin"
 	description = "A glowing toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/xeno
@@ -756,7 +720,6 @@
 //BLACKLISTED RACES
 /datum/reagent/mutationtoxin/skeleton
 	name = "Skeleton Mutation Toxin"
-	id = "skeletonmutationtoxin"
 	description = "A scary toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/skeleton
@@ -764,7 +727,6 @@
 
 /datum/reagent/mutationtoxin/zombie
 	name = "Zombie Mutation Toxin"
-	id = "zombiemutationtoxin"
 	description = "An undead toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/zombie //Not the infectious kind. The days of xenobio zombie outbreaks are long past.
@@ -772,7 +734,6 @@
 
 /datum/reagent/mutationtoxin/ash
 	name = "Ash Mutation Toxin"
-	id = "ashmutationtoxin"
 	description = "An ashen toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/lizard/ashwalker
@@ -782,7 +743,6 @@
 //DANGEROUS RACES
 /datum/reagent/mutationtoxin/shadow
 	name = "Shadow Mutation Toxin"
-	id = "shadowmutationtoxin"
 	description = "A dark toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/shadow
@@ -790,7 +750,6 @@
 
 /datum/reagent/mutationtoxin/plasma
 	name = "Plasma Mutation Toxin"
-	id = "plasmamutationtoxin"
 	description = "A plasma-based toxin."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	race = /datum/species/plasmaman
@@ -798,7 +757,6 @@
 
 /datum/reagent/slime_toxin
 	name = "Slime Mutation Toxin"
-	id = "slime_toxin"
 	description = "A toxin that turns organic material into slime."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	taste_description = "slime"
@@ -835,7 +793,6 @@
 
 /datum/reagent/mulligan
 	name = "Mulligan Toxin"
-	id = "mulligan"
 	description = "This toxin will rapidly change the DNA of human beings. Commonly used by Syndicate spies and assassins in need of an emergency ID change."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	metabolization_rate = INFINITY
@@ -851,7 +808,6 @@
 
 /datum/reagent/aslimetoxin
 	name = "Advanced Mutation Toxin"
-	id = "amutationtoxin"
 	description = "An advanced corruptive toxin produced by slimes."
 	color = "#13BC5E" // rgb: 19, 188, 94
 	taste_description = "slime"
@@ -862,7 +818,6 @@
 
 /datum/reagent/gluttonytoxin
 	name = "Gluttony's Blessing"
-	id = "gluttonytoxin"
 	description = "An advanced corruptive toxin produced by something terrible."
 	color = "#5EFF3B" //RGB: 94, 255, 59
 	can_synth = FALSE
@@ -873,7 +828,6 @@
 
 /datum/reagent/serotrotium
 	name = "Serotrotium"
-	id = "serotrotium"
 	description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans."
 	color = "#202040" // rgb: 20, 20, 40
 	metabolization_rate = 0.25 * REAGENTS_METABOLISM
@@ -888,7 +842,6 @@
 
 /datum/reagent/oxygen
 	name = "Oxygen"
-	id = "oxygen"
 	description = "A colorless, odorless gas. Grows on trees but is still pretty valuable."
 	reagent_state = GAS
 	color = "#808080" // rgb: 128, 128, 128
@@ -909,7 +862,6 @@
 
 /datum/reagent/copper
 	name = "Copper"
-	id = "copper"
 	description = "A highly ductile metal. Things made out of copper aren't very durable, but it makes a decent material for electrical wiring."
 	reagent_state = SOLID
 	color = "#6E3B08" // rgb: 110, 59, 8
@@ -925,7 +877,6 @@
 
 /datum/reagent/nitrogen
 	name = "Nitrogen"
-	id = "nitrogen"
 	description = "A colorless, odorless, tasteless gas. A simple asphyxiant that can silently displace vital oxygen."
 	reagent_state = GAS
 	color = "#808080" // rgb: 128, 128, 128
@@ -946,7 +897,6 @@
 
 /datum/reagent/hydrogen
 	name = "Hydrogen"
-	id = "hydrogen"
 	description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas."
 	reagent_state = GAS
 	color = "#808080" // rgb: 128, 128, 128
@@ -955,7 +905,6 @@
 
 /datum/reagent/potassium
 	name = "Potassium"
-	id = "potassium"
 	description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water."
 	reagent_state = SOLID
 	color = "#A0A0A0" // rgb: 160, 160, 160
@@ -963,7 +912,6 @@
 
 /datum/reagent/mercury
 	name = "Mercury"
-	id = "mercury"
 	description = "A curious metal that's a liquid at room temperature. Neurodegenerative and very bad for the mind."
 	color = "#484848" // rgb: 72, 72, 72A
 	taste_mult = 0 // apparently tasteless.
@@ -978,7 +926,6 @@
 
 /datum/reagent/sulfur
 	name = "Sulfur"
-	id = "sulfur"
 	description = "A sickly yellow solid mostly known for its nasty smell. It's actually much more helpful than it looks in biochemisty."
 	reagent_state = SOLID
 	color = "#BF8C00" // rgb: 191, 140, 0
@@ -987,7 +934,6 @@
 
 /datum/reagent/carbon
 	name = "Carbon"
-	id = "carbon"
 	description = "A crumbly black solid that, while unexciting on an physical level, forms the base of all known life. Kind of a big deal."
 	reagent_state = SOLID
 	color = "#1C1300" // rgb: 30, 20, 0
@@ -1002,7 +948,6 @@
 
 /datum/reagent/chlorine
 	name = "Chlorine"
-	id = "chlorine"
 	description = "A pale yellow gas that's well known as an oxidizer. While it forms many harmless molecules in its elemental form it is far from harmless."
 	reagent_state = GAS
 	color = "#808080" // rgb: 128, 128, 128
@@ -1016,7 +961,6 @@
 
 /datum/reagent/fluorine
 	name = "Fluorine"
-	id = "fluorine"
 	description = "A comically-reactive chemical element. The universe does not want this stuff to exist in this form in the slightest."
 	reagent_state = GAS
 	color = "#808080" // rgb: 128, 128, 128
@@ -1030,7 +974,6 @@
 
 /datum/reagent/sodium
 	name = "Sodium"
-	id = "sodium"
 	description = "A soft silver metal that can easily be cut with a knife. It's not salt just yet, so refrain from putting in on your chips."
 	reagent_state = SOLID
 	color = "#808080" // rgb: 128, 128, 128
@@ -1039,7 +982,6 @@
 
 /datum/reagent/phosphorus
 	name = "Phosphorus"
-	id = "phosphorus"
 	description = "A ruddy red powder that burns readily. Though it comes in many colors, the general theme is always the same."
 	reagent_state = SOLID
 	color = "#832828" // rgb: 131, 40, 40
@@ -1048,7 +990,6 @@
 
 /datum/reagent/lithium
 	name = "Lithium"
-	id = "lithium"
 	description = "A silver metal, its claim to fame is its remarkably low density. Using it is a bit too effective in calming oneself down."
 	reagent_state = SOLID
 	color = "#808080" // rgb: 128, 128, 128
@@ -1064,7 +1005,6 @@
 
 /datum/reagent/glycerol
 	name = "Glycerol"
-	id = "glycerol"
 	description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity."
 	color = "#808080" // rgb: 128, 128, 128
 	taste_description = "sweetness"
@@ -1072,7 +1012,6 @@
 
 /datum/reagent/radium
 	name = "Radium"
-	id = "radium"
 	description = "Radium is an alkaline earth metal. It is extremely radioactive."
 	reagent_state = SOLID
 	color = "#C7C7C7" // rgb: 199,199,199
@@ -1093,7 +1032,6 @@
 
 /datum/reagent/space_cleaner/sterilizine
 	name = "Sterilizine"
-	id = "sterilizine"
 	description = "Sterilizes wounds in preparation for surgery."
 	color = "#e6f1f5" // rgb: 200, 165, 220
 	taste_description = "bitterness"
@@ -1109,7 +1047,6 @@
 
 /datum/reagent/iron
 	name = "Iron"
-	id = "iron"
 	description = "Pure iron is a metal."
 	reagent_state = SOLID
 	taste_description = "iron"
@@ -1132,7 +1069,7 @@
 
 /datum/reagent/iron/overdose_start(mob/living/M)
 	to_chat(M, "<span class='userdanger'>You start feeling your guts twisting painfully!</span>")
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[id]_overdose", /datum/mood_event/overdose, name)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "[type]_overdose", /datum/mood_event/overdose, name)
 
 /datum/reagent/iron/overdose_process(mob/living/carbon/C)
 	if(prob(20))
@@ -1143,7 +1080,6 @@
 
 /datum/reagent/gold
 	name = "Gold"
-	id = "gold"
 	description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
 	reagent_state = SOLID
 	color = "#F7C430" // rgb: 247, 196, 48
@@ -1151,7 +1087,6 @@
 
 /datum/reagent/silver
 	name = "Silver"
-	id = "silver"
 	description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal."
 	reagent_state = SOLID
 	color = "#D0D0D0" // rgb: 208, 208, 208
@@ -1164,7 +1099,6 @@
 
 /datum/reagent/uranium
 	name ="Uranium"
-	id = "uranium"
 	description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
 	reagent_state = SOLID
 	color = "#B8B8C0" // rgb: 184, 184, 192
@@ -1185,7 +1119,6 @@
 
 /datum/reagent/bluespace
 	name = "Bluespace Dust"
-	id = "bluespace"
 	description = "A dust composed of microscopic bluespace crystals, with minor space-warping properties."
 	reagent_state = SOLID
 	color = "#0000CC"
@@ -1210,7 +1143,6 @@
 
 /datum/reagent/aluminium
 	name = "Aluminium"
-	id = "aluminium"
 	description = "A silvery white and ductile member of the boron group of chemical elements."
 	reagent_state = SOLID
 	color = "#A8A8A8" // rgb: 168, 168, 168
@@ -1218,7 +1150,6 @@
 
 /datum/reagent/silicon
 	name = "Silicon"
-	id = "silicon"
 	description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon."
 	reagent_state = SOLID
 	color = "#A8A8A8" // rgb: 168, 168, 168
@@ -1227,7 +1158,6 @@
 
 /datum/reagent/fuel
 	name = "Welding fuel"
-	id = "welding_fuel"
 	description = "Required for welders. Flamable."
 	color = "#660000" // rgb: 102, 0, 0
 	taste_description = "gross metal"
@@ -1250,7 +1180,6 @@
 
 /datum/reagent/space_cleaner
 	name = "Space cleaner"
-	id = "cleaner"
 	description = "A compound used to clean things. Now with 50% more sodium hypochlorite!"
 	color = "#A5F0EE" // rgb: 165, 240, 238
 	taste_description = "sourness"
@@ -1317,7 +1246,6 @@
 
 /datum/reagent/space_cleaner/ez_clean
 	name = "EZ Clean"
-	id = "ez_clean"
 	description = "A powerful, acidic cleaner sold by Waffle Co. Affects organic matter while leaving other objects unaffected."
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
 	taste_description = "acid"
@@ -1337,7 +1265,6 @@
 
 /datum/reagent/cryptobiolin
 	name = "Cryptobiolin"
-	id = "cryptobiolin"
 	description = "Cryptobiolin causes confusion and dizziness."
 	color = "#7529b3" // rgb: 200, 165, 220
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
@@ -1353,7 +1280,6 @@
 
 /datum/reagent/impedrezene
 	name = "Impedrezene"
-	id = "impedrezene"
 	description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions."
 	color = "#587a31" // rgb: 200, 165, 220A
 	taste_description = "numbness"
@@ -1371,7 +1297,6 @@
 
 /datum/reagent/nanomachines
 	name = "Nanomachines"
-	id = "nanomachines"
 	description = "Microscopic construction robots."
 	color = "#535E66" // rgb: 83, 94, 102
 	can_synth = FALSE
@@ -1383,7 +1308,6 @@
 
 /datum/reagent/xenomicrobes
 	name = "Xenomicrobes"
-	id = "xenomicrobes"
 	description = "Microbes with an entirely alien cellular structure."
 	color = "#535E66" // rgb: 83, 94, 102
 	can_synth = FALSE
@@ -1395,7 +1319,6 @@
 
 /datum/reagent/fungalspores
 	name = "Tubercle bacillus Cosmosis microbes"
-	id = "fungalspores"
 	description = "Active fungal spores."
 	color = "#92D17D" // rgb: 146, 209, 125
 	can_synth = FALSE
@@ -1408,7 +1331,6 @@
 
 /datum/reagent/fluorosurfactant//foam precursor
 	name = "Fluorosurfactant"
-	id = "fluorosurfactant"
 	description = "A perfluoronated sulfonic acid that forms a foam when mixed with water."
 	color = "#9E6B38" // rgb: 158, 107, 56
 	taste_description = "metal"
@@ -1416,7 +1338,6 @@
 
 /datum/reagent/foaming_agent// Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually.
 	name = "Foaming agent"
-	id = "foaming_agent"
 	description = "An agent that yields metallic foam when mixed with light metal and a strong acid."
 	reagent_state = SOLID
 	color = "#664B63" // rgb: 102, 75, 99
@@ -1425,7 +1346,6 @@
 
 /datum/reagent/smart_foaming_agent //Smart foaming agent. Functions similarly to metal foam, but conforms to walls.
 	name = "Smart foaming agent"
-	id = "smart_foaming_agent"
 	description = "An agent that yields metallic foam which conforms to area boundaries when mixed with light metal and a strong acid."
 	reagent_state = SOLID
 	color = "#664B63" // rgb: 102, 75, 99
@@ -1434,7 +1354,6 @@
 
 /datum/reagent/ammonia
 	name = "Ammonia"
-	id = "ammonia"
 	description = "A caustic substance commonly used in fertilizer or household cleaners."
 	reagent_state = GAS
 	color = "#404030" // rgb: 64, 64, 48
@@ -1443,7 +1362,6 @@
 
 /datum/reagent/diethylamine
 	name = "Diethylamine"
-	id = "diethylamine"
 	description = "A secondary amine, mildly corrosive."
 	color = "#604030" // rgb: 96, 64, 48
 	taste_description = "iron"
@@ -1451,7 +1369,6 @@
 
 /datum/reagent/carbondioxide
 	name = "Carbon Dioxide"
-	id = "co2"
 	reagent_state = GAS
 	description = "A gas commonly produced by burning carbon fuels. You're constantly producing this in your lungs."
 	color = "#B0B0B0" // rgb : 192, 192, 192
@@ -1472,7 +1389,6 @@
 
 /datum/reagent/nitrous_oxide
 	name = "Nitrous Oxide"
-	id = "nitrous_oxide"
 	description = "A potent oxidizer used as fuel in rockets and as an anaesthetic during surgery."
 	reagent_state = LIQUID
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
@@ -1507,7 +1423,6 @@
 
 /datum/reagent/stimulum
 	name = "Stimulum"
-	id = "stimulum"
 	description = "An unstable experimental gas that greatly increases the energy of those that inhale it"
 	reagent_state = GAS
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
@@ -1516,12 +1431,12 @@
 
 /datum/reagent/stimulum/on_mob_metabolize(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_STUNIMMUNE, id)
-	ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, id)
+	ADD_TRAIT(L, TRAIT_STUNIMMUNE, type)
+	ADD_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
 
 /datum/reagent/stimulum/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_STUNIMMUNE, id)
-	REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, id)
+	REMOVE_TRAIT(L, TRAIT_STUNIMMUNE, type)
+	REMOVE_TRAIT(L, TRAIT_SLEEPIMMUNE, type)
 	..()
 
 /datum/reagent/stimulum/on_mob_life(mob/living/carbon/M)
@@ -1532,7 +1447,6 @@
 
 /datum/reagent/nitryl
 	name = "Nitryl"
-	id = "no2"
 	description = "A highly reactive gas that makes you feel faster"
 	reagent_state = GAS
 	metabolization_rate = REAGENTS_METABOLISM
@@ -1542,10 +1456,10 @@
 
 /datum/reagent/nitryl/on_mob_metabolize(mob/living/L)
 	..()
-	L.add_movespeed_modifier(id, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
+	L.add_movespeed_modifier(type, update=TRUE, priority=100, multiplicative_slowdown=-1, blacklisted_movetypes=(FLYING|FLOATING))
 
 /datum/reagent/nitryl/on_mob_end_metabolize(mob/living/L)
-	L.remove_movespeed_modifier(id)
+	L.remove_movespeed_modifier(type)
 	..()
 
 /////////////////////////Coloured Crayon Powder////////////////////////////
@@ -1554,7 +1468,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder
 	name = "Crayon Powder"
-	id = "crayon powder"
 	var/colorname = "none"
 	description = "A powder made by grinding down crayons, good for colouring chemical reagents."
 	reagent_state = SOLID
@@ -1568,7 +1481,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/red
 	name = "Red Crayon Powder"
-	id = "redcrayonpowder"
 	colorname = "red"
 	color = "#DA0000" // red
 	random_color_list = list("#DA0000")
@@ -1576,7 +1488,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/orange
 	name = "Orange Crayon Powder"
-	id = "orangecrayonpowder"
 	colorname = "orange"
 	color = "#FF9300" // orange
 	random_color_list = list("#FF9300")
@@ -1584,7 +1495,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/yellow
 	name = "Yellow Crayon Powder"
-	id = "yellowcrayonpowder"
 	colorname = "yellow"
 	color = "#FFF200" // yellow
 	random_color_list = list("#FFF200")
@@ -1592,7 +1502,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/green
 	name = "Green Crayon Powder"
-	id = "greencrayonpowder"
 	colorname = "green"
 	color = "#A8E61D" // green
 	random_color_list = list("#A8E61D")
@@ -1600,7 +1509,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/blue
 	name = "Blue Crayon Powder"
-	id = "bluecrayonpowder"
 	colorname = "blue"
 	color = "#00B7EF" // blue
 	random_color_list = list("#00B7EF")
@@ -1608,7 +1516,6 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/purple
 	name = "Purple Crayon Powder"
-	id = "purplecrayonpowder"
 	colorname = "purple"
 	color = "#DA00FF" // purple
 	random_color_list = list("#DA00FF")
@@ -1616,21 +1523,18 @@
 
 /datum/reagent/colorful_reagent/crayonpowder/invisible
 	name = "Invisible Crayon Powder"
-	id = "invisiblecrayonpowder"
 	colorname = "invisible"
 	color = "#FFFFFF00" // white + no alpha
 	random_color_list = list(null)	//because using the powder color turns things invisible
 
 /datum/reagent/colorful_reagent/crayonpowder/black
 	name = "Black Crayon Powder"
-	id = "blackcrayonpowder"
 	colorname = "black"
 	color = "#1C1C1C" // not quite black
 	random_color_list = list("#404040")
 
 /datum/reagent/colorful_reagent/crayonpowder/white
 	name = "White Crayon Powder"
-	id = "whitecrayonpowder"
 	colorname = "white"
 	color = "#FFFFFF" // white
 	random_color_list = list("#FFFFFF") //doesn't actually change appearance at all
@@ -1639,7 +1543,6 @@
 
 /datum/reagent/plantnutriment
 	name = "Generic nutriment"
-	id = "plantnutriment"
 	description = "Some kind of nutriment. You can't really tell what it is. You should probably report it, along with how you obtained it."
 	color = "#000000" // RBG: 0, 0, 0
 	var/tox_prob = 0
@@ -1654,7 +1557,6 @@
 
 /datum/reagent/plantnutriment/eznutriment
 	name = "E-Z-Nutrient"
-	id = "eznutriment"
 	description = "Cheap and extremely common type of plant nutriment."
 	color = "#376400" // RBG: 50, 100, 0
 	tox_prob = 10
@@ -1662,7 +1564,6 @@
 
 /datum/reagent/plantnutriment/left4zednutriment
 	name = "Left 4 Zed"
-	id = "left4zednutriment"
 	description = "Unstable nutriment that makes plants mutate more often than usual."
 	color = "#1A1E4D" // RBG: 26, 30, 77
 	tox_prob = 25
@@ -1670,7 +1571,6 @@
 
 /datum/reagent/plantnutriment/robustharvestnutriment
 	name = "Robust Harvest"
-	id = "robustharvestnutriment"
 	description = "Very potent nutriment that prevents plants from mutating."
 	color = "#9D9D00" // RBG: 157, 157, 0
 	tox_prob = 15
@@ -1680,7 +1580,6 @@
 
 /datum/reagent/oil
 	name = "Oil"
-	id = "oil"
 	description = "Burns in a small smoky fire, mostly used to get Ash."
 	reagent_state = LIQUID
 	color = "#292929"
@@ -1688,7 +1587,6 @@
 
 /datum/reagent/stable_plasma
 	name = "Stable Plasma"
-	id = "stable_plasma"
 	description = "Non-flammable plasma locked into a liquid form that cannot ignite or become gaseous/solid."
 	reagent_state = LIQUID
 	color = "#6b008f"
@@ -1702,7 +1600,6 @@
 
 /datum/reagent/iodine
 	name = "Iodine"
-	id = "iodine"
 	description = "Commonly added to table salt as a nutrient. On its own it tastes far less pleasing."
 	reagent_state = LIQUID
 	color = "#694600"
@@ -1711,7 +1608,6 @@
 
 /datum/reagent/bromine
 	name = "Bromine"
-	id = "bromine"
 	description = "A brownish liquid that's highly reactive. Useful for stopping free radicals, but not intended for human consumption."
 	reagent_state = LIQUID
 	color = "#b37740"
@@ -1720,7 +1616,6 @@
 
 /datum/reagent/phenol
 	name = "Phenol"
-	id = "phenol"
 	description = "An aromatic ring of carbon with a hydroxyl group. A useful precursor to some medicines, but has no healing properties on its own."
 	reagent_state = LIQUID
 	taste_description = "sweet and tarry" //Again, not a strong acid.
@@ -1729,7 +1624,6 @@
 
 /datum/reagent/ash
 	name = "Ash"
-	id = "ash"
 	description = "Supposedly phoenixes rise from these, but you've never seen it."
 	reagent_state = LIQUID
 	color = "#665c56"
@@ -1738,7 +1632,6 @@
 
 /datum/reagent/acetone
 	name = "Acetone"
-	id = "acetone"
 	description = "A slick, slightly carcinogenic liquid. Has a multitude of mundane uses in everyday life."
 	reagent_state = LIQUID
 	taste_description = "solvent"//It's neutral though..?
@@ -1746,7 +1639,6 @@
 
 /datum/reagent/colorful_reagent
 	name = "Colorful Reagent"
-	id = "colorful_reagent"
 	description = "Thoroughly sample the rainbow."
 	reagent_state = LIQUID
 	color = "#FFFF00"
@@ -1776,7 +1668,6 @@
 
 /datum/reagent/hair_dye
 	name = "Quantum Hair Dye"
-	id = "hair_dye"
 	description = "Has a high chance of making you look like a mad scientist."
 	reagent_state = LIQUID
 	color = "#ff00dd"
@@ -1793,7 +1684,6 @@
 
 /datum/reagent/barbers_aid
 	name = "Barber's Aid"
-	id = "barbers_aid"
 	description = "A solution to hair loss across the world."
 	reagent_state = LIQUID
 	color = "#fac34b"
@@ -1811,7 +1701,6 @@
 
 /datum/reagent/concentrated_barbers_aid
 	name = "Concentrated Barber's Aid"
-	id = "concentrated_barbers_aid"
 	description = "A concentrated solution to hair loss across the world."
 	reagent_state = LIQUID
 	color = "#ffaf00"
@@ -1827,7 +1716,6 @@
 
 /datum/reagent/saltpetre
 	name = "Saltpetre"
-	id = "saltpetre"
 	description = "Volatile. Controversial. Third Thing."
 	reagent_state = LIQUID
 	color = "#60A584" // rgb: 96, 165, 132
@@ -1836,7 +1724,6 @@
 
 /datum/reagent/lye
 	name = "Lye"
-	id = "lye"
 	description = "Also known as sodium hydroxide. As a profession making this is somewhat underwhelming."
 	reagent_state = LIQUID
 	color = "#FFFFD6" // very very light yellow
@@ -1845,7 +1732,6 @@
 
 /datum/reagent/drying_agent
 	name = "Drying agent"
-	id = "drying_agent"
 	description = "A desiccant. Can be used to dry things."
 	reagent_state = LIQUID
 	color = "#A70FFF"
@@ -1865,7 +1751,6 @@
 // Liquid Carpets
 /datum/reagent/carpet
 	name = "Liquid Carpet"
-	id = "carpet"
 	description = "For those that need a more creative way to roll out a carpet."
 	reagent_state = LIQUID
 	color = "#b51d05"
@@ -1879,7 +1764,6 @@
 
 /datum/reagent/carpet/black
 	name = "Liquid Black Carpet"
-	id = "blackcarpet"
 	color = "#363636"
 
 /datum/reagent/carpet/black/reaction_turf(turf/T, reac_volume)
@@ -1890,7 +1774,6 @@
 
 /datum/reagent/carpet/blackred
 	name = "Liquid Red Black Carpet"
-	id = "blackredcarpet"
 	color = "#342125"
 
 /datum/reagent/carpet/blackred/reaction_turf(turf/T, reac_volume)
@@ -1901,7 +1784,6 @@
 
 /datum/reagent/carpet/monochrome
 	name = "Liquid Monochrome Carpet"
-	id = "monochromecarpet"
 	color = "#b4b4b4"
 
 /datum/reagent/carpet/monochrome/reaction_turf(turf/T, reac_volume)
@@ -1912,7 +1794,6 @@
 
 /datum/reagent/carpet/blue
 	name = "Liquid Blue Carpet"
-	id = "bluecarpet"
 	color = "#1256ff"
 
 /datum/reagent/carpet/blue/reaction_turf(turf/T, reac_volume)
@@ -1923,7 +1804,6 @@
 
 /datum/reagent/carpet/cyan
 	name = "Liquid Cyan Carpet"
-	id = "cyancarpet"
 	color = "#3acfb9"
 
 /datum/reagent/carpet/cyan/reaction_turf(turf/T, reac_volume)
@@ -1934,7 +1814,6 @@
 
 /datum/reagent/carpet/green
 	name = "Liquid Green Carpet"
-	id = "greencarpet"
 	color = "#619b62"
 
 /datum/reagent/carpet/green/reaction_turf(turf/T, reac_volume)
@@ -1945,7 +1824,6 @@
 
 /datum/reagent/carpet/orange
 	name = "Liquid Orange Carpet"
-	id = "orangecarpet"
 	color = "#cc7900"
 
 /datum/reagent/carpet/orange/reaction_turf(turf/T, reac_volume)
@@ -1956,7 +1834,6 @@
 
 /datum/reagent/carpet/purple
 	name = "Liquid Purple Carpet"
-	id = "purplecarpet"
 	color = "#6d3392"
 
 /datum/reagent/carpet/purple/reaction_turf(turf/T, reac_volume)
@@ -1967,7 +1844,6 @@
 
 /datum/reagent/carpet/red
 	name = "Liquid Red Carpet"
-	id = "redcarpet"
 	color = "#871515"
 
 /datum/reagent/carpet/red/reaction_turf(turf/T, reac_volume)
@@ -1978,7 +1854,6 @@
 
 /datum/reagent/carpet/royalblack
 	name = "Liquid Royal Black Carpet"
-	id = "royalblackcarpet"
 	color = "#483d05"
 
 /datum/reagent/carpet/royalblack/reaction_turf(turf/T, reac_volume)
@@ -1989,7 +1864,6 @@
 
 /datum/reagent/carpet/royalblue
 	name = "Liquid Royal Blue Carpet"
-	id = "royalbluecarpet"
 	color = "#24227e"
 
 /datum/reagent/carpet/royalblue/reaction_turf(turf/T, reac_volume)
@@ -2003,51 +1877,43 @@
 
 /datum/reagent/toxin/mutagen/mutagenvirusfood
 	name = "mutagenic agar"
-	id = "mutagenvirusfood"
 	color = "#A3C00F" // rgb: 163,192,15
 	taste_description = "sourness"
 
 /datum/reagent/toxin/mutagen/mutagenvirusfood/sugar
 	name = "sucrose agar"
-	id = "sugarvirusfood"
 	color = "#41B0C0" // rgb: 65,176,192
 	taste_description = "sweetness"
 
 /datum/reagent/medicine/synaptizine/synaptizinevirusfood
 	name = "virus rations"
-	id = "synaptizinevirusfood"
 	color = "#D18AA5" // rgb: 209,138,165
 	taste_description = "bitterness"
 
 /datum/reagent/toxin/plasma/plasmavirusfood
 	name = "virus plasma"
-	id = "plasmavirusfood"
 	color = "#A69DA9" // rgb: 166,157,169
 	taste_description = "bitterness"
 	taste_mult = 1.5
 
 /datum/reagent/toxin/plasma/plasmavirusfood/weak
 	name = "weakened virus plasma"
-	id = "weakplasmavirusfood"
 	color = "#CEC3C6" // rgb: 206,195,198
 	taste_description = "bitterness"
 	taste_mult = 1.5
 
 /datum/reagent/uranium/uraniumvirusfood
 	name = "decaying uranium gel"
-	id = "uraniumvirusfood"
 	color = "#67ADBA" // rgb: 103,173,186
 	taste_description = "the inside of a reactor"
 
 /datum/reagent/uranium/uraniumvirusfood/unstable
 	name = "unstable uranium gel"
-	id = "uraniumplasmavirusfood_unstable"
 	color = "#2FF2CB" // rgb: 47,242,203
 	taste_description = "the inside of a reactor"
 
 /datum/reagent/uranium/uraniumvirusfood/stable
 	name = "stable uranium gel"
-	id = "uraniumplasmavirusfood_stable"
 	color = "#04506C" // rgb: 4,80,108
 	taste_description = "the inside of a reactor"
 
@@ -2055,7 +1921,6 @@
 
 /datum/reagent/royal_bee_jelly
 	name = "royal bee jelly"
-	id = "royal_bee_jelly"
 	description = "Royal Bee Jelly, if injected into a Queen Space Bee said bee will split into two bees."
 	color = "#00ff80"
 	taste_description = "strange honey"
@@ -2071,7 +1936,6 @@
 /datum/reagent/romerol
 	name = "Romerol"
 	// the REAL zombie powder
-	id = "romerol"
 	description = "Romerol is a highly experimental bioterror agent \
 		which causes dormant nodules to be etched into the grey matter of \
 		the subject. These nodules only become active upon death of the \
@@ -2092,7 +1956,6 @@
 
 /datum/reagent/magillitis
 	name = "Magillitis"
-	id = "magillitis"
 	description = "An experimental serum which causes rapid muscular growth in Hominidae. Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
 	reagent_state = LIQUID
 	color = "#00f041"
@@ -2104,7 +1967,6 @@
 
 /datum/reagent/growthserum
 	name = "Growth Serum"
-	id = "growthserum"
 	description = "A commercial chemical designed to help older men in the bedroom."//not really it just makes you a giant
 	color = "#ff0000"//strong red. rgb 255, 0, 0
 	var/current_size = 1
@@ -2136,7 +1998,6 @@
 
 /datum/reagent/plastic_polymers
 	name = "plastic polymers"
-	id = "plastic_polymers"
 	description = "the petroleum based components of plastic."
 	color = "#f7eded"
 	taste_description = "plastic"
@@ -2144,7 +2005,6 @@
 
 /datum/reagent/glitter
 	name = "generic glitter"
-	id = "glitter"
 	description = "if you can see this description, contact a coder."
 	color = "#FFFFFF" //pure white
 	taste_description = "plastic"
@@ -2158,27 +2018,23 @@
 
 /datum/reagent/glitter/pink
 	name = "pink glitter"
-	id = "pink_glitter"
 	description = "pink sparkles that get everywhere"
 	color = "#ff8080" //A light pink color
 	glitter_type = /obj/effect/decal/cleanable/glitter/pink
 
 /datum/reagent/glitter/white
 	name = "white glitter"
-	id = "white_glitter"
 	description = "white sparkles that get everywhere"
 	glitter_type = /obj/effect/decal/cleanable/glitter/white
 
 /datum/reagent/glitter/blue
 	name = "blue glitter"
-	id = "blue_glitter"
 	description = "blue sparkles that get everywhere"
 	color = "#4040FF" //A blueish color
 	glitter_type = /obj/effect/decal/cleanable/glitter/blue
 
 /datum/reagent/pax
 	name = "pax"
-	id = "pax"
 	description = "A colorless liquid that suppresses violence on the subjects."
 	color = "#AAAAAA55"
 	taste_description = "water"
@@ -2187,15 +2043,14 @@
 
 /datum/reagent/pax/on_mob_metabolize(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_PACIFISM, id)
+	ADD_TRAIT(L, TRAIT_PACIFISM, type)
 
 /datum/reagent/pax/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_PACIFISM, id)
+	REMOVE_TRAIT(L, TRAIT_PACIFISM, type)
 	..()
 
 /datum/reagent/bz_metabolites
 	name = "BZ metabolites"
-	id = "bz_metabolites"
 	description = "A harmless metabolite of BZ gas"
 	color = "#FAFF00"
 	taste_description = "acrid cinnamon"
@@ -2203,11 +2058,11 @@
 
 /datum/reagent/bz_metabolites/on_mob_metabolize(mob/living/L)
 	..()
-	ADD_TRAIT(L, CHANGELING_HIVEMIND_MUTE, id)
+	ADD_TRAIT(L, CHANGELING_HIVEMIND_MUTE, type)
 
 /datum/reagent/bz_metabolites/on_mob_end_metabolize(mob/living/L)
 	..()
-	REMOVE_TRAIT(L, CHANGELING_HIVEMIND_MUTE, id)
+	REMOVE_TRAIT(L, CHANGELING_HIVEMIND_MUTE, type)
 
 /datum/reagent/bz_metabolites/on_mob_life(mob/living/L)
 	if(L.mind)
@@ -2218,13 +2073,11 @@
 
 /datum/reagent/pax/peaceborg
 	name = "synth-pax"
-	id = "synthpax"
 	description = "A colorless liquid that suppresses violence on the subjects. Cheaper to synthetize, but wears out faster than normal Pax."
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
 
 /datum/reagent/peaceborg_confuse
 	name = "Dizzying Solution"
-	id = "dizzysolution"
 	description = "Makes the target off balance and dizzy"
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
 	taste_description = "dizziness"
@@ -2240,7 +2093,6 @@
 
 /datum/reagent/peaceborg_tire
 	name = "Tiring Solution"
-	id = "tiresolution"
 	description = "An extremely weak stamina-toxin that tires out the target. Completely harmless."
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
 	taste_description = "tiredness"
@@ -2255,7 +2107,6 @@
 
 /datum/reagent/tranquility
 	name = "Tranquility"
-	id = "tranquility"
 	description = "A highly mutative liquid of unknown origin."
 	color = "#9A6750" //RGB: 154, 103, 80
 	taste_description = "inner peace"
@@ -2267,7 +2118,6 @@
 
 /datum/reagent/moonsugar
 	name = "Moonsugar"
-	id = "moonsugar"
 	description = "The primary precursor for an ancient feline delicacy known as skooma. While it has no notable effects on it's own, mixing it with morphine in a chilled container may yield interesting results."
 	color = "#FAEAFF"
 	taste_description = "synthetic catnip"
@@ -2280,7 +2130,6 @@
 
 /datum/reagent/changeling_string
 	name = "UNKNOWN"
-	id = "changeling_sting_real"
 	description = "404: Chemical not found."
 	metabolization_rate = REAGENTS_METABOLISM
 	color = "#0000FF"
@@ -2314,14 +2163,12 @@
 
 /datum/reagent/mustardgrind
 	name = "Mustardgrind"
-	id = "mustardgrind"
 	description = "A powerd that is mixed with water and enzymes to make mustard."
 	color = "#BCC740" //RGB: 188, 199, 64
 	taste_description = "plant dust"
 
 /datum/reagent/pax/catnip
 	name = "catnip"
-	id = "catnip"
 	taste_description = "grass"
 	description = "A colorless liquid that makes people more peaceful and felines more happy."
 	metabolization_rate = 1.75 * REAGENTS_METABOLISM
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index 758db841f2..5e8249009d 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -1,7 +1,6 @@
 
 /datum/reagent/thermite
 	name = "Thermite"
-	id = "thermite"
 	description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls."
 	reagent_state = SOLID
 	color = "#550000"
@@ -18,7 +17,6 @@
 
 /datum/reagent/nitroglycerin
 	name = "Nitroglycerin"
-	id = "nitroglycerin"
 	value = 5
 	description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol."
 	color = "#808080" // rgb: 128, 128, 128
@@ -26,7 +24,6 @@
 
 /datum/reagent/stabilizing_agent
 	name = "Stabilizing Agent"
-	id = "stabilizing_agent"
 	description = "Keeps unstable chemicals stable. This does not work on everything."
 	reagent_state = LIQUID
 	color = "#FFFF00"
@@ -35,7 +32,6 @@
 
 /datum/reagent/clf3
 	name = "Chlorine Trifluoride"
-	id = "clf3"
 	description = "Makes a temporary 3x3 fireball when it comes into existence, so be careful when mixing. ClF3 applied to a surface burns things that wouldn't otherwise burn, sometimes through the very floors of the station and exposing it to the vacuum of space."
 	reagent_state = LIQUID
 	color = "#FFC8C8"
@@ -79,7 +75,6 @@
 
 /datum/reagent/sorium
 	name = "Sorium"
-	id = "sorium"
 	description = "Sends everything flying from the detonation point."
 	reagent_state = LIQUID
 	color = "#5A64C8"
@@ -87,7 +82,6 @@
 
 /datum/reagent/liquid_dark_matter
 	name = "Liquid Dark Matter"
-	id = "liquid_dark_matter"
 	description = "Sucks everything into the detonation point."
 	reagent_state = LIQUID
 	color = "#210021"
@@ -96,7 +90,6 @@
 
 /datum/reagent/blackpowder
 	name = "Black Powder"
-	id = "blackpowder"
 	description = "Explodes. Violently."
 	reagent_state = LIQUID
 	color = "#000000"
@@ -118,7 +111,6 @@
 
 /datum/reagent/flash_powder
 	name = "Flash Powder"
-	id = "flash_powder"
 	description = "Makes a very bright flash."
 	reagent_state = LIQUID
 	color = "#C8C8C8"
@@ -126,7 +118,6 @@
 
 /datum/reagent/smoke_powder
 	name = "Smoke Powder"
-	id = "smoke_powder"
 	description = "Makes a large cloud of smoke that can carry reagents."
 	reagent_state = LIQUID
 	color = "#C8C8C8"
@@ -134,7 +125,6 @@
 
 /datum/reagent/sonic_powder
 	name = "Sonic Powder"
-	id = "sonic_powder"
 	description = "Makes a deafening noise."
 	reagent_state = LIQUID
 	color = "#C8C8C8"
@@ -142,7 +132,6 @@
 
 /datum/reagent/phlogiston
 	name = "Phlogiston"
-	id = "phlogiston"
 	description = "Catches you on fire and makes you ignite."
 	reagent_state = LIQUID
 	color = "#FA00AF"
@@ -164,7 +153,6 @@
 
 /datum/reagent/napalm
 	name = "Napalm"
-	id = "napalm"
 	description = "Very flammable."
 	reagent_state = LIQUID
 	color = "#FA00AF"
@@ -182,7 +170,6 @@
 
 /datum/reagent/cryostylane
 	name = "Cryostylane"
-	id = "cryostylane"
 	description = "Comes into existence at 20K. As long as there is sufficient oxygen for it to react with, Cryostylane slowly cools all other reagents in the container 0K."
 	color = "#0000DC"
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -202,7 +189,6 @@
 
 /datum/reagent/pyrosium
 	name = "Pyrosium"
-	id = "pyrosium"
 	description = "Comes into existence at 20K. As long as there is sufficient oxygen for it to react with, Pyrosium slowly heats all other reagents in the container."
 	color = "#64FAC8"
 	metabolization_rate = 0.5 * REAGENTS_METABOLISM
@@ -216,7 +202,6 @@
 
 /datum/reagent/teslium //Teslium. Causes periodic shocks, and makes shocks against the target much more effective.
 	name = "Teslium"
-	id = "teslium"
 	description = "An unstable, electrically-charged metallic slurry. Periodically electrocutes its victim, and makes electrocutions against them more deadly. Excessively heating teslium results in dangerous destabilization. Do not allow to come into contact with water."
 	reagent_state = LIQUID
 	color = "#20324D" //RGB: 32, 50, 77
@@ -234,7 +219,6 @@
 
 /datum/reagent/teslium/energized_jelly
 	name = "Energized Jelly"
-	id = "energized_jelly"
 	description = "Electrically-charged jelly. Boosts jellypeople's nervous system, but only shocks other lifeforms."
 	reagent_state = LIQUID
 	color = "#CAFF43"
@@ -255,7 +239,6 @@
 
 /datum/reagent/firefighting_foam
 	name = "Firefighting Foam"
-	id = "firefighting_foam"
 	description = "A historical fire suppressant. Originally believed to simply displace oxygen to starve fires, it actually interferes with the combustion reaction itself. Vastly superior to the cheap water-based extinguishers found on NT vessels."
 	reagent_state = LIQUID
 	color = "#A6FAFF55"
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index c839326f78..ad3a2c90a4 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -3,7 +3,6 @@
 
 /datum/reagent/toxin
 	name = "Toxin"
-	id = "toxin"
 	description = "A toxic chemical."
 	color = "#CF3600" // rgb: 207, 54, 0
 	taste_description = "bitterness"
@@ -18,7 +17,6 @@
 
 /datum/reagent/toxin/amatoxin
 	name = "Amatoxin"
-	id = "amatoxin"
 	description = "A powerful poison derived from certain species of mushroom."
 	color = "#792300" // rgb: 121, 35, 0
 	toxpwr = 2.5
@@ -27,7 +25,6 @@
 
 /datum/reagent/toxin/mutagen
 	name = "Unstable mutagen"
-	id = "mutagen"
 	description = "Might cause unpredictable mutations. Keep away from children."
 	color = "#00FF00"
 	toxpwr = 0
@@ -56,7 +53,6 @@
 
 /datum/reagent/toxin/plasma
 	name = "Plasma"
-	id = "plasma"
 	description = "Plasma in its liquid form."
 	taste_description = "bitterness"
 	specific_heat = SPECIFIC_HEAT_PLASMA
@@ -91,7 +87,6 @@
 
 /datum/reagent/toxin/lexorin
 	name = "Lexorin"
-	id = "lexorin"
 	description = "A powerful poison used to stop respiration."
 	color = "#7DC3A0"
 	toxpwr = 0
@@ -113,7 +108,6 @@
 
 /datum/reagent/toxin/slimejelly
 	name = "Slime Jelly"
-	id = "slimejelly"
 	description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL."
 	color = "#801E28" // rgb: 128, 30, 40
 	toxpwr = 0
@@ -133,7 +127,6 @@
 
 /datum/reagent/toxin/minttoxin
 	name = "Mint Toxin"
-	id = "minttoxin"
 	description = "Useful for dealing with undesirable customers."
 	color = "#CF3600" // rgb: 207, 54, 0
 	toxpwr = 0
@@ -147,7 +140,6 @@
 
 /datum/reagent/toxin/carpotoxin
 	name = "Carpotoxin"
-	id = "carpotoxin"
 	description = "A deadly neurotoxin produced by the dreaded spess carp."
 	color = "#003333" // rgb: 0, 51, 51
 	toxpwr = 2
@@ -156,7 +148,6 @@
 
 /datum/reagent/toxin/zombiepowder
 	name = "Zombie Powder"
-	id = "zombiepowder"
 	description = "A strong neurotoxin that puts the subject into a death-like state."
 	reagent_state = SOLID
 	color = "#669900" // rgb: 102, 153, 0
@@ -166,10 +157,10 @@
 
 /datum/reagent/toxin/zombiepowder/on_mob_metabolize(mob/living/L)
 	..()
-	L.fakedeath(id)
+	L.fakedeath(type)
 
 /datum/reagent/toxin/zombiepowder/on_mob_end_metabolize(mob/living/L)
-	L.cure_fakedeath(id)
+	L.cure_fakedeath(type)
 	..()
 
 /datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/carbon/M)
@@ -179,7 +170,6 @@
 
 /datum/reagent/toxin/ghoulpowder
 	name = "Ghoul Powder"
-	id = "ghoulpowder"
 	description = "A strong neurotoxin that slows metabolism to a death-like state, while keeping the patient fully active. Causes toxin buildup if used too long."
 	reagent_state = SOLID
 	color = "#664700" // rgb: 102, 71, 0
@@ -189,10 +179,10 @@
 
 /datum/reagent/toxin/ghoulpowder/on_mob_metabolize(mob/living/L)
 	..()
-	ADD_TRAIT(L, TRAIT_FAKEDEATH, id)
+	ADD_TRAIT(L, TRAIT_FAKEDEATH, type)
 
 /datum/reagent/toxin/ghoulpowder/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_FAKEDEATH, id)
+	REMOVE_TRAIT(L, TRAIT_FAKEDEATH, type)
 	..()
 
 /datum/reagent/toxin/ghoulpowder/on_mob_life(mob/living/carbon/M)
@@ -202,7 +192,6 @@
 
 /datum/reagent/toxin/mindbreaker
 	name = "Mindbreaker Toxin"
-	id = "mindbreaker"
 	description = "A powerful hallucinogen. Not a thing to be messed with. For some mental patients. it counteracts their symptoms and anchors them to reality."
 	color = "#B31008" // rgb: 139, 166, 233
 	toxpwr = 0
@@ -215,7 +204,6 @@
 
 /datum/reagent/toxin/plantbgone
 	name = "Plant-B-Gone"
-	id = "plantbgone"
 	description = "A harmful toxic mixture to kill plantlife. Do not ingest!"
 	color = "#49002E" // rgb: 73, 0, 46
 	toxpwr = 1
@@ -242,14 +230,12 @@
 
 /datum/reagent/toxin/plantbgone/weedkiller
 	name = "Weed Killer"
-	id = "weedkiller"
 	description = "A harmful toxic mixture to kill weeds. Do not ingest!"
 	color = "#4B004B" // rgb: 75, 0, 75
 	pH = 3
 
 /datum/reagent/toxin/pestkiller
 	name = "Pest Killer"
-	id = "pestkiller"
 	description = "A harmful toxic mixture to kill pests. Do not ingest!"
 	color = "#4B004B" // rgb: 75, 0, 75
 	toxpwr = 1
@@ -263,7 +249,6 @@
 
 /datum/reagent/toxin/spore
 	name = "Spore Toxin"
-	id = "spore"
 	description = "A natural toxin produced by blob spores that inhibits vision when ingested."
 	color = "#9ACD32"
 	toxpwr = 1
@@ -277,7 +262,6 @@
 
 /datum/reagent/toxin/spore_burning
 	name = "Burning Spore Toxin"
-	id = "spore_burning"
 	description = "A natural toxin produced by blob spores that induces combustion in its victim."
 	color = "#9ACD32"
 	toxpwr = 0.5
@@ -291,7 +275,6 @@
 
 /datum/reagent/toxin/chloralhydrate
 	name = "Chloral Hydrate"
-	id = "chloralhydrate"
 	description = "A powerful sedative that induces confusion and drowsiness before putting its target to sleep."
 	reagent_state = SOLID
 	color = "#000067" // rgb: 0, 0, 103
@@ -315,7 +298,6 @@
 
 /datum/reagent/toxin/fakebeer	//disguised as normal beer for use by emagged brobots
 	name = "Beer"
-	id = "fakebeer"
 	description = "A specially-engineered sedative disguised as beer. It induces instant sleep in its target."
 	color = "#664300" // rgb: 102, 67, 0
 	metabolization_rate = 1.5 * REAGENTS_METABOLISM
@@ -336,7 +318,6 @@
 
 /datum/reagent/toxin/coffeepowder
 	name = "Coffee Grounds"
-	id = "coffeepowder"
 	description = "Finely ground coffee beans, used to make coffee."
 	reagent_state = SOLID
 	color = "#5B2E0D" // rgb: 91, 46, 13
@@ -345,7 +326,6 @@
 
 /datum/reagent/toxin/teapowder
 	name = "Ground Tea Leaves"
-	id = "teapowder"
 	description = "Finely shredded tea leaves, used for making tea."
 	reagent_state = SOLID
 	color = "#7F8400" // rgb: 127, 132, 0
@@ -354,7 +334,6 @@
 
 /datum/reagent/toxin/mutetoxin //the new zombie powder.
 	name = "Mute Toxin"
-	id = "mutetoxin"
 	description = "A nonlethal poison that inhibits speech in its victim."
 	color = "#F0F8FF" // rgb: 240, 248, 255
 	toxpwr = 0
@@ -367,7 +346,6 @@
 
 /datum/reagent/toxin/staminatoxin
 	name = "Tirizene"
-	id = "tirizene"
 	description = "A nonlethal poison that causes extreme fatigue and weakness in its victim."
 	color = "#6E2828"
 	data = 15
@@ -381,7 +359,6 @@
 
 /datum/reagent/toxin/polonium
 	name = "Polonium"
-	id = "polonium"
 	description = "An extremely radioactive material in liquid form. Ingestion results in fatal irradiation."
 	reagent_state = LIQUID
 	color = "#787878"
@@ -394,7 +371,6 @@
 
 /datum/reagent/toxin/histamine
 	name = "Histamine"
-	id = "histamine"
 	description = "Histamine's effects become more dangerous depending on the dosage amount. They range from mildly annoying to incredibly lethal."
 	reagent_state = LIQUID
 	color = "#FA6464"
@@ -428,7 +404,6 @@
 
 /datum/reagent/toxin/formaldehyde
 	name = "Formaldehyde"
-	id = "formaldehyde"
 	description = "Formaldehyde, on its own, is a fairly weak toxin. It contains trace amounts of Histamine, very rarely making it decay into Histamine."
 	reagent_state = LIQUID
 	color = "#B4004B"
@@ -444,7 +419,6 @@
 
 /datum/reagent/toxin/venom
 	name = "Venom"
-	id = "venom"
 	description = "An exotic poison extracted from highly toxic fauna. Causes scaling amounts of toxin damage and bruising depending and dosage. Often decays into Histamine."
 	reagent_state = LIQUID
 	color = "#F0FFF0"
@@ -463,7 +437,6 @@
 
 /datum/reagent/toxin/fentanyl
 	name = "Fentanyl"
-	id = "fentanyl"
 	description = "Fentanyl will inhibit brain function and cause toxin damage before eventually knocking out its victim."
 	reagent_state = LIQUID
 	color = "#64916E"
@@ -481,7 +454,6 @@
 
 /datum/reagent/toxin/cyanide
 	name = "Cyanide"
-	id = "cyanide"
 	description = "An infamous poison known for its use in assassination. Causes small amounts of toxin damage with a small chance of oxygen damage or a stun."
 	reagent_state = LIQUID
 	color = "#00B4FF"
@@ -499,7 +471,6 @@
 
 /datum/reagent/toxin/bad_food
 	name = "Bad Food"
-	id = "bad_food"
 	description = "The result of some abomination of cookery, food so bad it's toxic."
 	reagent_state = LIQUID
 	color = "#d6d6d8"
@@ -509,7 +480,6 @@
 
 /datum/reagent/toxin/itching_powder
 	name = "Itching Powder"
-	id = "itching_powder"
 	description = "A powder that induces itching upon contact with the skin. Causes the victim to scratch at their itches and has a very low chance to decay into Histamine."
 	reagent_state = LIQUID
 	color = "#C8C8C8"
@@ -541,7 +511,6 @@
 
 /datum/reagent/toxin/initropidril
 	name = "Initropidril"
-	id = "initropidril"
 	description = "A powerful poison with insidious effects. It can cause stuns, lethal breathing failure, and cardiac arrest."
 	reagent_state = LIQUID
 	color = "#7F10C0"
@@ -572,7 +541,6 @@
 
 /datum/reagent/toxin/pancuronium
 	name = "Pancuronium"
-	id = "pancuronium"
 	description = "An undetectable toxin that swiftly incapacitates its victim. May also cause breathing failure."
 	reagent_state = LIQUID
 	color = "#195096"
@@ -590,7 +558,6 @@
 
 /datum/reagent/toxin/sodium_thiopental
 	name = "Sodium Thiopental"
-	id = "sodium_thiopental"
 	description = "Sodium Thiopental induces heavy weakness in its target as well as unconsciousness."
 	reagent_state = LIQUID
 	color = "#6496FA"
@@ -606,7 +573,6 @@
 
 /datum/reagent/toxin/sulfonal
 	name = "Sulfonal"
-	id = "sulfonal"
 	description = "A stealthy poison that deals minor toxin damage and eventually puts the target to sleep."
 	reagent_state = LIQUID
 	color = "#7DC3A0"
@@ -620,7 +586,6 @@
 
 /datum/reagent/toxin/amanitin
 	name = "Amanitin"
-	id = "amanitin"
 	description = "A very powerful delayed toxin. Upon full metabolization, a massive amount of toxin damage will be dealt depending on how long it has been in the victim's bloodstream."
 	reagent_state = LIQUID
 	color = "#FFFFFF"
@@ -635,7 +600,6 @@
 
 /datum/reagent/toxin/lipolicide
 	name = "Lipolicide"
-	id = "lipolicide"
 	description = "A powerful toxin that will destroy fat cells, massively reducing body weight in a short time. Deadly to those without nutriment in their body."
 	taste_description = "mothballs"
 	reagent_state = LIQUID
@@ -652,7 +616,6 @@
 
 /datum/reagent/toxin/coniine
 	name = "Coniine"
-	id = "coniine"
 	description = "Coniine metabolizes extremely slowly, but deals high amounts of toxin damage and stops breathing."
 	reagent_state = LIQUID
 	color = "#7DC3A0"
@@ -665,7 +628,6 @@
 
 /datum/reagent/toxin/spewium
 	name = "Spewium"
-	id = "spewium"
 	description = "A powerful emetic, causes uncontrollable vomiting.  May result in vomiting organs at high doses."
 	reagent_state = LIQUID
 	color = "#2f6617" //A sickly green color
@@ -691,7 +653,6 @@
 
 /datum/reagent/toxin/curare
 	name = "Curare"
-	id = "curare"
 	description = "Causes slight toxin damage followed by chain-stunning and oxygen damage."
 	reagent_state = LIQUID
 	color = "#191919"
@@ -707,7 +668,6 @@
 
 /datum/reagent/toxin/heparin //Based on a real-life anticoagulant. I'm not a doctor, so this won't be realistic.
 	name = "Heparin"
-	id = "heparin"
 	description = "A powerful anticoagulant. Victims will bleed uncontrollably and suffer scaling bruising."
 	reagent_state = LIQUID
 	color = "#C8C8C8" //RGB: 200, 200, 200
@@ -725,7 +685,6 @@
 
 /datum/reagent/toxin/rotatium //Rotatium. Fucks up your rotation and is hilarious
 	name = "Rotatium"
-	id = "rotatium"
 	description = "A constantly swirling, oddly colourful fluid. Causes the consumer's sense of direction and hand-eye coordination to become wild."
 	reagent_state = LIQUID
 	color = "#AC88CA" //RGB: 172, 136, 202
@@ -752,7 +711,6 @@
 
 /datum/reagent/toxin/skewium
 	name = "Skewium"
-	id = "skewium"
 	description = "A strange, dull coloured liquid that appears to warp back and forth inside its container. Causes any consumer to experience a visual phenomena similar to said warping."
 	reagent_state = LIQUID
 	color = "#ADBDCD"
@@ -790,7 +748,6 @@
 
 /datum/reagent/toxin/anacea
 	name = "Anacea"
-	id = "anacea"
 	description = "A toxin that quickly purges medicines and metabolizes very slowly."
 	reagent_state = LIQUID
 	color = "#3C5133"
@@ -810,7 +767,6 @@
 
 /datum/reagent/toxin/acid
 	name = "Sulphuric acid"
-	id = "sacid"
 	description = "A strong mineral acid with the molecular formula H2SO4."
 	color = "#00FF32"
 	toxpwr = 1
@@ -845,7 +801,6 @@
 
 /datum/reagent/toxin/acid/fluacid
 	name = "Fluorosulfuric acid"
-	id = "facid"
 	description = "Fluorosulfuric acid is an extremely corrosive chemical substance."
 	color = "#5050FF"
 	toxpwr = 2
@@ -858,7 +813,6 @@
 
 /datum/reagent/toxin/delayed
 	name = "Toxin Microcapsules"
-	id = "delayed_toxin"
 	description = "Causes heavy toxin damage after a brief time of inactivity."
 	reagent_state = LIQUID
 	metabolization_rate = 0 //stays in the system until active.
@@ -878,21 +832,19 @@
 
 /datum/reagent/toxin/mimesbane
 	name = "Mime's Bane"
-	id = "mimesbane"
 	description = "A nonlethal neurotoxin that interferes with the victim's ability to gesture."
 	color = "#F0F8FF" // rgb: 240, 248, 255
 	toxpwr = 0
 	taste_description = "stillness"
 
 /datum/reagent/toxin/mimesbane/on_mob_metabolize(mob/living/L)
-	ADD_TRAIT(L, TRAIT_EMOTEMUTE, id)
+	ADD_TRAIT(L, TRAIT_EMOTEMUTE, type)
 
 /datum/reagent/toxin/mimesbane/on_mob_end_metabolize(mob/living/L)
-	REMOVE_TRAIT(L, TRAIT_EMOTEMUTE, id)
+	REMOVE_TRAIT(L, TRAIT_EMOTEMUTE, type)
 
 /datum/reagent/toxin/bonehurtingjuice //oof ouch
 	name = "Bone Hurting Juice"
-	id = "bonehurtingjuice"
 	description = "A strange substance that looks a lot like water. Drinking it is oddly tempting. Oof ouch."
 	color = "#AAAAAA77" //RGBA: 170, 170, 170, 77
 	toxpwr = 0
@@ -953,7 +905,6 @@
 
 /datum/reagent/toxin/brainhurtingjuice //oof ouch
 	name = "Brain Hurting Juice"
-	id = "brainhurtingjuice"
 	color = "#AAAAAA77" //RGBA: 170, 170, 170, 77
 	toxpwr = 0
 	taste_description = "brain hurting"
@@ -970,7 +921,6 @@
 
 /datum/reagent/toxin/bungotoxin
 	name = "Bungotoxin"
-	id = "bungotoxin"
 	description = "A horrible cardiotoxin that protects the humble bungo pit."
 	//silent_toxin = TRUE //I guess we don't really have the entire tox system ported.
 	color = "#EBFF8E"
diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm
index b8aa6d155e..a07e7697bc 100644
--- a/code/modules/reagents/chemistry/recipes/medicine.dm
+++ b/code/modules/reagents/chemistry/recipes/medicine.dm
@@ -21,7 +21,7 @@
 /datum/chemical_reaction/inacusiate
 	name = "inacusiate"
 	id = /datum/reagent/medicine/inacusiate
-	results = list("inacusiate" = 2)
+	results = list(/datum/reagent/medicine/inacusiate = 2)
 	required_reagents = list(/datum/reagent/water = 1, /datum/reagent/carbon = 1, /datum/reagent/medicine/charcoal = 1)
 
 /datum/chemical_reaction/synaptizine
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index f7363971d1..458971b196 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -192,7 +192,7 @@
 /datum/chemical_reaction/virus_food_mutagen_salineglucose
 	name = "sucrose agar"
 	id = "salineglucosevirusfood"
-	results = list("sugarvirusfood" = 2)
+	results = list(/datum/reagent/toxin/mutagen/mutagenvirusfood/sugar = 2)
 	required_reagents = list(/datum/reagent/medicine/salglu_solution = 1, /datum/reagent/toxin/mutagen/mutagenvirusfood = 1)
 
 /datum/chemical_reaction/virus_food_uranium
@@ -430,14 +430,14 @@
 
 /datum/chemical_reaction/foaming_agent
 	name = "Foaming Agent"
-	id = "foaming_agent"
-	results = list("foaming_agent" = 1)
+	id = /datum/reagent/foaming_agent
+	results = list(/datum/reagent/foaming_agent = 1)
 	required_reagents = list(/datum/reagent/lithium = 1, /datum/reagent/hydrogen = 1)
 
 /datum/chemical_reaction/smart_foaming_agent
 	name = "Smart foaming Agent"
-	id = "smart_foaming_agent"
-	results = list("smart_foaming_agent" = 3)
+	id = /datum/reagent/smart_foaming_agent
+	results = list(/datum/reagent/smart_foaming_agent = 3)
 	required_reagents = list(/datum/reagent/foaming_agent = 3, /datum/reagent/acetone = 1, /datum/reagent/iron = 1)
 	mix_message = "The solution mixes into a frothy metal foam and conforms to the walls of its container."
 
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index 07fb19b278..cb9636bf02 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -134,7 +134,7 @@
 		var/list/beeagents = list()
 		for(var/X in holder.reagent_list)
 			var/datum/reagent/R = X
-			if(required_reagents[R.id])
+			if(required_reagents[R.type])
 				continue
 			beeagents += R
 		var/bee_amount = round(created_volume * 0.2)
diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm
index 7ed48e3c51..d9f28d2135 100644
--- a/code/modules/reagents/chemistry/recipes/toxins.dm
+++ b/code/modules/reagents/chemistry/recipes/toxins.dm
@@ -118,7 +118,7 @@
 	name = "Mime's Bane"
 	id = /datum/reagent/toxin/mimesbane
 	results = list(/datum/reagent/toxin/mimesbane = 3)
-	required_reagents = list(/datum/reagent/radium = 1, /datum/reagent/toxin/mutetoxin = 1, /datum/reagent/nothing = 1)
+	required_reagents = list(/datum/reagent/radium = 1, /datum/reagent/toxin/mutetoxin = 1, /datum/reagent/consumable/nothing = 1)
 
 /datum/chemical_reaction/bonehurtingjuice
 	name = "Bone Hurting Juice"
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 83fe560638..73b8716cde 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -104,7 +104,7 @@
 		target.visible_message("<span class='danger'>[M] has been splashed with something!</span>", \
 						"<span class='userdanger'>[M] has been splashed with something!</span>")
 		for(var/datum/reagent/A in reagents.reagent_list)
-			R += A.id + " ("
+			R += A.type + " ("
 			R += num2text(A.volume) + "),"
 
 		if(thrownby)
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index efe9c378d9..a215d09517 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -67,7 +67,7 @@
 			var/R
 			if(reagents)
 				for(var/datum/reagent/A in src.reagents.reagent_list)
-					R += A.id + " ("
+					R += A.type + " ("
 					R += num2text(A.volume) + "),"
 			log_combat(user, M, "squirted", R)
 
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 9065f57786..f4c9428858 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -27,7 +27,7 @@
 							"<span class='userdanger'>[user] splashes the contents of [src] onto [M]!</span>")
 			if(reagents)
 				for(var/datum/reagent/A in reagents.reagent_list)
-					R += A.id + " ("
+					R += A.type + " ("
 					R += num2text(A.volume) + "),"
 			if(isturf(target) && reagents.reagent_list.len && thrownby)
 				log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
diff --git a/code/modules/research/nanites/nanite_programs/healing.dm b/code/modules/research/nanites/nanite_programs/healing.dm
index 53da4d65c4..ad48b64baa 100644
--- a/code/modules/research/nanites/nanite_programs/healing.dm
+++ b/code/modules/research/nanites/nanite_programs/healing.dm
@@ -61,7 +61,7 @@
 /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.type,1)
diff --git a/code/modules/vore/eating/voreitems.dm b/code/modules/vore/eating/voreitems.dm
index cacf081e7d..05ab1e5f8b 100644
--- a/code/modules/vore/eating/voreitems.dm
+++ b/code/modules/vore/eating/voreitems.dm
@@ -35,7 +35,6 @@
 /*
 /datum/reagent/medicine/ickypak
 	name = "Ickypak"
-	id = "ickypak"
 	description = "A foul-smelling green liquid, for inducing muscle contractions to expel accidentally ingested things."
 	reagent_state = LIQUID
 	color = "#0E900E"
diff --git a/code/modules/vore/resizing/sizechemicals.dm b/code/modules/vore/resizing/sizechemicals.dm
index 5015216230..612e8c9fde 100644
--- a/code/modules/vore/resizing/sizechemicals.dm
+++ b/code/modules/vore/resizing/sizechemicals.dm
@@ -40,7 +40,6 @@
 
 /datum/reagent/medicine/normalcillin
 	name = "Normalcillin"
-	id = "normalcillin"
 	description = "Translucent cyan liquid."
 	reagent_state = LIQUID
 	color = "#00FFFF"
diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi
index d3bdc1b1ea3e77b3d874b35e124ead385eee8125..93acc0745367e610e7b2ecde202a7295eeea9502 100644
GIT binary patch
literal 11617
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

literal 11417
zcmbt)cTiJbw|0=;doQ617K#NyN<av`cN8I10hL|_0*F+li}VsesRGhM4@GIxdlLfE
zLla0SfxwOL@4GYackkSp`_1>qnK@^lUDsag*=s**#pvs*QB!bG0001L4Rx>~06@U|
z_aP$z002zyDns!fYXQdQ-e3nWJ5OhKZ)Z1G0Kh*xXS&mML4t~8+3S)?DNr=BXdAwt
zIFMM-mk*6ltY)`}7NlUv>3M_YmLmmyUCvvyU9MG1O4$lLzQDL#*gQH|K!Ka2<6pSs
zw#%D-(3??roPL2Z7M1aI5nffMzhghWAtoKtTFw$T(EW9&<{4KF^}{PfK^Nf~P430l
zs_6z(vq^X$D1>y8!CMbz@phj*j+Xil=~i&qKCyTEXq;RDosMKP>}PVz^IcJQVYrFM
z_iEM>iI0<kzR3Zn+J*<c8Yt(y&r8W4C$)^dUjK?$N?u_pCzbu(rCbfw;dOgJE&8Cj
z5ff&(h2n52NFnQ%-0T~EhfQoE8<tJAsPPjlZ2`TNX?!3Ft5>=IfjU5tDVa*Lw}<$B
zfKQmLk=HsgS+A72ric{@ua$In$j1Sz5%y=KC;MP^sg7ciq`0=-lQy!^&g6>Vty<+P
zzvgtpPX$$P*0V*Hiu?j;F0TC@9A9}9i~H7;u~5H}O|O3{e;0V=k#r+NFUHe-Da~45
z-*D%P_lY|DF@D@tN^E`&VXu=VfmnR}s}obQxmB*6JYlbj5cFU@sCx5R-n>_Z-hR_`
z@#%9yWsf4vEzr!CAT5+WtG%^we`u$-=k-#<6p*Xvo8CicoC^TJ3(x>RG4{{i%Lxf$
znp!+ipfu<rd>F%bgMh*OLq5?LjugntqZF1&r4C4)%G(cVl(gbWp!cjy5G!%G>WXP;
z3aE4oD#GUU#gtE<`EJ_>eub}{Q9ybn-gIE3$PYR)wtF7?z^vMgoW;4tjGT;*yTMCU
zGYH?|><61(FYcf3o@SqWJm*Ou4X5LOCsxC$NEQQeQVgea9t|bq8;23lD}8=K$RDo$
zjs#4Wq#8CxeZ;bU+jj1_ODwH^XuA<xtd(|aMeEJn<*>(K$m@4sT(op`<IS(v`ai1c
z==fZ^DMuSnanfl{moPk?uK!H9lP6|b^b53}MgsRIk7#d#RR0W5{`m0|2#RH!-@vz`
z(24f;ey-{YzQpcSDPK|e9V{(QGg?JnU0AS+90R!$!as+^`Day?S@lM?^QbyMRh~@J
zPZP6DiH)W5-kBEt?IQNPF|@f^Ci}5hWD?!>D42`D#MJcm<HwKr28_+j?)YXTzQ(2Y
zTo-5gAr7@<1#xE^S#I9PVi3gZ77(AWbt7eJN=o=!BT`s^SDagpjHRJrf&GgY^C#t5
zDJg4Hms0>_Gpcxg!8Ym&DIWy@C=9nOxjhvhc{!XTOA1ie)jhG89uW9kYdssvz{p5Y
zmo?l`Y9(;it8n$!o&G(u;LV%-d;LqnMRpB{fXmI3Ti0d%$3+k^nMfh6U`l{{+X-=Q
zXM*U2S;DnbZx}dWvDwGG#y-YxU7ZzVevWX!hR;T95B%v00<U>trpzp+OTNwPO<6Bj
zk({YK(M7#F%uG1VLt^Gx^<S`YO2o5NoG-6Ni>K4`Gk>So_wsrGfK^x1t4&K5RMP`U
z!hiK>W@crz%~Ns`00=`q#R*VqaZk)J3<jl&L-x~yC61pWf*$w8bH8dHE-2t1;NE>p
z$`jpap^ZBmlbRyFSZ-(;8y!XL_ca?Dn`OCW8$f;5jyq!)0fyQ1GcZTc>7p+k=he%0
zMDF=7=;>lfdHDkqM+1YT<gBb$Hg^_w;@0v)v4>yWE<wD2cO=wDT2cYud3*l=ui4ic
zK`=MaF%R4Osxq4S$|^@t?TewV2ufD%sav{;)!qb)Swr!rrY4(f@)BSOwy4?q{?&@?
zdl21xP&RMMIat}mgxPm*-r)%);bSQFVOd#Oi5^se{}JqI?Tg=iNrw1s_+2{!Iv&u{
z(CAEq1joE3B(<IXn(@c~E0TN;8)hyE1oZXwkp(8JS}0&jt9tZ_9tN5CE{uyl@vMDI
zt5a9TxZPWG4p@5I_34h;yf3-vFE%2~s-D7cwR^Yk-1+nrI80^Xy4Z;MwyFw#ial_%
zgvnj@RZ(XoOeNS-vEToZc%BYrvO_MlH48(uv?v)E&>>Y_>y)Yq?1c+FsNOt8KG{}Z
zm*K+_@epTq4UH!nF-aV8d|C?A0>Dnc_hFftCj?iMlg5)XGZv{l61?a=j>!ZC=yxf8
z8jgqRr>jKw(GHmj&yc#u1k1ALx#s>rz?p8Y)5Px|MtQ$f(cLFwMMEfyDV}ol5WH6m
zr@p|btzb)t{iA#U(6X~D+*h+4erdm>_7arO^DOQ?*^uz0a`_6IgmvhFeSqx>l<mQb
zScuF60Rj5}CsWgolX+|$s=R-a%J$`ia_uE##5Mxq8{)7N^)i79x`#xT1pl!7wmnhY
zVp{Qx**Ekh7QGFZi@t3H3H+GPczS-8-_$?43k4;)Zw#^{j}BLRljKWqlDs;s;@I_9
z6OO~V)U!Nf*8`lIkT&Q<_XobeMHnrM{Hn!}IqdwZxCP|mRI1Ev3#xed6OR*Yi2K&v
zfI65~nph-esFl)bqDV)x5z_BeQd-(s=RD!P0LGn7Y|7>fEW`WDEmajv5y_aA1B4el
zF8vMt-00W4$SM;Z9cmI9uC28Fxk5GL^L*W4RBtgzfR~}8NGFR4({JmOiJfHq7f4#O
z#?tXqbI|dDIUe#VML+x>;gf_q`v0L~9IV!siJAE+Nd8r$vrVZU6x9nPsInKmecRB}
z%S)7XzW$XNID`mgq>zhI;ru#%P(rfhsQ7#N!+FrxwfR?7)E8<n5N7o$WRax&o^7b^
z?-}Cqva+s9%a+&lGXL0wQfmI+8c1Ej!J#1)ykU-yY4?qU-oJmpi|4ab->9|_=iNN)
zWP%xVjzq-0hH_TLq9pKi|E#?{SMhXz5t@frD8^xE1i~^;9fO${*Fu(^n16AD%lmGt
z&GQtaG2<)f2!eSGxnpSPOi)cE)m!Yx(fT_K&Au3|SI5d<Y9pz}BqiJL!JvVsw@;Ch
z^Jz<era|DW>H7hLY>NtAh_*nVoQ5x7h{?&ZMsraE3C55rTn+j=w_Y)3hzHn$7LW(&
zZbxbPtsO(s^^j=qb_^*E7Xa|fe>G0peHq}|dZ^mos_*>7(na*=&jCX1*{W{jt@lX#
zV^(p?_cE3c$bnW=mLFDD<uI!cBq=%NcHuOUv=#NToeFwq!7d{B;a;^eQavzxl=jn=
zF8N|@67-4^_3{;N90F+$fA!0Ca%%ebj#iq!nZ<{X%*>5Fdo=3Br+Xi0{SJC0UH!n%
zf-S#gW^%M*g=xpf$N!-6<Vvcl5@e_WdUsn#%tA!K2$8Bq(7d-GHh*4R8Ts?XJRhhN
zxH~E}&LfOg{vsfM9bpiCV)2Qlm=>^^m3ae{){bLQ8~EvtC?$6`gTxg&IH<Q^Q7~sr
z%?Tq_yVz{5d|(Q@U&7%R`RlJwmUQ+in>>z#wew^&rEt?H%8jpnW11J*Pd2P#xn)hI
zh(6;t-?F`^h=h=YN)fN`J+bWX+5%6p;~DJiC11<Nb!dlvc2(EhU)&?5Vxu!`hrtwM
z?6dpsnwXfFH+z=`vr>gZ`us1?JnU&v8(LD9ty^hTI(d%+AFZ7vDdN?&7BtFJ8a;5x
zzvz8v+lS7mbyRi*(y*Hm;P_!WS&wcdoiGmR8yUTGo+#Ruk-(Jd;m*cSISDy3KdpNW
z;N?ceB|R#>SgV#$a-_T`_pkpGwEiqqe`NBTzfEns>;KhFS{w}Tn(*m%oc`aw%KzHf
zRL|1-dTtRD6Q>SS!Jzbv_;H}1SdQedup17$v(>4S^^PMvM#2P`Qs4mgAxwgaiAf|u
z?nr$Svx{s;qBZ`mv<%c6%4IuQVz5GKkcags8o37}GjH+~`r8*Lj35Gr7hTiw0QcF7
z({h>{LG1<K)=>z?Fw}E73TpXwfN`nk2cx(R1~p~=&H8O2cI5hy8?eOKcMF<d+T)6|
z&h*`hny6DoMi-f2O}*QdwreSi-sOiN$lWg3<LAl3&!sCvMv#Cye6umP31hp4D=oi>
z%3d0rd#3Le=UAO4QuBE19f`eUdwVVPJilQb#mJw8yEu&!{RjY%R}!XL9VbM)WsZ8T
zyF{w4<!tPg3ol2_(j%4+4v4Pi;a~6P#0Xna$gn0GVaHAub+*ghwIQS^wc>Wqbxp7r
zd+<oEyv=~1U?Yvlm!^bFmYB$0?hz60sc<}y{P}sO%KG<@n5_pl{5d-on90m@qhmV2
zu#sr;rFF)=fpW8|p7+dm*0vgaa9mRghYT>8&74v35&-Nt;YC`ohz{P!r|?U^o3wR7
zt%St(?-X^%{^_Jv@B;Tzz}=9p0SiY*o+zU{EZ-mY(Tcp*__fJSd=>W{;VQq|j1-Y)
z4$&L5VEi7n1a~<2&oK9F);tP3+LMA$(*hzQA}9cZc?!rcR&Yb*X<#m1pM-Gf&9v(2
zagSW;&(m!>!-yl@-W7u|c9sf7RO%y66qJ<Ag*S~&OdK?T&1GdjCxL&JkQA4GkJkll
zN343lHT8X0oEEPvJJ`y_7As>-FCd0mN%kIzcjXlmsBy)yZ|P7ws+~2O&K7u&k$}7|
zNnefanlGG4xFa;XQPY8SzB;$7OX-UMHJDN9^3bOfu;~W2XN^rf>k+@<dAZTyDo?PP
zrz8;WO^0{edndn_w3wYKDEJQiW{oo$CFfBU3ZMNjuzCo)E3TLE9AnTIX7RxFk+Fv$
z#^H?|{(Sn)24UU3Y?|Ps+~AoHvz*b3DH;EzY|%BXM#h)T{0@IWA?TC-cgIwu4WVbt
zqGri~x!TDUeg~>QyWPH_sjY1s2JNM+IsGdbW~g$4ZR4Wr7dV_{dwY9ihv`jgK|vRs
zR9ku5%-C4YCav;Wh^ubT3aQTv3m%;5l#lPhbxm<@*W|6vynfDmo`Sp6ZZ0m}uqW@r
zHq6Y-dRv24RY^96vREHp_Y3FMSt`ihS^X16-g&%vJ$!ZSwt^an+FYEHbqe;qK90mt
zw<XuZ;ih+4Nc)G)))$mSpbZPS?8TdcXobhD>3+&Jkc-z-RbRhS^$iRTdV|~b@<5I5
zD@ux1RaR}km4JYF9(f9YwBJ4#{*FQbP&n(P<(dfDw6<R27RZ*l4p{9g?Pw^X0sb0F
zLGTf3>gk=v{KYJ(;~*a&jCm5oz`&-F-gLWV(Y1RR5{gE9BRxCG*JY|((HE89`H}lL
zRyp*+^}dDG)ov{!s0CwTVL<>OE^ok2i(5*}dEj~qP9Q6vNrz>M#AoYYrMW$plA7_r
z>FL(zg-B8P9$mIj0sMDa%`VU($Hn40JDePZ6r1ies)`;JNbkb}BsNz*K)THBk%B3D
zB!`mWhHQ!3qjmvQR(vRUGJnYL_KoB(;&cWHcX8_@pq&Ri!Wb1I{sNw-SbmhpGavxJ
zWT-(xGv~${5(1W=4=U#8rN@BFN64bFlT!KO1-v#O-JPudgJ^6dmHJ-Ci=)B_?Bsz6
zw!gohz_QwZKBOGYPJl;45={MAf_m@3l||`4ZA<df)3;c0co$p-KRNt_9^63vz|NQ3
z9Kx?_&{<hoxPrWmjTdT|p$$JU)X1#!<*QexME!wFrRCQ5F$BvWkKewL5|s60{@mIs
z$1DEe!9;brJ_ds!c+(buc~1!iNPBPTD=wwqv*VgjIFATMFq(COE~`2?pG48_ztBYf
z`N~$-%Ll{3k8dje1&-=sH<ZmJenhixZpC<)sT9bG&Hk59he-VY@$A?FfOLE>HwH5b
z0UhO42-McZ>@(<7m&CT~Y5;X~`itT0$0u#LGRCdEl8cDKfEwx%8Yl<d_9XfM3Cs(*
zYTA7v-4#PF{28?wV$+5{V4`oG>@E0tqPNDjknIY8-wjhifLktoS#?I8lp}x!8jKjD
z5!)l)hJ}i7ESwWHFeU8Sw~$h7O&?0{GC*S__gF6@oBWcuyXCb>TM<9(#}Ba3Y=e<L
zq!JMgDl0E1kOsbW!sNKV6UWZAj<tjtBsx>Y5i~8jI&|xwu6&ViCIH-@pZ?(H*Kg20
z%xZ^MYlkJ;%Ey=1no`k5dN}!)BgOC?@j%oq?VS6>j`Kyl1|bP-kH>wXr`P9@s20&2
z+U19d+ea55l<z{B-rDkq;HxEgfhfh1_ObL)1IyS*41CTS%#_kD82~jp4*L|e!12dm
zb0MN61Y)Gs(W`+ol9WvMK3xn(>Y^G_xoFO$^Yx;q*m7C5B}!Lzc77beQ}&}&5RAwC
z1RZY1*aVGHGq3G&Aqe6lwzn#8^kQCFcDU?#Z_@0z>%hvpd}7s=V`odqqXIGE;(s~G
z*b#k#J_bHtN%7XU=?k^>c%k|LODq07dVNG8L5Py|w_mxbO@CL!?8!z}{C>Lxu%7%e
zGXeB$M1KFb6#T4Wpxy7i#q&>|+DJ(Teb5P1b}F);k=C{+b~6z-E&(G_B$qhPy#?r5
zC^|p8lW_4RulE@4Ol)@{7y`Xq;($)jCq@U<o$IOq5;Ue~2K;1hcpB!_eava&?9iUd
zyn;LHT=4@(aJ_-SJDLam4LW*S=ixz2K<Us-6TRi*k1h95UuY8*Iys=j)WC?V1JjD+
zva0>y$N9+oQLuu0T*`Rt_&7#H)bb$Obf_9>eT^)##Xm9yn?#XRBFSVOx-##tjv&_@
zPR>u#rcJ$_UAhm<D!q+?PEx=<Had^g-Hh*vIr4+_6$Hw_?<IMzJ^05LEUp-`;>Cs;
zCrzF1CoB1g`mmqY%*kR#pQw0l{{FS|w&+qsauOgr24SzJC|RD{aRpg=>6}y48;U+!
zb*54+LRb;4{a_ny%<3^+L&~bmn|$+-imT}B<&oOY8AlxDUd7kj?3~a8ay!-nu@@B<
z=x=S!gpr^~0)CGKsGY8ESGl#p7T)uW#zUR@gjA-R&<CF2Iwh!Z%>-@uOS~?BpC-4M
zKL{rQaMkLS>)kt&d^c=y!DL6zQ?Fw*l*rw^^kh@GO__S@Q#7CK`?pbrGg8b1F73Y<
z64Sg?%zF7l^%h)%j3022$8V>lrID^Vym%o~gsg%3DO$~B@Axy{jht&PXvFC{0i?IS
zUKKiYBV_XlmP=GH9QR@G-&4%|wqw?GaS<J#n8?3!J<Pp?FL78I7_0=GZ}r2l+cet>
zxN?ZbRMlDD2+_<nJZ}#hZXQ<}Wq=1k%T7d27}gU*UQO|xL@?L^gV>Aw*C)e2sDw!V
zlwQ!>%+VGY==MY=@Z@#+_z6nO`TItkV!Qpp(YDv{%U-&Nyte6Mg=&ymHzeXCYGA2Q
zEdhZS`bU>PuQ?CK5ut;%F0E~r%QJvMCyT4VlCTr^-*WDsP9?3+P@Fp`pEq(mJ1+&o
zXTwe;zv{NdYQvz^<;>y&gnw_iG46Dk|AU*b3{?zQzqxXBVR%#Wb<@$KwAXlC<73cp
z=hpwF>?YN^h&`9O_~OVCY~L9F-tOS`)->aNjA%Qph^VLzLFfa=;o0EANj!hY1n|dG
zT<5$uw^RDwgJdY+U`71(uA}2E;a<snf{>%$Y~_>7^SuQ^rK|6k7deub_au}Wa<_5{
zu8B0JKN{(u?52i#Pk&sR87n)U43ZAy=E=UK{<)u9ZgD!-{LTimxAuDR$qu#CNaO2+
zt``YYCXD^z4}b=dH|=9T*F9-|<1pe%-lwO@x%Pmk&E??N$-_TKhW2euBo2Nfm`^*h
z7mrdZ%oFf6tq3U!-Goy)_0K2e98?SZ&g)Cx{7f7=k*_iYN$O>IiIEnMYkr$}Q4z1S
z-=lIxqW?RueJ6s|_KNKXCG;X*ac)KNxYWXn?h_Elo*{M373T<|oUJ@6R3HT0ce`p5
z#~NhO0_;U|W18y^7N&g#%zfDrK`(RfUs1po;0Xo`6tV4HEyHD4S$>`bwL^co_+2~v
zI26->;5>$Fz5N0eI9zBw(DHjK`y=VG;hR6GUmkDEHb5D$AO|(~;}Q#l^RYbKpaz@X
z(eju&&u&hx%q^EhNJb6wur|zzNQ)nT(!WEVv#~v<RX?r-h7iAw(VZMi$dOrT+;85=
zP9dyYJWqywdF?Q}49>2+X2BU&kzrjVtJ<#ujEk_f_^yw<_}%PW*Ib^}lJMxIt~~lH
zM1a0j6`=3D)D3r79`O6u6>ZSXLRGM87{W^p<~sD`HSQ&m>nj(jx*F!4B>TE2kLc?O
zoQKrX!xU2=&+0&-Z3R}kIy&_}*S<O-o$DXM!jkMlSa-2vobDvoqV^eekqS2&g<e+R
zJ!xV<PaLPChWzp7NW<Ffn#-VxC%V^%P^9zu+IocnRn{nCvBT-W<7<}LvW2KNm=kBe
zbm;|Q5)=va)rz{uA@2`NBoAYcx4Rh*cTJTj$cD>h4Q+muZ~1iT8u(T#@a;Z8jPFb;
z^tZgeD_h`)?Gq*zmfJ5^=in|`r2#i}GS?n_!%sr!8RO4|^z!Ic?pu!^EA~G>zB%a!
zxq#gpU78w?r<Tk;zsq}@!Qn;$P~+Wj=T=>U?HY0d*xo9NJoTWEFVw(O>7|AIE$$W0
zA0#%r96^-~7Z<kj0cgcn&t{@Q^2Q$}IaFLg3vibQE};3n-Z;+950M2z!avkx#T+yJ
zIG}cqo_=sFNGQkcB|IzC;E|KDZr$9|7#MA+^4k@;<wCcVTQ}J7E9slyjc3P5AnB4n
zq5q{YAebRBWC)nspwy#wcosx8XAqmM@VWzi0r^p2B_xuYn4pqcw&k_b^<75z=-L+?
zVx>V|)V}OtBlAsUr0MNdrQ@@)OqKxN=A8`F3CB;<K}5H1-6}%8a&r1JB~*}KB9PBu
ztwS#1C-$vKlp<$gTF9t)X3OW30GLYYf+W8El10PWs<uDClL9qeH=>>Hv&h5?MEG>Q
zZuRjWh_#Tt(@Zi4o+L4r0|7@y(&=jkSJ(6AZE3oKJg>eHth*sx--RjQy+X|wF9<^K
z_-Hc0YCKE#Ebjqkw_t|=MN}x2$WuMo&dH`ys?kl*+sPVnZD+xo0adWQUrmgmZ&vA}
z_c%E?zIkox#sU?Vifvf#T^SWTHQj8wMsWQc&;kHnZ8S;HZd@A&oB~RFeNiZyg2TCy
zpq=o!l7>B}q=b%|doY^>xv*qz+0nMThfeb}ESTG!l&qfL?gbfWZBOmoeBSs+4|yK|
zk(t(LT~NrhY)3r-bPPsZlLOAMwuPkuGnJO*Yio71-@vaxFAWV1M}PgI0`&FwcjB49
zPjj`73r7MTNMxE_f3oj!#zjron`87qgNRhKF3%FfWd4u1u%r#=nTUBFr$9Cn0yKKB
z2Oeb*C4UsnJw=ju97S!8b~{~-z;9;W!S+FPks=%Ia`yS!`uZ&|uVpECV&TtY|Lm4=
zkyyvw^yk?X@{yQw9(0C&>p#H(8ta(-M|kEy^8g{>ef$?lFDRNZ;o49wl6*YN2mm~0
zym>ZQY~M?h{brLJl54qkX+y|@Np@G(=42JSWNZsqTys>f9>$u`+T#0vo;61rc(Si_
zfX<gT;WYAl%BDIJbd_A-22wq*tbbhKlS6Lt7lwS3+H2Xm8IKlvp*PnALLBe?`BMmY
zrkGr;@-Hac6;ZXv5CF2vd{*Y??WC>FiF@MvyK~!GB%~MHU!!KX4v0~Aw=zc((!kzA
z+HOHb`TOaRW~~`;(9C?Sm?fsSI*i>=6Pf>HpyyYub(g;@slI0~H#}4S5TbC}vh7jq
zqItEIk+4|A^z}l>y^M2X{)!96LC7I{la=!d3(5_?Qos#Z$6D%axraZ@6LBh$WtntR
z%1B(oMmF0u-xTE3qT0gW11QXgGb9Lv{C>Tyq2~OWxJCE;b}*$hL*vzr`Jv76KMjd8
zf${GuJR^DJ17MP0?qni^xU^h#m7y3%MU11lr`Jt<$uF}?$%;Dx582vjOPZS4b#!#L
z=4y*0Dri2Jmi9~Wa*OI_C9u%%h3`cAY-i5e==7zE&GtO4m4GhF$d;w*>RJ%pXXxm4
zK{{EGgcg3!ar^i&`XV%W;@4803T7D3hX_@M#{m_1Wc~JIvB^y^{1Et%3n?Jw)2F9L
z=8-uYgyB-mZI}8BK48Y0AEEfGL-nPa!i`|G0IZn<aAUmshq}%)wz1wPKc77**-z`(
zcb%;laCOJIjHn!}vhj&ry`aKl<-1!@A0|O<vQTFMhNO52V0i(sWl)Vy3`=iWVg16+
zJ4pSJ0jK`euq~6CeoqX6t*}TxffdWZAF=Xwy9~~rrQf%g7_pVjPPqhG3L%K{Z{PIU
z@7acrgomDRGRE=4Nn1C({w#Nv6arg@gufh&CR$3=#}IMSQaqv&gl{{I(OMf2p~o+}
zoAtgE4pY-D47INziRFTrLa(T!uMOX%L8-~;i61)zkFjYBMpv4fnz8`S*pt{ZGcy6^
zGnkr*AfkYqg0X_eDFR1zW4dY&fiOk|>X6$NMDIq{&Qf#0E+E}s<a>wy&)>KtSPh!U
z$5jNA)Pqf?;gQlmcIRp>U(HmS;Dc}XY{A}A{oHc?bTKh8-;RbiqlbjwPZ*{ratIJk
z%s0#2PGujJ`lxyX`qq00`>b5`mI>9|uE$<>W-)Kmp7>>jUk*m|>T^+1^X)rnWzD=O
zQn!%bckH6z5~*@Ijvcn0{*z?iqfa92P1{J->D)i&$F)PBt&Vae!)n2@o!{)A<+@i{
z#nq=JC7pGTF3=J4Exk`)mVrI@syG*W@i1GimG~d;EDwJnwv8p4A^2Vd4~)20$+2K*
zcQS8KX&Mu<$Rhzq+y6W|O6fPrcVt=2^ziBn5>1*+o0@h>D@8h!=99+=4d=;n-&Z&t
zW!Y^G)&%>k^UO2A5%C3hMu3h#PWM9BNlAS(>R&PD8vw!Q!I1eo?4{z6Ji4d<q80b^
z8#tHTaY5GxhZzz1YHjZfJa#RK7X!kuM`&jy@Xg9a+1!}z^92njCq?j0a{QFrj4JQ7
zu9R3f+Fq0H5T?et!}obh#GmHT5z5sqQ+H2c%3yCacg)Uks6c8QObD=nB<I{~RUSip
zOvO%bF*1<Tiux<}|KxbTDvY4Y%=;wC^ta%itx}{bm`euz2+&b&caZfnf#vTl`*3J|
zz(?fHF^7)C&!6!tN9!`mJ{$-}89X)NSMb5DIy)mH=I2k%LK6;K6}!U9tM@&scXc(#
z7bY1v{7^em`>(;uugKQ{01ErRxd7w-ffxs12t#{o&5O4?A%m6`T%cXaj5}4klz`x(
z<DZ$tJuTKrHP`PjY(6{M_}DbRurR6FSIZ9!fSHlpxa4F8V^h;ijt>&$?I-W+JA^xS
zSFCW|$(TF6TGI`0uF2;b_mPQ94GH2o$!K|`r}FBX6tij0vXRlaXp~1Jo_AmCxJX9e
z^&IB#Rkb{U3m~PByai=IqPM0C@c5@r+pjI@ZL;`>Es^Z_&Ye4lNn86tYi*<|-n6@1
zgipt2qq|+O8o)Ogg)lRS_sH&~+poFkpNE|omD538DCTemwcv3{NkMV9O~-C~{7dUD
zl6-rtqWeH@G&3Opm#8hW{s}{m%b`vnh>=j3byzlN7=HLH$A(2%NMlNmL);A6zY5XU
zhrLE3<WT`Pb+e<V%FXQXJS|Jz`#vSGLcoR{$#*+N#lZBcHmcXBXM~uXiH7+g^~+_+
zlD?iWDt7(GL*kZRU<tk_k%3gv+KT<+yx{pNt#7aA?yI%<9)7Oc3s&h$9Gr}9wh>F{
zwL7!v%Ue3VadncWVlxx*efN9%WP_;!8$Mv5sj3>8kFCR#!33e=H=g0Cdm%eTT6uKh
z{gA65yc?(#l=oFS#t->shMqB63g`ZAq|>Q|pJgf3_aMOF-myq1Gx%8K2Bu<c=0QF_
zyuSX)%&PN845Q9e8}!0AB`wXa`#rOHtN%T~4iy=|wSCoBVZs-cr@(`mBC)r>+$>Zs
z?t;fu*$eSi+j8}Z{ZPm`$r~fTsyo!f2aG)k6qS|VrI0o|?6;eMF?Y@Dz!!I!@MB56
zi;lJDm<+j_S=8#%`@@SqIcq1U!0~uvXncP8A$8oQXd6Y36hDIzUci=_=h2YMhF2D2
zp8Na^$$`=w#19`n6fr8+B?dentG`pEn}c#<^1k41xPua#X*p=!sR_J(wS)Nf#fpQ@
zgXm6g2!NNbiS*g9CHP8WCpa$7Q)Q-dyv|{K)PJd_S(*eKW@us(f#>hFP}TE6faMEI
z3lA#A!{W`cOP>b}Em3(=i?>17mtI^7!CV0S0JKOvP$7Oq;hGEYNXFMcA*uI)oVlt}
z%`ktM{ERnz*7E)5@cE!6=%%Hal~rzCx&HSkTEDi_rNEzVW))q52W^`cn<>HHaHsye
zSyz|8rO3rR#1rSk(a~rIIYmN#8E>>BeD^Zy1CcPbFq`hdb+;SC^U%}eR$n=Fu##%5
z8oo|AI97rmP-f=F7Dyb$L8HX@@A)y2r#8lTgp|6sXLVQt!KQYLbFjD>xS~O^8qiW~
zcwg80p}&4=TCsK|g?#PCbZnOL#;cgmh_CRZpuaEzW<iu&Z;s^9JeBxQp!|d<=^5Z4
z(aE%Oy=W>t;jiY)Nyg_vfydPUmYwr&5ifdqY6bTm!eBp?X}c*Cngp&s!2ZQ)zAYF7
z`nDan{NORzJRUn)9Narf8wecjV5b$q8Ma(h$XZ_egf@Yn4U4Eu?3=_3W6&0UE_Oy8
z!z$1IsXj*Qtk`ADfY`i7b*CP0;s%ArJyq#tee#>S-Jn%Jh}v^L)N%a{)Wv@R)=;uo
z-=0$r9rqLrItbh%1-MvNT5k|`m{rQ4gHZ)brJuZlW2g6_e`XIJEh~9Z{v9qNXys>y
z(CiapMI0Tr^CzA?4%nhmqRl=GWf(M0lqXWmYWnOuBMEe|<f9~dvXJ-MsWtrAr#Q&D
z+G{>%CY91OjU87MS?lytS_>zEo%h5qQ3Se3rY@U%yckh6wvJ|pK{6qNOf<CyiN3wM
zpSUSS7zcgo*9WgCh`44=-Iz)%W3X@kv!NxSVb*{jE8-;BELSzHYB<6rsHB-+rNyg?
z8+*H8FYFVgFDw>yx|gGgBO^1#OK3&_4OPT1d6#c1d2Ym_(d;y_JI8iC8@MV(i>%6u
z_rbaE#YjQN-;lc~esN)(z-WDZ37ThoE<2pBV}YX`8$;LQcKv5&iX3(pbnb5Na3tPY
zzkQ(OjIOoAqV9J<zek;?)(fAN*4PExanIMmTbnD*N8MifoMY!FX|)HYXRef0%YlDr
zfy&rsJ4FjEJ!``N^vyNRCJOv}M+q_ac^%U!^+*pSK8Qo&TN(G}XwlUA0Vjw`4J6t<
z%Qil9QoCvi$x5xL;)$+Tg2;a3)WY%|5PE)jPW*+hrV}D-khhGwcs^M&qb6gm14S+5
z1Ght6K9}r#tf-253SAVNHL0rfaS@fbDZ3E-qoPn%DH$ZZ@ymzvxfSaPEi!Czv!KDM
z@c>_d&&EMnz^bH{>`WDQznA=-s^`fmwVF~_P=N|J#f{DbQVO`$?%$v<bO-%zk(Mbg
zcs9zQJ@bJDfpuT_<c8f%tU>LIX&eQB3OF51*OkBY=D|L`QzIlhF8W2ceij|TQh;Gm
zvV0Jq1wjVzrVS@!t&lmJ#E0_srV{+0@z^LS!swmjNWTpS5&h-`yd_m?Sq=3e#Rsj5
z5m0R82C-2V-KZ;gzM7|e=x-N_7jH*TBr8DwbTK9+c`tuDn#h+ufo1P4-K@{@-vo_?
zLg3V3Nmq3CeIC)@iqiiST9l8JX5g)L`77IhPpcCsh#|Mjz{fG>ba(|_ZHVwmcK>F^
z|0SIydh33xuj?l1qc(c<O0D_;y%HJS6C&e>dsZsiO5&i-n^_5UTzuhVN*sw2pD2e!
zgMk%)jhW(?YXbu+i*Ec4*&H!rQGv=Uv6Y`sb!=@57<TccO{0>q0_W4)`WaE_lqHUu
zZh)(ef=57?#|CN4t4~}TEY4T8{BjY;tc!ov(-f6%Tp||t8&dG(X1px@xW=d?uZuC`
zYY@!ZAOW8J$v_{^b^?~s+XDn|a9GRj0pW0O8gFX#S7J%J4IE#eOBCK$4hU#=do%u7
z8HXqAU1suF&Y78+Q=RCQc8iS`NtwjD@KR9U?3&z>u3MGs?1AnoaudXqsAb_@#l+!v
zu0)@6Q><k9pho2bQqznND{fWgEHB-S4JC^a^``EVz121&T}Lv};8%t;Pk2-z2HY0J
zB*EfC2iF*tWLW5ZI{CRnA6bA5*$C(vEVfh?y=Gk8OAC45!ULIKwnYbj&6JL#r{k+u
znJu?|#yIZVi=MWa!!StP;1`6GIV<ve8e}E<wyMFbsvZIF6vr{s4-4}MEf)^|T_%5K
z=F>p}`5^O0fMszt5cM<N^c3z50e5_e^#4%6xJSoqB#zy@U><sEr4h@9&U(BCzn4h8
zh`iuTn)d(kC>3t3;^kFK8CrmYYbDUx($cFa-k>KZ2ZKLz?^I6&eT~FV?nuI3@kRwb
zxy;8yGCUL8_kFUEt;;E#-bZznFT78<tTe+}E<Dj`%UJI_qmnJ<e@RTb3?Y7Yk&+iW
S8IDgm256}0f-9A*!~O%AM}xNj

diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
index c5b9f16bc9..31c0e70939 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/MKUltra.dm
@@ -131,7 +131,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
 
 /datum/reagent/fermi/enthrall
 	name = "MKUltra"
-	id = "enthrall"
 	description = "A forbidden deep red mixture that increases a person's succeptability to another's words. When taken by the creator, it will enhance the draw of their voice to those affected by it."
 	color = "#660015" // rgb: , 0, 255
 	taste_description = "synthetic chocolate, a base tone of alcohol, and high notes of roses"
@@ -149,7 +148,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
 
 /datum/reagent/fermi/enthrall/test
 	name = "MKUltraTest"
-	id = "enthrallTest"
 	description = "A forbidden deep red mixture that makes you like Fermis a little too much. Unobtainable and due to be removed from the wiki."
 	data = list("creatorID" = "honkatonkbramblesnatch", "creatorGender" = "Mistress", "creatorName" = "Fermis Yakumo")
 	creatorID  = "honkatonkbramblesnatch"//ckey
@@ -158,7 +156,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
 	purity = 1
 
 /datum/reagent/fermi/enthrall/test/on_new()
-	id = "enthrall"
 	..()
 	creator = get_mob_by_key(creatorID)
 
@@ -227,7 +224,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
 			if(M.has_status_effect(STATUS_EFFECT_INLOVE))
 				return
 			if((C in viewers(7, get_turf(M))) && (C.client))
-				M.reagents.remove_reagent(id, volume)
+				M.reagents.del_reagent(type)
 				FallInLove(C, M)
 			return
 
@@ -280,7 +277,6 @@ Creating a chem with a low purity will make you permanently fall in love with so
 //Creates a gas cloud when the reaction blows up, causing everyone in it to fall in love with someone/something while it's in their system.
 /datum/reagent/fermi/enthrallExplo//Created in a gas cloud when it explodes
 	name = "Gaseous MKUltra"
-	id = "enthrallExplo"
 	description = "A forbidden deep red gas that overwhelms a foreign body, causing the person they next lay their eyes on to become more interesting. Studies have shown that people are 66% more likely to make friends with this in the air. Produced when MKUltra explodes."
 	color = "#2C051A" // rgb: , 0, 255
 	metabolization_rate = 0.1
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
index 0e53225aff..87615ccb68 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/SDGF.dm
@@ -39,7 +39,6 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 //Clone serum #chemClone
 /datum/reagent/fermi/SDGF //vars, mostly only care about keeping track if there's a player in the clone or not.
 	name = "synthetic-derived growth factor"
-	id = "SDGF"
 	description = "A rapidly diving mass of Embryonic stem cells. These cells are missing a nucleus and quickly replicate a host’s DNA before growing to form an almost perfect clone of the host. In some cases neural replication takes longer, though the underlying reason underneath has yet to be determined."
 	color = "#a502e0" // rgb: 96, 0, 255
 	var/playerClone = FALSE
@@ -123,7 +122,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 
 				//Transfer remaining reagent to clone. I think around 30u will make a healthy clone, otherwise they'll have clone damage, blood loss, brain damage and hunger.
 				SM.reagents.add_reagent(/datum/reagent/fermi/SDGFheal, volume)
-				M.reagents.remove_reagent(id, volume)
+				M.reagents.remove_reagent(type, volume)
 				log_game("FERMICHEM: [volume]u of SDGFheal has been transferred to the clone")
 				SSblackbox.record_feedback("tally", "fermi_chem", 1, "Sentient clones made")
 				return ..()
@@ -141,7 +140,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 							M.adjustBruteLoss(-1, 0)
 							M.adjustFireLoss(-1, 0)
 							M.heal_bodypart_damage(1,1)
-							M.reagents.remove_reagent(id, 1)//faster rate of loss.
+							M.reagents.remove_reagent(type, 1)//faster rate of loss.
 				else //If there's no ghosts, but they've made a large amount, then proceed to make flavourful clone, where you become fat and useless until you split.
 					switch(current_cycle)
 						if(21)
@@ -185,7 +184,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 							log_game("FERMICHEM: [M] ckey: [M.key] has created a mindless clone of themselves")
 							SSblackbox.record_feedback("tally", "fermi_chem", 1, "Braindead clones made")
 						if(87 to INFINITY)
-							M.reagents.remove_reagent(id, volume)//removes SGDF on completion. Has to do it this way because of how i've coded it. If some madlab gets over 1k of SDGF, they can have the clone healing.
+							M.reagents.remove_reagent(type, volume)//removes SGDF on completion. Has to do it this way because of how i've coded it. If some madlab gets over 1k of SDGF, they can have the clone healing.
 
 
 	..()
@@ -266,17 +265,16 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 
 		//Transfer remaining reagent to clone. I think around 30u will make a healthy clone, otherwise they'll have clone damage, blood loss, brain damage and hunger.
 		SM.reagents.add_reagent(/datum/reagent/fermi/SDGFheal, volume)
-		M.reagents.remove_reagent(id, volume)
-
+		log_combat(M, M, "SDGF clone-vived", src)
+		M.reagents.del_reagent(type)
 		SM.updatehealth()
 		SM.emote("gasp")
-		log_combat(M, M, "SDGF clone-vived", src)
+		return
 	..()
 
 //Unobtainable, used in clone spawn.
 /datum/reagent/fermi/SDGFheal
 	name = "synthetic-derived healing factor"
-	id = "SDGFheal"
 	description = "Leftover SDGF is transferred into the resulting clone, which quickly heals up the stresses from suddenly splitting. Restores blood, nutrition, and repaires brain and clone damage quickly. Only obtainable from using excess SDGF, and only enters the cloned body."
 	metabolization_rate = 0.8
 	can_synth = FALSE
@@ -292,7 +290,6 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 //Unobtainable, used if SDGF is impure but not too impure
 /datum/reagent/impure/SDGFtox
 	name = "Synthetic-derived apoptosis factor"
-	id = "SDGFtox"
 	description = "Impure synthetic-derived growth factor causes certain cells to undergo cell death, causing clone damage, and damaging blood cells."//i.e. tell me please, figure it's a good way to get pinged for bugfixes.
 	metabolization_rate = 1
 	can_synth = FALSE
@@ -305,7 +302,6 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 //Fail state of SDGF
 /datum/reagent/impure/SDZF
 	name = "synthetic-derived zombie factor"
-	id = "SDZF"
 	description = "A horribly peverse mass of Embryonic stem cells made real by the hands of a failed chemist. Emulates normal synthetic-derived growth factor, but produces a hostile zombie at the end of it."
 	color = "#a502e0" // rgb: 96, 0, 255
 	metabolization_rate = 0.2 * REAGENTS_METABOLISM
@@ -352,7 +348,7 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 				ZI.name = M.real_name
 				ZI.desc = "[M]'s clone, gone horribly wrong."
 				log_game("FERMICHEM: [M] ckey: [M.key]'s clone has become a horrifying zombie instead")
-				M.reagents.remove_reagent(id, 20)
+				M.reagents.remove_reagent(type, 20)
 
 			else//easier to deal with
 				to_chat(M, "<span class='notice'>The pentetic acid seems to have stopped the decay for now, clumping up the cells into a horrifying tumour!</span>")
@@ -362,12 +358,12 @@ IMPORTANT FACTORS TO CONSIDER WHILE BALANCING
 				S.name = "Living teratoma"
 				S.real_name = "Living teratoma"//horrifying!!
 				S.rabid = 1//Make them an angery boi
-				M.reagents.remove_reagent(id, volume)
+				M.reagents.remove_reagent(type, volume)
 				to_chat(M, "<span class='warning'>A large glob of the tumour suddenly splits itself from your body. You feel grossed out and slimey...</span>")
 				log_game("FERMICHEM: [M] ckey: [M.key]'s clone has become a horrifying teratoma instead")
 				SSblackbox.record_feedback("tally", "fermi_chem", 1, "Zombie clones made!")
 
 		if(87 to INFINITY)
 			M.adjustToxLoss(2, 0)
-			M.reagents.remove_reagent(id, 1)
+			M.reagents.remove_reagent(type, 1)
 	..()
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
index 8f267e58c7..f60f58da93 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm
@@ -15,7 +15,6 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die
 
 /datum/reagent/fermi/astral // Gives you the ability to astral project for a moment!
 	name = "Astrogen"
-	id = "astral"
 	description = "An opalescent murky liquid that is said to distort your soul from your being."
 	color = "#A080H4" // rgb: , 0, 255
 	taste_description = "your mind"
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
index 91b65af869..6262dc1a28 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
@@ -11,7 +11,6 @@
 
 /datum/reagent/fermi/eigenstate
 	name = "Eigenstasium"
-	id = "eigenstate"
 	description = "A strange mixture formed from a controlled reaction of bluespace with plasma, that causes localised eigenstate fluxuations within the patient"
 	taste_description = "wiggly cosmic dust."
 	color = "#5020F4" // rgb: 50, 20, 255
@@ -169,7 +168,7 @@
 
 	if(prob(20))
 		do_sparks(5,FALSE,M)
-	SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "[id]_overdose")//holdover until above fix works
+	SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "[type]_overdose")//holdover until above fix works
 	..()
 
 /datum/reagent/fermi/eigenstate/reaction_turf(turf/T, reac_volume)
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
index 0b686d1a34..8e1b879448 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
@@ -20,7 +20,6 @@
 
 /datum/reagent/fermi/breast_enlarger
 	name = "Succubus milk"
-	id = "breast_enlarger"
 	description = "A volatile collodial mixture derived from milk that encourages mammary production via a potent estrogen mix."
 	color = "#E60584" // rgb: 96, 0, 255
 	taste_description = "a milky ice cream like flavour."
@@ -124,7 +123,6 @@
 
 /datum/reagent/fermi/BEsmaller
 	name = "Modesty milk"
-	id = "BEsmaller"
 	description = "A volatile collodial mixture derived from milk that encourages mammary reduction via a potent estrogen mix. Produced by reacting impure Succubus milk."
 	color = "#E60584" // rgb: 96, 0, 255
 	taste_description = "a milky ice cream like flavour."
@@ -147,7 +145,6 @@
 
 /datum/reagent/fermi/BEsmaller_hypo
 	name = "Rectify milk" //Rectify
-	id = "BEsmaller_hypo"
 	color = "#E60584"
 	taste_description = "a milky ice cream like flavour."
 	metabolization_rate = 0.25
@@ -186,7 +183,6 @@
 //Since someone else made this in the time it took me to PR it, I merged them.
 /datum/reagent/fermi/penis_enlarger // Due to popular demand...!
 	name = "Incubus draft"
-	id = "penis_enlarger"
 	description = "A volatile collodial mixture derived from various masculine solutions that encourages a larger gentleman's package via a potent testosterone mix, formula derived from a collaboration from Fermichem  and Doctor Ronald Hyatt, who is well known for his phallus palace." //The toxic masculinity thing is a joke because I thought it would be funny to include it in the reagents, but I don't think many would find it funny? dumb
 	color = "#888888" // This is greyish..?
 	taste_description = "chinese dragon powder"
@@ -210,7 +206,7 @@
 			M.Knockdown(50)
 			M.Stun(50)
 			P.throw_at(T2, 8, 1)
-		M.reagents.del_reagent(id)
+		M.reagents.del_reagent(type)
 		return
 	var/mob/living/carbon/human/H = M
 	if(!H.getorganslot(ORGAN_SLOT_PENIS) && H.emergent_genital_call())
@@ -280,7 +276,6 @@
 
 /datum/reagent/fermi/PEsmaller // Due to cozmo's request...!
 	name = "Chastity draft"
-	id = "PEsmaller"
 	description = "A volatile collodial mixture derived from various masculine solutions that encourages a smaller gentleman's package via a potent testosterone mix. Produced by reacting impure Incubus draft."
 	color = "#888888" // This is greyish..?
 	taste_description = "chinese dragon powder"
@@ -304,7 +299,6 @@
 
 /datum/reagent/fermi/PEsmaller_hypo
 	name = "Rectify draft"
-	id = "PEsmaller_hypo"
 	color = "#888888" // This is greyish..?
 	taste_description = "chinese dragon powder"
 	description = "A medicine used to treat organomegaly in a patient's penis."
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
index 36eee1cf33..e9c5733584 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -3,7 +3,6 @@
 
 /datum/reagent/fermi
 	name = "Fermi" //This should never exist, but it does so that it can exist in the case of errors..
-	id = "fermi"
 	taste_description	= "affection and love!"
 	can_synth = FALSE
 	value = 20
@@ -32,7 +31,6 @@
 
 /datum/reagent/fermi/hatmium //for hatterhat
 	name = "Hat growth serium"
-	id = "hatmium"
 	description = "A strange substance that draws in a hat from the hat dimention."
 	color = "#7c311a" // rgb: , 0, 255
 	taste_description = "like jerky, whiskey and an off aftertaste of a crypt."
@@ -80,7 +78,6 @@
 
 /datum/reagent/fermi/furranium
 	name = "Furranium"
-	id = "furranium"
 	description = "OwO whats this?"
 	color = "#f9b9bc" // rgb: , 0, 255
 	taste_description = "dewicious degenyewacy"
@@ -170,7 +167,6 @@
 
 /datum/reagent/fermi/nanite_b_gone
 	name = "Nanite bane"
-	id = "nanite_b_gone"
 	description = "A stablised EMP that is highly volatile, shocking small nano machines that will kill them off at a rapid rate in a patient's system."
 	color = "#708f8f"
 	overdose_threshold = 15
@@ -214,7 +210,6 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 
 /datum/reagent/fermi/nanite_b_goneTox
 	name = "Electromagnetic crystals"
-	id = "nanite_b_goneTox"
 	description = "Causes items upon the patient to sometimes short out, as well as causing a shock in the patient, if the residual charge between the crystals builds up to sufficient quantities"
 	metabolization_rate = 0.5
 	chemical_flags = REAGENT_INVISIBLE
@@ -237,7 +232,6 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 
 /datum/reagent/fermi/fermiAcid
 	name = "Acid vapour"
-	id = "fermiAcid"
 	description = "Someone didn't do like an otter, and add acid to water."
 	taste_description = "acid burns, ow"
 	color = "#FFFFFF"
@@ -280,7 +274,6 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 
 /datum/reagent/fermi/fermiTest
 	name = "Fermis Test Reagent"
-	id = "fermiTest"
 	description = "You should be really careful with this...! Also, how did you get this?"
 	chemical_flags = REAGENT_FORCEONNEW
 	can_synth = FALSE
@@ -303,10 +296,10 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 	if(cached_purity >= 0.67)
 		for (var/datum/reagent/reagent in holder.reagent_list)
 			if (istype(reagent, /datum/reagent/fermi))
-				var/datum/chemical_reaction/fermi/Ferm  = GLOB.chemical_reagents_list[reagent.id]
+				var/datum/chemical_reaction/fermi/Ferm  = GLOB.chemical_reagents_list[reagent.type]
 				Ferm.FermiExplode(src, holder.my_atom, holder, holder.total_volume, holder.chem_temp, holder.pH)
 			else
-				var/datum/chemical_reaction/Ferm  = GLOB.chemical_reagents_list[reagent.id]
+				var/datum/chemical_reaction/Ferm  = GLOB.chemical_reagents_list[reagent.type]
 				Ferm.on_reaction(holder, reagent.volume)
 	for(var/mob/M in viewers(8, location))
 		to_chat(M, "<span class='danger'>The solution reacts dramatically, with a meow!</span>")
@@ -315,7 +308,6 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 
 /datum/reagent/fermi/acidic_buffer
 	name = "Acidic buffer"
-	id = "acidic_buffer"
 	description = "This reagent will consume itself and move the pH of a beaker towards acidity when added to another."
 	color = "#fbc314"
 	pH = 0
@@ -338,7 +330,6 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 
 /datum/reagent/fermi/basic_buffer
 	name = "Basic buffer"
-	id = "basic_buffer"
 	description = "This reagent will consume itself and move the pH of a beaker towards alkalinity when added to another."
 	color = "#3853a4"
 	pH = 14
@@ -362,7 +353,6 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
 //If you manage to gamble perfectly, makes you have cat ears after you transform back. But really, you shouldn't end up with that with how random it is.
 /datum/reagent/fermi/secretcatchem //Should I hide this from code divers? A secret cit chem?
 	name = "secretcatchem" //an attempt at hiding it
-	id = "secretcatchem"
 	description = "An illegal and hidden chem that turns people into cats. It's said that it's so rare and unstable that having it means you've been blessed. If used on someone in crit, it will turn them into a cat permanently, until the cat is killed."
 	taste_description = "hairballs and cream"
 	color = "#ffc224"
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
index 3e9ed259ac..8668ef76f0 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
@@ -1,6 +1,5 @@
 /datum/reagent/fermi/yamerol
 	name = "Yamerol"
-	id = "yamerol"
 	description = "For when you've trouble speaking or breathing, just yell YAMEROL! A chem that helps soothe any congestion problems and at high concentrations restores damaged lungs and tongues!"
 	taste_description = "a weird, syrupy flavour, yamero"
 	color = "#68e83a"
@@ -74,7 +73,6 @@
 
 /datum/reagent/impure/yamerol_tox
 	name = "Yamer oh no"
-	id = "yamerol_tox"
 	description = "A dangerous, cloying toxin that stucks to a patient’s respiratory system, damaging their tongue, lungs and causing suffocation."
 	taste_description = "a weird, syrupy flavour, yamero"
 	color = "#68e83a"
@@ -96,7 +94,6 @@
 
 /datum/reagent/synthtissue
 	name = "Synthtissue"
-	id = "synthtissue"
 	description = "Synthetic tissue used for grafting onto damaged organs during surgery, or for treating limb damage. Has a very tight growth window between 305-320, any higher and the temperature will cause the cells to die. Additionally, growth time is considerably long, so chemists are encouraged to leave beakers with said reaction ongoing, while they tend to their other duties."
 	pH = 7.6
 	metabolization_rate = 0.05 //Give them time to graft
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm
index c8ebde11d9..87f9d71ce2 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -1,6 +1,5 @@
 /datum/reagent/syndicateadrenals
 	name = "Syndicate Adrenaline"
-	id = "syndicateadrenals"
 	description = "Regenerates your stamina and increases your reaction time."
 	color = "#E62111"
 	overdose_threshold = 6
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index 9d504ed679..bf79ccefda 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -539,8 +539,8 @@
 	HIonRelease 		+= (rand(-25, 25)/100)
 	RateUpLim 			+= (rand(1, 1000)/100)
 	PurityMin 			+= (rand(-1, 1)/10)
-	var/additions = list("aluminium", "silver", "gold", "plasma", "silicon", "uranium", "milk")
-	required_reagents[pick(additions)] = rand(1, 5)//weird
+	var/picked = pick(/datum/reagent/aluminium, /datum/reagent/silver, /datum/reagent/gold, /datum/reagent/toxin/plasma, /datum/reagent/silicon, /datum/reagent/uranium, /datum/reagent/consumable/milk)
+	required_reagents[picked] = rand(1, 5)//weird
 
 /datum/chemical_reaction/fermi/secretcatchem/FermiFinish(datum/reagents/holder, var/atom/my_atom)
 	SSblackbox.record_feedback("tally", "catgirlium")//log
diff --git a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
index a98b2011db..dd27d195e5 100644
--- a/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
+++ b/modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
@@ -1,7 +1,6 @@
 //body bluids
 /datum/reagent/consumable/semen
 	name = "Semen"
-	id = "semen"
 	description = "Sperm from some animal. I bet you'll drink this out of a bucket someday."
 	taste_description = "something salty"
 	taste_mult = 2 //Not very overpowering flavor
@@ -45,7 +44,6 @@
 
 /datum/reagent/consumable/femcum
 	name = "Female Ejaculate"
-	id = "femcum"
 	description = "Vaginal lubricant found in most mammals and other animals of similar nature. Where you found this is your own business."
 	taste_description = "something with a tang" // wew coders who haven't eaten out a girl.
 	taste_mult = 2
@@ -93,7 +91,6 @@
 
 /datum/reagent/drug/aphrodisiac
 	name = "Crocin"
-	id = "aphro"
 	description = "Naturally found in the crocus and gardenia flowers, this drug acts as a natural and safe aphrodisiac."
 	taste_description = "strawberry roofies"
 	taste_mult = 2 //Hide the roofies in stronger flavors
@@ -112,7 +109,6 @@
 
 /datum/reagent/drug/aphrodisiacplus
 	name = "Hexacrocin"
-	id = "aphro+"
 	description = "Chemically condensed form of basic crocin. This aphrodisiac is extremely powerful and addictive in most animals.\
 					Addiction withdrawals can cause brain damage and shortness of breath. Overdosage can lead to brain damage and a \
 					permanent increase in libido (commonly referred to as 'bimbofication')."
@@ -167,7 +163,6 @@
 
 /datum/reagent/drug/anaphrodisiac
 	name = "Camphor"
-	id = "anaphro"
 	description = "Naturally found in some species of evergreen trees, camphor is a waxy substance. When injested by most animals, it acts as an anaphrodisiac\
 					, reducing libido and calming them. Non-habit forming and not addictive."
 	taste_description = "dull bitterness"
@@ -182,7 +177,6 @@
 
 /datum/reagent/drug/anaphrodisiacplus
 	name = "Hexacamphor"
-	id = "anaphro+"
 	description = "Chemically condensed camphor. Causes an extreme reduction in libido and a permanent one if overdosed. Non-addictive."
 	taste_description = "tranquil celibacy"
 	color = "#D9D9D9"//rgb(217, 217, 217)