diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm index 5a8667f18c..fa1831e488 100644 --- a/code/__defines/chemistry.dm +++ b/code/__defines/chemistry.dm @@ -50,9 +50,9 @@ // 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, "stoxin", REAGENT_ID_AMBROSIAEXTRACT) // Decrease heart rate. -var/list/heartstopper = list("potassium_chlorophoride", "zombiepowder") // This stops the heart. -var/list/cheartstopper = list("potassium_chloride") // This stops the heart when overdose is met. -- c = conditional +var/list/bradycardics = list("neurotoxin", "cryoxadone", "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 #define MAX_PILL_SPRITE 24 //max icon state of the pill sprites #define MAX_BOTTLE_SPRITE 4 //max icon state of the pill sprites diff --git a/code/__defines/reagents.dm b/code/__defines/reagents.dm index bf48611cf0..6924c51c0c 100644 --- a/code/__defines/reagents.dm +++ b/code/__defines/reagents.dm @@ -147,17 +147,6 @@ #define REAGENT_ID_VATSTABILIZER "vatstabilizer" -// Toxins -#define REAGENT_PACID "Polytrinic acid" -#define REAGENT_ID_PACID "pacid" -#define REAGEMT_PHORON "Phoron" -#define REAGENT_ID_PHORON "phoron" -#define REAGENT_SPIDERTOXIN "Spidertoxin" -#define REAGENT_ID_SPIDERTOXIN "spidertoxin" -#define REAGENT_LEAD "Lead" -#define REAGENT_ID_LEAD "lead" - - // Medicines #define REAGENT_ADRANOL "Adranol" #define REAGENT_ID_ADRANOL "adranol" @@ -179,6 +168,40 @@ #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_ID_CALCIUMCARBONATE "calciumcarbonate" + + + + + + + // Virology #define REAGENT_VACCINE "Vaccine" #define REAGENT_ID_VACCINE "vaccine" @@ -327,7 +350,6 @@ #define REAGENT_ID_ESSENTIALOIL "essential_oil" - // Admin chems #define REAGENT_ADMINORDRAZINE "Adminordrazine" #define REAGENT_ID_ADMINORDRAZINE "adminordrazine" @@ -488,49 +510,105 @@ - - - - -#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_SLIMEJELLY "Slimejelly" +// Toxins +#define REAGENT_TOXIN "Toxin" +#define REAGENT_ID_TOXIN "toxin" +#define REAGENT_PACID "Polytrinic acid" +#define REAGENT_ID_PACID "pacid" +#define REAGEMT_PHORON "Phoron" +#define REAGENT_ID_PHORON "phoron" +#define REAGENT_SPIDERTOXIN "Spidertoxin" +#define REAGENT_ID_SPIDERTOXIN "spidertoxin" +#define REAGENT_LEAD "Lead" +#define REAGENT_ID_LEAD "lead" +#define REAGENT_PLASTICIDE "Plasticide" +#define REAGENT_ID_PLASTICIDE "plasticide" +#define REAGENT_AMATOXIN "Amatoxin" +#define REAGENT_ID_AMATOXIN "amatoxin" +#define REAGENT_CARPOTOXIN "Carpotoxin" +#define REAGENT_ID_CARPOTOXIN "carpotoxin" +#define REAGENT_NEUROTOXIC_PROTEIN "toxic protein" +#define REAGENT_ID_NEUROTOXIC_PROTEIN "neurotoxic_protein" +#define REAGENT_HYDROPHORON "Hydrophoron" +#define REAGENT_ID_HYDROPHORON "hydrophoron" +#define REAGENT_CYANIDE "Cyanide" +#define REAGENT_ID_CYANIDE "cyanide" +#define REAGENT_MOLD "Mold" +#define REAGENT_ID_MOLD "mold" +#define REAGENT_EXPIREDMEDICINE "Expired Medicine" +#define REAGENT_ID_EXPIREDMEDICINE "expired_medicine" +#define REAGENT_STIMM "Stimm" +#define REAGENT_ID_STIMM "stimm" +#define REAGENT_POTASSIUMCHLORIDE "Potassium Chloride" +#define REAGENT_ID_POTASSIUMCHLORIDE "potassium_chloride" +#define REAGENT_POTASSIUMCHLOROPHORIDE "Potassium Chlorophoride" +#define REAGENT_ID_POTASSIUMCHLOROPHORIDE "potassium_chlorophoride" +#define REAGENT_ZOMBIEPOWDER "Zombie Powder" +#define REAGENT_ID_ZOMBIEPOWDER "zombiepowder" +#define REAGENT_LICHPOWDER "Lich Powder" +#define REAGENT_ID_LICHPOWDER "lichpowder" +#define REAGENT_FERTILIZER "Fertilizer" +#define REAGENT_ID_FERTILIZER "fertilizer" +#define REAGENT_EZNUTRIENT "EZ Nutrient" +#define REAGENT_ID_EZNUTRIENT "eznutrient" +#define REAGENT_LEFT4ZED "Left-4-Zed" +#define REAGENT_ID_LEFT4ZED "left4zed" +#define REAGENT_ROBUSTHARVEST "Robust Harvest" +#define REAGENT_ID_ROBUSTHARVEST "robustharvest" +#define REAGENT_TANNIN "Tannin" +#define REAGENT_ID_TANNIN "tannin" +#define REAGENT_PLANTBGONE "Plant-B-Gone" +#define REAGENT_ID_PLANTBGONE "plantbgone" +#define REAGENT_SIFSAP "Sivian Sap" +#define REAGENT_ID_SIFSAP "sifsap" +#define REAGENT_STOMACID "Digestive acid" +#define REAGENT_ID_STOMACID "stomacid" +#define REAGENT_THERMITEV "Pyrotoxin" +#define REAGENT_ID_THERMITEV "thermite_v" +#define REAGENT_CONDENSEDCAPSAICINV "Irritant toxin" +#define REAGENT_ID_CONDENSEDCAPSAICINV "condensedcapsaicin_v" +#define REAGENT_LEXORIN "Lexorin" +#define REAGENT_ID_LEXORIN "lexorin" +#define REAGENT_MUTAGEN "Unstable mutagen" +#define REAGENT_ID_MUTAGEN "mutagen" +#define REAGENT_SLIMEJELLY "Slime Jelly" #define REAGENT_ID_SLIMEJELLY "slimejelly" - - -#define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate" +#define REAGENT_STOXIN "Soporific" +#define REAGENT_ID_STOXIN "stoxin" +#define REAGENT_CHLORALHYDRATE "Chloral Hydrate" +#define REAGENT_ID_CHLORALHYDRATE "chloralhydrate" +#define REAGENT_BEER2 REAGENT_BEER +#define REAGENT_ID_BEER2 "beer2" +#define REAGENT_SEROTROTIUM "Serotrotium" +#define REAGENT_ID_SEROTROTIUM "serotrotium" +#define REAGENT_SEROTROTIUMV "Serotropic venom" +#define REAGENT_ID_SEROTROTIUMV "serotrotium_v" +#define REAGENT_CRYPTOBIOLIN "Cryptobiolin" +#define REAGENT_ID_CRYPTOBIOLIN "cryptobiolin" +#define REAGENT_IMPEDREZENE "Impedrezene" +#define REAGENT_ID_IMPEDREZENE "impedrezene" +#define REAGENT_MINDBREAKER "Mindbreaker Toxin" +#define REAGENT_ID_MINDBREAKER "mindbreaker" +#define REAGENT_MUTATIONTOXIN "Mutation Toxin" +#define REAGENT_ID_MUTATIONTOXIN "mutationtoxin" +#define REAGENT_DOCILITYTOXIN "Docility Toxin" +#define REAGENT_ID_DOCILITYTOXIN "docilitytoxin" +#define REAGENT_SHREDDINGNANITES REAGENT_RESTORATIVENANITES +#define REAGENT_ID_SHREDDINGNANITES "shredding_nanites" +#define REAGENT_IRRADIATEDNANITES REAGENT_RESTORATIVENANITES +#define REAGENT_ID_IRRADIATEDNANITES "irradiated_nanites" +#define REAGENT_NEUROPHAGENANITES REAGENT_RESTORATIVENANITES +#define REAGENT_ID_NEUROPHAGENANITES "neurophage_nanites" +#define REAGENT_SALMONELLA "Salmonella" +#define REAGENT_ID_SALMONELLA "salmonella" -Files left: food_drinks.dm, medicine.dm, toxins.dm + + + +Files left: food_drinks.dm, medicine.dm includes: .dm excludes: reagents.dm,ores.dm,materials.dm,mre.dm diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 16852e73ec..117a86892e 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -3,7 +3,7 @@ GLOBAL_LIST_EMPTY(archive_diseases) GLOBAL_LIST_INIT(advance_cures, list( REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, "orangejuice", "spaceacillin", "glucose", REAGENT_ID_ETHANOL, - "leporazine", "impedrezene", "hepanephrodaxon", + "leporazine", REAGENT_ID_IMPEDREZENE, "hepanephrodaxon", REAGENT_ID_SILVER, REAGENT_ID_GOLD )) diff --git a/code/datums/diseases/food_poisoning.dm b/code/datums/diseases/food_poisoning.dm index 4c7f0eabf8..1cd43b25f2 100644 --- a/code/datums/diseases/food_poisoning.dm +++ b/code/datums/diseases/food_poisoning.dm @@ -5,7 +5,7 @@ spread_text = "Non-Contagious" spread_flags = NON_CONTAGIOUS cure_text = "Sleep" - agent = "Salmonella" + agent = REAGENT_SALMONELLA cures = list(REAGENT_ID_CHICKENSOUP) cure_chance = 10 viable_mobtypes = list(/mob/living/carbon/human) diff --git a/code/game/gamemodes/changeling/powers/death_sting.dm b/code/game/gamemodes/changeling/powers/death_sting.dm index 9acb09e8b2..ed82ec0b35 100644 --- a/code/game/gamemodes/changeling/powers/death_sting.dm +++ b/code/game/gamemodes/changeling/powers/death_sting.dm @@ -18,6 +18,6 @@ T.silent = 10 T.Paralyse(10) T.make_jittery(100) - if(T.reagents) T.reagents.add_reagent("lexorin", 40) + if(T.reagents) T.reagents.add_reagent(REAGENT_ID_LEXORIN, 40) feedback_add_details("changeling_powers","DTHS") return 1 diff --git a/code/game/gamemodes/changeling/powers/epinephrine_overdose.dm b/code/game/gamemodes/changeling/powers/epinephrine_overdose.dm index f2e2175dfa..47afecedee 100644 --- a/code/game/gamemodes/changeling/powers/epinephrine_overdose.dm +++ b/code/game/gamemodes/changeling/powers/epinephrine_overdose.dm @@ -35,7 +35,7 @@ C.SetWeakened(0) C.lying = 0 C.update_canmove() -// C.reagents.add_reagent("toxin", 10) +// C.reagents.add_reagent(REAGENT_ID_TOXIN, 10) C.reagents.add_reagent("epinephrine", 20) if(src.mind.changeling.recursive_enhancement) diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index 670f7dd0c3..897846fccf 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -1143,8 +1143,8 @@ datum var/target_name New(var/text,var/joba) ..() - var/list/items = list("Sulphuric acid", REAGENT_PACID, REAGENT_LUBE, "Unstable mutagen",\ - "Leporazine", "Cryptobiolin", "Lexorin ",\ + var/list/items = list("Sulphuric acid", REAGENT_PACID, REAGENT_LUBE, REAGENT_MUTAGEN,\ + "Leporazine", REAGENT_CRYPTOBIOLIN, REAGENT_LEXORIN,\ "Kelotane", "Dexalin", "Tricordrazine") target_name = pick(items) switch(target_name) @@ -1154,13 +1154,13 @@ datum steal_target = /datum/reagent/pacid if(REAGENT_LUBE) steal_target = /datum/reagent/lube - if("Unstable mutagen") + if(REAGENT_MUTAGEN) steal_target = /datum/reagent/mutagen if("Leporazine") steal_target = /datum/reagent/leporazine - if("Cryptobiolin") + if(REAGENT_CRYPTOBIOLIN) steal_target =/datum/reagent/cryptobiolin - if("Lexorin") + if(REAGENT_LEXORIN) steal_target = /datum/reagent/lexorin if("Kelotane") steal_target = /datum/reagent/kelotane diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index ee418024f8..e0a146a820 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -150,9 +150,9 @@ if(man_rating >= 4) // Alien tech. var/reag_ID = pickweight(list( "healing_nanites" = 10, - "shredding_nanites" = 5, - "irradiated_nanites" = 5, - "neurophage_nanites" = 2) + REAGENT_ID_SHREDDINGNANITES = 5, + REAGENT_ID_IRRADIATEDNANITES = 5, + REAGENT_ID_NEUROPHAGENANITES = 2) ) new_chemicals[reag_ID] = "Nanite" if(man_rating >= 3) // Anomalous tech. diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index a1f2d214e0..49363929a5 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -69,10 +69,10 @@ update |= temp.take_damage(0, rand(force/2, force)) if("tox") if(H.reagents) - if(H.reagents.get_reagent_amount("carpotoxin") + force < force*2) - H.reagents.add_reagent("carpotoxin", force) - if(H.reagents.get_reagent_amount("cryptobiolin") + force < force*2) - H.reagents.add_reagent("cryptobiolin", force) + if(H.reagents.get_reagent_amount(REAGENT_ID_CARPOTOXIN) + force < force*2) + H.reagents.add_reagent(REAGENT_ID_CARPOTOXIN, force) + if(H.reagents.get_reagent_amount(REAGENT_ID_CRYPTOBIOLIN) + force < force*2) + H.reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, force) if("halloss") H.stun_effect_act(1, force / 2, BP_TORSO, src) else @@ -89,10 +89,10 @@ M.take_overall_damage(0, rand(force/2, force)) if("tox") if(M.reagents) - if(M.reagents.get_reagent_amount("carpotoxin") + force < force*2) - M.reagents.add_reagent("carpotoxin", force) - if(M.reagents.get_reagent_amount("cryptobiolin") + force < force*2) - M.reagents.add_reagent("cryptobiolin", force) + if(M.reagents.get_reagent_amount(REAGENT_ID_CARPOTOXIN) + force < force*2) + M.reagents.add_reagent(REAGENT_ID_CARPOTOXIN, force) + if(M.reagents.get_reagent_amount(REAGENT_ID_CRYPTOBIOLIN) + force < force*2) + M.reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, force) else return M.updatehealth() diff --git a/code/game/mecha/micro/micro.dm b/code/game/mecha/micro/micro.dm index f4d1b6ffe4..f28663c044 100644 --- a/code/game/mecha/micro/micro.dm +++ b/code/game/mecha/micro/micro.dm @@ -55,10 +55,10 @@ update |= temp.take_damage(0, rand(force/2, force)) if("tox") if(H.reagents) - if(H.reagents.get_reagent_amount("carpotoxin") + force < force*2) - H.reagents.add_reagent("carpotoxin", force) - if(H.reagents.get_reagent_amount("cryptobiolin") + force < force*2) - H.reagents.add_reagent("cryptobiolin", force) + if(H.reagents.get_reagent_amount(REAGENT_ID_CARPOTOXIN) + force < force*2) + H.reagents.add_reagent(REAGENT_ID_CARPOTOXIN, force) + if(H.reagents.get_reagent_amount(REAGENT_ID_CRYPTOBIOLIN) + force < force*2) + H.reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, force) else return if(update) H.UpdateDamageIcon() @@ -73,10 +73,10 @@ M.take_overall_damage(0, rand(force/2, force)) if("tox") if(M.reagents) - if(M.reagents.get_reagent_amount("carpotoxin") + force < force*2) - M.reagents.add_reagent("carpotoxin", force) - if(M.reagents.get_reagent_amount("cryptobiolin") + force < force*2) - M.reagents.add_reagent("cryptobiolin", force) + if(M.reagents.get_reagent_amount(REAGENT_ID_CARPOTOXIN) + force < force*2) + M.reagents.add_reagent(REAGENT_ID_CARPOTOXIN, force) + if(M.reagents.get_reagent_amount(REAGENT_ID_CRYPTOBIOLIN) + force < force*2) + M.reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, force) else return M.updatehealth() diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index d423ab76a4..2311d092bb 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -21,10 +21,10 @@ /obj/item/reagent_containers/glass/beaker/vial/random/toxin random_reagent_list = list( - list("mindbreaker" = 10, REAGENT_ID_BLISS = 20) = 3, - list("carpotoxin" = 15) = 2, - list("impedrezene" = 15) = 2, - list("zombiepowder" = 10) = 1) + list(REAGENT_ID_MINDBREAKER = 10, REAGENT_ID_BLISS = 20) = 3, + list(REAGENT_ID_CARPOTOXIN = 15) = 2, + list(REAGENT_ID_IMPEDREZENE = 15) = 2, + list(REAGENT_ID_ZOMBIEPOWDER = 10) = 1) /obj/item/reagent_containers/glass/beaker/vial/random/Initialize() . = ..() diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 4b520e4ace..3a0bd663d9 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -150,7 +150,7 @@ 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/dilating = list(REAGENT_ID_BLISS=5,REAGENT_ID_AMBROSIAEXTRACT=5,"mindbreaker"=1) + 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.")) else if(M.reagents.has_any_reagent(dilating) || H.ingested.has_any_reagent(dilating)) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index e8e7bdfa79..03801310ac 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -258,7 +258,7 @@ var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) - B1.reagents.add_reagent("plantbgone", 25) + B1.reagents.add_reagent(REAGENT_ID_PLANTBGONE, 25) B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 25) B2.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 25) B2.reagents.add_reagent(REAGENT_ID_SUGAR, 25) diff --git a/code/modules/blob2/core_chunk.dm b/code/modules/blob2/core_chunk.dm index ec9c69d2ac..242a99f8a5 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("hydrophoron" = 40, "peridaxon" = 20, "mutagen" = 20) + required_reagents = list(REAGENT_ID_HYDROPHORON = 40, "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/blazing_oil.dm b/code/modules/blob2/overmind/types/blazing_oil.dm index 5ceef2e643..0f3020fe33 100644 --- a/code/modules/blob2/overmind/types/blazing_oil.dm +++ b/code/modules/blob2/overmind/types/blazing_oil.dm @@ -33,7 +33,7 @@ env.add_thermal_energy(10 * 1000) /datum/blob_type/blazing_oil/on_chunk_tick(obj/item/blobcore_chunk/B) - B.reagents.add_reagent("thermite_v", 0.5) + B.reagents.add_reagent(REAGENT_ID_THERMITEV, 0.5) var/turf/T = get_turf(B) if(!T) @@ -44,4 +44,4 @@ /datum/blob_type/blazing_oil/on_chunk_use(obj/item/blobcore_chunk/B, mob/living/user) user.add_modifier(/datum/modifier/exothermic, 5 MINUTES) - return \ No newline at end of file + return diff --git a/code/modules/clothing/accessories/rings.dm b/code/modules/clothing/accessories/rings.dm index 361c87c854..828402da13 100644 --- a/code/modules/clothing/accessories/rings.dm +++ b/code/modules/clothing/accessories/rings.dm @@ -73,7 +73,7 @@ /obj/item/clothing/accessory/ring/reagent/sleepy/Initialize() . = ..() - reagents.add_reagent("chloralhydrate", 15) // Less than a sleepy-pen, but still enough to knock someone out + reagents.add_reagent(REAGENT_ID_CHLORALHYDRATE, 15) // Less than a sleepy-pen, but still enough to knock someone out ///////////////////////////////////////// //Seals and Signet Rings diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 4167cdf798..6502e04ec4 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -801,7 +801,7 @@ if(6) reagents.add_reagent("coco", 3) if(7) - reagents.add_reagent("slimejelly", 3) + reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 3) if(8) reagents.add_reagent("banana", 3) if(9) @@ -821,7 +821,7 @@ /obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly/Initialize() . = ..() - reagents.add_reagent("slimejelly", 5) + reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5) /obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly filling_color = "#ED1169" @@ -934,7 +934,7 @@ /obj/item/reagent_containers/food/snacks/organ/Initialize() . = ..() reagents.add_reagent("protein", rand(3,5)) - reagents.add_reagent("toxin", rand(1,3)) + reagents.add_reagent(REAGENT_ID_TOXIN, rand(1,3)) /obj/item/reagent_containers/food/snacks/tofu name = "Tofu" @@ -974,7 +974,7 @@ center_of_mass = list("x"=17, "y"=13) bitesize = 6 - var/toxin_type = "carpotoxin" + var/toxin_type = REAGENT_ID_CARPOTOXIN var/toxin_amount = 3 /obj/item/reagent_containers/food/snacks/carpmeat/Initialize() @@ -994,7 +994,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat/ray desc = "A fillet of space ray meat." - toxin_type = "stoxin" + toxin_type = REAGENT_ID_STOXIN /obj/item/reagent_containers/food/snacks/carpmeat/gnat desc = "A paltry sample of space-gnat meat. It looks pretty stringy and unpleasant, honestly." @@ -1517,7 +1517,7 @@ /obj/item/reagent_containers/food/snacks/amanita_pie/Initialize() . = ..() - reagents.add_reagent("amatoxin", 3) + reagents.add_reagent(REAGENT_ID_AMATOXIN, 3) reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 1) /obj/item/reagent_containers/food/snacks/plump_pie @@ -1785,7 +1785,7 @@ /obj/item/reagent_containers/food/snacks/badrecipe/Initialize() . = ..() - reagents.add_reagent("toxin", 1) + reagents.add_reagent(REAGENT_ID_TOXIN, 1) reagents.add_reagent(REAGENT_ID_CARBON, 3) /obj/item/reagent_containers/food/snacks/meatsteak @@ -1831,7 +1831,7 @@ /obj/item/reagent_containers/food/snacks/amanitajelly/Initialize() . = ..() - reagents.add_reagent("amatoxin", 6) + reagents.add_reagent(REAGENT_ID_AMATOXIN, 6) reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3) /obj/item/reagent_containers/food/snacks/poppypretzel @@ -2043,7 +2043,7 @@ /obj/item/reagent_containers/food/snacks/jelliedtoast/slime/Initialize() . = ..() - reagents.add_reagent("slimejelly", 5) + reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5) /obj/item/reagent_containers/food/snacks/honeytoast name = "Honeyed Toast" @@ -2077,7 +2077,7 @@ /obj/item/reagent_containers/food/snacks/jellyburger/slime/Initialize() . = ..() - reagents.add_reagent("slimejelly", 5) + reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5) /obj/item/reagent_containers/food/snacks/jellyburger/cherry/Initialize() . = ..() @@ -2317,7 +2317,7 @@ /obj/item/reagent_containers/food/snacks/jellysandwich/slime/Initialize() . = ..() - reagents.add_reagent("slimejelly", 5) + reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5) /obj/item/reagent_containers/food/snacks/jellysandwich/cherry/Initialize() . = ..() @@ -2341,7 +2341,7 @@ /obj/item/reagent_containers/food/snacks/boiledslimecore/Initialize() . = ..() - reagents.add_reagent("slimejelly", 5) + reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5) /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit name = "plump helmet biscuit" @@ -2443,7 +2443,7 @@ /obj/item/reagent_containers/food/snacks/slimesoup/Initialize() . = ..() - reagents.add_reagent("slimejelly", 5) + reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 5) reagents.add_reagent(REAGENT_ID_WATER, 10) /obj/item/reagent_containers/food/snacks/bloodsoup @@ -2547,11 +2547,11 @@ reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc) reagents.add_reagent(REAGENT_ID_BLOOD, 10) if(7) - reagents.add_reagent("slimejelly", 10) + reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 10) reagents.add_reagent(REAGENT_ID_WATER, 10) if(8) reagents.add_reagent(REAGENT_ID_CARBON, 10) - reagents.add_reagent("toxin", 10) + reagents.add_reagent(REAGENT_ID_TOXIN, 10) if(9) reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc) reagents.add_reagent("tomatojuice", 10) @@ -3438,7 +3438,7 @@ reagents.add_reagent(REAGENT_ID_AMBROSIAEXTRACT, 2) reagents.add_reagent("bicaridine", 1) reagents.add_reagent("kelotane", 1) - reagents.add_reagent("toxin", 1) + reagents.add_reagent(REAGENT_ID_TOXIN, 1) /obj/item/reagent_containers/food/snacks/cosmicbrowniesslice name = "cosmic brownie" @@ -3824,7 +3824,7 @@ . = ..() reagents.add_reagent("protein", 5) reagents.add_reagent("tomatojuice", 6) - reagents.add_reagent("mold", 8) + reagents.add_reagent(REAGENT_ID_MOLD, 8) /obj/item/reagent_containers/food/snacks/slice/oldpizza name = "moldy pizza slice" @@ -4219,7 +4219,7 @@ // ///obj/item/reagent_containers/food/snacks/hotdog/old/Initialize() // . = ..() -// reagents.add_reagent("mold", 6) +// reagents.add_reagent(REAGENT_ID_MOLD, 6) /obj/item/reagent_containers/food/snacks/flatbread name = "flatbread" @@ -4280,7 +4280,7 @@ set_light(1, 1, "#5dadcf") reagents.add_reagent("oxycodone", 1) - reagents.add_reagent("sifsap", 5) + reagents.add_reagent(REAGENT_ID_SIFSAP, 5) reagents.add_reagent(REAGENT_ID_BLISS, 5) /obj/item/reagent_containers/food/snacks/bellefritter @@ -4569,7 +4569,7 @@ /obj/item/reagent_containers/food/snacks/rosesalad/Initialize() . = ..() - reagents.add_reagent("stoxin", 2) + reagents.add_reagent(REAGENT_ID_STOXIN, 2) /obj/item/reagent_containers/food/snacks/eggbowl name = "egg bowl" @@ -4682,7 +4682,7 @@ /obj/item/reagent_containers/food/snacks/siffruit/Initialize() . = ..() - reagents.add_reagent("sifsap", 2) + reagents.add_reagent(REAGENT_ID_SIFSAP, 2) /obj/item/reagent_containers/food/snacks/siffruit/afterattack(obj/O as obj, mob/user as mob, proximity) if(istype(O,/obj/machinery/microwave)) @@ -4916,13 +4916,13 @@ var/composition_reagent_quantity ///mob/living/simple_mob/adultslime //The literal only thing in the game that uses this is commented out, so I comment out this too -// composition_reagent = "slimejelly" +// composition_reagent = REAGENT_ID_SLIMEJELLY /mob/living/carbon/alien/diona composition_reagent = REAGENT_ID_NUTRIMENT//Dionae are plants, so eating them doesn't give animal protein /mob/living/simple_mob/slime - composition_reagent = "slimejelly" + composition_reagent = REAGENT_ID_SLIMEJELLY allow_mind_transfer = TRUE /mob/living/simple_mob @@ -6929,7 +6929,7 @@ name = "master old-food" desc = "they're all inedible and potentially dangerous items" center_of_mass = list ("x"=15, "y"=9) - nutriment_desc = list("rot" = 5, "mold" = 5) + nutriment_desc = list("rot" = 5, REAGENT_ID_MOLD = 5) nutriment_amt = 10 bitesize = 3 filling_color = "#336b42" @@ -6937,12 +6937,12 @@ .=..() reagents.add_reagent(pick(list( REAGENT_ID_FUEL, - "amatoxin", - "carpotoxin", - "zombiepowder", - "cryptobiolin", + REAGENT_ID_AMATOXIN, + REAGENT_ID_CARPOTOXIN, + REAGENT_ID_ZOMBIEPOWDER, + REAGENT_ID_CRYPTOBIOLIN, REAGENT_ID_PSILOCYBIN)), 5) - reagents.add_reagent("salmonella", 5) + reagents.add_reagent(REAGENT_ID_SALMONELLA, 5) /obj/item/reagent_containers/food/snacks/old/pizza name = "\improper Pizza!" @@ -7077,7 +7077,7 @@ /obj/item/reagent_containers/food/snacks/canned/caviar/true/Initialize() . = ..() reagents.add_reagent("seafood", 4) - reagents.add_reagent("carpotoxin", 1) + reagents.add_reagent(REAGENT_ID_CARPOTOXIN, 1) /obj/item/reagent_containers/food/snacks/canned/maps name = "\improper MAPS" diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 9df2fedfc3..47f5c8b145 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -777,7 +777,7 @@ /obj/item/reagent_containers/food/snacks/donkpocket/ascended/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_URANIUM, 3) - reagents.add_reagent("thermite_v", 3) + reagents.add_reagent(REAGENT_ID_THERMITEV, 3) // Altevian Foobs diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm index d83a64551c..7e7e86bb19 100644 --- a/code/modules/food/food/superfoods.dm +++ b/code/modules/food/food/superfoods.dm @@ -190,21 +190,21 @@ name = "Slice Of Evil" //Pretty damn poisonous, takes a lot of work to make safe for consumption, useful for medical. desc = "An odd slice, despite the grease and cherries oozing off the top, it smells delicious." nutriment_desc = list("The desire to consume" = 10) // You won't even taste the poison. - reagents.add_reagent("neurotoxic_protein", 2) + reagents.add_reagent(REAGENT_ID_NEUROTOXIC_PROTEIN, 2) reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 2) - reagents.add_reagent("amatoxin", 2) - reagents.add_reagent("carpotoxin", 2) + reagents.add_reagent(REAGENT_ID_AMATOXIN, 2) + reagents.add_reagent(REAGENT_ID_CARPOTOXIN, 2) reagents.add_reagent(REAGENT_ID_SPIDERTOXIN, 2) bitesize = 7 if(2) name = "Slice Of Evil" //A bad trip desc = "A mysterious slice, coated in purple frosting that smells like grapes." nutriment_desc = list("The desire to show off an party" = 10) - reagents.add_reagent("stoxin", 2) + reagents.add_reagent(REAGENT_ID_STOXIN, 2) reagents.add_reagent(REAGENT_ID_BLISS, 10) - reagents.add_reagent("serotrotium", 4) - reagents.add_reagent("cryptobiolin", 8) - reagents.add_reagent("mindbreaker", 10) + reagents.add_reagent(REAGENT_ID_SEROTROTIUM, 4) + reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 8) + reagents.add_reagent(REAGENT_ID_MINDBREAKER, 10) reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 10) bitesize = 30 //even a single bite won't make you escape fate. if(3) @@ -212,8 +212,8 @@ desc = "A menacing slice, smelling clearly of copper, blood clots float on top." nutriment_desc = list("Infernal Rage" = 10) reagents.add_reagent(REAGENT_ID_BLOOD, 20) - reagents.add_reagent("stomacid", 10) - reagents.add_reagent("mutagen", 4) + reagents.add_reagent(REAGENT_ID_STOMACID, 10) + reagents.add_reagent(REAGENT_ID_MUTAGEN, 4) reagents.add_reagent("thirteenloko", 20) reagents.add_reagent("hyperzine", 10) bitesize = 30 diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm index 2a00397800..640edfbefc 100644 --- a/code/modules/food/glass/bottle.dm +++ b/code/modules/food/glass/bottle.dm @@ -70,28 +70,28 @@ desc = "A small bottle of toxins. Do not drink, it is poisonous." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-3" - prefill = list("toxin" = 60) + prefill = list(REAGENT_ID_TOXIN = 60) /obj/item/reagent_containers/glass/bottle/cyanide name = "cyanide bottle" desc = "A small bottle of cyanide. Bitter almonds?" icon = 'icons/obj/chemical.dmi' icon_state = "bottle-3" - prefill = list("cyanide" = 30) //volume changed to match chloral + prefill = list(REAGENT_ID_CYANIDE = 30) //volume changed to match chloral /obj/item/reagent_containers/glass/bottle/stoxin name = "soporific bottle" desc = "A small bottle of soporific. Just the fumes make you sleepy." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-3" - prefill = list("stoxin" = 60) + prefill = list(REAGENT_ID_STOXIN = 60) /obj/item/reagent_containers/glass/bottle/chloralhydrate name = "chloral hydrate bottle" desc = "A small bottle of Choral Hydrate. Mickey's Favorite!" icon = 'icons/obj/chemical.dmi' icon_state = "bottle-3" - prefill = list("chloralhydrate" = 30) //Intentionally low since it is so strong. Still enough to knock someone out. + prefill = list(REAGENT_ID_CHLORALHYDRATE = 30) //Intentionally low since it is so strong. Still enough to knock someone out. /obj/item/reagent_containers/glass/bottle/antitoxin name = "dylovene bottle" @@ -105,7 +105,7 @@ desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-1" - prefill = list("mutagen" = 60) + prefill = list(REAGENT_ID_MUTAGEN = 60) /obj/item/reagent_containers/glass/bottle/ammonia name = "ammonia bottle" @@ -119,21 +119,21 @@ desc = "A small bottle." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-4" - prefill = list("eznutrient" = 60) + prefill = list(REAGENT_ID_EZNUTRIENT = 60) /obj/item/reagent_containers/glass/bottle/left4zed name = "\improper Left-4-Zed bottle" desc = "A small bottle." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-4" - prefill = list("left4zed" = 60) + prefill = list(REAGENT_ID_LEFT4ZED = 60) /obj/item/reagent_containers/glass/bottle/robustharvest name = "\improper Robust Harvest" desc = "A small bottle." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-4" - prefill = list("robustharvest" = 60) + prefill = list(REAGENT_ID_ROBUSTHARVEST = 60) /obj/item/reagent_containers/glass/bottle/diethylamine name = "diethylamine bottle" diff --git a/code/modules/food/glass/bottle_potion.dm b/code/modules/food/glass/bottle_potion.dm index c854c14d19..e6e0cc236a 100644 --- a/code/modules/food/glass/bottle_potion.dm +++ b/code/modules/food/glass/bottle_potion.dm @@ -100,7 +100,7 @@ /obj/item/reagent_containers/glass/bottle/potion/badpolymorph name = "unstable polymorph potion" desc = "A small green bottle containing some uncomfortably green liquid that claims to transform the drinker wildly." - prefill = list("mutagen" = 30) + prefill = list(REAGENT_ID_MUTAGEN = 30) /obj/item/reagent_containers/glass/bottle/potion/bonerepair name = "mending potion" @@ -142,7 +142,7 @@ /obj/item/reagent_containers/glass/bottle/potion/soporific name = "still potion" desc = "A small green bottle containing some calm blue liquid." - prefill = list("stoxin" = 30) + prefill = list(REAGENT_ID_STOXIN = 30) /obj/item/reagent_containers/glass/bottle/potion/lipostipo name = "thick potion" diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 0f239316a2..8b712a044f 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -553,7 +553,7 @@ qdel(O) src.reagents.clear_reagents() ffuu.reagents.add_reagent(REAGENT_ID_CARBON, amount) - ffuu.reagents.add_reagent("toxin", amount/10) + ffuu.reagents.add_reagent(REAGENT_ID_TOXIN, amount/10) return ffuu /obj/machinery/microwave/verb/Eject() diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm index c288a140bb..a73fb2e1bc 100644 --- a/code/modules/food/recipes_fryer.dm +++ b/code/modules/food/recipes_fryer.dm @@ -143,7 +143,7 @@ result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/poisonberry /datum/recipe/jellydonut/slime // Subtypes of jellydonut, appliance inheritance applies. - reagents = list("slimejelly" = 5, REAGENT_ID_SUGAR = 5) + reagents = list(REAGENT_ID_SLIMEJELLY = 5, REAGENT_ID_SUGAR = 5) result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly /datum/recipe/jellydonut/cherry // Subtypes of jellydonut, appliance inheritance applies. diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm index ce0e0e6bbe..eda4541ba0 100644 --- a/code/modules/food/recipes_grill.dm +++ b/code/modules/food/recipes_grill.dm @@ -198,7 +198,7 @@ /datum/recipe/slimeburger appliance = GRILL - reagents = list("slimejelly" = 5) + reagents = list(REAGENT_ID_SLIMEJELLY = 5) items = list( /obj/item/reagent_containers/food/snacks/bun ) diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index f2b7399431..0ce5cde979 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -174,13 +174,13 @@ I said no! result = /obj/item/reagent_containers/food/snacks/spacylibertyduff /datum/recipe/amanitajelly - reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, "amatoxin" = 5) + reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, REAGENT_ID_AMATOXIN = 5) result = /obj/item/reagent_containers/food/snacks/amanitajelly /datum/recipe/amanitajelly/make_food(var/obj/container as obj) . = ..(container) for(var/obj/item/reagent_containers/food/snacks/amanitajelly/being_cooked in .) - being_cooked.reagents.del_reagent("amatoxin") + being_cooked.reagents.del_reagent(REAGENT_ID_AMATOXIN) /datum/recipe/meatballsoup fruit = list("carrot" = 1, "potato" = 1) @@ -269,7 +269,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/stew /datum/recipe/slimetoast - reagents = list("slimejelly" = 5) + reagents = list(REAGENT_ID_SLIMEJELLY = 5) items = list( /obj/item/reagent_containers/food/snacks/slice/bread, ) @@ -360,7 +360,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/twobread /datum/recipe/slimesandwich - reagents = list("slimejelly" = 5) + reagents = list(REAGENT_ID_SLIMEJELLY = 5) items = list( /obj/item/reagent_containers/food/snacks/slice/bread, /obj/item/reagent_containers/food/snacks/slice/bread, @@ -380,7 +380,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/bloodsoup /datum/recipe/slimesoup - reagents = list(REAGENT_ID_WATER = 10, "slimejelly" = 5) + reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_SLIMEJELLY = 5) items = list() result = /obj/item/reagent_containers/food/snacks/slimesoup @@ -484,7 +484,7 @@ I said no! /datum/recipe/validsalad/make_food(var/obj/container as obj) . = ..(container) for (var/obj/item/reagent_containers/food/snacks/validsalad/being_cooked in .) - being_cooked.reagents.del_reagent("toxin") + being_cooked.reagents.del_reagent(REAGENT_ID_TOXIN) /datum/recipe/stuffing reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index 6c6e3ab2aa..d08f88b8e4 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -243,7 +243,7 @@ /datum/recipe/amanita_pie appliance = OVEN - reagents = list("amatoxin" = 5) + reagents = list(REAGENT_ID_AMATOXIN = 5) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) result = /obj/item/reagent_containers/food/snacks/amanita_pie diff --git a/code/modules/hydroponics/backtank.dm b/code/modules/hydroponics/backtank.dm index 6ff4308733..d3cbc4d390 100644 --- a/code/modules/hydroponics/backtank.dm +++ b/code/modules/hydroponics/backtank.dm @@ -234,7 +234,7 @@ /obj/item/watertank/op/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_FUEL, 500) - reagents.add_reagent("cryptobiolin", 500) + reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 500) reagents.add_reagent(REAGENT_ID_PHORON, 500) reagents.add_reagent("condensedcapsaicin", 500) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 23deaabc25..431075c0c6 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -86,7 +86,7 @@ descriptors |= "sweet-sour" if(reagents.has_reagent(REAGENT_ID_RADIUM) || reagents.has_reagent(REAGENT_ID_URANIUM)) descriptors |= "radioactive" - if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin")) + 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")) descriptors |= "hallucinogenic" diff --git a/code/modules/hydroponics/seedtypes/amauri.dm b/code/modules/hydroponics/seedtypes/amauri.dm index 4a0f3567b4..4e9126df1a 100644 --- a/code/modules/hydroponics/seedtypes/amauri.dm +++ b/code/modules/hydroponics/seedtypes/amauri.dm @@ -3,7 +3,7 @@ seed_name = "amauri" display_name = "amauri plant" kitchen_tag = "amauri" - chems = list("zombiepowder" = list(1,10),"condensedcapsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) + chems = list(REAGENT_ID_ZOMBIEPOWDER = list(1,10),"condensedcapsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/amauri/New() ..() diff --git a/code/modules/hydroponics/seedtypes/ambrosia.dm b/code/modules/hydroponics/seedtypes/ambrosia.dm index 5e1e65a153..b55b63af2b 100644 --- a/code/modules/hydroponics/seedtypes/ambrosia.dm +++ b/code/modules/hydroponics/seedtypes/ambrosia.dm @@ -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), "impedrezene" = list(1,10), "mindbreaker" = list(1,10), REAGENT_ID_AMBROSIAEXTRACT = list(1,10)) + 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)) /datum/seed/ambrosia/infernus/New() ..() diff --git a/code/modules/hydroponics/seedtypes/apples.dm b/code/modules/hydroponics/seedtypes/apples.dm index ccabfacca7..15d223ae36 100644 --- a/code/modules/hydroponics/seedtypes/apples.dm +++ b/code/modules/hydroponics/seedtypes/apples.dm @@ -23,7 +23,7 @@ /datum/seed/apple/poison name = "poisonapple" mutants = null - chems = list("cyanide" = list(1,5)) + chems = list(REAGENT_ID_CYANIDE = list(1,5)) /datum/seed/apple/gold name = "goldapple" @@ -46,7 +46,7 @@ seed_name = "sivian pod" display_name = "sivian pod" kitchen_tag = "apple" - chems = list(REAGENT_ID_NUTRIMENT = list(1,5),"sifsap" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5),REAGENT_ID_SIFSAP = list(10,20)) /datum/seed/apple/sif/New() ..() diff --git a/code/modules/hydroponics/seedtypes/berries.dm b/code/modules/hydroponics/seedtypes/berries.dm index 1f3f8ee83c..75c98883ad 100644 --- a/code/modules/hydroponics/seedtypes/berries.dm +++ b/code/modules/hydroponics/seedtypes/berries.dm @@ -47,7 +47,7 @@ kitchen_tag = "poisonberries" display_name = "poison berry bush" mutants = list("deathberries") - chems = list(REAGENT_ID_NUTRIMENT = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(10,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_TOXIN = list(3,5), "poisonberryjuice" = list(10,5)) /datum/seed/berry/poison/New() ..() @@ -60,7 +60,7 @@ seed_name = "death berry" display_name = "death berry bush" mutants = null - chems = list(REAGENT_ID_NUTRIMENT = list(1), "toxin" = list(3,3), "lexorin" = list(1,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_TOXIN = list(3,3), REAGENT_ID_LEXORIN = list(1,5)) /datum/seed/berry/poison/death/New() ..() diff --git a/code/modules/hydroponics/seedtypes/flowers.dm b/code/modules/hydroponics/seedtypes/flowers.dm index 076179df38..39faaf4a3f 100644 --- a/code/modules/hydroponics/seedtypes/flowers.dm +++ b/code/modules/hydroponics/seedtypes/flowers.dm @@ -79,7 +79,7 @@ display_name = "rose" kitchen_tag = "rose" mutants = list("bloodrose") - chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "stoxin" = list(0,2)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_STOXIN = list(0,2)) /datum/seed/flower/rose/New() ..() @@ -99,7 +99,7 @@ name = "bloodrose" display_name = "bleeding rose" mutants = null - chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "stoxin" = list(1,5), REAGENT_ID_BLOOD = list(0,2)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_STOXIN = list(1,5), REAGENT_ID_BLOOD = list(0,2)) /datum/seed/flower/rose/blood/New() ..() diff --git a/code/modules/hydroponics/seedtypes/gelthi.dm b/code/modules/hydroponics/seedtypes/gelthi.dm index 6232408f6c..3ced3c0e67 100644 --- a/code/modules/hydroponics/seedtypes/gelthi.dm +++ b/code/modules/hydroponics/seedtypes/gelthi.dm @@ -3,7 +3,7 @@ seed_name = "gelthi" display_name = "gelthi plant" kitchen_tag = "gelthi" - chems = list("stoxin" = list(1,5),"capsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) + chems = list(REAGENT_ID_STOXIN = list(1,5),"capsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/gelthi/New() ..() diff --git a/code/modules/hydroponics/seedtypes/jurlmah.dm b/code/modules/hydroponics/seedtypes/jurlmah.dm index 32d197764c..7eee154904 100644 --- a/code/modules/hydroponics/seedtypes/jurlmah.dm +++ b/code/modules/hydroponics/seedtypes/jurlmah.dm @@ -3,7 +3,7 @@ seed_name = "jurl'mah" display_name = "jurl'mah reeds" kitchen_tag = "jurlmah" - chems = list("serotrotium" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) + chems = list(REAGENT_ID_SEROTROTIUM = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/jurlmah/New() ..() diff --git a/code/modules/hydroponics/seedtypes/mushrooms.dm b/code/modules/hydroponics/seedtypes/mushrooms.dm index b1c28c2a74..147c5712bb 100644 --- a/code/modules/hydroponics/seedtypes/mushrooms.dm +++ b/code/modules/hydroponics/seedtypes/mushrooms.dm @@ -80,7 +80,7 @@ seed_name = "liberty cap" display_name = "liberty cap mushrooms" mutants = null - chems = list(REAGENT_ID_NUTRIMENT = list(1), "stoxin" = list(3,3), REAGENT_ID_BLISS = list(1,25)) + chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_STOXIN = list(3,3), REAGENT_ID_BLISS = list(1,25)) /datum/seed/mushroom/hallucinogenic/strong/New() ..() @@ -96,7 +96,7 @@ seed_name = "fly amanita" display_name = "fly amanita mushrooms" mutants = list("destroyingangel","plastic") - chems = list(REAGENT_ID_NUTRIMENT = list(1), "amatoxin" = list(3,3), REAGENT_ID_PSILOCYBIN = list(1,25)) + chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMATOXIN = list(3,3), REAGENT_ID_PSILOCYBIN = list(1,25)) /datum/seed/mushroom/poison/New() ..() @@ -114,7 +114,7 @@ seed_name = "destroying angel" display_name = "destroying angel mushrooms" mutants = null - chems = list(REAGENT_ID_NUTRIMENT = list(1,50), "amatoxin" = list(13,3), REAGENT_ID_PSILOCYBIN = list(1,25)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_AMATOXIN = list(13,3), REAGENT_ID_PSILOCYBIN = list(1,25)) /datum/seed/mushroom/poison/death/New() ..() @@ -146,7 +146,7 @@ name = "redcap" seed_name = "red cap" display_name = "red caps" - chems = list(REAGENT_ID_WOODPULP = list(10,1), "tannin" = list(1,10)) + chems = list(REAGENT_ID_WOODPULP = list(10,1), REAGENT_ID_TANNIN = list(1,10)) mutants = null has_item_product = null @@ -179,7 +179,7 @@ seed_name = "plastellium" display_name = "plastellium" mutants = null - chems = list("plasticide" = list(1,10)) + chems = list(REAGENT_ID_PLASTICIDE = list(1,10)) /datum/seed/mushroom/plastic/New() ..() @@ -197,7 +197,7 @@ seed_name = "corpellian" display_name = "corpellian" mutants = null - chems = list("serotrotium" = list(5,10), "mold" = list(1,10)) + chems = list(REAGENT_ID_SEROTROTIUM = list(5,10), REAGENT_ID_MOLD = list(1,10)) /datum/seed/mushroom/spore/New() ..() diff --git a/code/modules/hydroponics/seedtypes/surik.dm b/code/modules/hydroponics/seedtypes/surik.dm index dfc0cafc71..c9a3b9e86c 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("impedrezene" = list(1,3),"synaptizine" = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5)) + chems = list(REAGENT_ID_IMPEDREZENE = list(1,3),"synaptizine" = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/surik/New() ..() diff --git a/code/modules/hydroponics/seedtypes/wabback.dm b/code/modules/hydroponics/seedtypes/wabback.dm index f2293c6133..db3dde13f9 100644 --- a/code/modules/hydroponics/seedtypes/wabback.dm +++ b/code/modules/hydroponics/seedtypes/wabback.dm @@ -31,7 +31,7 @@ seed_name = "black wabback" display_name = "black wabback" mutants = null - chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "protein" = list(1,10), "serotrotium_v" = list(0,1)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "protein" = list(1,10), REAGENT_ID_SEROTROTIUMV = list(0,1)) /datum/seed/wabback/vine/New() ..() diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm index 6536b88efd..1a28408475 100644 --- a/code/modules/hydroponics/spreading/spreading_growth.dm +++ b/code/modules/hydroponics/spreading/spreading_growth.dm @@ -51,7 +51,7 @@ return 0 for(var/obj/effect/effect/smoke/chem/smoke in view(1, src)) - if(smoke.reagents.has_reagent("plantbgone")) + if(smoke.reagents.has_reagent(REAGENT_ID_PLANTBGONE)) die_off() return diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 7342661bf2..1c307da029 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -56,12 +56,12 @@ // with cycle information under 'mechanical concerns' at some point. var/static/list/toxic_reagents = list( "anti_toxin" = -2, - "toxin" = 2, + REAGENT_ID_TOXIN = 2, REAGENT_ID_FLUORINE = 2.5, REAGENT_ID_CHLORINE = 1.5, REAGENT_ID_SACID = 1.5, REAGENT_ID_PACID = 3, - "plantbgone" = 3, + REAGENT_ID_PLANTBGONE = 3, "cryoxadone" = -3, REAGENT_ID_RADIUM = 2 ) @@ -75,9 +75,9 @@ REAGENT_ID_DIETHYLAMINE = 2, REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_ADMINORDRAZINE = 1, - "eznutrient" = 1, - "robustharvest" = 1, - "left4zed" = 1 + REAGENT_ID_EZNUTRIENT = 1, + REAGENT_ID_ROBUSTHARVEST = 1, + REAGENT_ID_LEFT4ZED = 1 ) var/static/list/weedkiller_reagents = list( REAGENT_ID_FLUORINE = -4, @@ -86,7 +86,7 @@ REAGENT_ID_SUGAR = 2, REAGENT_ID_SACID = -2, REAGENT_ID_PACID = -4, - "plantbgone" = -8, + REAGENT_ID_PLANTBGONE = -8, REAGENT_ID_ADMINORDRAZINE = -5 ) var/static/list/pestkiller_reagents = list( @@ -115,22 +115,22 @@ "sodawater" = list( 0.1, 0, 0 ), REAGENT_ID_SACID = list( -1, 0, 0 ), REAGENT_ID_PACID = list( -2, 0, 0 ), - "plantbgone" = list( -2, 0, 0.2), + REAGENT_ID_PLANTBGONE = list( -2, 0, 0.2), "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 ), REAGENT_ID_RADIUM = list( -1.5, 0, 0.2), REAGENT_ID_ADMINORDRAZINE = list( 1, 1, 1 ), - "robustharvest" = list( 0, 0.2, 0 ), - "left4zed" = list( 0, 0, 0.2) + REAGENT_ID_ROBUSTHARVEST = list( 0, 0.2, 0 ), + REAGENT_ID_LEFT4ZED = list( 0, 0, 0.2) ) // Mutagen list specifies minimum value for the mutation to take place, rather // than a bound as the lists above specify. var/static/list/mutagenic_reagents = list( REAGENT_ID_RADIUM = 8, - "mutagen" = 15 + REAGENT_ID_MUTAGEN = 15 ) /obj/machinery/portable_atmospherics/hydroponics/AltClick(var/mob/living/user) diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm index 205952f0a0..c7834148d4 100644 --- a/code/modules/mob/living/bot/medbot.dm +++ b/code/modules/mob/living/bot/medbot.dm @@ -36,7 +36,7 @@ var/treatment_fire = "tricordrazine" var/treatment_tox = "tricordrazine" var/treatment_virus = "spaceacillin" - var/treatment_emag = "toxin" + var/treatment_emag = REAGENT_ID_TOXIN var/declare_treatment = 0 //When attempting to treat a patient, should it notify everyone wearing medhuds? // Are we tipped over? diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 98a52fe444..d65398003e 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -695,7 +695,7 @@ if(toxins_pp > safe_toxins_max) var/ratio = (poison/safe_toxins_max) * 10 if(reagents) - reagents.add_reagent("toxin", CLAMP(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE)) + reagents.add_reagent(REAGENT_ID_TOXIN, CLAMP(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE)) breath.adjust_gas(poison_type, -poison/6, update = 0) //update after throw_alert("tox_in_air", /obj/screen/alert/tox_in_air) else diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index 60bbc3ac10..fd1148d8db 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -221,7 +221,7 @@ if(toxins_pp > safe_toxins_max) var/ratio = (poison/safe_toxins_max) * 10 if(H.reagents) - H.reagents.add_reagent("toxin", CLAMP(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE)) + H.reagents.add_reagent(REAGENT_ID_TOXIN, CLAMP(ratio, MIN_TOXIN_DAMAGE, MAX_TOXIN_DAMAGE)) breath.adjust_gas(poison_type, -poison/6, update = 0) //update after H.throw_alert("tox_in_air", /obj/screen/alert/tox_in_air) else diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index 371824d209..25a6064ee9 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -36,7 +36,7 @@ var/datum/species/shapeshifter/promethean/prometheans assisted_langs = list(LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) // Prometheans are weird, let's just assume they can use basically any language. blood_name = "gelatinous ooze" - blood_reagents = "slimejelly" + blood_reagents = REAGENT_ID_SLIMEJELLY breath_type = null poison_type = null diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index 4df56e47b0..5933c53a57 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -177,7 +177,7 @@ H.trait_injection_reagents += REAGENT_ID_ANDROROVIR // -> MALE H.trait_injection_reagents += REAGENT_ID_GYNOROVIR // -> FEMALE H.trait_injection_reagents += REAGENT_ID_ANDROGYNOROVIR // -> PLURAL - H.trait_injection_reagents += "stoxin" // night night chem + H.trait_injection_reagents += REAGENT_ID_STOXIN // night night chem H.trait_injection_reagents += REAGENT_ID_RAINBOWTOXIN // Funny flashing lights. H.trait_injection_reagents += REAGENT_ID_PARALYSISTOXIN // Paralysis! H.trait_injection_reagents += REAGENT_ID_PAINENZYME // Pain INCREASER diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm index 3564a2c5a9..c33f119eb2 100644 --- a/code/modules/mob/living/carbon/metroid/items.dm +++ b/code/modules/mob/living/carbon/metroid/items.dm @@ -29,7 +29,7 @@ /obj/item/slime_extract/New() ..() create_reagents(5) -// reagents.add_reagent("slimejelly", 30) +// reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 30) /obj/item/slime_extract/grey name = "grey slime extract" @@ -359,7 +359,7 @@ /obj/item/reagent_containers/food/snacks/egg/slime/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 4) - reagents.add_reagent("slimejelly", 1) + reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 1) addtimer(CALLBACK(src, ./proc/Grow), rand(120 SECONDS, 150 SECONDS)) /obj/item/reagent_containers/food/snacks/egg/slime/proc/Grow() diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index b5c0f47cbc..2d438d1abd 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -634,7 +634,7 @@ var/global/list/robot_modules = list( var/datum/reagents/R = new/datum/reagents(50) PB.reagents = R R.my_atom = PB - R.add_reagent("beer2", 50) + R.add_reagent(REAGENT_ID_BEER2, 50) PB.name = "Auntie Hong's Final Sip" PB.desc = "A bottle of very special mix of alcohol and poison. Some may argue that there's alcohol to die for, but Auntie Hong took it to next level." @@ -645,7 +645,7 @@ var/global/list/robot_modules = list( /obj/item/robot_module/robot/clerical/butler/respawn_consumable(var/mob/living/silicon/robot/R, var/amount) var/obj/item/reagent_containers/food/drinks/bottle/small/beer/PB = locate() in src.emag if(PB) - PB.reagents.add_reagent("beer2", 2 * amount) + PB.reagents.add_reagent(REAGENT_ID_BEER2, 2 * amount) /obj/item/robot_module/robot/clerical/general name = "clerical robot module" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm index 18428ab3e7..5027ed4a26 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm @@ -59,7 +59,7 @@ special_attack_cooldown = 6 SECONDS ai_holder_type = /datum/ai_holder/simple_mob/intentional/giant_spider_broodmother poison_per_bite = 2 - poison_type = "cyanide" + poison_type = REAGENT_ID_CYANIDE loot_list = list(/obj/item/royal_spider_egg = 100) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm index bc2cb46ab5..3811839158 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/carrier.dm @@ -27,7 +27,7 @@ melee_damage_upper = 25 poison_per_bite = 3 - poison_type = "chloralhydrate" + poison_type = REAGENT_ID_CHLORALHYDRATE movement_cooldown = 2 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/electric.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/electric.dm index 397c48efb5..937b1d8ce2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/electric.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/electric.dm @@ -39,7 +39,7 @@ poison_chance = 15 poison_per_bite = 3 - poison_type = "stimm" + poison_type = REAGENT_ID_STIMM shock_resist = 0.75 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm index bcdeedef00..89019b727f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/lurker.dm @@ -38,7 +38,7 @@ melee_damage_lower = 10 melee_damage_upper = 10 poison_chance = 30 - poison_type = "cryptobiolin" + poison_type = REAGENT_ID_CRYPTOBIOLIN poison_per_bite = 1 player_msg = "You have an imperfect, but automatic stealth. If you attack something while 'hidden', then \ diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm index 27211f3b82..00b380b2ec 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm @@ -38,7 +38,7 @@ melee_damage_lower = 5 // Doesn't do a lot of damage, since the goal is to make more spiders with egg attacks. melee_damage_upper = 10 poison_per_bite = 5 - poison_type = "stoxin" + poison_type = REAGENT_ID_STOXIN player_msg = "You can spin webs on an adjacent tile, or cocoon an object by clicking on it.
\ You can also cocoon a dying or dead entity by clicking on them, and you will gain charges for egg-laying.
\ diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/pepper.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/pepper.dm index b0481c0097..8626170c99 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/pepper.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/pepper.dm @@ -27,8 +27,8 @@ poison_chance = 20 poison_per_bite = 5 - poison_type = "condensedcapsaicin_v" + poison_type = REAGENT_ID_CONDENSEDCAPSAICINV /mob/living/simple_mob/animal/giant_spider/pepper/Initialize() adjust_scale(1.1) - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/thermic.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/thermic.dm index d51f6422fe..4f64a01585 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/thermic.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/thermic.dm @@ -35,4 +35,4 @@ poison_chance = 30 poison_per_bite = 1 - poison_type = "thermite_v" + poison_type = REAGENT_ID_THERMITEV diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm index 3b025bc2d7..4c0ea17260 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/tunneler.dm @@ -40,7 +40,7 @@ poison_chance = 15 poison_per_bite = 3 - poison_type = "serotrotium_v" + poison_type = REAGENT_ID_SEROTROTIUMV // ai_holder_type = /datum/ai_holder/simple_mob/melee/tunneler diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm index 1b1cc2b063..800236dec2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm @@ -7,8 +7,8 @@ /mob/living/simple_mob/animal/passive/fish/koi/poisonous/Initialize() . = ..() create_reagents(60) - reagents.add_reagent("toxin", 45) - reagents.add_reagent("impedrezene", 15) + reagents.add_reagent(REAGENT_ID_TOXIN, 45) + reagents.add_reagent(REAGENT_ID_IMPEDREZENE, 15) /mob/living/simple_mob/animal/passive/fish/koi/poisonous/Life() ..() @@ -56,8 +56,8 @@ /mob/living/simple_mob/animal/passive/fish/koi/poisonous/proc/sting(var/mob/living/M) if(!M.reagents) return 0 - M.reagents.add_reagent("toxin", 2) - M.reagents.add_reagent("impedrezene", 1) + M.reagents.add_reagent(REAGENT_ID_TOXIN, 2) + M.reagents.add_reagent(REAGENT_ID_IMPEDREZENE, 1) return 1 /mob/living/simple_mob/animal/passive/fish/measelshark diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm index 3d05b68abb..4897c12503 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/grafadreka.dm @@ -493,7 +493,7 @@ var/global/list/wounds_being_tended_by_drakes = list() for(var/obj/item/organ/external/E in H.organs) if(E.status & ORGAN_BLEEDING) E.organ_clamp() - H.bloodstr.add_reagent("sifsap", rand(1,2)) + H.bloodstr.add_reagent(REAGENT_ID_SIFSAP, rand(1,2)) for(var/datum/wound/W in E.wounds) W.salve() W.disinfect() 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 4917eeff5a..ed4cea05b0 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,7 +49,7 @@ 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,"condensedcapsaicin_v","frostoil") + var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","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. diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm index 48babbe51a..e925674468 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/disbot_vr.dm @@ -47,7 +47,7 @@ var/poison_chance = 100 var/poison_per_bite = 10 - var/poison_type = "expired_medicine" + var/poison_type = REAGENT_ID_EXPIREDMEDICINE /datum/say_list/disbot speak = list("ATTEMPTING TO CONTACT A.R.K, ATTEMPT 1e26+3","DIRT SAMPLE COLLECTED, DIRT QUOTA 124871/155 CONFIRMED.") diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm index a23102b717..5dd0edb14d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm @@ -8,7 +8,7 @@ color = "#CC23FF" slime_color = "purple" coretype = /obj/item/slime_extract/purple - reagent_injected = "toxin" + reagent_injected = REAGENT_ID_TOXIN description_info = "This slime spreads a toxin when it attacks. A biosuit or other thick armor can protect from the toxic attack." player_msg = "You inject a harmful toxin when attacking." diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm index 2ae22c5d3c..889e8e857b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm @@ -52,7 +52,7 @@ say_list_type = /datum/say_list/oregrub var/poison_per_bite = 2.5 - var/poison_type = "thermite_v" //burn baby burn + var/poison_type = REAGENT_ID_THERMITEV //burn baby burn var/poison_chance = 50 var/min_ore = 4 diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index efd5db1e7d..ac28193cc9 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -340,7 +340,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5 if(blood_incompatible(injected.data["blood_type"],our.data["blood_type"],injected.data["species"],our.data["species"]) ) - reagents.add_reagent("toxin",amount * 0.5) + reagents.add_reagent(REAGENT_ID_TOXIN,amount * 0.5) reagents.update_total() else vessel.add_reagent(REAGENT_ID_BLOOD, amount, injected.data) diff --git a/code/modules/organs/internal/stomach.dm b/code/modules/organs/internal/stomach.dm index 48d0b87472..6dc7e6d506 100644 --- a/code/modules/organs/internal/stomach.dm +++ b/code/modules/organs/internal/stomach.dm @@ -6,7 +6,7 @@ unacidable = TRUE // Don't melt when holding your acid, dangit. - var/acidtype = "stomacid" // Incase you want some stomach organ with, say, polyacid instead, or sulphuric. + var/acidtype = REAGENT_ID_STOMACID // Incase you want some stomach organ with, say, polyacid instead, or sulphuric. var/max_acid_volume = 30 var/deadly_hold = TRUE // Does the stomach do damage to mobs eaten by its owner? Xenos should probably have this FALSE. diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 083b197307..1f20130e83 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -275,7 +275,7 @@ var/list/organ_cache = list() adjust_germ_level(rand(2,3)) if(501 to INFINITY) adjust_germ_level(rand(3,5)) - owner.reagents.add_reagent("toxin", rand(1,2)) + owner.reagents.add_reagent(REAGENT_ID_TOXIN, rand(1,2)) /obj/item/organ/proc/receive_chem(chemical as obj) return 0 diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 16c0b697e0..07ac7665f4 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -249,8 +249,8 @@ /obj/item/pen/reagent/sleepy/New() ..() - reagents.add_reagent("chloralhydrate", 1) //VOREStation Edit - reagents.add_reagent("stoxin", 14) //VOREStation Add + reagents.add_reagent(REAGENT_ID_CHLORALHYDRATE, 1) //VOREStation Edit + reagents.add_reagent(REAGENT_ID_STOXIN, 14) //VOREStation Add /* @@ -261,8 +261,8 @@ /obj/item/pen/reagent/paralysis/New() ..() - reagents.add_reagent("zombiepowder", 5) - reagents.add_reagent("cryptobiolin", 10) + reagents.add_reagent(REAGENT_ID_ZOMBIEPOWDER, 5) + reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 10) /* * Chameleon Pen diff --git a/code/modules/projectiles/projectile/arc.dm b/code/modules/projectiles/projectile/arc.dm index 271e5f2576..d4d383bd14 100644 --- a/code/modules/projectiles/projectile/arc.dm +++ b/code/modules/projectiles/projectile/arc.dm @@ -189,7 +189,7 @@ spawn() var/obj/effect/effect/water/splash = new(T) splash.create_reagents(15) - splash.reagents.add_reagent("stomacid", 5) + splash.reagents.add_reagent(REAGENT_ID_STOMACID, 5) splash.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = "#ec4940")) splash.set_color() @@ -198,5 +198,5 @@ var/obj/effect/decal/cleanable/chemcoating/acid = locate() in T if(!istype(acid)) acid = new(T) - acid.reagents.add_reagent("stomacid", 5) + acid.reagents.add_reagent(REAGENT_ID_STOMACID, 5) acid.update_icon() diff --git a/code/modules/projectiles/projectile/blob.dm b/code/modules/projectiles/projectile/blob.dm index a20adf0df9..752e70cd4a 100644 --- a/code/modules/projectiles/projectile/blob.dm +++ b/code/modules/projectiles/projectile/blob.dm @@ -9,7 +9,7 @@ fire_sound = 'sound/effects/slime_squish.ogg' var/splatter = FALSE // Will this make a cloud of reagents? var/splatter_volume = 5 // The volume of its chemical container, for said cloud of reagents. - var/list/my_chems = list("mold") + var/list/my_chems = list(REAGENT_ID_MOLD) /obj/item/projectile/energy/blob/splattering splatter = TRUE @@ -45,7 +45,7 @@ /obj/item/projectile/energy/blob/toxic damage_type = TOX check_armour = "bio" - my_chems = list("amatoxin") + my_chems = list(REAGENT_ID_AMATOXIN) /obj/item/projectile/energy/blob/toxic/splattering splatter = TRUE @@ -53,7 +53,7 @@ /obj/item/projectile/energy/blob/acid damage_type = BURN check_armour = "bio" - my_chems = list(REAGENT_ID_SACID, "mold") + my_chems = list(REAGENT_ID_SACID, REAGENT_ID_MOLD) /obj/item/projectile/energy/blob/acid/splattering splatter = TRUE @@ -61,7 +61,7 @@ /obj/item/projectile/energy/blob/combustible splatter = TRUE flammability = 0.25 - my_chems = list(REAGENT_ID_FUEL, "mold") + my_chems = list(REAGENT_ID_FUEL, REAGENT_ID_MOLD) /obj/item/projectile/energy/blob/freezing my_chems = list("frostoil") diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm index b33a08899d..725eb699b5 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm @@ -244,9 +244,9 @@ /obj/item/reagent_containers/chem_disp_cartridge/ethylredox spawn_reagent = "ethylredoxrazine" /obj/item/reagent_containers/chem_disp_cartridge/sleeptox - spawn_reagent = "stoxin" + spawn_reagent = REAGENT_ID_STOXIN /obj/item/reagent_containers/chem_disp_cartridge/chloral - spawn_reagent = "chloralhydrate" + spawn_reagent = REAGENT_ID_CHLORALHYDRATE /obj/item/reagent_containers/chem_disp_cartridge/cryoxadone spawn_reagent = "cryoxadone" /obj/item/reagent_containers/chem_disp_cartridge/clonexadone diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm index 4114508d5c..2115dca67d 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm @@ -2,8 +2,8 @@ //Xenoflora ammonia spawn_reagent = REAGENT_ID_AMMONIA diethylamine spawn_reagent = REAGENT_ID_DIETHYLAMINE - plantbgone spawn_reagent = "plantbgone" - mutagen spawn_reagent = "mutagen" + plantbgone spawn_reagent = REAGENT_ID_PLANTBGONE + mutagen spawn_reagent = REAGENT_ID_MUTAGEN //Biochem nutriment spawn_reagent = REAGENT_ID_NUTRIMENT diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm index 9bf8775351..db299f8ebc 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm @@ -40,7 +40,7 @@ "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", "stoxin", "chloralhydrate", "cryoxadone", + "rezadone", "spaceacillin", "ethylredoxrazine", REAGENT_ID_STOXIN, REAGENT_ID_CHLORALHYDRATE, "cryoxadone", "clonexadone" ) diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm index 431da2f57b..3a9ae7e7ed 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm @@ -2,7 +2,7 @@ name = "xenoflora chem dispenser" ui_title = "Xenoflora Chemical Dispenser" dispense_reagents = list( - REAGENT_ID_WATER, REAGENT_ID_SUGAR, REAGENT_ID_ETHANOL, REAGENT_ID_RADIUM, REAGENT_ID_AMMONIA, REAGENT_ID_DIETHYLAMINE, "plantbgone", "mutagen", REAGENT_ID_CALCIUM + REAGENT_ID_WATER, REAGENT_ID_SUGAR, REAGENT_ID_ETHANOL, REAGENT_ID_RADIUM, REAGENT_ID_AMMONIA, REAGENT_ID_DIETHYLAMINE, REAGENT_ID_PLANTBGONE, REAGENT_ID_MUTAGEN, REAGENT_ID_CALCIUM ) /obj/machinery/chemical_dispenser/xenoflora/full diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm index b2c422c78e..bcd14cfd74 100644 --- a/code/modules/reagents/reactions/distilling/distilling.dm +++ b/code/modules/reagents/reactions/distilling/distilling.dm @@ -174,7 +174,7 @@ name = "Distilling Cryogellatin" id = "distill_cryoslurry" result = REAGENT_ID_CRYOSLURRY - required_reagents = list("frostoil" = 7, "enzyme" = 3, "plasticide" = 3, REAGENT_ID_FOAMINGAGENT = 2) + required_reagents = list("frostoil" = 7, "enzyme" = 3, REAGENT_ID_PLASTICIDE = 3, REAGENT_ID_FOAMINGAGENT = 2) inhibitors = list(REAGENT_ID_WATER = 5) result_amount = 1 @@ -194,8 +194,8 @@ /decl/chemical_reaction/distilling/lichpowder name = "Distilling Lichpowder" id = "distill_lichpowder" - result = "lichpowder" - required_reagents = list("zombiepowder" = 2, "leporazine" = 1) + result = REAGENT_ID_LICHPOWDER + required_reagents = list(REAGENT_ID_ZOMBIEPOWDER = 2, "leporazine" = 1) result_amount = 2 reaction_rate = HALF_LIFE(8) @@ -206,7 +206,7 @@ name = "Distilling Necroxadone" id = "distill_necroxadone" result = "necroxadone" - required_reagents = list("lichpowder" = 1, "cryoxadone" = 1, "carthatoline" = 1) + required_reagents = list(REAGENT_ID_LICHPOWDER = 1, "cryoxadone" = 1, "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 4b392020e5..1647d8d551 100644 --- a/code/modules/reagents/reactions/instant/drinks.dm +++ b/code/modules/reagents/reactions/instant/drinks.dm @@ -1155,7 +1155,7 @@ name = "Named Bullet" id = "slimeshot" result = "slimeshot" - required_reagents = list("slimejelly" = 4, "vodka" = 1) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 4, "vodka" = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/negroni diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm index a80acaac78..365a9fa276 100644 --- a/code/modules/reagents/reactions/instant/instant.dm +++ b/code/modules/reagents/reactions/instant/instant.dm @@ -62,9 +62,9 @@ result_amount = 3 /decl/chemical_reaction/instant/mutagen - name = "Unstable mutagen" - id = "mutagen" - result = "mutagen" + name = REAGENT_MUTAGEN + id = REAGENT_ID_MUTAGEN + result = REAGENT_ID_MUTAGEN required_reagents = list(REAGENT_ID_RADIUM = 1, REAGENT_ID_PHOSPHORUS = 1, REAGENT_ID_CHLORINE = 1) result_amount = 3 @@ -125,9 +125,9 @@ result_amount = 2 /decl/chemical_reaction/instant/impedrezene - name = "Impedrezene" - id = "impedrezene" - result = "impedrezene" + name = REAGENT_IMPEDREZENE + id = REAGENT_ID_IMPEDREZENE + result = REAGENT_ID_IMPEDREZENE required_reagents = list(REAGENT_ID_MERCURY = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_SUGAR = 1) result_amount = 2 @@ -151,7 +151,7 @@ name = "Osteodaxon" id = "osteodaxon" result = "osteodaxon" - required_reagents = list("bicaridine" = 2, REAGENT_ID_PHORON = 0.1, "carpotoxin" = 1) + required_reagents = list("bicaridine" = 2, REAGENT_ID_PHORON = 0.1, REAGENT_ID_CARPOTOXIN = 1) catalysts = list(REAGENT_ID_PHORON = 5) inhibitors = list("clonexadone" = 1) // Messes with cryox result_amount = 2 @@ -187,7 +187,7 @@ name = "Cordradaxon" id = "cordradaxon" result = "cordradaxon" - required_reagents = list("potassium_chlorophoride" = 1, REAGENT_ID_BIOMASS = 2, "bicaridine" = 2) + required_reagents = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE = 1, REAGENT_ID_BIOMASS = 2, "bicaridine" = 2) catalysts = list(REAGENT_ID_PHORON = 5) inhibitors = list("clonexadone" = 1) result_amount = 2 @@ -208,9 +208,9 @@ result_amount = 2 /decl/chemical_reaction/instant/cryptobiolin - name = "Cryptobiolin" - id = "cryptobiolin" - result = "cryptobiolin" + name = REAGENT_CRYPTOBIOLIN + id = REAGENT_ID_CRYPTOBIOLIN + result = REAGENT_ID_CRYPTOBIOLIN required_reagents = list(REAGENT_ID_POTASSIUM = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_SUGAR = 1) result_amount = 3 @@ -274,10 +274,10 @@ result_amount = 3 /decl/chemical_reaction/instant/stimm - name = "Stimm" - id = "stimm" - result = "stimm" - required_reagents = list("left4zed" = 1, REAGENT_ID_FUEL = 1) + name = REAGENT_STIMM + id = REAGENT_ID_STIMM + result = REAGENT_ID_STIMM + required_reagents = list(REAGENT_ID_LEFT4ZED = 1, REAGENT_ID_FUEL = 1) catalysts = list(REAGENT_ID_FUEL = 5) result_amount = 2 @@ -307,7 +307,7 @@ name = "Mortiferin" id = "mortiferin" result = "mortiferin" - required_reagents = list("cryptobiolin" = 1, "clonexadone" = 1, "corophizine" = 1) + required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 1, "clonexadone" = 1, "corophizine" = 1) result_amount = 2 catalysts = list(REAGENT_ID_PHORON = 5) @@ -315,7 +315,7 @@ name = "Spaceacillin" id = "spaceacillin" result = "spaceacillin" - required_reagents = list("cryptobiolin" = 1, "inaprovaline" = 1) + required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 1, "inaprovaline" = 1) result_amount = 2 /decl/chemical_reaction/instant/corophizine @@ -356,54 +356,54 @@ result_amount = 2 /decl/chemical_reaction/instant/soporific - name = "Soporific" - id = "stoxin" - result = "stoxin" - required_reagents = list("chloralhydrate" = 1, REAGENT_ID_SUGAR = 4) + name = REAGENT_STOXIN + id = REAGENT_ID_STOXIN + result = REAGENT_ID_STOXIN + required_reagents = list(REAGENT_ID_CHLORALHYDRATE = 1, REAGENT_ID_SUGAR = 4) inhibitors = list(REAGENT_ID_PHOSPHORUS) // Messes with the smoke result_amount = 5 /decl/chemical_reaction/instant/chloralhydrate - name = "Chloral Hydrate" - id = "chloralhydrate" - result = "chloralhydrate" + name = REAGENT_CHLORALHYDRATE + id = REAGENT_ID_CHLORALHYDRATE + result = REAGENT_ID_CHLORALHYDRATE required_reagents = list(REAGENT_ID_ETHANOL = 1, REAGENT_ID_CHLORINE = 3, REAGENT_ID_WATER = 1) result_amount = 1 /decl/chemical_reaction/instant/potassium_chloride - name = "Potassium Chloride" - id = "potassium_chloride" - result = "potassium_chloride" + name = REAGENT_POTASSIUMCHLORIDE + id = REAGENT_ID_POTASSIUMCHLORIDE + result = REAGENT_ID_POTASSIUMCHLORIDE required_reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_POTASSIUM = 1) result_amount = 2 /decl/chemical_reaction/instant/potassium_chlorophoride - name = "Potassium Chlorophoride" - id = "potassium_chlorophoride" - result = "potassium_chlorophoride" - required_reagents = list("potassium_chloride" = 1, REAGENT_ID_PHORON = 1, "chloralhydrate" = 1) + name = REAGENT_POTASSIUMCHLOROPHORIDE + id = REAGENT_ID_POTASSIUMCHLOROPHORIDE + result = REAGENT_ID_POTASSIUMCHLOROPHORIDE + required_reagents = list(REAGENT_ID_POTASSIUMCHLORIDE = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_CHLORALHYDRATE = 1) result_amount = 4 /decl/chemical_reaction/instant/zombiepowder - name = "Zombie Powder" - id = "zombiepowder" - result = "zombiepowder" - required_reagents = list("carpotoxin" = 5, "stoxin" = 5, REAGENT_ID_COPPER = 5) + name = REAGENT_ZOMBIEPOWDER + id = REAGENT_ID_ZOMBIEPOWDER + result = REAGENT_ID_ZOMBIEPOWDER + required_reagents = list(REAGENT_ID_CARPOTOXIN = 5, REAGENT_ID_STOXIN = 5, REAGENT_ID_COPPER = 5) result_amount = 2 /decl/chemical_reaction/instant/carpotoxin - name = "Carpotoxin" - id = "carpotoxin" - result = "carpotoxin" - required_reagents = list(REAGENT_ID_SPIDERTOXIN = 2, REAGENT_ID_BIOMASS = 1, "sifsap" = 2) - catalysts = list("sifsap" = 10) + name = REAGENT_CARPOTOXIN + id = REAGENT_ID_CARPOTOXIN + result = REAGENT_ID_CARPOTOXIN + required_reagents = list(REAGENT_ID_SPIDERTOXIN = 2, REAGENT_ID_BIOMASS = 1, REAGENT_ID_SIFSAP = 2) + catalysts = list(REAGENT_ID_SIFSAP = 10) inhibitors = list(REAGENT_ID_RADIUM = 1) result_amount = 2 /decl/chemical_reaction/instant/mindbreaker - name = "Mindbreaker Toxin" - id = "mindbreaker" - result = "mindbreaker" + 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) result_amount = 3 @@ -438,16 +438,16 @@ /decl/chemical_reaction/instant/left4zed name = "Left4Zed" - id = "left4zed" - result = "left4zed" - required_reagents = list (REAGENT_ID_DIETHYLAMINE = 2, "mutagen" = 1) + id = REAGENT_ID_LEFT4ZED + result = REAGENT_ID_LEFT4ZED + required_reagents = list (REAGENT_ID_DIETHYLAMINE = 2, REAGENT_ID_MUTAGEN = 1) result_amount = 3 /decl/chemical_reaction/instant/robustharvest name = "RobustHarvest" - id = "robustharvest" - result = "robustharvest" - required_reagents = list (REAGENT_ID_AMMONIA = 1, REAGENT_ID_CALCIUM = 1, "neurotoxic_protein" = 1) + id = REAGENT_ID_ROBUSTHARVEST + result = REAGENT_ID_ROBUSTHARVEST + required_reagents = list (REAGENT_ID_AMMONIA = 1, REAGENT_ID_CALCIUM = 1, REAGENT_ID_NEUROTOXIC_PROTEIN = 1) result_amount = 3 /decl/chemical_reaction/instant/space_cleaner @@ -458,10 +458,10 @@ result_amount = 2 /decl/chemical_reaction/instant/plantbgone - name = "Plant-B-Gone" - id = "plantbgone" - result = "plantbgone" - required_reagents = list("toxin" = 1, REAGENT_ID_WATER = 4) + name = REAGENT_PLANTBGONE + id = REAGENT_ID_PLANTBGONE + result = REAGENT_ID_PLANTBGONE + required_reagents = list(REAGENT_ID_TOXIN = 1, REAGENT_ID_WATER = 4) result_amount = 5 /decl/chemical_reaction/instant/foaming_agent @@ -505,13 +505,13 @@ name = "Rezadone" id = "rezadone" result = "rezadone" - required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, REAGENT_ID_COPPER = 1) + required_reagents = list(REAGENT_ID_CARPOTOXIN = 1, REAGENT_ID_CRYPTOBIOLIN = 1, REAGENT_ID_COPPER = 1) result_amount = 3 /decl/chemical_reaction/instant/lexorin - name = "Lexorin" - id = "lexorin" - result = "lexorin" + name = REAGENT_LEXORIN + id = REAGENT_ID_LEXORIN + result = REAGENT_ID_LEXORIN required_reagents = list(REAGENT_ID_PHORON = 1, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_NITROGEN = 1) result_amount = 3 @@ -519,28 +519,28 @@ name = REAGENT_METHYLPHENIDATE id = REAGENT_ID_METHYLPHENIDATE result = REAGENT_ID_METHYLPHENIDATE - required_reagents = list("mindbreaker" = 1, REAGENT_ID_HYDROGEN = 1) + required_reagents = list(REAGENT_ID_MINDBREAKER = 1, REAGENT_ID_HYDROGEN = 1) result_amount = 3 /decl/chemical_reaction/instant/citalopram name = REAGENT_CITALOPRAM id = REAGENT_ID_CITALOPRAM result = REAGENT_ID_CITALOPRAM - required_reagents = list("mindbreaker" = 1, REAGENT_ID_CARBON = 1) + required_reagents = list(REAGENT_ID_MINDBREAKER = 1, REAGENT_ID_CARBON = 1) result_amount = 3 /decl/chemical_reaction/instant/paroxetine name = REAGENT_PAROXETINE id = REAGENT_ID_PAROXETINE result = REAGENT_ID_PAROXETINE - required_reagents = list("mindbreaker" = 1, REAGENT_ID_OXYGEN = 1, "inaprovaline" = 1) + required_reagents = list(REAGENT_ID_MINDBREAKER = 1, REAGENT_ID_OXYGEN = 1, "inaprovaline" = 1) result_amount = 3 /decl/chemical_reaction/instant/neurotoxin name = "Neurotoxin" id = "neurotoxin" result = "neurotoxin" - required_reagents = list("gargleblaster" = 1, "stoxin" = 1) + required_reagents = list("gargleblaster" = 1, REAGENT_ID_STOXIN = 1) result_amount = 2 /decl/chemical_reaction/instant/luminol @@ -626,7 +626,7 @@ name = "Plastic" id = "solidplastic" result = null - required_reagents = list(REAGENT_ID_PACID = 1, "plasticide" = 2) + required_reagents = list(REAGENT_ID_PACID = 1, REAGENT_ID_PLASTICIDE = 2) result_amount = 1 /decl/chemical_reaction/instant/plastication/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -639,7 +639,7 @@ name = "Carpet" id = "redcarpet" result = null - required_reagents = list(REAGENT_ID_LIQUIDCARPET = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 2, REAGENT_ID_PLASTICIDE = 1) result_amount = 2 var/carpet_type = /obj/item/stack/tile/carpet @@ -650,43 +650,43 @@ /decl/chemical_reaction/instant/carpetify/bcarpet name = "Black Carpet" id = "blackcarpet" - required_reagents = list(REAGENT_ID_LIQUIDCARPETB = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPETB = 2, REAGENT_ID_PLASTICIDE = 1) carpet_type = /obj/item/stack/tile/carpet/bcarpet /decl/chemical_reaction/instant/carpetify/blucarpet name = "Blue Carpet" id = "bluecarpet" - required_reagents = list (REAGENT_ID_LIQUIDCARPETBLU = 2, "plasticide" = 1) + required_reagents = list (REAGENT_ID_LIQUIDCARPETBLU = 2, REAGENT_ID_PLASTICIDE = 1) carpet_type = /obj/item/stack/tile/carpet/blucarpet /decl/chemical_reaction/instant/carpetify/turcarpet name = "Turquise Carpet" id = "turcarpet" - required_reagents = list(REAGENT_ID_LIQUIDCARPETTUR = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPETTUR = 2, REAGENT_ID_PLASTICIDE = 1) carpet_type = /obj/item/stack/tile/carpet/turcarpet /decl/chemical_reaction/instant/carpetify/sblucarpet name = "Silver Blue Carpet" id = "sblucarpet" - required_reagents = list(REAGENT_ID_LIQUIDCARPETSBLU = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPETSBLU = 2, REAGENT_ID_PLASTICIDE = 1) carpet_type = /obj/item/stack/tile/carpet/sblucarpet /decl/chemical_reaction/instant/carpetify/clowncarpet name = "Clown Carpet" id = "clowncarpet" - required_reagents = list(REAGENT_ID_LIQUIDCARPETC = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPETC = 2, REAGENT_ID_PLASTICIDE = 1) carpet_type = /obj/item/stack/tile/carpet/gaycarpet /decl/chemical_reaction/instant/carpetify/pcarpet name = "Purple Carpet" id = "Purplecarpet" - required_reagents = list(REAGENT_ID_LIQUIDCARPETP = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPETP = 2, REAGENT_ID_PLASTICIDE = 1) carpet_type = /obj/item/stack/tile/carpet/purcarpet /decl/chemical_reaction/instant/carpetify/ocarpet name = "Orange Carpet" id = "orangecarpet" - required_reagents = list(REAGENT_ID_LIQUIDCARPETO = 2, "plasticide" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPETO = 2, REAGENT_ID_PLASTICIDE = 1) carpet_type = /obj/item/stack/tile/carpet/oracarpet /decl/chemical_reaction/instant/concrete @@ -899,7 +899,7 @@ name = "Red paint" id = "red_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKRED = 1) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKRED = 1) result_amount = 5 /decl/chemical_reaction/instant/red_paint/send_data() @@ -909,7 +909,7 @@ name = "Orange paint" id = "orange_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKORANGE = 1) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKORANGE = 1) result_amount = 5 /decl/chemical_reaction/instant/orange_paint/send_data() @@ -919,7 +919,7 @@ name = "Yellow paint" id = "yellow_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKYELLOW = 1) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKYELLOW = 1) result_amount = 5 /decl/chemical_reaction/instant/yellow_paint/send_data() @@ -929,7 +929,7 @@ name = "Green paint" id = "green_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREEN = 1) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREEN = 1) result_amount = 5 /decl/chemical_reaction/instant/green_paint/send_data() @@ -939,7 +939,7 @@ name = "Blue paint" id = "blue_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBLUE = 1) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBLUE = 1) result_amount = 5 /decl/chemical_reaction/instant/blue_paint/send_data() @@ -949,7 +949,7 @@ name = "Purple paint" id = "purple_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKPURPLE = 1) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKPURPLE = 1) result_amount = 5 /decl/chemical_reaction/instant/purple_paint/send_data() @@ -959,7 +959,7 @@ name = "Grey paint" id = "grey_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREY = 1) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKGREY = 1) result_amount = 5 /decl/chemical_reaction/instant/grey_paint/send_data() @@ -969,7 +969,7 @@ name = "Brown paint" id = "brown_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBROWN = 1) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MARKERINKBROWN = 1) result_amount = 5 /decl/chemical_reaction/instant/brown_paint/send_data() @@ -979,7 +979,7 @@ name = "Blood paint" id = "blood_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BLOOD = 2) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BLOOD = 2) result_amount = 5 /decl/chemical_reaction/instant/blood_paint/send_data(var/datum/reagents/T) @@ -992,7 +992,7 @@ name = "Milk paint" id = "milk_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "milk" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "milk" = 5) result_amount = 5 /decl/chemical_reaction/instant/milk_paint/send_data() @@ -1002,7 +1002,7 @@ name = "Orange juice paint" id = "orange_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "orangejuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "orangejuice" = 5) result_amount = 5 /decl/chemical_reaction/instant/orange_juice_paint/send_data() @@ -1012,7 +1012,7 @@ name = "Tomato juice paint" id = "tomato_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "tomatojuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "tomatojuice" = 5) result_amount = 5 /decl/chemical_reaction/instant/tomato_juice_paint/send_data() @@ -1022,7 +1022,7 @@ name = "Lime juice paint" id = "lime_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "limejuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "limejuice" = 5) result_amount = 5 /decl/chemical_reaction/instant/lime_juice_paint/send_data() @@ -1032,7 +1032,7 @@ name = "Carrot juice paint" id = "carrot_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "carrotjuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "carrotjuice" = 5) result_amount = 5 /decl/chemical_reaction/instant/carrot_juice_paint/send_data() @@ -1042,7 +1042,7 @@ name = "Berry juice paint" id = "berry_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "berryjuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "berryjuice" = 5) result_amount = 5 /decl/chemical_reaction/instant/berry_juice_paint/send_data() @@ -1052,7 +1052,7 @@ name = "Grape juice paint" id = "grape_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "grapejuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "grapejuice" = 5) result_amount = 5 /decl/chemical_reaction/instant/grape_juice_paint/send_data() @@ -1062,7 +1062,7 @@ name = "Poison berry juice paint" id = "poisonberry_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "poisonberryjuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "poisonberryjuice" = 5) result_amount = 5 /decl/chemical_reaction/instant/poisonberry_juice_paint/send_data() @@ -1072,7 +1072,7 @@ name = "Watermelon juice paint" id = "watermelon_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "watermelonjuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "watermelonjuice" = 5) result_amount = 5 /decl/chemical_reaction/instant/watermelon_juice_paint/send_data() @@ -1082,7 +1082,7 @@ name = "Lemon juice paint" id = "lemon_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "lemonjuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "lemonjuice" = 5) result_amount = 5 /decl/chemical_reaction/instant/lemon_juice_paint/send_data() @@ -1092,7 +1092,7 @@ name = "Banana juice paint" id = "banana_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "banana" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "banana" = 5) result_amount = 5 /decl/chemical_reaction/instant/banana_juice_paint/send_data() @@ -1102,7 +1102,7 @@ name = "Potato juice paint" id = "potato_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "potatojuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "potatojuice" = 5) result_amount = 5 /decl/chemical_reaction/instant/potato_juice_paint/send_data() @@ -1112,7 +1112,7 @@ name = "Carbon paint" id = "carbon_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_CARBON = 1) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_CARBON = 1) result_amount = 5 /decl/chemical_reaction/instant/carbon_paint/send_data() @@ -1122,7 +1122,7 @@ name = "Aluminum paint" id = "aluminum_paint" result = REAGENT_ID_PAINT - required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_ALUMINIUM = 1) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_ALUMINIUM = 1) result_amount = 5 /decl/chemical_reaction/instant/aluminum_paint/send_data() @@ -1175,9 +1175,9 @@ //R-UST Port /decl/chemical_reaction/instant/hydrophoron - name = "Hydrophoron" - id = "hydrophoron" - result = "hydrophoron" + name = REAGENT_HYDROPHORON + id = REAGENT_ID_HYDROPHORON + result = REAGENT_ID_HYDROPHORON required_reagents = list(REAGENT_ID_HYDROGEN = 1, REAGENT_ID_PHORON = 1) inhibitors = list(REAGENT_ID_NITROGEN = 1) //So it doesn't mess with lexorin result_amount = 2 @@ -1186,7 +1186,7 @@ name = REAGENT_DEUTERIUM id = REAGENT_ID_DEUTERIUM result = REAGENT_ID_DEUTERIUM - required_reagents = list("hydrophoron" = 1, REAGENT_ID_WATER = 2) + required_reagents = list(REAGENT_ID_HYDROPHORON = 1, REAGENT_ID_WATER = 2) result_amount = 3 //Skrellian crap. @@ -1194,7 +1194,7 @@ name = REAGENT_TALUMQUEM id = REAGENT_ID_TALUMQUEM result = REAGENT_ID_TALUMQUEM - required_reagents = list(REAGENT_ID_BLISS = 2, REAGENT_ID_SUGAR = 1, "amatoxin" = 1) + required_reagents = list(REAGENT_ID_BLISS = 2, REAGENT_ID_SUGAR = 1, REAGENT_ID_AMATOXIN = 1) result_amount = 4 /decl/chemical_reaction/instant/qerr_quem @@ -1226,19 +1226,19 @@ name = "Neutralize Toxic Proteins" id = "neurotoxic_protein_neutral" result = "protein" - required_reagents = list("anti_toxin" = 1, "neurotoxic_protein" = 2) + required_reagents = list("anti_toxin" = 1, REAGENT_ID_NEUROTOXIC_PROTEIN = 2) result_amount = 2 /decl/chemical_reaction/instant/neutralize_carpotoxin name = "Neutralize Carpotoxin" id = "carpotoxin_neutral" result = "protein" - required_reagents = list("enzyme" = 1, "carpotoxin" = 1, "sifsap" = 1) + required_reagents = list("enzyme" = 1, REAGENT_ID_CARPOTOXIN = 1, REAGENT_ID_SIFSAP = 1) result_amount = 1 /decl/chemical_reaction/instant/neutralize_spidertoxin name = "Neutralize Spidertoxin" id = "spidertoxin_neutral" result = "protein" - required_reagents = list("enzyme" = 1, REAGENT_ID_SPIDERTOXIN = 1, "sifsap" = 1) + required_reagents = list("enzyme" = 1, REAGENT_ID_SPIDERTOXIN = 1, REAGENT_ID_SIFSAP = 1) result_amount = 1 diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm index e2eaca2818..02f612893d 100644 --- a/code/modules/reagents/reactions/instant/instant_vr.dm +++ b/code/modules/reagents/reactions/instant/instant_vr.dm @@ -53,7 +53,7 @@ name = REAGENT_AMORPHOROVIR id = REAGENT_ID_AMORPHOROVIR result = REAGENT_ID_AMORPHOROVIR - required_reagents = list("cryptobiolin" = 30, REAGENT_ID_BIOMASS = 30, "hyperzine" = 20) + required_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 30, REAGENT_ID_BIOMASS = 30, "hyperzine" = 20) catalysts = list(REAGENT_ID_PHORON = 5) result_amount = 1 @@ -136,7 +136,7 @@ name = REAGENT_UNSORBITOL id = REAGENT_ID_UNSORBITOL result = REAGENT_ID_UNSORBITOL - required_reagents = list("mutagen" = 3, "lipozine" = 2) + required_reagents = list(REAGENT_ID_MUTAGEN = 3, "lipozine" = 2) result_amount = 5 /////////////////////////////////////////////////////////////////////////////////// @@ -205,5 +205,5 @@ name = REAGENT_ADVMUTATIONTOXIN id = "advmutationtoxin2" result = REAGENT_ID_ADVMUTATIONTOXIN - required_reagents = list(REAGENT_ID_PHORON = 15, "slimejelly" = 15, "mutationtoxin" = 15) //In case a xenobiologist wants to become a fully fledged slime person. + required_reagents = list(REAGENT_ID_PHORON = 15, REAGENT_ID_SLIMEJELLY = 15, REAGENT_ID_MUTATIONTOXIN = 15) //In case a xenobiologist wants to become a fully fledged slime person. result_amount = 1 diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm index fdfc8798f8..adda682adb 100644 --- a/code/modules/reagents/reactions/instant/virology.dm +++ b/code/modules/reagents/reactions/instant/virology.dm @@ -2,7 +2,7 @@ name = REAGENT_MUTAGENVIRUSFOOD id = REAGENT_ID_MUTAGENVIRUSFOOD result = REAGENT_ID_MUTAGENVIRUSFOOD - required_reagents = list("mutagen" = 1, "virusfood" = 1) + required_reagents = list(REAGENT_ID_MUTAGEN = 1, "virusfood" = 1) result_amount = 1 /decl/chemical_reaction/instant/virus_food_adranol @@ -75,7 +75,7 @@ /decl/chemical_reaction/instant/mix_virus/mix_virus_2 name = "Mix Virus 2" id = "mixvirus2" - required_reagents = list("mutagen" = 1) + required_reagents = list(REAGENT_ID_MUTAGEN = 1) level_min = 2 level_max = 4 diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 81148ffcc2..d8152f9759 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -282,31 +282,31 @@ name = "stimm injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one is filled with a home-made stimulant, with some serious side-effects." - filled_reagents = list("stimm" = 10) // More than 10u will OD. + filled_reagents = list(REAGENT_ID_STIMM = 10) // More than 10u will OD. /obj/item/reagent_containers/hypospray/autoinjector/biginjector/expired name = "expired injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one has had its contents expire a long time ago, using it now will probably make someone sick, or worse." - filled_reagents = list("expired_medicine" = 15) + filled_reagents = list(REAGENT_ID_EXPIREDMEDICINE = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific name = "soporific injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one is sometimes used by orderlies, as it has soporifics, which make someone tired and fall asleep." - filled_reagents = list("stoxin" = 15) + filled_reagents = list(REAGENT_ID_STOXIN = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/cyanide name = "cyanide injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one contains cyanide, a lethal poison. It being inside a medical autoinjector has certain unsettling implications." - filled_reagents = list("cyanide" = 15) + filled_reagents = list(REAGENT_ID_CYANIDE = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/serotrotium name = "serotrotium injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one is filled with serotrotium, which causes concentrated production of the serotonin neurotransmitter in humans." - filled_reagents = list("serotrotium" = 15) + filled_reagents = list(REAGENT_ID_SEROTROTIUM = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/bliss name = "illicit injector" @@ -318,21 +318,21 @@ name = "cryptobiolin injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one contains cryptobiolin, which causes confusion." - filled_reagents = list("cryptobiolin" = 15) + filled_reagents = list(REAGENT_ID_CRYPTOBIOLIN = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/impedrezene name = "impedrezene injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one has impedrezene inside, a narcotic that impairs higher brain functioning. \ This autoinjector is almost certainly created illegitimately." - filled_reagents = list("impedrezene" = 15) + filled_reagents = list(REAGENT_ID_IMPEDREZENE = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker name = "mindbreaker injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one stores the dangerous hallucinogen called 'Mindbreaker', likely put in place \ by illicit groups hoping to hide their product." - filled_reagents = list("mindbreaker" = 15) + filled_reagents = list(REAGENT_ID_MINDBREAKER = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/psilocybin name = "psilocybin injector" @@ -346,14 +346,14 @@ desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This contains unstable mutagen, which makes using this a very bad idea. It will either \ ruin your genetic health, turn you into a Five Points violation, or both!" - filled_reagents = list("mutagen" = 15) + filled_reagents = list(REAGENT_ID_MUTAGEN = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/lexorin name = "lexorin injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This contains lexorin, a dangerous toxin that stops respiration, and has been \ implicated in several high-profile assassinations in the past." - filled_reagents = list("lexorin" = 15) + filled_reagents = list(REAGENT_ID_LEXORIN = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites name = "medical nanite injector" diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 4e50bf488c..202f454fc6 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -136,7 +136,7 @@ /obj/item/reagent_containers/pill/tox/Initialize() . = ..() - reagents.add_reagent("toxin", 50) + reagents.add_reagent(REAGENT_ID_TOXIN, 50) color = reagents.get_color() /obj/item/reagent_containers/pill/cyanide @@ -146,7 +146,7 @@ /obj/item/reagent_containers/pill/cyanide/Initialize() . = ..() - reagents.add_reagent("cyanide", 50) + reagents.add_reagent(REAGENT_ID_CYANIDE, 50) /obj/item/reagent_containers/pill/adminordrazine @@ -166,7 +166,7 @@ /obj/item/reagent_containers/pill/stox/Initialize() . = ..() - reagents.add_reagent("stoxin", 15) + reagents.add_reagent(REAGENT_ID_STOXIN, 15) color = reagents.get_color() /obj/item/reagent_containers/pill/kelotane @@ -339,9 +339,9 @@ /obj/item/reagent_containers/pill/zoom/Initialize() . = ..() if(prob(50)) //VOREStation edit begin: Zoom pill adjustments - reagents.add_reagent("mold", 2) //Chance to be more dangerous - reagents.add_reagent("expired_medicine", 5) - reagents.add_reagent("stimm", 5) //VOREStation edit end: Zoom pill adjustments + reagents.add_reagent(REAGENT_ID_MOLD, 2) //Chance to be more dangerous + reagents.add_reagent(REAGENT_ID_EXPIREDMEDICINE, 5) + reagents.add_reagent(REAGENT_ID_STIMM, 5) //VOREStation edit end: Zoom pill adjustments color = reagents.get_color() /obj/item/reagent_containers/pill/diet diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index ea4561c333..c89015e3e2 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -198,7 +198,7 @@ return /obj/item/reagent_containers/spray/plantbgone - name = "Plant-B-Gone" + name = REAGENT_PLANTBGONE desc = "Kills those pesky weeds!" icon = 'icons/obj/hydroponics_machines.dmi' icon_state = "plantbgone" @@ -207,7 +207,7 @@ /obj/item/reagent_containers/spray/plantbgone/Initialize() . = ..() - reagents.add_reagent("plantbgone", 100) + reagents.add_reagent(REAGENT_ID_PLANTBGONE, 100) /obj/item/reagent_containers/spray/chemsprayer/hosed name = "hose nozzle" diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 2cbd869d08..20d6485b8c 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -369,14 +369,14 @@ /obj/item/reagent_containers/syringe/drugs/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_BLISS, 5) - reagents.add_reagent("mindbreaker", 5) - reagents.add_reagent("cryptobiolin", 5) + reagents.add_reagent(REAGENT_ID_MINDBREAKER, 5) + reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 5) //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped //update_icon() /obj/item/reagent_containers/syringe/ld50_syringe/choral/Initialize() . = ..() - reagents.add_reagent("chloralhydrate", 50) + reagents.add_reagent(REAGENT_ID_CHLORALHYDRATE, 50) mode = SYRINGE_INJECT update_icon() diff --git a/code/modules/reagents/reagents/core.dm b/code/modules/reagents/reagents/core.dm index 44dc798feb..58ce6fe69a 100644 --- a/code/modules/reagents/reagents/core.dm +++ b/code/modules/reagents/reagents/core.dm @@ -160,7 +160,7 @@ H.inject_blood(src, removed * volume_mod) if(!H.isSynthetic() && data["species"] == "synthetic") // Remember not to inject oil into your veins, it's bad for you. - H.reagents.add_reagent("toxin", removed * 1.5) + H.reagents.add_reagent(REAGENT_ID_TOXIN, removed * 1.5) return diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index 423ac02e23..b4e5e23429 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -4622,7 +4622,7 @@ ..() if(alien == IS_DIONA) return - M.reagents.add_reagent("slimejelly", 0.25) + M.reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 0.25) /datum/reagent/ethanol/cloverclub name = "Clover Club" diff --git a/code/modules/reagents/reagents/medicine.dm b/code/modules/reagents/reagents/medicine.dm index 9e3255100c..7df322752b 100644 --- a/code/modules/reagents/reagents/medicine.dm +++ b/code/modules/reagents/reagents/medicine.dm @@ -267,7 +267,7 @@ else if(alien != IS_DIONA) M.adjustOxyLoss(-15 * removed * M.species.chem_strength_heal) - holder.remove_reagent("lexorin", 8 * removed) //VOREStation Edit + holder.remove_reagent(REAGENT_ID_LEXORIN, 8 * removed) //VOREStation Edit /datum/reagent/dexalinp name = "Dexalin Plus" @@ -292,7 +292,7 @@ else if(alien != IS_DIONA) M.adjustOxyLoss(-150 * removed * M.species.chem_strength_heal) - holder.remove_reagent("lexorin", 3 * removed) + holder.remove_reagent(REAGENT_ID_LEXORIN, 3 * removed) /datum/reagent/tricordrazine name = "Tricordrazine" @@ -584,7 +584,7 @@ M.AdjustParalysis(-1) M.AdjustStunned(-1) M.AdjustWeakened(-1) - holder.remove_reagent("mindbreaker", 5) + holder.remove_reagent(REAGENT_ID_MINDBREAKER, 5) M.hallucination = max(0, M.hallucination - 10) M.adjustToxLoss(10 * removed * chem_effective) // It used to be incredibly deadly due to an oversight. Not anymore! M.add_chemical_effect(CE_PAINKILLER, 20 * chem_effective * M.species.chem_strength_pain) diff --git a/code/modules/reagents/reagents/toxins.dm b/code/modules/reagents/reagents/toxins.dm index be61b6da43..444e1b7a28 100644 --- a/code/modules/reagents/reagents/toxins.dm +++ b/code/modules/reagents/reagents/toxins.dm @@ -1,8 +1,8 @@ /* Toxins, poisons, venoms */ /datum/reagent/toxin - name = "toxin" - id = "toxin" + name = REAGENT_TOXIN + id = REAGENT_ID_TOXIN description = "A toxic chemical." taste_description = "bitterness" taste_mult = 1.2 @@ -29,8 +29,8 @@ affect_blood(M, alien, removed * 0.2) /datum/reagent/toxin/plasticide - name = "Plasticide" - id = "plasticide" + name = REAGENT_PLASTICIDE + id = REAGENT_ID_PLASTICIDE description = "Liquid plastic, do not eat." taste_description = "plastic" reagent_state = LIQUID @@ -38,8 +38,8 @@ strength = 5 /datum/reagent/toxin/amatoxin - name = "Amatoxin" - id = "amatoxin" + name = REAGENT_AMATOXIN + id = REAGENT_ID_AMATOXIN description = "A powerful poison derived from certain species of mushroom." taste_description = "mushroom" reagent_state = LIQUID @@ -52,8 +52,8 @@ M.adjustToxLoss(max_dose * strength * removed / (max_dose * 0.2)) /datum/reagent/toxin/carpotoxin - name = "Carpotoxin" - id = "carpotoxin" + name = REAGENT_CARPOTOXIN + id = REAGENT_ID_CARPOTOXIN description = "A deadly neurotoxin produced by the dreaded space carp." taste_description = "fish" reagent_state = LIQUID @@ -65,8 +65,8 @@ M.adjustBrainLoss(strength / 4 * removed) /datum/reagent/toxin/neurotoxic_protein - name = "toxic protein" - id = "neurotoxic_protein" + name = REAGENT_NEUROTOXIC_PROTEIN + id = REAGENT_ID_NEUROTOXIC_PROTEIN description = "A weak neurotoxic chemical." taste_description = "fish" reagent_state = LIQUID @@ -89,8 +89,8 @@ //R-UST port // Produced during deuterium synthesis. Super poisonous, SUPER flammable (doesn't need oxygen to burn). /datum/reagent/toxin/hydrophoron - name = "Hydrophoron" - id = "hydrophoron" + name = REAGENT_HYDROPHORON + id = REAGENT_ID_HYDROPHORON description = "An exceptionally flammable molecule formed from deuterium synthesis." strength = 80 var/fire_mult = 30 @@ -179,8 +179,8 @@ remove_self(amount) /datum/reagent/toxin/cyanide //Fast and Lethal - name = "Cyanide" - id = "cyanide" + name = REAGENT_CYANIDE + id = REAGENT_ID_CYANIDE description = "A highly toxic chemical." taste_description = "almond" taste_mult = 0.6 @@ -195,8 +195,8 @@ M.Sleeping(1) /datum/reagent/toxin/mold - name = "Mold" - id = "mold" + name = REAGENT_MOLD + id = REAGENT_ID_MOLD description = "A mold is a fungus that causes biodegradation of natural materials. This variant contains mycotoxins, and is dangerous to humans." taste_description = "mold" reagent_state = SOLID @@ -208,8 +208,8 @@ M.vomit() /datum/reagent/toxin/expired_medicine - name = "Expired Medicine" - id = "expired_medicine" + name = REAGENT_EXPIREDMEDICINE + id = REAGENT_ID_EXPIREDMEDICINE description = "Some form of liquid medicine that is well beyond its shelf date. Administering it now would cause illness." taste_description = "bitterness" reagent_state = LIQUID @@ -226,8 +226,8 @@ /datum/reagent/toxin/stimm //Homemade Hyperzine - name = "Stimm" - id = "stimm" + name = REAGENT_STIMM + id = REAGENT_ID_STIMM description = "A homemade stimulant with some serious side-effects." taste_description = "sweetness" taste_mult = 1.8 @@ -257,8 +257,8 @@ to_chat(M, span_warning("Huh... Is this what a heart attack feels like?")) /datum/reagent/toxin/potassium_chloride - name = "Potassium Chloride" - id = "potassium_chloride" + name = REAGENT_POTASSIUMCHLORIDE + id = REAGENT_ID_POTASSIUMCHLORIDE description = "A delicious salt that stops the heart when injected into cardiac muscle." taste_description = "salt" reagent_state = SOLID @@ -283,8 +283,8 @@ H.Weaken(10) /datum/reagent/toxin/potassium_chlorophoride - name = "Potassium Chlorophoride" - id = "potassium_chlorophoride" + name = REAGENT_POTASSIUMCHLOROPHORIDE + id = REAGENT_ID_POTASSIUMCHLOROPHORIDE description = "A specific chemical based on Potassium Chloride to stop the heart for surgery. Not safe to eat!" taste_description = "salt" reagent_state = SOLID @@ -306,8 +306,8 @@ M.adjustFireLoss(removed * 3) /datum/reagent/toxin/zombiepowder - name = "Zombie Powder" - id = "zombiepowder" + name = REAGENT_ZOMBIEPOWDER + id = REAGENT_ID_ZOMBIEPOWDER description = "A strong neurotoxin that puts the subject into a death-like state." taste_description = "numbness" reagent_state = SOLID @@ -333,8 +333,8 @@ return ..() /datum/reagent/toxin/lichpowder - name = "Lich Powder" - id = "lichpowder" + name = REAGENT_LICHPOWDER + id = REAGENT_ID_LICHPOWDER description = "A stablized nerve agent that puts the subject into a strange state of un-death." reagent_state = SOLID color = "#666666" @@ -362,8 +362,8 @@ return ..() /datum/reagent/toxin/fertilizer //Reagents used for plant fertilizers. - name = "fertilizer" - id = "fertilizer" + name = REAGENT_FERTILIZER + id = REAGENT_ID_FERTILIZER description = "A chemical mix good for growing plants with." taste_description = "plant food" taste_mult = 0.5 @@ -372,20 +372,20 @@ color = "#664330" /datum/reagent/toxin/fertilizer/eznutrient - name = "EZ Nutrient" - id = "eznutrient" + name = REAGENT_EZNUTRIENT + id = REAGENT_ID_EZNUTRIENT /datum/reagent/toxin/fertilizer/left4zed - name = "Left-4-Zed" - id = "left4zed" + name = REAGENT_LEFT4ZED + id = REAGENT_ID_LEFT4ZED /datum/reagent/toxin/fertilizer/robustharvest - name = "Robust Harvest" - id = "robustharvest" + name = REAGENT_ROBUSTHARVEST + id = REAGENT_ID_ROBUSTHARVEST /datum/reagent/toxin/fertilizer/tannin - name = "tannin" - id = "tannin" + name = REAGENT_TANNIN + id = REAGENT_ID_TANNIN description = "A chemical found in some plants as a natural pesticide. It may also aid in regulating growth." taste_description = "puckering" taste_mult = 1.2 @@ -401,8 +401,8 @@ ..() /datum/reagent/toxin/plantbgone - name = "Plant-B-Gone" - id = "plantbgone" + name = REAGENT_PLANTBGONE + id = REAGENT_ID_PLANTBGONE description = "A harmful toxic mixture to kill plantlife. Do not ingest!" taste_mult = 1 reagent_state = LIQUID @@ -436,8 +436,8 @@ M.adjustToxLoss(50 * removed) /datum/reagent/toxin/sifslurry - name = "Sivian Sap" - id = "sifsap" + name = REAGENT_SIFSAP + id = REAGENT_ID_SIFSAP description = "A natural slurry comprised of fluorescent bacteria native to Sif, in the Vir system." taste_description = "sour" reagent_state = LIQUID @@ -476,8 +476,8 @@ meltdose = 4 /datum/reagent/acid/digestive - name = "Digestive acid" - id = "stomacid" + name = REAGENT_STOMACID + id = REAGENT_ID_STOMACID description = "Some form of digestive slurry." taste_description = "vomit" reagent_state = LIQUID @@ -486,8 +486,8 @@ meltdose = 30 /datum/reagent/thermite/venom - name = "Pyrotoxin" - id = "thermite_v" + name = REAGENT_THERMITEV + id = REAGENT_ID_THERMITEV description = "A biologically produced compound capable of melting steel or other metals, similarly to thermite." taste_description = "sweet chalk" reagent_state = SOLID @@ -508,8 +508,8 @@ to_chat(M, span_critical("Some of your veins rupture, the exposed blood igniting!")) /datum/reagent/condensedcapsaicin/venom - name = "Irritant toxin" - id = "condensedcapsaicin_v" + name = REAGENT_CONDENSEDCAPSAICINV + id = REAGENT_ID_CONDENSEDCAPSAICINV description = "A biological agent that acts similarly to pepperspray. This compound seems to be particularly cruel, however, capable of permeating the barriers of blood vessels." taste_description = "fire" color = "#B31008" @@ -530,8 +530,8 @@ M.eye_blurry = max(M.eye_blurry, 10) /datum/reagent/lexorin - name = "Lexorin" - id = "lexorin" + name = REAGENT_LEXORIN + id = REAGENT_ID_LEXORIN description = "Lexorin temporarily stops respiration. Causes tissue damage." taste_description = "acid" reagent_state = LIQUID @@ -558,8 +558,8 @@ M.AdjustLosebreath(1) /datum/reagent/mutagen - name = "Unstable mutagen" - id = "mutagen" + name = REAGENT_MUTAGEN + id = REAGENT_ID_MUTAGEN description = "Might cause unpredictable mutations. Keep away from children." taste_description = "slime" taste_mult = 0.9 @@ -627,8 +627,8 @@ M.apply_effect(10 * removed, IRRADIATE, 0) /datum/reagent/slimejelly - name = "Slime Jelly" - id = "slimejelly" + name = REAGENT_SLIMEJELLY + id = REAGENT_ID_SLIMEJELLY description = "A gooey semi-liquid produced from one of the deadliest lifeforms in existence. SO REAL." taste_description = "slime" taste_mult = 1.3 @@ -652,8 +652,8 @@ M.heal_organ_damage(25 * removed, 0) /datum/reagent/soporific - name = "Soporific" - id = "stoxin" + name = REAGENT_STOXIN + id = REAGENT_ID_STOXIN description = "An effective hypnotic used to treat insomnia." taste_description = "bitterness" reagent_state = LIQUID @@ -699,8 +699,8 @@ M.drowsyness = max(M.drowsyness, 60) /datum/reagent/chloralhydrate - name = "Chloral Hydrate" - id = "chloralhydrate" + name = REAGENT_CHLORALHYDRATE + id = REAGENT_ID_CHLORALHYDRATE description = "A powerful sedative." taste_description = "bitterness" reagent_state = SOLID @@ -750,8 +750,8 @@ M.adjustOxyLoss(removed * overdose_mod) /datum/reagent/chloralhydrate/beer2 //disguised as normal beer for use by emagged brobots - name = "Beer" - id = "beer2" + name = REAGENT_BEER2 + id = REAGENT_ID_BEER2 description = "An alcoholic beverage made from malted grains, hops, yeast, and water. The fermentation appears to be incomplete." //If the players manage to analyze this, they deserve to know something is wrong. taste_description = "beer" reagent_state = LIQUID @@ -763,8 +763,8 @@ /* Drugs */ /datum/reagent/serotrotium - name = "Serotrotium" - id = "serotrotium" + name = REAGENT_SEROTROTIUM + id = REAGENT_ID_SEROTROTIUM description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans." taste_description = "bitterness" reagent_state = LIQUID @@ -780,8 +780,8 @@ return /datum/reagent/serotrotium/venom - name = "Serotropic venom" - id = "serotrotium_v" + name = REAGENT_SEROTROTIUMV + id = REAGENT_ID_SEROTROTIUMV description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans. This appears to be a biologically produced form, resulting in a specifically toxic nature." taste_description = "chalky bitterness" filtered_organs = list(O_SPLEEN) @@ -796,8 +796,8 @@ return ..() /datum/reagent/cryptobiolin - name = "Cryptobiolin" - id = "cryptobiolin" + name = REAGENT_CRYPTOBIOLIN + id = REAGENT_ID_CRYPTOBIOLIN description = "Cryptobiolin causes confusion and dizzyness." taste_description = "sourness" reagent_state = LIQUID @@ -820,8 +820,8 @@ M.Confuse(drug_strength * 5) /datum/reagent/impedrezene - name = "Impedrezene" - id = "impedrezene" + name = REAGENT_IMPEDREZENE + id = REAGENT_ID_IMPEDREZENE description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions." taste_description = "numbness" reagent_state = LIQUID @@ -841,8 +841,8 @@ M.emote("drool") /datum/reagent/mindbreaker - name = "Mindbreaker Toxin" - id = "mindbreaker" + name = REAGENT_MINDBREAKER + id = REAGENT_ID_MINDBREAKER description = "A powerful hallucinogen, it can cause fatal effects in users." taste_description = "sourness" reagent_state = LIQUID @@ -867,8 +867,8 @@ /* Transformations */ /datum/reagent/slimetoxin - name = "Mutation Toxin" - id = "mutationtoxin" + name = REAGENT_MUTATIONTOXIN + id = REAGENT_ID_MUTATIONTOXIN description = "A corruptive toxin produced by slimes." taste_description = "sludge" reagent_state = LIQUID @@ -897,8 +897,8 @@ M.apply_effect(16 * removed, IRRADIATE, 0) /datum/reagent/aslimetoxin - name = "Docility Toxin" - id = "docilitytoxin" + name = REAGENT_DOCILITYTOXIN + id = REAGENT_ID_DOCILITYTOXIN description = "A corruptive toxin produced by slimes." taste_description = "sludge" reagent_state = LIQUID @@ -932,8 +932,8 @@ */ /datum/reagent/shredding_nanites - name = "Restorative Nanites" - id = "shredding_nanites" + name = REAGENT_SHREDDINGNANITES + id = REAGENT_ID_SHREDDINGNANITES description = "Miniature medical robots that swiftly restore bodily damage. These ones seem to be malfunctioning." taste_description = "metal" reagent_state = SOLID @@ -946,8 +946,8 @@ M.adjustOxyLoss(4 * removed) /datum/reagent/irradiated_nanites - name = "Restorative Nanites" - id = "irradiated_nanites" + name = REAGENT_IRRADIATEDNANITES + id = REAGENT_ID_IRRADIATEDNANITES description = "Miniature medical robots that swiftly restore bodily damage. These ones seem to be malfunctioning." taste_description = "metal" reagent_state = SOLID @@ -960,8 +960,8 @@ M.radiation = max(M.radiation + 5 * removed, 0) // Irradiate you. Because it's inside you. /datum/reagent/neurophage_nanites - name = "Restorative Nanites" - id = "neurophage_nanites" + name = REAGENT_NEUROPHAGENANITES + id = REAGENT_ID_NEUROPHAGENANITES description = "Miniature medical robots that swiftly restore bodily damage. These ones seem to be completely hostile." taste_description = "metal" reagent_state = SOLID @@ -975,8 +975,8 @@ M.adjustBruteLoss(2 * removed) /datum/reagent/salmonella - name = "Salmonella" - id = "salmonella" + name = REAGENT_SALMONELLA + id = REAGENT_ID_SALMONELLA description = "A nasty bacteria found in spoiled food." reagent_state = LIQUID color = "#1E4600" diff --git a/code/modules/xenoarcheaology/effect_master.dm b/code/modules/xenoarcheaology/effect_master.dm index 7bfd9f9965..00455f05e5 100644 --- a/code/modules/xenoarcheaology/effect_master.dm +++ b/code/modules/xenoarcheaology/effect_master.dm @@ -305,7 +305,7 @@ else if(W.reagents.has_reagent(REAGENT_ID_PHORON, 1) || W.reagents.has_reagent(REAGENT_ID_THERMITE, 1)) if(my_effect.trigger == TRIGGER_VOLATILE) my_effect.ToggleActivate() - else if(W.reagents.has_reagent("toxin", 1) || W.reagents.has_reagent("cyanide", 1) || W.reagents.has_reagent("amatoxin", 1) || W.reagents.has_reagent("neurotoxin", 1)) + else if(W.reagents.has_reagent(REAGENT_ID_TOXIN, 1) || W.reagents.has_reagent(REAGENT_ID_CYANIDE, 1) || W.reagents.has_reagent(REAGENT_ID_AMATOXIN, 1) || W.reagents.has_reagent("neurotoxin", 1)) if(my_effect.trigger == TRIGGER_TOXIN) my_effect.ToggleActivate() else if(istype(W,/obj/item/melee/baton) && W:status ||\ @@ -330,7 +330,7 @@ var/list/water = list(REAGENT_ID_HYDROGEN, REAGENT_ID_WATER) var/list/acid = list(REAGENT_ID_SACID, REAGENT_ID_PACID, REAGENT_ID_DIETHYLAMINE) var/list/volatile = list(REAGENT_ID_PHORON,REAGENT_ID_THERMITE) - var/list/toxic = list("toxin","cyanide","amatoxin","neurotoxin") + var/list/toxic = list(REAGENT_ID_TOXIN,REAGENT_ID_CYANIDE,REAGENT_ID_AMATOXIN,"neurotoxin") for(var/datum/artifact_effect/my_effect in my_effects) if(Touching.id in water) diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm index 9c2385e43c..e6b476c7bd 100644 --- a/code/modules/xenoarcheaology/finds/special.dm +++ b/code/modules/xenoarcheaology/finds/special.dm @@ -8,7 +8,7 @@ /obj/item/reagent_containers/glass/replenishing/Initialize() . = ..() START_PROCESSING(SSobj, src) - spawning_id = pick(REAGENT_ID_BLOOD,REAGENT_ID_HOLYWATER,REAGENT_ID_LUBE,"stoxin",REAGENT_ID_ETHANOL,"ice",REAGENT_ID_GLYCEROL,REAGENT_ID_FUEL,REAGENT_ID_CLEANER) + spawning_id = pick(REAGENT_ID_BLOOD,REAGENT_ID_HOLYWATER,REAGENT_ID_LUBE,REAGENT_ID_STOXIN,REAGENT_ID_ETHANOL,"ice",REAGENT_ID_GLYCEROL,REAGENT_ID_FUEL,REAGENT_ID_CLEANER) /obj/item/reagent_containers/glass/replenishing/process() reagents.add_reagent(spawning_id, 0.3) diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm index 9c06e5db82..73f9f04e7e 100644 --- a/code/modules/xenobio/items/extracts.dm +++ b/code/modules/xenobio/items/extracts.dm @@ -96,9 +96,9 @@ ..() /decl/chemical_reaction/instant/slime/grey_slimejelly - name = "Slime Jelly" + name = REAGENT_SLIMEJELLY id = "m_jelly" - result = "slimejelly" + result = REAGENT_ID_SLIMEJELLY required_reagents = list("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 96d8356f03..f70a98e702 100644 --- a/code/modules/xenobio/items/extracts_vr.dm +++ b/code/modules/xenobio/items/extracts_vr.dm @@ -105,9 +105,9 @@ /decl/chemical_reaction/instant/slime/grey_slimejelly - name = "Slime Jelly" + name = REAGENT_SLIMEJELLY id = "m_grey_jelly" - result = "slimejelly" + result = REAGENT_ID_SLIMEJELLY required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 30 required = /obj/item/slime_extract/grey @@ -170,7 +170,7 @@ /decl/chemical_reaction/instant/slime/metal_materials_steel name = "Slime Weird Construction Materials" id = "m_metal_steel" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/metal @@ -248,7 +248,7 @@ name = "Slime Cryotoxin" id = "m_blue_cryotoxin" result = "cryotoxin" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 30 required = /obj/item/slime_extract/blue @@ -304,7 +304,7 @@ /decl/chemical_reaction/instant/slime/purple_fertility name = "Slime Fetility" id = "m_purple_fertility" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/purple @@ -428,8 +428,8 @@ /decl/chemical_reaction/instant/slime/orange_pyrotoxin name = "Slime Pyrotoxin" id = "m_orange_pyrotoxin" - result = "thermite_v" - required_reagents = list("slimejelly" = 5) + result = REAGENT_ID_THERMITEV + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 30 required = /obj/item/slime_extract/orange @@ -495,7 +495,7 @@ /decl/chemical_reaction/instant/slime/yellow_battery name = "Slime Cell" id = "m_yellow_cell" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/yellow @@ -579,7 +579,7 @@ /decl/chemical_reaction/instant/slime/gold_materials_gold name = "Slime Gold" id = "m_gold_gold" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/gold @@ -654,7 +654,7 @@ /decl/chemical_reaction/instant/slime/silver_materials_silver name = "Slime Silver" id = "m_silver_silver" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/silver @@ -686,7 +686,7 @@ name = "Slime Blood" id = "m_darkpurple_blood" result = REAGENT_ID_BLOOD - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 30 required = /obj/item/slime_extract/dark_purple @@ -810,7 +810,7 @@ /decl/chemical_reaction/instant/slime/dark_blue_death name = "Slime Death" id = "m_darkblue_death" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/dark_blue @@ -890,7 +890,7 @@ /decl/chemical_reaction/instant/slime/red_ferality name = "Slime Ferality" id = "m_red_ferality" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/red @@ -951,7 +951,7 @@ /decl/chemical_reaction/instant/slime/green_uranium name = "Slime Uranium" id = "m_green_uranium" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/green @@ -1001,7 +1001,7 @@ /decl/chemical_reaction/instant/slime/pink_heal_pulse name = "Slime Heal Pulse" id = "m_pink_heal_pulse" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/pink @@ -1063,7 +1063,7 @@ /decl/chemical_reaction/instant/slime/oil_explosion name = "Slime Explosion" id = "m_oil_boom" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/oil @@ -1151,7 +1151,7 @@ /decl/chemical_reaction/instant/slime/bluespace_teleporter name = "Slime Bluespace Teleporter" id = "m_bs_teleporter" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/bluespace @@ -1211,7 +1211,7 @@ /decl/chemical_reaction/instant/slime/cerulean_random_potion name = "Slime Random Potion" id = "m_cerulean_random_potion" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/cerulean @@ -1284,7 +1284,7 @@ name = "Slime Goop" id = "m_amber_goop" result = "slime_goop" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 30 required = /obj/item/slime_extract/amber @@ -1316,7 +1316,7 @@ /decl/chemical_reaction/instant/slime/sapphire_mutation name = "Slime Mutation Toxins" id = "m_sapphire_mutation_tox" - result = "mutationtoxin" + result = REAGENT_ID_MUTATIONTOXIN required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 30 required = /obj/item/slime_extract/sapphire @@ -1343,7 +1343,7 @@ /decl/chemical_reaction/instant/slime/sapphire_sapience name = "Slime Sapience" id = "m_sapphire_sapience" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/sapphire @@ -1417,7 +1417,7 @@ /decl/chemical_reaction/instant/slime/ruby_push name = "Slime Push" id = "m_ruby_push" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/ruby @@ -1513,7 +1513,7 @@ /decl/chemical_reaction/instant/slime/emerald_hell name = "Slime Hell" id = "m_emerald_hell" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/emerald @@ -1578,7 +1578,7 @@ /decl/chemical_reaction/instant/slime/light_pink_obedience name = "Slime Obedience" id = "m_lightpink_obedience" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/light_pink @@ -1652,7 +1652,7 @@ /decl/chemical_reaction/instant/slime/rainbow_unity name = "Slime Unity" id = "m_rainbow_unity" - required_reagents = list("slimejelly" = 5) + required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 1 required = /obj/item/slime_extract/rainbow diff --git a/code/modules/xenobio2/_xeno_setup.dm b/code/modules/xenobio2/_xeno_setup.dm index b82d70f86d..f821f024cd 100644 --- a/code/modules/xenobio2/_xeno_setup.dm +++ b/code/modules/xenobio2/_xeno_setup.dm @@ -48,21 +48,21 @@ #define MINOR_MALEABLE 1 #define MIN_MALEABLE 0 -var/global/list/xenoChemList = list("mutationtoxin", +var/global/list/xenoChemList = list(REAGENT_ID_MUTATIONTOXIN, REAGENT_ID_PSILOCYBIN, - "mindbreaker", - "impedrezene", - "cryptobiolin", + REAGENT_ID_MINDBREAKER, + REAGENT_ID_IMPEDREZENE, + REAGENT_ID_CRYPTOBIOLIN, REAGENT_ID_BLISS, - "chloralhydrate", - "stoxin", - "mutagen", - "lexorin", + REAGENT_ID_CHLORALHYDRATE, + REAGENT_ID_STOXIN, + REAGENT_ID_MUTAGEN, + REAGENT_ID_LEXORIN, REAGENT_ID_PACID, - "cyanide", + REAGENT_ID_CYANIDE, REAGENT_ID_PHORON, - "plasticide", - "amatoxin", + REAGENT_ID_PLASTICIDE, + REAGENT_ID_AMATOXIN, REAGENT_ID_CARBON, REAGENT_ID_RADIUM, REAGENT_ID_SACID, @@ -76,8 +76,8 @@ var/global/list/xenoChemList = list("mutationtoxin", "imidazoline", "peridaxon", "rezadone", - "mutationtoxin", - "docilitytoxin") + REAGENT_ID_MUTATIONTOXIN, + REAGENT_ID_MUTATIONTOXIN) /datum/xeno/traits var/list/traits = list() diff --git a/code/modules/xenobio2/_xeno_setup_vr.dm b/code/modules/xenobio2/_xeno_setup_vr.dm index f093290d5e..4d199afdaf 100644 --- a/code/modules/xenobio2/_xeno_setup_vr.dm +++ b/code/modules/xenobio2/_xeno_setup_vr.dm @@ -26,17 +26,17 @@ xenoChemList += REAGENT_ID_SIZEOXADONE xenoChemList += REAGENT_ID_ICKYPAK xenoChemList += REAGENT_ID_UNSORBITOL - xenoChemList += "toxin" - xenoChemList += "carpotoxin" - xenoChemList += "potassium_chloride" - xenoChemList += "potassium_chlorophoride" - xenoChemList += "zombiepowder" - xenoChemList += "fertilizer" - xenoChemList += "eznutrient" - xenoChemList += "left4zed" - xenoChemList += "robustharvest" - xenoChemList += "plantbgone" - xenoChemList += "serotrotium" + xenoChemList += REAGENT_ID_TOXIN + xenoChemList += REAGENT_ID_CARPOTOXIN + xenoChemList += REAGENT_ID_POTASSIUMCHLORIDE + xenoChemList += REAGENT_ID_POTASSIUMCHLOROPHORIDE + xenoChemList += REAGENT_ID_ZOMBIEPOWDER + xenoChemList += REAGENT_ID_FERTILIZER + xenoChemList += REAGENT_ID_EZNUTRIENT + xenoChemList += REAGENT_ID_LEFT4ZED + xenoChemList += REAGENT_ID_ROBUSTHARVEST + xenoChemList += REAGENT_ID_PLANTBGONE + xenoChemList += REAGENT_ID_SEROTROTIUM xenoChemList += REAGENT_ID_NICOTINE xenoChemList += REAGENT_ID_URANIUM xenoChemList += REAGENT_ID_SILVER diff --git a/code/modules/xenobio2/mob/slime/slime procs.dm b/code/modules/xenobio2/mob/slime/slime procs.dm index 2bd5912958..91fc793e51 100644 --- a/code/modules/xenobio2/mob/slime/slime procs.dm +++ b/code/modules/xenobio2/mob/slime/slime procs.dm @@ -29,7 +29,7 @@ Slime specific procs go here. if(prob(40)) var/hasMutToxin for(var/R in traitdat.chems) - if(R == "mutationtoxin") + if(R == REAGENT_ID_MUTATIONTOXIN) hasMutToxin = 1 var/chemamount if(hasMutToxin) @@ -40,7 +40,7 @@ Slime specific procs go here. traitdat.chems[chemtype] = chemamount else chemamount = rand(1,5) - traitdat.chems["mutationtoxin"] = chemamount + traitdat.chems[REAGENT_ID_MUTATIONTOXIN] = chemamount /mob/living/simple_mob/xeno/slime/proc/GrowUp() GenerateAdult() @@ -115,7 +115,7 @@ Slime specific procs go here. return if(reagents.total_volume <= 0) return - if(reagents.has_reagent("docilitytoxin")) //Toxin that makes them docile? Good for quelling angry mobs. + if(reagents.has_reagent(REAGENT_ID_MUTATIONTOXIN)) //Toxin that makes them docile? Good for quelling angry mobs. hostile = 0 traitdat.traits[TRAIT_XENO_HOSTILE] = 0 ..() diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm index 4831b54136..b501624fb7 100644 --- a/code/modules/xenobio2/mob/slime/slime.dm +++ b/code/modules/xenobio2/mob/slime/slime.dm @@ -21,7 +21,7 @@ Slime definitions, Life and New live here. var/growthpoint = 25 //At what point they grow up. var/shiny = 0 move_to_delay = 17 //Slimes shouldn't be able to go faster than humans. - default_chems = list("slimejelly" = 5) + default_chems = list(REAGENT_ID_SLIMEJELLY = 5) attacktext = list("absorbed some of") response_help = "pats" response_disarm = "tries to stop" @@ -48,7 +48,7 @@ Slime definitions, Life and New live here. chemreact = list( REAGENT_ID_NUTRIMENT = list(XENO_CHEM_NUTRI = 0.5), REAGENT_ID_RADIUM = list(XENO_CHEM_TOXIC = 0.3, XENO_CHEM_MUT = 1), - "mutagen" = list(XENO_CHEM_NUTRI = 0.4, XENO_CHEM_MUT = 2), + REAGENT_ID_MUTAGEN = list(XENO_CHEM_NUTRI = 0.4, XENO_CHEM_MUT = 2), REAGENT_ID_WATER = list(XENO_CHEM_NUTRI = -0.1), "milk" = list(XENO_CHEM_NUTRI = 0.3), REAGENT_ID_SACID = list(XENO_CHEM_TOXIC = 1), @@ -59,26 +59,26 @@ Slime definitions, Life and New live here. "beer" = list(XENO_CHEM_NUTRI = 0.6), REAGENT_ID_DIETHYLAMINE = list(XENO_CHEM_NUTRI = 0.9), REAGENT_ID_SUGAR = list(XENO_CHEM_TOXIC = 0.4, XENO_CHEM_NUTRI = 0.2), - "eznutrient" = list(XENO_CHEM_NUTRI = 0.8), + REAGENT_ID_EZNUTRIENT = list(XENO_CHEM_NUTRI = 0.8), "cryoxadone" = list(XENO_CHEM_TOXIC = 0.4), "flourine" = list(XENO_CHEM_TOXIC = 0.1), - "robustharvest" = list(XENO_CHEM_NUTRI = 1.5), + REAGENT_ID_ROBUSTHARVEST = list(XENO_CHEM_NUTRI = 1.5), "glucose" = list(XENO_CHEM_NUTRI = 0.5), REAGENT_ID_BLOOD = list(XENO_CHEM_NUTRI = 0.75, XENO_CHEM_TOXIC = 0.05, XENO_CHEM_MUT = 0.45), REAGENT_ID_FUEL = list(XENO_CHEM_TOXIC = 0.4), - "toxin" = list(XENO_CHEM_TOXIC = 0.5), - "carpotoxin" = list(XENO_CHEM_TOXIC = 1, XENO_CHEM_MUT = 1.5), + REAGENT_ID_TOXIN = list(XENO_CHEM_TOXIC = 0.5), + REAGENT_ID_CARPOTOXIN = list(XENO_CHEM_TOXIC = 1, XENO_CHEM_MUT = 1.5), REAGENT_ID_PHORON = list(XENO_CHEM_TOXIC = 1.5, XENO_CHEM_MUT = 0.03), "virusfood" = list(XENO_CHEM_NUTRI = 1.5, XENO_CHEM_MUT = 0.32), - "cyanide" = list(XENO_CHEM_TOXIC = 3.5), - "slimejelly" = list(XENO_CHEM_NUTRI = 0.5), + REAGENT_ID_CYANIDE = list(XENO_CHEM_TOXIC = 3.5), + REAGENT_ID_SLIMEJELLY = list(XENO_CHEM_NUTRI = 0.5), "amutationtoxin" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1.5, XENO_CHEM_MUT = 3), - "mutationtoxin" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1, XENO_CHEM_MUT = 1.5), + REAGENT_ID_MUTATIONTOXIN = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1, XENO_CHEM_MUT = 1.5), REAGENT_ID_GOLD = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_NUTRI = 0.7, XENO_CHEM_MUT = 0.3), REAGENT_ID_URANIUM = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_TOXIC = 0.7, XENO_CHEM_MUT = 1.2), REAGENT_ID_GLYCEROL = list(XENO_CHEM_NUTRI = 0.6), REAGENT_ID_WOODPULP = list(XENO_CHEM_HEAL = 0.1, XENO_CHEM_NUTRI = 0.7), - "docilitytoxin" = list(XENO_CHEM_NUTRI = 0.3) ) + REAGENT_ID_MUTATIONTOXIN = list(XENO_CHEM_NUTRI = 0.3) ) /mob/living/simple_mob/xeno/slime/New() ..()