more work.

code/modules/reagents/reagent_containers/pill.dm

@@ -96,42 +96,42 @@
 	name = "adminordrazine pill"
 	desc = "It's magic. We don't have to explain it."
 	icon_state = "pill16"
-	list_reagents = list("adminordrazine" = 50)
+	list_reagents = list(/datum/reagent/medicine/adminordrazine = 50)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/morphine
 	name = "morphine pill"
 	desc = "Commonly used to treat insomnia."
 	icon_state = "pill8"
-	list_reagents = list("morphine" = 30)
+	list_reagents = list(/datum/reagent/medicine/morphine = 30)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/stimulant
 	name = "stimulant pill"
 	desc = "Often taken by overworked employees, athletes, and the inebriated. You'll snap to attention immediately!"
 	icon_state = "pill19"
-	list_reagents = list("ephedrine" = 10, "antihol" = 10, "coffee" = 30)
+	list_reagents = list(/datum/reagent/medicine/ephedrine = 10, /datum/reagent/medicine/antihol = 10, /datum/reagent/consumable/coffee = 30)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/salbutamol
 	name = "salbutamol pill"
 	desc = "Used to treat oxygen deprivation."
 	icon_state = "pill16"
-	list_reagents = list("salbutamol" = 30)
+	list_reagents = list(/datum/reagent/medicine/salbutamol = 30)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/charcoal
 	name = "charcoal pill"
 	desc = "Neutralizes many common toxins."
 	icon_state = "pill17"
-	list_reagents = list("charcoal" = 10)
+	list_reagents = list(/datum/reagent/medicine/charcoal = 10)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/epinephrine
 	name = "epinephrine pill"
 	desc = "Used to stabilize patients."
 	icon_state = "pill5"
-	list_reagents = list("epinephrine" = 15)
+	list_reagents = list(/datum/reagent/medicine/epinephrine = 15)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/mannitol
@@ -145,34 +145,34 @@
 	name = "mutadone pill"
 	desc = "Used to treat genetic damage."
 	icon_state = "pill20"
-	list_reagents = list("mutadone" = 50)
+	list_reagents = list(/datum/reagent/medicine/mutadone = 50)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/salicyclic
 	name = "salicylic acid pill"
 	desc = "Used to dull pain."
 	icon_state = "pill9"
-	list_reagents = list("sal_acid" = 24)
+	list_reagents = list(/datum/reagent/medicine/sal_acid = 24)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/oxandrolone
 	name = "oxandrolone pill"
 	desc = "Used to stimulate burn healing."
 	icon_state = "pill11"
-	list_reagents = list("oxandrolone" = 24)
+	list_reagents = list(/datum/reagent/medicine/oxandrolone = 24)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/insulin
 	name = "insulin pill"
 	desc = "Handles hyperglycaemic coma."
 	icon_state = "pill18"
-	list_reagents = list("insulin" = 50)
+	list_reagents = list(/datum/reagent/medicine/insulin = 50)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/psicodine
 	name = "psicodine pill"
 	desc = "Used to treat mental instability and traumas."
-	list_reagents = list("psicodine" = 10)
+	list_reagents = list(/datum/reagent/medicine/psicodine = 10)
 	icon_state = "pill22"
 	roundstart = 1
 
@@ -180,21 +180,21 @@
 	name = "potassium iodide pill"
 	desc = "Used to treat radition used to counter radiation poisoning."
 	icon_state = "pill18"
-	list_reagents = list("potass_iodide" = 50)
+	list_reagents = list(/datum/reagent/medicine/potass_iodide = 50)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/antirad_plus
 	name = "prussian blue pill"
 	desc = "Used to treat heavy radition poisoning."
 	icon_state = "prussian_blue"
-	list_reagents = list("prussian_blue" = 25, /datum/reagent/water = 10)
+	list_reagents = list(/datum/reagent/medicine/prussian_blue = 25, /datum/reagent/water = 10)
 	roundstart = 1
 
 /obj/item/reagent_containers/pill/mutarad
 	name = "radiation treatment deluxe pill"
 	desc = "Used to treat heavy radition poisoning and genetic defects."
 	icon_state = "anit_rad_fixgene"
-	list_reagents = list("prussian_blue" = 15, "potass_iodide" = 15, "mutadone" = 15, /datum/reagent/water = 5)
+	list_reagents = list(/datum/reagent/medicine/prussian_blue = 15, /datum/reagent/medicine/potass_iodide = 15, /datum/reagent/medicine/mutadone = 15, /datum/reagent/water = 5)
 	roundstart = 1
 
 ///////////////////////////////////////// this pill is used only in a legion mob drop
@@ -203,11 +203,11 @@
 	desc = "I wouldn't eat this if I were you."
 	icon_state = "pill9"
 	color = "#454545"
-	list_reagents = list("shadowmutationtoxin" = 1)
+	list_reagents = list(/datum/reagent/mutationtoxin/shadow = 1)
 //////////////////////////////////////// drugs
 /obj/item/reagent_containers/pill/zoom
 	name = "zoom pill"
-	list_reagents = list("synaptizine" = 10, "nicotine" = 10, "methamphetamine" = 1)
+	list_reagents = list(/datum/reagent/medicine/synaptizine = 10, /datum/reagent/drug/nicotine = 10, /datum/reagent/drug/methamphetamine = 1)
 
 
 /obj/item/reagent_containers/pill/happy
@@ -217,18 +217,18 @@
 
 /obj/item/reagent_containers/pill/lsd
 	name = "hallucinogen pill"
-	list_reagents = list("mushroomhallucinogen" = 15, "mindbreaker" = 15)
+	list_reagents = list(/datum/reagent/drug/mushroomhallucinogen = 15, /datum/reagent/toxin/mindbreaker = 15)
 
 
 /obj/item/reagent_containers/pill/aranesp
 	name = "speedy pill"
-	list_reagents = list("aranesp" = 10)
+	list_reagents = list(/datum/reagent/drug/aranesp = 10)
 
 /obj/item/reagent_containers/pill/happiness
 	name = "happiness pill"
 	desc = "It has a creepy smiling face on it."
 	icon_state = "pill_happy"
-	list_reagents = list("happiness" = 10)
+	list_reagents = list(/datum/reagent/drug/happiness = 10)
 
 /obj/item/reagent_containers/pill/floorpill
 	name = "floorpill"
@@ -250,8 +250,8 @@
 
 /obj/item/reagent_containers/pill/penis_enlargement
 	name = "penis enlargement pill"
-	list_reagents = list("penis_enlarger" = 10)
+	list_reagents = list(/datum/reagent/fermi/penis_enlarger = 10)
 
 /obj/item/reagent_containers/pill/breast_enlargement
 	name = "breast enlargement pill"
-	list_reagents = list("breast_enlarger" = 10)
+	list_reagents = list(/datum/reagent/fermi/breast_enlarger = 10)