diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm
index fa1831e488..a730c1a449 100644
--- a/code/__defines/chemistry.dm
+++ b/code/__defines/chemistry.dm
@@ -49,8 +49,8 @@
#define ANTIBIO_SUPER 3
// Chemistry lists.
-var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", REAGENT_ID_NITROGLYCERIN, "thirteenloko", REAGENT_ID_NICOTINE) // Increase heart rate.
-var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", REAGENT_ID_BLISS, REAGENT_ID_STOXIN, REAGENT_ID_AMBROSIAEXTRACT) // Decrease heart rate.
+var/list/tachycardics = list("coffee", REAGENT_ID_INAPROVALINE, REAGENT_ID_HYPERZINE, REAGENT_ID_NITROGLYCERIN, "thirteenloko", REAGENT_ID_NICOTINE) // Increase heart rate.
+var/list/bradycardics = list("neurotoxin", REAGENT_ID_CRYOXADONE, REAGENT_ID_CLONEXADONE, REAGENT_ID_BLISS, REAGENT_ID_STOXIN, REAGENT_ID_AMBROSIAEXTRACT) // Decrease heart rate.
var/list/heartstopper = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE, REAGENT_ID_ZOMBIEPOWDER) // This stops the heart.
var/list/cheartstopper = list(REAGENT_ID_POTASSIUMCHLORIDE) // This stops the heart when overdose is met. -- c = conditional
diff --git a/code/__defines/reagents.dm b/code/__defines/reagents.dm
index 6924c51c0c..32e6df659b 100644
--- a/code/__defines/reagents.dm
+++ b/code/__defines/reagents.dm
@@ -166,40 +166,100 @@
#define REAGENT_ID_POLYMORPH "polymorph"
#define REAGENT_GLAMOUR "Glamour"
#define REAGENT_ID_GLAMOUR "glamour"
-
-
-
-
-#define REAGENT_
-#define REAGENT_ID_
-#define REAGENT_
-#define REAGENT_ID_
-#define REAGENT_
-#define REAGENT_ID_
-#define REAGENT_
-#define REAGENT_ID_
-#define REAGENT_
-#define REAGENT_ID_
-#define REAGENT_
-#define REAGENT_ID_
-#define REAGENT_
-#define REAGENT_ID_
-#define REAGENT_
-#define REAGENT_ID_
-#define REAGENT_
-#define REAGENT_ID_
-#define REAGENT_
-#define REAGENT_ID_
-#define REAGENT_
-#define REAGENT_ID_
-
-
+#define REAGENT_INAPROVALINE "Inaprovaline"
+#define REAGENT_ID_INAPROVALINE "inaprovaline"
+#define REAGENT_INAPROVALAZE "Inaprovalaze"
+#define REAGENT_ID_INAPROVALAZE "inaprovalaze"
+#define REAGENT_BICARIDINE "Bicaridine"
+#define REAGENT_ID_BICARIDINE "bicaridine"
+#define REAGENT_BICARIDAZE "Bicaridaze"
+#define REAGENT_ID_BICARIDAZE "bicaridaze"
+#define REAGENT_CALCIUMCARBONATE "calcium carbonate"
#define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate"
-
-
-
-
-
+#define REAGENT_KELOTANE "Kelotane"
+#define REAGENT_ID_KELOTANE "kelotane"
+#define REAGENT_DERMALINE "Dermaline"
+#define REAGENT_ID_DERMALINE "dermaline"
+#define REAGENT_DERMALAZE "Dermalaze"
+#define REAGENT_ID_DERMALAZE "dermalaze"
+#define REAGENT_ANTITOXIN "Dylovene"
+#define REAGENT_ID_ANTITOXIN "anti_toxin"
+#define REAGENT_CARTHATOLINE "Carthatoline"
+#define REAGENT_ID_CARTHATOLINE "carthatoline"
+#define REAGENT_DEXALIN "Dexalin"
+#define REAGENT_ID_DEXALIN "dexalin"
+#define REAGENT_DEXALINP "Dexalin Plus"
+#define REAGENT_ID_DEXALINP "dexalinp"
+#define REAGENT_TRICORDRAZINE "Tricordrazine"
+#define REAGENT_ID_TRICORDRAZINE "tricordrazine"
+#define REAGENT_TRICORLIDAZE "Tricorlidaze"
+#define REAGENT_ID_TRICORLIDAZE "tricorlidaze"
+#define REAGENT_CRYOXADONE "Cryoxadone"
+#define REAGENT_ID_CRYOXADONE "cryoxadone"
+#define REAGENT_CLONEXADONE "Clonexadone"
+#define REAGENT_ID_CLONEXADONE "clonexadone"
+#define REAGENT_MORTIFERIN "Mortiferin"
+#define REAGENT_ID_MORTIFERIN "mortiferin"
+#define REAGENT_NECROXADONE "Necroxadone"
+#define REAGENT_ID_NECROXADONE "necroxadone"
+#define REAGENT_PARACETAMOL "Paracetamol"
+#define REAGENT_ID_PARACETAMOL "paracetamol"
+#define REAGENT_TRAMADOL "Tramadol"
+#define REAGENT_ID_TRAMADOL "tramadol"
+#define REAGENT_OXYCODONE "Oxycodone"
+#define REAGENT_ID_OXYCODONE "oxycodone"
+#define REAGENT_SYNAPTIZINE "Synaptizine"
+#define REAGENT_ID_SYNAPTIZINE "synaptizine"
+#define REAGENT_HYPERZINE "Hyperzine"
+#define REAGENT_ID_HYPERZINE "hyperzine"
+#define REAGENT_ALKYSINE "Alkysine"
+#define REAGENT_ID_ALKYSINE "alkysine"
+#define REAGENT_IMIDAZOLINE "Imidazoline"
+#define REAGENT_ID_IMIDAZOLINE "imidazoline"
+#define REAGENT_PERIDAXON "Peridaxon"
+#define REAGENT_ID_PERIDAXON "peridaxon"
+#define REAGENT_OSTEODAXON "Osteodaxon"
+#define REAGENT_ID_OSTEODAXON "osteodaxon"
+#define REAGENT_MYELAMINE "Myelamine"
+#define REAGENT_ID_MYELAMINE "myelamine"
+#define REAGENT_RESPIRODAXON "Respirodaxon"
+#define REAGENT_ID_RESPIRODAXON "respirodaxon
+#define REAGENT_GASTIRODAXON "Gastirodaxon"
+#define REAGENT_ID_GASTIRODAXON "gastirodaxon"
+#define REAGENT_HEPANEPHRODAXON "Hepanephrodaxon"
+#define REAGENT_ID_HEPANEPHRODAXON "hepanephrodaxon"
+#define REAGENT_CORDRADAXON "Cordradaxon"
+#define REAGENT_ID_CORDRADAXON "cordradaxon"
+#define REAGENT_IMMUNOSUPRIZINE "Immunosuprizine"
+#define REAGENT_ID_IMMUNOSUPRIZINE "immunosuprizine"
+#define REAGENT_MALISHQUALEM "Malish-Qualem"
+#define REAGENT_ID_MALISHQUALEM "malish-qualem"
+#define REAGENT_RYETALYN "Ryetalyn"
+#define REAGENT_ID_RYETALYN "ryetalyn"
+#define REAGENT_ETHYLREDOXRAZINE "Ethylredoxrazine"
+#define REAGENT_ID_ETHYLREDOXRAZINE "ethylredoxrazine"
+#define REAGENT_HYRONALIN "Hyronalin"
+#define REAGENT_ID_HYRONALIN "hyronalin"
+#define REAGENT_ARITHRAZINE "Arithrazine"
+#define REAGENT_ID_ARITHRAZINE "arithrazine"
+#define REAGENT_SPACEACILLIN "Spaceacillin"
+#define REAGENT_ID_SPACEACILLIN "spaceacillin"
+#define REAGENT_COROPHIZINE "Corophizine"
+#define REAGENT_ID_COROPHIZINE "corophizine"
+#define REAGENT_SPACOMYCAZE "Spacomycaze"
+#define REAGENT_ID_SPACOMYCAZE "spacomycaze"
+#define REAGENT_STERILIZINE "Sterilizine"
+#define REAGENT_ID_STERILIZINE "sterilizine"
+#define REAGENT_LEPORAZINE "Leporazine"
+#define REAGENT_ID_LEPORAZINE "leporazine"
+#define REAGENT_REZADONE "Rezadone"
+#define REAGENT_ID_REZADONE "rezadone"
+#define REAGENT_HEALINGNANITES "Restorative Nanites"
+#define REAGENT_ID_HEALINGNANITES "healing_nanites"
+#define REAGENT_MENTHOL "Menthol"
+#define REAGENT_ID_MENTHOL "menthol"
+#define REAGENT_EARTHSBLOOD "Earthsblood"
+#define REAGENT_ID_EARTHSBLOOD "earthsblood"
// Virology
@@ -510,6 +570,37 @@
+
+
+#define REAGENT_PROTEIN "Protein"
+#define REAGENT_ID_PROTEIN "protein"
+#define REAGENT_
+#define REAGENT_ID_
+#define REAGENT_
+#define REAGENT_ID_
+#define REAGENT_
+#define REAGENT_ID_
+#define REAGENT_
+#define REAGENT_ID_
+#define REAGENT_
+#define REAGENT_ID_
+#define REAGENT_
+#define REAGENT_ID_
+#define REAGENT_
+#define REAGENT_ID_
+#define REAGENT_
+#define REAGENT_ID_
+#define REAGENT_
+#define REAGENT_ID_
+#define REAGENT_
+#define REAGENT_ID_
+
+
+
+
+
+
+
// Toxins
#define REAGENT_TOXIN "Toxin"
#define REAGENT_ID_TOXIN "toxin"
@@ -593,11 +684,11 @@
#define REAGENT_ID_MUTATIONTOXIN "mutationtoxin"
#define REAGENT_DOCILITYTOXIN "Docility Toxin"
#define REAGENT_ID_DOCILITYTOXIN "docilitytoxin"
-#define REAGENT_SHREDDINGNANITES REAGENT_RESTORATIVENANITES
+#define REAGENT_SHREDDINGNANITES REAGENT_HEALINGNANITES
#define REAGENT_ID_SHREDDINGNANITES "shredding_nanites"
-#define REAGENT_IRRADIATEDNANITES REAGENT_RESTORATIVENANITES
+#define REAGENT_IRRADIATEDNANITES REAGENT_HEALINGNANITES
#define REAGENT_ID_IRRADIATEDNANITES "irradiated_nanites"
-#define REAGENT_NEUROPHAGENANITES REAGENT_RESTORATIVENANITES
+#define REAGENT_NEUROPHAGENANITES REAGENT_HEALINGNANITES
#define REAGENT_ID_NEUROPHAGENANITES "neurophage_nanites"
#define REAGENT_SALMONELLA "Salmonella"
#define REAGENT_ID_SALMONELLA "salmonella"
@@ -608,7 +699,7 @@
-Files left: food_drinks.dm, medicine.dm
+Files left: food_drinks.dm,
includes: .dm
excludes: reagents.dm,ores.dm,materials.dm,mre.dm
diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm
index 22cdabb1dd..f5d21ce3ba 100644
--- a/code/datums/diseases/_disease.dm
+++ b/code/datums/diseases/_disease.dm
@@ -106,7 +106,7 @@ GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease))
if((spread_flags & SPECIAL || spread_flags & NON_CONTAGIOUS || spread_flags & BLOOD) && !force_spread)
return
- if(affected_mob.bloodstr.has_reagent("spaceacillin") || (affected_mob.nutrition > 300 && prob(affected_mob.nutrition/50)))
+ if(affected_mob.bloodstr.has_reagent(REAGENT_ID_SPACEACILLIN) || (affected_mob.nutrition > 300 && prob(affected_mob.nutrition/50)))
return
var/spread_range = 1
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 117a86892e..4ef18ca30e 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -2,8 +2,8 @@ GLOBAL_LIST_EMPTY(archive_diseases)
GLOBAL_LIST_INIT(advance_cures, list(
REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, "orangejuice",
- "spaceacillin", "glucose", REAGENT_ID_ETHANOL,
- "leporazine", REAGENT_ID_IMPEDREZENE, "hepanephrodaxon",
+ REAGENT_ID_SPACEACILLIN, "glucose", REAGENT_ID_ETHANOL,
+ REAGENT_ID_LEPORAZINE, REAGENT_ID_IMPEDREZENE, REAGENT_ID_HEPANEPHRODAXON,
REAGENT_ID_SILVER, REAGENT_ID_GOLD
))
diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm
index 3f9fbd8eee..1e69116c94 100644
--- a/code/datums/diseases/advance/symptoms/oxygen.dm
+++ b/code/datums/diseases/advance/symptoms/oxygen.dm
@@ -29,8 +29,8 @@ Bonus
var/mob/living/M = A.affected_mob
switch(A.stage)
if(4, 5)
- if(M.reagents.get_reagent_amount("dexalin") < 10)
- M.reagents.add_reagent("dexalin", 10)
+ if(M.reagents.get_reagent_amount(REAGENT_ID_DEXALIN) < 10)
+ M.reagents.add_reagent(REAGENT_ID_DEXALIN, 10)
else
if(prob(SYMPTOM_ACTIVATION_PROB * 5))
to_chat(M, span_notice(pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")))
diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm
index 84328d194c..8de8690841 100644
--- a/code/datums/diseases/advance/symptoms/sensory.dm
+++ b/code/datums/diseases/advance/symptoms/sensory.dm
@@ -39,8 +39,8 @@ Bonus
M.reagents.del_reagent(REAGENT_ID_BLISS)
M.hallucination = max(0, M.hallucination-4)
if(A.stage >= 5)
- if(M.reagents.get_reagent_amount("alkysine") < 10)
- M.reagents.add_reagent("alkysine", 5)
+ if(M.reagents.get_reagent_amount(REAGENT_ID_ALKYSINE) < 10)
+ M.reagents.add_reagent(REAGENT_ID_ALKYSINE, 5)
/datum/symptom/sensory_restoration
name = "Sensory Restoration"
@@ -56,8 +56,8 @@ Bonus
var/mob/living/M = A.affected_mob
switch(A.stage)
if(4, 5)
- if(M.reagents.get_reagent_amount("imidazoline") < 10)
- M.reagents.add_reagent("imidazoline", 5)
+ if(M.reagents.get_reagent_amount(REAGENT_ID_IMIDAZOLINE) < 10)
+ M.reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5)
else
if(prob(SYMPTOM_ACTIVATION_PROB))
to_chat(M, span_notice(pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.")))
diff --git a/code/datums/diseases/advance/symptoms/stimulant.dm b/code/datums/diseases/advance/symptoms/stimulant.dm
index 4a427d4036..f1f4460266 100644
--- a/code/datums/diseases/advance/symptoms/stimulant.dm
+++ b/code/datums/diseases/advance/symptoms/stimulant.dm
@@ -36,8 +36,8 @@ Bonus
if(3, 4)
L.jitteriness += 10
else
- if(L.reagents.get_reagent_amount("hyperzine" < 10))
- L.reagents.add_reagent("hyperzine", 5)
+ if(L.reagents.get_reagent_amount(REAGENT_ID_HYPERZINE < 10))
+ L.reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
if(prob(30))
L.jitteriness += 15
return
diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm
index 57899ef201..b7fa0ea033 100644
--- a/code/datums/diseases/brainrot.dm
+++ b/code/datums/diseases/brainrot.dm
@@ -3,8 +3,8 @@
max_stages = 4
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
- cure_text = "Alkysine"
- cures = list("alkysine")
+ cure_text = REAGENT_ALKYSINE
+ cures = list(REAGENT_ID_ALKYSINE)
agent = "Cryptococcus Cosmosis"
viable_mobtypes = list(/mob/living/carbon/human)
cure_chance = 15
diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm
index ae9c307297..da735da65e 100644
--- a/code/datums/diseases/cold.dm
+++ b/code/datums/diseases/cold.dm
@@ -4,7 +4,7 @@
spread_text = "Airborne"
spread_flags = AIRBORNE
cure_text = "Rest & Spaceacillin"
- cures = list("spaceacillin", REAGENT_ID_CHICKENSOUP)
+ cures = list(REAGENT_ID_SPACEACILLIN, REAGENT_ID_CHICKENSOUP)
needs_all_cures = FALSE
agent = "XY-rhinovirus"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm
index a0fa691976..ff82a5cfb5 100644
--- a/code/datums/diseases/cold9.dm
+++ b/code/datums/diseases/cold9.dm
@@ -4,8 +4,8 @@
max_stages = 3
spread_text = "On contact"
spread_flags = CONTACT_GENERAL
- cure_text = "Spaceacillin"
- cures = list("spaceacillin")
+ cure_text = REAGENT_SPACEACILLIN
+ cures = list(REAGENT_ID_SPACEACILLIN)
agent = "ICE9-rhinovirus"
viable_mobtypes = list(/mob/living/carbon/human)
desc = "If left untreated the subject will slow, as if partly frozen."
diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm
index 8c3062809b..4152623124 100644
--- a/code/datums/diseases/flu.dm
+++ b/code/datums/diseases/flu.dm
@@ -2,8 +2,8 @@
name = "The Flu"
max_stages = 3
spread_text = "Airborne"
- cure_text = "Spaceacillin"
- cures = list("spaceacillin", REAGENT_ID_CHICKENSOUP)
+ cure_text = REAGENT_SPACEACILLIN
+ cures = list(REAGENT_ID_SPACEACILLIN, REAGENT_ID_CHICKENSOUP)
needs_all_cures = FALSE
cure_chance = 10
agent = "H13N1 flu virion"
diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm
index d223274576..6c3050b441 100644
--- a/code/datums/diseases/gbs.dm
+++ b/code/datums/diseases/gbs.dm
@@ -42,8 +42,8 @@
stage_prob = 5
spread_text = "Non-contagious"
spread_flags = NON_CONTAGIOUS
- cure_text = "Cryoxadone"
- cures = list("cryoxadone")
+ cure_text = REAGENT_CRYOXADONE
+ cures = list(REAGENT_ID_CRYOXADONE)
cure_chance = 10
agent = "gibbis"
disease_flags = CURABLE
diff --git a/code/datums/diseases/roanoake.dm b/code/datums/diseases/roanoake.dm
index 412ff16ae7..3d6176728e 100644
--- a/code/datums/diseases/roanoake.dm
+++ b/code/datums/diseases/roanoake.dm
@@ -4,9 +4,9 @@
stage_prob = 2
spread_text = "Blood and close contact"
spread_flags = BLOOD
- cure_text = "Spaceacillin"
+ cure_text = REAGENT_SPACEACILLIN
agent = "Chimera cells"
- cures = list("spaceacillin")
+ cures = list(REAGENT_ID_SPACEACILLIN)
cure_chance = 10
viable_mobtypes = list(/mob/living/carbon/human)
desc = "If left untreated, subject will become a xenochimera upon perishing."
diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm
index 897846fccf..f12840fdf3 100644
--- a/code/game/gamemodes/newobjective.dm
+++ b/code/game/gamemodes/newobjective.dm
@@ -1143,12 +1143,12 @@ datum
var/target_name
New(var/text,var/joba)
..()
- var/list/items = list("Sulphuric acid", REAGENT_PACID, REAGENT_LUBE, REAGENT_MUTAGEN,\
- "Leporazine", REAGENT_CRYPTOBIOLIN, REAGENT_LEXORIN,\
- "Kelotane", "Dexalin", "Tricordrazine")
+ var/list/items = list(REAGENT_SACID, REAGENT_PACID, REAGENT_LUBE, REAGENT_MUTAGEN,\
+ REAGENT_LEPORAZINE, REAGENT_CRYPTOBIOLIN, REAGENT_LEXORIN,\
+ REAGENT_KELOTANE, REAGENT_DEXALIN, REAGENT_TRICORDRAZINE)
target_name = pick(items)
switch(target_name)
- if("Sulphuric acid")
+ if(REAGENT_SACID)
steal_target = /datum/reagent/acid
if(REAGENT_PACID)
steal_target = /datum/reagent/pacid
@@ -1156,17 +1156,17 @@ datum
steal_target = /datum/reagent/lube
if(REAGENT_MUTAGEN)
steal_target = /datum/reagent/mutagen
- if("Leporazine")
+ if(REAGENT_LEPORAZINE)
steal_target = /datum/reagent/leporazine
if(REAGENT_CRYPTOBIOLIN)
steal_target =/datum/reagent/cryptobiolin
if(REAGENT_LEXORIN)
steal_target = /datum/reagent/lexorin
- if("Kelotane")
+ if(REAGENT_KELOTANE)
steal_target = /datum/reagent/kelotane
- if("Dexalin")
+ if(REAGENT_DEXALIN)
steal_target = /datum/reagent/dexalin
- if("Tricordrazine")
+ if(REAGENT_TRICORDRAZINE)
steal_target = /datum/reagent/tricordrazine
explanation_text = "Steal a container filled with [target_name]."
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index e0a146a820..7962de2640 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -94,7 +94,7 @@
circuit = /obj/item/circuitboard/sleeper
var/mob/living/carbon/human/occupant = null
var/list/available_chemicals = list()
- var/list/base_chemicals = list("inaprovaline" = "Inaprovaline", "paracetamol" = "Paracetamol", "anti_toxin" = "Dylovene", "dexalin" = "Dexalin")
+ var/list/base_chemicals = list(REAGENT_ID_INAPROVALINE = REAGENT_INAPROVALINE, REAGENT_ID_PARACETAMOL = REAGENT_PARACETAMOL, REAGENT_ID_ANTITOXIN = REAGENT_ANTITOXIN, REAGENT_ID_DEXALIN = REAGENT_DEXALIN)
var/amounts = list(5, 10)
var/obj/item/reagent_containers/glass/beaker = null
var/filtering = 0
@@ -149,18 +149,18 @@
if(man_rating >= 4) // Alien tech.
var/reag_ID = pickweight(list(
- "healing_nanites" = 10,
+ REAGENT_ID_HEALINGNANITES = 10,
REAGENT_ID_SHREDDINGNANITES = 5,
REAGENT_ID_IRRADIATEDNANITES = 5,
REAGENT_ID_NEUROPHAGENANITES = 2)
)
new_chemicals[reag_ID] = "Nanite"
if(man_rating >= 3) // Anomalous tech.
- new_chemicals["immunosuprizine"] = "Immunosuprizine"
+ new_chemicals[REAGENT_ID_IMMUNOSUPRIZINE] = REAGENT_IMMUNOSUPRIZINE
if(man_rating >= 2) // Tier 3.
- new_chemicals["spaceacillin"] = "Spaceacillin"
+ new_chemicals[REAGENT_ID_SPACEACILLIN] = REAGENT_SPACEACILLIN
if(man_rating >= 1) // Tier 2.
- new_chemicals["leporazine"] = "Leporazine"
+ new_chemicals[REAGENT_ID_LEPORAZINE] = REAGENT_LEPORAZINE
if(new_chemicals.len)
available_chemicals += new_chemicals
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 30a0d81465..ac0d7bc590 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -195,8 +195,8 @@
occupant.adjustBrainLoss(-(CEILING(0.5*heal_rate, 1)))
//So clones don't die of oxyloss in a running pod.
- if(occupant.reagents.get_reagent_amount("inaprovaline") < 30)
- occupant.reagents.add_reagent("inaprovaline", 60)
+ if(occupant.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE) < 30)
+ occupant.reagents.add_reagent(REAGENT_ID_INAPROVALINE, 60)
occupant.Sleeping(30)
//Also heal some oxyloss ourselves because inaprovaline is so bad at preventing it!!
occupant.adjustOxyLoss(-4)
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 14449730b2..3f196e998d 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -232,8 +232,8 @@
var/heal_brute = occupant.getBruteLoss() ? min(1, 20/occupant.getBruteLoss()) : 0
var/heal_fire = occupant.getFireLoss() ? min(1, 20/occupant.getFireLoss()) : 0
occupant.heal_organ_damage(heal_brute,heal_fire)
- var/has_cryo = occupant.reagents.get_reagent_amount("cryoxadone") >= 1
- var/has_clonexa = occupant.reagents.get_reagent_amount("clonexadone") >= 1
+ var/has_cryo = occupant.reagents.get_reagent_amount(REAGENT_ID_CRYOXADONE) >= 1
+ var/has_clonexa = occupant.reagents.get_reagent_amount(REAGENT_ID_CLONEXADONE) >= 1
var/has_cryo_medicine = has_cryo || has_clonexa
if(beaker && !has_cryo_medicine)
beaker.reagents.trans_to_mob(occupant, 1, CHEM_BLOOD, 10)
diff --git a/code/game/mecha/equipment/tools/sleeper.dm b/code/game/mecha/equipment/tools/sleeper.dm
index 7dd617557d..3183a2593e 100644
--- a/code/game/mecha/equipment/tools/sleeper.dm
+++ b/code/game/mecha/equipment/tools/sleeper.dm
@@ -236,8 +236,8 @@
M.Paralyse(2)
M.Weaken(2)
M.Stun(2)
- if(M.reagents.get_reagent_amount("inaprovaline") < 5)
- M.reagents.add_reagent("inaprovaline", 5)
+ if(M.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE) < 5)
+ M.reagents.add_reagent(REAGENT_ID_INAPROVALINE, 5)
chassis.use_power(energy_drain)
update_equip_info()
return
diff --git a/code/game/mecha/equipment/tools/syringe_gun.dm b/code/game/mecha/equipment/tools/syringe_gun.dm
index e47db0d36b..580e36acf4 100644
--- a/code/game/mecha/equipment/tools/syringe_gun.dm
+++ b/code/game/mecha/equipment/tools/syringe_gun.dm
@@ -22,7 +22,7 @@
. = ..()
flags |= NOREACT
syringes = new
- known_reagents = list("inaprovaline"="Inaprovaline","anti_toxin"="Dylovene")
+ known_reagents = list(REAGENT_ID_INAPROVALINE=REAGENT_INAPROVALINE,REAGENT_ID_ANTITOXIN=REAGENT_ANTITOXIN)
processed_reagents = new
create_reagents(max_volume)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 3a0bd663d9..206f91ff33 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -149,7 +149,7 @@
if(M.getBrainLoss() > 15)
to_chat(user, span_notice("There's visible lag between left and right pupils' reactions."))
- var/list/pinpoint = list("oxycodone"=1,"tramadol"=5)
+ var/list/pinpoint = list(REAGENT_ID_OXYCODONE=1,REAGENT_ID_TRAMADOL=5)
var/list/dilating = list(REAGENT_ID_BLISS=5,REAGENT_ID_AMBROSIAEXTRACT=5,REAGENT_ID_MINDBREAKER=1)
if(M.reagents.has_any_reagent(pinpoint) || H.ingested.has_any_reagent(pinpoint))
to_chat(user, span_notice("\The [M]'s pupils are already pinpoint and cannot narrow any more."))
diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm
index 4eca83946c..1dc29984d0 100644
--- a/code/game/objects/items/devices/scanners/health.dm
+++ b/code/game/objects/items/devices/scanners/health.dm
@@ -260,8 +260,8 @@
if (M.getCloneLoss())
dat += span_warning("Subject appears to have been imperfectly cloned.")
dat += "
"
-// if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
-// user.show_message(span_notice("Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."))
+// if (M.reagents && M.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE))
+// user.show_message(span_notice("Bloodstream Analysis located [M.reagents:get_reagent_amount(REAGENT_ID_INAPROVALINE)] units of rejuvenation chemicals."))
if (M.has_brain_worms())
dat += span_warning("Subject suffering from aberrant brain activity. Recommend further scanning.")
dat += "
"
diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm
index 93cfd6bd68..973239a777 100644
--- a/code/game/objects/items/weapons/ecigs.dm
+++ b/code/game/objects/items/weapons/ecigs.dm
@@ -205,7 +205,7 @@
..()
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 10)
- reagents.add_reagent("menthol", 5)
+ reagents.add_reagent(REAGENT_ID_MENTHOL, 5)
/obj/item/reagent_containers/ecig_cartridge/watermelon
name = "watermelon flavour cartridge"
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index f0f3a37867..9fc8936d0b 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -220,7 +220,7 @@
pack.desc += " 'MB' has been scribbled on it."
pack = new /obj/item/storage/fancy/cigarettes(src)
- pack.reagents.add_reagent("tricordrazine", 15 * pack.storage_slots)
+ pack.reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 15 * pack.storage_slots)
pack.desc += " 'T' has been scribbled on it."
new /obj/item/flame/lighter/zippo(src)
diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm
index 242a99f8a5..555d34b83e 100644
--- a/code/modules/blob2/core_chunk.dm
+++ b/code/modules/blob2/core_chunk.dm
@@ -142,7 +142,7 @@
name = "Allied Blob Revival"
id = "blob_friend"
result = null
- required_reagents = list(REAGENT_ID_HYDROPHORON = 40, "peridaxon" = 20, REAGENT_ID_MUTAGEN = 20)
+ required_reagents = list(REAGENT_ID_HYDROPHORON = 40, REAGENT_ID_PERIDAXON = 20, REAGENT_ID_MUTAGEN = 20)
result_amount = 1
/decl/chemical_reaction/instant/blob_reconstitution/domination/on_reaction(var/datum/reagents/holder)
diff --git a/code/modules/blob2/overmind/types/classic.dm b/code/modules/blob2/overmind/types/classic.dm
index b7d5fe28bc..63bcdaadc2 100644
--- a/code/modules/blob2/overmind/types/classic.dm
+++ b/code/modules/blob2/overmind/types/classic.dm
@@ -31,7 +31,7 @@
if(!istype(blood))
blood = new(T)
blood.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = color))
- blood.reagents.add_reagent("tricorlidaze", 5)
+ blood.reagents.add_reagent(REAGENT_ID_TRICORLIDAZE, 5)
blood.update_icon()
return
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
index 77cd68161c..6c29ebe4be 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm
@@ -13,13 +13,13 @@
interface_desc = "Dispenses loaded chemicals directly into the wearer's bloodstream."
charges = list(
- list("tricordrazine", "tricordrazine", 0, 80),
- list("tramadol", "tramadol", 0, 80),
- list("dexalin plus", "dexalinp", 0, 80),
- list("antibiotics", "spaceacillin", 0, 80),
- list("antitoxins", "anti_toxin", 0, 80),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 80),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 80),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80),
list("nutrients", "glucose", 0, 80),
- list("hyronalin", "hyronalin", 0, 80),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80)
)
@@ -30,16 +30,16 @@
//Want more? Go refill. Gives the ninja another reason to have to show their face.
charges = list(
- list("tricordrazine", "tricordrazine", 0, 30),
- list("tramadol", "tramadol", 0, 30),
- list("dexalin plus", "dexalinp", 0, 30),
- list("antibiotics", "spaceacillin", 0, 30),
- list("antitoxins", "anti_toxin", 0, 60),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 30),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 30),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 30),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 30),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 60),
list("nutrients", "glucose", 0, 80),
- list("bicaridine", "bicaridine", 0, 30),
- list("clotting agent", "myelamine", 0, 30),
- list("peridaxon", "peridaxon", 0, 30),
- list("hyronalin", "hyronalin", 0, 30),
+ list(REAGENT_ID_BICARIDINE, REAGENT_ID_BICARIDINE, 0, 30),
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 30),
+ list(REAGENT_ID_PERIDAXON, REAGENT_ID_PERIDAXON, 0, 30),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 30),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30)
)
@@ -124,11 +124,11 @@
desc = "A complex web of tubing and needles suitable for hardsuit use."
charges = list(
- list("synaptizine", "synaptizine", 0, 30),
- list("hyperzine", "hyperzine", 0, 30),
- list("oxycodone", "oxycodone", 0, 30),
+ list(REAGENT_ID_SYNAPTIZINE, REAGENT_ID_SYNAPTIZINE, 0, 30),
+ list(REAGENT_ID_HYPERZINE, REAGENT_ID_HYPERZINE, 0, 30),
+ list(REAGENT_ID_OXYCODONE, REAGENT_ID_OXYCODONE, 0, 30),
list("nutrients", "glucose", 0, 80),
- list("clotting agent", "myelamine", 0, 80)
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80)
)
interface_name = "combat chem dispenser"
@@ -149,26 +149,26 @@
/obj/item/rig_module/chem_dispenser/injector/advanced
charges = list(
- list("tricordrazine", "tricordrazine", 0, 80),
- list("tramadol", "tramadol", 0, 80),
- list("dexalin plus", "dexalinp", 0, 80),
- list("antibiotics", "spaceacillin", 0, 80),
- list("antitoxins", "anti_toxin", 0, 80),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 80),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 80),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80),
list("nutrients", "glucose", 0, 80),
- list("hyronalin", "hyronalin", 0, 80),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80),
- list("clotting agent", "myelamine", 0, 80)
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80)
)
/obj/item/rig_module/chem_dispenser/injector/advanced/empty
charges = list(
- list("tricordrazine", "tricordrazine", 0, 0),
- list("tramadol", "tramadol", 0, 0),
- list("dexalin plus", "dexalinp", 0, 0),
- list("antibiotics", "spaceacillin", 0, 0),
- list("antitoxins", "anti_toxin", 0, 0),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 0),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 0),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 0),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 0),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 0),
list("nutrients", "glucose", 0, 0),
- list("hyronalin", "hyronalin", 0, 0),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 0),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 0),
- list("clotting agent", "myelamine", 0, 0)
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 0)
)
diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/rescue_pharm_vr.dm b/code/modules/clothing/spacesuits/rig/modules/specific/rescue_pharm_vr.dm
index 0b54dd879b..1e74c2dae2 100644
--- a/code/modules/clothing/spacesuits/rig/modules/specific/rescue_pharm_vr.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/specific/rescue_pharm_vr.dm
@@ -19,10 +19,10 @@
var/chems_to_use = 5 //Per injection
charges = list(
- list("inaprovaline", "inaprovaline", 0, 20),
- list("anti_toxin", "anti_toxin", 0, 20),
- list("paracetamol", "paracetamol", 0, 20),
- list("dexalin", "dexalin", 0, 20)
+ list(REAGENT_ID_INAPROVALINE, REAGENT_ID_INAPROVALINE, 0, 20),
+ list(REAGENT_ID_ANTITOXIN, REAGENT_ID_ANTITOXIN, 0, 20),
+ list(REAGENT_ID_PARACETAMOL, REAGENT_ID_PARACETAMOL, 0, 20),
+ list(REAGENT_ID_DEXALIN, REAGENT_ID_DEXALIN, 0, 20)
)
/obj/item/rig_module/rescue_pharm/process()
diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm
index e53816b98e..17825ed637 100644
--- a/code/modules/clothing/spacesuits/rig/modules/utility.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm
@@ -143,13 +143,13 @@
interface_desc = "Dispenses loaded chemicals directly into the wearer's bloodstream."
charges = list(
- list("tricordrazine", "tricordrazine", 0, 80),
- list("tramadol", "tramadol", 0, 80),
- list("dexalin plus", "dexalinp", 0, 80),
- list("antibiotics", "spaceacillin", 0, 80),
- list("antitoxins", "anti_toxin", 0, 80),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 80),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 80),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80),
list("nutrients", "glucose", 0, 80),
- list("hyronalin", "hyronalin", 0, 80),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80)
)
@@ -160,16 +160,16 @@
//Want more? Go refill. Gives the ninja another reason to have to show their face.
charges = list(
- list("tricordrazine", "tricordrazine", 0, 30),
- list("tramadol", "tramadol", 0, 30),
- list("dexalin plus", "dexalinp", 0, 30),
- list("antibiotics", "spaceacillin", 0, 30),
- list("antitoxins", "anti_toxin", 0, 60),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 30),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 30),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 30),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 30),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 60),
list("nutrients", "glucose", 0, 80),
- list("bicaridine", "bicaridine", 0, 30),
- list("clotting agent", "myelamine", 0, 30),
- list("peridaxon", "peridaxon", 0, 30),
- list("hyronalin", "hyronalin", 0, 30),
+ list(REAGENT_ID_BICARIDINE, REAGENT_ID_BICARIDINE, 0, 30),
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 30),
+ list(REAGENT_ID_PERIDAXON, REAGENT_ID_PERIDAXON, 0, 30),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 30),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30)
)
@@ -254,11 +254,11 @@
desc = "A complex web of tubing and needles suitable for hardsuit use."
charges = list(
- list("synaptizine", "synaptizine", 0, 30),
- list("hyperzine", "hyperzine", 0, 30),
- list("oxycodone", "oxycodone", 0, 30),
+ list(REAGENT_ID_SYNAPTIZINE, REAGENT_ID_SYNAPTIZINE, 0, 30),
+ list(REAGENT_ID_HYPERZINE, REAGENT_ID_HYPERZINE, 0, 30),
+ list(REAGENT_ID_OXYCODONE, REAGENT_ID_OXYCODONE, 0, 30),
list("nutrients", "glucose", 0, 80),
- list("clotting agent", "myelamine", 0, 80)
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80)
)
interface_name = "combat chem dispenser"
@@ -279,15 +279,15 @@
/obj/item/rig_module/chem_dispenser/injector/advanced
charges = list(
- list("tricordrazine", "tricordrazine", 0, 80),
- list("tramadol", "tramadol", 0, 80),
- list("dexalin plus", "dexalinp", 0, 80),
- list("antibiotics", "spaceacillin", 0, 80),
- list("antitoxins", "anti_toxin", 0, 80),
+ list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_TRICORDRAZINE, 0, 80),
+ list(REAGENT_ID_TRAMADOL, REAGENT_ID_TRAMADOL, 0, 80),
+ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80),
+ list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80),
+ list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80),
list("nutrients", "glucose", 0, 80),
- list("hyronalin", "hyronalin", 0, 80),
+ list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80),
list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80),
- list("clotting agent", "myelamine", 0, 80)
+ list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80)
)
/obj/item/rig_module/voice
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 6502e04ec4..d0fae7402d 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -448,7 +448,7 @@
/obj/item/reagent_containers/food/snacks/aesirsalad/Initialize()
. = ..()
reagents.add_reagent("doctorsdelight", 8)
- reagents.add_reagent("tricordrazine", 8)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 8)
/obj/item/reagent_containers/food/snacks/candy/donor
name = "Donor Candy"
@@ -807,7 +807,7 @@
if(9)
reagents.add_reagent("berryjuice", 3)
if(10)
- reagents.add_reagent("tricordrazine", 3)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 3)
/obj/item/reagent_containers/food/snacks/donut/plain/jelly/poisonberry
filling_color = "#ED1169"
@@ -1077,7 +1077,7 @@
/obj/item/reagent_containers/food/snacks/bearmeat/Initialize()
. = ..()
reagents.add_reagent("protein", 12)
- reagents.add_reagent("hyperzine", 5)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
/obj/item/reagent_containers/food/snacks/xenomeat
name = "xenomeat"
@@ -1139,7 +1139,7 @@
nutriment_amt = 2
nutriment_desc = list("heartiness" = 1, "dough" = 2)
var/warm = FALSE
- var/list/heated_reagents = list("tricordrazine" = 5)
+ var/list/heated_reagents = list(REAGENT_ID_TRICORDRAZINE = 5)
/obj/item/reagent_containers/food/snacks/donkpocket/Initialize()
. = ..()
@@ -1218,7 +1218,7 @@
name = "\improper Sin-pocket"
desc = "The food of choice for the veteran. Do NOT overconsume."
filling_color = "#6D6D00"
- heated_reagents = list("doctorsdelight" = 5, "hyperzine" = 0.75, "synaptizine" = 0.25)
+ heated_reagents = list("doctorsdelight" = 5, REAGENT_ID_HYPERZINE = 0.75, REAGENT_ID_SYNAPTIZINE = 0.25)
var/has_been_heated = 0
/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket/attack_self(mob/user)
@@ -1244,7 +1244,7 @@
/obj/item/reagent_containers/food/snacks/brainburger/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
- reagents.add_reagent("alkysine", 6)
+ reagents.add_reagent(REAGENT_ID_ALKYSINE, 6)
/obj/item/reagent_containers/food/snacks/ghostburger
name = "Ghost Burger"
@@ -1536,7 +1536,7 @@
name = "exceptional plump pie"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 8, nutriment_desc)
- reagents.add_reagent("tricordrazine", 5)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5)
/obj/item/reagent_containers/food/snacks/xemeatpie
name = "Xeno-pie"
@@ -1706,7 +1706,7 @@
/obj/item/reagent_containers/food/snacks/carrotfries/Initialize()
. = ..()
- reagents.add_reagent("imidazoline", 3)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 3)
/obj/item/reagent_containers/food/snacks/cheesyfries
@@ -2507,7 +2507,7 @@
/obj/item/reagent_containers/food/snacks/nettlesoup/Initialize()
. = ..()
reagents.add_reagent(REAGENT_ID_WATER, 5)
- reagents.add_reagent("tricordrazine", 5)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5)
/obj/item/reagent_containers/food/snacks/mysterysoup
name = "Mystery soup"
@@ -2536,7 +2536,7 @@
if(3)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent(REAGENT_ID_WATER, 5)
- reagents.add_reagent("tricordrazine", 5)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5)
if(4)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc)
reagents.add_reagent(REAGENT_ID_WATER, 10)
@@ -2558,7 +2558,7 @@
if(10)
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc)
reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5)
/obj/item/reagent_containers/food/snacks/wishsoup
name = "Wish Soup"
@@ -2663,7 +2663,7 @@
. = ..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
/obj/item/reagent_containers/food/snacks/bearstew
@@ -2681,9 +2681,9 @@
/obj/item/reagent_containers/food/snacks/bearstew/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
- reagents.add_reagent("hyperzine", 5)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5)
reagents.add_reagent(REAGENT_ID_WATER, 5)
@@ -2742,7 +2742,7 @@
reagents.add_reagent("protein", 3)
reagents.add_reagent("capsaicin", 3)
reagents.add_reagent("tomatojuice", 2)
- reagents.add_reagent("hyperzine", 5)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
///////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////Sliceable/////////////////////////////////////////////////
@@ -2950,7 +2950,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/carrotcake/Initialize()
. = ..()
- reagents.add_reagent("imidazoline", 10)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 10)
/obj/item/reagent_containers/food/snacks/slice/carrotcake
name = "Carrot Cake slice"
@@ -2980,7 +2980,7 @@
/obj/item/reagent_containers/food/snacks/sliceable/braincake/Initialize()
. = ..()
reagents.add_reagent("protein", 25)
- reagents.add_reagent("alkysine", 10)
+ reagents.add_reagent(REAGENT_ID_ALKYSINE, 10)
/obj/item/reagent_containers/food/snacks/slice/braincake
name = "Brain Cake slice"
@@ -3436,8 +3436,8 @@
. = ..()
reagents.add_reagent("protein", 2)
reagents.add_reagent(REAGENT_ID_AMBROSIAEXTRACT, 2)
- reagents.add_reagent("bicaridine", 1)
- reagents.add_reagent("kelotane", 1)
+ reagents.add_reagent(REAGENT_ID_BICARIDINE, 1)
+ reagents.add_reagent(REAGENT_ID_KELOTANE, 1)
reagents.add_reagent(REAGENT_ID_TOXIN, 1)
/obj/item/reagent_containers/food/snacks/cosmicbrowniesslice
@@ -3776,7 +3776,7 @@
. = ..()
reagents.add_reagent("protein", 5)
reagents.add_reagent("tomatojuice", 6)
- reagents.add_reagent("imidazoline", 12)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 12)
/obj/item/reagent_containers/food/snacks/slice/vegetablepizza
name = "Vegetable pizza slice"
@@ -4279,7 +4279,7 @@
. = ..()
set_light(1, 1, "#5dadcf")
- reagents.add_reagent("oxycodone", 1)
+ reagents.add_reagent(REAGENT_ID_OXYCODONE, 1)
reagents.add_reagent(REAGENT_ID_SIFSAP, 5)
reagents.add_reagent(REAGENT_ID_BLISS, 5)
@@ -4365,8 +4365,8 @@
/obj/item/reagent_containers/food/snacks/liquidvitamin/Initialize()
. = ..()
reagents.add_reagent("flour", 20)
- reagents.add_reagent("tricordrazine", 5)
- reagents.add_reagent("paracetamol", 5)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5)
+ reagents.add_reagent(REAGENT_ID_PARACETAMOL, 5)
reagents.add_reagent("enzyme", 1)
reagents.add_reagent(REAGENT_ID_IRON, 3)
@@ -7043,7 +7043,7 @@
/obj/item/reagent_containers/food/snacks/canned/spinach/Initialize()
.=..()
reagents.add_reagent(REAGENT_ID_ADRENALINE, 4)
- reagents.add_reagent("hyperzine", 4)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE, 4)
reagents.add_reagent(REAGENT_ID_IRON, 4)
//////////////////////////////Advanced Canned Food//////////////////////////////
diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm
index 0c7792e279..b236c3fd34 100644
--- a/code/modules/food/food/snacks/meat.dm
+++ b/code/modules/food/food/snacks/meat.dm
@@ -103,7 +103,7 @@
/obj/item/reagent_containers/food/snacks/bearmeat/Initialize()
. = ..()
reagents.add_reagent("protein", 12)
- reagents.add_reagent("hyperzine", 5)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
/obj/item/reagent_containers/food/snacks/xenomeat
name = "xenomeat"
@@ -170,7 +170,7 @@
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent(REAGENT_ID_PHORON, 3)
- reagents.add_reagent("myelamine", 3)
+ reagents.add_reagent(REAGENT_ID_MYELAMINE, 3)
src.bitesize = 3
/obj/item/reagent_containers/food/snacks/meat/worm/attackby(obj/item/W as obj, mob/user as mob)
diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm
index 47f5c8b145..204d150124 100644
--- a/code/modules/food/food/snacks_vr.dm
+++ b/code/modules/food/food/snacks_vr.dm
@@ -262,7 +262,7 @@
. = ..()
bitesize = 5
reagents.add_reagent("protein", 20)
- reagents.add_reagent("tricordrazine", 5)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5)
reagents.add_reagent(REAGENT_ID_IRON, 5)
/obj/item/reagent_containers/food/snacks/cuttlefish
diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm
index 7e7e86bb19..99e2fa3ba7 100644
--- a/code/modules/food/food/superfoods.dm
+++ b/code/modules/food/food/superfoods.dm
@@ -215,29 +215,29 @@
reagents.add_reagent(REAGENT_ID_STOMACID, 10)
reagents.add_reagent(REAGENT_ID_MUTAGEN, 4)
reagents.add_reagent("thirteenloko", 20)
- reagents.add_reagent("hyperzine", 10)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE, 10)
bitesize = 30
if(4)
name = "Slice Of Good" //anti-tox
desc = "A colourful slice, smelling of pear and coated in delicious cream."
nutriment_desc = list("Hapiness" = 10)
- reagents.add_reagent("anti_toxin", 2)
- reagents.add_reagent("tricordrazine", 2)
+ reagents.add_reagent(REAGENT_ID_ANTITOXIN, 2)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 2)
bitesize = 3
if(5)
name = "Slice Of Good" //anti-oxy
desc = "A light slice, it's pretty to look at and smells of vanilla."
nutriment_desc = list("Freedom" = 10)
- reagents.add_reagent("dexalinp", 2)
- reagents.add_reagent("tricordrazine", 2)
+ reagents.add_reagent(REAGENT_ID_DEXALINP, 2)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 2)
bitesize = 3
if(6)
name = "Slice Of Good" //anti-burn/brute
desc = "A hearty slice, it smells of chocolate and strawberries."
nutriment_desc = list("Love" = 10)
- reagents.add_reagent("bicaridine", 2)
- reagents.add_reagent("tricordrazine", 2)
- reagents.add_reagent("kelotane", 2)
+ reagents.add_reagent(REAGENT_ID_BICARIDINE, 2)
+ reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 2)
+ reagents.add_reagent(REAGENT_ID_KELOTANE, 2)
bitesize = 4
/obj/structure/chaoscake/attackby(var/obj/item/W, var/mob/living/user)
diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm
index 640edfbefc..38b31aa67c 100644
--- a/code/modules/food/glass/bottle.dm
+++ b/code/modules/food/glass/bottle.dm
@@ -63,7 +63,7 @@
desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("inaprovaline" = 60)
+ prefill = list(REAGENT_ID_INAPROVALINE = 60)
/obj/item/reagent_containers/glass/bottle/toxin
name = "toxin bottle"
@@ -98,7 +98,7 @@
desc = "A small bottle of dylovene. Counters poisons, and repairs damage. A wonder drug."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("anti_toxin" = 60)
+ prefill = list(REAGENT_ID_ANTITOXIN = 60)
/obj/item/reagent_containers/glass/bottle/mutagen
name = "unstable mutagen bottle"
diff --git a/code/modules/food/glass/bottle/robot.dm b/code/modules/food/glass/bottle/robot.dm
index a3da0e3b9f..d047976c9b 100644
--- a/code/modules/food/glass/bottle/robot.dm
+++ b/code/modules/food/glass/bottle/robot.dm
@@ -12,8 +12,8 @@
desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- reagent = "inaprovaline"
- prefill = list("inaprovaline" = 60)
+ reagent = REAGENT_ID_INAPROVALINE
+ prefill = list(REAGENT_ID_INAPROVALINE = 60)
/obj/item/reagent_containers/glass/bottle/robot/antitoxin
@@ -21,5 +21,5 @@
desc = "A small bottle of Anti-toxins. Counters poisons, and repairs damage, a wonder drug."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- reagent = "anti_toxin"
- prefill = list("anti_toxin" = 60)
+ reagent = REAGENT_ID_ANTITOXIN
+ prefill = list(REAGENT_ID_ANTITOXIN = 60)
diff --git a/code/modules/food/glass/bottle_potion.dm b/code/modules/food/glass/bottle_potion.dm
index e6e0cc236a..c6328c6e38 100644
--- a/code/modules/food/glass/bottle_potion.dm
+++ b/code/modules/food/glass/bottle_potion.dm
@@ -3,7 +3,7 @@
desc = "A small green bottle containing some red liquid that claims to heal injuries."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-5"
- prefill = list("bicaridine" = 30)
+ prefill = list(REAGENT_ID_BICARIDINE = 30)
/obj/item/reagent_containers/glass/bottle/potion/healing
@@ -15,32 +15,32 @@
/obj/item/reagent_containers/glass/bottle/potion/fire_resist
name = "fire resistance potion"
desc = "A small green bottle containing some orange liquid that claims to protect the drinker from fire."
- prefill = list("dermaline" = 15, "kelotane" = 15)
+ prefill = list(REAGENT_ID_DERMALINE = 15, REAGENT_ID_KELOTANE = 15)
/obj/item/reagent_containers/glass/bottle/potion/antidote
name = "antidote potion"
desc = "A small green bottle containing some green liquid that claims to cure poisoning."
- prefill = list("anti_toxin" = 30)
+ prefill = list(REAGENT_ID_ANTITOXIN = 30)
/obj/item/reagent_containers/glass/bottle/potion/water
name = "water breathing potion"
desc = "A small green bottle containing some blue liquid that claims to allow the drinker to breathe under water."
- prefill = list("dexalinp" = 30)
+ prefill = list(REAGENT_ID_DEXALINP = 30)
/obj/item/reagent_containers/glass/bottle/potion/regeneration
name = "regeneration potion"
desc = "A small green bottle containing some purple liquid that claims to regenerate severe wounds."
- prefill = list("peridaxon" = 30)
+ prefill = list(REAGENT_ID_PERIDAXON = 30)
/obj/item/reagent_containers/glass/bottle/potion/panacea
name = "panacea potion"
desc = "A small green bottle containing some white liquid that claims to cure all ailments."
- prefill = list("spaceacillin" = 30)
+ prefill = list(REAGENT_ID_SPACEACILLIN = 30)
/obj/item/reagent_containers/glass/bottle/potion/magic
name = "magic resistence potion"
desc = "A small green bottle containing some dark green liquid that claims to cure magical effects."
- prefill = list("hyronalin" = 30)
+ prefill = list(REAGENT_ID_HYRONALIN = 30)
/obj/item/reagent_containers/glass/bottle/potion/lightness
name = "feather weight potion"
@@ -50,7 +50,7 @@
/obj/item/reagent_containers/glass/bottle/potion/SOP
name = "standard operating potion"
desc = "A small green bottle containing some yellow liquid that claims to be important."
- prefill = list("myelamine" = 30)
+ prefill = list(REAGENT_ID_MYELAMINE = 30)
/obj/item/reagent_containers/glass/bottle/potion/shrink
name = "diminution potion"
@@ -65,7 +65,7 @@
/obj/item/reagent_containers/glass/bottle/potion/pain
name = "grit potion"
desc = "A small green bottle containing some thin purple liquid that claims to power through even the most perilous injuries."
- prefill = list("tramadol" = 30)
+ prefill = list(REAGENT_ID_TRAMADOL = 30)
/obj/item/reagent_containers/glass/bottle/potion/faerie
name = "faerie dance potion"
@@ -80,12 +80,12 @@
/obj/item/reagent_containers/glass/bottle/potion/speed
name = "blinding speed potion"
desc = "A small green bottle containing some bubbling orange liquid that claims to make you move at incredible speeds."
- prefill = list("hyperzine" = 30)
+ prefill = list(REAGENT_ID_HYPERZINE = 30)
/obj/item/reagent_containers/glass/bottle/potion/attractiveness
name = "love potion"
desc = "A small green bottle containing some light mint coloured liquid that claims to make you more attractive to potential partners."
- prefill = list("menthol" = 30)
+ prefill = list(REAGENT_ID_MENTHOL = 30)
/obj/item/reagent_containers/glass/bottle/potion/girljuice
name = "girl transformation potion"
@@ -105,7 +105,7 @@
/obj/item/reagent_containers/glass/bottle/potion/bonerepair
name = "mending potion"
desc = "A small green bottle containing some pale blue liquid that claims to fix that which is broken."
- prefill = list("osteodaxon" = 1)
+ prefill = list(REAGENT_ID_OSTEODAXON = 1)
/obj/item/reagent_containers/glass/bottle/potion/truepolymorph
name = "polymorph potion"
diff --git a/code/modules/food/glass/bottle_vr.dm b/code/modules/food/glass/bottle_vr.dm
index 8179250b7a..157bbc0b7a 100644
--- a/code/modules/food/glass/bottle_vr.dm
+++ b/code/modules/food/glass/bottle_vr.dm
@@ -3,7 +3,7 @@
desc = "A small bottle. Bicaridine is an analgesic medication and can be used to treat blunt trauma."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("bicaridine" = 60)
+ prefill = list(REAGENT_ID_BICARIDINE = 60)
/obj/item/reagent_containers/glass/bottle/vermicetol
name = "vermicetol bottle"
@@ -17,119 +17,119 @@
desc = "A small bottle. A fifty-fifty mix of the popular burn medications kelotane and deramline."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("dermaline" = 30, "kelotane" = 30)
+ prefill = list(REAGENT_ID_DERMALINE = 30, REAGENT_ID_KELOTANE = 30)
/obj/item/reagent_containers/glass/bottle/dermaline
name = "dermaline bottle"
desc = "A small bottle. Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("dermaline" = 60)
+ prefill = list(REAGENT_ID_DERMALINE = 60)
/obj/item/reagent_containers/glass/bottle/carthatoline
name = "carthatoline bottle"
desc = "A small bottle. Carthatoline is strong evacuant used to treat severe poisoning."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("carthatoline" = 60)
+ prefill = list(REAGENT_ID_CARTHATOLINE = 60)
/obj/item/reagent_containers/glass/bottle/dexalinp
name = "dexalinp bottle"
desc = "A small bottle. Dexalin Plus is used in the treatment of oxygen deprivation. It is highly effective."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("dexalinp" = 60)
+ prefill = list(REAGENT_ID_DEXALINP = 60)
/obj/item/reagent_containers/glass/bottle/tramadol
name = "tramadol bottle"
desc = "A small bottle. A simple, yet effective painkiller."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("tramadol" = 60)
+ prefill = list(REAGENT_ID_TRAMADOL = 60)
/obj/item/reagent_containers/glass/bottle/oxycodone
name = "oxycodone bottle"
desc = "A small bottle. An effective and very addictive painkiller."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("oxycodone" = 60)
+ prefill = list(REAGENT_ID_OXYCODONE = 60)
/obj/item/reagent_containers/glass/bottle/alkysine
name = "alkysine bottle"
desc = "A small bottle. Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("alkysine" = 60)
+ prefill = list(REAGENT_ID_ALKYSINE = 60)
/obj/item/reagent_containers/glass/bottle/imidazoline
name = "imidazoline bottle"
desc = "A small bottle. Heals eye damage."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("imidazoline" = 60)
+ prefill = list(REAGENT_ID_IMIDAZOLINE = 60)
/obj/item/reagent_containers/glass/bottle/peridaxon
name = "peridaxon bottle"
desc = "A small bottle. Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("peridaxon" = 60)
+ prefill = list(REAGENT_ID_PERIDAXON = 60)
/obj/item/reagent_containers/glass/bottle/osteodaxon
name = "osteodaxon bottle"
desc = "A small bottle. An experimental drug used to heal bone fractures."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("osteodaxon" = 60)
+ prefill = list(REAGENT_ID_OSTEODAXON = 60)
/obj/item/reagent_containers/glass/bottle/myelamine
name = "myelamine bottle"
desc = "A small bottle. Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("myelamine" = 60)
+ prefill = list(REAGENT_ID_MYELAMINE = 60)
/obj/item/reagent_containers/glass/bottle/hyronalin
name = "hyronalin bottle"
desc = "A small bottle. Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("hyronalin" = 60)
+ prefill = list(REAGENT_ID_HYRONALIN = 60)
/obj/item/reagent_containers/glass/bottle/arithrazine
name = "arithrazine bottle"
desc = "A small bottle. Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("arithrazine" = 60)
+ prefill = list(REAGENT_ID_ARITHRAZINE = 60)
/obj/item/reagent_containers/glass/bottle/spaceacillin
name = "spaceacillin bottle"
desc = "A small bottle. An all-purpose antiviral agent."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("spaceacillin" = 60)
+ prefill = list(REAGENT_ID_SPACEACILLIN = 60)
/obj/item/reagent_containers/glass/bottle/corophizine
name = "corophizine bottle"
desc = "A small bottle. A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("corophizine" = 60)
+ prefill = list(REAGENT_ID_COROPHIZINE = 60)
/obj/item/reagent_containers/glass/bottle/rezadone
name = "rezadone bottle"
desc = "A small bottle. A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("rezadone" = 60)
+ prefill = list(REAGENT_ID_REZADONE = 60)
/obj/item/reagent_containers/glass/bottle/healing_nanites
name = "healing nanites bottle"
desc = "A small bottle. Miniature medical robots that swiftly restore bodily damage."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle-4"
- prefill = list("healing_nanites" = 60)
+ prefill = list(REAGENT_ID_HEALINGNANITES = 60)
/obj/item/reagent_containers/glass/bottle/ickypak
name = "ickypak bottle"
diff --git a/code/modules/genetics/side_effects.dm b/code/modules/genetics/side_effects.dm
index 3ff4ee9416..6ee490cd56 100644
--- a/code/modules/genetics/side_effects.dm
+++ b/code/modules/genetics/side_effects.dm
@@ -24,7 +24,7 @@
H.custom_emote(VISIBLE_MESSAGE, "starts turning very red..")
/datum/genetics/side_effect/genetic_burn/finish(mob/living/carbon/human/H)
- if(H.reagents.has_reagent("dexalin"))
+ if(H.reagents.has_reagent(REAGENT_ID_DEXALIN))
return
for(var/organ_name in BP_ALL)
var/obj/item/organ/external/E = H.get_organ(organ_name)
@@ -41,7 +41,7 @@
H.custom_emote(VISIBLE_MESSAGE, "'s limbs start shivering uncontrollably.")
/datum/genetics/side_effect/bone_snap/finish(mob/living/carbon/human/H)
- if(H.reagents.has_reagent("bicaridine"))
+ if(H.reagents.has_reagent(REAGENT_ID_BICARIDINE))
return
var/organ_name = pick(BP_ALL)
var/obj/item/organ/external/E = H.get_organ(organ_name)
@@ -60,7 +60,7 @@
H.custom_emote(VISIBLE_MESSAGE, "has drool running down from [T.his] mouth.")
/datum/genetics/side_effect/confuse/finish(mob/living/carbon/human/H)
- if(H.reagents.has_reagent("anti_toxin"))
+ if(H.reagents.has_reagent(REAGENT_ID_ANTITOXIN))
return
H.Confuse(100)
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 431075c0c6..c1fef23695 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -72,7 +72,7 @@
var/list/descriptors = list()
if(reagents.has_reagent(REAGENT_ID_SUGAR) || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
descriptors |= "sweet"
- if(reagents.has_reagent("anti_toxin"))
+ if(reagents.has_reagent(REAGENT_ID_ANTITOXIN))
descriptors |= "astringent"
if(reagents.has_reagent("frostoil"))
descriptors |= "numbing"
@@ -88,11 +88,11 @@
descriptors |= "radioactive"
if(reagents.has_reagent(REAGENT_ID_AMATOXIN) || reagents.has_reagent(REAGENT_ID_TOXIN))
descriptors |= "poisonous"
- if(reagents.has_reagent(REAGENT_ID_PSILOCYBIN) || reagents.has_reagent(REAGENT_ID_BLISS) || reagents.has_reagent("earthsblood"))
+ if(reagents.has_reagent(REAGENT_ID_PSILOCYBIN) || reagents.has_reagent(REAGENT_ID_BLISS) || reagents.has_reagent(REAGENT_ID_EARTHSBLOOD))
descriptors |= "hallucinogenic"
- if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood"))
+ if(reagents.has_reagent(REAGENT_ID_BICARIDINE) || reagents.has_reagent(REAGENT_ID_EARTHSBLOOD))
descriptors |= "medicinal"
- if(reagents.has_reagent(REAGENT_ID_GOLD) || reagents.has_reagent("earthsblood"))
+ if(reagents.has_reagent(REAGENT_ID_GOLD) || reagents.has_reagent(REAGENT_ID_EARTHSBLOOD))
descriptors |= "shiny"
if(reagents.has_reagent(REAGENT_ID_LUBE))
descriptors |= "slippery"
diff --git a/code/modules/hydroponics/seedtypes/ambrosia.dm b/code/modules/hydroponics/seedtypes/ambrosia.dm
index b55b63af2b..b7b83ff848 100644
--- a/code/modules/hydroponics/seedtypes/ambrosia.dm
+++ b/code/modules/hydroponics/seedtypes/ambrosia.dm
@@ -5,7 +5,7 @@
display_name = "ambrosia vulgaris"
kitchen_tag = "ambrosia"
mutants = list("ambrosiadeus")
- chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMBROSIAEXTRACT = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMBROSIAEXTRACT = list(1,8), REAGENT_ID_KELOTANE = list(1,8,1), REAGENT_ID_BICARIDINE = list(1,10,1))
/datum/seed/ambrosia/New()
..()
@@ -25,7 +25,7 @@
display_name = "ambrosia deus"
kitchen_tag = "ambrosiadeus"
mutants = list("ambrosiainfernus", "ambrosiagaia")
- chems = list(REAGENT_ID_NUTRIMENT = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_BICARIDINE = list(1,8), REAGENT_ID_SYNAPTIZINE = list(1,8,1), REAGENT_ID_HYPERZINE = list(1,10,1), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/deus/New()
..()
@@ -38,7 +38,7 @@
display_name = "ambrosia infernus"
kitchen_tag = "ambrosiainfernus"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "oxycodone" = list(1,8), REAGENT_ID_IMPEDREZENE = list(1,10), REAGENT_ID_MINDBREAKER = list(1,10), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,3), REAGENT_ID_OXYCODONE = list(1,8), REAGENT_ID_IMPEDREZENE = list(1,10), REAGENT_ID_MINDBREAKER = list(1,10), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/infernus/New()
..()
@@ -51,7 +51,7 @@
display_name = "ambrosia gaia"
kitchen_tag = "ambrosiagaia"
mutants = null
- chems = list ("earthsblood" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,3))
+ chems = list (REAGENT_ID_EARTHSBLOOD = list(3,5), REAGENT_ID_NUTRIMENT = list(1,3))
/datum/seed/ambrosia/gaia/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/carrots.dm b/code/modules/hydroponics/seedtypes/carrots.dm
index f1e40e6320..be905b8d6a 100644
--- a/code/modules/hydroponics/seedtypes/carrots.dm
+++ b/code/modules/hydroponics/seedtypes/carrots.dm
@@ -3,7 +3,7 @@
seed_name = "carrot"
display_name = "carrots"
kitchen_tag = "carrot"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_IMIDAZOLINE = list(3,5), "carrotjuice" = list(10,20))
/datum/seed/carrots/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/flowers.dm b/code/modules/hydroponics/seedtypes/flowers.dm
index 39faaf4a3f..e50b396c3b 100644
--- a/code/modules/hydroponics/seedtypes/flowers.dm
+++ b/code/modules/hydroponics/seedtypes/flowers.dm
@@ -22,7 +22,7 @@
seed_name = "poppy"
display_name = "poppies"
kitchen_tag = "poppy"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_BICARIDINE = list(1,10))
/datum/seed/flower/poppy/New()
..()
@@ -58,7 +58,7 @@
seed_name = "lavender"
display_name = "lavender"
kitchen_tag = "lavender"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_BICARIDINE = list(1,10))
/datum/seed/flower/lavender/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/grapes.dm b/code/modules/hydroponics/seedtypes/grapes.dm
index fd63ef95bd..0da587e729 100644
--- a/code/modules/hydroponics/seedtypes/grapes.dm
+++ b/code/modules/hydroponics/seedtypes/grapes.dm
@@ -26,7 +26,7 @@
seed_name = "green grape"
display_name = "green grapevines"
mutants = null
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "kelotane" = list(3,5), "grapejuice" = list(10,10))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_KELOTANE = list(3,5), "grapejuice" = list(10,10))
/datum/seed/grapes/green/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/kudzu.dm b/code/modules/hydroponics/seedtypes/kudzu.dm
index 667ff7e845..182466a297 100644
--- a/code/modules/hydroponics/seedtypes/kudzu.dm
+++ b/code/modules/hydroponics/seedtypes/kudzu.dm
@@ -3,7 +3,7 @@
seed_name = "kudzu"
display_name = "kudzu vines"
kitchen_tag = "kudzu"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,50), "anti_toxin" = list(1,25))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_ANTITOXIN = list(1,25))
/datum/seed/kudzu/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/lettuce.dm b/code/modules/hydroponics/seedtypes/lettuce.dm
index 77281dc5e0..a8bb68b40f 100644
--- a/code/modules/hydroponics/seedtypes/lettuce.dm
+++ b/code/modules/hydroponics/seedtypes/lettuce.dm
@@ -26,7 +26,7 @@
seed_name = "glacial lettuce"
display_name = "glacial lettuce"
kitchen_tag = "icelettuce"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "paracetamol" = list(0,2))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_PARACETAMOL = list(0,2))
/datum/seed/lettuce/ice/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/malanitear.dm b/code/modules/hydroponics/seedtypes/malanitear.dm
index 15b62d23d4..67106e41f7 100644
--- a/code/modules/hydroponics/seedtypes/malanitear.dm
+++ b/code/modules/hydroponics/seedtypes/malanitear.dm
@@ -3,7 +3,7 @@
seed_name = "Malani's tear"
display_name = "Malani's tear leaves"
kitchen_tag = "mtear"
- chems = list("honey" = list(1,10), "kelotane" = list(3,5))
+ chems = list("honey" = list(1,10), REAGENT_ID_KELOTANE = list(3,5))
/datum/seed/mtear/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#4CC789")
set_trait(TRAIT_PLANT_ICON,"bush7")
set_trait(TRAIT_IDEAL_HEAT, 283)
- set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
\ No newline at end of file
+ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
diff --git a/code/modules/hydroponics/seedtypes/selemhand.dm b/code/modules/hydroponics/seedtypes/selemhand.dm
index 5b49728c61..f9e451a627 100644
--- a/code/modules/hydroponics/seedtypes/selemhand.dm
+++ b/code/modules/hydroponics/seedtypes/selemhand.dm
@@ -3,7 +3,7 @@
seed_name = "Selem's hand"
display_name = "Selem's hand leaves"
kitchen_tag = "shand"
- chems = list("bicaridine" = list(0,10))
+ chems = list(REAGENT_ID_BICARIDINE = list(0,10))
/datum/seed/shand/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#378C61")
set_trait(TRAIT_PLANT_ICON,"tree5")
set_trait(TRAIT_IDEAL_HEAT, 283)
- set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
\ No newline at end of file
+ set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
diff --git a/code/modules/hydroponics/seedtypes/surik.dm b/code/modules/hydroponics/seedtypes/surik.dm
index c9a3b9e86c..a571a0f35f 100644
--- a/code/modules/hydroponics/seedtypes/surik.dm
+++ b/code/modules/hydroponics/seedtypes/surik.dm
@@ -3,7 +3,7 @@
seed_name = "surik"
display_name = "surik vine"
kitchen_tag = "surik"
- chems = list(REAGENT_ID_IMPEDREZENE = list(1,3),"synaptizine" = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5))
+ chems = list(REAGENT_ID_IMPEDREZENE = list(1,3),REAGENT_ID_SYNAPTIZINE = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/surik/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/tobacco.dm b/code/modules/hydroponics/seedtypes/tobacco.dm
index 52136e0b15..0e11bacfa0 100644
--- a/code/modules/hydroponics/seedtypes/tobacco.dm
+++ b/code/modules/hydroponics/seedtypes/tobacco.dm
@@ -23,7 +23,7 @@
name = "stimbush"
seed_name = "stim-bush"
display_name = "stim-bush"
- chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "hyperzine" = list(1,10), "synaptizine" = list(1,5))
+ chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_HYPERZINE = list(1,10), REAGENT_ID_SYNAPTIZINE = list(1,5))
/datum/seed/tobacco/stimbush/New()
..()
diff --git a/code/modules/hydroponics/seedtypes/vale.dm b/code/modules/hydroponics/seedtypes/vale.dm
index 37cf0d7a58..fcfac20d87 100644
--- a/code/modules/hydroponics/seedtypes/vale.dm
+++ b/code/modules/hydroponics/seedtypes/vale.dm
@@ -3,7 +3,7 @@
seed_name = "vale"
display_name = "vale bush"
kitchen_tag = "vale"
- chems = list("paracetamol" = list(1,5),"dexalin" = list(1,2),REAGENT_ID_NUTRIMENT= list(1,5))
+ chems = list(REAGENT_ID_PARACETAMOL = list(1,5),REAGENT_ID_DEXALIN = list(1,2),REAGENT_ID_NUTRIMENT= list(1,5))
/datum/seed/vale/New()
..()
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index 1c307da029..c11ac18bb6 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -55,14 +55,14 @@
// Reagent information for process(), consider moving this to a controller along
// with cycle information under 'mechanical concerns' at some point.
var/static/list/toxic_reagents = list(
- "anti_toxin" = -2,
+ REAGENT_ID_ANTITOXIN = -2,
REAGENT_ID_TOXIN = 2,
REAGENT_ID_FLUORINE = 2.5,
REAGENT_ID_CHLORINE = 1.5,
REAGENT_ID_SACID = 1.5,
REAGENT_ID_PACID = 3,
REAGENT_ID_PLANTBGONE = 3,
- "cryoxadone" = -3,
+ REAGENT_ID_CRYOXADONE = -3,
REAGENT_ID_RADIUM = 2
)
var/static/list/nutrient_reagents = list(
@@ -116,7 +116,7 @@
REAGENT_ID_SACID = list( -1, 0, 0 ),
REAGENT_ID_PACID = list( -2, 0, 0 ),
REAGENT_ID_PLANTBGONE = list( -2, 0, 0.2),
- "cryoxadone" = list( 3, 0, 0 ),
+ REAGENT_ID_CRYOXADONE = list( 3, 0, 0 ),
REAGENT_ID_AMMONIA = list( 0.5, 0, 0 ),
REAGENT_ID_DIETHYLAMINE = list( 1, 0, 0 ),
REAGENT_ID_NUTRIMENT = list( 0.5, 0.1, 0 ),
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index c7834148d4..2ca495e5c9 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -31,11 +31,11 @@
var/injection_amount = 15 //How much reagent do we inject at a time?
var/heal_threshold = 10 //Start healing when they have this much damage in a category
var/use_beaker = 0 //Use reagents in beaker instead of default treatment agents.
- var/treatment_brute = "tricordrazine"
- var/treatment_oxy = "tricordrazine"
- var/treatment_fire = "tricordrazine"
- var/treatment_tox = "tricordrazine"
- var/treatment_virus = "spaceacillin"
+ var/treatment_brute = REAGENT_ID_TRICORDRAZINE
+ var/treatment_oxy = REAGENT_ID_TRICORDRAZINE
+ var/treatment_fire = REAGENT_ID_TRICORDRAZINE
+ var/treatment_tox = REAGENT_ID_TRICORDRAZINE
+ var/treatment_virus = REAGENT_ID_SPACEACILLIN
var/treatment_emag = REAGENT_ID_TOXIN
var/declare_treatment = 0 //When attempting to treat a patient, should it notify everyone wearing medhuds?
@@ -52,10 +52,10 @@
name = "\improper Mysterious Medibot"
desc = "International Medibot of mystery."
skin = "bezerk"
- treatment_brute = "bicaridine"
- treatment_fire = "dermaline"
- treatment_oxy = "dexalin"
- treatment_tox = "anti_toxin"
+ treatment_brute = REAGENT_ID_BICARIDINE
+ treatment_fire = REAGENT_ID_DERMALINE
+ treatment_oxy = REAGENT_ID_DEXALIN
+ treatment_tox = REAGENT_ID_ANTITOXIN
/mob/living/bot/medbot/handleIdle()
if(is_tipped) // Don't handle idle things if we're incapacitated!
diff --git a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
index 4a6e50cfcc..b3537fc728 100644
--- a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
+++ b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
@@ -82,8 +82,8 @@
// ========
/datum/medical_effect/headache
name = "Headache"
- triggers = list("cryoxadone" = 10, "bicaridine" = 15, "tricordrazine" = 15)
- cures = list("alkysine", "tramadol", "paracetamol", "oxycodone")
+ triggers = list(REAGENT_ID_CRYOXADONE = 10, REAGENT_ID_BICARIDINE = 15, REAGENT_ID_TRICORDRAZINE = 15)
+ cures = list(REAGENT_ID_ALKYSINE, REAGENT_ID_TRAMADOL, REAGENT_ID_PARACETAMOL, REAGENT_ID_OXYCODONE)
cure_message = "Your head stops throbbing..."
/datum/medical_effect/headache/on_life(mob/living/carbon/human/H, strength)
@@ -99,8 +99,8 @@
// ===========
/datum/medical_effect/bad_stomach
name = "Bad Stomach"
- triggers = list("kelotane" = 30, "dermaline" = 15)
- cures = list("anti_toxin")
+ triggers = list(REAGENT_ID_KELOTANE = 30, REAGENT_ID_DERMALINE = 15)
+ cures = list(REAGENT_ID_ANTITOXIN)
cure_message = "Your stomach feels a little better now..."
/datum/medical_effect/bad_stomach/on_life(mob/living/carbon/human/H, strength)
@@ -116,8 +116,8 @@
// ======
/datum/medical_effect/cramps
name = "Cramps"
- triggers = list("anti_toxin" = 30, "tramadol" = 15)
- cures = list("inaprovaline")
+ triggers = list(REAGENT_ID_ANTITOXIN = 30, REAGENT_ID_TRAMADOL = 15)
+ cures = list(REAGENT_ID_INAPROVALINE)
cure_message = "The cramps let up..."
/datum/medical_effect/cramps/on_life(mob/living/carbon/human/H, strength)
@@ -135,7 +135,7 @@
/datum/medical_effect/itch
name = "Itch"
triggers = list(REAGENT_ID_BLISS = 10)
- cures = list("inaprovaline")
+ cures = list(REAGENT_ID_INAPROVALINE)
cure_message = "The itching stops..."
/datum/medical_effect/itch/on_life(mob/living/carbon/human/H, strength)
diff --git a/code/modules/mob/living/carbon/human/chem_side_effects.dm b/code/modules/mob/living/carbon/human/chem_side_effects.dm
index 4a6e50cfcc..b3537fc728 100644
--- a/code/modules/mob/living/carbon/human/chem_side_effects.dm
+++ b/code/modules/mob/living/carbon/human/chem_side_effects.dm
@@ -82,8 +82,8 @@
// ========
/datum/medical_effect/headache
name = "Headache"
- triggers = list("cryoxadone" = 10, "bicaridine" = 15, "tricordrazine" = 15)
- cures = list("alkysine", "tramadol", "paracetamol", "oxycodone")
+ triggers = list(REAGENT_ID_CRYOXADONE = 10, REAGENT_ID_BICARIDINE = 15, REAGENT_ID_TRICORDRAZINE = 15)
+ cures = list(REAGENT_ID_ALKYSINE, REAGENT_ID_TRAMADOL, REAGENT_ID_PARACETAMOL, REAGENT_ID_OXYCODONE)
cure_message = "Your head stops throbbing..."
/datum/medical_effect/headache/on_life(mob/living/carbon/human/H, strength)
@@ -99,8 +99,8 @@
// ===========
/datum/medical_effect/bad_stomach
name = "Bad Stomach"
- triggers = list("kelotane" = 30, "dermaline" = 15)
- cures = list("anti_toxin")
+ triggers = list(REAGENT_ID_KELOTANE = 30, REAGENT_ID_DERMALINE = 15)
+ cures = list(REAGENT_ID_ANTITOXIN)
cure_message = "Your stomach feels a little better now..."
/datum/medical_effect/bad_stomach/on_life(mob/living/carbon/human/H, strength)
@@ -116,8 +116,8 @@
// ======
/datum/medical_effect/cramps
name = "Cramps"
- triggers = list("anti_toxin" = 30, "tramadol" = 15)
- cures = list("inaprovaline")
+ triggers = list(REAGENT_ID_ANTITOXIN = 30, REAGENT_ID_TRAMADOL = 15)
+ cures = list(REAGENT_ID_INAPROVALINE)
cure_message = "The cramps let up..."
/datum/medical_effect/cramps/on_life(mob/living/carbon/human/H, strength)
@@ -135,7 +135,7 @@
/datum/medical_effect/itch
name = "Itch"
triggers = list(REAGENT_ID_BLISS = 10)
- cures = list("inaprovaline")
+ cures = list(REAGENT_ID_INAPROVALINE)
cure_message = "The itching stops..."
/datum/medical_effect/itch/on_life(mob/living/carbon/human/H, strength)
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
index 034aa0ac13..122d2a824b 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
@@ -203,7 +203,7 @@
name = "MediHound hypospray"
desc = "An advanced chemical synthesizer and injection system utilizing carrier's reserves, designed for heavy-duty medical equipment."
charge_cost = 10
- reagent_ids = list("inaprovaline", "dexalin", "bicaridine", "kelotane", "anti_toxin", "spaceacillin", "paracetamol")
+ reagent_ids = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_DEXALIN, REAGENT_ID_BICARIDINE, REAGENT_ID_KELOTANE, REAGENT_ID_ANTITOXIN, REAGENT_ID_SPACEACILLIN, REAGENT_ID_PARACETAMOL)
var/datum/matter_synth/water = null
/obj/item/reagent_containers/borghypo/hound/process() //Recharges in smaller steps and uses the water reserves as well.
@@ -220,12 +220,12 @@
/obj/item/reagent_containers/borghypo/hound/lost
name = "Hound hypospray"
desc = "An advanced chemical synthesizer and injection system utilizing carrier's reserves."
- reagent_ids = list("tricordrazine", "inaprovaline", "bicaridine", "dexalin", "anti_toxin", "tramadol", "spaceacillin")
+ reagent_ids = list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_INAPROVALINE, REAGENT_ID_BICARIDINE, REAGENT_ID_DEXALIN, REAGENT_ID_ANTITOXIN, REAGENT_ID_TRAMADOL, REAGENT_ID_SPACEACILLIN)
/obj/item/reagent_containers/borghypo/hound/trauma
name = "Hound hypospray"
desc = "An advanced chemical synthesizer and injection system utilizing carrier's reserves."
- reagent_ids = list("tricordrazine", "inaprovaline", "oxycodone", "dexalin" ,"spaceacillin")
+ reagent_ids = list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_INAPROVALINE, REAGENT_ID_OXYCODONE, REAGENT_ID_DEXALIN ,REAGENT_ID_SPACEACILLIN)
//Tongue stuff
diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
index 10b7738149..e0da78daf7 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
@@ -13,7 +13,7 @@
var/min_health = -100
var/cleaning = 0
var/patient_laststat = null
- var/list/injection_chems = list("inaprovaline", "bicaridine", "kelotane", "anti_toxin", "dexalin", "tricordrazine", "spaceacillin", "tramadol") //The borg is able to heal every damage type. As a nerf, they use 750 charge per injection.
+ var/list/injection_chems = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_BICARIDINE, REAGENT_ID_KELOTANE, REAGENT_ID_ANTITOXIN, REAGENT_ID_DEXALIN, REAGENT_ID_TRICORDRAZINE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_TRAMADOL) //The borg is able to heal every damage type. As a nerf, they use 750 charge per injection.
var/eject_port = "ingestion"
var/list/items_preserved = list()
var/UI_open = FALSE
@@ -449,7 +449,7 @@
return
if(patient && !(patient.stat & DEAD)) //What is bitwise NOT? ... Thought it was tilde.
- if(href_list["inject"] == "inaprovaline" || patient.health > min_health)
+ if(href_list["inject"] == REAGENT_ID_INAPROVALINE || patient.health > min_health)
inject_chem(usr, href_list["inject"])
else
to_chat(usr, span_notice("ERROR: Subject is not in stable condition for injections."))
@@ -462,7 +462,7 @@
/obj/item/dogborg/sleeper/proc/inject_chem(mob/user, chem)
if(patient && patient.reagents)
- if(chem in injection_chems + "inaprovaline")
+ if(chem in injection_chems + REAGENT_ID_INAPROVALINE)
if(hound.cell.charge < 800) //This is so borgs don't kill themselves with it.
to_chat(hound, span_notice("You don't have enough power to synthesize fluids."))
return
@@ -748,7 +748,7 @@
name = "Supply Storage"
desc = "A mounted survival unit with fuel processor, helpful with both deliveries and assisting injured miners."
icon_state = "sleeperc"
- injection_chems = list("glucose","inaprovaline","tricordrazine")
+ injection_chems = list("glucose",REAGENT_ID_INAPROVALINE,REAGENT_ID_TRICORDRAZINE)
max_item_count = 10
recycles = FALSE
stabilizer = TRUE
@@ -775,19 +775,19 @@
name = "Emergency Storage"
desc = "A mounted 'emergency containment cell'."
icon_state = "sleeperert"
- injection_chems = list("inaprovaline", "tramadol") // short list
+ injection_chems = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_TRAMADOL) // short list
/obj/item/dogborg/sleeper/trauma //Trauma borg belly
name = "Recovery Belly"
desc = "A downgraded model of the sleeper belly, intended primarily for post-surgery recovery."
icon_state = "sleeper"
- injection_chems = list("inaprovaline", "dexalin", "tricordrazine", "spaceacillin", "oxycodone")
+ injection_chems = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_DEXALIN, REAGENT_ID_TRICORDRAZINE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_OXYCODONE)
/obj/item/dogborg/sleeper/lost
name = "Multipurpose Belly"
desc = "A multipurpose belly, capable of functioning as both sleeper and processor."
icon_state = "sleeperlost"
- injection_chems = list("tricordrazine", "bicaridine", "dexalin", "anti_toxin", "tramadol", "spaceacillin")
+ injection_chems = list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_BICARIDINE, REAGENT_ID_DEXALIN, REAGENT_ID_ANTITOXIN, REAGENT_ID_TRAMADOL, REAGENT_ID_SPACEACILLIN)
compactor = TRUE
max_item_count = 25
stabilizer = TRUE
@@ -797,7 +797,7 @@
name = "Combat Triage Belly"
desc = "A mounted sleeper that stabilizes patients and can inject reagents in the borg's reserves. This one is for more extreme combat scenarios."
icon_state = "sleepersyndiemed"
- injection_chems = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", REAGENT_ID_SYNTHBLOOD)
+ injection_chems = list(REAGENT_ID_HEALINGNANITES, REAGENT_ID_HYPERZINE, REAGENT_ID_TRAMADOL, REAGENT_ID_OXYCODONE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_PERIDAXON, REAGENT_ID_OSTEODAXON, REAGENT_ID_MYELAMINE, REAGENT_ID_SYNTHBLOOD)
digest_multiplier = 2
/obj/item/dogborg/sleeper/K9/syndie
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
index 6bf397a381..49f5b5cb05 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/stardog.dm
@@ -1437,7 +1437,7 @@
water_state = "enzyme_shallow"
under_state = "flesh_floor"
- reagent_type = "Sulphuric acid" //why not
+ reagent_type = REAGENT_ID_SACID //why not
outdoors = FALSE
var/mob/living/simple_mob/vore/overmap/stardog/linked_mob
var/mobstuff = TRUE //if false, we don't care about dogs, and that's terrible
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm
index 85087a9b15..345b20aa47 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer_powers.dm
@@ -218,7 +218,7 @@
if(chemicals < 50)
to_chat(src, span_warning("You don't have enough chemicals!"))
- var/chem = tgui_input_list(usr, "Select a chemical to secrete.", "Chemicals", list("alkysine","bicaridine","hyperzine","tramadol"))
+ var/chem = tgui_input_list(usr, "Select a chemical to secrete.", "Chemicals", list(REAGENT_ID_ALKYSINE,REAGENT_ID_BICARIDINE,REAGENT_ID_HYPERZINE,REAGENT_ID_TRAMADOL))
if(!chem || chemicals < 50 || !host || controlling || !src || stat) //Sanity check.
return
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
index ed4cea05b0..261d37a7c5 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm
@@ -49,9 +49,9 @@
var/list/bodypart_targets = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD)
var/infest_target = BP_TORSO // The currently chosen bodypart to infest.
var/mob/living/carbon/host // Our humble host.
- var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,REAGENT_ID_CONDENSEDCAPSAICINV,"frostoil")
+ var/list/produceable_chemicals = list(REAGENT_ID_INAPROVALINE,REAGENT_ID_ANTITOXIN,REAGENT_ID_ALKYSINE,REAGENT_ID_BICARIDINE,REAGENT_ID_TRAMADOL,REAGENT_ID_KELOTANE,REAGENT_ID_LEPORAZINE,REAGENT_ID_IRON,REAGENT_ID_PHORON,REAGENT_ID_CONDENSEDCAPSAICINV,"frostoil")
var/randomized_reagent = REAGENT_ID_IRON // The reagent chosen at random to be produced, if there's no one piloting the worm.
- var/passive_reagent = "paracetamol" // Reagent passively produced by the leech. Should usually be a painkiller.
+ var/passive_reagent = REAGENT_ID_PARACETAMOL // Reagent passively produced by the leech. Should usually be a painkiller.
var/feeding_delay = 30 SECONDS // How long do we have to wait to bite our host's organs?
var/last_feeding = 0
@@ -159,7 +159,7 @@
ai_holder.hostile = FALSE
ai_holder.lose_target()
alpha = 5
- if(host.reagents.has_reagent("cordradaxon") && !docile) // Overwhelms the leech with food.
+ if(host.reagents.has_reagent(REAGENT_ID_CORDRADAXON) && !docile) // Overwhelms the leech with food.
var/message = "We feel the rush of cardiac pluripotent cells in your host's blood, lulling us into docility."
to_chat(src, span_warning(message))
docile = TRUE
@@ -178,23 +178,23 @@
if(!docile && ishuman(host) && chemicals < max_chemicals)
var/mob/living/carbon/human/H = host
H.remove_blood(1)
- if(!H.reagents.has_reagent("inaprovaline"))
- H.reagents.add_reagent("inaprovaline", 1)
+ if(!H.reagents.has_reagent(REAGENT_ID_INAPROVALINE))
+ H.reagents.add_reagent(REAGENT_ID_INAPROVALINE, 1)
chemicals += 2
if(!client && !docile) // Automatic 'AI' to manage damage levels.
if(host.getBruteLoss() >= 30 && chemicals > 50)
- host.reagents.add_reagent("bicaridine", 5)
+ host.reagents.add_reagent(REAGENT_ID_BICARIDINE, 5)
chemicals -= 30
if(host.getToxLoss() >= 30 && chemicals > 50)
- var/randomchem = pickweight(list("tramadol" = 7, "anti_toxin" = 15, "frostoil" = 3))
+ var/randomchem = pickweight(list(REAGENT_ID_TRAMADOL = 7, REAGENT_ID_ANTITOXIN = 15, "frostoil" = 3))
host.reagents.add_reagent(randomchem, 5)
chemicals -= 50
if(host.getFireLoss() >= 30 && chemicals > 50)
- host.reagents.add_reagent("kelotane", 5)
- host.reagents.add_reagent("leporazine", 2)
+ host.reagents.add_reagent(REAGENT_ID_KELOTANE, 5)
+ host.reagents.add_reagent(REAGENT_ID_LEPORAZINE, 2)
chemicals -= 50
if(host.getOxyLoss() >= 30 && chemicals > 50)
@@ -202,8 +202,8 @@
chemicals -= 40
if(host.getBrainLoss() >= 10 && chemicals > 100)
- host.reagents.add_reagent("alkysine", 5)
- host.reagents.add_reagent("tramadol", 3)
+ host.reagents.add_reagent(REAGENT_ID_ALKYSINE, 5)
+ host.reagents.add_reagent(REAGENT_ID_TRAMADOL, 3)
chemicals -= 100
if(prob(30) && chemicals > 50)
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
index 93c2958519..91b62843e7 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
@@ -1007,7 +1007,7 @@ I think I covered everything.
//Alternatively bully a coder (me) to make a unique digest_mode for mob healbellies that prevents death, or something.
if(istype(A, /mob/living/carbon/human))
var/mob/living/carbon/human/P = L
- var/list/to_inject = list("myelamine","osteodaxon","spaceacillin","peridaxon", REAGENT_ID_IRON, "hyronalin")
+ var/list/to_inject = list(REAGENT_ID_MYELAMINE,REAGENT_ID_OSTEODAXON,REAGENT_ID_SPACEACILLIN,REAGENT_ID_PERIDAXON, REAGENT_ID_IRON, REAGENT_ID_HYRONALIN)
//Lets not OD them...
for(var/RG in to_inject)
if(!P.reagents.has_reagent(RG))
diff --git a/code/modules/organs/internal/liver.dm b/code/modules/organs/internal/liver.dm
index b26c864609..75e3f8dec6 100644
--- a/code/modules/organs/internal/liver.dm
+++ b/code/modules/organs/internal/liver.dm
@@ -11,7 +11,7 @@
if(owner.life_tick % PROCESS_ACCURACY == 0)
//High toxins levels are dangerous
- if(owner.getToxLoss() >= 50 && !owner.reagents.has_reagent("anti_toxin"))
+ if(owner.getToxLoss() >= 50 && !owner.reagents.has_reagent(REAGENT_ID_ANTITOXIN))
//Healthy liver suffers on its own
if (src.damage < min_broken_damage)
src.damage += 0.2 * PROCESS_ACCURACY
@@ -22,7 +22,7 @@
O.damage += 0.2 * PROCESS_ACCURACY
//Detox can heal small amounts of damage
- if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent("anti_toxin"))
+ if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent(REAGENT_ID_ANTITOXIN))
src.damage -= 0.2 * PROCESS_ACCURACY
if(src.damage < 0)
diff --git a/code/modules/organs/internal/spleen.dm b/code/modules/organs/internal/spleen.dm
index db2942926b..86299edfc8 100644
--- a/code/modules/organs/internal/spleen.dm
+++ b/code/modules/organs/internal/spleen.dm
@@ -15,7 +15,7 @@
if(owner.life_tick % spleen_tick == 0)
//High toxins levels are dangerous
- if(owner.getToxLoss() >= 30 && !owner.reagents.has_reagent("anti_toxin"))
+ if(owner.getToxLoss() >= 30 && !owner.reagents.has_reagent(REAGENT_ID_ANTITOXIN))
//Healthy liver suffers on its own
if (src.damage < min_broken_damage)
src.damage += 0.2 * spleen_tick
@@ -34,7 +34,7 @@
B.adjust_germ_level(round(rand(-3 * spleen_efficiency, -10 * spleen_efficiency)))
//Detox can heal small amounts of damage
- if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent("anti_toxin"))
+ if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent(REAGENT_ID_ANTITOXIN))
src.damage -= 0.2 * spleen_tick * spleen_efficiency
if(src.damage < 0)
diff --git a/code/modules/organs/misc.dm b/code/modules/organs/misc.dm
index 30515e746b..c6d9f32682 100644
--- a/code/modules/organs/misc.dm
+++ b/code/modules/organs/misc.dm
@@ -11,7 +11,7 @@
/obj/item/organ/internal/borer/process()
// Borer husks regenerate health, feel no pain, and are resistant to stuns and brainloss.
- for(var/chem in list("tricordrazine","tramadol","hyperzine","alkysine"))
+ for(var/chem in list(REAGENT_ID_TRICORDRAZINE,REAGENT_ID_TRAMADOL,REAGENT_ID_HYPERZINE,REAGENT_ID_ALKYSINE))
if(owner.reagents.get_reagent_amount(chem) < 3)
owner.reagents.add_reagent(chem, 5)
@@ -59,4 +59,4 @@
/obj/item/organ/internal/stack/vox/stack
name = "vox cortical stack"
- icon_state = "cortical_stack"
\ No newline at end of file
+ icon_state = "cortical_stack"
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index dd8279f67f..195abc32d0 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -757,9 +757,9 @@ Note that amputating the affected organ does in fact remove the infection from t
// Internal wounds get worse over time. Low temperatures (cryo) stop them.
if(W.internal && owner.bodytemperature >= 170)
- var/bicardose = owner.reagents.get_reagent_amount("bicaridine")
- var/inaprovaline = owner.reagents.get_reagent_amount("inaprovaline")
- var/myeldose = owner.reagents.get_reagent_amount("myelamine")
+ var/bicardose = owner.reagents.get_reagent_amount(REAGENT_ID_BICARIDINE)
+ var/inaprovaline = owner.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE)
+ var/myeldose = owner.reagents.get_reagent_amount(REAGENT_ID_MYELAMINE)
if(!(W.can_autoheal() || (bicardose && inaprovaline) || myeldose)) //bicaridine and inaprovaline stop internal wounds from growing bigger with time, unless it is so small that it is already healing
W.open_wound(0.1 * wound_update_accuracy)
diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
index 725eb699b5..a6912dfea7 100644
--- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
+++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
@@ -194,60 +194,60 @@
// ERT
/obj/item/reagent_containers/chem_disp_cartridge/inaprov
- spawn_reagent = "inaprovaline"
+ spawn_reagent = REAGENT_ID_INAPROVALINE
/obj/item/reagent_containers/chem_disp_cartridge/ryetalyn
- spawn_reagent = "ryetalyn"
+ spawn_reagent = REAGENT_ID_RYETALYN
/obj/item/reagent_containers/chem_disp_cartridge/paracetamol
- spawn_reagent = "paracetamol"
+ spawn_reagent = REAGENT_ID_PARACETAMOL
/obj/item/reagent_containers/chem_disp_cartridge/tramadol
- spawn_reagent = "tramadol"
+ spawn_reagent = REAGENT_ID_TRAMADOL
/obj/item/reagent_containers/chem_disp_cartridge/oxycodone
- spawn_reagent = "oxycodone"
+ spawn_reagent = REAGENT_ID_OXYCODONE
/obj/item/reagent_containers/chem_disp_cartridge/sterilizine
- spawn_reagent = "sterilizine"
+ spawn_reagent = REAGENT_ID_STERILIZINE
/obj/item/reagent_containers/chem_disp_cartridge/leporazine
- spawn_reagent = "leporazine"
+ spawn_reagent = REAGENT_ID_LEPORAZINE
/obj/item/reagent_containers/chem_disp_cartridge/kelotane
- spawn_reagent = "kelotane"
+ spawn_reagent = REAGENT_ID_KELOTANE
/obj/item/reagent_containers/chem_disp_cartridge/dermaline
- spawn_reagent = "dermaline"
+ spawn_reagent = REAGENT_ID_DERMALINE
/obj/item/reagent_containers/chem_disp_cartridge/dexalin
- spawn_reagent = "dexalin"
+ spawn_reagent = REAGENT_ID_DEXALIN
/obj/item/reagent_containers/chem_disp_cartridge/dexalin/small
volume = CARTRIDGE_VOLUME_SMALL // For the medicine cartridge crate, so it's not too easy to get large amounts of dexalin
/obj/item/reagent_containers/chem_disp_cartridge/dexalin_p
- spawn_reagent = "dexalinp"
+ spawn_reagent = REAGENT_ID_DEXALINP
/obj/item/reagent_containers/chem_disp_cartridge/tricord
- spawn_reagent = "tricordrazine"
+ spawn_reagent = REAGENT_ID_TRICORDRAZINE
/obj/item/reagent_containers/chem_disp_cartridge/dylovene
- spawn_reagent = "anti_toxin"
+ spawn_reagent = REAGENT_ID_ANTITOXIN
/obj/item/reagent_containers/chem_disp_cartridge/synaptizine
- spawn_reagent = "synaptizine"
+ spawn_reagent = REAGENT_ID_SYNAPTIZINE
/obj/item/reagent_containers/chem_disp_cartridge/hyronalin
- spawn_reagent = "hyronalin"
+ spawn_reagent = REAGENT_ID_HYRONALIN
/obj/item/reagent_containers/chem_disp_cartridge/arithrazine
- spawn_reagent = "arithrazine"
+ spawn_reagent = REAGENT_ID_ARITHRAZINE
/obj/item/reagent_containers/chem_disp_cartridge/alkysine
- spawn_reagent = "alkysine"
+ spawn_reagent = REAGENT_ID_ALKYSINE
/obj/item/reagent_containers/chem_disp_cartridge/imidazoline
- spawn_reagent = "imidazoline"
+ spawn_reagent = REAGENT_ID_IMIDAZOLINE
/obj/item/reagent_containers/chem_disp_cartridge/peridaxon
- spawn_reagent = "peridaxon"
+ spawn_reagent = REAGENT_ID_PERIDAXON
/obj/item/reagent_containers/chem_disp_cartridge/bicaridine
- spawn_reagent = "bicaridine"
+ spawn_reagent = REAGENT_ID_BICARIDINE
/obj/item/reagent_containers/chem_disp_cartridge/hyperzine
- spawn_reagent = "hyperzine"
+ spawn_reagent = REAGENT_ID_HYPERZINE
/obj/item/reagent_containers/chem_disp_cartridge/rezadone
- spawn_reagent = "rezadone"
+ spawn_reagent = REAGENT_ID_REZADONE
/obj/item/reagent_containers/chem_disp_cartridge/spaceacillin
- spawn_reagent = "spaceacillin"
+ spawn_reagent = REAGENT_ID_SPACEACILLIN
/obj/item/reagent_containers/chem_disp_cartridge/ethylredox
- spawn_reagent = "ethylredoxrazine"
+ spawn_reagent = REAGENT_ID_ETHYLREDOXRAZINE
/obj/item/reagent_containers/chem_disp_cartridge/sleeptox
spawn_reagent = REAGENT_ID_STOXIN
/obj/item/reagent_containers/chem_disp_cartridge/chloral
spawn_reagent = REAGENT_ID_CHLORALHYDRATE
/obj/item/reagent_containers/chem_disp_cartridge/cryoxadone
- spawn_reagent = "cryoxadone"
+ spawn_reagent = REAGENT_ID_CRYOXADONE
/obj/item/reagent_containers/chem_disp_cartridge/clonexadone
- spawn_reagent = "clonexadone"
+ spawn_reagent = REAGENT_ID_CLONEXADONE
diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
index 2115dca67d..e6de541cef 100644
--- a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
+++ b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm
@@ -11,7 +11,7 @@
//Special Ops
biomass spawn_reagent = REAGENT_ID_BIOMASS
- carthatoline spawn_reagent = "carthatoline"
- corophizine spawn_reagent = "corophizine"
- myelamine spawn_reagent = "myelamine"
- osteodaxon spawn_reagent = "osteodaxon"
+ carthatoline spawn_reagent = REAGENT_ID_CARTHATOLINE
+ corophizine spawn_reagent = REAGENT_ID_COROPHIZINE
+ myelamine spawn_reagent = REAGENT_ID_MYELAMINE
+ osteodaxon spawn_reagent = REAGENT_ID_OSTEODAXON
diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
index db299f8ebc..30dad26e77 100644
--- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
+++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
@@ -37,11 +37,11 @@
/obj/machinery/chemical_dispenser/ert
dispense_reagents = list(
- "inaprovaline", "ryetalyn", "paracetamol", "tramadol", "oxycodone", "sterilizine", "leporazine",
- "kelotane", "dermaline", "dexalin", "dexalinp", "tricordrazine", "anti_toxin", "synaptizine",
- "hyronalin", "arithrazine", "alkysine", "imidazoline", "peridaxon", "bicaridine", "hyperzine",
- "rezadone", "spaceacillin", "ethylredoxrazine", REAGENT_ID_STOXIN, REAGENT_ID_CHLORALHYDRATE, "cryoxadone",
- "clonexadone"
+ REAGENT_ID_INAPROVALINE, REAGENT_ID_RYETALYN, REAGENT_ID_PARACETAMOL, REAGENT_ID_TRAMADOL, REAGENT_ID_OXYCODONE, REAGENT_ID_STERILIZINE, REAGENT_ID_LEPORAZINE,
+ REAGENT_ID_KELOTANE, REAGENT_ID_DERMALINE, REAGENT_ID_DEXALIN, REAGENT_ID_DEXALINP, REAGENT_ID_TRICORDRAZINE, REAGENT_ID_ANTITOXIN, REAGENT_ID_SYNAPTIZINE,
+ REAGENT_ID_HYRONALIN, REAGENT_ID_ARITHRAZINE, REAGENT_ID_ALKYSINE, REAGENT_ID_IMIDAZOLINE, REAGENT_ID_PERIDAXON, REAGENT_ID_BICARIDINE, REAGENT_ID_HYPERZINE,
+ REAGENT_ID_REZADONE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_ETHYLREDOXRAZINE, REAGENT_ID_STOXIN, REAGENT_ID_CHLORALHYDRATE, REAGENT_ID_CRYOXADONE,
+ REAGENT_ID_CLONEXADONE
)
/obj/machinery/chemical_dispenser/bar_soft
diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm
index bcd14cfd74..65b32a1440 100644
--- a/code/modules/reagents/reactions/distilling/distilling.dm
+++ b/code/modules/reagents/reactions/distilling/distilling.dm
@@ -63,8 +63,8 @@
/decl/chemical_reaction/distilling/inaprovalaze
name = "Distilling Inaprovalaze"
id = "distill_inaprovalaze"
- result = "inaprovalaze"
- required_reagents = list("inaprovaline" = 2, REAGENT_ID_FOAMINGAGENT = 1)
+ result = REAGENT_ID_INAPROVALAZE
+ required_reagents = list(REAGENT_ID_INAPROVALINE = 2, REAGENT_ID_FOAMINGAGENT = 1)
result_amount = 2
reaction_rate = HALF_LIFE(10)
@@ -74,8 +74,8 @@
/decl/chemical_reaction/distilling/bicaridaze
name = "Distilling Bicaridaze"
id = "distill_bicaridaze"
- result = "bicaridaze"
- required_reagents = list("bicaridine" = 2, REAGENT_ID_FOAMINGAGENT = 1)
+ result = REAGENT_ID_BICARIDAZE
+ required_reagents = list(REAGENT_ID_BICARIDINE = 2, REAGENT_ID_FOAMINGAGENT = 1)
result_amount = 2
reaction_rate = HALF_LIFE(10)
@@ -85,8 +85,8 @@
/decl/chemical_reaction/distilling/dermalaze
name = "Distilling Dermalaze"
id = "distill_dermalaze"
- result = "dermalaze"
- required_reagents = list("dermaline" = 2, REAGENT_ID_FOAMINGAGENT = 1)
+ result = REAGENT_ID_DERMALAZE
+ required_reagents = list(REAGENT_ID_DERMALINE = 2, REAGENT_ID_FOAMINGAGENT = 1)
result_amount = 2
reaction_rate = HALF_LIFE(10)
@@ -96,8 +96,8 @@
/decl/chemical_reaction/distilling/spacomycaze
name = "Distilling Spacomycaze"
id = "distill_spacomycaze"
- result = "spacomycaze"
- required_reagents = list("paracetamol" = 1, "spaceacillin" = 1, REAGENT_ID_FOAMINGAGENT = 1)
+ result = REAGENT_ID_SPACOMYCAZE
+ required_reagents = list(REAGENT_ID_PARACETAMOL = 1, REAGENT_ID_SPACEACILLIN = 1, REAGENT_ID_FOAMINGAGENT = 1)
result_amount = 2
reaction_rate = HALF_LIFE(10)
@@ -107,8 +107,8 @@
/decl/chemical_reaction/distilling/tricorlidaze
name = "Distilling Tricorlidaze"
id = "distill_tricorlidaze"
- result = "tricorlidaze"
- required_reagents = list("tricordrazine" = 1, "sterilizine" = 1, REAGENT_ID_FOAMINGAGENT = 1)
+ result = REAGENT_ID_TRICORLIDAZE
+ required_reagents = list(REAGENT_ID_TRICORDRAZINE = 1, REAGENT_ID_STERILIZINE = 1, REAGENT_ID_FOAMINGAGENT = 1)
result_amount = 2
reaction_rate = HALF_LIFE(10)
@@ -119,7 +119,7 @@
name = "Distilling Synthplas"
id = "distill_synthplas"
result = REAGENT_ID_SYNTHBLOOD_DILUTE
- required_reagents = list("protein" = 2, REAGENT_ID_ANTIBODIES = 1, "bicaridine" = 1)
+ required_reagents = list("protein" = 2, REAGENT_ID_ANTIBODIES = 1, REAGENT_ID_BICARIDINE = 1)
result_amount = 3
reaction_rate = HALF_LIFE(15)
@@ -156,7 +156,7 @@
name = "Distilling Brute Juice"
id = "distill_brutejuice"
result = REAGENT_ID_BERSERKMED
- required_reagents = list(REAGENT_ID_BIOMASS = 1, "hyperzine" = 3, "synaptizine" = 2, REAGENT_ID_PHORON = 1)
+ required_reagents = list(REAGENT_ID_BIOMASS = 1, REAGENT_ID_HYPERZINE = 3, REAGENT_ID_SYNAPTIZINE = 2, REAGENT_ID_PHORON = 1)
result_amount = 3
temp_range = list(T0C + 600, T0C + 700)
@@ -195,7 +195,7 @@
name = "Distilling Lichpowder"
id = "distill_lichpowder"
result = REAGENT_ID_LICHPOWDER
- required_reagents = list(REAGENT_ID_ZOMBIEPOWDER = 2, "leporazine" = 1)
+ required_reagents = list(REAGENT_ID_ZOMBIEPOWDER = 2, REAGENT_ID_LEPORAZINE = 1)
result_amount = 2
reaction_rate = HALF_LIFE(8)
@@ -205,8 +205,8 @@
/decl/chemical_reaction/distilling/necroxadone
name = "Distilling Necroxadone"
id = "distill_necroxadone"
- result = "necroxadone"
- required_reagents = list(REAGENT_ID_LICHPOWDER = 1, "cryoxadone" = 1, "carthatoline" = 1)
+ result = REAGENT_ID_NECROXADONE
+ required_reagents = list(REAGENT_ID_LICHPOWDER = 1, REAGENT_ID_CRYOXADONE = 1, REAGENT_ID_CARTHATOLINE = 1)
result_amount = 2
catalysts = list(REAGENT_ID_PHORON = 5)
diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm
index 1647d8d551..4e69751c47 100644
--- a/code/modules/reagents/reactions/instant/drinks.dm
+++ b/code/modules/reagents/reactions/instant/drinks.dm
@@ -365,7 +365,7 @@
name = "The Doctor's Delight"
id = "doctordelight"
result = "doctorsdelight"
- required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 2, "tricordrazine" = 1)
+ required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 2, REAGENT_ID_TRICORDRAZINE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/irish_cream
@@ -1246,7 +1246,7 @@
name = "Godka"
id = "godka"
result = "godka"
- required_reagents = list("vodka" = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_ETHANOL = 1, "carthatoline" = 1)
+ required_reagents = list("vodka" = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_CARTHATOLINE = 1)
catalysts = list("enzyme" = 5, REAGENT_ID_HOLYWATER = 5)
result_amount = 1
@@ -1339,7 +1339,7 @@
name = "Soda Oil"
id = "sodaoil"
result = "sodaoil"
- required_reagents = list("cookingoil" = 4, "sodawater" = 1, REAGENT_ID_CARBON = 1, "tricordrazine" = 1)
+ required_reagents = list("cookingoil" = 4, "sodawater" = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_TRICORDRAZINE = 1)
result_amount = 6
/decl/chemical_reaction/instant/drinks/fusionnaire
diff --git a/code/modules/reagents/reactions/instant/food.dm b/code/modules/reagents/reactions/instant/food.dm
index 5ac6b07569..fd5d87f89b 100644
--- a/code/modules/reagents/reactions/instant/food.dm
+++ b/code/modules/reagents/reactions/instant/food.dm
@@ -153,7 +153,7 @@
name = "Syntiflesh"
id = "syntiflesh"
result = null
- required_reagents = list(REAGENT_ID_BLOOD = 5, "clonexadone" = 5)
+ required_reagents = list(REAGENT_ID_BLOOD = 5, REAGENT_ID_CLONEXADONE = 5)
result_amount = 1
/decl/chemical_reaction/instant/food/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume)
diff --git a/code/modules/reagents/reactions/instant/food_vr.dm b/code/modules/reagents/reactions/instant/food_vr.dm
index 7c39b10a75..cf34c86468 100644
--- a/code/modules/reagents/reactions/instant/food_vr.dm
+++ b/code/modules/reagents/reactions/instant/food_vr.dm
@@ -1,2 +1,2 @@
/decl/chemical_reaction/instant/food/syntiflesh
- required_reagents = list(REAGENT_ID_BLOOD = 5, "clonexadone" = 1)
+ required_reagents = list(REAGENT_ID_BLOOD = 5, REAGENT_ID_CLONEXADONE = 1)
diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm
index 365a9fa276..0fc3d46542 100644
--- a/code/modules/reagents/reactions/instant/instant.dm
+++ b/code/modules/reagents/reactions/instant/instant.dm
@@ -4,54 +4,54 @@
/* Common reactions */
/decl/chemical_reaction/instant/inaprovaline
- name = "Inaprovaline"
- id = "inaprovaline"
- result = "inaprovaline"
+ name = REAGENT_INAPROVALINE
+ id = REAGENT_ID_INAPROVALINE
+ result = REAGENT_ID_INAPROVALINE
required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_SUGAR = 1)
result_amount = 3
/decl/chemical_reaction/instant/dylovene
- name = "Dylovene"
- id = "anti_toxin"
- result = "anti_toxin"
+ name = REAGENT_ANTITOXIN
+ id = REAGENT_ID_ANTITOXIN
+ result = REAGENT_ID_ANTITOXIN
required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_POTASSIUM = 1, REAGENT_ID_NITROGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/carthatoline
- name = "Carthatoline"
- id = "carthatoline"
- result = "carthatoline"
- required_reagents = list("anti_toxin" = 1, REAGENT_ID_CARBON = 2, REAGENT_ID_PHORON = 0.1)
+ name = REAGENT_CARTHATOLINE
+ id = REAGENT_ID_CARTHATOLINE
+ result = REAGENT_ID_CARTHATOLINE
+ required_reagents = list(REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_CARBON = 2, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 1)
result_amount = 2
/decl/chemical_reaction/instant/paracetamol
- name = "Paracetamol"
- id = "paracetamol"
- result = "paracetamol"
- required_reagents = list("inaprovaline" = 1, REAGENT_ID_NITROGEN = 1, REAGENT_ID_WATER = 1)
+ name = REAGENT_PARACETAMOL
+ id = REAGENT_ID_PARACETAMOL
+ result = REAGENT_ID_PARACETAMOL
+ required_reagents = list(REAGENT_ID_INAPROVALINE = 1, REAGENT_ID_NITROGEN = 1, REAGENT_ID_WATER = 1)
result_amount = 2
/decl/chemical_reaction/instant/tramadol
- name = "Tramadol"
- id = "tramadol"
- result = "tramadol"
- required_reagents = list("paracetamol" = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_OXYGEN = 1)
+ name = REAGENT_TRAMADOL
+ id = REAGENT_ID_TRAMADOL
+ result = REAGENT_ID_TRAMADOL
+ required_reagents = list(REAGENT_ID_PARACETAMOL = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/oxycodone
- name = "Oxycodone"
- id = "oxycodone"
- result = "oxycodone"
- required_reagents = list(REAGENT_ID_ETHANOL = 1, "tramadol" = 1)
+ name = REAGENT_OXYCODONE
+ id = REAGENT_ID_OXYCODONE
+ result = REAGENT_ID_OXYCODONE
+ required_reagents = list(REAGENT_ID_ETHANOL = 1, REAGENT_ID_TRAMADOL = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
/decl/chemical_reaction/instant/sterilizine
- name = "Sterilizine"
- id = "sterilizine"
- result = "sterilizine"
- required_reagents = list(REAGENT_ID_ETHANOL = 1, "anti_toxin" = 1, REAGENT_ID_CHLORINE = 1)
+ name = REAGENT_STERILIZINE
+ id = REAGENT_ID_STERILIZINE
+ result = REAGENT_ID_STERILIZINE
+ required_reagents = list(REAGENT_ID_ETHANOL = 1, REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_CHLORINE = 1)
result_amount = 3
/decl/chemical_reaction/instant/silicate
@@ -104,24 +104,24 @@
result_amount = 3
/decl/chemical_reaction/instant/synaptizine
- name = "Synaptizine"
- id = "synaptizine"
- result = "synaptizine"
+ name = REAGENT_SYNAPTIZINE
+ id = REAGENT_ID_SYNAPTIZINE
+ result = REAGENT_ID_SYNAPTIZINE
required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_LITHIUM = 1, REAGENT_ID_WATER = 1)
result_amount = 3
/decl/chemical_reaction/instant/hyronalin
- name = "Hyronalin"
- id = "hyronalin"
- result = "hyronalin"
- required_reagents = list(REAGENT_ID_RADIUM = 1, "anti_toxin" = 1)
+ name = REAGENT_HYRONALIN
+ id = REAGENT_ID_HYRONALIN
+ result = REAGENT_ID_HYRONALIN
+ required_reagents = list(REAGENT_ID_RADIUM = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/arithrazine
- name = "Arithrazine"
- id = "arithrazine"
- result = "arithrazine"
- required_reagents = list("hyronalin" = 1, REAGENT_ID_HYDROGEN = 1)
+ name = REAGENT_ARITHRAZINE
+ id = REAGENT_ID_ARITHRAZINE
+ result = REAGENT_ID_ARITHRAZINE
+ required_reagents = list(REAGENT_ID_HYRONALIN = 1, REAGENT_ID_HYDROGEN = 1)
result_amount = 2
/decl/chemical_reaction/instant/impedrezene
@@ -132,64 +132,64 @@
result_amount = 2
/decl/chemical_reaction/instant/kelotane
- name = "Kelotane"
- id = "kelotane"
- result = "kelotane"
+ name = REAGENT_KELOTANE
+ id = REAGENT_ID_KELOTANE
+ result = REAGENT_ID_KELOTANE
required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_CARBON = 1)
result_amount = 2
log_is_important = 1
/decl/chemical_reaction/instant/peridaxon
- name = "Peridaxon"
- id = "peridaxon"
- result = "peridaxon"
- required_reagents = list("bicaridine" = 2, "clonexadone" = 2)
+ name = REAGENT_PERIDAXON
+ id = REAGENT_ID_PERIDAXON
+ result = REAGENT_ID_PERIDAXON
+ required_reagents = list(REAGENT_ID_BICARIDINE = 2, REAGENT_ID_CLONEXADONE = 2)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
/decl/chemical_reaction/instant/osteodaxon
- name = "Osteodaxon"
- id = "osteodaxon"
- result = "osteodaxon"
- required_reagents = list("bicaridine" = 2, REAGENT_ID_PHORON = 0.1, REAGENT_ID_CARPOTOXIN = 1)
+ name = REAGENT_OSTEODAXON
+ id = REAGENT_ID_OSTEODAXON
+ result = REAGENT_ID_OSTEODAXON
+ required_reagents = list(REAGENT_ID_BICARIDINE = 2, REAGENT_ID_PHORON = 0.1, REAGENT_ID_CARPOTOXIN = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
- inhibitors = list("clonexadone" = 1) // Messes with cryox
+ inhibitors = list(REAGENT_ID_CLONEXADONE = 1) // Messes with cryox
result_amount = 2
/decl/chemical_reaction/instant/respirodaxon
- name = "Respirodaxon"
- id = "respirodaxon"
- result = "respirodaxon"
- required_reagents = list("dexalinp" = 2, REAGENT_ID_BIOMASS = 2, REAGENT_ID_PHORON = 1)
+ name = REAGENT_RESPIRODAXON
+ id = REAGENT_ID_HYRONALIN
+ result = REAGENT_ID_HYRONALIN
+ required_reagents = list(REAGENT_ID_DEXALINP = 2, REAGENT_ID_BIOMASS = 2, REAGENT_ID_PHORON = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
- inhibitors = list("dexalin" = 1)
+ inhibitors = list(REAGENT_ID_DEXALIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/gastirodaxon
- name = "Gastirodaxon"
- id = "gastirodaxon"
- result = "gastirodaxon"
- required_reagents = list("carthatoline" = 1, REAGENT_ID_BIOMASS = 2, REAGENT_ID_TUNGSTEN = 2)
+ name = REAGENT_GASTIRODAXON
+ id = REAGENT_ID_GASTIRODAXON
+ result = REAGENT_ID_GASTIRODAXON
+ required_reagents = list(REAGENT_ID_CARTHATOLINE = 1, REAGENT_ID_BIOMASS = 2, REAGENT_ID_TUNGSTEN = 2)
catalysts = list(REAGENT_ID_PHORON = 5)
inhibitors = list(REAGENT_ID_LITHIUM = 1)
result_amount = 3
/decl/chemical_reaction/instant/hepanephrodaxon
- name = "Hepanephrodaxon"
- id = "hepanephrodaxon"
- result = "hepanephrodaxon"
- required_reagents = list("carthatoline" = 2, REAGENT_ID_BIOMASS = 2, REAGENT_ID_LITHIUM = 1)
+ name = REAGENT_HEPANEPHRODAXON
+ id = REAGENT_ID_HEPANEPHRODAXON
+ result = REAGENT_ID_HEPANEPHRODAXON
+ required_reagents = list(REAGENT_ID_CARTHATOLINE = 2, REAGENT_ID_BIOMASS = 2, REAGENT_ID_LITHIUM = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
inhibitors = list(REAGENT_ID_TUNGSTEN = 1)
result_amount = 2
/decl/chemical_reaction/instant/cordradaxon
- name = "Cordradaxon"
- id = "cordradaxon"
- result = "cordradaxon"
- required_reagents = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE = 1, REAGENT_ID_BIOMASS = 2, "bicaridine" = 2)
+ name = REAGENT_CORDRADAXON
+ id = REAGENT_ID_CORDRADAXON
+ result = REAGENT_ID_CORDRADAXON
+ required_reagents = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE = 1, REAGENT_ID_BIOMASS = 2, REAGENT_ID_BICARIDINE = 2)
catalysts = list(REAGENT_ID_PHORON = 5)
- inhibitors = list("clonexadone" = 1)
+ inhibitors = list(REAGENT_ID_CLONEXADONE = 1)
result_amount = 2
/decl/chemical_reaction/instant/virus_food
@@ -200,9 +200,9 @@
result_amount = 5
/decl/chemical_reaction/instant/leporazine
- name = "Leporazine"
- id = "leporazine"
- result = "leporazine"
+ name = REAGENT_LEPORAZINE
+ id = REAGENT_ID_LEPORAZINE
+ result = REAGENT_ID_LEPORAZINE
required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_COPPER = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
@@ -215,61 +215,61 @@
result_amount = 3
/decl/chemical_reaction/instant/tricordrazine
- name = "Tricordrazine"
- id = "tricordrazine"
- result = "tricordrazine"
- required_reagents = list("inaprovaline" = 1, "anti_toxin" = 1)
+ name = REAGENT_TRICORDRAZINE
+ id = REAGENT_ID_TRICORDRAZINE
+ result = REAGENT_ID_TRICORDRAZINE
+ required_reagents = list(REAGENT_ID_INAPROVALINE = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/alkysine
- name = "Alkysine"
- id = "alkysine"
- result = "alkysine"
- required_reagents = list(REAGENT_ID_CHLORINE = 1, REAGENT_ID_NITROGEN = 1, "anti_toxin" = 1)
+ name = REAGENT_ALKYSINE
+ id = REAGENT_ID_ALKYSINE
+ result = REAGENT_ID_ALKYSINE
+ required_reagents = list(REAGENT_ID_CHLORINE = 1, REAGENT_ID_NITROGEN = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/dexalin
- name = "Dexalin"
- id = "dexalin"
- result = "dexalin"
+ name = REAGENT_DEXALIN
+ id = REAGENT_ID_DEXALIN
+ result = REAGENT_ID_DEXALIN
required_reagents = list(REAGENT_ID_OXYGEN = 2, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 1)
inhibitors = list(REAGENT_ID_WATER = 1) // Messes with cryox
result_amount = 1
/decl/chemical_reaction/instant/dermaline
- name = "Dermaline"
- id = "dermaline"
- result = "dermaline"
- required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_PHOSPHORUS = 1, "kelotane" = 1)
+ name = REAGENT_DERMALINE
+ id = REAGENT_ID_DERMALINE
+ result = REAGENT_ID_DERMALINE
+ required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_PHOSPHORUS = 1, REAGENT_ID_KELOTANE = 1)
result_amount = 3
/decl/chemical_reaction/instant/dexalinp
- name = "Dexalin Plus"
- id = "dexalinp"
- result = "dexalinp"
- required_reagents = list("dexalin" = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_IRON = 1)
+ name = REAGENT_DEXALINP
+ id = REAGENT_ID_DEXALINP
+ result = REAGENT_ID_DEXALINP
+ required_reagents = list(REAGENT_ID_DEXALIN = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_IRON = 1)
result_amount = 3
/decl/chemical_reaction/instant/bicaridine
- name = "Bicaridine"
- id = "bicaridine"
- result = "bicaridine"
- required_reagents = list("inaprovaline" = 1, REAGENT_ID_CARBON = 1)
+ name = REAGENT_BICARIDINE
+ id = REAGENT_ID_BICARIDINE
+ result = REAGENT_ID_BICARIDINE
+ required_reagents = list(REAGENT_ID_INAPROVALINE = 1, REAGENT_ID_CARBON = 1)
inhibitors = list(REAGENT_ID_SUGAR = 1) // Messes up with inaprovaline
result_amount = 2
/decl/chemical_reaction/instant/myelamine
- name = "Myelamine"
- id = "myelamine"
- result = "myelamine"
- required_reagents = list("bicaridine" = 1, REAGENT_ID_IRON = 2, REAGENT_ID_SPIDERTOXIN = 1)
+ name = REAGENT_MYELAMINE
+ id = REAGENT_ID_MYELAMINE
+ result = REAGENT_ID_MYELAMINE
+ required_reagents = list(REAGENT_ID_BICARIDINE = 1, REAGENT_ID_IRON = 2, REAGENT_ID_SPIDERTOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/hyperzine
- name = "Hyperzine"
- id = "hyperzine"
- result = "hyperzine"
+ name = REAGENT_HYPERZINE
+ id = REAGENT_ID_HYPERZINE
+ result = REAGENT_ID_HYPERZINE
required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_PHOSPHORUS = 1, REAGENT_ID_SULFUR = 1)
result_amount = 3
@@ -282,76 +282,76 @@
result_amount = 2
/decl/chemical_reaction/instant/ryetalyn
- name = "Ryetalyn"
- id = "ryetalyn"
- result = "ryetalyn"
- required_reagents = list("arithrazine" = 1, REAGENT_ID_CARBON = 1)
+ name = REAGENT_RYETALYN
+ id = REAGENT_ID_RYETALYN
+ result = REAGENT_ID_RYETALYN
+ required_reagents = list(REAGENT_ID_ARITHRAZINE = 1, REAGENT_ID_CARBON = 1)
result_amount = 2
/decl/chemical_reaction/instant/cryoxadone
- name = "Cryoxadone"
- id = "cryoxadone"
- result = "cryoxadone"
- required_reagents = list("dexalin" = 1, REAGENT_ID_WATER = 1, REAGENT_ID_OXYGEN = 1)
+ name = REAGENT_CRYOXADONE
+ id = REAGENT_ID_CRYOXADONE
+ result = REAGENT_ID_CRYOXADONE
+ required_reagents = list(REAGENT_ID_DEXALIN = 1, REAGENT_ID_WATER = 1, REAGENT_ID_OXYGEN = 1)
result_amount = 3
/decl/chemical_reaction/instant/clonexadone
- name = "Clonexadone"
- id = "clonexadone"
- result = "clonexadone"
- required_reagents = list("cryoxadone" = 1, REAGENT_ID_SODIUM = 1, REAGENT_ID_PHORON = 0.1)
+ name = REAGENT_CLONEXADONE
+ id = REAGENT_ID_CLONEXADONE
+ result = REAGENT_ID_CLONEXADONE
+ required_reagents = list(REAGENT_ID_CRYOXADONE = 1, REAGENT_ID_SODIUM = 1, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
/decl/chemical_reaction/instant/mortiferin
- name = "Mortiferin"
- id = "mortiferin"
- result = "mortiferin"
- required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 1, "clonexadone" = 1, "corophizine" = 1)
+ name = REAGENT_MORTIFERIN
+ id = REAGENT_ID_MORTIFERIN
+ result = REAGENT_ID_MORTIFERIN
+ required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 1, REAGENT_ID_CLONEXADONE = 1, REAGENT_ID_COROPHIZINE = 1)
result_amount = 2
catalysts = list(REAGENT_ID_PHORON = 5)
/decl/chemical_reaction/instant/spaceacillin
- name = "Spaceacillin"
- id = "spaceacillin"
- result = "spaceacillin"
- required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 1, "inaprovaline" = 1)
+ name = REAGENT_SPACEACILLIN
+ id = REAGENT_ID_SPACEACILLIN
+ result = REAGENT_ID_SPACEACILLIN
+ required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 1, REAGENT_ID_INAPROVALINE = 1)
result_amount = 2
/decl/chemical_reaction/instant/corophizine
- name = "Corophizine"
- id = "corophizine"
- result = "corophizine"
- required_reagents = list("spaceacillin" = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_PHORON = 0.1)
+ name = REAGENT_COROPHIZINE
+ id = REAGENT_ID_COROPHIZINE
+ result = REAGENT_ID_COROPHIZINE
+ required_reagents = list(REAGENT_ID_SPACEACILLIN = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
/decl/chemical_reaction/instant/immunosuprizine
- name = "Immunosuprizine"
- id = "immunosuprizine"
- result = "immunosuprizine"
- required_reagents = list("corophizine" = 1, REAGENT_ID_TUNGSTEN = 1, REAGENT_ID_SACID = 1)
+ name = REAGENT_IMMUNOSUPRIZINE
+ id = REAGENT_ID_IMMUNOSUPRIZINE
+ result = REAGENT_ID_IMMUNOSUPRIZINE
+ required_reagents = list(REAGENT_ID_COROPHIZINE = 1, REAGENT_ID_TUNGSTEN = 1, REAGENT_ID_SACID = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
/decl/chemical_reaction/instant/imidazoline
- name = "imidazoline"
- id = "imidazoline"
- result = "imidazoline"
- required_reagents = list(REAGENT_ID_CARBON = 1, REAGENT_ID_HYDROGEN = 1, "anti_toxin" = 1)
+ name = REAGENT_ID_IMIDAZOLINE
+ id = REAGENT_ID_IMIDAZOLINE
+ result = REAGENT_ID_IMIDAZOLINE
+ required_reagents = list(REAGENT_ID_CARBON = 1, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 2
/decl/chemical_reaction/instant/ethylredoxrazine
- name = "Ethylredoxrazine"
- id = "ethylredoxrazine"
- result = "ethylredoxrazine"
- required_reagents = list(REAGENT_ID_OXYGEN = 1, "anti_toxin" = 1, REAGENT_ID_CARBON = 1)
+ name = REAGENT_ETHYLREDOXRAZINE
+ id = REAGENT_ID_ETHYLREDOXRAZINE
+ result = REAGENT_ID_ETHYLREDOXRAZINE
+ required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_CARBON = 1)
result_amount = 3
/decl/chemical_reaction/instant/calciumcarbonate
name = "Calcium Carbonate"
- id = "calciumcarbonate"
- result = "calciumcarbonate"
+ id = REAGENT_ID_CALCIUMCARBONATE
+ result = REAGENT_ID_CALCIUMCARBONATE
required_reagents = list(REAGENT_ID_OXYGEN = 3, REAGENT_ID_CALCIUM = 1, REAGENT_ID_CARBON = 1)
result_amount = 2
@@ -404,7 +404,7 @@
name = REAGENT_MINDBREAKER
id = REAGENT_ID_MINDBREAKER
result = REAGENT_ID_MINDBREAKER
- required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_HYDROGEN = 1, "anti_toxin" = 1)
+ required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_ANTITOXIN = 1)
result_amount = 3
/decl/chemical_reaction/instant/lipozine
@@ -502,9 +502,9 @@
log_is_important = 1
/decl/chemical_reaction/instant/rezadone
- name = "Rezadone"
- id = "rezadone"
- result = "rezadone"
+ name = REAGENT_REZADONE
+ id = REAGENT_ID_REZADONE
+ result = REAGENT_ID_REZADONE
required_reagents = list(REAGENT_ID_CARPOTOXIN = 1, REAGENT_ID_CRYPTOBIOLIN = 1, REAGENT_ID_COPPER = 1)
result_amount = 3
@@ -533,7 +533,7 @@
name = REAGENT_PAROXETINE
id = REAGENT_ID_PAROXETINE
result = REAGENT_ID_PAROXETINE
- required_reagents = list(REAGENT_ID_MINDBREAKER = 1, REAGENT_ID_OXYGEN = 1, "inaprovaline" = 1)
+ required_reagents = list(REAGENT_ID_MINDBREAKER = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_INAPROVALINE = 1)
result_amount = 3
/decl/chemical_reaction/instant/neurotoxin
@@ -1205,10 +1205,10 @@
result_amount = 4
/decl/chemical_reaction/instant/malish_qualem
- name = "Malish-Qualem"
- id = "malish-qualem"
- result = "malish-qualem"
- required_reagents = list("immunosuprizine" = 1, REAGENT_ID_QERRQUEM = 1, "inaprovaline" = 1)
+ name = REAGENT_MALISHQUALEM
+ id = REAGENT_ID_MALISHQUALEM
+ result = REAGENT_ID_MALISHQUALEM
+ required_reagents = list(REAGENT_ID_IMMUNOSUPRIZINE = 1, REAGENT_ID_QERRQUEM = 1, REAGENT_ID_INAPROVALINE = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 2
@@ -1226,7 +1226,7 @@
name = "Neutralize Toxic Proteins"
id = "neurotoxic_protein_neutral"
result = "protein"
- required_reagents = list("anti_toxin" = 1, REAGENT_ID_NEUROTOXIC_PROTEIN = 2)
+ required_reagents = list(REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_NEUROTOXIC_PROTEIN = 2)
result_amount = 2
/decl/chemical_reaction/instant/neutralize_carpotoxin
diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm
index 02f612893d..8cad988a79 100644
--- a/code/modules/reagents/reactions/instant/instant_vr.dm
+++ b/code/modules/reagents/reactions/instant/instant_vr.dm
@@ -5,7 +5,7 @@
name = REAGENT_SIZEOXADONE
id = REAGENT_ID_SIZEOXADONE
result = REAGENT_ID_SIZEOXADONE
- required_reagents = list("clonexadone" = 1, "tramadol" = 3, REAGENT_ID_PHORON = 1)
+ required_reagents = list(REAGENT_ID_CLONEXADONE = 1, REAGENT_ID_TRAMADOL = 3, REAGENT_ID_PHORON = 1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 5
@@ -30,7 +30,7 @@
id = REAGENT_ID_NORMALCILLIN
result = REAGENT_ID_NORMALCILLIN
// POLARISTODO requires_heating = 1
- required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, "leporazine" = 20)
+ required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, REAGENT_ID_LEPORAZINE = 20)
result_amount = 1
/decl/chemical_reaction/instant/dontcrossthebeams
@@ -53,7 +53,7 @@
name = REAGENT_AMORPHOROVIR
id = REAGENT_ID_AMORPHOROVIR
result = REAGENT_ID_AMORPHOROVIR
- required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 30, REAGENT_ID_BIOMASS = 30, "hyperzine" = 20)
+ required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 30, REAGENT_ID_BIOMASS = 30, REAGENT_ID_HYPERZINE = 20)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 1
@@ -61,21 +61,21 @@
name = REAGENT_ANDROROVIR
id = REAGENT_ID_ANDROROVIR
result = REAGENT_ID_ANDROROVIR
- required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "bicaridine" = 20, REAGENT_ID_IRON = 20, REAGENT_ID_ETHANOL = 20)
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_BICARIDINE = 20, REAGENT_ID_IRON = 20, REAGENT_ID_ETHANOL = 20)
result_amount = 1
/decl/chemical_reaction/instant/gynorovir
name = REAGENT_GYNOROVIR
id = REAGENT_ID_GYNOROVIR
result = REAGENT_ID_GYNOROVIR
- required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "inaprovaline" = 20, REAGENT_ID_SILICON = 20, REAGENT_ID_SUGAR = 20)
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_INAPROVALINE = 20, REAGENT_ID_SILICON = 20, REAGENT_ID_SUGAR = 20)
result_amount = 1
/decl/chemical_reaction/instant/androgynorovir
name = REAGENT_ANDROGYNOROVIR
id = REAGENT_ID_ANDROGYNOROVIR
result = REAGENT_ID_ANDROGYNOROVIR
- required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "anti_toxin" = 20, REAGENT_ID_FLUORINE = 20, REAGENT_ID_TUNGSTEN = 20)
+ required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_ANTITOXIN = 20, REAGENT_ID_FLUORINE = 20, REAGENT_ID_TUNGSTEN = 20)
result_amount = 1
/decl/chemical_reaction/instant/androrovir_bootleg
@@ -129,7 +129,7 @@
name = REAGENT_ICKYPAK
id = REAGENT_ID_ICKYPAK
result = REAGENT_ID_ICKYPAK
- required_reagents = list("hyperzine" = 4, REAGENT_ID_FLUOROSURFACTANT = 1)
+ required_reagents = list(REAGENT_ID_HYPERZINE = 4, REAGENT_ID_FLUOROSURFACTANT = 1)
result_amount = 5
/decl/chemical_reaction/instant/unsorbitol
@@ -152,7 +152,7 @@
name = REAGENT_VERMICETOL
id = REAGENT_ID_VERMICETOL
result = REAGENT_ID_VERMICETOL
- required_reagents = list("bicaridine" = 2, REAGENT_ID_SHOCKCHEM = 1, REAGENT_ID_PHORON = 0.1)
+ required_reagents = list(REAGENT_ID_BICARIDINE = 2, REAGENT_ID_SHOCKCHEM = 1, REAGENT_ID_PHORON = 0.1)
catalysts = list(REAGENT_ID_PHORON = 5)
result_amount = 3
diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm
index adda682adb..c2ea1ec0c3 100644
--- a/code/modules/reagents/reactions/instant/virology.dm
+++ b/code/modules/reagents/reactions/instant/virology.dm
@@ -37,7 +37,7 @@
name = REAGENT_SUGARVIRUSFOOD
id = "inaprovalinevirusfood"
result = REAGENT_ID_SUGARVIRUSFOOD
- required_reagents = list("inaprovaline" = 1, REAGENT_ID_MUTAGENVIRUSFOOD = 1)
+ required_reagents = list(REAGENT_ID_INAPROVALINE = 1, REAGENT_ID_MUTAGENVIRUSFOOD = 1)
result_amount = 2
/decl/chemical_reaction/instant/virus_food_size
@@ -157,5 +157,5 @@
id = "antibodiesmix"
result = REAGENT_ID_ANTIBODIES
required_reagents = list(REAGENT_ID_VACCINE)
- catalysts = list("inaprovaline" = 0.1)
+ catalysts = list(REAGENT_ID_INAPROVALINE = 0.1)
result_amount = 0.5
diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm
index 08a01ba3c1..9beec35380 100644
--- a/code/modules/reagents/reagent_containers/borghypo.dm
+++ b/code/modules/reagents/reagent_containers/borghypo.dm
@@ -14,25 +14,25 @@
var/recharge_time = 5 //Time it takes for shots to recharge (in seconds)
var/bypass_protection = FALSE // If true, can inject through things like spacesuits and armor.
- var/list/reagent_ids = list("tricordrazine", "inaprovaline", "anti_toxin", "tramadol", "dexalin" ,"spaceacillin")
+ var/list/reagent_ids = list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_INAPROVALINE, REAGENT_ID_ANTITOXIN, REAGENT_ID_TRAMADOL, REAGENT_ID_DEXALIN ,REAGENT_ID_SPACEACILLIN)
var/list/reagent_volumes = list()
var/list/reagent_names = list()
/obj/item/reagent_containers/borghypo/surgeon
- reagent_ids = list("inaprovaline", "dexalin", "tricordrazine", "spaceacillin", "oxycodone")
+ reagent_ids = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_DEXALIN, REAGENT_ID_TRICORDRAZINE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_OXYCODONE)
/obj/item/reagent_containers/borghypo/crisis
- reagent_ids = list("inaprovaline", "bicaridine", "kelotane", "anti_toxin", "dexalin", "tricordrazine", "spaceacillin", "tramadol")
+ reagent_ids = list(REAGENT_ID_INAPROVALINE, REAGENT_ID_BICARIDINE, REAGENT_ID_KELOTANE, REAGENT_ID_ANTITOXIN, REAGENT_ID_DEXALIN, REAGENT_ID_TRICORDRAZINE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_TRAMADOL)
/obj/item/reagent_containers/borghypo/lost
- reagent_ids = list("tricordrazine", "bicaridine", "dexalin", "anti_toxin", "tramadol", "spaceacillin")
+ reagent_ids = list(REAGENT_ID_TRICORDRAZINE, REAGENT_ID_BICARIDINE, REAGENT_ID_DEXALIN, REAGENT_ID_ANTITOXIN, REAGENT_ID_TRAMADOL, REAGENT_ID_SPACEACILLIN)
/obj/item/reagent_containers/borghypo/merc
name = "advanced cyborg hypospray"
desc = "An advanced nanite and chemical synthesizer and injection system, designed for heavy-duty medical equipment. This type is capable of safely bypassing \
thick materials that other hyposprays would struggle with."
bypass_protection = TRUE // Because mercs tend to be in spacesuits.
- reagent_ids = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", REAGENT_ID_SYNTHBLOOD)
+ reagent_ids = list(REAGENT_ID_HEALINGNANITES, REAGENT_ID_HYPERZINE, REAGENT_ID_TRAMADOL, REAGENT_ID_OXYCODONE, REAGENT_ID_SPACEACILLIN, REAGENT_ID_PERIDAXON, REAGENT_ID_OSTEODAXON, REAGENT_ID_MYELAMINE, REAGENT_ID_SYNTHBLOOD)
/obj/item/reagent_containers/borghypo/Initialize()
. = ..()
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 1e8447dc6d..e48f2fe6fd 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -282,7 +282,7 @@
/obj/item/reagent_containers/glass/beaker/cryoxadone
name = "beaker (cryoxadone)"
- prefill = list("cryoxadone" = 30)
+ prefill = list(REAGENT_ID_CRYOXADONE = 30)
/obj/item/reagent_containers/glass/beaker/sulphuric
prefill = list(REAGENT_ID_SACID = 60)
diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm
index 3510c179ed..29f663faff 100644
--- a/code/modules/reagents/reagent_containers/glass_vr.dm
+++ b/code/modules/reagents/reagent_containers/glass_vr.dm
@@ -3,51 +3,51 @@
/obj/item/reagent_containers/glass/beaker/vial/bicaridine
name = "vial (bicaridine)"
- prefill = list("bicaridine" = 30)
+ prefill = list(REAGENT_ID_BICARIDINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/dylovene
name = "vial (dylovene)"
- prefill = list("dylovene" = 30)
+ prefill = list(REAGENT_ID_ANTITOXIN = 30)
/obj/item/reagent_containers/glass/beaker/vial/dermaline
name = "vial (dermaline)"
- prefill = list("dermaline" = 30)
+ prefill = list(REAGENT_ID_DERMALINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/kelotane
name = "vial (kelotane)"
- prefill = list("kelotane" = 30)
+ prefill = list(REAGENT_ID_KELOTANE = 30)
/obj/item/reagent_containers/glass/beaker/vial/inaprovaline
name = "vial (inaprovaline)"
- prefill = list("inaprovaline" = 30)
+ prefill = list(REAGENT_ID_INAPROVALINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/dexalin
name = "vial (dexalin)"
- prefill = list("dexalin" = 30)
+ prefill = list(REAGENT_ID_DEXALIN = 30)
/obj/item/reagent_containers/glass/beaker/vial/dexalinplus
name = "vial (dexalinp)"
- prefill = list("dexalinp" = 30)
+ prefill = list(REAGENT_ID_DEXALINP = 30)
/obj/item/reagent_containers/glass/beaker/vial/tricordrazine
name = "vial (tricordrazine)"
- prefill = list("tricordrazine" = 30)
+ prefill = list(REAGENT_ID_TRICORDRAZINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/alkysine
name = "vial (alkysine)"
- prefill = list("alkysine" = 30)
+ prefill = list(REAGENT_ID_ALKYSINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/imidazoline
name = "vial (imidazoline)"
- prefill = list("imidazoline" = 30)
+ prefill = list(REAGENT_ID_IMIDAZOLINE = 30)
/obj/item/reagent_containers/glass/beaker/vial/peridaxon
name = "vial (peridaxon)"
- prefill = list("peridaxon" = 30)
+ prefill = list(REAGENT_ID_PERIDAXON = 30)
/obj/item/reagent_containers/glass/beaker/vial/hyronalin
name = "vial (hyronalin)"
- prefill = list("hyronalin" = 30)
+ prefill = list(REAGENT_ID_HYRONALIN = 30)
/obj/item/reagent_containers/glass/beaker/vial/amorphorovir
name = "vial (" + REAGENT_ID_AMORPHOROVIR + ")"
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index d8152f9759..f69d56feb8 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -154,7 +154,7 @@
amount_per_transfer_from_this = 5
volume = 5
filled = 1
- filled_reagents = list("inaprovaline" = 5)
+ filled_reagents = list(REAGENT_ID_INAPROVALINE = 5)
preserve_item = 0
hyposound = 'sound/effects/hypospray.ogg'
@@ -194,18 +194,18 @@
/obj/item/reagent_containers/hypospray/autoinjector/detox
name = "autoinjector (antitox)"
icon_state = "green"
- filled_reagents = list("anti_toxin" = 5)
+ filled_reagents = list(REAGENT_ID_ANTITOXIN = 5)
//Special autoinjectors, while having potent chems like the 15u ones, the chems are usually potent enough that 5u is enough
/obj/item/reagent_containers/hypospray/autoinjector/bonemed
name = "bone repair injector"
desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel. This one excels at treating damage to bones."
- filled_reagents = list("osteodaxon" = 5)
+ filled_reagents = list(REAGENT_ID_OSTEODAXON = 5)
/obj/item/reagent_containers/hypospray/autoinjector/clonemed
name = "clone injector"
desc = "A rapid and safe way to administer small amounts of drugs by untrained or trained personnel. This one excels at treating genetic damage."
- filled_reagents = list("rezadone" = 5)
+ filled_reagents = list(REAGENT_ID_REZADONE = 5)
// These have a 15u capacity, somewhat higher tech level, and generally more useful chems, but are otherwise the same as the regular autoinjectors.
/obj/item/reagent_containers/hypospray/autoinjector/biginjector
@@ -215,7 +215,7 @@
amount_per_transfer_from_this = 15
volume = 15
origin_tech = list(TECH_BIO = 4)
- filled_reagents = list("inaprovaline" = 15)
+ filled_reagents = list(REAGENT_ID_INAPROVALINE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/empty //for the autolathe
name = "large autoinjector"
@@ -226,52 +226,52 @@
name = "trauma hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to be used on victims of \
moderate blunt trauma."
- filled_reagents = list("bicaridine" = 15)
+ filled_reagents = list(REAGENT_ID_BICARIDINE = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn
name = "burn hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to be used on burn victims, \
featuring an optimized chemical mixture to allow for rapid healing."
- filled_reagents = list("kelotane" = 7.5, "dermaline" = 7.5)
+ filled_reagents = list(REAGENT_ID_KELOTANE = 7.5, REAGENT_ID_DERMALINE = 7.5)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin
name = "toxin hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to counteract toxins."
- filled_reagents = list("anti_toxin" = 15)
+ filled_reagents = list(REAGENT_ID_ANTITOXIN = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy
name = "oxy hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one is made to counteract oxygen \
deprivation."
- filled_reagents = list("dexalinp" = 10, "tricordrazine" = 5)
+ filled_reagents = list(REAGENT_ID_DEXALINP = 10, REAGENT_ID_TRICORDRAZINE = 5)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity
name = "purity hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This variant excels at \
resolving viruses, infections, radiation, and genetic maladies."
- filled_reagents = list("spaceacillin" = 4, "arithrazine" = 5, REAGENT_ID_PRUSSIANBLUE = 5, "ryetalyn" = 1)
+ filled_reagents = list(REAGENT_ID_SPACEACILLIN = 4, REAGENT_ID_ARITHRAZINE = 5, REAGENT_ID_PRUSSIANBLUE = 5, REAGENT_ID_RYETALYN = 1)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain
name = "pain hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This one contains potent painkillers."
- filled_reagents = list("tramadol" = 15)
+ filled_reagents = list(REAGENT_ID_TRAMADOL = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ
name = "organ hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. Organ damage is resolved by this variant."
- filled_reagents = list("alkysine" = 3, "imidazoline" = 2, "peridaxon" = 10)
+ filled_reagents = list(REAGENT_ID_ALKYSINE = 3, REAGENT_ID_IMIDAZOLINE = 2, REAGENT_ID_PERIDAXON = 10)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat
name = "combat hypo"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This is a more dangerous and potentially \
addictive hypo compared to others, as it contains a potent cocktail of various chemicals to optimize the recipient's combat \
ability."
- filled_reagents = list("bicaridine" = 3, "kelotane" = 1.5, "dermaline" = 1.5, "oxycodone" = 3, "hyperzine" = 3, "tricordrazine" = 3)
+ filled_reagents = list(REAGENT_ID_BICARIDINE = 3, REAGENT_ID_KELOTANE = 1.5, REAGENT_ID_DERMALINE = 1.5, REAGENT_ID_OXYCODONE = 3, REAGENT_ID_HYPERZINE = 3, REAGENT_ID_TRICORDRAZINE = 3)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting
name = "clotting agent"
desc = "A refined version of the standard autoinjector, allowing greater capacity. This variant excels at treating bleeding wounds and internal bleeding."
- filled_reagents = list("inaprovaline" = 5, "myelamine" = 10)
+ filled_reagents = list(REAGENT_ID_INAPROVALINE = 5, REAGENT_ID_MYELAMINE = 10)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose
name = "glucose hypo"
@@ -361,7 +361,7 @@
The injector stores a slurry of highly advanced and specialized nanomachines designed \
to restore bodily health from within. The nanomachines are short-lived but degrade \
harmlessly, and cannot self-replicate in order to remain Five Points compliant."
- filled_reagents = list("healing_nanites" = 15)
+ filled_reagents = list(REAGENT_ID_HEALINGNANITES = 15)
/obj/item/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites
name = "defective nanite injector"
diff --git a/code/modules/reagents/reagent_containers/hypospray_vr.dm b/code/modules/reagents/reagent_containers/hypospray_vr.dm
index 37d273a5cf..c620419558 100644
--- a/code/modules/reagents/reagent_containers/hypospray_vr.dm
+++ b/code/modules/reagents/reagent_containers/hypospray_vr.dm
@@ -1,22 +1,22 @@
/obj/item/reagent_containers/hypospray/autoinjector/burn
name = "autoinjector (burn)"
icon_state = "purple"
- filled_reagents = list("dermaline" = 3.5, "leporazine" = 1.5)
+ filled_reagents = list(REAGENT_ID_DERMALINE = 3.5, REAGENT_ID_LEPORAZINE = 1.5)
/obj/item/reagent_containers/hypospray/autoinjector/trauma
name = "autoinjector (trauma)"
icon_state = "black"
- filled_reagents = list("bicaridine" = 4, "tramadol" = 1)
+ filled_reagents = list(REAGENT_ID_BICARIDINE = 4, REAGENT_ID_TRAMADOL = 1)
/obj/item/reagent_containers/hypospray/autoinjector/oxy
name = "autoinjector (oxy)"
icon_state = "blue"
- filled_reagents = list("dexalinp" = 5)
+ filled_reagents = list(REAGENT_ID_DEXALINP = 5)
/obj/item/reagent_containers/hypospray/autoinjector/rad
name = "autoinjector (rad)"
icon_state = "black"
- filled_reagents = list("hyronalin" = 5)
+ filled_reagents = list(REAGENT_ID_HYRONALIN = 5)
/obj/item/storage/box/traumainjectors
name = "box of emergency injectors"
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 202f454fc6..a52c847a65 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -120,13 +120,13 @@
//Pills
/obj/item/reagent_containers/pill/antitox
- name = "Dylovene (30u)" //VOREStation Edit
+ name = REAGENT_ANTITOXIN + " (30u)" //VOREStation Edit
desc = "Neutralizes many common toxins."
icon_state = "pill1"
/obj/item/reagent_containers/pill/antitox/Initialize()
. = ..()
- reagents.add_reagent("anti_toxin", 30) //VOREStation Edit
+ reagents.add_reagent(REAGENT_ID_ANTITOXIN, 30) //VOREStation Edit
color = reagents.get_color()
/obj/item/reagent_containers/pill/tox
@@ -150,7 +150,7 @@
/obj/item/reagent_containers/pill/adminordrazine
- name = "Adminordrazine pill"
+ name = REAGENT_ADMINORDRAZINE + " pill"
desc = "It's magic. We don't have to explain it."
icon_state = "pillA"
@@ -160,7 +160,7 @@
/obj/item/reagent_containers/pill/stox
- name = "Soporific (15u)"
+ name = REAGENT_STOXIN + " (15u)"
desc = "Commonly used to treat insomnia."
icon_state = "pill2"
@@ -170,37 +170,37 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/kelotane
- name = "Kelotane (20u)" //VOREStation Edit
+ name = REAGENT_KELOTANE + " (20u)" //VOREStation Edit
desc = "Used to treat burns."
icon_state = "pill3"
/obj/item/reagent_containers/pill/kelotane/Initialize()
. = ..()
- reagents.add_reagent("kelotane", 20) //VOREStation Edit
+ reagents.add_reagent(REAGENT_ID_KELOTANE, 20) //VOREStation Edit
color = reagents.get_color()
/obj/item/reagent_containers/pill/paracetamol
- name = "Paracetamol (15u)"
- desc = "Paracetamol! A painkiller for the ages. Chewables!"
+ name = REAGENT_PARACETAMOL + " (15u)"
+ desc = REAGENT_PARACETAMOL + "! A painkiller for the ages. Chewables!"
icon_state = "pill3"
/obj/item/reagent_containers/pill/paracetamol/Initialize()
. = ..()
- reagents.add_reagent("paracetamol", 15)
+ reagents.add_reagent(REAGENT_ID_PARACETAMOL, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/tramadol
- name = "Tramadol (15u)"
+ name = REAGENT_TRAMADOL + " (15u)"
desc = "A simple painkiller."
icon_state = "pill3"
/obj/item/reagent_containers/pill/tramadol/Initialize()
. = ..()
- reagents.add_reagent("tramadol", 15)
+ reagents.add_reagent(REAGENT_ID_TRAMADOL, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/methylphenidate
- name = "Methylphenidate (15u)"
+ name = REAGENT_METHYLPHENIDATE + " (15u)"
desc = "Improves the ability to concentrate."
icon_state = "pill2"
@@ -210,7 +210,7 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/citalopram
- name = "Citalopram (15u)"
+ name = REAGENT_CITALOPRAM + " (15u)"
desc = "Mild anti-depressant."
icon_state = "pill4"
@@ -220,77 +220,77 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/dexalin
- name = "Dexalin (7.5u)" //VOREstation Edit
+ name = REAGENT_DEXALIN + " (7.5u)" //VOREstation Edit
desc = "Used to treat oxygen deprivation."
icon_state = "pill1"
/obj/item/reagent_containers/pill/dexalin/Initialize()
. = ..()
- reagents.add_reagent("dexalin", 7.5) //VOREStation Edit
+ reagents.add_reagent(REAGENT_ID_DEXALIN, 7.5) //VOREStation Edit
color = reagents.get_color()
/obj/item/reagent_containers/pill/dexalin_plus
- name = "Dexalin Plus (15u)"
+ name = REAGENT_DEXALINP + " (15u)"
desc = "Used to treat extreme oxygen deprivation."
icon_state = "pill2"
/obj/item/reagent_containers/pill/dexalin_plus/Initialize()
. = ..()
- reagents.add_reagent("dexalinp", 15)
+ reagents.add_reagent(REAGENT_ID_DEXALINP, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/dermaline
- name = "Dermaline (15u)"
+ name = REAGENT_DERMALINE + " (15u)"
desc = "Used to treat burn wounds."
icon_state = "pill2"
/obj/item/reagent_containers/pill/dermaline/Initialize()
. = ..()
- reagents.add_reagent("dermaline", 15)
+ reagents.add_reagent(REAGENT_ID_DERMALINE, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/dylovene
- name = "Dylovene (15u)"
+ name = REAGENT_ANTITOXIN + " (15u)"
desc = "A broad-spectrum anti-toxin."
icon_state = "pill1"
/obj/item/reagent_containers/pill/dylovene/Initialize()
. = ..()
- reagents.add_reagent("anti_toxin", 15)
+ reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/inaprovaline
- name = "Inaprovaline (30u)"
+ name = REAGENT_INAPROVALINE + " (30u)"
desc = "Used to stabilize patients."
icon_state = "pill2"
/obj/item/reagent_containers/pill/inaprovaline/Initialize()
. = ..()
- reagents.add_reagent("inaprovaline", 30)
+ reagents.add_reagent(REAGENT_ID_INAPROVALINE, 30)
color = reagents.get_color()
/obj/item/reagent_containers/pill/bicaridine
- name = "Bicaridine (20u)"
+ name = REAGENT_BICARIDINE + " (20u)"
desc = "Used to treat physical injuries."
icon_state = "pill2"
/obj/item/reagent_containers/pill/bicaridine/Initialize()
. = ..()
- reagents.add_reagent("bicaridine", 20)
+ reagents.add_reagent(REAGENT_ID_BICARIDINE, 20)
color = reagents.get_color()
/obj/item/reagent_containers/pill/spaceacillin
- name = "Spaceacillin (15u)" //VOREStation Edit
+ name = REAGENT_SPACEACILLIN + " (15u)" //VOREStation Edit
desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space."
icon_state = "pill3"
/obj/item/reagent_containers/pill/spaceacillin/Initialize()
. = ..()
- reagents.add_reagent("spaceacillin", 15)
+ reagents.add_reagent(REAGENT_ID_SPACEACILLIN, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/carbon
- name = "Carbon (30u)" //VOREStation Edit
+ name = REAGENT_CARBON + " (30u)" //VOREStation Edit
desc = "Used to neutralise chemicals in the stomach."
icon_state = "pill3"
@@ -300,7 +300,7 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/iron
- name = "Iron (30u)" //VOREStation Edit
+ name = REAGENT_IRON + " (30u)" //VOREStation Edit
desc = "Used to aid in blood regeneration after bleeding for red-blooded crew."
icon_state = "pill1"
@@ -310,7 +310,7 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/copper
- name = "Copper (30u)"
+ name = REAGENT_COPPER + " (30u)"
desc = "Used to aid in blood regeneration after bleeding for blue-blooded crew."
icon_state = "pill1"
diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm
index 3a4fadc2f7..659792bf79 100644
--- a/code/modules/reagents/reagent_containers/pill_vr.dm
+++ b/code/modules/reagents/reagent_containers/pill_vr.dm
@@ -1,6 +1,6 @@
/obj/item/reagent_containers/pill/nutriment
- name = "Nutriment (30u)"
- desc = "Used to feed people on the field. Contains 30 units of Nutriment."
+ name = REAGENT_NUTRIMENT + " (30u)"
+ desc = "Used to feed people on the field. Contains 30 units of " + REAGENT_NUTRIMENT + "."
icon_state = "pill10"
/obj/item/reagent_containers/pill/nutriment/Initialize()
@@ -8,8 +8,8 @@
reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
/obj/item/reagent_containers/pill/protein
- name = "Protein (30u)"
- desc = "Used to feed carnivores on the field. Contains 30 units of Protein."
+ name = REAGENT_PROTEIN + " (30u)"
+ desc = "Used to feed carnivores on the field. Contains 30 units of " + REAGENT_PROTEIN + "."
icon_state = "pill24"
/obj/item/reagent_containers/pill/protein/Initialize()
@@ -17,108 +17,108 @@
reagents.add_reagent("protein", 30)
/obj/item/reagent_containers/pill/rezadone
- name = "Rezadone (5u)"
+ name = REAGENT_REZADONE + " (5u)"
desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
icon_state = "pill2"
/obj/item/reagent_containers/pill/rezadone/Initialize()
. = ..()
- reagents.add_reagent("rezadone", 5)
+ reagents.add_reagent(REAGENT_ID_REZADONE, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/peridaxon
- name = "Peridaxon (10u)"
+ name = REAGENT_PERIDAXON + " (10u)"
desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
icon_state = "pill10"
/obj/item/reagent_containers/pill/peridaxon/Initialize()
. = ..()
- reagents.add_reagent("peridaxon", 10)
+ reagents.add_reagent(REAGENT_ID_PERIDAXON, 10)
/obj/item/reagent_containers/pill/carthatoline
- name = "Carthatoline (15u)"
- desc = "Carthatoline is strong evacuant used to treat severe poisoning."
+ name = REAGENT_CARTHATOLINE + " (15u)"
+ desc = REAGENT_CARTHATOLINE + " is strong evacuant used to treat severe poisoning."
icon_state = "pill4"
/obj/item/reagent_containers/pill/carthatoline/Initialize()
. = ..()
- reagents.add_reagent("carthatoline", 15)
+ reagents.add_reagent(REAGENT_ID_CARTHATOLINE, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/alkysine
- name = "Alkysine (10u)"
- desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
+ name = REAGENT_ALKYSINE + " (10u)"
+ desc = REAGENT_ALKYSINE + " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
icon_state = "pill3"
/obj/item/reagent_containers/pill/alkysine/Initialize()
. = ..()
- reagents.add_reagent("alkysine", 10)
+ reagents.add_reagent(REAGENT_ID_ALKYSINE, 10)
color = reagents.get_color()
/obj/item/reagent_containers/pill/imidazoline
- name = "Imidazoline (15u)"
+ name = REAGENT_IMIDAZOLINE + " (15u)"
desc = "Heals eye damage."
icon_state = "pill3"
/obj/item/reagent_containers/pill/imidazoline/Initialize()
. = ..()
- reagents.add_reagent("imidazoline", 15)
+ reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/osteodaxon
- name = "Osteodaxon (25u)"
+ name = REAGENT_OSTEODAXON + " (25u)"
desc = "An experimental drug used to heal bone fractures."
icon_state = "pill2"
/obj/item/reagent_containers/pill/osteodaxon/Initialize()
. = ..()
- reagents.add_reagent("osteodaxon", 15)
- reagents.add_reagent("inaprovaline", 10)
+ reagents.add_reagent(REAGENT_ID_OSTEODAXON, 15)
+ reagents.add_reagent(REAGENT_ID_INAPROVALINE, 10)
color = reagents.get_color()
/obj/item/reagent_containers/pill/myelamine
- name = "Myelamine (25u)"
+ name = REAGENT_MYELAMINE + " (25u)"
desc = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets."
icon_state = "pill1"
/obj/item/reagent_containers/pill/myelamine/Initialize()
. = ..()
- reagents.add_reagent("myelamine", 15)
- reagents.add_reagent("inaprovaline", 10)
+ reagents.add_reagent(REAGENT_ID_MYELAMINE, 15)
+ reagents.add_reagent(REAGENT_ID_INAPROVALINE, 10)
color = reagents.get_color()
/obj/item/reagent_containers/pill/hyronalin
- name = "Hyronalin (15u)"
- desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
+ name = REAGENT_HYRONALIN + " (15u)"
+ desc = REAGENT_HYRONALIN + " is a medicinal drug used to counter the effect of radiation poisoning."
icon_state = "pill4"
/obj/item/reagent_containers/pill/hyronalin/Initialize()
. = ..()
- reagents.add_reagent("hyronalin", 15)
+ reagents.add_reagent(REAGENT_ID_HYRONALIN, 15)
color = reagents.get_color()
/obj/item/reagent_containers/pill/arithrazine
- name = "Arithrazine (5u)"
- desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
+ name = REAGENT_ARITHRAZINE + " (5u)"
+ desc = REAGENT_ARITHRAZINE + " is an unstable medication used for the most extreme cases of radiation poisoning."
icon_state = "pill2"
/obj/item/reagent_containers/pill/arithrazine/Initialize()
. = ..()
- reagents.add_reagent("arithrazine", 5)
+ reagents.add_reagent(REAGENT_ID_ARITHRAZINE, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/corophizine
- name = "Corophizine (5u)"
+ name = REAGENT_COROPHIZINE + " (5u)"
desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
icon_state = "pill2"
/obj/item/reagent_containers/pill/corophizine/Initialize()
. = ..()
- reagents.add_reagent("corophizine", 5)
+ reagents.add_reagent(REAGENT_ID_COROPHIZINE, 5)
color = reagents.get_color()
/obj/item/reagent_containers/pill/vermicetol
- name = "Vermicetol (15u)"
+ name = REAGENT_VERMICETOL + " (15u)"
desc = "An extremely potent drug to treat physical injuries."
icon_state = "pill1"
@@ -128,17 +128,17 @@
color = reagents.get_color()
/obj/item/reagent_containers/pill/healing_nanites
- name = "Healing nanites (30u)"
+ name = REAGENT_HEALINGNANITES + " (30u)"
desc = "Miniature medical robots that swiftly restore bodily damage."
icon_state = "pill1"
/obj/item/reagent_containers/pill/healing_nanites/Initialize()
. = ..()
- reagents.add_reagent("healing_nanites", 30)
+ reagents.add_reagent(REAGENT_ID_HEALINGNANITES, 30)
color = reagents.get_color()
/obj/item/reagent_containers/pill/sleevingcure
- name = "Kitsuhanan Cure (1u)"
+ name = REAGENT_SLEEVINGCURE + " (1u)"
desc = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery."
icon_state = "pill3"
@@ -154,5 +154,5 @@
/obj/item/reagent_containers/pill/airlock/New()
..()
- reagents.add_reagent("anti_toxin", 15)
- reagents.add_reagent("paracetamol", 5)
+ reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15)
+ reagents.add_reagent(REAGENT_ID_PARACETAMOL, 5)
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index c89015e3e2..078ee4d390 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -109,12 +109,12 @@
reagents.add_reagent(REAGENT_ID_CLEANER, volume)
/obj/item/reagent_containers/spray/sterilizine
- name = "sterilizine"
+ name = REAGENT_ID_STERILIZINE
desc = "Great for hiding incriminating bloodstains and sterilizing scalpels."
/obj/item/reagent_containers/spray/sterilizine/Initialize()
. = ..()
- reagents.add_reagent("sterilizine", volume)
+ reagents.add_reagent(REAGENT_ID_STERILIZINE, volume)
/obj/item/reagent_containers/spray/pepper
name = "pepperspray"
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 20d6485b8c..37a14f8615 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -338,7 +338,7 @@
/obj/item/reagent_containers/syringe/inaprovaline/Initialize()
. = ..()
- reagents.add_reagent("inaprovaline", 15)
+ reagents.add_reagent(REAGENT_ID_INAPROVALINE, 15)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
//update_icon()
@@ -348,7 +348,7 @@
/obj/item/reagent_containers/syringe/antitoxin/Initialize()
. = ..()
- reagents.add_reagent("anti_toxin", 15)
+ reagents.add_reagent(REAGENT_ID_ANTITOXIN, 15)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
//update_icon()
@@ -358,7 +358,7 @@
/obj/item/reagent_containers/syringe/antiviral/Initialize()
. = ..()
- reagents.add_reagent("spaceacillin", 15)
+ reagents.add_reagent(REAGENT_ID_SPACEACILLIN, 15)
//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped
//update_icon()
@@ -387,7 +387,7 @@
/obj/item/reagent_containers/syringe/steroid/Initialize()
..()
//reagents.add_reagent(REAGENT_ID_ADRENALINE,5) //VOREStation Edit - No thanks.
- reagents.add_reagent("hyperzine",10)
+ reagents.add_reagent(REAGENT_ID_HYPERZINE,10)
/obj/item/reagent_containers/syringe/proc/dirty(var/mob/living/carbon/human/target, var/obj/item/organ/external/eo)
if(!ishuman(loc))
diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm
index b4e5e23429..2b2275e31a 100644
--- a/code/modules/reagents/reagents/food_drinks.dm
+++ b/code/modules/reagents/reagents/food_drinks.dm
@@ -1051,7 +1051,7 @@
/datum/reagent/drink/juice/carrot/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
- M.reagents.add_reagent("imidazoline", removed * 0.2)
+ M.reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, removed * 0.2)
/datum/reagent/drink/juice/lettuce
name = "Lettuce Juice"
diff --git a/code/modules/reagents/reagents/medicine.dm b/code/modules/reagents/reagents/medicine.dm
index 7df322752b..5876a319f2 100644
--- a/code/modules/reagents/reagents/medicine.dm
+++ b/code/modules/reagents/reagents/medicine.dm
@@ -1,9 +1,9 @@
/* General medicine */
/datum/reagent/inaprovaline
- name = "Inaprovaline"
- id = "inaprovaline"
- description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients. Also counteracts allergic reactions."
+ name = REAGENT_INAPROVALINE
+ id = REAGENT_ID_INAPROVALINE
+ description = REAGENT_INAPROVALINE + " is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients. Also counteracts allergic reactions."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#00BFFF"
@@ -18,9 +18,9 @@
M.remove_chemical_effect(CE_ALLERGEN)
/datum/reagent/inaprovaline/topical
- name = "Inaprovalaze"
- id = "inaprovalaze"
- description = "Inaprovalaze is a topical variant of Inaprovaline."
+ name = REAGENT_INAPROVALAZE
+ id = REAGENT_ID_INAPROVALAZE
+ description = REAGENT_INAPROVALAZE + " is a topical variant of Inaprovaline."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#00BFFF"
@@ -41,9 +41,9 @@
M.add_chemical_effect(CE_PAINKILLER, 12 * M.species.chem_strength_pain)
/datum/reagent/bicaridine
- name = "Bicaridine"
- id = "bicaridine"
- description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma."
+ name = REAGENT_BICARIDINE
+ id = REAGENT_ID_BICARIDINE
+ description = REAGENT_BICARIDINE + " is an analgesic medication and can be used to treat blunt trauma."
taste_description = "bitterness"
taste_mult = 3
reagent_state = LIQUID
@@ -77,9 +77,9 @@
O.wounds -= W
/datum/reagent/bicaridine/topical
- name = "Bicaridaze"
- id = "bicaridaze"
- description = "Bicaridaze is a topical variant of the chemical Bicaridine."
+ name = REAGENT_BICARIDAZE
+ id = REAGENT_ID_BICARIDAZE
+ description = REAGENT_BICARIDAZE + " is a topical variant of the chemical Bicaridine."
taste_description = "bitterness"
taste_mult = 3
reagent_state = LIQUID
@@ -105,8 +105,8 @@
M.heal_organ_damage(6 * removed * chem_effective, 0)
/datum/reagent/calciumcarbonate
- name = "calcium carbonate"
- id = "calciumcarbonate"
+ name = REAGENT_CALCIUMCARBONATE
+ id = REAGENT_ID_CALCIUMCARBONATE
description = "Calcium carbonate is a calcium salt commonly used as an antacid."
taste_description = "chalk"
reagent_state = SOLID
@@ -124,9 +124,9 @@
M.add_chemical_effect(CE_ANTACID, 3)
/datum/reagent/kelotane
- name = "Kelotane"
- id = "kelotane"
- description = "Kelotane is a drug used to treat burns."
+ name = REAGENT_KELOTANE
+ id = REAGENT_ID_KELOTANE
+ description = REAGENT_KELOTANE + " is a drug used to treat burns."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#FFA800"
@@ -142,9 +142,10 @@
M.heal_organ_damage(0, 4 * removed * chem_effective) //VOREStation edit
/datum/reagent/dermaline
- name = "Dermaline"
- id = "dermaline"
- description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue."
+ name = REAGENT_DERMALINE
+ id = REAGENT_ID_DERMALINE
+ name = REAGENT_DERMALINE
+ description = REAGENT_DERMALINE + " is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue."
taste_description = "bitterness"
taste_mult = 1.5
reagent_state = LIQUID
@@ -160,9 +161,9 @@
M.heal_organ_damage(0, 8 * removed * chem_effective) //VOREStation edit
/datum/reagent/dermaline/topical
- name = "Dermalaze"
- id = "dermalaze"
- description = "Dermalaze is a topical variant of the chemical Dermaline."
+ name = REAGENT_DERMALAZE
+ id = REAGENT_ID_DERMALAZE
+ description = REAGENT_DERMALAZE + " is a topical variant of the chemical Dermaline."
taste_description = "bitterness"
taste_mult = 1.5
reagent_state = LIQUID
@@ -188,9 +189,9 @@
M.heal_organ_damage(0, 12 * removed * chem_effective)
/datum/reagent/dylovene
- name = "Dylovene"
- id = "anti_toxin"
- description = "Dylovene is a broad-spectrum antitoxin."
+ name = REAGENT_ANTITOXIN
+ id = REAGENT_ID_ANTITOXIN
+ description = REAGENT_ANTITOXIN + " is a broad-spectrum antitoxin."
taste_description = "a roll of gauze"
reagent_state = LIQUID
color = "#00A000"
@@ -210,9 +211,9 @@
M.remove_a_modifier_of_type(/datum/modifier/poisoned)
/datum/reagent/carthatoline
- name = "Carthatoline"
- id = "carthatoline"
- description = "Carthatoline is strong evacuant used to treat severe poisoning."
+ name = REAGENT_CARTHATOLINE
+ id = REAGENT_ID_CARTHATOLINE
+ description = REAGENT_CARTHATOLINE + " is strong evacuant used to treat severe poisoning."
reagent_state = LIQUID
color = "#225722"
scannable = 1
@@ -245,9 +246,9 @@
st?.take_damage(removed * 2) // Causes stomach contractions, makes sense for an overdose to make it much worse.
/datum/reagent/dexalin
- name = "Dexalin"
- id = "dexalin"
- description = "Dexalin is used in the treatment of oxygen deprivation."
+ name = REAGENT_DEXALIN
+ id = REAGENT_ID_DEXALIN
+ description = REAGENT_DEXALIN + " is used in the treatment of oxygen deprivation."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#0080FF"
@@ -270,9 +271,9 @@
holder.remove_reagent(REAGENT_ID_LEXORIN, 8 * removed) //VOREStation Edit
/datum/reagent/dexalinp
- name = "Dexalin Plus"
- id = "dexalinp"
- description = "Dexalin Plus is used in the treatment of oxygen deprivation. It is highly effective."
+ name = REAGENT_DEXALINP
+ id = REAGENT_ID_DEXALINP
+ description = REAGENT_DEXALINP + " is used in the treatment of oxygen deprivation. It is highly effective."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#0040FF"
@@ -295,9 +296,9 @@
holder.remove_reagent(REAGENT_ID_LEXORIN, 3 * removed)
/datum/reagent/tricordrazine
- name = "Tricordrazine"
- id = "tricordrazine"
- description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries."
+ name = REAGENT_TRICORDRAZINE
+ id = REAGENT_ID_TRICORDRAZINE
+ description = REAGENT_TRICORDRAZINE + " is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#8040FF"
@@ -317,9 +318,9 @@
affect_blood(M, alien, removed * 0.4)
/datum/reagent/tricorlidaze
- name = "Tricorlidaze"
- id = "tricorlidaze"
- description = "Tricorlidaze is a topical gel produced with tricordrazine and sterilizine."
+ name = REAGENT_TRICORLIDAZE
+ id = REAGENT_ID_TRICORLIDAZE
+ description = REAGENT_TRICORLIDAZE + " is a topical gel produced with tricordrazine and sterilizine."
taste_description = "bitterness"
reagent_state = SOLID
color = "#B060FF"
@@ -353,8 +354,8 @@
remove_self(to_produce * 5)
/datum/reagent/cryoxadone
- name = "Cryoxadone"
- id = "cryoxadone"
+ name = REAGENT_CRYOXADONE
+ id = REAGENT_ID_CRYOXADONE
description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly."
taste_description = "overripe bananas"
reagent_state = LIQUID
@@ -378,8 +379,8 @@
M.adjustToxLoss(-10 * removed * chem_effective)
/datum/reagent/clonexadone
- name = "Clonexadone"
- id = "clonexadone"
+ name = REAGENT_CLONEXADONE
+ id = REAGENT_ID_CLONEXADONE
description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' the cloning process when used in conjunction with a cryo tube."
taste_description = "rotten bananas"
reagent_state = LIQUID
@@ -404,8 +405,8 @@
M.adjustToxLoss(-30 * removed * chem_effective)
/datum/reagent/mortiferin
- name = "Mortiferin"
- id = "mortiferin"
+ name = REAGENT_MORTIFERIN
+ id = REAGENT_ID_MORTIFERIN
description = "A liquid compound based upon those used in cloning. Utilized in cases of toxic shock. May cause liver damage."
taste_description = "meat"
reagent_state = LIQUID
@@ -447,8 +448,8 @@
L.take_damage(rand(1,3) * removed)
/datum/reagent/necroxadone
- name = "Necroxadone"
- id = "necroxadone"
+ name = REAGENT_NECROXADONE
+ id = REAGENT_ID_NECROXADONE
description = "A liquid compound based upon that which is used in the cloning process. Utilized primarily in severe cases of toxic shock."
taste_description = "meat"
reagent_state = LIQUID
@@ -482,8 +483,8 @@
/* Painkillers */
/datum/reagent/paracetamol
- name = "Paracetamol"
- id = "paracetamol"
+ name = REAGENT_PARACETAMOL
+ id = REAGENT_ID_PARACETAMOL
description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -507,8 +508,8 @@
M.hallucination = max(M.hallucination, 2)
/datum/reagent/tramadol
- name = "Tramadol"
- id = "tramadol"
+ name = REAGENT_TRAMADOL
+ id = REAGENT_ID_TRAMADOL
description = "A simple, yet effective painkiller."
taste_description = "sourness"
reagent_state = LIQUID
@@ -531,8 +532,8 @@
M.hallucination = max(M.hallucination, 2)
/datum/reagent/oxycodone
- name = "Oxycodone"
- id = "oxycodone"
+ name = REAGENT_OXYCODONE
+ id = REAGENT_ID_OXYCODONE
description = "An effective and very addictive painkiller."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -560,9 +561,9 @@
/* Other medicine */
/datum/reagent/synaptizine
- name = "Synaptizine"
- id = "synaptizine"
- description = "Synaptizine is used to treat various diseases."
+ name = REAGENT_SYNAPTIZINE
+ id = REAGENT_ID_SYNAPTIZINE
+ description = REAGENT_SYNAPTIZINE + " is used to treat various diseases."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#99CCFF"
@@ -590,9 +591,9 @@
M.add_chemical_effect(CE_PAINKILLER, 20 * chem_effective * M.species.chem_strength_pain)
/datum/reagent/hyperzine
- name = "Hyperzine"
- id = "hyperzine"
- description = "Hyperzine is a highly effective, long lasting, muscle stimulant."
+ name = REAGENT_HYPERZINE
+ id = REAGENT_ID_HYPERZINE
+ description = REAGENT_HYPERZINE + " is a highly effective, long lasting, muscle stimulant."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#FF3300"
@@ -620,9 +621,9 @@
to_chat(M, span_warning("Huh... Is this what a heart attack feels like?"))
/datum/reagent/alkysine
- name = "Alkysine"
- id = "alkysine"
- description = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
+ name = REAGENT_ALKYSINE
+ id = REAGENT_ID_ALKYSINE
+ description = REAGENT_ALKYSINE " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#FFFF66"
@@ -644,8 +645,8 @@
M.add_chemical_effect(CE_PAINKILLER, 10 * chem_effective * M.species.chem_strength_pain)
/datum/reagent/imidazoline
- name = "Imidazoline"
- id = "imidazoline"
+ name = REAGENT_IMIDAZOLINE
+ id = REAGENT_ID_IMIDAZOLINE
description = "Heals eye damage"
taste_description = "dull toxin"
reagent_state = LIQUID
@@ -668,8 +669,8 @@
H.sdisabilities &= ~BLIND
/datum/reagent/peridaxon
- name = "Peridaxon"
- id = "peridaxon"
+ name = REAGENT_PERIDAXON
+ id = REAGENT_ID_PERIDAXON
description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -701,8 +702,8 @@
M.hallucination = max(M.hallucination, 10)
/datum/reagent/osteodaxon
- name = "Osteodaxon"
- id = "osteodaxon"
+ name = REAGENT_OSTEODAXON
+ id = REAGENT_ID_OSTEODAXON
description = "An experimental drug used to heal bone fractures."
reagent_state = LIQUID
color = "#C9BCE3"
@@ -724,8 +725,8 @@
H.AdjustWeakened(1) //Bones being regrown will knock you over
/datum/reagent/myelamine
- name = "Myelamine"
- id = "myelamine"
+ name = REAGENT_MYELAMINE
+ id = REAGENT_ID_MYELAMINE
description = "Used to rapidly clot internal hemorrhages by increasing the effectiveness of platelets."
reagent_state = LIQUID
color = "#4246C7"
@@ -771,8 +772,8 @@
O.wounds -= W
/datum/reagent/respirodaxon
- name = "Respirodaxon"
- id = "respirodaxon"
+ name = REAGENT_RESPIRODAXON
+ id = REAGENT_ID_RESPIRODAXON
description = "Used to repair the tissue of the lungs and similar organs."
taste_description = "metallic"
reagent_state = LIQUID
@@ -794,7 +795,7 @@
if(I.damage > 0)
I.damage = max(I.damage - 4 * removed * repair_strength, 0)
H.Confuse(2)
- if(M.reagents.has_reagent("gastirodaxon") || M.reagents.has_reagent("peridaxon"))
+ if(M.reagents.has_reagent(REAGENT_ID_GASTIRODAXON) || M.reagents.has_reagent(REAGENT_ID_PERIDAXON))
if(H.losebreath >= 15 && prob(H.losebreath))
H.Stun(2)
else
@@ -803,8 +804,8 @@
H.losebreath = max(H.losebreath - 4, 0)
/datum/reagent/gastirodaxon
- name = "Gastirodaxon"
- id = "gastirodaxon"
+ name = REAGENT_GASTIRODAXON
+ id = REAGENT_ID_GASTIRODAXON
description = "Used to repair the tissues of the digestive system."
taste_description = "chalk"
reagent_state = LIQUID
@@ -826,7 +827,7 @@
if(I.damage > 0)
I.damage = max(I.damage - 4 * removed * repair_strength, 0)
H.Confuse(2)
- if(M.reagents.has_reagent("hepanephrodaxon") || M.reagents.has_reagent("peridaxon"))
+ if(M.reagents.has_reagent(REAGENT_ID_HEPANEPHRODAXON) || M.reagents.has_reagent(REAGENT_ID_PERIDAXON))
if(prob(10))
H.vomit(1)
else if(H.nutrition > 30)
@@ -835,8 +836,8 @@
H.adjustToxLoss(-10 * removed) // Carthatoline based, considering cost.
/datum/reagent/hepanephrodaxon
- name = "Hepanephrodaxon"
- id = "hepanephrodaxon"
+ name = REAGENT_HEPANEPHRODAXON
+ id = REAGENT_ID_HEPANEPHRODAXON
description = "Used to repair the common tissues involved in filtration."
taste_description = "glue"
reagent_state = LIQUID
@@ -858,7 +859,7 @@
if(I.damage > 0)
I.damage = max(I.damage - 4 * removed * repair_strength, 0)
H.Confuse(2)
- if(M.reagents.has_reagent("cordradaxon") || M.reagents.has_reagent("peridaxon"))
+ if(M.reagents.has_reagent(REAGENT_ID_CORDRADAXON) || M.reagents.has_reagent(REAGENT_ID_PERIDAXON))
if(prob(5))
H.vomit(1)
else if(prob(5))
@@ -869,8 +870,8 @@
H.adjustToxLoss(-12 * removed) // Carthatoline based, considering cost.
/datum/reagent/cordradaxon
- name = "Cordradaxon"
- id = "cordradaxon"
+ name = REAGENT_CORDRADAXON
+ id = REAGENT_ID_CORDRADAXON
description = "Used to repair the specialized tissues involved in the circulatory system."
taste_description = "rust"
reagent_state = LIQUID
@@ -892,14 +893,14 @@
if(I.damage > 0)
I.damage = max(I.damage - 4 * removed * repair_strength, 0)
H.Confuse(2)
- if(M.reagents.has_reagent("respirodaxon") || M.reagents.has_reagent("peridaxon"))
+ if(M.reagents.has_reagent(REAGENT_ID_HYRONALIN) || M.reagents.has_reagent(REAGENT_ID_PERIDAXON))
H.losebreath = CLAMP(H.losebreath + 1, 0, 10)
else
H.adjustOxyLoss(-30 * removed) // Deals with blood oxygenation.
/datum/reagent/immunosuprizine
- name = "Immunosuprizine"
- id = "immunosuprizine"
+ name = REAGENT_IMMUNOSUPRIZINE
+ id = REAGENT_ID_IMMUNOSUPRIZINE
description = "An experimental powder believed to have the ability to prevent any organ rejection."
taste_description = "flesh"
reagent_state = SOLID
@@ -945,7 +946,7 @@
I.rejecting = 0
I.can_reject = FALSE
- if(H.reagents.has_reagent("spaceacillin") || H.reagents.has_reagent("corophizine")) // Chemicals that increase your immune system's aggressiveness make this chemical's job harder.
+ if(H.reagents.has_reagent(REAGENT_ID_SPACEACILLIN) || H.reagents.has_reagent(REAGENT_ID_COROPHIZINE)) // Chemicals that increase your immune system's aggressiveness make this chemical's job harder.
for(var/obj/item/organ/I in organtotal)
if(I.transplant_data)
var/rejectmem = I.can_reject
@@ -955,8 +956,8 @@
I.take_damage(1)
/datum/reagent/skrellimmuno
- name = "Malish-Qualem"
- id = "malish-qualem"
+ name = REAGENT_MALISHQUALEM
+ id = REAGENT_ID_MALISHQUALEM
description = "A strange, oily powder used by Malish-Katish to prevent organ rejection."
taste_description = "mordant"
reagent_state = SOLID
@@ -991,7 +992,7 @@
I.rejecting = 0
I.can_reject = FALSE
- if(H.reagents.has_reagent("spaceacillin") || H.reagents.has_reagent("corophizine"))
+ if(H.reagents.has_reagent(REAGENT_ID_SPACEACILLIN) || H.reagents.has_reagent(REAGENT_ID_COROPHIZINE))
for(var/obj/item/organ/I in organtotal)
if(I.transplant_data)
var/rejectmem = I.can_reject
@@ -1001,9 +1002,9 @@
I.take_damage(1)
/datum/reagent/ryetalyn
- name = "Ryetalyn"
- id = "ryetalyn"
- description = "Ryetalyn can cure all genetic abnomalities via a catalytic process."
+ name = REAGENT_RYETALYN
+ id = REAGENT_ID_RYETALYN
+ description = REAGENT_RYETALYN + " can cure all genetic abnomalities via a catalytic process."
taste_description = "acid"
reagent_state = SOLID
color = "#004000"
@@ -1048,8 +1049,8 @@
H.update_mutations()
/datum/reagent/ethylredoxrazine
- name = "Ethylredoxrazine"
- id = "ethylredoxrazine"
+ name = REAGENT_ETHYLREDOXRAZINE
+ id = REAGENT_ID_ETHYLREDOXRAZINE
description = "A powerful oxidizer that reacts with ethanol."
taste_description = "bitterness"
reagent_state = SOLID
@@ -1081,9 +1082,9 @@
R.remove_self(removed * 20)
/datum/reagent/hyronalin
- name = "Hyronalin"
- id = "hyronalin"
- description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
+ name = REAGENT_HYRONALIN
+ id = REAGENT_ID_HYRONALIN
+ description = REAGENT_HYRONALIN + " is a medicinal drug used to counter the effect of radiation poisoning."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#408000"
@@ -1098,9 +1099,9 @@
M.accumulated_rads = max(M.accumulated_rads - 30 * removed * M.species.chem_strength_heal, 0)
/datum/reagent/arithrazine
- name = "Arithrazine"
- id = "arithrazine"
- description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
+ name = REAGENT_ARITHRAZINE
+ id = REAGENT_ID_ARITHRAZINE
+ description = REAGENT_ARITHRAZINE + " is an unstable medication used for the most extreme cases of radiation poisoning."
taste_description = "bitterness"
reagent_state = LIQUID
color = "#008000"
@@ -1119,8 +1120,8 @@
M.take_organ_damage(4 * removed, 0)
/datum/reagent/spaceacillin
- name = "Spaceacillin"
- id = "spaceacillin"
+ name = REAGENT_SPACEACILLIN
+ id = REAGENT_ID_SPACEACILLIN
description = "An all-purpose antiviral agent."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -1148,8 +1149,8 @@
affect_blood(M, alien, removed * 0.8) // Not 100% as effective as injections, though still useful.
/datum/reagent/corophizine
- name = "Corophizine"
- id = "corophizine"
+ name = REAGENT_COROPHIZINE
+ id = REAGENT_ID_COROPHIZINE
description = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses."
taste_description = "burnt toast"
reagent_state = LIQUID
@@ -1216,8 +1217,8 @@
eo.fracture()
/datum/reagent/spacomycaze
- name = "Spacomycaze"
- id = "spacomycaze"
+ name = REAGENT_SPACOMYCAZE
+ id = REAGENT_ID_SPACOMYCAZE
description = "An all-purpose painkilling antibiotic gel."
taste_description = "oil"
reagent_state = SOLID
@@ -1265,8 +1266,8 @@
remove_self(to_produce)
/datum/reagent/sterilizine
- name = "Sterilizine"
- id = "sterilizine"
+ name = REAGENT_STERILIZINE
+ id = REAGENT_ID_STERILIZINE
description = "Sterilizes wounds in preparation for surgery and thoroughly removes blood."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -1317,8 +1318,8 @@
remove_self(amount)
/datum/reagent/leporazine
- name = "Leporazine"
- id = "leporazine"
+ name = REAGENT_LEPORAZINE
+ id = REAGENT_ID_LEPORAZINE
description = "Leporazine can be use to stabilize an individuals body temperature."
taste_description = "bitterness"
reagent_state = LIQUID
@@ -1339,8 +1340,8 @@
M.bodytemperature = min(temp, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
/datum/reagent/rezadone
- name = "Rezadone"
- id = "rezadone"
+ name = REAGENT_REZADONE
+ id = REAGENT_ID_REZADONE
description = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects."
taste_description = "bitterness"
reagent_state = SOLID
@@ -1387,8 +1388,8 @@
// This exists to cut the number of chemicals a merc borg has to juggle on their hypo.
/datum/reagent/healing_nanites
- name = "Restorative Nanites"
- id = "healing_nanites"
+ name = REAGENT_HEALINGNANITES
+ id = REAGENT_ID_HEALINGNANITES
description = "Miniature medical robots that swiftly restore bodily damage."
taste_description = "metal"
reagent_state = SOLID
@@ -1404,8 +1405,8 @@
M.adjustCloneLoss(-2 * removed)
/datum/reagent/menthol
- name = "Menthol"
- id = "menthol"
+ name = REAGENT_MENTHOL
+ id = REAGENT_ID_MENTHOL
description = "Tastes naturally minty, and imparts a very mild numbing sensation."
taste_description = "mint"
reagent_state = LIQUID
@@ -1415,8 +1416,8 @@
scannable = 1
/datum/reagent/earthsblood
- name = "Earthsblood"
- id = "earthsblood"
+ name = REAGENT_EARTHSBLOOD
+ id = REAGENT_ID_EARTHSBLOOD
description = "A rare plant extract with immense, almost magical healing capabilities. Induces a potent psychoactive state, damaging neurons with prolonged use."
taste_description = "honey and sunlight"
reagent_state = LIQUID
diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm
index 4e46d84b97..491746274f 100644
--- a/code/modules/resleeving/machines.dm
+++ b/code/modules/resleeving/machines.dm
@@ -163,8 +163,8 @@
occupant.adjustBrainLoss(-(CEILING((0.5*heal_rate), 1)))
//So clones don't die of oxyloss in a running pod.
- if(occupant.reagents.get_reagent_amount("inaprovaline") < 30)
- occupant.reagents.add_reagent("inaprovaline", 60)
+ if(occupant.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE) < 30)
+ occupant.reagents.add_reagent(REAGENT_ID_INAPROVALINE, 60)
//Also heal some oxyloss ourselves because inaprovaline is so bad at preventing it!!
occupant.adjustOxyLoss(-4)
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index 7b75f82277..b8b1f29a4a 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -133,7 +133,7 @@
return 0
var/obj/item/reagent_containers/container = tool
- if(!container.reagents.has_reagent("peridaxon"))
+ if(!container.reagents.has_reagent(REAGENT_ID_PERIDAXON))
return 0
if(!hasorgans(target))
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index 6c0da1fe9c..2110834bbf 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -1396,7 +1396,7 @@
desc = "A small bottle of finely ground poppyseed and mixed dried berries."
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle3"
- prefill = list("bicaridine" = 30, REAGENT_ID_NUTRIMENT = 30)
+ prefill = list(REAGENT_ID_BICARIDINE = 30, REAGENT_ID_NUTRIMENT = 30)
/obj/item/clothing/accessory/storage/ritualharness/fluff/antoinette/Initialize()
. = ..()
diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm
index 47a6678e48..e08717ec61 100644
--- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm
+++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm
@@ -50,12 +50,12 @@
coolant_reagents_purity["icecoffee"] = 0.6
coolant_reagents_purity["icetea"] = 0.6
coolant_reagents_purity["milkshake"] = 0.6
- coolant_reagents_purity["leporazine"] = 0.7
- coolant_reagents_purity["kelotane"] = 0.7
- coolant_reagents_purity["sterilizine"] = 0.7
- coolant_reagents_purity["dermaline"] = 0.7
- coolant_reagents_purity["hyperzine"] = 0.8
- coolant_reagents_purity["cryoxadone"] = 0.9
+ coolant_reagents_purity[REAGENT_ID_LEPORAZINE] = 0.7
+ coolant_reagents_purity[REAGENT_ID_KELOTANE] = 0.7
+ coolant_reagents_purity[REAGENT_ID_STERILIZINE] = 0.7
+ coolant_reagents_purity[REAGENT_ID_DERMALINE] = 0.7
+ coolant_reagents_purity[REAGENT_ID_HYPERZINE] = 0.8
+ coolant_reagents_purity[REAGENT_ID_CRYOXADONE] = 0.9
coolant_reagents_purity[REAGENT_ID_COOLANT] = 1
coolant_reagents_purity[REAGENT_ID_ADMINORDRAZINE] = 2
diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm
index 73f9f04e7e..b7e89a3c95 100644
--- a/code/modules/xenobio/items/extracts.dm
+++ b/code/modules/xenobio/items/extracts.dm
@@ -99,7 +99,7 @@
name = REAGENT_SLIMEJELLY
id = "m_jelly"
result = REAGENT_ID_SLIMEJELLY
- required_reagents = list("peridaxon" = 5)
+ required_reagents = list(REAGENT_ID_PERIDAXON = 5)
result_amount = 15
required = /obj/item/slime_extract/grey
diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm
index f70a98e702..82082d5d30 100644
--- a/code/modules/xenobio/items/extracts_vr.dm
+++ b/code/modules/xenobio/items/extracts_vr.dm
@@ -1504,7 +1504,7 @@
/decl/chemical_reaction/instant/slime/emerald_hyperzine
name = "Slime Hyperzine"
id = "m_emerald_hyperzine"
- result = "hyperzine"
+ result = REAGENT_ID_HYPERZINE
required_reagents = list(REAGENT_ID_WATER = 5)
result_amount = 30
required = /obj/item/slime_extract/emerald
diff --git a/code/modules/xenobio2/_xeno_setup.dm b/code/modules/xenobio2/_xeno_setup.dm
index f821f024cd..a5dc08c9a7 100644
--- a/code/modules/xenobio2/_xeno_setup.dm
+++ b/code/modules/xenobio2/_xeno_setup.dm
@@ -67,15 +67,15 @@ var/global/list/xenoChemList = list(REAGENT_ID_MUTATIONTOXIN,
REAGENT_ID_RADIUM,
REAGENT_ID_SACID,
REAGENT_ID_SUGAR,
- "kelotane",
- "dermaline",
- "anti_toxin",
- "dexalin",
- "synaptizine",
- "alkysine",
- "imidazoline",
- "peridaxon",
- "rezadone",
+ REAGENT_ID_KELOTANE,
+ REAGENT_ID_DERMALINE,
+ REAGENT_ID_ANTITOXIN,
+ REAGENT_ID_DEXALIN,
+ REAGENT_ID_SYNAPTIZINE,
+ REAGENT_ID_ALKYSINE,
+ REAGENT_ID_IMIDAZOLINE,
+ REAGENT_ID_PERIDAXON,
+ REAGENT_ID_REZADONE,
REAGENT_ID_MUTATIONTOXIN,
REAGENT_ID_MUTATIONTOXIN)
diff --git a/code/modules/xenobio2/_xeno_setup_vr.dm b/code/modules/xenobio2/_xeno_setup_vr.dm
index 4d199afdaf..89b4b9acc9 100644
--- a/code/modules/xenobio2/_xeno_setup_vr.dm
+++ b/code/modules/xenobio2/_xeno_setup_vr.dm
@@ -1,22 +1,22 @@
/hook/startup/proc/xenochems_vr() //A chemical whitelist. Adds on to the other chemical whitelist. This is required, as you don't want users getting certain chemicals (See: Adminordizine) and also don't want them to just get pure stock chemicals, as that'd be boring for the player.
- xenoChemList += "inaprovaline"
- xenoChemList += "bicaridine"
- xenoChemList += "dylovene"
- xenoChemList += "dexalinp"
- xenoChemList += "tricordrazine"
- xenoChemList += "cryoxadone"
- xenoChemList += "clonexadone"
- xenoChemList += "paracetamol"
- xenoChemList += "tramadol"
- xenoChemList += "oxycodone"
- xenoChemList += "ryetalyn"
- xenoChemList += "hyperzine"
- xenoChemList += "ethylredoxrazine"
- xenoChemList += "hyronalin"
- xenoChemList += "arithrazine"
- xenoChemList += "spaceacillin"
- xenoChemList += "sterilizine"
- xenoChemList += "leporazine"
+ xenoChemList += REAGENT_ID_INAPROVALINE
+ xenoChemList += REAGENT_ID_BICARIDINE
+ xenoChemList += REAGENT_ID_ANTITOXIN
+ xenoChemList += REAGENT_ID_DEXALINP
+ xenoChemList += REAGENT_ID_TRICORDRAZINE
+ xenoChemList += REAGENT_ID_CRYOXADONE
+ xenoChemList += REAGENT_ID_CLONEXADONE
+ xenoChemList += REAGENT_ID_PARACETAMOL
+ xenoChemList += REAGENT_ID_TRAMADOL
+ xenoChemList += REAGENT_ID_OXYCODONE
+ xenoChemList += REAGENT_ID_RYETALYN
+ xenoChemList += REAGENT_ID_HYPERZINE
+ xenoChemList += REAGENT_ID_ETHYLREDOXRAZINE
+ xenoChemList += REAGENT_ID_HYRONALIN
+ xenoChemList += REAGENT_ID_ARITHRAZINE
+ xenoChemList += REAGENT_ID_SPACEACILLIN
+ xenoChemList += REAGENT_ID_STERILIZINE
+ xenoChemList += REAGENT_ID_LEPORAZINE
xenoChemList += REAGENT_ID_METHYLPHENIDATE
xenoChemList += REAGENT_ID_CITALOPRAM
xenoChemList += REAGENT_ID_PAROXETINE
diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm
index b501624fb7..dde4267802 100644
--- a/code/modules/xenobio2/mob/slime/slime.dm
+++ b/code/modules/xenobio2/mob/slime/slime.dm
@@ -60,7 +60,7 @@ Slime definitions, Life and New live here.
REAGENT_ID_DIETHYLAMINE = list(XENO_CHEM_NUTRI = 0.9),
REAGENT_ID_SUGAR = list(XENO_CHEM_TOXIC = 0.4, XENO_CHEM_NUTRI = 0.2),
REAGENT_ID_EZNUTRIENT = list(XENO_CHEM_NUTRI = 0.8),
- "cryoxadone" = list(XENO_CHEM_TOXIC = 0.4),
+ REAGENT_ID_CRYOXADONE = list(XENO_CHEM_TOXIC = 0.4),
"flourine" = list(XENO_CHEM_TOXIC = 0.1),
REAGENT_ID_ROBUSTHARVEST = list(XENO_CHEM_NUTRI = 1.5),
"glucose" = list(XENO_CHEM_NUTRI = 0.5),
diff --git a/maps/expedition_vr/alienship/_alienship.dm b/maps/expedition_vr/alienship/_alienship.dm
index 7d2aaa9bbc..6b54bcfb4c 100644
--- a/maps/expedition_vr/alienship/_alienship.dm
+++ b/maps/expedition_vr/alienship/_alienship.dm
@@ -101,7 +101,7 @@
icon = 'alienship.dmi'
icon_state = "alien_injector"
item_state = "autoinjector"
- filled_reagents = list("rezadone" = 4, "corophizine" = 1)
+ filled_reagents = list(REAGENT_ID_REZADONE = 4, REAGENT_ID_COROPHIZINE = 1)
// -- Areas -- //