diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm index 8213aa200f..519609f0e9 100644 --- a/code/__defines/chemistry.dm +++ b/code/__defines/chemistry.dm @@ -49,8 +49,8 @@ #define ANTIBIO_SUPER 3 // Chemistry lists. -var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") // Increase heart rate. -var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "bliss", "stoxin", "ambrosia_extract") // Decrease heart rate. +var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "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 diff --git a/code/__defines/reagents.dm b/code/__defines/reagents.dm index e215eaafc5..6d3efe468e 100644 --- a/code/__defines/reagents.dm +++ b/code/__defines/reagents.dm @@ -15,29 +15,347 @@ #define REAGENT_OXYGEN "Oxygen" #define REAGENT_ID_OXYGEN "oxygen" #define REAGENT_VOLATILE_FUEL "Volatile Fuel" - - - - - - - - - - - +#define REAGENT_HYDROGEN "Hydrogen" #define REAGENT_ID_HYDROGEN "hydrogen" +#define REAGENT_FLUORINE "Fluorine" +#define REAGENT_ID_FLUORINE "fluorine" +#define REAGENT_CHLORINE "Chlorine" +#define REAGENT_ID_CHLORINE "chlorine" + // Fluid Reagents +#define REAGENT_ETHANOL "Ethanol" +#define REAGENT_ID_ETHANOL "ethanol" +#define REAGENT_SACID "Sulphuric acid" +#define REAGENT_ID_SACID "sacid" +#define REAGENT_BLOOD "Blood" +#define REAGENT_ID_BLOOD "blood" +#define REAGENT_SYNTHBLOOD "synthetic blood" +#define REAGENT_ID_SYNTHBLOOD "synthblood" +#define REAGENT_SYNTHBLOOD_DILUTE "synthetic plasma" +#define REAGENT_ID_SYNTHBLOOD_DILUTE "synthblood_dilute" +#define REAGENT_ANTIBODIES "Antibodies" +#define REAGENT_ID_ANTIBODIES "antibodies" #define REAGENT_WATER "Water" #define REAGENT_ID_WATER "water" -#define REAGENT_PACID "pacid" +#define REAGENT_FUEL "Welding fuel" +#define REAGENT_ID_FUEL "fuel" + // Solid Reagents #define REAGENT_IRON "Iron" #define REAGENT_ID_IRON "iron" +#define REAGENT_LITHIUM "Lithium" +#define REAGENT_ID_LITHIUM "lithium" +#define REAGENT_ALUMINIUM "Aluminum" +#define REAGENT_ID_ALUMINIUM "aluminum" +#define REAGENT_CALCIUM "Calcium" +#define REAGENT_ID_CALCIUM "calcium" +#define REAGENT_CARBON "Carbon" +#define REAGENT_ID_CARBON "carbon" #define REAGENT_COPPER "Copper" #define REAGENT_ID_COPPER "copper" +#define REAGENT_MERCURY "Mercury" +#define REAGENT_ID_MERCURY "mercury" +#define REAGENT_PHOSPHORUS "Phosphorus" +#define REAGENT_ID_PHOSPHORUS "phosphorus" +#define REAGENT_POTASSIUM "Potassium" +#define REAGENT_ID_POTASSIUM "potassium" +#define REAGENT_RADIUM "Radium" +#define REAGENT_ID_RADIUM "radium" +#define REAGENT_SILICON "Silicon" +#define REAGENT_ID_SILICON "silicon" +#define REAGENT_SODIUM "Sodium" +#define REAGENT_ID_SODIUM "sodium" +#define REAGENT_SUGAR "Sugar" +#define REAGENT_ID_SUGAR "sugar" +#define REAGENT_SULFUR "Sulfur" +#define REAGENT_ID_SULFUR "sulfur" +#define REAGENT_TUNGSTEN "Tungsten" +#define REAGENT_ID_TUNGSTEN "tungsten" +#define REAGENT_SODIUMCHLORIDE "Table Salt" +#define REAGENT_ID_SODIUMCHLORIDE "sodiumchloride" +#define REAGENT_NUTRIMENT "Nutriment" +#define REAGENT_ID_NUTRIMENT "nutriment" + + +// Xeno chem react +#define XENO_CHEM_NUTRI "nutr" +#define XENO_CHEM_MUT "mut" +#define XENO_CHEM_TOXIC "toxic" +#define XENO_CHEM_HEAL "heal" + + +// Drugs and Chemical reactions +#define REAGENT_SIZEOXADONE "Sizeoxadone" +#define REAGENT_ID_SIZEOXADONE "sizeoxadone" +#define REAGENT_MACROCILLIN "Macrocillin" +#define REAGENT_ID_MACROCILLIN "macrocillin" +#define REAGENT_MICROCILLIN "Microcillin" +#define REAGENT_ID_MICROCILLIN "microcillin" +#define REAGENT_NORMALCILLIN "Normalcillin" +#define REAGENT_ID_NORMALCILLIN "normalcillin" +#define REAGENT_ICKYPAK "Ickypak" +#define REAGENT_ID_ICKYPAK "ickypak" +#define REAGENT_UNSORBITOL "Unsorbitol" +#define REAGENT_ID_UNSORBITOL "unsorbitol" +#define REAGENT_AMORPHOROVIR "Amorphorovir" +#define REAGENT_ID_AMORPHOROVIR "amorphorovir" +#define REAGENT_ANDROROVIR "Androrovir" +#define REAGENT_ID_ANDROROVIR "androrovir" +#define REAGENT_GYNOROVIR "Gynorovir" +#define REAGENT_ID_GYNOROVIR "gynorovir" +#define REAGENT_ANDROGYNOROVIR "Androgynorovir" +#define REAGENT_ID_ANDROGYNOROVIR "androgynorovir" +#define REAGENT_RAINBOWTOXIN "Rainbow Toxin" +#define REAGENT_ID_RAINBOWTOXIN "rainbowtoxin" +#define REAGENT_PARALYSISTOXIN "Tetrodotoxin" +#define REAGENT_ID_PARALYSISTOXIN "paralysistoxin" +#define REAGENT_PAINENZYME "Pain Enzyme" +#define REAGENT_ID_PAINENZYME "painenzyme" + + +// Drugs +#define REAGENT_DRUGS "generic drugs" +#define REAGENT_ID_DRUGS "drugs" +#define REAGENT_BLISS "Bliss" +#define REAGENT_ID_BLISS "bliss" +#define REAGENT_AMBROSIAEXTRACT "Ambrosia extract" +#define REAGENT_ID_AMBROSIAEXTRACT "ambrosia_extract" +#define REAGENT_PSILOCYBIN "Psilocybin" +#define REAGENT_ID_PSILOCYBIN "psilocybin" +#define REAGENT_TALUMQUEM "Talum-quem" +#define REAGENT_ID_TALUMQUEM "talum_quem" +#define REAGENT_NICOTINE "Nicotine" +#define REAGENT_ID_NICOTINE "nicotine" +#define REAGENT_METHYLPHENIDATE "Methylphenidate" +#define REAGENT_ID_METHYLPHENIDATE "methylphenidate" +#define REAGENT_CITALOPRAM "Citalopram" +#define REAGENT_ID_CITALOPRAM "citalopram" +#define REAGENT_PAROXETINE "Paroxetine" +#define REAGENT_ID_PAROXETINE "paroxetine" +#define REAGENT_QERRQUEM "Qerr-quem" +#define REAGENT_ID_QERRQUEM "qerr_quem" + + +// 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" + + +// Food and Drinks +#define REAGENT_MEATCOLONY "A colony of meat cells" +#define REAGENT_ID_MEATCOLONY "meatcolony" +#define REAGENT_PLANTCOLONY "A colony of plant cells" +#define REAGENT_ID_PLANTCOLONY "plantcolony" +#define REAGENT_GRUBSHAKE "Grub shake" +#define REAGENT_ID_GRUBSHAKE "grubshake" +#define REAGENT_BURNOUT "Burnout" +#define REAGENT_ID_BURNOUT "burnout" +#define REAGENT_MONSTERTAMER "Monster Tamer" +#define REAGENT_ID_MONSTERTAMER "monstertamer" +#define REAGENT_PINKRUSSIAN "Pink Russian" +#define REAGENT_ID_PINKRUSSIAN "pinkrussian" +#define REAGENT_ORIGINALSIN "Original Sin" +#define REAGENT_ID_ORIGINALSIN "originalsin" +#define REAGENT_NEWYORKSOUR "New York Sour" +#define REAGENT_ID_NEWYORKSOUR "newyorksour" +#define REAGENT_WINDGARITA "WND-Garita" +#define REAGENT_ID_WINDGARITA "windgarita" +#define REAGENT_MUDSLIDE "Mudslide" +#define REAGENT_ID_MUDSLIDE "mudslide" +#define REAGENT_GALACTICPANIC "Galactic Panic Attack" +#define REAGENT_ID_GALACTICPANIC "galacticpanic" +#define REAGENT_BULLDOG "Space Bulldog" +#define REAGENT_ID_BULLDOG "bulldog" +#define REAGENT_SBAGLIATO "Negroni Sbagliato" +#define REAGENT_ID_SBAGLIATO "sbagliato" +#define REAGENT_ITALIANCRISIS "Italian Crisis" +#define REAGENT_ID_ITALIANCRISIS "italiancrisis" +#define REAGENT_SUGARRUSH "Sweet Rush" +#define REAGENT_ID_SUGARRUSH "sugarrush" +#define REAGENT_LOTUS "Lotus" +#define REAGENT_ID_LOTUS "lotus" +#define REAGENT_SHROOMJUICE "Dumb Shroom Juice" +#define REAGENT_ID_SHROOMJUICE "shroomjuice" +#define REAGENT_RUSSIANROULETTE "Russian Roulette" +#define REAGENT_ID_RUSSIANROULETTE "russianroulette" +#define REAGENT_LOVEMAKER "The Love Maker" +#define REAGENT_ID_LOVEMAKER "lovemaker" +#define REAGENT_HONEYSHOT "Honey Shot" +#define REAGENT_ID_HONEYSHOT "honeyshot" +#define REAGENT_APPLETINI "Appletini" +#define REAGENT_ID_APPLETINIT "appletini" +#define REAGENT_GLOWINGAPPLETINI "Glowing Appletini" +#define REAGENT_ID_GLOWINGAPPLETINI "glowingappletini" +#define REAGENT_SCSATW "Slow Comfortable Screw Against the Wall" +#define REAGENT_ID_SCSATW "scsatw" +#define REAGENT_CHOCCYMILK "Choccy Milk" +#define REAGENT_ID_CHOCCYMILK "choccymilk" +#define REAGENT_REDSPACEFLUSH "Redspace Flush" +#define REAGENT_ID_REDSPACEFLUSH "redspaceflush" +#define REAGENT_GRAVEYARD "Graveyard" +#define REAGENT_ID_GRAVEYARD "graveyard" +#define REAGENT_BIGBEER "Giant Beer" +#define REAGENT_ID_BIGBEER "bigbeer" +#define REAGENT_MANAGERSUMMONER "Manager Summoner" +#define REAGENT_ID_MANAGERSUMMONER "manager_summoner" +#define REAGENT_SWEETTEA "Sweet Tea" +#define REAGENT_ID_SWEETTEA "sweettea" +#define REAGENT_UNSWEETTEA "Unsweetened Tea" +#define REAGENT_ID_UNSWEETTEA "unsweettea" +#define REAGENT_HAIROFTHERAT "Hair of the Rat" +#define REAGENT_ID_HAIROFTHERAT "hairoftherat" +#define REAGENT_BEPIS "Bepis" +#define REAGENT_ID_BEPIS "bepis" +#define REAGENT_BEPIS "Bepis Cola" +#define REAGENT_ID_BEPIS "bepis" +#define REAGENT_BUZZFUZZ "Buzz Fuzz" +#define REAGENT_ID_BUZZFUZZ "buzz_fuzz" +#define REAGENT_SPRITEDCRANBERRY "Sprited Cranberry" +#define REAGENT_ID_SPRITEDCRANBERRY "sprited_cranberry" +#define REAGENT_SHAMBLERS "Shambler's Juice" +#define REAGENT_ID_SHAMBLERS "shamblers" +#define REAGENT_BRAINPROTEIN "grey matter" +#define REAGENT_ID_BRAINPROTEIN "brain_protein" +#define REAGENT_ID_REDBRAINPROTEIN "red_brain_protein" +#define REAGENT_PROTEINPOWDER "Protein Powder" +#define REAGENT_ID_PROTEINPOWDER "protein_powder" +#define REAGENT_PROTEINSHAKE "Protein Shake" +#define REAGENT_ID_PROTEINSHAKE "protein_shake" +#define REAGENT_VANILLAPROTEINPOWDER "Vanilla Protein Powder" +#define REAGENT_ID_VANILLAPROTEINPOWDER "vanilla_protein_powder" +#define REAGENT_VANILLAPROTEINSHAKE "Vanilla Protein Shake" +#define REAGENT_ID_VANILLAPROTEINSHAKER "vanilla_protein_shake" +#define REAGENT_BANANAPROTEINPOWDER "Banana Protein Powder" +#define REAGENT_ID_BANANAPROTEINPOWDER "banana_protein_powder" +#define REAGENT_BANANAPROTEINSHAKE "Banana Protein Shake" +#define REAGENT_ID_BANANAPROTEINSHAKE "banana_protein_shake" +#define REAGENT_CHOCOLATEPROTEINPOWDER "Chocolate Protein Powder" +#define REAGENT_ID_CHOCOLATEPROTEINPOWDER "chocolate_protein_powder" +#define REAGENT_CHOCOLATEPROTEINSHAKE "Chocolate Protein Shake" +#define REAGENT_ID_CHOCOLATEPROTEINSHAKE "chocolate_protein_shake" +#define REAGENT_STRAWBERRYPROTEINPOWDER "Strawberry Protein Powder" +#define REAGENT_ID_STRAWBERRYPROTEINPOWDER "strawberry_protein_powder" +#define REAGENT_STRAWBERRYPROTEINSHAKE "Strawberry Protein Shake" +#define REAGENT_ID_STRAWBERRYPROTEINSHAKE "strawberry_protein_shake" +#define REAGENT_SOUP "Soup +#define REAGENT_ID_SOUP "generic_soup" +#define REAGENT_TOMATOSOUP "Tomato Soup" +#define REAGENT_ID_TOMATOSOUP "tomato_soup" +#define REAGENT_MUSHROOMSOUP "Cream of Mushroom Soup" +#define REAGENT_ID_MUSHROOMSOUP "mushroom_soup" +#define REAGENT_CHICKENSOUP "Cream of Chicken Soup" +#define REAGENT_ID_CHICKENSOUP "chicken_soup" +#define REAGENT_CHICKENNOODLESOUP "Chicken Noodle Soup" +#define REAGENT_ID_CHICKENNOODLESOUP "chicken_noodle_soup" +#define REAGENT_ONIONSOUP "Onion Soup" +#define REAGENT_ID_ONIONSOUP "onion_soup" +#define REAGENT_VEGETABLESOUP "Vegetable Soup" +#define REAGENT_ID_VEGETABLESOUP "vegetable_soup" +#define REAGENT_BEETSOUP "Beet Soup" +#define REAGENT_ID_BEETSOUP "beet_soup" +#define REAGENT_HOTNSOURSOUP "Hot & Sour Soup" +#define REAGENT_ID_HOTNSOURSOUP "hot_n_sour_soup" +#define REAGENT_NUKIE "Nukie" +#define REAGENT_ID_NUKIE "nukie" +#define REAGENT_NUKIEPEACH "Nukie Peach" +#define REAGENT_ID_NUKIEPEACH "nukie_peach" +#define REAGENT_NUKIEPEAR "Nukie Pear" +#define REAGENT_ID_NUKIEPEAR "nukie_pear" +#define REAGENT_NUKIECHERRY "Nukie Cherry" +#define REAGENT_ID_NUKIECHERRY "nukie_cherry" +#define REAGENT_NUKIEMELON "Nukie Melon" +#define REAGENT_ID_NUKIEMELON "nukie_melon" +#define REAGENT_NUKIEBANANA "Nukie Banana" +#define REAGENT_ID_NUKIEBANANA "nukie_banana" +#define REAGENT_NUKIEROSE "Nukie Rose" +#define REAGENT_ID_NUKIEROSE "nukie_rose" +#define REAGENT_NUKIELEMON "Nukie Lemon" +#define REAGENT_ID_NUKIELEMON "nukie_lemon" +#define REAGENT_NUKIEFRUIT "Nukie Fruit" +#define REAGENT_ID_NUKIEFRUIT "nukie_fruit" +#define REAGENT_NUKIESPECIAL "Nukie Limited Edition" +#define REAGENT_ID_NUKIESPECIAL "nukie_special" +#define REAGENT_NUKIEMEGA "Mega Nukie" +#define REAGENT_ID_NUKIEMEGA "nukie_mega" +#define REAGENT_NUKIEMEGASIGHT "Nukie Mega Plum" +#define REAGENT_ID_NUKIEMEGASIGHT "nukie_mega_sight" +#define REAGENT_NUKIEMEGAHEART "Nukie Mega Juice" +#define REAGENT_ID_NUKIEMEGAHEART "nukie_mega_heart" +#define REAGENT_NUKIEMEGASLEEP "Nukie Nega" +#define REAGENT_ID_NUKIEMEGASLEEP "nukie_mega_sleep" +#define REAGENT_NUKIEMEGASHOCK "Nukie Mega Shock" +#define REAGENT_ID_NUKIEMEGASHOCK "nukie_mega_shock" +#define REAGENT_NUKIEMEGAFAST "Nukie Mega Rapid" +#define REAGENT_ID_NUKIEMEGAFAST "nukie_mega_fast" +#define REAGENT_NUKIEMEGAHIGH "Nukie Mega Sky" +#define REAGENT_ID_NUKIEMEGAHIGH "nukie_mega_high" +#define REAGENT_NUKIEMEGASHRINK "Nukie Mega Shrink" +#define REAGENT_ID_NUKIEMEGASHRINK "nukie_mega_shrink" +#define REAGENT_NUKIEMEGAGROWTH "Nukie Mega Growth" +#define REAGENT_ID_NUKIEMEGAGROWTH "nukie_mega_growth" + + + + + + + +#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_ + + + + + +includes: .dm +excludes: reagents.dm,ores.dm,materials.dm,mre.dm + + + + + + + + + + + + + + + + + + + #define REAGENT_SILVER "Silver" #define REAGENT_ID_SILVER "silver" #define REAGENT_GOLD "Gold" @@ -45,68 +363,282 @@ #define REAGENT_SLIMEJELLY "Slimejelly" #define REAGENT_ID_SLIMEJELLY "slimejelly" -// Toxins -#define REAGEMT_PHORON "Phoron" -#define REAGENT_ID_PHORON "phoron" -#define REAGENT_LEAD "Lead" -#define REAGENT_ID_LEAD "lead" -#define REAGENT_SPIDERTOXIN "Spidertoxin" -#define REAGENT_ID_SPIDERTOXIN "spidertoxin" - #define REAGENT_ID_SILICATE "silicate" -#define REAGENT_ID_POTASSIUM "potassium" #define REAGENT_ID_URANIUM "uranium" -#define REAGENT_ID_CARBON "carbon" #define REAGENT_ID_PLATINUM "platinum" -#define REAGENT_ID_ALUMINIUM "aluminum" #define REAGENT_ID_CALCIUMCARBONATE "calciumcarbonate" todos defective_nanites - +coco +mold +left4zed var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,"condensedcapsaicin_v","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. + + + + + + xenoChemList += "inaprovaline" + xenoChemList += "bicaridine" + xenoChemList += "dylovene" + xenoChemList += "dexalinp" + xenoChemList += "tricordrazine" + xenoChemList += "cryoxadone" + xenoChemList += "clonexadone" + xenoChemList += "paracetamol" + xenoChemList += "tramadol" + xenoChemList += "oxycodone" + xenoChemList += "ryetalyn" + xenoChemList += "hyperzine" + xenoChemList += "ethylredoxrazine" + xenoChemList += "hyronalin" + xenoChemList += "arithrazine" + xenoChemList += "spaceacillin" + xenoChemList += "sterilizine" + xenoChemList += "leporazine" + xenoChemList += "methylphenidate" + xenoChemList += "citalopram" + xenoChemList += "paroxetine" + xenoChemList += "macrocillin" + xenoChemList += "microcillin" + xenoChemList += "normalcillin" + xenoChemList += "sizeoxadone" + xenoChemList += "ickypak" + xenoChemList += "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 += "nicotine" + xenoChemList += "uranium" + xenoChemList += "silver" + xenoChemList += "gold" + xenoChemList += "adrenaline" + xenoChemList += "holywater" + xenoChemList += "ammonia" + xenoChemList += "diethylamine" + xenoChemList += "fluorosurfactant" + xenoChemList += "foaming_agent" + xenoChemList += "thermite" + xenoChemList += "cleaner" + xenoChemList += "lube" + xenoChemList += "glycerol" + xenoChemList += "coolant" + xenoChemList += "luminol" + xenoChemList += "cornoil" + xenoChemList += "lipozine" + xenoChemList += "sodiumchloride" + xenoChemList += "frostoil" + xenoChemList += "capsaicin" + xenoChemList += "condensedcapsaicin" + xenoChemList += "neurotoxin" + + supermatter mydrogen silicon -lithium + deuterium tritium helium-3 boron + "adminordrazine", + REAGENT_ID_NUTRIMENT, + "macrocillin", + "microcillin", + "normalcillin", + "magicdust" + kitchen_tag = "lime" + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "limejuice" = list(10,20)) - chemreact = list( "nutriment" = list("nutr" = 0.5), - "radium" = list("toxic" = 0.3, "mut" = 1), - "mutagen" = list("nutr" = 0.4, "mut" = 2), - "water" = list("nutr" = -0.1), - "milk" = list("nutr" = 0.3), - "sacid" = list("toxic" = 1), - "pacid" = list("toxic" = 2), - "chlorine" = list("toxic" = 0.5), - "ammonia" = list("toxic" = 0.5), - "sodawater" = list("toxic" = 0.1, "nutr" = -0.1), - "beer" = list("nutr" = 0.6), - "diethylamine" = list("nutr" = 0.9), - "sugar" = list("toxic" = 0.4, "nutr" = 0.2), - "eznutrient" = list("nutr" = 0.8), - "cryoxadone" = list("toxic" = 0.4), - "flourine" = list("toxic" = 0.1), - "robustharvest" = list("nutr" = 1.5), - "glucose" = list("nutr" = 0.5), - "blood" = list("nutr" = 0.75, "toxic" = 0.05, "mut" = 0.45), - "fuel" = list("toxic" = 0.4), - "toxin" = list("toxic" = 0.5), - "carpotoxin" = list("toxic" = 1, "mut" = 1.5), - REAGENT_ID_PHORON = list("toxic" = 1.5, "mut" = 0.03), - "virusfood" = list("nutr" = 1.5, "mut" = 0.32), - "cyanide" = list("toxic" = 3.5), - "slimejelly" = list("nutr" = 0.5), - "amutationtoxin" = list("toxic" = 0.1, "heal" = 1.5, "mut" = 3), - "mutationtoxin" = list("toxic" = 0.1, "heal" = 1, "mut" = 1.5), - "gold" = list("heal" = 0.3, "nutr" = 0.7, "mut" = 0.3), - "uranium" = list("heal" = 0.3, "toxic" = 0.7, "mut" = 1.2), - "glycerol" = list("nutr" = 0.6), - "woodpulp" = list("heal" = 0.1, "nutr" = 0.7), - "docilitytoxin" = list("nutr" = 0.3) ) +/datum/seed/citrus/New() + ..() + set_trait(TRAIT_HARVEST_REPEAT,1) + set_trait(TRAIT_JUICY,1) + set_trait(TRAIT_MATURATION,6) + set_trait(TRAIT_PRODUCTION,6) + set_trait(TRAIT_YIELD,4) + set_trait(TRAIT_POTENCY,15) + set_trait(TRAIT_PRODUCT_ICON,"treefruit") + set_trait(TRAIT_PRODUCT_COLOUR,"#3AF026") + set_trait(TRAIT_PLANT_ICON,"tree") + set_trait(TRAIT_FLESH_COLOUR,"#3AF026") + +/datum/seed/citrus/lemon + name = "lemon" + seed_name = "lemon" + display_name = "lemon trees" + kitchen_tag = "lemon" + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lemonjuice" = list(10,20)) + +/datum/seed/citrus/lemon/New() + ..() + set_trait(TRAIT_PRODUCES_POWER,1) + set_trait(TRAIT_PRODUCT_ICON,"lemon") + set_trait(TRAIT_PRODUCT_COLOUR,"#F0E226") + set_trait(TRAIT_FLESH_COLOUR,"#F0E226") + set_trait(TRAIT_IDEAL_LIGHT, 6) + +/datum/seed/citrus/orange + name = "orange" + seed_name = "orange" + display_name = "orange trees" + kitchen_tag = "orange" + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "orangejuice" = list(10,20)) + list("zombiepowder" = list(1,10),"condensedcapsaicin""imidazoline" = list(3,5), "carrotjuice" = list(10,20)) + chemreact = list( REAGENT_ID_NUTRIMENT = list(XENO_CHEM_NUTRI = 0.5), + "radium" = list(XENO_CHEM_TOXIC = 0.3, XENO_CHEM_MUT = 1), + "mutagen" = list(XENO_CHEM_NUTRI = 0.4, XENO_CHEM_MUT = 2), + "water" = list(XENO_CHEM_NUTRI = -0.1), + "milk" = list(XENO_CHEM_NUTRI = 0.3), + "sacid" = list(XENO_CHEM_TOXIC = 1), + "pacid" = list(XENO_CHEM_TOXIC = 2), + "chlorine" = list(XENO_CHEM_TOXIC = 0.5), + "ammonia" = list(XENO_CHEM_TOXIC = 0.5), + "sodawater" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_NUTRI = -0.1), + "beer" = list(XENO_CHEM_NUTRI = 0.6), + "diethylamine" = list(XENO_CHEM_NUTRI = 0.9), + "sugar" = list(XENO_CHEM_TOXIC = 0.4, XENO_CHEM_NUTRI = 0.2), + "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), + "glucose" = list(XENO_CHEM_NUTRI = 0.5), + "blood" = list(XENO_CHEM_NUTRI = 0.75, XENO_CHEM_TOXIC = 0.05, XENO_CHEM_MUT = 0.45), + "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_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), + "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), + "gold" = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_NUTRI = 0.7, XENO_CHEM_MUT = 0.3), + "uranium" = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_TOXIC = 0.7, XENO_CHEM_MUT = 1.2), + "glycerol" = list(XENO_CHEM_NUTRI = 0.6), + "woodpulp" = list(XENO_CHEM_HEAL = 0.1, XENO_CHEM_NUTRI = 0.7), + "docilitytoxin" = list(XENO_CHEM_NUTRI = 0.3) ) +re.id == "protein" || re.id == "glucose" || re.id == "fishbait") +liquid_protean +peanutoil +cornoil +durianpaste + if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice")) + descriptors |= "sweet" + if(reagents.has_reagent("anti_toxin")) + descriptors |= "astringent" + if(reagents.has_reagent("frostoil")) + descriptors |= "numbing" + if(reagents.has_reagent(REAGENT_ID_NUTRIMENT)) + descriptors |= "nutritious" + if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin")) + descriptors |= "spicy" + if(reagents.has_reagent("coco")) + descriptors |= "bitter" + if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice")) + descriptors |= "sweet-sour" + if(reagents.has_reagent("radium") || reagents.has_reagent("uranium")) + descriptors |= "radioactive" + if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin")) + descriptors |= "poisonous" + if(reagents.has_reagent("psilocybin") || reagents.has_reagent("bliss") || reagents.has_reagent("earthsblood")) + descriptors |= "hallucinogenic" + if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood")) + descriptors |= "medicinal" + if(reagents.has_reagent("gold") || reagents.has_reagent("earthsblood")) + descriptors |= "shiny" + if(reagents.has_reagent("lube")) + descriptors |= "slippery" + if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid")) + descriptors |= "acidic" + + var/static/list/toxic_reagents = list( + "anti_toxin" = -2, + "toxin" = 2, + REAGENT_ID_FLUORINE = 2.5, + "chlorine" = 1.5, + "sacid" = 1.5, + "pacid" = 3, + "plantbgone" = 3, + "cryoxadone" = -3, + "radium" = 2 + ) + var/static/list/nutrient_reagents = list( + "milk" = 0.1, + "beer" = 0.25, + "phosphorus" = 0.1, + "sugar" = 0.1, + "sodawater" = 0.1, + "ammonia" = 1, + "diethylamine" = 2, + REAGENT_ID_NUTRIMENT = 1, + "adminordrazine" = 1, + "eznutrient" = 1, + "robustharvest" = 1, + "left4zed" = 1 + ) + var/static/list/weedkiller_reagents = list( + REAGENT_ID_FLUORINE = -4, + "chlorine" = -3, + "phosphorus" = -2, + "sugar" = 2, + "sacid" = -2, + "pacid" = -4, + "plantbgone" = -8, + "adminordrazine" = -5 + ) + var/static/list/pestkiller_reagents = list( + "sugar" = 2, + "diethylamine" = -2, + "adminordrazine" = -5 + ) + var/static/list/water_reagents = list( + "water" = 1, + "adminordrazine" = 1, + "milk" = 0.9, + "beer" = 0.7, + REAGENT_ID_FLUORINE = -0.5, + "chlorine" = -0.5, + "phosphorus" = -0.5, + "water" = 1, + "sodawater" = 1, + ) + + // Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order). + var/static/list/beneficial_reagents = list( + "beer" = list( -0.05, 0, 0 ), + REAGENT_ID_FLUORINE = list( -2, 0, 0 ), + "chlorine" = list( -1, 0, 0 ), + "phosphorus" = list( -0.75, 0, 0 ), + "sodawater" = list( 0.1, 0, 0 ), + "sacid" = list( -1, 0, 0 ), + "pacid" = list( -2, 0, 0 ), + "plantbgone" = list( -2, 0, 0.2), + "cryoxadone" = list( 3, 0, 0 ), + "ammonia" = list( 0.5, 0, 0 ), + "diethylamine" = list( 1, 0, 0 ), + REAGENT_ID_NUTRIMENT = list( 0.5, 0.1, 0 ), + "radium" = list( -1.5, 0, 0.2), + "adminordrazine" = list( 1, 1, 1 ), + "robustharvest" = list( 0, 0.2, 0 ), + "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( + "radium" = 8, + "mutagen" = 15 + ) diff --git a/code/controllers/subsystems/plants.dm b/code/controllers/subsystems/plants.dm index 730b8cd05f..bfa2df55e8 100644 --- a/code/controllers/subsystems/plants.dm +++ b/code/controllers/subsystems/plants.dm @@ -110,8 +110,8 @@ SUBSYSTEM_DEF(plants) if(seed.consume_gasses) seed.consume_gasses[GAS_PHORON] = null seed.consume_gasses[GAS_CO2] = null - if(seed.chems && !isnull(seed.chems[REAGENT_PACID])) - seed.chems[REAGENT_PACID] = null // Eating through the hull will make these plants completely inviable, albeit very dangerous. + if(seed.chems && !isnull(seed.chems[REAGENT_ID_PACID])) + seed.chems[REAGENT_ID_PACID] = null // Eating through the hull will make these plants completely inviable, albeit very dangerous. seed.chems -= null // Setting to null does not actually remove the entry, which is weird. seed.set_trait(TRAIT_IDEAL_HEAT,293) seed.set_trait(TRAIT_HEAT_TOLERANCE,20) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 6eda375458..e442023856 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -1,8 +1,8 @@ GLOBAL_LIST_EMPTY(archive_diseases) GLOBAL_LIST_INIT(advance_cures, list( - "sodiumchloride", "sugar", "orangejuice", - "spaceacillin", "glucose", "ethanol", + REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, "orangejuice", + "spaceacillin", "glucose", REAGENT_ID_ETHANOL, "dyloteane", "impedrezene", "hepanephrodaxon", "gold", "silver" )) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 8e19382f94..84328d194c 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -32,11 +32,11 @@ Bonus if(A.stage >= 3) M.slurring = max(0, M.slurring-4) M.druggy = max(0, M.druggy-4) - M.reagents.remove_reagent("ethanol", 3) + M.reagents.remove_reagent(REAGENT_ID_ETHANOL, 3) if(A.stage >= 4) M.drowsyness = max(0, M.drowsyness-4) - if(M.reagents.has_reagent("bliss")) - M.reagents.del_reagent("bliss") + if(M.reagents.has_reagent(REAGENT_ID_BLISS)) + M.reagents.del_reagent(REAGENT_ID_BLISS) M.hallucination = max(0, M.hallucination-4) if(A.stage >= 5) if(M.reagents.get_reagent_amount("alkysine") < 10) diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm index 78b630bc15..2bb5a1f81f 100644 --- a/code/datums/diseases/anxiety.dm +++ b/code/datums/diseases/anxiety.dm @@ -5,7 +5,7 @@ spread_text = "On contact" spread_flags = CONTACT_GENERAL cure_text = "Ethanol" - cures = list("ethanol") + cures = list(REAGENT_ID_ETHANOL) agent = "Excess Lepdopticides" viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey) desc = "If left untreated subject will regurgitate butterflies." diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm index a867c8d9d9..436bbbe187 100644 --- a/code/datums/diseases/beesease.dm +++ b/code/datums/diseases/beesease.dm @@ -5,7 +5,7 @@ spread_text = "On contact" spread_flags = CONTACT_GENERAL cure_text = "Sugar" - cures = list("sugar") + cures = list(REAGENT_ID_SUGAR) agent = "Apidae Infection" viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey) desc = "If left untreated, subject will regurgitate bees." diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm index 487f466761..ae9c307297 100644 --- a/code/datums/diseases/cold.dm +++ b/code/datums/diseases/cold.dm @@ -4,7 +4,7 @@ spread_text = "Airborne" spread_flags = AIRBORNE cure_text = "Rest & Spaceacillin" - cures = list("spaceacillin", "chicken_soup") + cures = list("spaceacillin", REAGENT_ID_CHICKENSOUP) needs_all_cures = FALSE agent = "XY-rhinovirus" viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey) diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm index 2962f48e9b..8c3062809b 100644 --- a/code/datums/diseases/flu.dm +++ b/code/datums/diseases/flu.dm @@ -3,7 +3,7 @@ max_stages = 3 spread_text = "Airborne" cure_text = "Spaceacillin" - cures = list("spaceacillin", "chicken_soup") + cures = list("spaceacillin", REAGENT_ID_CHICKENSOUP) needs_all_cures = FALSE cure_chance = 10 agent = "H13N1 flu virion" diff --git a/code/datums/diseases/food_poisoning.dm b/code/datums/diseases/food_poisoning.dm index cbb7a0c804..4c7f0eabf8 100644 --- a/code/datums/diseases/food_poisoning.dm +++ b/code/datums/diseases/food_poisoning.dm @@ -6,7 +6,7 @@ spread_flags = NON_CONTAGIOUS cure_text = "Sleep" agent = "Salmonella" - cures = list("chicken_soup") + cures = list(REAGENT_ID_CHICKENSOUP) cure_chance = 10 viable_mobtypes = list(/mob/living/carbon/human) desc = "Nausea, sickness, and vomitting." diff --git a/code/datums/diseases/lycancoughy.dm b/code/datums/diseases/lycancoughy.dm index 6d8f106163..1869179283 100644 --- a/code/datums/diseases/lycancoughy.dm +++ b/code/datums/diseases/lycancoughy.dm @@ -5,7 +5,7 @@ spread_text = "On contact" spread_flags = CONTACT_GENERAL cure_text = "Ethanol" - cures = list("ethanol") + cures = list(REAGENT_ID_ETHANOL) agent = "Excess Snuggles" viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey) desc = "If left untreated subject will regurgitate... puppies." diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm index 24b2261cda..e3c73aaffd 100644 --- a/code/datums/diseases/magnitis.dm +++ b/code/datums/diseases/magnitis.dm @@ -3,7 +3,7 @@ max_stages = 4 spread_text = "Airbone" cure_text = "Iron" - cures = list("iron") + cures = list(REAGENT_ID_IRON) agent = "Fukkos Miracos" viable_mobtypes = list(/mob/living/carbon/human) permeability_mod = 0.75 diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index 5c60665a74..3857664671 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -1143,14 +1143,14 @@ datum var/target_name New(var/text,var/joba) ..() - var/list/items = list("Sulphuric acid", "Polytrinic acid", "Space Lube", "Unstable mutagen",\ + var/list/items = list("Sulphuric acid", REAGENT_PACID, "Space Lube", "Unstable mutagen",\ "Leporazine", "Cryptobiolin", "Lexorin ",\ "Kelotane", "Dexalin", "Tricordrazine") target_name = pick(items) switch(target_name) if("Sulphuric acid") steal_target = /datum/reagent/acid - if("Polytrinic acid") + if(REAGENT_PACID) steal_target = /datum/reagent/pacid if("Space Lube") steal_target = /datum/reagent/lube diff --git a/code/game/gamemodes/technomancer/spells/condensation.dm b/code/game/gamemodes/technomancer/spells/condensation.dm index c1fe4912c6..39b52923ec 100644 --- a/code/game/gamemodes/technomancer/spells/condensation.dm +++ b/code/game/gamemodes/technomancer/spells/condensation.dm @@ -27,7 +27,7 @@ if(desired_turf) // This shouldn't fail but... var/obj/effect/effect/water/W = new /obj/effect/effect/water(get_turf(T)) W.create_reagents(60) - W.reagents.add_reagent(id = "water", amount = 60, data = null, safety = 0) + W.reagents.add_reagent(id = REAGENT_ID_WATER, amount = 60, data = null, safety = 0) W.set_color() W.set_up(desired_turf) flick(initial(icon_state),W) // Otherwise pooling causes the animation to stay stuck at the end. @@ -40,5 +40,5 @@ else add_attack_logs(user,hit_atom,"Wetted the floor with [src] at [T.x],[T.y],[T.z]") else if(hit_atom.reagents && !ismob(hit_atom)) //TODO: Something for the scepter - hit_atom.reagents.add_reagent(id = "water", amount = 60, data = null, safety = 0) - adjust_instability(5) \ No newline at end of file + hit_atom.reagents.add_reagent(id = REAGENT_ID_WATER, amount = 60, data = null, safety = 0) + adjust_instability(5) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 180bebe532..ee418024f8 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -234,7 +234,7 @@ if(ishuman(occupant) && !(NO_BLOOD in occupant.species.flags) && occupant.vessel) occupantData["pulse"] = occupant.get_pulse(GETPULSE_TOOL) occupantData["hasBlood"] = 1 - var/blood_volume = round(occupant.vessel.get_reagent_amount("blood")) + var/blood_volume = round(occupant.vessel.get_reagent_amount(REAGENT_ID_BLOOD)) occupantData["bloodLevel"] = blood_volume occupantData["bloodMax"] = occupant.species.blood_volume occupantData["bloodPercent"] = round(100*(blood_volume/occupant.species.blood_volume), 0.01) //copy pasta ends here diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index b3b41376ff..a4df3f8814 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -274,9 +274,9 @@ var/S = 0 for(var/obj/item/reagent_containers/food/snacks/grown/I in contents) S += 5 - if(I.reagents.get_reagent_amount("nutriment") < 0.1) + if(I.reagents.get_reagent_amount(REAGENT_ID_NUTRIMENT) < 0.1) points += 1 - else points += I.reagents.get_reagent_amount("nutriment") * 10 * eat_eff + else points += I.reagents.get_reagent_amount(REAGENT_ID_NUTRIMENT) * 10 * eat_eff qdel(I) if(S) processing = 1 diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index cc3e3fc755..8750514b60 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -297,7 +297,7 @@ var/datum/reagent/blood/injected = locate() in S.reagents.reagent_list //Grab some blood if(injected && injected.data) loaded_dna = injected.data - S.reagents.remove_reagent("blood", injected.volume) + S.reagents.remove_reagent(REAGENT_ID_BLOOD, injected.volume) to_chat(user, span_info("You scan the blood sample into the bioprinter.")) return else if(istype(W,/obj/item/reagent_containers/glass)) diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 4f4722c559..95ba958438 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -108,7 +108,7 @@ if(ishuman(occupant) && !(NO_BLOOD in occupant.species.flags) && occupant.vessel) occupantData["pulse"] = occupant.get_pulse(GETPULSE_TOOL) occupantData["hasBlood"] = 1 - var/blood_volume = round(occupant.vessel.get_reagent_amount("blood")) + var/blood_volume = round(occupant.vessel.get_reagent_amount(REAGENT_ID_BLOOD)) occupantData["bloodLevel"] = blood_volume occupantData["bloodMax"] = occupant.species.blood_volume occupantData["bloodPercent"] = round(100*(blood_volume/occupant.species.blood_volume), 0.01) //copy pasta ends here diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index f6a50c3254..50e439b75e 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -161,7 +161,7 @@ enemy_hp -= attackamt arcade_action(ui.user) - if("heal") + if(XENO_CHEM_HEAL) blocked = 1 var/pointamt = rand(1,3) var/healamt = rand(6,8) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 5e7f12fd6c..f38e2e08cc 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -127,7 +127,7 @@ return // If the human is losing too much blood, beep. - if(T.vessel.get_reagent_amount("blood") < T.species.blood_volume*T.species.blood_level_safe) + if(T.vessel.get_reagent_amount(REAGENT_ID_BLOOD) < T.species.blood_volume*T.species.blood_level_safe) visible_message("\The [src] beeps loudly.") var/datum/reagent/B = T.take_blood(beaker,amount) diff --git a/code/game/machinery/pandemic.dm b/code/game/machinery/pandemic.dm index cd51b2a9fc..65ec57eafc 100644 --- a/code/game/machinery/pandemic.dm +++ b/code/game/machinery/pandemic.dm @@ -119,7 +119,7 @@ return var/obj/item/reagent_containers/glass/bottle/B = create_culture(name) B.desc = "A small bottle. Contains [D.agent] culture in synthblood medium." - B.reagents.add_reagent("blood", 20, list("viruses" = list(D))) + B.reagents.add_reagent(REAGENT_ID_BLOOD, 20, list("viruses" = list(D))) if("clone_vaccine") if(wait) atom_say("The replicator is not ready yet.") diff --git a/code/game/objects/effects/chem/foam.dm b/code/game/objects/effects/chem/foam.dm index 84ef931b74..a8d7b243ac 100644 --- a/code/game/objects/effects/chem/foam.dm +++ b/code/game/objects/effects/chem/foam.dm @@ -127,7 +127,7 @@ for(var/id in carried_reagents) F.reagents.add_reagent(id, 1, safety = 1) //makes a safety call because all reagents should have already reacted anyway else - F.reagents.add_reagent("water", 1, safety = 1) + F.reagents.add_reagent(REAGENT_ID_WATER, 1, safety = 1) // wall formed by metal foams, dense and opaque, but easy to break diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index c22ddaa46f..0da54588e6 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -105,7 +105,7 @@ /obj/effect/temp_visual/heal name = "healing glow" - icon_state = "heal" + icon_state = XENO_CHEM_HEAL duration = 15 /obj/effect/temp_visual/heal/Initialize(mapload) diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 05cd09f6d5..50c8b45e8a 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -17,11 +17,11 @@ /obj/item/reagent_containers/glass/beaker/vial/random flags = 0 - var/list/random_reagent_list = list(list("water" = 15) = 1, list("cleaner" = 15) = 1) + var/list/random_reagent_list = list(list(REAGENT_ID_WATER = 15) = 1, list("cleaner" = 15) = 1) /obj/item/reagent_containers/glass/beaker/vial/random/toxin random_reagent_list = list( - list("mindbreaker" = 10, "bliss" = 20) = 3, + list("mindbreaker" = 10, REAGENT_ID_BLISS = 20) = 3, list("carpotoxin" = 15) = 2, list("impedrezene" = 15) = 2, list("zombiepowder" = 10) = 1) diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index e765f3a0e1..23c7e436cd 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -339,7 +339,7 @@ if(!heart) return TRUE - var/blood_volume = H.vessel.get_reagent_amount("blood") + var/blood_volume = H.vessel.get_reagent_amount(REAGENT_ID_BLOOD) if(!heart || heart.is_broken()) blood_volume *= 0.3 else if(heart.is_bruised()) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index eb9db84acd..4b520e4ace 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("bliss"=5,"ambrosia_extract"=5,"mindbreaker"=1) + var/list/dilating = list(REAGENT_ID_BLISS=5,REAGENT_ID_AMBROSIAEXTRACT=5,"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/devices/scanners/guide.dm b/code/game/objects/items/devices/scanners/guide.dm index 68bd33d8e8..18405d9c97 100644 --- a/code/game/objects/items/devices/scanners/guide.dm +++ b/code/game/objects/items/devices/scanners/guide.dm @@ -67,7 +67,7 @@ if(org.damage >= 1 && !istype(org, /obj/item/organ/internal/brain)) organ = TRUE - var/blood_volume = M.vessel.get_reagent_amount("blood") + var/blood_volume = M.vessel.get_reagent_amount(REAGENT_ID_BLOOD) if(blood_volume <= M.species.blood_volume*M.species.blood_level_safe) bloodloss = TRUE diff --git a/code/game/objects/items/devices/scanners/health.dm b/code/game/objects/items/devices/scanners/health.dm index 348d8b55e6..4eca83946c 100644 --- a/code/game/objects/items/devices/scanners/health.dm +++ b/code/game/objects/items/devices/scanners/health.dm @@ -359,7 +359,7 @@ // Blood level if(M:vessel) - var/blood_volume = H.vessel.get_reagent_amount("blood") + var/blood_volume = H.vessel.get_reagent_amount(REAGENT_ID_BLOOD) var/blood_percent = round((blood_volume / H.species.blood_volume)*100) var/blood_type = H.dna.b_type var/blood_reagent = H.species.blood_reagents diff --git a/code/game/objects/items/devices/scanners/mass_spectrometer.dm b/code/game/objects/items/devices/scanners/mass_spectrometer.dm index 45286f9abf..f8de73ad8c 100644 --- a/code/game/objects/items/devices/scanners/mass_spectrometer.dm +++ b/code/game/objects/items/devices/scanners/mass_spectrometer.dm @@ -40,7 +40,7 @@ if(reagents.total_volume) var/list/blood_traces = list() for(var/datum/reagent/R in reagents.reagent_list) - if(R.id != "blood") + if(R.id != REAGENT_ID_BLOOD) reagents.clear_reagents() to_chat(user, span_warning("The sample was contaminated! Please insert another sample")) return diff --git a/code/game/objects/items/selectable_item_vr.dm b/code/game/objects/items/selectable_item_vr.dm index 3183971bce..bf7ab989af 100644 --- a/code/game/objects/items/selectable_item_vr.dm +++ b/code/game/objects/items/selectable_item_vr.dm @@ -43,6 +43,6 @@ desc = "A pre-arranged home chemistry kit. This one is for rather specific set of gender-altering chemicals." preface_string = "This kit can be used to create a vial of a gender-altering chemical, but there's only enough material for one." preface_title = "Gender Chemistry Kit" - item_options = list("Androrovir" = /obj/item/reagent_containers/glass/beaker/vial/androrovir, - "Gynorovir" = /obj/item/reagent_containers/glass/beaker/vial/gynorovir, - "Androgynorovir" = /obj/item/reagent_containers/glass/beaker/vial/androgynorovir) + item_options = list(REAGENT_ANDROROVIR = /obj/item/reagent_containers/glass/beaker/vial/androrovir, + REAGENT_GYNOROVIR = /obj/item/reagent_containers/glass/beaker/vial/gynorovir, + REAGENT_ANDROGYNOROVIR = /obj/item/reagent_containers/glass/beaker/vial/androgynorovir) diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 6a444248c6..9611a4b14d 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -59,7 +59,7 @@ if(O.reagents.total_volume < 1) to_chat(user, "The [O] is empty.") else if(O.reagents.total_volume >= 1) - if(O.reagents.has_reagent("pacid", 1)) + if(O.reagents.has_reagent(REAGENT_ID_PACID, 1)) to_chat(user, "The acid chews through the balloon!") O.reagents.splash(user, reagents.total_volume) qdel(src) diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index 34b463330f..1f57b7a9c4 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -104,12 +104,12 @@ /obj/item/clothing/mask/chewable/tobacco/cheap name = "chewing tobacco" desc = "A chewy wad of tobacco. Cut in long strands and treated with syrup so it tastes less like an ash-tray when you stuff it into your face." - filling = list("nicotine" = 2) + filling = list(REAGENT_ID_NICOTINE = 2) /obj/item/clothing/mask/chewable/tobacco/fine name = "deluxe chewing tobacco" desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ash-tray when you stuff it into your face." - filling = list("nicotine" = 3) + filling = list(REAGENT_ID_NICOTINE = 3) /obj/item/clothing/mask/chewable/tobacco/nico name = "nicotine gum" @@ -120,7 +120,7 @@ /obj/item/clothing/mask/chewable/tobacco/nico/Initialize() . = ..() - reagents.add_reagent("nicotine", 2) + reagents.add_reagent(REAGENT_ID_NICOTINE, 2) color = reagents.get_color() /obj/item/storage/chewables @@ -215,7 +215,7 @@ slot_flags = SLOT_EARS | SLOT_MASK chem_volume = 50 chewtime = 300 - filling = list("sugar" = 2) + filling = list(REAGENT_ID_SUGAR = 2) /obj/item/clothing/mask/chewable/candy/gum name = "chewing gum" @@ -287,7 +287,7 @@ desc = "A chocolate-coated biscuit stick." icon_state = "pockystick" item_state = "pocky" - filling = list("sugar" = 2, "chocolate" = 5) + filling = list(REAGENT_ID_SUGAR = 2, "chocolate" = 5) type_butt = null /obj/item/clothing/mask/chewable/candy/pocky/process() diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 23d0d1b28c..e85596a9ed 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -175,9 +175,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM e.start() qdel(src) return - if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently + if(reagents.get_reagent_amount(REAGENT_ID_FUEL)) // the fuel explodes, too, but much less violently var/datum/effect/effect/system/reagents_explosion/e = new() - e.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0) + e.set_up(round(reagents.get_reagent_amount(REAGENT_ID_FUEL) / 5, 1), get_turf(src), 0, 0) e.start() qdel(src) return @@ -292,7 +292,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/clothing/mask/smokable/cigarette/Initialize() . = ..() if(nicotine_amt) - reagents.add_reagent("nicotine", nicotine_amt) + reagents.add_reagent(REAGENT_ID_NICOTINE, nicotine_amt) /obj/item/clothing/mask/smokable/cigarette/attackby(obj/item/W as obj, mob/user as mob) ..() diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm index f29636a2d3..93cfd6bd68 100644 --- a/code/game/objects/items/weapons/ecigs.dm +++ b/code/game/objects/items/weapons/ecigs.dm @@ -170,32 +170,32 @@ desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says you can add whatever flavoring agents you want." /obj/item/reagent_containers/ecig_cartridge/blanknico/New() ..() - reagents.add_reagent("nicotine", 5) - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_NICOTINE, 5) + reagents.add_reagent(REAGENT_ID_WATER, 10) /obj/item/reagent_containers/ecig_cartridge/med_nicotine name = "tobacco flavour cartridge" desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored." /obj/item/reagent_containers/ecig_cartridge/med_nicotine/New() ..() - reagents.add_reagent("nicotine", 5) - reagents.add_reagent("water", 15) + reagents.add_reagent(REAGENT_ID_NICOTINE, 5) + reagents.add_reagent(REAGENT_ID_WATER, 15) /obj/item/reagent_containers/ecig_cartridge/high_nicotine name = "high nicotine tobacco flavour cartridge" desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored, with extra nicotine." /obj/item/reagent_containers/ecig_cartridge/high_nicotine/New() ..() - reagents.add_reagent("nicotine", 10) - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_NICOTINE, 10) + reagents.add_reagent(REAGENT_ID_WATER, 10) /obj/item/reagent_containers/ecig_cartridge/orange name = "orange flavour cartridge" desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its orange flavored." /obj/item/reagent_containers/ecig_cartridge/orange/New() ..() - reagents.add_reagent("nicotine", 5) - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_NICOTINE, 5) + reagents.add_reagent(REAGENT_ID_WATER, 10) reagents.add_reagent("orangejuice", 5) /obj/item/reagent_containers/ecig_cartridge/mint @@ -203,8 +203,8 @@ desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its mint flavored." /obj/item/reagent_containers/ecig_cartridge/mint/New() ..() - reagents.add_reagent("nicotine", 5) - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_NICOTINE, 5) + reagents.add_reagent(REAGENT_ID_WATER, 10) reagents.add_reagent("menthol", 5) /obj/item/reagent_containers/ecig_cartridge/watermelon @@ -212,8 +212,8 @@ desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its watermelon flavored." /obj/item/reagent_containers/ecig_cartridge/watermelon/New() ..() - reagents.add_reagent("nicotine", 5) - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_NICOTINE, 5) + reagents.add_reagent(REAGENT_ID_WATER, 10) reagents.add_reagent("watermelonjuice", 5) /obj/item/reagent_containers/ecig_cartridge/grape @@ -221,8 +221,8 @@ desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its grape flavored." /obj/item/reagent_containers/ecig_cartridge/grape/New() ..() - reagents.add_reagent("nicotine", 5) - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_NICOTINE, 5) + reagents.add_reagent(REAGENT_ID_WATER, 10) reagents.add_reagent("grapejuice", 5) /obj/item/reagent_containers/ecig_cartridge/lemonlime @@ -230,8 +230,8 @@ desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its lemon-lime flavored." /obj/item/reagent_containers/ecig_cartridge/lemonlime/New() ..() - reagents.add_reagent("nicotine", 5) - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_NICOTINE, 5) + reagents.add_reagent(REAGENT_ID_WATER, 10) reagents.add_reagent("lemon_lime", 5) /obj/item/reagent_containers/ecig_cartridge/coffee @@ -239,8 +239,8 @@ desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its coffee flavored." /obj/item/reagent_containers/ecig_cartridge/coffee/New() ..() - reagents.add_reagent("nicotine", 5) - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_NICOTINE, 5) + reagents.add_reagent(REAGENT_ID_WATER, 10) reagents.add_reagent("coffee", 5) /* /obj/item/reagent_containers/ecig_cartridge/cannabis @@ -248,7 +248,7 @@ desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label seems to be suspiciously scuffed off..." /obj/item/reagent_containers/ecig_cartridge/cannabis/New() ..() - reagents.add_reagent("nicotine", 5) - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_NICOTINE, 5) + reagents.add_reagent(REAGENT_ID_WATER, 10) reagents.add_reagent("cannabis", 5) */ diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index dbee592959..c626f8f0d3 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -213,9 +213,9 @@ var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) - B1.reagents.add_reagent("aluminum", 30) + B1.reagents.add_reagent(REAGENT_ID_ALUMINIUM, 30) B2.reagents.add_reagent("foaming_agent", 10) - B2.reagents.add_reagent("pacid", 10) + B2.reagents.add_reagent(REAGENT_ID_PACID, 10) detonator = new/obj/item/assembly_holder/timer_igniter(src) @@ -235,11 +235,11 @@ var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) - B1.reagents.add_reagent("aluminum", 15) - B1.reagents.add_reagent("fuel",20) + B1.reagents.add_reagent(REAGENT_ID_ALUMINIUM, 15) + B1.reagents.add_reagent(REAGENT_ID_FUEL,20) B2.reagents.add_reagent(REAGENT_ID_PHORON, 15) - B2.reagents.add_reagent("sacid", 15) - B1.reagents.add_reagent("fuel",20) + B2.reagents.add_reagent(REAGENT_ID_SACID, 15) + B1.reagents.add_reagent(REAGENT_ID_FUEL,20) detonator = new/obj/item/assembly_holder/timer_igniter(src) @@ -259,9 +259,9 @@ var/obj/item/reagent_containers/glass/beaker/B2 = new(src) B1.reagents.add_reagent("plantbgone", 25) - B1.reagents.add_reagent("potassium", 25) - B2.reagents.add_reagent("phosphorus", 25) - B2.reagents.add_reagent("sugar", 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) detonator = new/obj/item/assembly_holder/timer_igniter(src) @@ -283,7 +283,7 @@ var/obj/item/reagent_containers/glass/beaker/B2 = new(src) B1.reagents.add_reagent("fluorosurfactant", 40) - B2.reagents.add_reagent("water", 40) + B2.reagents.add_reagent(REAGENT_ID_WATER, 40) B2.reagents.add_reagent("cleaner", 10) detonator = new/obj/item/assembly_holder/timer_igniter(src) @@ -304,10 +304,10 @@ var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) - B1.reagents.add_reagent("phosphorus", 40) - B1.reagents.add_reagent("potassium", 40) + B1.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 40) + B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 40) B1.reagents.add_reagent("condensedcapsaicin", 40) - B2.reagents.add_reagent("sugar", 40) + B2.reagents.add_reagent(REAGENT_ID_SUGAR, 40) B2.reagents.add_reagent("condensedcapsaicin", 80) detonator = new/obj/item/assembly_holder/timer_igniter(src) diff --git a/code/game/objects/items/weapons/implants/implantreagent_vr.dm b/code/game/objects/items/weapons/implants/implantreagent_vr.dm index 48a60b0f53..f619d0588d 100644 --- a/code/game/objects/items/weapons/implants/implantreagent_vr.dm +++ b/code/game/objects/items/weapons/implants/implantreagent_vr.dm @@ -2,8 +2,8 @@ name = "reagent generator implant" desc = "This is an implant that has attached storage and generates a reagent." implant_color = "r" - var/list/generated_reagents = list("water" = 2) //Any number of reagents, the associated value is how many units are generated per process() - var/reagent_name = "water" //What is shown when reagents are removed, doesn't need to be an actual reagent + var/list/generated_reagents = list(REAGENT_ID_WATER = 2) //Any number of reagents, the associated value is how many units are generated per process() + var/reagent_name = REAGENT_ID_WATER //What is shown when reagents are removed, doesn't need to be an actual reagent var/gen_cost = 0.5 //amount of nutrient taken from the host per process tick var/transfer_amount = 30 //amount transferred when using verb var/usable_volume = 120 diff --git a/code/game/objects/items/weapons/material/chainsaw.dm b/code/game/objects/items/weapons/material/chainsaw.dm index 7984198f2a..f595a757fd 100644 --- a/code/game/objects/items/weapons/material/chainsaw.dm +++ b/code/game/objects/items/weapons/material/chainsaw.dm @@ -16,7 +16,7 @@ var/datum/reagents/R = new/datum/reagents(max_fuel) reagents = R R.my_atom = src - R.add_reagent("fuel", max_fuel) + R.add_reagent(REAGENT_ID_FUEL, max_fuel) START_PROCESSING(SSobj, src) . = ..() @@ -73,7 +73,7 @@ playsound(src, 'sound/weapons/chainsaw_attack.ogg',40,1) if(A && on) if(get_fuel() > 0) - reagents.remove_reagent("fuel", 1) + reagents.remove_reagent(REAGENT_ID_FUEL, 1) if(istype(A,/obj/structure/window)) var/obj/structure/window/W = A W.shatter() @@ -103,14 +103,14 @@ if(on) if(get_fuel() > 0) - reagents.remove_reagent("fuel", 1) + reagents.remove_reagent(REAGENT_ID_FUEL, 1) playsound(src, 'sound/weapons/chainsaw_turnoff.ogg',15,1) if(get_fuel() <= 0) to_chat(usr, "\The [src] sputters to a stop!") turnOff() /obj/item/chainsaw/proc/get_fuel() - return reagents.get_reagent_amount("fuel") + return reagents.get_reagent_amount(REAGENT_ID_FUEL) /obj/item/chainsaw/examine(mob/user) . = ..() diff --git a/code/game/objects/items/weapons/mop_deploy.dm b/code/game/objects/items/weapons/mop_deploy.dm index 182f4971dc..315fc56e42 100644 --- a/code/game/objects/items/weapons/mop_deploy.dm +++ b/code/game/objects/items/weapons/mop_deploy.dm @@ -20,7 +20,7 @@ START_PROCESSING(SSobj, src) /turf/proc/clean_deploy(atom/source) - if(source.reagents.has_reagent("water", 1)) + if(source.reagents.has_reagent(REAGENT_ID_WATER, 1)) clean_blood() if(istype(src, /turf/simulated)) var/turf/simulated/T = src diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index ad934b0d03..add1c8f968 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -108,26 +108,26 @@ var/current_capacity = 0 var/max_pickup = 100 //How much ore can be picked up in one go. There to prevent someone from walking on a turf with 10000 ore and making the server cry. var/list/stored_ore = list( - "sand" = 0, - "hematite" = 0, - "carbon" = 0, - "raw copper" = 0, - "raw tin" = 0, - "void opal" = 0, - "painite" = 0, - "quartz" = 0, - "raw bauxite" = 0, - "phoron" = 0, - "silver" = 0, - "gold" = 0, - "marble" = 0, - "uranium" = 0, - "diamond" = 0, - "platinum" = 0, - "lead" = 0, - "mhydrogen" = 0, - "verdantium" = 0, - "rutile" = 0) + ORE_SAND = 0, + ORE_HEMATITE = 0, + ORE_CARBON = 0, + ORE_COPPER = 0, + ORE_TIN = 0, + ORE_VOPAL = 0, + ORE_PAINITE = 0, + ORE_QUARTZ = 0, + ORE_BAUXITE = 0, + ORE_PHORON = 0, + ORE_SILVER = 0, + ORE_GOLD = 0, + ORE_MARBLE = 0, + ORE_URANIUM = 0, + ORE_DIAMOND = 0, + ORE_PLATINUM = 0, + ORE_LEAD = 0, + ORE_MHYDROGEN = 0, + ORE_VERDANTIUM = 0, + ORE_RUTILE = 0) var/last_update = 0 /obj/item/storage/bag/ore/holding diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 80cfb13338..627fe4e88c 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -103,10 +103,10 @@ GLOBAL_LIST_INIT(bibleitemstates, list( /obj/item/storage/bible/afterattack(atom/A, mob/user as mob, proximity) if(!proximity) return if(user.mind && (user.mind.assigned_role == JOB_CHAPLAIN)) - if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder + if(A.reagents && A.reagents.has_reagent(REAGENT_ID_WATER)) //blesses all the water in the holder to_chat(user, span_notice("You bless [A].")) - var/water2holy = A.reagents.get_reagent_amount("water") - A.reagents.del_reagent("water") + var/water2holy = A.reagents.get_reagent_amount(REAGENT_ID_WATER) + A.reagents.del_reagent(REAGENT_ID_WATER) A.reagents.add_reagent("holywater",water2holy) /obj/item/storage/bible/attackby(obj/item/W as obj, mob/user as mob) diff --git a/code/game/objects/items/weapons/storage/mre.dm b/code/game/objects/items/weapons/storage/mre.dm index c164aef120..ff9a02dca9 100644 --- a/code/game/objects/items/weapons/storage/mre.dm +++ b/code/game/objects/items/weapons/storage/mre.dm @@ -364,19 +364,19 @@ MRE Stuff if("boneless pork ribs", "grilled chicken", "pizza square", "spaghetti", "chicken tenders") icon_state = "tgmcmre_entree" nutriment_amt = 5 - starts_with = list("sodiumchloride" = 1) + starts_with = list(REAGENT_ID_SODIUMCHLORIDE = 1) if("meatballs", "cheese spread", "beef turnover", "mashed potatoes") icon_state = "tgmcmre_side" nutriment_amt = 3 - starts_with = list("sodiumchloride" = 1) + starts_with = list(REAGENT_ID_SODIUMCHLORIDE= 1) if("biscuit", "pretzels", "peanuts", "cracker") icon_state = "tgmcmre_snack" nutriment_amt = 2 - starts_with = list("sodiumchloride" = 1) + starts_with = list(REAGENT_ID_SODIUMCHLORIDE = 1) if("spiced apples", "chocolate brownie", "sugar cookie", "choco bar") icon_state = "tgmcmre_dessert" nutriment_amt = 2 - starts_with = list("sugar" = 1) + starts_with = list(REAGENT_ID_SUGAR = 1) package_open_state = "tgmcmre_[flavor]" nutriment_desc = list("[new_taste]" = nutriment_amt) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 91d1031fad..f0f3a37867 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -196,26 +196,26 @@ var/obj/item/storage/fancy/cigarettes/pack pack = new /obj/item/storage/fancy/cigarettes(src) - fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5)) + fill_cigarre_package(pack, list(REAGENT_ID_ALUMINIUM = 5, REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SULFUR = 5)) pack.desc += " 'F' has been scribbled on it." pack = new /obj/item/storage/fancy/cigarettes(src) - fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5)) + fill_cigarre_package(pack, list(REAGENT_ID_ALUMINIUM = 5, REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SULFUR = 5)) pack.desc += " 'F' has been scribbled on it." pack = new /obj/item/storage/fancy/cigarettes(src) - fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5)) + fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_PHOSPHORUS = 5)) pack.desc += " 'S' has been scribbled on it." pack = new /obj/item/storage/fancy/cigarettes(src) - fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5)) + fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_PHOSPHORUS = 5)) pack.desc += " 'S' has been scribbled on it." pack = new /obj/item/storage/fancy/cigarettes(src) // Dylovene. Going with 1.5 rather than 1.6666666... - fill_cigarre_package(pack, list("potassium" = 1.5, REAGENT_ID_NITROGEN = 1.5, "silicon" = 1.5)) + fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 1.5, REAGENT_ID_NITROGEN = 1.5, REAGENT_ID_SILICON = 1.5)) // Mindbreaker - fill_cigarre_package(pack, list("silicon" = 4.5, "hydrogen" = 4.5)) + fill_cigarre_package(pack, list(REAGENT_ID_SILICON = 4.5, REAGENT_ID_HYDROGEN = 4.5)) pack.desc += " 'MB' has been scribbled on it." diff --git a/code/game/objects/items/weapons/tools/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index e0ce8ab19b..ed36b077e5 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -49,7 +49,7 @@ var/datum/reagents/R = new/datum/reagents(max_fuel) reagents = R R.my_atom = src - R.add_reagent("fuel", max_fuel) + R.add_reagent(REAGENT_ID_FUEL, max_fuel) update_icon() if(always_process) START_PROCESSING(SSobj, src) @@ -185,7 +185,7 @@ //Returns the amount of fuel in the welder /obj/item/weldingtool/proc/get_fuel() - return reagents.get_reagent_amount("fuel") + return reagents.get_reagent_amount(REAGENT_ID_FUEL) /obj/item/weldingtool/proc/get_max_fuel() return max_fuel @@ -197,7 +197,7 @@ if(amount) burned_fuel_for = 0 // Reset the counter since we're removing fuel. if(get_fuel() >= amount) - reagents.remove_reagent("fuel", amount) + reagents.remove_reagent(REAGENT_ID_FUEL, amount) if(M) eyecheck(M) update_icon() @@ -440,7 +440,7 @@ /obj/item/weldingtool/alien/process() if(get_fuel() <= get_max_fuel()) - reagents.add_reagent("fuel", 1) + reagents.add_reagent(REAGENT_ID_FUEL, 1) ..() /obj/item/weldingtool/experimental @@ -461,7 +461,7 @@ ..() if(get_fuel() < get_max_fuel() && nextrefueltick < world.time) nextrefueltick = world.time + 10 - reagents.add_reagent("fuel", 1) + reagents.add_reagent(REAGENT_ID_FUEL, 1) /obj/item/weldingtool/experimental/hybrid name = "strange welding tool" diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm index e8be87608d..ae6bea6ddd 100644 --- a/code/game/objects/items/weapons/weldbackpack.dm +++ b/code/game/objects/items/weapons/weldbackpack.dm @@ -17,7 +17,7 @@ var/datum/reagents/R = new/datum/reagents(max_fuel) //Lotsa refills reagents = R R.my_atom = src - R.add_reagent("fuel", max_fuel) + R.add_reagent(REAGENT_ID_FUEL, max_fuel) nozzle = new nozzle_type(src) nozzle_attached = 1 diff --git a/code/game/objects/structures/medical_stand_vr.dm b/code/game/objects/structures/medical_stand_vr.dm index 05bd7fde60..7e7a89f641 100644 --- a/code/game/objects/structures/medical_stand_vr.dm +++ b/code/game/objects/structures/medical_stand_vr.dm @@ -423,7 +423,7 @@ return // If the human is losing too much blood, beep. - if(H.vessel.get_reagent_amount("blood") < H.species.blood_volume*H.species.blood_level_safe) + if(H.vessel.get_reagent_amount(REAGENT_ID_BLOOD) < H.species.blood_volume*H.species.blood_level_safe) visible_message("\The [src] beeps loudly.") var/datum/reagent/B = H.take_blood(beaker,amount) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 74c86c61e1..d62252012e 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -216,7 +216,7 @@ mymist = null if(on) - add_overlay(image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir)) + add_overlay(image('icons/obj/watercloset.dmi', src, REAGENT_ID_WATER, MOB_LAYER + 1, dir)) if(temperature_settings[watertemp] < T20C) return //no mist for cold water if(!ismist) @@ -265,7 +265,7 @@ var/mob/living/L = AM process_heat(L) wash_floor() - reagents.add_reagent("water", reagents.get_free_space()) + reagents.add_reagent(REAGENT_ID_WATER, reagents.get_free_space()) /obj/machinery/shower/proc/wash_floor() if(is_washing) @@ -588,7 +588,7 @@ var/obj/item/reagent_containers/RG = O if (istype(RG) && RG.is_open_container()) - RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) + RG.reagents.add_reagent(REAGENT_ID_WATER, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) user.visible_message(span_notice("[user] fills \the [RG] using \the [src]."),span_notice("You fill \the [RG] using \the [src].")) playsound(src, 'sound/effects/sink.ogg', 75, 1) return 1 @@ -612,7 +612,7 @@ span_userdanger("[user] was stunned by [TU.his] wet [O]!")) return 1 else if(istype(O, /obj/item/mop)) - O.reagents.add_reagent("water", 5) + O.reagents.add_reagent(REAGENT_ID_WATER, 5) to_chat(user, span_notice("You wet \the [O] in \the [src].")) playsound(src, 'sound/effects/slosh.ogg', 25, 1) return diff --git a/code/game/turfs/simulated/underwater.dm b/code/game/turfs/simulated/underwater.dm index 02dcbd5235..0e72122cf9 100644 --- a/code/game/turfs/simulated/underwater.dm +++ b/code/game/turfs/simulated/underwater.dm @@ -14,7 +14,7 @@ depth = 10 // Higher numbers indicates deeper water, 10 is unused right now, but may be useful for adding effects in the future. - reagent_type = "water" + reagent_type = REAGENT_ID_WATER /turf/simulated/floor/water/underwater/return_air_for_internal_lifeform(var/mob/living/L) if(L.can_breathe_water()) // For squid. diff --git a/code/game/turfs/simulated/wall_types_vr.dm b/code/game/turfs/simulated/wall_types_vr.dm index 976fe96c8f..5ecb521de7 100644 --- a/code/game/turfs/simulated/wall_types_vr.dm +++ b/code/game/turfs/simulated/wall_types_vr.dm @@ -236,4 +236,4 @@ var/list/flesh_overlay_cache = list() icon = 'icons/turf/wall_masks_vr.dmi' /turf/simulated/wall/stonelogs/Initialize(mapload) - . = ..(mapload, "concrete",MAT_LOG) \ No newline at end of file + . = ..(mapload, "concrete",MAT_LOG) diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index f84d3311ad..9d24aea00b 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -19,7 +19,7 @@ var/depth = 1 // Higher numbers indicates deeper water. - var/reagent_type = "water" + var/reagent_type = REAGENT_ID_WATER /turf/simulated/floor/water/Initialize() . = ..() @@ -241,14 +241,14 @@ var/list/shoreline_icon_cache = list() L.adjustToxLoss(poisonlevel) /turf/simulated/floor/water/blood - name = "blood" + name = REAGENT_ID_BLOOD desc = "A body of blood. It seems shallow enough to walk through, if needed." icon = 'icons/turf/outdoors.dmi' icon_state = "bloodshallow" water_icon = 'icons/turf/outdoors.dmi' water_state = "bloodshallow" under_state = "rock" - reagent_type = "blood" + reagent_type = REAGENT_ID_BLOOD /turf/simulated/floor/water/blood/get_edge_icon_state() return "bloodshallow" @@ -272,4 +272,4 @@ var/list/shoreline_icon_cache = list() water_icon = 'icons/turf/flooring/glamour.dmi' water_state = "water" under_state = "glamour" - reagent_type = "water" + reagent_type = REAGENT_ID_WATER diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index a44d915277..b788f9b20e 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -281,7 +281,7 @@ //expects an atom containing the reagents used to clean the turf /turf/proc/clean(atom/source, mob/user) - if(source.reagents.has_reagent("water", 1) || source.reagents.has_reagent("cleaner", 1)) + if(source.reagents.has_reagent(REAGENT_ID_WATER, 1) || source.reagents.has_reagent("cleaner", 1)) clean_blood() if(istype(src, /turf/simulated)) var/turf/simulated/T = src diff --git a/code/modules/blob2/overmind/types/classic.dm b/code/modules/blob2/overmind/types/classic.dm index 86094def25..b7d5fe28bc 100644 --- a/code/modules/blob2/overmind/types/classic.dm +++ b/code/modules/blob2/overmind/types/classic.dm @@ -22,7 +22,7 @@ spawn() var/obj/effect/effect/water/splash = new(T) splash.create_reagents(15) - splash.reagents.add_reagent("blood", 10,list("blood_colour" = color)) + splash.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = color)) splash.set_color() splash.set_up(F, 2, 3) @@ -30,7 +30,7 @@ var/obj/effect/decal/cleanable/chemcoating/blood = locate() in T if(!istype(blood)) blood = new(T) - blood.reagents.add_reagent("blood", 10,list("blood_colour" = color)) + blood.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = color)) blood.reagents.add_reagent("tricorlidaze", 5) blood.update_icon() diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm index 4018b5cb53..77cd68161c 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm @@ -20,7 +20,7 @@ list("antitoxins", "anti_toxin", 0, 80), list("nutrients", "glucose", 0, 80), list("hyronalin", "hyronalin", 0, 80), - list("radium", "radium", 0, 80) + list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80) ) var/max_reagent_volume = 80 //Used when refilling. @@ -40,7 +40,7 @@ list("clotting agent", "myelamine", 0, 30), list("peridaxon", "peridaxon", 0, 30), list("hyronalin", "hyronalin", 0, 30), - list("radium", "radium", 0, 30) + list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30) ) /obj/item/rig_module/chem_dispenser/accepts_item(var/obj/item/input_item, var/mob/living/user) @@ -156,7 +156,7 @@ list("antitoxins", "anti_toxin", 0, 80), list("nutrients", "glucose", 0, 80), list("hyronalin", "hyronalin", 0, 80), - list("radium", "radium", 0, 80), + list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80), list("clotting agent", "myelamine", 0, 80) ) @@ -169,6 +169,6 @@ list("antitoxins", "anti_toxin", 0, 0), list("nutrients", "glucose", 0, 0), list("hyronalin", "hyronalin", 0, 0), - list("radium", "radium", 0, 0), + list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 0), list("clotting agent", "myelamine", 0, 0) ) diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 6e66d2504f..e53816b98e 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -150,7 +150,7 @@ list("antitoxins", "anti_toxin", 0, 80), list("nutrients", "glucose", 0, 80), list("hyronalin", "hyronalin", 0, 80), - list("radium", "radium", 0, 80) + list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80) ) var/max_reagent_volume = 80 //Used when refilling. @@ -170,7 +170,7 @@ list("clotting agent", "myelamine", 0, 30), list("peridaxon", "peridaxon", 0, 30), list("hyronalin", "hyronalin", 0, 30), - list("radium", "radium", 0, 30) + list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 30) ) /obj/item/rig_module/chem_dispenser/accepts_item(var/obj/item/input_item, var/mob/living/user) @@ -286,7 +286,7 @@ list("antitoxins", "anti_toxin", 0, 80), list("nutrients", "glucose", 0, 80), list("hyronalin", "hyronalin", 0, 80), - list("radium", "radium", 0, 80), + list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80), list("clotting agent", "myelamine", 0, 80) ) diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 2ec2692630..f9dbcf34fa 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -168,8 +168,8 @@ //rag must have a minimum of 2 units welder fuel or ehtanol based reagents and at least 80% of the reagents must so. /obj/item/reagent_containers/glass/rag/proc/can_ignite() var/fuel - if(reagents.get_reagent_amount("fuel")) - fuel += reagents.get_reagent_amount("fuel") + if(reagents.get_reagent_amount(REAGENT_ID_FUEL)) + fuel += reagents.get_reagent_amount(REAGENT_ID_FUEL) else for(var/datum/reagent/ethanol/R in reagents.reagent_list) @@ -231,7 +231,7 @@ qdel(src) return - reagents.remove_reagent("fuel", reagents.maximum_volume/25) + reagents.remove_reagent(REAGENT_ID_FUEL, reagents.maximum_volume/25) for(var/datum/reagent/ethanol/R in reagents.reagent_list) if(istype(R, /datum/reagent/ethanol)) reagents.remove_reagent(R.id, reagents.maximum_volume/25) diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index 6c3d6161d5..78646aa794 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -87,7 +87,7 @@ if(istype(Bait, bait_type)) var/foodvolume for(var/datum/reagent/re in Bait.reagents.reagent_list) - if(re.id == "nutriment" || re.id == "protein" || re.id == "glucose" || re.id == "fishbait") + if(re.id == REAGENT_ID_NUTRIMENT || re.id == "protein" || re.id == "glucose" || re.id == "fishbait") foodvolume += re.volume toolspeed = initial(toolspeed) * 10*(0.01/(0.2*(foodvolume/Bait.reagents.maximum_volume + 0.5))) //VOREStation edit: gives fishing a universal formula because Polaris' doesn't work here. Min value of 1, max value of 1/3, 0.5 at 1/2 filled with bait reagents. diff --git a/code/modules/food/drinkingglass/extras.dm b/code/modules/food/drinkingglass/extras.dm index afcd7044a3..2394143a13 100644 --- a/code/modules/food/drinkingglass/extras.dm +++ b/code/modules/food/drinkingglass/extras.dm @@ -86,11 +86,11 @@ sipp_mob(target, user, "liquid_protean") return if(SPECIES_PROMETHEAN) - sipp_mob(target, user, "nutriment") + sipp_mob(target, user, REAGENT_ID_NUTRIMENT) return return ..() -/obj/item/glass_extra/straw/proc/sipp_mob(mob/living/victim, mob/user, reagent_type = "nutriment") +/obj/item/glass_extra/straw/proc/sipp_mob(mob/living/victim, mob/user, reagent_type = REAGENT_ID_NUTRIMENT) if(victim.health <= 0) to_chat(user, span_warning("There's not enough of [victim] left to sip on!")) return diff --git a/code/modules/food/drinkingglass/metaglass_vr.dm b/code/modules/food/drinkingglass/metaglass_vr.dm index ebaf4670e6..579a0cea87 100644 --- a/code/modules/food/drinkingglass/metaglass_vr.dm +++ b/code/modules/food/drinkingglass/metaglass_vr.dm @@ -241,5 +241,5 @@ glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/manager_summoner - glass_icon_state = "manager_summoner" + glass_icon_state = REAGENT_ID_MANAGERSUMMONER glass_icon_file = 'icons/obj/drinks_vr.dmi' diff --git a/code/modules/food/drinkingglass/shaker.dm b/code/modules/food/drinkingglass/shaker.dm index 8d9ff65249..1369441664 100644 --- a/code/modules/food/drinkingglass/shaker.dm +++ b/code/modules/food/drinkingglass/shaker.dm @@ -32,10 +32,10 @@ /obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/Initialize() . = ..() cut_overlays() - reagents.add_reagent("nutriment", 30) - reagents.add_reagent("iron", 10) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30) + reagents.add_reagent(REAGENT_ID_IRON, 10) reagents.add_reagent("protein", 35) - reagents.add_reagent("water", 25) + reagents.add_reagent(REAGENT_ID_WATER, 25) /obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/update_icon() - return \ No newline at end of file + return diff --git a/code/modules/food/drinkingglass/shaker_vr.dm b/code/modules/food/drinkingglass/shaker_vr.dm index 2bc6528b38..0bdbe75d86 100644 --- a/code/modules/food/drinkingglass/shaker_vr.dm +++ b/code/modules/food/drinkingglass/shaker_vr.dm @@ -9,7 +9,7 @@ . = ..() cut_overlays() reagents.add_reagent("liquid_protean", 50) - reagents.add_reagent("nutriment", 50) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 50) /obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake/update_icon() - return \ No newline at end of file + return diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index 4a175222a5..ec7c739dee 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -41,7 +41,7 @@ /obj/item/reagent_containers/food/drinks/cans/waterbottle/Initialize() . = ..() - reagents.add_reagent("water", 30) + reagents.add_reagent(REAGENT_ID_WATER, 30) /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind name = "\improper Space Mountain Wind" @@ -278,8 +278,8 @@ /obj/item/reagent_containers/food/drinks/cans/terra_cola/Initialize() . = ..() - reagents.add_reagent("water", 25) - reagents.add_reagent("iron", 5) + reagents.add_reagent(REAGENT_ID_WATER, 25) + reagents.add_reagent(REAGENT_ID_IRON, 5) /////////////////////////MISC VENDOR DRINKS///////////////////////// @@ -365,7 +365,7 @@ /obj/item/reagent_containers/food/drinks/cans/bepis/Initialize() . = ..() - reagents.add_reagent("bepis", 30) + reagents.add_reagent(REAGENT_ID_BEPIS, 30) /obj/item/reagent_containers/food/drinks/cans/astrodew name = "\improper Astro Dew Spring Water" @@ -376,7 +376,7 @@ /obj/item/reagent_containers/food/drinks/cans/astrodew/Initialize() . = ..() - reagents.add_reagent("water", 30) + reagents.add_reagent(REAGENT_ID_WATER, 30) /obj/item/reagent_containers/food/drinks/cans/icecoffee name = "\improper Café Del Consumir" @@ -403,7 +403,7 @@ /obj/item/reagent_containers/food/drinks/cans/buzz/Initialize() . = ..() - reagents.add_reagent("buzz_fuzz", 30) + reagents.add_reagent(REAGENT_ID_BUZZFUZZ, 30) /obj/item/reagent_containers/food/drinks/cans/shambler name = "\improper Shambler's Juice" @@ -414,7 +414,7 @@ /obj/item/reagent_containers/food/drinks/cans/shambler/Initialize() . = ..() - reagents.add_reagent("shamblers", 30) + reagents.add_reagent(REAGENT_ID_SHAMBLERS, 30) /obj/item/reagent_containers/food/drinks/cans/cranberry name = "\improper Sprited Cranberry" @@ -425,7 +425,7 @@ /obj/item/reagent_containers/food/drinks/cans/cranberry/Initialize() . = ..() - reagents.add_reagent("sprited_cranberry", 30) + reagents.add_reagent(REAGENT_ID_SPRITEDCRANBERRY, 30) /////////////////////////CANNED BOOZE DRINKS///////////////////////// @@ -460,7 +460,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_peach/Initialize() . = ..() - reagents.add_reagent("nukie_peach", 60) + reagents.add_reagent(REAGENT_ID_NUKIEPEACH, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_pear name = "\improper Nukies - Great Pear" @@ -471,7 +471,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_pear/Initialize() . = ..() - reagents.add_reagent("nukie_pear", 60) + reagents.add_reagent(REAGENT_ID_NUKIEPEAR, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_cherry name = "\improper Nukies - Popping Cherry" @@ -482,7 +482,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_cherry/Initialize() . = ..() - reagents.add_reagent("nukie_cherry", 60) + reagents.add_reagent(REAGENT_ID_NUKIECHERRY, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_melon name = "\improper Nukies - Melon Squirter" @@ -493,7 +493,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_melon/Initialize() . = ..() - reagents.add_reagent("nukie_melon", 60) + reagents.add_reagent(REAGENT_ID_NUKIEMELON, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_banana name = "\improper Nukies - Bursting Banana" @@ -504,7 +504,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_banana/Initialize() . = ..() - reagents.add_reagent("nukie_banana", 60) + reagents.add_reagent(REAGENT_ID_NUKIEBANANA, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_rose name = "\improper Nukies - Insatiable Rose" @@ -515,7 +515,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_rose/Initialize() . = ..() - reagents.add_reagent("nukie_rose", 60) + reagents.add_reagent(REAGENT_ID_NUKIEROSE, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_lemon name = "\improper Nukies - Citrus Got Real" @@ -526,7 +526,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_lemon/Initialize() . = ..() - reagents.add_reagent("nukie_lemon", 60) + reagents.add_reagent(REAGENT_ID_NUKIELEMON, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_fruit name = "\improper Nukies - Swelling Fruit" @@ -537,7 +537,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_fruit/Initialize() . = ..() - reagents.add_reagent("nukie_fruit", 60) + reagents.add_reagent(REAGENT_ID_NUKIEFRUIT, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_special name = "\improper Nukies - Limited Edition" @@ -548,7 +548,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_special/Initialize() . = ..() - reagents.add_reagent("nukie_special", 60) + reagents.add_reagent(REAGENT_ID_NUKIESPECIAL, 60) /////////////////////////MEGA NUKIES///////////////////////// //Rare loot energy drinks with special properties, for the funnies. @@ -562,7 +562,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_mega_sight/Initialize() . = ..() - reagents.add_reagent("nukie_mega_sight", 60) + reagents.add_reagent(REAGENT_ID_NUKIEMEGASIGHT, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_mega_heart name = "\improper Nukies Mega - Juice Pumper" @@ -573,7 +573,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_mega_heart/Initialize() . = ..() - reagents.add_reagent("nukie_mega_heart", 60) + reagents.add_reagent(REAGENT_ID_NUKIEMEGAHEART, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_mega_sleep name = "\improper Nukies Nega - Vibrating Nights" @@ -584,7 +584,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_mega_sleep/Initialize() . = ..() - reagents.add_reagent("nukie_mega_sleep", 60) + reagents.add_reagent(REAGENT_ID_NUKIEMEGASLEEP, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_mega_shock name = "\improper Nukies Mega - Jolt Railer" @@ -595,7 +595,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_mega_shock/Initialize() . = ..() - reagents.add_reagent("nukie_mega_shock", 60) + reagents.add_reagent(REAGENT_ID_NUKIEMEGASHOCK, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_mega_fast name = "\improper Nukies Mega - Rapid Rager" @@ -606,7 +606,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_mega_fast/Initialize() . = ..() - reagents.add_reagent("nukie_mega_fast", 60) + reagents.add_reagent(REAGENT_ID_NUKIEMEGAFAST, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_mega_high name = "\improper Nukies Mega - Diamond Sky" @@ -617,7 +617,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_mega_high/Initialize() . = ..() - reagents.add_reagent("nukie_mega_high", 60) + reagents.add_reagent(REAGENT_ID_NUKIEMEGAHIGH, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink name = "\improper Nukies Mega - Shrinking Flower" @@ -628,7 +628,7 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_mega_shrink/Initialize() . = ..() - reagents.add_reagent("nukie_mega_shrink", 60) + reagents.add_reagent(REAGENT_ID_NUKIEMEGASHRINK, 60) /obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow name = "\improper Nukies Mega - Growing Geyser" @@ -639,4 +639,4 @@ /obj/item/reagent_containers/food/drinks/cans/nukie_mega_grow/Initialize() . = ..() - reagents.add_reagent("nukie_mega_growth", 60) + reagents.add_reagent(REAGENT_ID_NUKIEMEGAGROWTH, 60) diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index 0eb6cb0408..35974d7095 100644 --- a/code/modules/food/food/condiment.dm +++ b/code/modules/food/food/condiment.dm @@ -91,7 +91,7 @@ desc = "Leaves the tongue numb in its passage." icon_state = "coldsauce" center_of_mass = list("x"=16, "y"=6) - if("sodiumchloride") + if(REAGENT_ID_SODIUMCHLORIDE) name = "Salt Shaker" desc = "Salt. From space oceans, presumably." icon_state = "saltshaker" @@ -106,7 +106,7 @@ desc = "A delicious oil used in cooking. General purpose." icon_state = "oliveoil" center_of_mass = list("x"=16, "y"=6) - if("sugar") + if(REAGENT_ID_SUGAR) name = "Sugar" desc = "Tastey space sugar!" center_of_mass = list("x"=16, "y"=6) @@ -166,7 +166,7 @@ /obj/item/reagent_containers/food/condiment/sugar/Initialize() . = ..() - reagents.add_reagent("sugar", 50) + reagents.add_reagent(REAGENT_ID_SUGAR, 50) /obj/item/reagent_containers/food/condiment/ketchup/Initialize() . = ..() @@ -237,7 +237,7 @@ /obj/item/reagent_containers/food/condiment/small/saltshaker/Initialize() . = ..() - reagents.add_reagent("sodiumchloride", 20) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 20) /obj/item/reagent_containers/food/condiment/small/peppermill //Keeping name here to save map based headaches name = "pepper shaker" @@ -260,13 +260,13 @@ reagents.add_reagent("blackpepper", 30) /obj/item/reagent_containers/food/condiment/small/sugar - name = "sugar" + name = REAGENT_ID_SUGAR desc = "Sweetness in a bottle" icon_state = "sugarsmall" /obj/item/reagent_containers/food/condiment/small/sugar/Initialize() . = ..() - reagents.add_reagent("sugar", 20) + reagents.add_reagent(REAGENT_ID_SUGAR, 20) //MRE condiments and drinks. @@ -284,7 +284,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/salt/Initialize() . = ..() - reagents.add_reagent("sodiumchloride", 5) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 5) /obj/item/reagent_containers/food/condiment/small/packet/pepper name = "pepper packet" @@ -302,7 +302,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/sugar/Initialize() . = ..() - reagents.add_reagent("sugar", 5) + reagents.add_reagent(REAGENT_ID_SUGAR, 5) /obj/item/reagent_containers/food/condiment/small/packet/jelly name = "jelly packet" @@ -495,7 +495,7 @@ /obj/item/reagent_containers/food/condiment/carton/sugar name = "sugar carton" desc = "A big carton of sugar. Sweet!" - icon_state = "sugar" + icon_state = REAGENT_ID_SUGAR volume = 120 center_of_mass = list("x"=16, "y"=8) @@ -505,7 +505,7 @@ /obj/item/reagent_containers/food/condiment/carton/sugar/Initialize() . = ..() - reagents.add_reagent("sugar", 100) + reagents.add_reagent(REAGENT_ID_SUGAR, 100) /obj/item/reagent_containers/food/condiment/carton/sugar/rustic name = "sugar sack" @@ -534,7 +534,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/protein_powder/Initialize() . = ..() - reagents.add_reagent("protein_powder", 5) + reagents.add_reagent(REAGENT_ID_PROTEINPOWDER, 5) /obj/item/reagent_containers/food/condiment/small/packet/protein_powder/vanilla name = "vanilla protein powder packet" @@ -543,7 +543,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/protein_powder/vanilla/Initialize() . = ..() - reagents.add_reagent("vanilla_protein_powder", 5) + reagents.add_reagent(REAGENT_ID_VANILLAPROTEINPOWDER, 5) /obj/item/reagent_containers/food/condiment/small/packet/protein_powder/banana name = "banana protein powder packet" @@ -552,7 +552,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/protein_powder/banana/Initialize() . = ..() - reagents.add_reagent("banana_protein_powder", 5) + reagents.add_reagent(REAGENT_ID_BANANAPROTEINPOWDER, 5) /obj/item/reagent_containers/food/condiment/small/packet/protein_powder/chocolate name = "chocolate protein powder packet" @@ -561,7 +561,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/protein_powder/chocolate/Initialize() . = ..() - reagents.add_reagent("chocolate_protein_powder", 5) + reagents.add_reagent(REAGENT_ID_CHOCOLATEPROTEINPOWDER, 5) /obj/item/reagent_containers/food/condiment/small/packet/protein_powder/strawberry name = "strawberry protein powder packet" @@ -570,4 +570,4 @@ /obj/item/reagent_containers/food/condiment/small/packet/protein_powder/strawberry/Initialize() . = ..() - reagents.add_reagent("strawberry_protein_powder", 5) + reagents.add_reagent(REAGENT_ID_STRAWBERRYPROTEINPOWDER, 5) diff --git a/code/modules/food/food/drinks/drinkingglass.dm b/code/modules/food/food/drinks/drinkingglass.dm index 3d48ab9068..97db510bd5 100644 --- a/code/modules/food/food/drinks/drinkingglass.dm +++ b/code/modules/food/food/drinks/drinkingglass.dm @@ -157,7 +157,7 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/proteinshake/Initialize() . = ..() - reagents.add_reagent("nutriment", 30) - reagents.add_reagent("iron", 10) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30) + reagents.add_reagent(REAGENT_ID_IRON, 10) reagents.add_reagent("protein", 15) - reagents.add_reagent("water", 45) \ No newline at end of file + reagents.add_reagent(REAGENT_ID_WATER, 45) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 0a89dd26b8..9674d5cf55 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -53,7 +53,7 @@ /obj/item/reagent_containers/food/snacks/Initialize() . = ..() if(nutriment_amt) - reagents.add_reagent("nutriment",(nutriment_amt*2),nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT,(nutriment_amt*2),nutriment_desc) //Placeholder for effect that trigger on eating that aren't tied to reagents. /obj/item/reagent_containers/food/snacks/proc/On_Consume(var/mob/living/M) @@ -116,7 +116,7 @@ var/swallow_whole = FALSE var/obj/belly/belly_target // These are surprise tools that will help us later - var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25) + var/fullness = M.nutrition + (M.reagents.get_reagent_amount(REAGENT_ID_NUTRIMENT) * 25) if(M == user) //If you're eating it yourself if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M @@ -460,7 +460,7 @@ /obj/item/reagent_containers/food/snacks/candy/donor/Initialize() . = ..() - reagents.add_reagent("sugar", 3) + reagents.add_reagent(REAGENT_ID_SUGAR, 3) /obj/item/reagent_containers/food/snacks/candy_corn name = "candy corn" @@ -475,7 +475,7 @@ /obj/item/reagent_containers/food/snacks/candy_corn/Initialize() . = ..() - reagents.add_reagent("sugar", 2) + reagents.add_reagent(REAGENT_ID_SUGAR, 2) /obj/item/reagent_containers/food/snacks/chocolatebar //not a vending item name = "Chocolate Bar" @@ -489,7 +489,7 @@ /obj/item/reagent_containers/food/snacks/chocolatebar/Initialize() . = ..() - reagents.add_reagent("sugar", 2) + reagents.add_reagent(REAGENT_ID_SUGAR, 2) reagents.add_reagent("coco", 2) /obj/item/reagent_containers/food/snacks/chocolatepiece @@ -527,7 +527,7 @@ /obj/item/reagent_containers/food/snacks/chocolateegg/Initialize() . = ..() - reagents.add_reagent("sugar", 2) + reagents.add_reagent(REAGENT_ID_SUGAR, 2) reagents.add_reagent("coco", 2) /obj/item/reagent_containers/food/snacks/donut @@ -548,7 +548,7 @@ desc = "A plain ol' donut." /obj/item/reagent_containers/food/snacks/donut/plain/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/donut/plain/jelly name = "plain jelly donut" @@ -556,7 +556,7 @@ desc = "At least this one has jelly!" /obj/item/reagent_containers/food/snacks/donut/plain/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/pink @@ -566,7 +566,7 @@ overlay_state = "donut_pink_inbox" /obj/item/reagent_containers/food/snacks/donut/pink/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/donut/pink/jelly name = "pink frosted jelly donut" @@ -574,7 +574,7 @@ desc = "This one has pink frosting and a jelly filling!" /obj/item/reagent_containers/food/snacks/donut/pink/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/purple @@ -584,7 +584,7 @@ overlay_state = "donut_purple_inbox" /obj/item/reagent_containers/food/snacks/donut/purple/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/donut/purple/jelly name = "purple frosted jelly donut" @@ -592,7 +592,7 @@ desc = "This one has purple frosting and a jelly filling!" /obj/item/reagent_containers/food/snacks/donut/purple/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/green @@ -602,7 +602,7 @@ overlay_state = "donut_green_inbox" /obj/item/reagent_containers/food/snacks/donut/green/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/donut/green/jelly name = "green frosted jelly donut" @@ -610,7 +610,7 @@ desc = "This one has green frosting and a jelly filling!" /obj/item/reagent_containers/food/snacks/donut/green/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/beige @@ -620,7 +620,7 @@ overlay_state = "donut_beige_inbox" /obj/item/reagent_containers/food/snacks/donut/beige/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/donut/beige/jelly name = "beige frosted jelly donut" @@ -628,7 +628,7 @@ desc = "This one has beige frosting and a jelly filling!" /obj/item/reagent_containers/food/snacks/donut/beige/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/choc @@ -638,7 +638,7 @@ overlay_state = "donut_choc_inbox" /obj/item/reagent_containers/food/snacks/donut/choc/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("chocolate", 5) /obj/item/reagent_containers/food/snacks/donut/choc/jelly @@ -647,7 +647,7 @@ desc = "This one has chocolate frosting and a jelly filling!" /obj/item/reagent_containers/food/snacks/donut/choc/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) reagents.add_reagent("chocolate", 5) @@ -658,7 +658,7 @@ overlay_state = "donut_blue_inbox" /obj/item/reagent_containers/food/snacks/donut/blue/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/donut/blue/jelly name = "blue frosted jelly donut" @@ -666,7 +666,7 @@ desc = "This one has blue frosting and a jelly filling!" /obj/item/reagent_containers/food/snacks/donut/blue/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/yellow @@ -676,7 +676,7 @@ overlay_state = "donut_yellow_inbox" /obj/item/reagent_containers/food/snacks/donut/yellow/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/donut/yellow/jelly name = "yellow frosted jelly donut" @@ -684,7 +684,7 @@ desc = "This one has yellow frosting and a jelly filling!" /obj/item/reagent_containers/food/snacks/donut/yellow/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/olive @@ -694,7 +694,7 @@ overlay_state = "donut_olive_inbox" /obj/item/reagent_containers/food/snacks/donut/olive/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/donut/olive/jelly name = "olive frosted jelly donut" @@ -702,7 +702,7 @@ desc = "This one has olive frosting and a jelly filling!" /obj/item/reagent_containers/food/snacks/donut/olive/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) /obj/item/reagent_containers/food/snacks/donut/homer @@ -712,7 +712,7 @@ overlay_state = "donut_homer_inbox" /obj/item/reagent_containers/food/snacks/donut/homer/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("sprinkles", 1) /obj/item/reagent_containers/food/snacks/donut/homer/jelly @@ -721,7 +721,7 @@ desc = "It's a d'ohnut with jelly filling!" /obj/item/reagent_containers/food/snacks/donut/homer/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("sprinkles", 1) reagents.add_reagent("berryjuice", 5) @@ -732,7 +732,7 @@ overlay_state = "donut_choc_sprinkles_inbox" /obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("sprinkles", 1) reagents.add_reagent("chocolate", 1) @@ -742,7 +742,7 @@ desc = "Pretty sure this is the most sugar you can pack into a donut." /obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("sprinkles", 1) reagents.add_reagent("berryjuice", 5) reagents.add_reagent("chocolate", 1) @@ -763,7 +763,7 @@ overlay_state = "donut_laugh_inbox" /obj/item/reagent_containers/food/snacks/donut/laugh/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/donut/laugh/jelly name = "laugh jelly donut" @@ -771,7 +771,7 @@ desc = "Try not to be jelly." /obj/item/reagent_containers/food/snacks/donut/laugh/jelly/Initialize() . = ..() - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) reagents.add_reagent("berryjuice", 5) @@ -789,7 +789,7 @@ reagents.add_reagent("sprinkles", 1) switch(rand(1,10)) if(1) - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) if(2) reagents.add_reagent("capsaicin", 3) if(3) @@ -909,7 +909,7 @@ /obj/item/reagent_containers/food/snacks/friedegg/Initialize() . = ..() reagents.add_reagent("protein", 3) - reagents.add_reagent("sodiumchloride", 1) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) reagents.add_reagent("blackpepper", 1) /obj/item/reagent_containers/food/snacks/boiledegg @@ -1016,7 +1016,7 @@ /obj/item/reagent_containers/food/snacks/crab_legs/Initialize() . = ..() reagents.add_reagent("seafood", 6) - reagents.add_reagent("sodiumchloride", 1) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) /obj/item/reagent_containers/food/snacks/fishfingers name = "Fish Fingers" @@ -1054,7 +1054,7 @@ /obj/item/reagent_containers/food/snacks/mushroomslice/Initialize() . = ..() - reagents.add_reagent("psilocybin", 3) + reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3) /obj/item/reagent_containers/food/snacks/tomatomeat name = "tomato slice" @@ -1090,7 +1090,7 @@ /obj/item/reagent_containers/food/snacks/xenomeat/Initialize() . = ..() reagents.add_reagent("protein", 6) - reagents.add_reagent("pacid",6) + reagents.add_reagent(REAGENT_ID_PACID,6) /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat. name = "spider meat" @@ -1102,8 +1102,8 @@ /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize() . = ..() - reagents.add_reagent("spidertoxin",6) - reagents.remove_reagent("pacid",6) + reagents.add_reagent(REAGENT_ID_SPIDERTOXIN,6) + reagents.remove_reagent(REAGENT_ID_PACID,6) /obj/item/reagent_containers/food/snacks/meatball name = "meatball" @@ -1212,7 +1212,7 @@ icon_state = "dankpocket" nutriment_amt = 2 nutriment_desc = list("heartiness" = 1, "dough" = 2) - heated_reagents = list("bliss" = 5) + heated_reagents = list(REAGENT_ID_BLISS = 5) /obj/item/reagent_containers/food/snacks/donkpocket/sinpocket name = "\improper Sin-pocket" @@ -1518,7 +1518,7 @@ /obj/item/reagent_containers/food/snacks/amanita_pie/Initialize() . = ..() reagents.add_reagent("amatoxin", 3) - reagents.add_reagent("psilocybin", 1) + reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 1) /obj/item/reagent_containers/food/snacks/plump_pie name = "plump pie" @@ -1535,7 +1535,7 @@ if(prob(10)) name = "exceptional plump pie" desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!" - reagents.add_reagent("nutriment", 8, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 8, nutriment_desc) reagents.add_reagent("tricordrazine", 5) /obj/item/reagent_containers/food/snacks/xemeatpie @@ -1752,7 +1752,7 @@ /obj/item/reagent_containers/food/snacks/blackpudding/Initialize() . = ..() reagents.add_reagent("protein", 2) - reagents.add_reagent("blood", 5) + reagents.add_reagent(REAGENT_ID_BLOOD, 5) /obj/item/reagent_containers/food/snacks/soydope name = "Soy Dope" @@ -1786,7 +1786,7 @@ /obj/item/reagent_containers/food/snacks/badrecipe/Initialize() . = ..() reagents.add_reagent("toxin", 1) - reagents.add_reagent("carbon", 3) + reagents.add_reagent(REAGENT_ID_CARBON, 3) /obj/item/reagent_containers/food/snacks/meatsteak name = "Meat steak" @@ -1800,7 +1800,7 @@ /obj/item/reagent_containers/food/snacks/meatsteak/Initialize() . = ..() reagents.add_reagent("protein", 4) - reagents.add_reagent("sodiumchloride", 1) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) reagents.add_reagent("blackpepper", 1) /obj/item/reagent_containers/food/snacks/spacylibertyduff @@ -1816,7 +1816,7 @@ /obj/item/reagent_containers/food/snacks/spacylibertyduff/Initialize() . = ..() - reagents.add_reagent("psilocybin", 6) + reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 6) /obj/item/reagent_containers/food/snacks/amanitajelly name = "Amanita Jelly" @@ -1832,7 +1832,7 @@ /obj/item/reagent_containers/food/snacks/amanitajelly/Initialize() . = ..() reagents.add_reagent("amatoxin", 6) - reagents.add_reagent("psilocybin", 3) + reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3) /obj/item/reagent_containers/food/snacks/poppypretzel name = "Poppy pretzel" @@ -1895,7 +1895,7 @@ Expand() /obj/item/reagent_containers/food/snacks/monkeycube/on_reagent_change() - if(reagents.has_reagent("water")) + if(reagents.has_reagent(REAGENT_ID_WATER)) Expand() /obj/item/reagent_containers/food/snacks/monkeycube/wrapped @@ -1981,7 +1981,7 @@ reagents.add_reagent("protein", 10) reagents.add_reagent("banana", 5) reagents.add_reagent("blackpepper", 1) - reagents.add_reagent("sodiumchloride", 1) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) /obj/item/reagent_containers/food/snacks/baguette name = "Baguette" @@ -1996,7 +1996,7 @@ /obj/item/reagent_containers/food/snacks/baguette/Initialize() . = ..() reagents.add_reagent("blackpepper", 1) - reagents.add_reagent("sodiumchloride", 1) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) /obj/item/reagent_containers/food/snacks/fishandchips name = "Fish and Chips" @@ -2025,7 +2025,7 @@ /obj/item/reagent_containers/food/snacks/rofflewaffles/Initialize() . = ..() - reagents.add_reagent("psilocybin", 8) + reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 8) /obj/item/reagent_containers/food/snacks/jelliedtoast name = "Jellied Toast" @@ -2290,7 +2290,7 @@ /obj/item/reagent_containers/food/snacks/toastedsandwich/Initialize() . = ..() reagents.add_reagent("protein", 3) - reagents.add_reagent("carbon", 2) + reagents.add_reagent(REAGENT_ID_CARBON, 2) /obj/item/reagent_containers/food/snacks/grilledcheese name = "Grilled Cheese Sandwich" @@ -2358,7 +2358,7 @@ if(prob(10)) name = "exceptional plump helmet biscuit" desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" - reagents.add_reagent("nutriment", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/chawanmushi name = "chawanmushi" @@ -2431,7 +2431,7 @@ /obj/item/reagent_containers/food/snacks/meatballsoup/Initialize() . = ..() reagents.add_reagent("protein", 8) - reagents.add_reagent("water", 5) + reagents.add_reagent(REAGENT_ID_WATER, 5) /obj/item/reagent_containers/food/snacks/slimesoup name = "slime soup" @@ -2444,7 +2444,7 @@ /obj/item/reagent_containers/food/snacks/slimesoup/Initialize() . = ..() reagents.add_reagent("slimejelly", 5) - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_WATER, 10) /obj/item/reagent_containers/food/snacks/bloodsoup name = "Tomato soup" @@ -2458,8 +2458,8 @@ /obj/item/reagent_containers/food/snacks/bloodsoup/Initialize() . = ..() reagents.add_reagent("protein", 2) - reagents.add_reagent("blood", 10) - reagents.add_reagent("water", 5) + reagents.add_reagent(REAGENT_ID_BLOOD, 10) + reagents.add_reagent(REAGENT_ID_WATER, 5) /obj/item/reagent_containers/food/snacks/clownstears name = JOB_CLOWN + "'s Tears" @@ -2475,7 +2475,7 @@ /obj/item/reagent_containers/food/snacks/clownstears/Initialize() . = ..() reagents.add_reagent("banana", 5) - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_WATER, 10) /obj/item/reagent_containers/food/snacks/vegetablesoup name = "Vegetable soup" @@ -2490,7 +2490,7 @@ /obj/item/reagent_containers/food/snacks/vegetablesoup/Initialize() . = ..() - reagents.add_reagent("vegetable_soup", 10) + reagents.add_reagent(REAGENT_ID_VEGETABLESOUP, 10) /obj/item/reagent_containers/food/snacks/nettlesoup name = "Nettle soup" @@ -2506,7 +2506,7 @@ /obj/item/reagent_containers/food/snacks/nettlesoup/Initialize() . = ..() - reagents.add_reagent("water", 5) + reagents.add_reagent(REAGENT_ID_WATER, 5) reagents.add_reagent("tricordrazine", 5) /obj/item/reagent_containers/food/snacks/mysterysoup @@ -2526,37 +2526,37 @@ var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10) switch(mysteryselect) if(1) - reagents.add_reagent("nutriment", 6, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc) reagents.add_reagent("capsaicin", 3) reagents.add_reagent("tomatojuice", 2) if(2) - reagents.add_reagent("nutriment", 6, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc) reagents.add_reagent("frostoil", 3) reagents.add_reagent("tomatojuice", 2) if(3) - reagents.add_reagent("nutriment", 5, nutriment_desc) - reagents.add_reagent("water", 5) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc) + reagents.add_reagent(REAGENT_ID_WATER, 5) reagents.add_reagent("tricordrazine", 5) if(4) - reagents.add_reagent("nutriment", 5, nutriment_desc) - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc) + reagents.add_reagent(REAGENT_ID_WATER, 10) if(5) - reagents.add_reagent("nutriment", 2, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 2, nutriment_desc) reagents.add_reagent("banana", 10) if(6) - reagents.add_reagent("nutriment", 6, nutriment_desc) - reagents.add_reagent("blood", 10) + 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("water", 10) + reagents.add_reagent(REAGENT_ID_WATER, 10) if(8) - reagents.add_reagent("carbon", 10) + reagents.add_reagent(REAGENT_ID_CARBON, 10) reagents.add_reagent("toxin", 10) if(9) - reagents.add_reagent("nutriment", 5, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc) reagents.add_reagent("tomatojuice", 10) if(10) - reagents.add_reagent("nutriment", 6, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc) reagents.add_reagent("tomatojuice", 5) reagents.add_reagent("imidazoline", 5) @@ -2572,10 +2572,10 @@ /obj/item/reagent_containers/food/snacks/wishsoup/Initialize() . = ..() - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_WATER, 10) if(prob(25)) src.desc = "A wish come true!" - reagents.add_reagent("nutriment", 8, list("something good" = 8)) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 8, list("something good" = 8)) /obj/item/reagent_containers/food/snacks/tomatosoup name = "Tomato Soup" @@ -2589,7 +2589,7 @@ /obj/item/reagent_containers/food/snacks/tomatosoup/Initialize() . = ..() - reagents.add_reagent("tomato_soup", 10) + reagents.add_reagent(REAGENT_ID_TOMATOSOUP, 10) /obj/item/reagent_containers/food/snacks/mushroomsoup name = "chantrelle soup" @@ -2603,7 +2603,7 @@ /obj/item/reagent_containers/food/snacks/mushroomsoup/Initialize() . = ..() - reagents.add_reagent("mushroom_soup", 10) + reagents.add_reagent(REAGENT_ID_MUSHROOMSOUP, 10) /obj/item/reagent_containers/food/snacks/beetsoup name = "beet soup" @@ -2618,7 +2618,7 @@ /obj/item/reagent_containers/food/snacks/beetsoup/Initialize() . = ..() name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht")) - reagents.add_reagent("beet_soup", 10) + reagents.add_reagent(REAGENT_ID_BEETSOUP, 10) /obj/item/reagent_containers/food/snacks/soup/onion name = "onion soup" @@ -2632,7 +2632,7 @@ /obj/item/reagent_containers/food/snacks/soup/onion/Initialize() . = ..() - reagents.add_reagent("onion_soup", 10) + reagents.add_reagent(REAGENT_ID_ONIONSOUP, 10) /obj/item/reagent_containers/food/snacks/chickennoodlesoup name = "chicken noodle soup" @@ -2644,7 +2644,7 @@ /obj/item/reagent_containers/food/snacks/chickennoodlesoup/Initialize() . = ..() - reagents.add_reagent("chicken_noodle_soup", 10) + reagents.add_reagent(REAGENT_ID_CHICKENNOODLESOUP, 10) /obj/item/reagent_containers/food/snacks/stew name = "Stew" @@ -2664,7 +2664,7 @@ reagents.add_reagent("protein", 4) reagents.add_reagent("tomatojuice", 5) reagents.add_reagent("imidazoline", 5) - reagents.add_reagent("water", 5) + reagents.add_reagent(REAGENT_ID_WATER, 5) /obj/item/reagent_containers/food/snacks/bearstew name = "bear stew" @@ -2684,7 +2684,7 @@ reagents.add_reagent("hyperzine", 5) reagents.add_reagent("tomatojuice", 5) reagents.add_reagent("imidazoline", 5) - reagents.add_reagent("water", 5) + reagents.add_reagent(REAGENT_ID_WATER, 5) /obj/item/reagent_containers/food/snacks/hotchili @@ -3435,7 +3435,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies/Initialize() . = ..() reagents.add_reagent("protein", 2) - reagents.add_reagent("ambrosia_extract", 2) + reagents.add_reagent(REAGENT_ID_AMBROSIAEXTRACT, 2) reagents.add_reagent("bicaridine", 1) reagents.add_reagent("kelotane", 1) reagents.add_reagent("toxin", 1) @@ -3503,7 +3503,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/buchedenoel/Initialize() . = ..() - reagents.add_reagent("sugar", 9) + reagents.add_reagent(REAGENT_ID_SUGAR, 9) reagents.add_reagent("coco", 5) /obj/item/reagent_containers/food/snacks/bucheslice @@ -3531,7 +3531,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize() . = ..() reagents.add_reagent("blackpepper", 1) - reagents.add_reagent("sodiumchloride", 1) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) reagents.add_reagent("cookingoil", 1) /obj/item/reagent_containers/food/snacks/turkeyslice @@ -3561,7 +3561,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize() . = ..() reagents.add_reagent("blackpepper", 1) - reagents.add_reagent("sodiumchloride", 1) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) reagents.add_reagent("cookingoil", 1) /obj/item/reagent_containers/food/snacks/sliceable/turkey/on_slice_extra() @@ -4039,7 +4039,7 @@ /obj/item/reagent_containers/food/snacks/dionaroast/Initialize() . = ..() - reagents.add_reagent("radium", 2) + reagents.add_reagent(REAGENT_ID_RADIUM, 2) /obj/item/reagent_containers/food/snacks/dough name = "dough" @@ -4281,7 +4281,7 @@ reagents.add_reagent("oxycodone", 1) reagents.add_reagent("sifsap", 5) - reagents.add_reagent("bliss", 5) + reagents.add_reagent(REAGENT_ID_BLISS, 5) /obj/item/reagent_containers/food/snacks/bellefritter name = "frostbelle fritters" @@ -4295,7 +4295,7 @@ /obj/item/reagent_containers/food/snacks/bellefritter/Initialize() . = ..() reagents.add_reagent("batter", 10) - reagents.add_reagent("sugar", 5) + reagents.add_reagent(REAGENT_ID_SUGAR, 5) /obj/item/reagent_containers/food/snacks/roastedsunflower name = "sunflower seeds" @@ -4333,7 +4333,7 @@ /obj/item/reagent_containers/food/snacks/liquidfood/Initialize() . = ..() - reagents.add_reagent("iron", 3) + reagents.add_reagent(REAGENT_ID_IRON, 3) /obj/item/reagent_containers/food/snacks/liquidprotein name = "\improper LiquidProtein Ration" @@ -4349,7 +4349,7 @@ /obj/item/reagent_containers/food/snacks/liquidprotein/Initialize() . = ..() reagents.add_reagent("protein", 30) - reagents.add_reagent("iron", 3) + reagents.add_reagent(REAGENT_ID_IRON, 3) /obj/item/reagent_containers/food/snacks/liquidvitamin name = "\improper VitaPaste Ration" @@ -4368,7 +4368,7 @@ reagents.add_reagent("tricordrazine", 5) reagents.add_reagent("paracetamol", 5) reagents.add_reagent("enzyme", 1) - reagents.add_reagent("iron", 3) + reagents.add_reagent(REAGENT_ID_IRON, 3) /obj/item/reagent_containers/food/snacks/meatcube name = "cubed meat" @@ -4564,7 +4564,7 @@ icon_state = "rosesalad" filling_color = "#FF3867" nutriment_amt = 10 - nutriment_desc = list("bittersweet" = 10, "iron" = 5) + nutriment_desc = list("bittersweet" = 10, REAGENT_ID_IRON = 5) bitesize = 4 /obj/item/reagent_containers/food/snacks/rosesalad/Initialize() @@ -4919,7 +4919,7 @@ // composition_reagent = "slimejelly" /mob/living/carbon/alien/diona - composition_reagent = "nutriment"//Dionae are plants, so eating them doesn't give animal protein + composition_reagent = REAGENT_ID_NUTRIMENT//Dionae are plants, so eating them doesn't give animal protein /mob/living/simple_mob/slime composition_reagent = "slimejelly" @@ -5009,7 +5009,7 @@ /obj/item/reagent_containers/food/snacks/funnelcake/Initialize() . = ..() reagents.add_reagent("batter", 10) - reagents.add_reagent("sugar", 5) + reagents.add_reagent(REAGENT_ID_SUGAR, 5) /obj/item/reagent_containers/food/snacks/spreads name = "nutri-spread" @@ -5031,7 +5031,7 @@ /obj/item/reagent_containers/food/snacks/spreads/Initialize() . = ..() reagents.add_reagent("triglyceride", 20) - reagents.add_reagent("sodiumchloride",1) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE,1) /obj/item/reagent_containers/food/snacks/rawcutlet/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/material/knife)) @@ -6190,7 +6190,7 @@ /obj/item/reagent_containers/food/snacks/candy/Initialize() . = ..() - reagents.add_reagent("sugar", 3) + reagents.add_reagent(REAGENT_ID_SUGAR, 3) /obj/item/reagent_containers/food/snacks/namagashi name = "\improper Ryo-kucha Namagashi" @@ -6206,7 +6206,7 @@ /obj/item/reagent_containers/food/snacks/namagashi/Initialize() . = ..() - reagents.add_reagent("sugar", 2) + reagents.add_reagent(REAGENT_ID_SUGAR, 2) /obj/item/reagent_containers/food/snacks/candy/proteinbar name = "\improper SwoleMAX protein bar" @@ -6222,7 +6222,7 @@ /obj/item/reagent_containers/food/snacks/candy/proteinbar/Initialize() . = ..() reagents.add_reagent("protein", 4) - reagents.add_reagent("sugar", 4) + reagents.add_reagent(REAGENT_ID_SUGAR, 4) /obj/item/reagent_containers/food/snacks/candy/gummy name = "\improper AlliCo Gummies" @@ -6237,7 +6237,7 @@ /obj/item/reagent_containers/food/snacks/candy/gummy/Initialize() . = ..() - reagents.add_reagent("sugar", 5) + reagents.add_reagent(REAGENT_ID_SUGAR, 5) /obj/item/reagent_containers/food/snacks/cookiesnack name = "Carps Ahoy! miniature cookies" @@ -6259,12 +6259,12 @@ icon_state = "fruitbar" trash = /obj/item/trash/candy/fruitbar nutriment_amt = 13 - nutriment_desc = list("apricot" = 2, "sugar" = 2, "dates" = 2, "cranberry" = 2, "apple" = 2) + nutriment_desc = list("apricot" = 2, REAGENT_ID_SUGAR = 2, "dates" = 2, "cranberry" = 2, "apple" = 2) bitesize = 6 /obj/item/reagent_containers/food/snacks/fruitbar/Initialize() . = ..() - reagents.add_reagent("sugar", 4) + reagents.add_reagent(REAGENT_ID_SUGAR, 4) ///////////////////////////////////////////////////////////////////////////// //////////////////////////////Candy Bars (1-10)////////////////////////////// @@ -6285,7 +6285,7 @@ /obj/item/reagent_containers/food/snacks/cb01/Initialize() . = ..() - reagents.add_reagent("sugar", 1) + reagents.add_reagent(REAGENT_ID_SUGAR, 1) /obj/item/reagent_containers/food/snacks/cb02 name = "\improper Hundred-Thousand Thaler Bar" @@ -6302,7 +6302,7 @@ /obj/item/reagent_containers/food/snacks/cb02/Initialize() . = ..() - reagents.add_reagent("sugar", 1) + reagents.add_reagent(REAGENT_ID_SUGAR, 1) /obj/item/reagent_containers/food/snacks/cb03 name = "\improper Aerostat Bar" @@ -6319,7 +6319,7 @@ /obj/item/reagent_containers/food/snacks/cb03/Initialize() . = ..() - reagents.add_reagent("sugar", 1) + reagents.add_reagent(REAGENT_ID_SUGAR, 1) /obj/item/reagent_containers/food/snacks/cb04 name = "\improper Lars' Saltlakris" @@ -6336,7 +6336,7 @@ /obj/item/reagent_containers/food/snacks/cb04/Initialize() . = ..() - reagents.add_reagent("sugar", 1) + reagents.add_reagent(REAGENT_ID_SUGAR, 1) /obj/item/reagent_containers/food/snacks/cb05 name = "\improper Andromeda Bar" @@ -6353,7 +6353,7 @@ /obj/item/reagent_containers/food/snacks/cb05/Initialize() . = ..() - reagents.add_reagent("sugar", 3) + reagents.add_reagent(REAGENT_ID_SUGAR, 3) /obj/item/reagent_containers/food/snacks/cb06 name = "\improper Mocha Crunch" @@ -6370,7 +6370,7 @@ /obj/item/reagent_containers/food/snacks/cb06/Initialize() . = ..() - reagents.add_reagent("sugar", 1) + reagents.add_reagent(REAGENT_ID_SUGAR, 1) reagents.add_reagent("coffee", 1) /obj/item/reagent_containers/food/snacks/cb07 @@ -6388,7 +6388,7 @@ /obj/item/reagent_containers/food/snacks/cb07/Initialize() . = ..() - reagents.add_reagent("sugar", 1) + reagents.add_reagent(REAGENT_ID_SUGAR, 1) /obj/item/reagent_containers/food/snacks/cb08 name = "\improper Cronk Bar" @@ -6405,7 +6405,7 @@ /obj/item/reagent_containers/food/snacks/cb08/Initialize() . = ..() - reagents.add_reagent("sugar", 2) + reagents.add_reagent(REAGENT_ID_SUGAR, 2) /obj/item/reagent_containers/food/snacks/cb09 name = "\improper Kaju Mamma! Bar" @@ -6422,7 +6422,7 @@ /obj/item/reagent_containers/food/snacks/cb09/Initialize() . = ..() - reagents.add_reagent("sugar", 1) + reagents.add_reagent(REAGENT_ID_SUGAR, 1) reagents.add_reagent("milk", 1) reagents.add_reagent("peanutoil", 1) @@ -6441,7 +6441,7 @@ /obj/item/reagent_containers/food/snacks/cb10/Initialize() . = ..() - reagents.add_reagent("sugar", 1) + reagents.add_reagent(REAGENT_ID_SUGAR, 1) reagents.add_reagent("protein", 1) reagents.add_reagent("peanutoil", 1) @@ -6664,7 +6664,7 @@ // ///obj/item/reagent_containers/food/snacks/spacetwinkie/Initialize() // . = ..() -// reagents.add_reagent("sugar", 4) +// reagents.add_reagent(REAGENT_ID_SUGAR, 4) /obj/item/reagent_containers/food/snacks/cheesiehonkers name = "Cheesie Honkers" @@ -6936,12 +6936,12 @@ /obj/item/reagent_containers/food/snacks/old/Initialize() .=..() reagents.add_reagent(pick(list( - "fuel", + REAGENT_ID_FUEL, "amatoxin", "carpotoxin", "zombiepowder", "cryptobiolin", - "psilocybin")), 5) + REAGENT_ID_PSILOCYBIN)), 5) reagents.add_reagent("salmonella", 5) /obj/item/reagent_containers/food/snacks/old/pizza @@ -6997,7 +6997,7 @@ /obj/item/reagent_containers/food/snacks/canned/beef/Initialize() .=..() reagents.add_reagent("protein", 4) - reagents.add_reagent("sodiumchloride", 2) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2) /obj/item/reagent_containers/food/snacks/canned/beans name = "baked beans" @@ -7027,7 +7027,7 @@ /obj/item/reagent_containers/food/snacks/canned/tomato/Initialize() .=..() - reagents.add_reagent("tomato_soup", 12) + reagents.add_reagent(REAGENT_ID_TOMATOSOUP, 12) /obj/item/reagent_containers/food/snacks/canned/spinach name = "spinach" @@ -7044,7 +7044,7 @@ .=..() reagents.add_reagent("adrenaline", 4) reagents.add_reagent("hyperzine", 4) - reagents.add_reagent("iron", 4) + reagents.add_reagent(REAGENT_ID_IRON, 4) //////////////////////////////Advanced Canned Food////////////////////////////// @@ -7092,7 +7092,7 @@ /obj/item/reagent_containers/food/snacks/canned/maps/Initialize() . = ..() reagents.add_reagent("protein", 6) - reagents.add_reagent("sodiumchloride", 2) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2) /obj/item/reagent_containers/food/snacks/canned/appleberry name = "\improper Appleberry Bits" @@ -7108,7 +7108,7 @@ /obj/item/reagent_containers/food/snacks/canned/appleberry/Initialize() . = ..() reagents.add_reagent("milk", 8) - reagents.add_reagent("sugar", 5) + reagents.add_reagent(REAGENT_ID_SUGAR, 5) /obj/item/reagent_containers/food/snacks/canned/ntbeans name = "baked beans" @@ -7137,7 +7137,7 @@ filling_color = "#caa3c9" center_of_mass = list("x"=15, "y"=9) bitesize = 2 - var/brainmeat = "brain_protein" + var/brainmeat = REAGENT_ID_BRAINPROTEIN /obj/item/reagent_containers/food/snacks/canned/brainzsnax/Initialize() . = ..() @@ -7155,7 +7155,7 @@ filling_color = "#a6898d" center_of_mass = list("x"=15, "y"=9) bitesize = 2 - brainmeat = "red_brain_protein" + brainmeat = REAGENT_ID_REDBRAINPROTEIN //////////////Packaged Food - break open and eat////////////// @@ -7221,7 +7221,7 @@ /obj/item/reagent_containers/food/snacks/packaged/spacetwinkie/Initialize() . = ..() - reagents.add_reagent("sugar", 4) + reagents.add_reagent(REAGENT_ID_SUGAR, 4) /obj/item/reagent_containers/food/snacks/packaged/genration name = "generic ration" @@ -7277,7 +7277,7 @@ /obj/item/reagent_containers/food/snacks/packaged/sweetration/Initialize() . = ..() - reagents.add_reagent("sugar", 6) + reagents.add_reagent(REAGENT_ID_SUGAR, 6) /obj/item/reagent_containers/food/snacks/packaged/vendburger name = "packaged burger" @@ -7290,7 +7290,7 @@ /obj/item/reagent_containers/food/snacks/packaged/vendburger/Initialize() . = ..() - reagents.add_reagent("sodiumchloride", 1) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) /obj/item/reagent_containers/food/snacks/packaged/vendhotdog name = "packaged hotdog" @@ -7303,7 +7303,7 @@ /obj/item/reagent_containers/food/snacks/packaged/vendhotdog/Initialize() . = ..() - reagents.add_reagent("sodiumchloride", 1) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) /obj/item/reagent_containers/food/snacks/packaged/vendburrito name = "packaged burrito" @@ -7316,4 +7316,4 @@ /obj/item/reagent_containers/food/snacks/packaged/vendburrito/Initialize() . = ..() - reagents.add_reagent("sodiumchloride", 1) + reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm index 90f1088534..8cecbf1977 100644 --- a/code/modules/food/food/snacks/meat.dm +++ b/code/modules/food/food/snacks/meat.dm @@ -80,7 +80,7 @@ /obj/item/reagent_containers/food/snacks/hugemushroomslice/Initialize() . = ..() - reagents.add_reagent("psilocybin", 3) + reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3) /obj/item/reagent_containers/food/snacks/tomatomeat name = "tomato slice" @@ -116,7 +116,7 @@ /obj/item/reagent_containers/food/snacks/xenomeat/Initialize() . = ..() reagents.add_reagent("protein", 6) - reagents.add_reagent("pacid",6) + reagents.add_reagent(REAGENT_ID_PACID,6) /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat. name = "insect meat" @@ -128,8 +128,8 @@ /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize() . = ..() - reagents.add_reagent("spidertoxin",6) - reagents.remove_reagent("pacid",6) + reagents.add_reagent(REAGENT_ID_SPIDERTOXIN,6) + reagents.remove_reagent(REAGENT_ID_PACID,6) /obj/item/reagent_containers/food/snacks/rawturkey name = "raw turkey" diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index fbc04990f8..5e1fea294b 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -38,7 +38,7 @@ /obj/item/reagent_containers/food/snacks/goulash/Initialize() . = ..() reagents.add_reagent("protein", 3) //For meaty things. - reagents.add_reagent("water", 5) + reagents.add_reagent(REAGENT_ID_WATER, 5) /obj/item/reagent_containers/food/snacks/donerkebab @@ -79,7 +79,7 @@ /obj/item/reagent_containers/food/snacks/reishicup/Initialize() . = ..() - reagents.add_reagent("psilocybin", 3) + reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 3) bitesize = 6 /obj/item/storage/box/wings //This is kinda like the donut box. @@ -134,7 +134,7 @@ /obj/item/reagent_containers/food/snacks/hotandsoursoup/Initialize() . = ..() bitesize = 2 - reagents.add_reagent("hot_n_sour_soup", 10) + reagents.add_reagent(REAGENT_ID_HOTNSOURSOUP, 10) /obj/item/reagent_containers/food/snacks/kitsuneudon name = "kitsune udon" @@ -178,7 +178,7 @@ /obj/item/reagent_containers/food/snacks/bugball/Initialize() . = ..() reagents.add_reagent("protein", 1) - reagents.add_reagent("carbon", 5) + reagents.add_reagent(REAGENT_ID_CARBON, 5) bitesize = 7 /obj/item/reagent_containers/food/snacks/pillbug @@ -207,7 +207,7 @@ /obj/item/reagent_containers/food/snacks/pillbug/Initialize() . = ..() reagents.add_reagent("protein", 1) - reagents.add_reagent("carbon", 5) + reagents.add_reagent(REAGENT_ID_CARBON, 5) bitesize = 3 /obj/item/reagent_containers/food/snacks/mammi @@ -263,7 +263,7 @@ bitesize = 5 reagents.add_reagent("protein", 20) reagents.add_reagent("tricordrazine", 5) - reagents.add_reagent("iron", 5) + reagents.add_reagent(REAGENT_ID_IRON, 5) /obj/item/reagent_containers/food/snacks/cuttlefish name = "raw cuttlefish" @@ -343,7 +343,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/monkfishremains/Initialize() . = ..() bitesize = 0.01 //impossible to eat - reagents.add_reagent("carbon", 5) + reagents.add_reagent(REAGENT_ID_CARBON, 5) /obj/item/reagent_containers/food/snacks/sliceable/sharkchunk name = "chunk of shark meat" @@ -472,14 +472,14 @@ qdel(src) /obj/item/reagent_containers/food/snacks/cube/on_reagent_change() - if(reagents.has_reagent("water")) + if(reagents.has_reagent(REAGENT_ID_WATER)) Expand() /obj/item/reagent_containers/food/snacks/cube/protein /obj/item/reagent_containers/food/snacks/cube/protein/Initialize() . = ..() - reagents.add_reagent("meatcolony", 5) + reagents.add_reagent(REAGENT_ID_MEATCOLONY, 5) /obj/item/reagent_containers/food/snacks/proteinslab name = "Protein slab" @@ -502,7 +502,7 @@ /obj/item/reagent_containers/food/snacks/cube/nutriment/Initialize() . = ..() - reagents.add_reagent("plantcolony", 5) + reagents.add_reagent(REAGENT_ID_PLANTCOLONY, 5) /obj/item/reagent_containers/food/snacks/nutrimentslab name = "Nutriment slab" @@ -561,7 +561,7 @@ /obj/item/reagent_containers/food/snacks/nachos/Initialize() . = ..() - reagents.add_reagent("nutriment", 1) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 1) bitesize = 1 /obj/item/reagent_containers/food/snacks/cheesenachos @@ -573,7 +573,7 @@ /obj/item/reagent_containers/food/snacks/cheesenachos/Initialize() . = ..() - reagents.add_reagent("nutriment", 5) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5) reagents.add_reagent("protein", 2) bitesize = 2 @@ -590,7 +590,7 @@ /obj/item/reagent_containers/food/snacks/milosoup/Initialize() . = ..() - reagents.add_reagent("water", 5) + reagents.add_reagent(REAGENT_ID_WATER, 5) /obj/item/reagent_containers/food/snacks/onionsoup name = "Onion Soup" @@ -604,7 +604,7 @@ /obj/item/reagent_containers/food/snacks/onionsoup/Initialize() . = ..() - reagents.add_reagent("onion_soup", 10) + reagents.add_reagent(REAGENT_ID_ONIONSOUP, 10) //Fennec foods /obj/item/storage/box/wings/bucket @@ -691,7 +691,7 @@ /obj/item/reagent_containers/food/snacks/scorpion_cooked/Initialize() . = ..() - reagents.add_reagent("nutriment", 2) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 2) reagents.add_reagent("protein", 4) bitesize = 4 @@ -736,7 +736,7 @@ /obj/item/reagent_containers/food/snacks/honey_candy/Initialize() . = ..() - reagents.add_reagent("sugar", 2) + reagents.add_reagent(REAGENT_ID_SUGAR, 2) bitesize = 2 /obj/item/reagent_containers/food/snacks/locust @@ -981,28 +981,28 @@ w_class = ITEMSIZE_TINY nutriment_amt = 1 bitesize = 2 - nutriment_desc = list("sugar" = 5, "berry" = 2) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, "berry" = 2) /obj/item/reagent_containers/food/snacks/winegum/orange icon_state = "winegum_orange" - nutriment_desc = list("sugar" = 5, "orange" = 2) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, "orange" = 2) /obj/item/reagent_containers/food/snacks/winegum/black icon_state = "winegum_black" - nutriment_desc = list("sugar" = 5, "berry" = 2) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, "berry" = 2) /obj/item/reagent_containers/food/snacks/winegum/green icon_state = "winegum_green" - nutriment_desc = list("sugar" = 5, "lime" = 2) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, "lime" = 2) /obj/item/reagent_containers/food/snacks/winegum/yellow icon_state = "winegum_yellow" - nutriment_desc = list("sugar" = 5, "lemon" = 2) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, "lemon" = 2) /obj/item/reagent_containers/food/snacks/winegum/white icon_state = "winegum_white" - nutriment_desc = list("sugar" = 5, "pineapplejuice" = 2) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, "pineapplejuice" = 2) /obj/item/storage/box/winegum //This is kinda like the donut box. name = "Desatti Wine Gums" @@ -1044,7 +1044,7 @@ w_class = ITEMSIZE_TINY nutriment_amt = 1 bitesize = 2 - nutriment_desc = list("sugar" = 5) + nutriment_desc = list(REAGENT_ID_SUGAR = 5) var/list/color_options = list("saucer_pink","saucer_blue","saucer_orange","saucer_green","saucer_yellow") /obj/item/reagent_containers/food/snacks/saucer/Initialize() @@ -1149,7 +1149,7 @@ w_class = ITEMSIZE_TINY nutriment_amt = 1 bitesize = 2 - nutriment_desc = list("sugar" = 5, "banana" = 3) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, "banana" = 3) /obj/item/reagent_containers/food/snacks/foam_shrimp name = "Foam Shrimp" @@ -1159,7 +1159,7 @@ w_class = ITEMSIZE_TINY nutriment_amt = 1 bitesize = 2 - nutriment_desc = list("sugar" = 5, "strawberry" = 3) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, "strawberry" = 3) /obj/item/storage/box/shrimpsandbananas //This is kinda like the donut box. name = "Shrimps and Bananas" @@ -1184,7 +1184,7 @@ w_class = ITEMSIZE_TINY nutriment_amt = 1 bitesize = 2 - nutriment_desc = list("sugar" = 5, "rhubarb" = 2, "custard" = 2) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, "rhubarb" = 2, "custard" = 2) var/list/color_options = list("rhubarbcustard_1","rhubarbcustard_2") /obj/item/reagent_containers/food/snacks/rhubarbcustard/Initialize() diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm index 74f94c5575..9d6edf9e89 100644 --- a/code/modules/food/food/superfoods.dm +++ b/code/modules/food/food/superfoods.dm @@ -1,7 +1,7 @@ // Chaos cake /datum/recipe/chaoscake_layerone - reagents = list("flour" = 30,"milk" = 20, "sugar" = 10, "egg" = 9) + reagents = list("flour" = 30,"milk" = 20, REAGENT_ID_SUGAR = 10, "egg" = 9) fruit = list("poisonberries" = 2, "cherries" = 2) items = list( /obj/item/reagent_containers/food/snacks/meat/, @@ -12,7 +12,7 @@ result = /obj/structure/chaoscake /datum/recipe/chaoscake_layertwo - reagents = list("flour" = 30, "milk" = 20, "sugar" = 10, "egg" = 9, ) + reagents = list("flour" = 30, "milk" = 20, REAGENT_ID_SUGAR = 10, "egg" = 9, ) fruit = list("vanilla" = 2, "banana" = 2) items = list( /obj/item/reagent_containers/food/snacks/dough, @@ -23,7 +23,7 @@ result = /obj/item/chaoscake_layer /datum/recipe/chaoscake_layerthree - reagents = list("flour" = 25, "milk" = 15, "sugar" = 10, "egg" = 6, "deathbell" = 10) + reagents = list("flour" = 25, "milk" = 15, REAGENT_ID_SUGAR = 10, "egg" = 6, "deathbell" = 10) fruit = list("grapes" = 3) items = list( /obj/item/reagent_containers/food/snacks/dough, @@ -33,7 +33,7 @@ result = /obj/item/chaoscake_layer/three /datum/recipe/chaoscake_layerfour - reagents = list("flour" = 25, "milk" = 15, "sugar" = 10, "egg" = 6, "milkshake" = 30) + reagents = list("flour" = 25, "milk" = 15, REAGENT_ID_SUGAR = 10, "egg" = 6, "milkshake" = 30) fruit = list("rice" = 3) items = list( /obj/item/reagent_containers/food/snacks/dough, @@ -43,13 +43,13 @@ result = /obj/item/chaoscake_layer/four /datum/recipe/chaoscake_layerfive - reagents = list("flour" = 20, "milk" = 10, "sugar" = 10, "egg" = 6, "blood" = 30) + reagents = list("flour" = 20, "milk" = 10, REAGENT_ID_SUGAR = 10, "egg" = 6, REAGENT_ID_BLOOD = 30) fruit = list("tomato" = 2) items = list() //supposed to be made with lobster, still has to be ported. result = /obj/item/chaoscake_layer/five /datum/recipe/chaoscake_layersix - reagents = list("flour" = 20, "milk" = 10, "sugar" = 10, "egg" = 6, "sprinkles" = 5) + reagents = list("flour" = 20, "milk" = 10, REAGENT_ID_SUGAR = 10, "egg" = 6, "sprinkles" = 5) fruit = list("apple" = 2) items = list( /obj/item/reagent_containers/food/snacks/dough, @@ -62,7 +62,7 @@ result = /obj/item/chaoscake_layer/six /datum/recipe/chaoscake_layerseven - reagents = list("flour" = 15, "milk" = 10, "sugar" = 5, "egg" = 3, "devilskiss" = 20) + reagents = list("flour" = 15, "milk" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3, "devilskiss" = 20) fruit = list("potato" = 1) items = list( /obj/item/reagent_containers/food/snacks/dough, @@ -72,7 +72,7 @@ result = /obj/item/chaoscake_layer/seven /datum/recipe/chaoscake_layereight - reagents = list("flour" = 15, "milk" = 10, "sugar" = 5, "egg" = 3, "cream" = 20) + reagents = list("flour" = 15, "milk" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3, "cream" = 20) fruit = list("lemon" = 1) items = list( /obj/item/reagent_containers/food/snacks/dough, @@ -82,7 +82,7 @@ result = /obj/item/chaoscake_layer/eight /datum/recipe/chaoscake_layernine - reagents = list("water" = 10, "blood" = 10) + reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_BLOOD = 10) fruit = list("goldapple" = 1) items = list() result = /obj/item/chaoscake_layer/nine @@ -194,24 +194,24 @@ reagents.add_reagent("shockchem", 2) reagents.add_reagent("amatoxin", 2) reagents.add_reagent("carpotoxin", 2) - reagents.add_reagent("spidertoxin", 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("bliss", 10) + 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("psilocybin", 10) + reagents.add_reagent(REAGENT_ID_PSILOCYBIN, 10) bitesize = 30 //even a single bite won't make you escape fate. if(3) name = "Slice Of Evil" //acidic desc = "A menacing slice, smelling clearly of copper, blood clots float on top." nutriment_desc = list("Infernal Rage" = 10) - reagents.add_reagent("blood", 20) + reagents.add_reagent(REAGENT_ID_BLOOD, 20) reagents.add_reagent("stomacid", 10) reagents.add_reagent("mutagen", 4) reagents.add_reagent("thirteenloko", 20) diff --git a/code/modules/food/food/z_custom_food_vr.dm b/code/modules/food/food/z_custom_food_vr.dm index 50c87dcb4e..82eab62aaf 100644 --- a/code/modules/food/food/z_custom_food_vr.dm +++ b/code/modules/food/food/z_custom_food_vr.dm @@ -22,7 +22,7 @@ var/global/ingredientLimit = 20 . = ..() topping = image(icon,,"[initial(icon_state)]_top") filling = image(icon,,"[initial(icon_state)]_filling") - src.reagents.add_reagent("nutriment",3) + src.reagents.add_reagent(REAGENT_ID_NUTRIMENT,3) src.updateName() return diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm index ba16cd6889..1c1fffe6a5 100644 --- a/code/modules/food/glass/bottle.dm +++ b/code/modules/food/glass/bottle.dm @@ -147,7 +147,7 @@ desc = "A small bottle. Contains a small amount of Polytrinic Acid" icon = 'icons/obj/chemical.dmi' icon_state = "bottle-4" - prefill = list("pacid" = 60) + prefill = list(REAGENT_ID_PACID = 60) /obj/item/reagent_containers/glass/bottle/adminordrazine name = "adminordrazine bottle" @@ -175,4 +175,4 @@ desc = "A bottle of raw biomass! Gross!" icon = 'icons/obj/chemical.dmi' icon_state = "bottle-3" - prefill = list("biomass" = 60) \ No newline at end of file + prefill = list("biomass" = 60) diff --git a/code/modules/food/glass/bottle_potion.dm b/code/modules/food/glass/bottle_potion.dm index 274db27da7..6efeffcbc0 100644 --- a/code/modules/food/glass/bottle_potion.dm +++ b/code/modules/food/glass/bottle_potion.dm @@ -45,7 +45,7 @@ /obj/item/reagent_containers/glass/bottle/potion/lightness name = "feather weight potion" desc = "A small green bottle containing some mysterious liquid that claims to make you feel lighter." - prefill = list("ickypak" = 30) + prefill = list(REAGENT_ID_ICKYPAK = 30) /obj/item/reagent_containers/glass/bottle/potion/SOP name = "standard operating potion" @@ -55,12 +55,12 @@ /obj/item/reagent_containers/glass/bottle/potion/shrink name = "diminution potion" desc = "A small green bottle containing some swirling cyan liquid that claims to reduce the drinkers stature." - prefill = list("microcillin" = 1) + prefill = list(REAGENT_ID_MICROCILLIN = 1) /obj/item/reagent_containers/glass/bottle/potion/growth name = "fire giant potion" desc = "A small green bottle containing some bubbling yellow liquid that claims to turn the drinker into a fire giant." - prefill = list("macrocillin" = 1, "capsaicin" = 5) + prefill = list(REAGENT_ID_MACROCILLIN = 1, "capsaicin" = 5) /obj/item/reagent_containers/glass/bottle/potion/pain name = "grit potion" @@ -70,12 +70,12 @@ /obj/item/reagent_containers/glass/bottle/potion/faerie name = "faerie dance potion" desc = "A small green bottle containing some swishing pink liquid that claims to help you open your mind." - prefill = list("psilocybin" = 30) + prefill = list(REAGENT_ID_PSILOCYBIN = 30) /obj/item/reagent_containers/glass/bottle/potion/relaxation name = "relaxation potion" desc = "A small green bottle containing some still green liquid that claims to make everything feel just fine, really." - prefill = list("ambrosia_extract" = 30) + prefill = list(REAGENT_ID_AMBROSIAEXTRACT = 30) /obj/item/reagent_containers/glass/bottle/potion/speed name = "blinding speed potion" @@ -90,12 +90,12 @@ /obj/item/reagent_containers/glass/bottle/potion/girljuice name = "girl transformation potion" desc = "A small green bottle containing some pretty pink liquid that claims to turn the drinker into a woman." - prefill = list("gynorovir" = 1) + prefill = list(REAGENT_ID_GYNOROVIR = 1) /obj/item/reagent_containers/glass/bottle/potion/boyjuice name = "boy transformation potion" desc = "A small green bottle containing some strong blue liquid that claims to turn the drinker into a man." - prefill = list("androrovir" = 1) + prefill = list(REAGENT_ID_ANDROROVIR = 1) /obj/item/reagent_containers/glass/bottle/potion/badpolymorph name = "unstable polymorph potion" @@ -122,17 +122,17 @@ /obj/item/reagent_containers/glass/bottle/potion/plain name = "plain potion" desc = "A small green bottle containing some plain transparent liquid." - prefill = list("water" = 30) + prefill = list(REAGENT_ID_WATER = 30) /obj/item/reagent_containers/glass/bottle/potion/ethanol name = "thin potion" desc = "A small green bottle containing some thin transparent liquid with a solvent scent." - prefill = list("ethanol" = 30) + prefill = list(REAGENT_ID_ETHANOL = 30) /obj/item/reagent_containers/glass/bottle/potion/sugar name = "sweet potion" desc = "A small green bottle containing some white translucent liquid with a sweet scent." - prefill = list("sugar" = 30) + prefill = list(REAGENT_ID_SUGAR = 30) /obj/item/reagent_containers/glass/bottle/potion/capsaicin name = "warm potion" diff --git a/code/modules/food/glass/bottle_vr.dm b/code/modules/food/glass/bottle_vr.dm index 18d8f9201a..0a3c4c11a6 100644 --- a/code/modules/food/glass/bottle_vr.dm +++ b/code/modules/food/glass/bottle_vr.dm @@ -136,14 +136,14 @@ desc = "A small bottle of ickypak. The smell alone makes you gag." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-3" - prefill = list("ickypak" = 60) + prefill = list(REAGENT_ID_ICKYPAK = 60) /obj/item/reagent_containers/glass/bottle/unsorbitol name = "unsorbitol bottle" desc = "A small bottle of unsorbitol. Sickeningly sweet." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-3" - prefill = list("unsorbitol" = 60) + prefill = list(REAGENT_ID_UNSORBITOL = 60) /obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose name = "glucose container" diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm index 6d95e881cd..067006e956 100644 --- a/code/modules/food/kitchen/cooking_machines/_appliance.dm +++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm @@ -716,16 +716,16 @@ /mob/living/proc/calculate_composition() // moved from devour.dm on aurora's side if (!composition_reagent)//if no reagent has been set, then we'll set one if (isSynthetic()) - src.composition_reagent = "iron" + src.composition_reagent = REAGENT_ID_IRON else if(istype(src, /mob/living/carbon/human/diona) || istype(src, /mob/living/carbon/alien/diona)) - src.composition_reagent = "nutriment" // diona are plants, not meat + src.composition_reagent = REAGENT_ID_NUTRIMENT // diona are plants, not meat else src.composition_reagent = "protein" if(istype(src, /mob/living/carbon/human)) var/mob/living/carbon/human/H = src if(istype(H.species, /datum/species/diona)) - src.composition_reagent = "nutriment" + src.composition_reagent = REAGENT_ID_NUTRIMENT //if the mob is a simple animal - MOB NOT ANIMAL - with a defined meat quantity if (istype(src, /mob/living/simple_mob)) diff --git a/code/modules/food/kitchen/gibber.dm b/code/modules/food/kitchen/gibber.dm index bd9379bf52..e3edfe0ba6 100644 --- a/code/modules/food/kitchen/gibber.dm +++ b/code/modules/food/kitchen/gibber.dm @@ -209,7 +209,7 @@ var/obj/item/reagent_containers/food/snacks/meat/new_meat = new slab_type(src, rand(3,8)) if(istype(new_meat)) new_meat.name = "[slab_name] [new_meat.name]" - new_meat.reagents.add_reagent("nutriment",slab_nutrition) + new_meat.reagents.add_reagent(REAGENT_ID_NUTRIMENT,slab_nutrition) if(src.occupant.reagents) src.occupant.reagents.trans_to_obj(new_meat, round(occupant.reagents.total_volume/(2 + occupant.meat_amount),1)) diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm index 6d48a6e698..fa9ac03798 100644 --- a/code/modules/food/kitchen/icecream.dm +++ b/code/modules/food/kitchen/icecream.dm @@ -30,9 +30,9 @@ if(ICECREAM_BLUE) return list("milk", "ice", "singulo") if(CONE_WAFFLE) - return list("flour", "sugar") + return list("flour", REAGENT_ID_SUGAR) if(CONE_CHOC) - return list("flour", "sugar", "coco") + return list("flour", REAGENT_ID_SUGAR, "coco") else return list("milk", "ice") @@ -58,7 +58,7 @@ product_types.Add(5) reagents.add_reagent("milk", 5) reagents.add_reagent("flour", 5) - reagents.add_reagent("sugar", 5) + reagents.add_reagent(REAGENT_ID_SUGAR, 5) reagents.add_reagent("ice", 5) /obj/machinery/icecream_vat/attack_hand(mob/user as mob) @@ -98,7 +98,7 @@ // if(beaker) // beaker.reagents.trans_to(I, 10) if(I.reagents.total_volume < 10) - I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume) + I.reagents.add_reagent(REAGENT_ID_SUGAR, 10 - I.reagents.total_volume) else to_chat(user, span_warning("There is not enough icecream left!")) else @@ -179,7 +179,7 @@ /obj/item/reagent_containers/food/snacks/icecream/New() create_reagents(20) - reagents.add_reagent("nutriment", 5) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5) /obj/item/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour_name) name = "[flavour_name] icecream" diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index eeadee61e7..0f239316a2 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -552,7 +552,7 @@ qdel(H.held_mob) qdel(O) src.reagents.clear_reagents() - ffuu.reagents.add_reagent("carbon", amount) + ffuu.reagents.add_reagent(REAGENT_ID_CARBON, amount) ffuu.reagents.add_reagent("toxin", amount/10) return ffuu diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm index ce4f32982f..c288a140bb 100644 --- a/code/modules/food/recipes_fryer.dm +++ b/code/modules/food/recipes_fryer.dm @@ -22,7 +22,7 @@ /datum/recipe/risottoballs appliance = FRYER - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) items = list(/obj/item/reagent_containers/food/snacks/risotto) coating = /datum/reagent/nutriment/coating/batter reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product @@ -32,7 +32,7 @@ /datum/recipe/bellefritter appliance = FRYER coating = /datum/reagent/nutriment/coating/batter - reagents = list("sugar" = 5) + reagents = list(REAGENT_ID_SUGAR = 5) items = list(/obj/item/reagent_containers/food/snacks/frostbelle) result = /obj/item/reagent_containers/food/snacks/bellefritter result_quantity = 2 @@ -128,7 +128,7 @@ // All donuts were given reagents of 5 to equal old recipes and make for faster cook times. /datum/recipe/jellydonut appliance = FRYER - reagents = list("berryjuice" = 5, "sugar" = 5) + reagents = list("berryjuice" = 5, REAGENT_ID_SUGAR = 5) items = list( /obj/item/reagent_containers/food/snacks/doughslice ) @@ -136,23 +136,23 @@ result_quantity = 2 /datum/recipe/jellydonut/poisonberry - reagents = list("poisonberryjuice" = 5, "sugar" = 5) + reagents = list("poisonberryjuice" = 5, REAGENT_ID_SUGAR = 5) items = list( /obj/item/reagent_containers/food/snacks/dough ) 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, "sugar" = 5) + reagents = list("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. - reagents = list("cherryjelly" = 5, "sugar" = 5) + reagents = list("cherryjelly" = 5, REAGENT_ID_SUGAR = 5) result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly /datum/recipe/donut appliance = FRYER - reagents = list("sugar" = 5) + reagents = list(REAGENT_ID_SUGAR = 5) items = list( /obj/item/reagent_containers/food/snacks/doughslice ) @@ -161,7 +161,7 @@ /datum/recipe/chaosdonut appliance = FRYER - reagents = list("frostoil" = 10, "capsaicin" = 10, "sugar" = 10) + reagents = list("frostoil" = 10, "capsaicin" = 10, REAGENT_ID_SUGAR = 10) reagent_mix = RECIPE_REAGENT_REPLACE //This creates its own reagents items = list( /obj/item/reagent_containers/food/snacks/doughslice @@ -171,7 +171,7 @@ /datum/recipe/funnelcake appliance = FRYER - reagents = list("sugar" = 5, "batter" = 10) + reagents = list(REAGENT_ID_SUGAR = 5, "batter" = 10) result = /obj/item/reagent_containers/food/snacks/funnelcake result_quantity = 2 @@ -185,7 +185,7 @@ //VOREStation Add Start /datum/recipe/generalschicken appliance = FRYER - reagents = list("capsaicin" = 2, "sugar" = 2, "batter" = 10) + reagents = list("capsaicin" = 2, REAGENT_ID_SUGAR = 2, "batter" = 10) items = list( /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat diff --git a/code/modules/food/recipes_fryer_vr.dm b/code/modules/food/recipes_fryer_vr.dm index 6843ffec34..9b2bc5d49d 100644 --- a/code/modules/food/recipes_fryer_vr.dm +++ b/code/modules/food/recipes_fryer_vr.dm @@ -1,6 +1,6 @@ /datum/recipe/generalschicken appliance = FRYER - reagents = list("capsaicin" = 2, "sugar" = 2, "batter" = 10) + reagents = list("capsaicin" = 2, REAGENT_ID_SUGAR = 2, "batter" = 10) items = list( /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat @@ -30,8 +30,8 @@ /datum/recipe/locust appliance = FRYER - reagents = list("sodiumchloride" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1) items = list( /obj/item/reagent_containers/food/snacks/locust ) - result = /obj/item/reagent_containers/food/snacks/locust_cooked \ No newline at end of file + result = /obj/item/reagent_containers/food/snacks/locust_cooked diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm index a357da8263..ce0e0e6bbe 100644 --- a/code/modules/food/recipes_grill.dm +++ b/code/modules/food/recipes_grill.dm @@ -186,7 +186,7 @@ /datum/recipe/superbiteburger appliance = GRILL fruit = list("tomato" = 1) - reagents = list("sodiumchloride" = 5, "blackpepper" = 5) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 5, "blackpepper" = 5) items = list( /obj/item/reagent_containers/food/snacks/bigbiteburger, /obj/item/reagent_containers/food/snacks/dough, @@ -247,17 +247,17 @@ /datum/recipe/omurice/heart appliance = GRILL - reagents = list("rice" = 5, "ketchup" = 5, "sugar" = 5, "egg" = 3) + reagents = list("rice" = 5, "ketchup" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3) result = /obj/item/reagent_containers/food/snacks/omurice/heart /datum/recipe/omurice/face appliance = GRILL - reagents = list("rice" = 5, "ketchup" = 5, "sodiumchloride" = 1, "egg" = 3) + reagents = list("rice" = 5, "ketchup" = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "egg" = 3) result = /obj/item/reagent_containers/food/snacks/omurice/face /datum/recipe/meatsteak appliance = GRILL - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) items = list(/obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/meatsteak diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 90af4ee63f..f2b7399431 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -20,14 +20,14 @@ I said no! */ /datum/recipe/friedegg - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) items = list( /obj/item/reagent_containers/food/snacks/egg ) result = /obj/item/reagent_containers/food/snacks/friedegg /datum/recipe/boiledegg - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) reagent_mix = RECIPE_REAGENT_REPLACE items = list( /obj/item/reagent_containers/food/snacks/egg @@ -36,7 +36,7 @@ I said no! /datum/recipe/devilledegg fruit = list("chili" = 1) - reagents = list("sodiumchloride" = 2, "mayo" = 5) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "mayo" = 5) items = list( /obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/egg @@ -67,7 +67,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/donkpocket //SPECIAL /datum/recipe/muffin - reagents = list("milk" = 5, "sugar" = 5) + reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5) reagent_mix = RECIPE_REAGENT_REPLACE items = list( /obj/item/reagent_containers/food/snacks/dough, @@ -146,7 +146,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/cheesymash /datum/recipe/blackpudding - reagents = list("blood" = 5) + reagents = list(REAGENT_ID_BLOOD = 5) items = list( /obj/item/reagent_containers/food/snacks/sausage, ) @@ -157,7 +157,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/popcorn /datum/recipe/fortunecookie - reagents = list("sugar" = 5) + reagents = list(REAGENT_ID_SUGAR = 5) items = list( /obj/item/reagent_containers/food/snacks/doughslice, /obj/item/paper, @@ -165,16 +165,16 @@ I said no! result = /obj/item/reagent_containers/food/snacks/fortunecookie /datum/recipe/syntisteak - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) items = list(/obj/item/reagent_containers/food/snacks/meat/syntiflesh) result = /obj/item/reagent_containers/food/snacks/meatsteak /datum/recipe/spacylibertyduff - reagents = list("water" = 5, "vodka" = 5, "psilocybin" = 5) + reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, REAGENT_ID_PSILOCYBIN = 5) result = /obj/item/reagent_containers/food/snacks/spacylibertyduff /datum/recipe/amanitajelly - reagents = list("water" = 5, "vodka" = 5, "amatoxin" = 5) + reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, "amatoxin" = 5) result = /obj/item/reagent_containers/food/snacks/amanitajelly /datum/recipe/amanitajelly/make_food(var/obj/container as obj) @@ -184,22 +184,22 @@ I said no! /datum/recipe/meatballsoup fruit = list("carrot" = 1, "potato" = 1) - reagents = list("water" = 10) + reagents = list(REAGENT_ID_WATER = 10) items = list(/obj/item/reagent_containers/food/snacks/meatball) result = /obj/item/reagent_containers/food/snacks/meatballsoup /datum/recipe/vegetablesoup fruit = list("carrot" = 1, "potato" = 1, "corn" = 1, "eggplant" = 1) - reagents = list("water" = 10) + reagents = list(REAGENT_ID_WATER = 10) result = /obj/item/reagent_containers/food/snacks/vegetablesoup /datum/recipe/nettlesoup fruit = list("nettle" = 1, "potato" = 1) - reagents = list("water" = 10, "egg" = 3) + reagents = list(REAGENT_ID_WATER = 10, "egg" = 3) result = /obj/item/reagent_containers/food/snacks/nettlesoup /datum/recipe/wishsoup - reagents = list("water" = 20) + reagents = list(REAGENT_ID_WATER = 20) result= /obj/item/reagent_containers/food/snacks/wishsoup /datum/recipe/hotchili @@ -250,11 +250,11 @@ I said no! /datum/recipe/tomatosoup fruit = list("tomato" = 2) - reagents = list("water" = 10) + reagents = list(REAGENT_ID_WATER = 10) result = /obj/item/reagent_containers/food/snacks/tomatosoup /datum/recipe/rofflewaffles - reagents = list("psilocybin" = 5, "sugar" = 10) + reagents = list(REAGENT_ID_PSILOCYBIN = 5, REAGENT_ID_SUGAR = 10) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough, @@ -264,7 +264,7 @@ I said no! /datum/recipe/stew fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "eggplant" = 1, "mushroom" = 1) - reagents = list("water" = 10) + reagents = list(REAGENT_ID_WATER = 10) items = list(/obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/stew @@ -283,7 +283,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry /datum/recipe/milosoup - reagents = list("water" = 10) + reagents = list(REAGENT_ID_WATER = 10) items = list( /obj/item/reagent_containers/food/snacks/soydope, /obj/item/reagent_containers/food/snacks/soydope, @@ -301,14 +301,14 @@ I said no! result = /obj/item/reagent_containers/food/snacks/stewedsoymeat /datum/recipe/boiledspagetti - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/spagetti, ) result = /obj/item/reagent_containers/food/snacks/boiledspagetti /datum/recipe/boiledrice - reagents = list("water" = 5, "rice" = 10) + reagents = list(REAGENT_ID_WATER = 5, "rice" = 10) result = /obj/item/reagent_containers/food/snacks/boiledrice /datum/recipe/ricepudding @@ -317,12 +317,12 @@ I said no! /datum/recipe/pastatomato fruit = list("tomato" = 2) - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) items = list(/obj/item/reagent_containers/food/snacks/spagetti) result = /obj/item/reagent_containers/food/snacks/pastatomato /datum/recipe/meatballspagetti - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/spagetti, /obj/item/reagent_containers/food/snacks/meatball, @@ -331,7 +331,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/meatballspagetti /datum/recipe/spesslaw - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/spagetti, /obj/item/reagent_containers/food/snacks/meatball, @@ -343,12 +343,12 @@ I said no! /datum/recipe/candiedapple fruit = list("apple" = 1) - reagents = list("water" = 5, "sugar" = 5) //Makes sense seeing as how it's just syrup on the exterior + reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SUGAR = 5) //Makes sense seeing as how it's just syrup on the exterior result = /obj/item/reagent_containers/food/snacks/candiedapple /datum/recipe/caramelapple fruit = list("apple" = 1) - reagents = list("milk" = 5, "sugar" = 5) //Since caramel can be made with milk I thought this was appropriate + reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5) //Since caramel can be made with milk I thought this was appropriate result = /obj/item/reagent_containers/food/snacks/caramelapple /datum/recipe/twobread @@ -376,16 +376,16 @@ I said no! result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry /datum/recipe/bloodsoup - reagents = list("blood" = 30) + reagents = list(REAGENT_ID_BLOOD = 30) result = /obj/item/reagent_containers/food/snacks/bloodsoup /datum/recipe/slimesoup - reagents = list("water" = 10, "slimejelly" = 5) + reagents = list(REAGENT_ID_WATER = 10, "slimejelly" = 5) items = list() result = /obj/item/reagent_containers/food/snacks/slimesoup /datum/recipe/boiledslimeextract - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) items = list( /obj/item/slime_extract, ) @@ -415,7 +415,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/kudzudonburi /datum/recipe/mysterysoup - reagents = list("water" = 10, "egg" = 3) + reagents = list(REAGENT_ID_WATER = 10, "egg" = 3) items = list( /obj/item/reagent_containers/food/snacks/badrecipe, /obj/item/reagent_containers/food/snacks/tofu, @@ -426,24 +426,24 @@ I said no! /datum/recipe/plumphelmetbiscuit fruit = list("plumphelmet" = 1) - reagents = list("water" = 5, "flour" = 5) + reagents = list(REAGENT_ID_WATER = 5, "flour" = 5) result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit result_quantity = 2 /datum/recipe/mushroomsoup fruit = list("mushroom" = 1) - reagents = list("water" = 5, "milk" = 5) + reagents = list(REAGENT_ID_WATER = 5, "milk" = 5) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/mushroomsoup /datum/recipe/chawanmushi fruit = list("mushroom" = 1) - reagents = list("water" = 5, "soysauce" = 5, "egg" = 6) + reagents = list(REAGENT_ID_WATER = 5, "soysauce" = 5, "egg" = 6) result = /obj/item/reagent_containers/food/snacks/chawanmushi /datum/recipe/beetsoup fruit = list("whitebeet" = 1, "cabbage" = 1) - reagents = list("water" = 10) + reagents = list(REAGENT_ID_WATER = 10) result = /obj/item/reagent_containers/food/snacks/beetsoup /datum/recipe/tossedsalad @@ -487,7 +487,7 @@ I said no! being_cooked.reagents.del_reagent("toxin") /datum/recipe/stuffing - reagents = list("water" = 5, "sodiumchloride" = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) items = list( /obj/item/reagent_containers/food/snacks/sliceable/bread, ) @@ -510,7 +510,7 @@ I said no! /datum/recipe/onionsoup fruit = list("onion" = 1) - reagents = list("water" = 10) + reagents = list(REAGENT_ID_WATER = 10) result = /obj/item/reagent_containers/food/snacks/soup/onion /datum/recipe/microwavebun @@ -539,7 +539,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/cutlet /datum/recipe/roastedcornsunflowerseeds - reagents = list("sodiumchloride" = 1, "cornoil" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "cornoil" = 1) items = list( /obj/item/reagent_containers/food/snacks/rawsunflower ) @@ -547,7 +547,7 @@ I said no! result_quantity = 2 /datum/recipe/roastedsunflowerseeds - reagents = list("sodiumchloride" = 1, "cookingoil" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "cookingoil" = 1) items = list( /obj/item/reagent_containers/food/snacks/rawsunflower ) @@ -555,7 +555,7 @@ I said no! result_quantity = 2 /datum/recipe/roastedpeanutsunflowerseeds - reagents = list("sodiumchloride" = 1, "peanutoil" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "peanutoil" = 1) items = list( /obj/item/reagent_containers/food/snacks/rawsunflower ) @@ -564,24 +564,24 @@ I said no! /datum/recipe/roastedpeanuts fruit = list("peanut" = 2) - reagents = list("sodiumchloride" = 2, "cookingoil" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "cookingoil" = 1) result = /obj/item/reagent_containers/food/snacks/roastedpeanuts result_quantity = 2 /datum/recipe/roastedpeanutscorn fruit = list("peanut" = 2) - reagents = list("sodiumchloride" = 2, "cornoil" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "cornoil" = 1) result = /obj/item/reagent_containers/food/snacks/roastedpeanuts result_quantity = 2 /datum/recipe/roastedpeanutspeanut fruit = list("peanut" = 2) - reagents = list("sodiumchloride" = 2, "peanutoil" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "peanutoil" = 1) result = /obj/item/reagent_containers/food/snacks/roastedpeanuts result_quantity = 2 /datum/recipe/mint - reagents = list("sugar" = 5, "frostoil" = 5) + reagents = list(REAGENT_ID_SUGAR = 5, "frostoil" = 5) result = /obj/item/reagent_containers/food/snacks/mint /datum/recipe/sashimi @@ -608,12 +608,12 @@ I said no! items = list( /obj/item/reagent_containers/food/snacks/dough ) - reagents = list("sugar" = 5, "egg" = 3) + reagents = list(REAGENT_ID_SUGAR = 5, "egg" = 3) result = /obj/item/reagent_containers/food/snacks/sugarcookie result_quantity = 4 /datum/recipe/berrymuffin - reagents = list("milk" = 5, "sugar" = 5) + reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5) items = list( /obj/item/reagent_containers/food/snacks/dough ) @@ -622,7 +622,7 @@ I said no! result_quantity = 2 /datum/recipe/poisonberrymuffin - reagents = list("milk" = 5, "sugar" = 5) + reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5) items = list( /obj/item/reagent_containers/food/snacks/dough ) @@ -631,7 +631,7 @@ I said no! result_quantity = 2 /datum/recipe/ghostmuffin - reagents = list("milk" = 5, "sugar" = 5) + reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/ectoplasm @@ -641,7 +641,7 @@ I said no! result_quantity = 2 /datum/recipe/poisonghostmuffin - reagents = list("milk" = 5, "sugar" = 5) + reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/ectoplasm @@ -663,11 +663,11 @@ I said no! result = /obj/item/reagent_containers/food/snacks/fruitsalad /datum/recipe/eggbowl - reagents = list("water" = 5, "rice" = 10, "egg" = 3) + reagents = list(REAGENT_ID_WATER = 5, "rice" = 10, "egg" = 3) result = /obj/item/reagent_containers/food/snacks/eggbowl /datum/recipe/porkbowl - reagents = list("water" = 5, "rice" = 10) + reagents = list(REAGENT_ID_WATER = 5, "rice" = 10) items = list( /obj/item/reagent_containers/food/snacks/cutlet ) @@ -694,14 +694,14 @@ I said no! result = /obj/item/reagent_containers/food/snacks/piginblanket /datum/recipe/bagelplain - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/bun ) result = /obj/item/reagent_containers/food/snacks/bagelplain /datum/recipe/bagelsunflower - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/rawsunflower @@ -709,7 +709,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/bagelsunflower /datum/recipe/bagelcheese - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/cheesewedge @@ -717,7 +717,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/bagelcheese /datum/recipe/bagelraisin - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/reagent_containers/food/snacks/no_raisin @@ -726,14 +726,14 @@ I said no! /datum/recipe/bagelpoppy fruit = list("poppy" = 1) - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/bun ) result = /obj/item/reagent_containers/food/snacks/bagelpoppy /datum/recipe/bageleverything - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/fuel_assembly/supermatter @@ -741,7 +741,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/bageleverything /datum/recipe/bageltwo - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/bun, /obj/item/soulstone @@ -786,7 +786,7 @@ I said no! /datum/recipe/bearstew fruit = list("potato" = 1, "tomato" = 1, "carrot" = 1, "eggplant" = 1, "mushroom" = 1) - reagents = list("water" = 10) + reagents = list(REAGENT_ID_WATER = 10) items = list(/obj/item/reagent_containers/food/snacks/bearmeat) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/bearstew @@ -802,13 +802,13 @@ I said no! result = /obj/item/reagent_containers/food/snacks/bibimbap /datum/recipe/friedrice - reagents = list("water" = 5, "rice" = 10, "soysauce" = 5) + reagents = list(REAGENT_ID_WATER = 5, "rice" = 10, "soysauce" = 5) fruit = list("carrot" = 1, "cabbage" = 1) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/friedrice /datum/recipe/lomein - reagents = list("water" = 5, "soysauce" = 5) + reagents = list(REAGENT_ID_WATER = 5, "soysauce" = 5) fruit = list("carrot" = 1, "cabbage" = 1) items = list( /obj/item/reagent_containers/food/snacks/spagetti @@ -818,7 +818,7 @@ I said no! /datum/recipe/chickennoodlesoup fruit = list("carrot" = 1) - reagents = list("water" = 10) + reagents = list(REAGENT_ID_WATER = 10) items = list( /obj/item/reagent_containers/food/snacks/spagetti, /obj/item/reagent_containers/food/snacks/rawcutlet) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/chickennoodlesoup @@ -839,7 +839,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/risotto /datum/recipe/poachedegg - reagents = list("spacespice" = 1, "sodiumchloride" = 1, "blackpepper" = 1, "water" = 5) + reagents = list("spacespice" = 1, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/egg ) @@ -857,7 +857,7 @@ I said no! // Chip update /datum/recipe/microwavetortilla - reagents = list("flour" = 5, "water" = 5) + reagents = list("flour" = 5, REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough ) @@ -874,7 +874,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/taco /datum/recipe/chips - reagents = list("sodiumchloride" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1) items = list( /obj/item/reagent_containers/food/snacks/tortilla ) @@ -889,13 +889,13 @@ I said no! /datum/recipe/salsa fruit = list("chili" = 1, "tomato" = 1, "lime" = 1) - reagents = list("spacespice" = 1, "blackpepper" = 1,"sodiumchloride" = 1) + reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1) result = /obj/item/reagent_containers/food/snacks/dip/salsa reagent_mix = RECIPE_REAGENT_REPLACE //Ingredients are mixed together. /datum/recipe/guac fruit = list("chili" = 1, "lime" = 1) - reagents = list("spacespice" = 1, "blackpepper" = 1,"sodiumchloride" = 1) + reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1) items = list( /obj/item/reagent_containers/food/snacks/tofu ) @@ -904,7 +904,7 @@ I said no! /datum/recipe/cheesesauce fruit = list("chili" = 1, "tomato" = 1) - reagents = list("spacespice" = 1, "blackpepper" = 1,"sodiumchloride" = 1) + reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1) items = list( /obj/item/reagent_containers/food/snacks/cheesewedge ) @@ -1037,7 +1037,7 @@ I said no! /obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/egg ) - reagents = list("blood" = 15) + reagents = list(REAGENT_ID_BLOOD = 15) result = /obj/item/reagent_containers/food/snacks/riztizkzi_sea /datum/recipe/father_breakfast @@ -1116,7 +1116,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/gigapuddi /datum/recipe/gigapuddi/happy - reagents = list("milk" = 15, "sugar" = 5) + reagents = list("milk" = 15, REAGENT_ID_SUGAR = 5) items = list( /obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/egg @@ -1124,7 +1124,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/gigapuddi/happy /datum/recipe/gigapuddi/anger - reagents = list("milk" = 15, "sodiumchloride" = 5) + reagents = list("milk" = 15, REAGENT_ID_SODIUMCHLORIDE = 5) items = list( /obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/egg diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm index 9b53d364da..9e68234e4a 100644 --- a/code/modules/food/recipes_microwave_vr.dm +++ b/code/modules/food/recipes_microwave_vr.dm @@ -30,7 +30,7 @@ /datum/recipe/donerkebab fruit = list("tomato" = 1, "cabbage" = 1) - reagents = list("sodiumchloride" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1) items = list( /obj/item/reagent_containers/food/snacks/meatsteak, /obj/item/reagent_containers/food/snacks/sliceable/flatdough @@ -46,7 +46,7 @@ result = /obj/item/reagent_containers/food/snacks/roastbeef /datum/recipe/reishicup - reagents = list("psilocybin" = 3, "sugar" = 3) + reagents = list(REAGENT_ID_PSILOCYBIN = 3, REAGENT_ID_SUGAR = 3) items = list( /obj/item/reagent_containers/food/snacks/chocolatebar ) @@ -54,7 +54,7 @@ /datum/recipe/hotandsoursoup fruit = list("cabbage" = 1, "mushroom" = 1) - reagents = list("sodiumchloride" = 2, "blackpepper" = 2, "water" = 10) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "blackpepper" = 2, REAGENT_ID_WATER = 10) items = list( /obj/item/reagent_containers/food/snacks/tofu ) @@ -69,7 +69,7 @@ result = /obj/item/reagent_containers/food/snacks/kitsuneudon /datum/recipe/pillbugball - reagents = list("carbon" = 5) + reagents = list(REAGENT_ID_CARBON = 5) items = list( /obj/item/reagent_containers/food/snacks/meat/grubmeat ) @@ -77,7 +77,7 @@ /datum/recipe/mammi fruit = list("orange" = 1) - reagents = list("water" = 10, "flour" = 10, "milk" = 5, "sodiumchloride" = 1) + reagents = list(REAGENT_ID_WATER = 10, "flour" = 10, "milk" = 5, REAGENT_ID_SODIUMCHLORIDE = 1) result = /obj/item/reagent_containers/food/snacks/mammi /datum/recipe/makaroni @@ -121,14 +121,14 @@ result = /obj/item/reagent_containers/food/snacks/monkfishcooked /datum/recipe/sharksteak - reagents = list("blackpepper"= 1, "sodiumchloride" = 1) + reagents = list("blackpepper"= 1, REAGENT_ID_SODIUMCHLORIDE = 1) items = list( /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat ) result = /obj/item/reagent_containers/food/snacks/sharkmeatcooked /datum/recipe/sharkdip - reagents = list("sodiumchloride" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1) fruit = list("chili" = 1) items = list( /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat @@ -136,7 +136,7 @@ result = /obj/item/reagent_containers/food/snacks/sharkmeatdip /datum/recipe/sharkcubes - reagents = list("soysauce" = 5, "sodiumchloride" = 1) + reagents = list("soysauce" = 5, REAGENT_ID_SODIUMCHLORIDE = 1) fruit = list("potato" = 1) items = list( /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat @@ -146,7 +146,7 @@ //// food cubes /datum/recipe/foodcubes - reagents = list("enzyme" = 20, "virusfood" = 5, "nutriment" = 15, "protein" = 15) // labor intensive + reagents = list("enzyme" = 20, "virusfood" = 5, REAGENT_ID_NUTRIMENT = 15, "protein" = 15) // labor intensive items = list() result = /obj/item/storage/box/wings/tray @@ -182,7 +182,7 @@ result = /obj/item/reagent_containers/food/snacks/grub_purple /datum/recipe/honey_candy - reagents = list("sugar" = 5, "nutriment" = 5) + reagents = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_NUTRIMENT = 5) items = list() result = /obj/item/reagent_containers/food/snacks/honey_candy diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index 57a58cb57d..6c6e3ab2aa 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -11,7 +11,7 @@ /datum/recipe/dionaroast appliance = OVEN fruit = list("apple" = 1) - reagents = list("pacid" = 5) //It dissolves the carapace. Still poisonous, though. + reagents = list(REAGENT_ID_PACID = 5) //It dissolves the carapace. Still poisonous, though. items = list(/obj/item/holder/diona) result = /obj/item/reagent_containers/food/snacks/dionaroast reagent_mix = RECIPE_REAGENT_REPLACE //No eating polyacid @@ -19,7 +19,7 @@ /datum/recipe/monkeysdelight appliance = OVEN fruit = list("banana" = 1) - reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, "flour" = 10) items = list( /obj/item/reagent_containers/food/snacks/monkeycube ) @@ -36,7 +36,7 @@ /* OLD RECIPE /datum/recipe/turkey appliance = OVEN - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) items = list( /obj/item/reagent_containers/food/snacks/meat/chicken, /obj/item/reagent_containers/food/snacks/stuffing @@ -47,7 +47,7 @@ /datum/recipe/turkey appliance = OVEN fruit = list("potato" = 1) - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) items = list( /obj/item/reagent_containers/food/snacks/rawturkey, /obj/item/reagent_containers/food/snacks/stuffing @@ -56,7 +56,7 @@ /datum/recipe/tofurkey appliance = OVEN - reagents = list("sodiumchloride" = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) items = list( /obj/item/reagent_containers/food/snacks/tofu, /obj/item/reagent_containers/food/snacks/tofu, @@ -67,7 +67,7 @@ /datum/recipe/zestfish appliance = OVEN fruit = list("lemon" = 1) - reagents = list("sodiumchloride" = 3) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 3) items = list( /obj/item/reagent_containers/food/snacks/carpmeat ) @@ -76,7 +76,7 @@ /datum/recipe/limezestfish appliance = OVEN fruit = list("lime" = 1) - reagents = list("sodiumchloride" = 3) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 3) items = list( /obj/item/reagent_containers/food/snacks/carpmeat ) @@ -91,12 +91,12 @@ /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough ) - reagents = list("sodiumchloride" = 1, "yeast" = 5) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "yeast" = 5) result = /obj/item/reagent_containers/food/snacks/sliceable/bread /datum/recipe/baguette appliance = OVEN - reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "yeast" = 5) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, "yeast" = 5) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough @@ -182,7 +182,7 @@ /datum/recipe/bananabread appliance = OVEN fruit = list("banana" = 1) - reagents = list("milk" = 5, "sugar" = 15) + reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough @@ -228,14 +228,14 @@ /datum/recipe/pie appliance = OVEN fruit = list("banana" = 1) - reagents = list("sugar" = 5) + reagents = list(REAGENT_ID_SUGAR = 5) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) result = /obj/item/reagent_containers/food/snacks/pie /datum/recipe/cherrypie appliance = OVEN fruit = list("cherries" = 1) - reagents = list("sugar" = 10) + reagents = list(REAGENT_ID_SUGAR = 10) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough ) @@ -262,14 +262,14 @@ /datum/recipe/pumpkinpie appliance = OVEN fruit = list("pumpkin" = 1) - reagents = list("sugar" = 5) + reagents = list(REAGENT_ID_SUGAR = 5) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) result = /obj/item/reagent_containers/food/snacks/sliceable/pumpkinpie /datum/recipe/appletart appliance = OVEN fruit = list("goldapple" = 1) - reagents = list("sugar" = 10) + reagents = list(REAGENT_ID_SUGAR = 10) items = list(/obj/item/reagent_containers/food/snacks/sliceable/flatdough) result = /obj/item/reagent_containers/food/snacks/appletart result_quantity = 2 @@ -278,7 +278,7 @@ /datum/recipe/keylimepie appliance = OVEN fruit = list("lime" = 2) - reagents = list("milk" = 5, "sugar" = 5, "egg" = 3, "flour" = 10) + reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3, "flour" = 10) result = /obj/item/reagent_containers/food/snacks/sliceable/keylimepie reagent_mix = RECIPE_REAGENT_REPLACE //No raw egg in finished product, protein after cooking causes magic meatballs otherwise @@ -294,7 +294,7 @@ /datum/recipe/cookie appliance = OVEN - reagents = list("milk" = 10, "sugar" = 10) + reagents = list("milk" = 10, REAGENT_ID_SUGAR = 10) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/chocolatebar @@ -305,7 +305,7 @@ /datum/recipe/ovenfortunecookie appliance = OVEN - reagents = list("sugar" = 5) + reagents = list(REAGENT_ID_SUGAR = 5) items = list( /obj/item/reagent_containers/food/snacks/doughslice, /obj/item/paper @@ -321,7 +321,7 @@ /datum/recipe/cracker appliance = OVEN - reagents = list("sodiumchloride" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1) items = list( /obj/item/reagent_containers/food/snacks/doughslice ) @@ -348,7 +348,7 @@ /datum/recipe/cinnamonbun appliance = OVEN - reagents = list("sugar" = 15, "cream" = 10) + reagents = list(REAGENT_ID_SUGAR = 15, "cream" = 10) items = list( /obj/item/reagent_containers/food/snacks/dough ) @@ -515,7 +515,7 @@ /datum/recipe/pancakes appliance = OVEN - reagents = list("milk" = 5, "sugar" = 15) + reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/sliceable/flatdough @@ -526,7 +526,7 @@ /datum/recipe/pancakes/berry appliance = OVEN fruit = list("berries" = 2) - reagents = list("milk" = 5, "sugar" = 15) + reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/sliceable/flatdough @@ -595,7 +595,7 @@ /datum/recipe/truffle appliance = OVEN - reagents = list("sugar" = 5, "cream" = 5) + reagents = list(REAGENT_ID_SUGAR = 5, "cream" = 5) items = list( /obj/item/reagent_containers/food/snacks/chocolatebar ) @@ -605,7 +605,7 @@ /datum/recipe/croissant appliance = OVEN - reagents = list("sodiumchloride" = 1, "water" = 5, "milk" = 5, "yeast" = 5) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_WATER = 5, "milk" = 5, "yeast" = 5) reagent_mix = RECIPE_REAGENT_REPLACE items = list(/obj/item/reagent_containers/food/snacks/dough) result = /obj/item/reagent_containers/food/snacks/croissant @@ -623,7 +623,7 @@ /datum/recipe/suppermatter appliance = OVEN - reagents = list("radium" = 5, "milk" = 5) + reagents = list(REAGENT_ID_RADIUM = 5, "milk" = 5) items = list( /obj/item/reagent_containers/food/snacks/sliceable/cheesecake ) @@ -632,7 +632,7 @@ /datum/recipe/excitingsuppermatter appliance = OVEN - reagents = list("radium" = 5, "spacespice" = 5) + reagents = list(REAGENT_ID_RADIUM = 5, "spacespice" = 5) items = list( /obj/item/reagent_containers/food/snacks/sliceable/cheesecake ) @@ -641,7 +641,7 @@ /datum/recipe/waffles appliance = OVEN - reagents = list("sugar" = 10) + reagents = list(REAGENT_ID_SUGAR = 10) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough @@ -658,7 +658,7 @@ /datum/recipe/meatbun appliance = OVEN fruit = list("cabbage" = 1) - reagents = list("water" = 5) + reagents = list(REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/sliceable/flatdough, @@ -669,7 +669,7 @@ /datum/recipe/spicedmeatbun appliance = OVEN - reagents = list("spacespice" = 2, "water" = 5) + reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/doughslice, /obj/item/reagent_containers/food/snacks/rawcutlet @@ -680,7 +680,7 @@ /datum/recipe/custardbun appliance = OVEN - reagents = list("spacespice" = 1, "water" = 5, "egg" = 3) + reagents = list("spacespice" = 1, REAGENT_ID_WATER = 5, "egg" = 3) items = list( /obj/item/reagent_containers/food/snacks/doughslice ) @@ -689,7 +689,7 @@ /datum/recipe/chickenmomo appliance = OVEN - reagents = list("spacespice" = 2, "water" = 5) + reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/doughslice, /obj/item/reagent_containers/food/snacks/doughslice, @@ -702,7 +702,7 @@ /datum/recipe/veggiemomo appliance = OVEN - reagents = list("spacespice" = 2, "water" = 5) + reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5) fruit = list("carrot" = 1, "cabbage" = 1) items = list( /obj/item/reagent_containers/food/snacks/doughslice, @@ -711,4 +711,4 @@ ) reagent_mix = RECIPE_REAGENT_REPLACE //Get that water outta here result = /obj/item/reagent_containers/food/snacks/veggiemomo - result_quantity = 2 \ No newline at end of file + result_quantity = 2 diff --git a/code/modules/food/recipes_oven_vr.dm b/code/modules/food/recipes_oven_vr.dm index b73704b91a..94db2d390c 100644 --- a/code/modules/food/recipes_oven_vr.dm +++ b/code/modules/food/recipes_oven_vr.dm @@ -1,7 +1,7 @@ /datum/recipe/scorpion appliance = OVEN - reagents = list("sodiumchloride" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1) items = list( /obj/item/reagent_containers/food/snacks/scorpion ) - result = /obj/item/reagent_containers/food/snacks/scorpion_cooked \ No newline at end of file + result = /obj/item/reagent_containers/food/snacks/scorpion_cooked diff --git a/code/modules/hydroponics/backtank.dm b/code/modules/hydroponics/backtank.dm index ce35eeabc3..bcc84c2614 100644 --- a/code/modules/hydroponics/backtank.dm +++ b/code/modules/hydroponics/backtank.dm @@ -233,7 +233,7 @@ /obj/item/watertank/op/Initialize() . = ..() - reagents.add_reagent("fuel", 500) + reagents.add_reagent(REAGENT_ID_FUEL, 500) reagents.add_reagent("cryptobiolin", 500) reagents.add_reagent(REAGENT_ID_PHORON, 500) reagents.add_reagent("condensedcapsaicin", 500) @@ -266,7 +266,7 @@ /obj/item/watertank/atmos/Initialize() . = ..() - reagents.add_reagent("water", 200) + reagents.add_reagent(REAGENT_ID_WATER, 200) /obj/item/watertank/atmos/make_noz() return new /obj/item/reagent_containers/spray/mister/atmos(src) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index e42d0ff0cb..ac4e2083b2 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -52,7 +52,7 @@ var/list/data = list() if(reagent_data.len > 1 && potency > 0) rtotal += round(potency/reagent_data[2]) - if(rid == "nutriment") + if(rid == REAGENT_ID_NUTRIMENT) data[seed.seed_name] = max(1,rtotal) reagents.add_reagent(rid,max(1,rtotal),data) @@ -70,13 +70,13 @@ desc = SSplants.product_descs["[seed.uid]"] else var/list/descriptors = list() - if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice")) + if(reagents.has_reagent(REAGENT_ID_SUGAR) || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice")) descriptors |= "sweet" if(reagents.has_reagent("anti_toxin")) descriptors |= "astringent" if(reagents.has_reagent("frostoil")) descriptors |= "numbing" - if(reagents.has_reagent("nutriment")) + if(reagents.has_reagent(REAGENT_ID_NUTRIMENT)) descriptors |= "nutritious" if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin")) descriptors |= "spicy" @@ -84,11 +84,11 @@ descriptors |= "bitter" if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice")) descriptors |= "sweet-sour" - if(reagents.has_reagent("radium") || reagents.has_reagent("uranium")) + if(reagents.has_reagent(REAGENT_ID_RADIUM) || reagents.has_reagent("uranium")) descriptors |= "radioactive" if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin")) descriptors |= "poisonous" - if(reagents.has_reagent("psilocybin") || reagents.has_reagent("bliss") || reagents.has_reagent("earthsblood")) + if(reagents.has_reagent(REAGENT_ID_PSILOCYBIN) || reagents.has_reagent(REAGENT_ID_BLISS) || reagents.has_reagent("earthsblood")) descriptors |= "hallucinogenic" if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood")) descriptors |= "medicinal" @@ -96,7 +96,7 @@ descriptors |= "shiny" if(reagents.has_reagent("lube")) descriptors |= "slippery" - if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid")) + if(reagents.has_reagent(REAGENT_ID_PACID) || reagents.has_reagent(REAGENT_ID_SACID)) descriptors |= "acidic" if(seed.get_trait(TRAIT_JUICY)) descriptors |= "juicy" diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 49d3760380..733b0c933a 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -390,7 +390,7 @@ "calvatia", "gigantea", "clitopilis", "prumulus", "entoloma", "abortivum", "suillus", "tuber", "aestivum", "volvacea", "delica", "russula", "rozites") - possible_prefixes |= list("butter", "shad", "sugar", "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown", + possible_prefixes |= list("butter", "shad", REAGENT_ID_SUGAR, "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown", "black", "white", "paper", "slippery", "honey", "bitter") prefix = pick(possible_prefixes) @@ -455,7 +455,7 @@ chems = list() if(prob(80)) - chems["nutriment"] = list(rand(1,10),rand(10,20)) + chems[REAGENT_ID_NUTRIMENT] = list(rand(1,10),rand(10,20)) var/additional_chems = rand(0,5) @@ -463,10 +463,10 @@ // VOREStation Edit Start: Modified exclusion list var/list/banned_chems = list( "adminordrazine", - "nutriment", - "macrocillin", - "microcillin", - "normalcillin", + REAGENT_ID_NUTRIMENT, + REAGENT_ID_MACROCILLIN, + REAGENT_ID_MICROCILLIN, + REAGENT_ID_NORMALCILLIN, "magicdust" ) // VOREStation Edit End: Modified exclusion list diff --git a/code/modules/hydroponics/seed_datums_vr.dm b/code/modules/hydroponics/seed_datums_vr.dm index 5fcf7c4432..02c1c9b370 100644 --- a/code/modules/hydroponics/seed_datums_vr.dm +++ b/code/modules/hydroponics/seed_datums_vr.dm @@ -7,7 +7,7 @@ display_name = "Shrinking mushroom trees" mutants = list("megam") kitchen_tag = "microm" - chems = list("microcillin" = list(1,20)) + chems = list(REAGENT_ID_MICROCILLIN = list(1,20)) /datum/seed/size/New() ..() @@ -27,7 +27,7 @@ display_name = "Mega mushroom trees" mutants = list("microm") kitchen_tag = "megam" - chems = list("macrocillin" = list(1,20)) + chems = list(REAGENT_ID_MACROCILLIN = list(1,20)) /datum/seed/size/megam/New() ..() @@ -41,4 +41,4 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#DADA00") /datum/seed/gnomes - harvest_sound = 'sound/items/hooh.ogg' \ No newline at end of file + harvest_sound = 'sound/items/hooh.ogg' diff --git a/code/modules/hydroponics/seedtypes/amauri.dm b/code/modules/hydroponics/seedtypes/amauri.dm index 0ad44e7862..4a0f3567b4 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),"nutriment" = list(1,5)) + chems = list("zombiepowder" = list(1,10),"condensedcapsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/amauri/New() ..() @@ -12,4 +12,4 @@ set_trait(TRAIT_MATURATION,8) set_trait(TRAIT_PRODUCTION,9) set_trait(TRAIT_YIELD,4) - set_trait(TRAIT_POTENCY,10) \ No newline at end of file + set_trait(TRAIT_POTENCY,10) diff --git a/code/modules/hydroponics/seedtypes/ambrosia.dm b/code/modules/hydroponics/seedtypes/ambrosia.dm index 289b182d9a..5e1e65a153 100644 --- a/code/modules/hydroponics/seedtypes/ambrosia.dm +++ b/code/modules/hydroponics/seedtypes/ambrosia.dm @@ -5,7 +5,7 @@ display_name = "ambrosia vulgaris" kitchen_tag = "ambrosia" mutants = list("ambrosiadeus") - chems = list("nutriment" = list(1), "ambrosia_extract" = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1)) + chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMBROSIAEXTRACT = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1)) /datum/seed/ambrosia/New() ..() @@ -25,7 +25,7 @@ display_name = "ambrosia deus" kitchen_tag = "ambrosiadeus" mutants = list("ambrosiainfernus", "ambrosiagaia") - chems = list("nutriment" = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), "ambrosia_extract" = list(1,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), REAGENT_ID_AMBROSIAEXTRACT = list(1,10)) /datum/seed/ambrosia/deus/New() ..() @@ -38,7 +38,7 @@ display_name = "ambrosia infernus" kitchen_tag = "ambrosiainfernus" mutants = null - chems = list("nutriment" = list(1,3), "oxycodone" = list(1,8), "impedrezene" = list(1,10), "mindbreaker" = list(1,10), "ambrosia_extract" = list(1,10)) + 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)) /datum/seed/ambrosia/infernus/New() ..() @@ -51,7 +51,7 @@ display_name = "ambrosia gaia" kitchen_tag = "ambrosiagaia" mutants = null - chems = list ("earthsblood" = list(3,5), "nutriment" = list(1,3)) + chems = list ("earthsblood" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,3)) /datum/seed/ambrosia/gaia/New() ..() @@ -65,4 +65,4 @@ set_trait(TRAIT_BIOLUM,1) set_trait(TRAIT_BIOLUM_COLOUR,"#ffb500") set_trait(TRAIT_PRODUCT_COLOUR, "#ffee00") - set_trait(TRAIT_PLANT_COLOUR,"#f3ba2b") \ No newline at end of file + set_trait(TRAIT_PLANT_COLOUR,"#f3ba2b") diff --git a/code/modules/hydroponics/seedtypes/apples.dm b/code/modules/hydroponics/seedtypes/apples.dm index 4bd8a0bade..ff909ff146 100644 --- a/code/modules/hydroponics/seedtypes/apples.dm +++ b/code/modules/hydroponics/seedtypes/apples.dm @@ -5,7 +5,7 @@ display_name = "apple tree" kitchen_tag = "apple" mutants = list("poisonapple","goldapple") - chems = list("nutriment" = list(1,10),"applejuice" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10),"applejuice" = list(10,20)) /datum/seed/apple/New() ..() @@ -31,7 +31,7 @@ display_name = "gold apple tree" kitchen_tag = "goldapple" mutants = null - chems = list("nutriment" = list(1,10), "gold" = list(1,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "gold" = list(1,5)) /datum/seed/apple/gold/New() ..() @@ -46,7 +46,7 @@ seed_name = "sivian pod" display_name = "sivian pod" kitchen_tag = "apple" - chems = list("nutriment" = list(1,5),"sifsap" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5),"sifsap" = list(10,20)) /datum/seed/apple/sif/New() ..() @@ -59,4 +59,4 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#0720c3") set_trait(TRAIT_PLANT_ICON,"tree5") set_trait(TRAIT_FLESH_COLOUR,"#05157d") - set_trait(TRAIT_IDEAL_LIGHT, 1) \ No newline at end of file + set_trait(TRAIT_IDEAL_LIGHT, 1) diff --git a/code/modules/hydroponics/seedtypes/berries.dm b/code/modules/hydroponics/seedtypes/berries.dm index 3654a62cb3..08fe6eb1b4 100644 --- a/code/modules/hydroponics/seedtypes/berries.dm +++ b/code/modules/hydroponics/seedtypes/berries.dm @@ -5,7 +5,7 @@ display_name = "berry bush" kitchen_tag = "berries" mutants = list("glowberries","poisonberries") - chems = list("nutriment" = list(1,10), "berryjuice" = list(10,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "berryjuice" = list(10,10)) /datum/seed/berry/New() ..() @@ -26,7 +26,7 @@ seed_name = "glowberry" display_name = "glowberry bush" mutants = null - chems = list("nutriment" = list(1,10), "uranium" = list(3,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "uranium" = list(3,5)) /datum/seed/berry/glow/New() ..() @@ -47,7 +47,7 @@ kitchen_tag = "poisonberries" display_name = "poison berry bush" mutants = list("deathberries") - chems = list("nutriment" = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(10,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1), "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("nutriment" = list(1), "toxin" = list(3,3), "lexorin" = list(1,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1), "toxin" = list(3,3), "lexorin" = list(1,5)) /datum/seed/berry/poison/death/New() ..() @@ -79,4 +79,4 @@ /datum/seed/berry/peppercorn/New() ..() set_trait(TRAIT_PRODUCT_COLOUR,"#303030") - set_trait(TRAIT_WATER_CONSUMPTION, 2) \ No newline at end of file + set_trait(TRAIT_WATER_CONSUMPTION, 2) diff --git a/code/modules/hydroponics/seedtypes/cabbage.dm b/code/modules/hydroponics/seedtypes/cabbage.dm index 0ee7fb2693..bf6b1a51a8 100644 --- a/code/modules/hydroponics/seedtypes/cabbage.dm +++ b/code/modules/hydroponics/seedtypes/cabbage.dm @@ -3,7 +3,7 @@ seed_name = "cabbage" display_name = "cabbages" kitchen_tag = "cabbage" - chems = list("nutriment" = list(1,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10)) /datum/seed/cabbage/New() ..() @@ -18,4 +18,4 @@ set_trait(TRAIT_PLANT_ICON,"vine2") set_trait(TRAIT_IDEAL_LIGHT, 6) set_trait(TRAIT_WATER_CONSUMPTION, 6) - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) \ No newline at end of file + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) diff --git a/code/modules/hydroponics/seedtypes/carrots.dm b/code/modules/hydroponics/seedtypes/carrots.dm index 2b8ef7577b..f1e40e6320 100644 --- a/code/modules/hydroponics/seedtypes/carrots.dm +++ b/code/modules/hydroponics/seedtypes/carrots.dm @@ -3,7 +3,7 @@ seed_name = "carrot" display_name = "carrots" kitchen_tag = "carrot" - chems = list("nutriment" = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20)) /datum/seed/carrots/New() ..() @@ -14,4 +14,4 @@ set_trait(TRAIT_PRODUCT_ICON,"carrot") set_trait(TRAIT_PRODUCT_COLOUR,"#FFDB4A") set_trait(TRAIT_PLANT_ICON,"carrot") - set_trait(TRAIT_WATER_CONSUMPTION, 6) \ No newline at end of file + set_trait(TRAIT_WATER_CONSUMPTION, 6) diff --git a/code/modules/hydroponics/seedtypes/celery.dm b/code/modules/hydroponics/seedtypes/celery.dm index c404ed670f..3f478dc769 100644 --- a/code/modules/hydroponics/seedtypes/celery.dm +++ b/code/modules/hydroponics/seedtypes/celery.dm @@ -3,7 +3,7 @@ seed_name = "celery" display_name = "celery" kitchen_tag = "celery" - chems = list("nutriment" = list(5,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(5,20)) /datum/seed/celery/New() ..() @@ -14,4 +14,4 @@ set_trait(TRAIT_POTENCY,8) set_trait(TRAIT_PRODUCT_ICON,"stalk") set_trait(TRAIT_PRODUCT_COLOUR,"#56FD56") - set_trait(TRAIT_PLANT_ICON,"stalk3") \ No newline at end of file + set_trait(TRAIT_PLANT_ICON,"stalk3") diff --git a/code/modules/hydroponics/seedtypes/cherries.dm b/code/modules/hydroponics/seedtypes/cherries.dm index ece8d793e7..7767263023 100644 --- a/code/modules/hydroponics/seedtypes/cherries.dm +++ b/code/modules/hydroponics/seedtypes/cherries.dm @@ -4,7 +4,7 @@ seed_noun = "pits" display_name = "cherry tree" kitchen_tag = "cherries" - chems = list("nutriment" = list(1,15), "sugar" = list(1,15), "cherryjelly" = list(10,15)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_SUGAR = list(1,15), "cherryjelly" = list(10,15)) /datum/seed/cherries/New() ..() @@ -17,4 +17,4 @@ set_trait(TRAIT_PRODUCT_ICON,"cherry") set_trait(TRAIT_PRODUCT_COLOUR,"#A80000") set_trait(TRAIT_PLANT_ICON,"tree2") - set_trait(TRAIT_PLANT_COLOUR,"#2F7D2D") \ No newline at end of file + set_trait(TRAIT_PLANT_COLOUR,"#2F7D2D") diff --git a/code/modules/hydroponics/seedtypes/chili.dm b/code/modules/hydroponics/seedtypes/chili.dm index 8a93d5b786..59adafd8fd 100644 --- a/code/modules/hydroponics/seedtypes/chili.dm +++ b/code/modules/hydroponics/seedtypes/chili.dm @@ -4,7 +4,7 @@ seed_name = "chili" display_name = "chili plants" kitchen_tag = "chili" - chems = list("capsaicin" = list(3,5), "nutriment" = list(1,25)) + chems = list("capsaicin" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,25)) mutants = list("icechili", "ghostchili") /datum/seed/chili/New() @@ -26,7 +26,7 @@ display_name = "ice-pepper plants" kitchen_tag = "icechili" mutants = null - chems = list("frostoil" = list(3,5), "nutriment" = list(1,50)) + chems = list("frostoil" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,50)) /datum/seed/chili/ice/New() ..() @@ -40,10 +40,10 @@ display_name = "ghost chili plants" kitchen_tag = "ghostchili" mutants = null - chems = list("condensedcapsaicin" = list (3,10), "nutriment" = list (1,25)) - + chems = list("condensedcapsaicin" = list (3,10), REAGENT_ID_NUTRIMENT = list (1,25)) + /datum/seed/chili/ghost/New() ..() set_trait(TRAIT_MATURATION,6) set_trait(TRAIT_PRODUCTION,3) - set_trait(TRAIT_PRODUCT_COLOUR,"#eaecec") \ No newline at end of file + set_trait(TRAIT_PRODUCT_COLOUR,"#eaecec") diff --git a/code/modules/hydroponics/seedtypes/citrus.dm b/code/modules/hydroponics/seedtypes/citrus.dm index ebc154aa40..063026342b 100644 --- a/code/modules/hydroponics/seedtypes/citrus.dm +++ b/code/modules/hydroponics/seedtypes/citrus.dm @@ -3,7 +3,7 @@ seed_name = "lime" display_name = "lime trees" kitchen_tag = "lime" - chems = list("nutriment" = list(1,20), "limejuice" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "limejuice" = list(10,20)) /datum/seed/citrus/New() ..() @@ -23,7 +23,7 @@ seed_name = "lemon" display_name = "lemon trees" kitchen_tag = "lemon" - chems = list("nutriment" = list(1,20), "lemonjuice" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lemonjuice" = list(10,20)) /datum/seed/citrus/lemon/New() ..() @@ -38,9 +38,9 @@ seed_name = "orange" display_name = "orange trees" kitchen_tag = "orange" - chems = list("nutriment" = list(1,20), "orangejuice" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "orangejuice" = list(10,20)) /datum/seed/citrus/orange/New() ..() set_trait(TRAIT_PRODUCT_COLOUR,"#FFC20A") - set_trait(TRAIT_FLESH_COLOUR,"#FFC20A") \ No newline at end of file + set_trait(TRAIT_FLESH_COLOUR,"#FFC20A") diff --git a/code/modules/hydroponics/seedtypes/cocoa.dm b/code/modules/hydroponics/seedtypes/cocoa.dm index 7f7aa31b39..c89bfcf0e6 100644 --- a/code/modules/hydroponics/seedtypes/cocoa.dm +++ b/code/modules/hydroponics/seedtypes/cocoa.dm @@ -3,7 +3,7 @@ seed_name = "cacao" display_name = "cacao tree" kitchen_tag = "cocoa" - chems = list("nutriment" = list(1,10), "coco" = list(4,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "coco" = list(4,5)) /datum/seed/cocoa/New() ..() @@ -16,4 +16,4 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#CCA935") set_trait(TRAIT_PLANT_ICON,"tree2") set_trait(TRAIT_IDEAL_HEAT, 298) - set_trait(TRAIT_WATER_CONSUMPTION, 6) \ No newline at end of file + set_trait(TRAIT_WATER_CONSUMPTION, 6) diff --git a/code/modules/hydroponics/seedtypes/corn.dm b/code/modules/hydroponics/seedtypes/corn.dm index 40071604fb..e46cf0f2d9 100644 --- a/code/modules/hydroponics/seedtypes/corn.dm +++ b/code/modules/hydroponics/seedtypes/corn.dm @@ -3,7 +3,7 @@ seed_name = "corn" display_name = "ears of corn" kitchen_tag = "corn" - chems = list("nutriment" = list(1,10), "cornoil" = list(3,15)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "cornoil" = list(3,15)) trash_type = /obj/item/corncob /datum/seed/corn/New() @@ -18,4 +18,4 @@ set_trait(TRAIT_PLANT_ICON,"corn") set_trait(TRAIT_IDEAL_HEAT, 298) set_trait(TRAIT_IDEAL_LIGHT, 6) - set_trait(TRAIT_WATER_CONSUMPTION, 6) \ No newline at end of file + set_trait(TRAIT_WATER_CONSUMPTION, 6) diff --git a/code/modules/hydroponics/seedtypes/durian.dm b/code/modules/hydroponics/seedtypes/durian.dm index 8963f4c9ec..b0ad06f648 100644 --- a/code/modules/hydroponics/seedtypes/durian.dm +++ b/code/modules/hydroponics/seedtypes/durian.dm @@ -4,7 +4,7 @@ seed_noun = "pits" display_name = "durian" kitchen_tag = "durian" - chems = list("nutriment" = list(1,5), "durianpaste" = list(1, 20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "durianpaste" = list(1, 20)) /datum/seed/durian/New() ..() @@ -18,4 +18,4 @@ set_trait(TRAIT_PLANT_COLOUR,"#87C969") set_trait(TRAIT_PLANT_ICON,"tree") set_trait(TRAIT_IDEAL_LIGHT, 8) - set_trait(TRAIT_WATER_CONSUMPTION, 8) \ No newline at end of file + set_trait(TRAIT_WATER_CONSUMPTION, 8) diff --git a/code/modules/hydroponics/seedtypes/eggplant.dm b/code/modules/hydroponics/seedtypes/eggplant.dm index 587146d9d0..1661aabe40 100644 --- a/code/modules/hydroponics/seedtypes/eggplant.dm +++ b/code/modules/hydroponics/seedtypes/eggplant.dm @@ -5,7 +5,7 @@ display_name = "eggplants" kitchen_tag = "eggplant" mutants = list("egg-plant") - chems = list("nutriment" = list(1,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10)) /datum/seed/eggplant/New() ..() @@ -27,5 +27,5 @@ display_name = "egg-plants" kitchen_tag = "egg-plant" mutants = null - chems = list("nutriment" = list(1,5), "egg" = list(3,12)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "egg" = list(3,12)) has_item_product = /obj/item/reagent_containers/food/snacks/egg/purple diff --git a/code/modules/hydroponics/seedtypes/flowers.dm b/code/modules/hydroponics/seedtypes/flowers.dm index e6c2e86f59..076179df38 100644 --- a/code/modules/hydroponics/seedtypes/flowers.dm +++ b/code/modules/hydroponics/seedtypes/flowers.dm @@ -4,7 +4,7 @@ seed_name = "harebell" display_name = "harebells" kitchen_tag = "harebell" - chems = list("nutriment" = list(1,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20)) /datum/seed/flower/New() ..() @@ -22,7 +22,7 @@ seed_name = "poppy" display_name = "poppies" kitchen_tag = "poppy" - chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10)) /datum/seed/flower/poppy/New() ..() @@ -58,7 +58,7 @@ seed_name = "lavender" display_name = "lavender" kitchen_tag = "lavender" - chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10)) /datum/seed/flower/lavender/New() ..() @@ -79,7 +79,7 @@ display_name = "rose" kitchen_tag = "rose" mutants = list("bloodrose") - chems = list("nutriment" = list(1,5), "stoxin" = list(0,2)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "stoxin" = list(0,2)) /datum/seed/flower/rose/New() ..() @@ -99,7 +99,7 @@ name = "bloodrose" display_name = "bleeding rose" mutants = null - chems = list("nutriment" = list(1,5), "stoxin" = list(1,5), "blood" = list(0,2)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "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 1fa365c875..6232408f6c 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),"nutriment" = list(1,5)) + chems = list("stoxin" = list(1,5),"capsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/gelthi/New() ..() @@ -12,4 +12,4 @@ set_trait(TRAIT_MATURATION,6) set_trait(TRAIT_PRODUCTION,6) set_trait(TRAIT_YIELD,2) - set_trait(TRAIT_POTENCY,1) \ No newline at end of file + set_trait(TRAIT_POTENCY,1) diff --git a/code/modules/hydroponics/seedtypes/grapes.dm b/code/modules/hydroponics/seedtypes/grapes.dm index e61978e5f0..fd63ef95bd 100644 --- a/code/modules/hydroponics/seedtypes/grapes.dm +++ b/code/modules/hydroponics/seedtypes/grapes.dm @@ -5,7 +5,7 @@ display_name = "grapevines" kitchen_tag = "grapes" mutants = list("greengrapes") - chems = list("nutriment" = list(1,10), "sugar" = list(1,5), "grapejuice" = list(10,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SUGAR = list(1,5), "grapejuice" = list(10,10)) /datum/seed/grapes/New() ..() @@ -26,8 +26,8 @@ seed_name = "green grape" display_name = "green grapevines" mutants = null - chems = list("nutriment" = list(1,10), "kelotane" = list(3,5), "grapejuice" = list(10,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "kelotane" = list(3,5), "grapejuice" = list(10,10)) /datum/seed/grapes/green/New() ..() - set_trait(TRAIT_PRODUCT_COLOUR,"42ed2f") \ No newline at end of file + set_trait(TRAIT_PRODUCT_COLOUR,"42ed2f") diff --git a/code/modules/hydroponics/seedtypes/grass.dm b/code/modules/hydroponics/seedtypes/grass.dm index 25231b84a8..c5cb6a814f 100644 --- a/code/modules/hydroponics/seedtypes/grass.dm +++ b/code/modules/hydroponics/seedtypes/grass.dm @@ -4,7 +4,7 @@ display_name = "grass" kitchen_tag = "grass" mutants = list("carpet") - chems = list("nutriment" = list(1,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20)) /datum/seed/grass/New() ..() @@ -33,4 +33,4 @@ set_trait(TRAIT_PRODUCT_ICON,"grass") set_trait(TRAIT_PRODUCT_COLOUR,"#9e2500") set_trait(TRAIT_PLANT_COLOUR,"#ee4401") - set_trait(TRAIT_PLANT_ICON,"grass") \ No newline at end of file + set_trait(TRAIT_PLANT_ICON,"grass") diff --git a/code/modules/hydroponics/seedtypes/jurlmah.dm b/code/modules/hydroponics/seedtypes/jurlmah.dm index 61e810b9da..32d197764c 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),"nutriment" = list(1,5)) + chems = list("serotrotium" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/jurlmah/New() ..() @@ -12,4 +12,4 @@ set_trait(TRAIT_MATURATION,8) set_trait(TRAIT_PRODUCTION,9) set_trait(TRAIT_YIELD,3) - set_trait(TRAIT_POTENCY,10) \ No newline at end of file + set_trait(TRAIT_POTENCY,10) diff --git a/code/modules/hydroponics/seedtypes/kudzu.dm b/code/modules/hydroponics/seedtypes/kudzu.dm index 336c205b25..667ff7e845 100644 --- a/code/modules/hydroponics/seedtypes/kudzu.dm +++ b/code/modules/hydroponics/seedtypes/kudzu.dm @@ -3,7 +3,7 @@ seed_name = "kudzu" display_name = "kudzu vines" kitchen_tag = "kudzu" - chems = list("nutriment" = list(1,50), "anti_toxin" = list(1,25)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,50), "anti_toxin" = list(1,25)) /datum/seed/kudzu/New() ..() @@ -16,4 +16,4 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#96D278") set_trait(TRAIT_PLANT_COLOUR,"#6F7A63") set_trait(TRAIT_PLANT_ICON,"vine2") - set_trait(TRAIT_WATER_CONSUMPTION, 0.5) \ No newline at end of file + set_trait(TRAIT_WATER_CONSUMPTION, 0.5) diff --git a/code/modules/hydroponics/seedtypes/lettuce.dm b/code/modules/hydroponics/seedtypes/lettuce.dm index b9293fbed7..77281dc5e0 100644 --- a/code/modules/hydroponics/seedtypes/lettuce.dm +++ b/code/modules/hydroponics/seedtypes/lettuce.dm @@ -4,7 +4,7 @@ seed_name = "lettuce" display_name = "lettuce" kitchen_tag = "lettuce" - chems = list("nutriment" = list(1,15)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,15)) /datum/seed/lettuce/New() ..() @@ -26,9 +26,9 @@ seed_name = "glacial lettuce" display_name = "glacial lettuce" kitchen_tag = "icelettuce" - chems = list("nutriment" = list(1,5), "paracetamol" = list(0,2)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "paracetamol" = list(0,2)) /datum/seed/lettuce/ice/New() ..() set_trait(TRAIT_ALTER_TEMP, -5) - set_trait(TRAIT_PRODUCT_COLOUR,"#9ABCC9") \ No newline at end of file + set_trait(TRAIT_PRODUCT_COLOUR,"#9ABCC9") diff --git a/code/modules/hydroponics/seedtypes/mushrooms.dm b/code/modules/hydroponics/seedtypes/mushrooms.dm index 4be5e0fb31..8fe783850a 100644 --- a/code/modules/hydroponics/seedtypes/mushrooms.dm +++ b/code/modules/hydroponics/seedtypes/mushrooms.dm @@ -5,7 +5,7 @@ seed_noun = "spores" display_name = "chanterelle mushrooms" mutants = list("reishi","amanita","plumphelmet") - chems = list("nutriment" = list(1,25)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,25)) splat_type = /obj/effect/plant kitchen_tag = "mushroom" @@ -44,7 +44,7 @@ seed_name = "plump helmet" display_name = "plump helmet mushrooms" mutants = list("walkingmushroom","towercap") - chems = list("nutriment" = list(2,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(2,10)) kitchen_tag = "plumphelmet" /datum/seed/mushroom/plump/New() @@ -62,7 +62,7 @@ seed_name = "reishi" display_name = "reishi" mutants = list("libertycap","glowshroom") - chems = list("nutriment" = list(1,50), "psilocybin" = list(3,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_PSILOCYBIN = list(3,5)) /datum/seed/mushroom/hallucinogenic/New() ..() @@ -80,7 +80,7 @@ seed_name = "liberty cap" display_name = "liberty cap mushrooms" mutants = null - chems = list("nutriment" = list(1), "stoxin" = list(3,3), "bliss" = list(1,25)) + chems = list(REAGENT_ID_NUTRIMENT = list(1), "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("nutriment" = list(1), "amatoxin" = list(3,3), "psilocybin" = list(1,25)) + chems = list(REAGENT_ID_NUTRIMENT = list(1), "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("nutriment" = list(1,50), "amatoxin" = list(13,3), "psilocybin" = list(1,25)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,50), "amatoxin" = list(13,3), REAGENT_ID_PSILOCYBIN = list(1,25)) /datum/seed/mushroom/poison/death/New() ..() @@ -159,7 +159,7 @@ seed_name = "glowshroom" display_name = "glowshrooms" mutants = null - chems = list("radium" = list(1,20)) + chems = list(REAGENT_ID_RADIUM = list(1,20)) /datum/seed/mushroom/glowshroom/New() ..() @@ -209,4 +209,4 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#e29cd2") set_trait(TRAIT_PLANT_COLOUR,"#f8e6f4") set_trait(TRAIT_PLANT_ICON,"mushroom9") - set_trait(TRAIT_SPORING, TRUE) \ No newline at end of file + set_trait(TRAIT_SPORING, TRUE) diff --git a/code/modules/hydroponics/seedtypes/nettles.dm b/code/modules/hydroponics/seedtypes/nettles.dm index 5a1073c6fc..81f05cb323 100644 --- a/code/modules/hydroponics/seedtypes/nettles.dm +++ b/code/modules/hydroponics/seedtypes/nettles.dm @@ -4,7 +4,7 @@ seed_name = "nettle" display_name = "nettles" mutants = list("deathnettle") - chems = list("nutriment" = list(1,50), "sacid" = list(0,1)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_SACID = list(0,1)) kitchen_tag = "nettle" /datum/seed/nettle/New() @@ -25,7 +25,7 @@ display_name = "death nettles" kitchen_tag = "deathnettle" mutants = null - chems = list("nutriment" = list(1,50), "pacid" = list(0,1)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_PACID = list(0,1)) /datum/seed/nettle/death/New() ..() diff --git a/code/modules/hydroponics/seedtypes/onion.dm b/code/modules/hydroponics/seedtypes/onion.dm index 2123ad2b38..3bd214261e 100644 --- a/code/modules/hydroponics/seedtypes/onion.dm +++ b/code/modules/hydroponics/seedtypes/onion.dm @@ -3,7 +3,7 @@ seed_name = "onion" display_name = "onions" kitchen_tag = "onion" - chems = list("nutriment" = list(1,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10)) /datum/seed/onion/New() ..() @@ -14,4 +14,4 @@ set_trait(TRAIT_PRODUCT_ICON,"onion") set_trait(TRAIT_PRODUCT_COLOUR,"#E0C367") set_trait(TRAIT_PLANT_ICON,"carrot") - set_trait(TRAIT_WATER_CONSUMPTION, 6) \ No newline at end of file + set_trait(TRAIT_WATER_CONSUMPTION, 6) diff --git a/code/modules/hydroponics/seedtypes/peanuts.dm b/code/modules/hydroponics/seedtypes/peanuts.dm index cc710d25ca..8dfa76addb 100644 --- a/code/modules/hydroponics/seedtypes/peanuts.dm +++ b/code/modules/hydroponics/seedtypes/peanuts.dm @@ -4,7 +4,7 @@ seed_name = "peanut" display_name = "peanut vines" kitchen_tag = "peanut" - chems = list("nutriment" = list(1,10), "peanutoil" = list(3,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "peanutoil" = list(3,10)) /datum/seed/peanuts/New() ..() @@ -16,4 +16,4 @@ set_trait(TRAIT_PRODUCT_ICON,"nuts") set_trait(TRAIT_PRODUCT_COLOUR,"#C4AE7A") set_trait(TRAIT_PLANT_ICON,"bush2") - set_trait(TRAIT_IDEAL_LIGHT, 6) \ No newline at end of file + set_trait(TRAIT_IDEAL_LIGHT, 6) diff --git a/code/modules/hydroponics/seedtypes/pineapple.dm b/code/modules/hydroponics/seedtypes/pineapple.dm index 9e14b244dc..27e14c6c92 100644 --- a/code/modules/hydroponics/seedtypes/pineapple.dm +++ b/code/modules/hydroponics/seedtypes/pineapple.dm @@ -6,7 +6,7 @@ display_name = "pineapple" kitchen_tag = "pineapple" mutants = list("spineapple") - chems = list("nutriment" = list(1,5), "pineapplejuice" = list(1, 20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "pineapplejuice" = list(1, 20)) /datum/seed/pineapple/New() ..() @@ -30,7 +30,7 @@ seed_name = "spineapple" display_name = "spineapple" kitchen_tag = "spineapple" - chems = list("nutriment" = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20)) /datum/seed/spineapple/New() ..() @@ -46,4 +46,4 @@ set_trait(TRAIT_IDEAL_HEAT, 298) set_trait(TRAIT_IDEAL_LIGHT, 4) set_trait(TRAIT_WATER_CONSUMPTION, 6) - set_trait(TRAIT_STINGS,1) \ No newline at end of file + set_trait(TRAIT_STINGS,1) diff --git a/code/modules/hydroponics/seedtypes/potato.dm b/code/modules/hydroponics/seedtypes/potato.dm index 8aad55afc6..f3a76300a6 100644 --- a/code/modules/hydroponics/seedtypes/potato.dm +++ b/code/modules/hydroponics/seedtypes/potato.dm @@ -3,7 +3,7 @@ seed_name = "potato" display_name = "potatoes" kitchen_tag = "potato" - chems = list("nutriment" = list(1,10), "potatojuice" = list(10,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "potatojuice" = list(10,10)) /datum/seed/potato/New() ..() @@ -15,4 +15,4 @@ set_trait(TRAIT_PRODUCT_ICON,"potato") set_trait(TRAIT_PRODUCT_COLOUR,"#D4CAB4") set_trait(TRAIT_PLANT_ICON,"bush2") - set_trait(TRAIT_WATER_CONSUMPTION, 6) \ No newline at end of file + set_trait(TRAIT_WATER_CONSUMPTION, 6) diff --git a/code/modules/hydroponics/seedtypes/pumpkin.dm b/code/modules/hydroponics/seedtypes/pumpkin.dm index 916d44e58b..ed1392993d 100644 --- a/code/modules/hydroponics/seedtypes/pumpkin.dm +++ b/code/modules/hydroponics/seedtypes/pumpkin.dm @@ -3,7 +3,7 @@ seed_name = "pumpkin" display_name = "pumpkin vine" kitchen_tag = "pumpkin" - chems = list("nutriment" = list(1,6)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,6)) /datum/seed/pumpkin/New() ..() @@ -16,4 +16,4 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#DBAC02") set_trait(TRAIT_PLANT_COLOUR,"#21661E") set_trait(TRAIT_PLANT_ICON,"vine2") - set_trait(TRAIT_WATER_CONSUMPTION, 6) \ No newline at end of file + set_trait(TRAIT_WATER_CONSUMPTION, 6) diff --git a/code/modules/hydroponics/seedtypes/rhubarb.dm b/code/modules/hydroponics/seedtypes/rhubarb.dm index f3ee13ce41..8534c9727e 100644 --- a/code/modules/hydroponics/seedtypes/rhubarb.dm +++ b/code/modules/hydroponics/seedtypes/rhubarb.dm @@ -3,7 +3,7 @@ seed_name = "rhubarb" display_name = "rhubarb" kitchen_tag = "rhubarb" - chems = list("nutriment" = list(1,15)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,15)) /datum/seed/rhubarb/New() ..() @@ -14,4 +14,4 @@ set_trait(TRAIT_POTENCY,6) set_trait(TRAIT_PRODUCT_ICON,"stalk") set_trait(TRAIT_PRODUCT_COLOUR,"#FD5656") - set_trait(TRAIT_PLANT_ICON,"stalk3") \ No newline at end of file + set_trait(TRAIT_PLANT_ICON,"stalk3") diff --git a/code/modules/hydroponics/seedtypes/rice.dm b/code/modules/hydroponics/seedtypes/rice.dm index 413c43b9fc..e90c6b1e96 100644 --- a/code/modules/hydroponics/seedtypes/rice.dm +++ b/code/modules/hydroponics/seedtypes/rice.dm @@ -3,7 +3,7 @@ seed_name = "rice" display_name = "rice stalks" kitchen_tag = "rice" - chems = list("nutriment" = list(1,25), "rice" = list(10,15)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,25), "rice" = list(10,15)) /datum/seed/rice/New() ..() @@ -16,4 +16,4 @@ set_trait(TRAIT_PLANT_COLOUR,"#8ED17D") set_trait(TRAIT_PLANT_ICON,"stalk2") set_trait(TRAIT_WATER_CONSUMPTION, 6) - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) \ No newline at end of file + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) diff --git a/code/modules/hydroponics/seedtypes/soybean.dm b/code/modules/hydroponics/seedtypes/soybean.dm index 22329be263..c12d36803a 100644 --- a/code/modules/hydroponics/seedtypes/soybean.dm +++ b/code/modules/hydroponics/seedtypes/soybean.dm @@ -3,7 +3,7 @@ seed_name = "soybean" display_name = "soybeans" kitchen_tag = "soybeans" - chems = list("nutriment" = list(1,20), "soymilk" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "soymilk" = list(10,20)) /datum/seed/soybean/New() ..() @@ -14,4 +14,4 @@ set_trait(TRAIT_POTENCY,5) set_trait(TRAIT_PRODUCT_ICON,"bean") set_trait(TRAIT_PRODUCT_COLOUR,"#EBE7C0") - set_trait(TRAIT_PLANT_ICON,"stalk") \ No newline at end of file + set_trait(TRAIT_PLANT_ICON,"stalk") diff --git a/code/modules/hydroponics/seedtypes/sugarcane.dm b/code/modules/hydroponics/seedtypes/sugarcane.dm index c670500a1d..6abdf841c1 100644 --- a/code/modules/hydroponics/seedtypes/sugarcane.dm +++ b/code/modules/hydroponics/seedtypes/sugarcane.dm @@ -3,7 +3,7 @@ seed_name = "sugarcane" display_name = "sugarcanes" kitchen_tag = "sugarcanes" - chems = list("sugar" = list(4,5)) + chems = list(REAGENT_ID_SUGAR = list(4,5)) /datum/seed/sugarcane/New() ..() @@ -16,4 +16,4 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#B4D6BD") set_trait(TRAIT_PLANT_COLOUR,"#6BBD68") set_trait(TRAIT_PLANT_ICON,"stalk3") - set_trait(TRAIT_IDEAL_HEAT, 298) \ No newline at end of file + set_trait(TRAIT_IDEAL_HEAT, 298) diff --git a/code/modules/hydroponics/seedtypes/surik.dm b/code/modules/hydroponics/seedtypes/surik.dm index 8ea521995c..dfc0cafc71 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),"nutriment" = list(1,5)) + chems = list("impedrezene" = list(1,3),"synaptizine" = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/surik/New() ..() @@ -12,4 +12,4 @@ set_trait(TRAIT_MATURATION,7) set_trait(TRAIT_PRODUCTION,7) set_trait(TRAIT_YIELD,3) - set_trait(TRAIT_POTENCY,3) \ No newline at end of file + set_trait(TRAIT_POTENCY,3) diff --git a/code/modules/hydroponics/seedtypes/telriis.dm b/code/modules/hydroponics/seedtypes/telriis.dm index 47c577b787..49b573453a 100644 --- a/code/modules/hydroponics/seedtypes/telriis.dm +++ b/code/modules/hydroponics/seedtypes/telriis.dm @@ -3,7 +3,7 @@ seed_name = "telriis" display_name = "telriis grass" kitchen_tag = "telriis" - chems = list("pwine" = list(1,5), "nutriment" = list(1,6)) + chems = list("pwine" = list(1,5), REAGENT_ID_NUTRIMENT = list(1,6)) /datum/seed/telriis/New() ..() @@ -13,4 +13,4 @@ set_trait(TRAIT_MATURATION,5) set_trait(TRAIT_PRODUCTION,5) set_trait(TRAIT_YIELD,4) - set_trait(TRAIT_POTENCY,5) \ No newline at end of file + set_trait(TRAIT_POTENCY,5) diff --git a/code/modules/hydroponics/seedtypes/thaadra.dm b/code/modules/hydroponics/seedtypes/thaadra.dm index 209b495c82..7d2aaa1d93 100644 --- a/code/modules/hydroponics/seedtypes/thaadra.dm +++ b/code/modules/hydroponics/seedtypes/thaadra.dm @@ -3,7 +3,7 @@ seed_name = "thaa'dra" display_name = "thaa'dra lichen" kitchen_tag = "thaadra" - chems = list("frostoil" = list(1,5),"nutriment" = list(1,5)) + chems = list("frostoil" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/thaadra/New() ..() @@ -13,4 +13,4 @@ set_trait(TRAIT_MATURATION,5) set_trait(TRAIT_PRODUCTION,9) set_trait(TRAIT_YIELD,2) - set_trait(TRAIT_POTENCY,5) \ No newline at end of file + set_trait(TRAIT_POTENCY,5) diff --git a/code/modules/hydroponics/seedtypes/tobacco.dm b/code/modules/hydroponics/seedtypes/tobacco.dm index d9550fef8c..52136e0b15 100644 --- a/code/modules/hydroponics/seedtypes/tobacco.dm +++ b/code/modules/hydroponics/seedtypes/tobacco.dm @@ -5,7 +5,7 @@ display_name = "tobacco" kitchen_tag = "tobacco" mutants = list("stimbush") - chems = list("nutriment" = list(1,15), "nicotine" = list(1,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_NICOTINE = list(1,20)) /datum/seed/tobacco/New() ..() @@ -23,7 +23,7 @@ name = "stimbush" seed_name = "stim-bush" display_name = "stim-bush" - chems = list("nutriment" = list(1,10), "hyperzine" = list(1,10), "synaptizine" = list(1,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "hyperzine" = list(1,10), "synaptizine" = list(1,5)) /datum/seed/tobacco/stimbush/New() ..() diff --git a/code/modules/hydroponics/seedtypes/tomatoes.dm b/code/modules/hydroponics/seedtypes/tomatoes.dm index 3454d69952..312c799957 100644 --- a/code/modules/hydroponics/seedtypes/tomatoes.dm +++ b/code/modules/hydroponics/seedtypes/tomatoes.dm @@ -4,7 +4,7 @@ seed_name = "tomato" display_name = "tomato plant" mutants = list("bluetomato","bloodtomato") - chems = list("nutriment" = list(1,10), "tomatojuice" = list(10,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "tomatojuice" = list(10,10)) kitchen_tag = "tomato" /datum/seed/tomato/New() @@ -27,7 +27,7 @@ seed_name = "blood tomato" display_name = "blood tomato plant" mutants = list("killertomato") - chems = list("nutriment" = list(1,10), "blood" = list(1,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_BLOOD = list(1,5)) splat_type = /obj/effect/decal/cleanable/blood/splatter /datum/seed/tomato/blood/New() @@ -53,7 +53,7 @@ seed_name = "blue tomato" display_name = "blue tomato plant" mutants = list("bluespacetomato") - chems = list("nutriment" = list(1,20), "lube" = list(1,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lube" = list(1,5)) /datum/seed/tomato/blue/New() ..() @@ -65,11 +65,11 @@ seed_name = "bluespace tomato" display_name = "bluespace tomato plant" mutants = null - chems = list("nutriment" = list(1,20), "singulo" = list(10,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "singulo" = list(10,5)) /datum/seed/tomato/blue/teleport/New() ..() set_trait(TRAIT_TELEPORTING,1) set_trait(TRAIT_PRODUCT_COLOUR,"#00E5FF") set_trait(TRAIT_BIOLUM,1) - set_trait(TRAIT_BIOLUM_COLOUR,"#4DA4A8") \ No newline at end of file + set_trait(TRAIT_BIOLUM_COLOUR,"#4DA4A8") diff --git a/code/modules/hydroponics/seedtypes/vale.dm b/code/modules/hydroponics/seedtypes/vale.dm index 166fafcf97..37cf0d7a58 100644 --- a/code/modules/hydroponics/seedtypes/vale.dm +++ b/code/modules/hydroponics/seedtypes/vale.dm @@ -3,7 +3,7 @@ seed_name = "vale" display_name = "vale bush" kitchen_tag = "vale" - chems = list("paracetamol" = list(1,5),"dexalin" = list(1,2),"nutriment"= list(1,5)) + chems = list("paracetamol" = list(1,5),"dexalin" = list(1,2),REAGENT_ID_NUTRIMENT= list(1,5)) /datum/seed/vale/New() ..() @@ -12,4 +12,4 @@ set_trait(TRAIT_MATURATION,8) set_trait(TRAIT_PRODUCTION,10) set_trait(TRAIT_YIELD,3) - set_trait(TRAIT_POTENCY,3) \ No newline at end of file + set_trait(TRAIT_POTENCY,3) diff --git a/code/modules/hydroponics/seedtypes/vanilla.dm b/code/modules/hydroponics/seedtypes/vanilla.dm index a2bc5c8dcf..2d42a80c65 100644 --- a/code/modules/hydroponics/seedtypes/vanilla.dm +++ b/code/modules/hydroponics/seedtypes/vanilla.dm @@ -3,7 +3,7 @@ seed_name = "vanilla" display_name = "vanilla" kitchen_tag = "vanilla" - chems = list("nutriment" = list(1,10), "vanilla" = list(2,8), "sugar" = list(1, 4)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "vanilla" = list(2,8), REAGENT_ID_SUGAR = list(1, 4)) /datum/seed/vanilla/New() ..() diff --git a/code/modules/hydroponics/seedtypes/wabback.dm b/code/modules/hydroponics/seedtypes/wabback.dm index 8c1e9411f0..f2293c6133 100644 --- a/code/modules/hydroponics/seedtypes/wabback.dm +++ b/code/modules/hydroponics/seedtypes/wabback.dm @@ -4,7 +4,7 @@ seed_name = "white wabback" seed_noun = "nodes" display_name = "white wabback" - chems = list("nutriment" = list(1,10), "protein" = list(1,5), "enzyme" = list(0,3)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "protein" = list(1,5), "enzyme" = list(0,3)) kitchen_tag = "wabback" mutants = list("blackwabback","wildwabback") has_item_product = /obj/item/stack/material/cloth @@ -31,7 +31,7 @@ seed_name = "black wabback" display_name = "black wabback" mutants = null - chems = list("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), "serotrotium_v" = list(0,1)) /datum/seed/wabback/vine/New() ..() @@ -44,11 +44,11 @@ display_name = "wild wabback" mutants = list("whitewabback") has_item_product = null - chems = list("nutriment" = list(1,15), "protein" = list(0,2), "enzyme" = list(0,1)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,15), "protein" = list(0,2), "enzyme" = list(0,1)) /datum/seed/wabback/wild/New() ..() set_trait(TRAIT_IDEAL_LIGHT, 3) set_trait(TRAIT_WATER_CONSUMPTION, 7) set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.1) - set_trait(TRAIT_YIELD,5) \ No newline at end of file + set_trait(TRAIT_YIELD,5) diff --git a/code/modules/hydroponics/seedtypes/watermelon.dm b/code/modules/hydroponics/seedtypes/watermelon.dm index 79ae157295..0999d88cba 100644 --- a/code/modules/hydroponics/seedtypes/watermelon.dm +++ b/code/modules/hydroponics/seedtypes/watermelon.dm @@ -3,7 +3,7 @@ seed_name = "watermelon" display_name = "watermelon vine" kitchen_tag = "watermelon" - chems = list("nutriment" = list(1,6), "watermelonjuice" = list(10,6)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,6), "watermelonjuice" = list(10,6)) /datum/seed/watermelon/New() ..() @@ -20,4 +20,4 @@ set_trait(TRAIT_FLESH_COLOUR,"#F22C2C") set_trait(TRAIT_IDEAL_HEAT, 298) set_trait(TRAIT_IDEAL_LIGHT, 6) - set_trait(TRAIT_WATER_CONSUMPTION, 6) \ No newline at end of file + set_trait(TRAIT_WATER_CONSUMPTION, 6) diff --git a/code/modules/hydroponics/seedtypes/wheat.dm b/code/modules/hydroponics/seedtypes/wheat.dm index a657490c15..5febc076fb 100644 --- a/code/modules/hydroponics/seedtypes/wheat.dm +++ b/code/modules/hydroponics/seedtypes/wheat.dm @@ -3,7 +3,7 @@ seed_name = "wheat" display_name = "wheat stalks" kitchen_tag = "wheat" - chems = list("nutriment" = list(1,25), "flour" = list(10,30)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,25), "flour" = list(10,30)) /datum/seed/wheat/New() ..() @@ -16,4 +16,4 @@ set_trait(TRAIT_PLANT_COLOUR,"#BFAF82") set_trait(TRAIT_PLANT_ICON,"stalk2") set_trait(TRAIT_IDEAL_LIGHT, 6) - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) \ No newline at end of file + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) diff --git a/code/modules/hydroponics/seedtypes/whitebeets.dm b/code/modules/hydroponics/seedtypes/whitebeets.dm index 3534fcc7ff..04dfca254f 100644 --- a/code/modules/hydroponics/seedtypes/whitebeets.dm +++ b/code/modules/hydroponics/seedtypes/whitebeets.dm @@ -3,7 +3,7 @@ seed_name = "white-beet" display_name = "white-beets" kitchen_tag = "whitebeet" - chems = list("nutriment" = list(0,20), "sugar" = list(1,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(0,20), REAGENT_ID_SUGAR = list(1,5)) /datum/seed/whitebeets/New() ..() @@ -15,4 +15,4 @@ set_trait(TRAIT_PRODUCT_COLOUR,"#EEF5B0") set_trait(TRAIT_PLANT_COLOUR,"#4D8F53") set_trait(TRAIT_PLANT_ICON,"carrot2") - set_trait(TRAIT_WATER_CONSUMPTION, 6) \ No newline at end of file + set_trait(TRAIT_WATER_CONSUMPTION, 6) diff --git a/code/modules/hydroponics/seedtypes/wurmwoad.dm b/code/modules/hydroponics/seedtypes/wurmwoad.dm index bb4df620a2..3ca70c9af6 100644 --- a/code/modules/hydroponics/seedtypes/wurmwoad.dm +++ b/code/modules/hydroponics/seedtypes/wurmwoad.dm @@ -4,7 +4,7 @@ name = "wurmwoad" seed_name = "wurmwoad" display_name = "wurmwoad growth" - chems = list("nutriment" = list(1,10), "spacespice" = list(5,15)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "spacespice" = list(5,15)) kitchen_tag = "wurmwoad" /datum/seed/wurmwoad/New() diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 00f6e4dbb2..cb1fc39437 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -135,7 +135,7 @@ update_icon() SSplants.add_plant(src) //Some plants eat through plating. - if(islist(seed.chems) && !isnull(seed.chems["pacid"])) + if(islist(seed.chems) && !isnull(seed.chems[REAGENT_ID_PACID])) var/turf/T = get_turf(src) T.ex_act(prob(80) ? 3 : 2) diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm index 1fe2f70b05..6536b88efd 100644 --- a/code/modules/hydroponics/spreading/spreading_growth.dm +++ b/code/modules/hydroponics/spreading/spreading_growth.dm @@ -26,7 +26,7 @@ continue if(floor.density) - if(!isnull(seed.chems["pacid"])) + if(!isnull(seed.chems[REAGENT_ID_PACID])) spawn(rand(5,25)) floor.ex_act(3) continue diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 62fe40d707..f10585a8e9 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -57,70 +57,70 @@ var/static/list/toxic_reagents = list( "anti_toxin" = -2, "toxin" = 2, - "fluorine" = 2.5, - "chlorine" = 1.5, - "sacid" = 1.5, - "pacid" = 3, + REAGENT_ID_FLUORINE = 2.5, + REAGENT_ID_CHLORINE = 1.5, + REAGENT_ID_SACID = 1.5, + REAGENT_ID_PACID = 3, "plantbgone" = 3, "cryoxadone" = -3, - "radium" = 2 + REAGENT_ID_RADIUM = 2 ) var/static/list/nutrient_reagents = list( "milk" = 0.1, "beer" = 0.25, - "phosphorus" = 0.1, - "sugar" = 0.1, + REAGENT_ID_PHOSPHORUS = 0.1, + REAGENT_ID_SUGAR = 0.1, "sodawater" = 0.1, "ammonia" = 1, "diethylamine" = 2, - "nutriment" = 1, + REAGENT_ID_NUTRIMENT = 1, "adminordrazine" = 1, "eznutrient" = 1, "robustharvest" = 1, "left4zed" = 1 ) var/static/list/weedkiller_reagents = list( - "fluorine" = -4, - "chlorine" = -3, - "phosphorus" = -2, - "sugar" = 2, - "sacid" = -2, - "pacid" = -4, + REAGENT_ID_FLUORINE = -4, + REAGENT_ID_CHLORINE = -3, + REAGENT_ID_PHOSPHORUS = -2, + REAGENT_ID_SUGAR = 2, + REAGENT_ID_SACID = -2, + REAGENT_ID_PACID = -4, "plantbgone" = -8, "adminordrazine" = -5 ) var/static/list/pestkiller_reagents = list( - "sugar" = 2, + REAGENT_ID_SUGAR = 2, "diethylamine" = -2, "adminordrazine" = -5 ) var/static/list/water_reagents = list( - "water" = 1, + REAGENT_ID_WATER = 1, "adminordrazine" = 1, "milk" = 0.9, "beer" = 0.7, - "fluorine" = -0.5, - "chlorine" = -0.5, - "phosphorus" = -0.5, - "water" = 1, + REAGENT_ID_FLUORINE = -0.5, + REAGENT_ID_CHLORINE = -0.5, + REAGENT_ID_PHOSPHORUS = -0.5, + REAGENT_ID_WATER = 1, "sodawater" = 1, ) // Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order). var/static/list/beneficial_reagents = list( "beer" = list( -0.05, 0, 0 ), - "fluorine" = list( -2, 0, 0 ), - "chlorine" = list( -1, 0, 0 ), - "phosphorus" = list( -0.75, 0, 0 ), + REAGENT_ID_FLUORINE = list( -2, 0, 0 ), + REAGENT_ID_CHLORINE = list( -1, 0, 0 ), + REAGENT_ID_PHOSPHORUS = list( -0.75, 0, 0 ), "sodawater" = list( 0.1, 0, 0 ), - "sacid" = list( -1, 0, 0 ), - "pacid" = list( -2, 0, 0 ), + REAGENT_ID_SACID = list( -1, 0, 0 ), + REAGENT_ID_PACID = list( -2, 0, 0 ), "plantbgone" = list( -2, 0, 0.2), "cryoxadone" = list( 3, 0, 0 ), "ammonia" = list( 0.5, 0, 0 ), "diethylamine" = list( 1, 0, 0 ), - "nutriment" = list( 0.5, 0.1, 0 ), - "radium" = list( -1.5, 0, 0.2), + REAGENT_ID_NUTRIMENT = list( 0.5, 0.1, 0 ), + REAGENT_ID_RADIUM = list( -1.5, 0, 0.2), "adminordrazine" = list( 1, 1, 1 ), "robustharvest" = list( 0, 0.2, 0 ), "left4zed" = list( 0, 0, 0.2) @@ -129,7 +129,7 @@ // 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( - "radium" = 8, + REAGENT_ID_RADIUM = 8, "mutagen" = 15 ) diff --git a/code/modules/integrated_electronics/passive/power.dm b/code/modules/integrated_electronics/passive/power.dm index 8af9708865..b96b6d32d2 100644 --- a/code/modules/integrated_electronics/passive/power.dm +++ b/code/modules/integrated_electronics/passive/power.dm @@ -118,7 +118,7 @@ spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2) var/volume = 60 - var/list/fuel = list(REAGENT_ID_PHORON = 50000, REAGENT_ID_SLIMEJELLY = 25000, "fuel" = 15000, "carbon" = 10000, "ethanol"= 10000, "nutriment" = 8000, "blood" = 5000) + var/list/fuel = list(REAGENT_ID_PHORON = 50000, REAGENT_ID_SLIMEJELLY = 25000, REAGENT_ID_FUEL = 15000, REAGENT_ID_CARBON = 10000, REAGENT_ID_ETHANOL= 10000, REAGENT_ID_NUTRIMENT = 8000, REAGENT_ID_BLOOD = 5000) /obj/item/integrated_circuit/passive/power/chemical_cell/New() ..() diff --git a/code/modules/materials/materials/metals/metals.dm b/code/modules/materials/materials/metals/metals.dm index dbf1e502ac..123585efcc 100644 --- a/code/modules/materials/materials/metals/metals.dm +++ b/code/modules/materials/materials/metals/metals.dm @@ -4,7 +4,7 @@ // Very rare alloy that is reflective, should be used sparingly. /datum/material/durasteel - name = "durasteel" + name = MAT_DURASTEEL stack_type = /obj/item/stack/material/durasteel integrity = 600 melting_point = 7000 @@ -41,7 +41,7 @@ ) /datum/material/iron - name = "iron" + name = MAT_IRON stack_type = /obj/item/stack/material/iron icon_colour = "#5C5454" weight = 22 @@ -61,7 +61,7 @@ supply_conversion_value = 2 /datum/material/gold - name = "gold" + name = MAT_GOLD stack_type = /obj/item/stack/material/gold icon_colour = "#EDD12F" weight = 24 @@ -73,7 +73,7 @@ supply_conversion_value = 2 /datum/material/silver - name = "silver" + name = MAT_SILVER stack_type = /obj/item/stack/material/silver icon_colour = "#D1E6E3" weight = 22 @@ -85,7 +85,7 @@ supply_conversion_value = 2 /datum/material/platinum - name = "platinum" + name = MAT_PLATINUM stack_type = /obj/item/stack/material/platinum icon_colour = "#9999FF" weight = 27 @@ -96,7 +96,7 @@ supply_conversion_value = 5 /datum/material/uranium - name = "uranium" + name = MAT_URANIUM stack_type = /obj/item/stack/material/uranium radioactivity = 12 icon_base = "stone" @@ -108,7 +108,7 @@ supply_conversion_value = 2 /datum/material/mhydrogen - name = "mhydrogen" + name = MAT_METALHYDROGEN stack_type = /obj/item/stack/material/mhydrogen icon_colour = "#E6C5DE" stack_origin_tech = list(TECH_MATERIAL = 6, TECH_POWER = 6, TECH_MAGNET = 5) @@ -117,7 +117,7 @@ supply_conversion_value = 6 /datum/material/deuterium - name = "deuterium" + name = MAT_DEUTERIUM stack_type = /obj/item/stack/material/deuterium icon_colour = "#999999" stack_origin_tech = list(TECH_MATERIAL = 3) @@ -127,7 +127,7 @@ conductive = 0 /datum/material/tritium - name = "tritium" + name = MAT_TRITIUM stack_type = /obj/item/stack/material/tritium icon_colour = "#777777" stack_origin_tech = list(TECH_MATERIAL = 5) @@ -137,7 +137,7 @@ conductive = 0 /datum/material/osmium - name = "osmium" + name = MAT_OSMIUM stack_type = /obj/item/stack/material/osmium icon_colour = "#9999FF" stack_origin_tech = list(TECH_MATERIAL = 5) @@ -164,7 +164,7 @@ stack_origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2) /datum/material/bronze - name = "bronze" + name = MAT_BRONZE stack_type = /obj/item/stack/material/bronze icon_colour = "#EDD12F" icon_base = "solid" @@ -174,9 +174,9 @@ protectiveness = 9 // 33% /datum/material/tin - name = "tin" - display_name = "tin" - use_name = "tin" + name = MAT_TIN + display_name = MAT_TIN + use_name = MAT_TIN stack_type = /obj/item/stack/material/tin icon_colour = "#b2afaf" sheet_singular_name = "ingot" @@ -186,9 +186,9 @@ weight = 13 /datum/material/copper - name = "copper" - display_name = "copper" - use_name = "copper" + name = MAT_COPPER + display_name = MAT_COPPER + use_name = MAT_COPPER stack_type = /obj/item/stack/material/copper conductivity = 52 icon_colour = "#af633e" @@ -199,12 +199,12 @@ hardness = 50 /datum/material/aluminium - name = "aluminium" - display_name = "aluminium" - use_name = "aluminium" + name = MAT_ALUMINIUM + display_name = MAT_ALUMINIUM + use_name = MAT_ALUMINIUM icon_colour = "#e5e2d0" stack_type = /obj/item/stack/material/aluminium sheet_singular_name = "ingot" sheet_plural_name = "ingots" supply_conversion_value = 2 - weight = 10 \ No newline at end of file + weight = 10 diff --git a/code/modules/materials/sheets/metals/metal.dm b/code/modules/materials/sheets/metals/metal.dm index 65b41df81e..b80408d871 100644 --- a/code/modules/materials/sheets/metals/metal.dm +++ b/code/modules/materials/sheets/metals/metal.dm @@ -6,9 +6,9 @@ apply_colour = TRUE /obj/item/stack/material/plasteel - name = "plasteel" + name = MAT_PLASTEEL icon_state = "sheet-reinforced" - default_type = "plasteel" + default_type = MAT_PLASTEEL no_variants = FALSE apply_colour = TRUE @@ -26,10 +26,10 @@ icon_state = "rods" /obj/item/stack/material/durasteel - name = "durasteel" + name = MAT_DURASTEEL icon_state = "sheet-reinforced" item_state = "sheet-metal" - default_type = "durasteel" + default_type = MAT_DURASTEEL no_variants = FALSE apply_colour = TRUE @@ -42,112 +42,112 @@ no_variants = FALSE /obj/item/stack/material/iron - name = "iron" + name = MAT_IRON icon_state = "sheet-ingot" - default_type = "iron" + default_type = MAT_IRON apply_colour = 1 no_variants = FALSE /obj/item/stack/material/lead - name = "lead" + name = MAT_LEAD icon_state = "sheet-ingot" - default_type = "lead" + default_type = MAT_LEAD apply_colour = 1 no_variants = FALSE /obj/item/stack/material/gold - name = "gold" + name = MAT_GOLD icon_state = "sheet-ingot" - default_type = "gold" + default_type = MAT_GOLD no_variants = FALSE apply_colour = TRUE /obj/item/stack/material/silver - name = "silver" + name = MAT_SILVER icon_state = "sheet-ingot" - default_type = "silver" + default_type = MAT_SILVER no_variants = FALSE apply_colour = TRUE //Valuable resource, cargo can sell it. /obj/item/stack/material/platinum - name = "platinum" + name = MAT_PLATINUM icon_state = "sheet-adamantine" - default_type = "platinum" + default_type = MAT_PLATINUM no_variants = FALSE apply_colour = TRUE /obj/item/stack/material/uranium - name = "uranium" + name = MAT_URANIUM icon_state = "sheet-uranium" - default_type = "uranium" + default_type = MAT_URANIUM no_variants = FALSE //Extremely valuable to Research. /obj/item/stack/material/mhydrogen name = "metallic hydrogen" icon_state = "sheet-mythril" - default_type = "mhydrogen" + default_type = MAT_METALHYDROGEN no_variants = FALSE // Fusion fuel. /obj/item/stack/material/deuterium - name = "deuterium" + name = MAT_DEUTERIUM icon_state = "sheet-puck" - default_type = "deuterium" + default_type = MAT_DEUTERIUM apply_colour = 1 no_variants = FALSE //Fuel for MRSPACMAN generator. /obj/item/stack/material/tritium - name = "tritium" + name = MAT_TRITIUM icon_state = "sheet-puck" - default_type = "tritium" + default_type = MAT_TRITIUM apply_colour = TRUE no_variants = FALSE /obj/item/stack/material/osmium - name = "osmium" + name = MAT_OSMIUM icon_state = "sheet-ingot" - default_type = "osmium" + default_type = MAT_OSMIUM apply_colour = 1 no_variants = FALSE /obj/item/stack/material/graphite - name = "graphite" + name = MAT_GRAPHITE icon_state = "sheet-puck" default_type = MAT_GRAPHITE apply_colour = 1 no_variants = FALSE /obj/item/stack/material/bronze - name = "bronze" + name = MAT_BRONZE icon_state = "sheet-ingot" singular_name = "bronze ingot" - default_type = "bronze" + default_type = MAT_BRONZE apply_colour = 1 no_variants = FALSE /obj/item/stack/material/tin - name = "tin" + name = MAT_TIN icon_state = "sheet-ingot" singular_name = "tin ingot" - default_type = "tin" + default_type = MAT_TIN apply_colour = 1 no_variants = FALSE /obj/item/stack/material/copper - name = "copper" + name = MAT_COPPER icon_state = "sheet-ingot" singular_name = "copper ingot" - default_type = "copper" + default_type = MAT_COPPER apply_colour = 1 no_variants = FALSE /obj/item/stack/material/aluminium - name = "aluminium" + name = MAT_ALUMINIUM icon_state = "sheet-ingot" singular_name = "aluminium ingot" - default_type = "aluminium" + default_type = MAT_ALUMINIUM apply_colour = 1 no_variants = FALSE diff --git a/code/modules/mining/alloys.dm b/code/modules/mining/alloys.dm index 4ca7e64571..826f30dd5e 100644 --- a/code/modules/mining/alloys.dm +++ b/code/modules/mining/alloys.dm @@ -9,22 +9,22 @@ var/metaltag /datum/alloy/durasteel - metaltag = "durasteel" + metaltag = MAT_DURASTEEL requires = list( - "diamond" = 1, - "platinum" = 1, - "carbon" = 2, - "hematite" = 2 + ORE_DIAMOND = 1, + ORE_PLATINUM = 1, + ORE_CARBON = 2, + ORE_HEMATITE = 2 ) product_mod = 0.3 product = /obj/item/stack/material/durasteel /datum/alloy/plasteel - metaltag = "plasteel" + metaltag = MAT_PLASTEEL requires = list( - "platinum" = 1, - "carbon" = 2, - "hematite" = 2 + ORE_PLATINUM = 1, + ORE_CARBON = 2, + ORE_HEMATITE = 2 ) product_mod = 0.3 product = /obj/item/stack/material/plasteel @@ -32,24 +32,24 @@ /datum/alloy/steel metaltag = MAT_STEEL requires = list( - "carbon" = 1, - "hematite" = 1 + ORE_CARBON = 1, + ORE_HEMATITE = 1 ) product = /obj/item/stack/material/steel /datum/alloy/borosilicate - metaltag = "borosilicate glass" + metaltag = MAT_PGLASS requires = list( - "platinum" = 1, - "sand" = 2 + ORE_PLATINUM = 1, + ORE_SAND = 2 ) product = /obj/item/stack/material/glass/phoronglass /* /datum/alloy/bronze - metaltag = "bronze" + metaltag = MAT_BRONZE requires = list( - "copper" = 2, - "tin" = 1 + ORE_COPPER = 2, + ORE_TIN = 1 ) product = /obj/item/stack/material/bronze -*/ \ No newline at end of file +*/ diff --git a/code/modules/mining/alloys_vr.dm b/code/modules/mining/alloys_vr.dm index 6b2348bdba..b04f5d197e 100644 --- a/code/modules/mining/alloys_vr.dm +++ b/code/modules/mining/alloys_vr.dm @@ -3,7 +3,7 @@ requires = list( "rutile" = 1, "platinum" = 1, - "carbon" = 2, + REAGENT_ID_CARBON = 2, ) product_mod = 0.3 product = /obj/item/stack/material/plastitanium @@ -23,7 +23,7 @@ "rutile" = 1, "sand" = 2, "platinum" = 1, - "carbon" = 2, + REAGENT_ID_CARBON = 2, ) product_mod = 1 - product = /obj/item/stack/material/glass/plastitanium \ No newline at end of file + product = /obj/item/stack/material/glass/plastitanium diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm index 786ff0210e..3764591ebf 100644 --- a/code/modules/mining/ore_datum.dm +++ b/code/modules/mining/ore_datum.dm @@ -39,7 +39,7 @@ /ore/hematite name = ORE_HEMATITE - display_name = "hematite" + display_name = ORE_HEMATITE smelts_to = MAT_IRON alloy = 1 result_amount = 5 @@ -62,7 +62,7 @@ /ore/glass name = ORE_SAND - display_name = "sand" + display_name = ORE_SAND smelts_to = MAT_GLASS alloy = 1 compresses_to = "sandstone" @@ -113,7 +113,7 @@ /ore/diamond name = ORE_DIAMOND - display_name = "diamond" + display_name = ORE_DIAMOND alloy = 1 compresses_to = MAT_DIAMOND result_amount = 5 @@ -178,7 +178,7 @@ /* /ore/copper name = ORE_COPPER - display_name = "copper" + display_name = ORE_COPPER smelts_to = MAT_COPPER alloy = 1 result_amount = 5 @@ -189,7 +189,7 @@ /ore/tin name = ORE_TIN - display_name = "tin" + display_name = ORE_TIN smelts_to = MAT_TIN alloy = 1 result_amount = 5 @@ -208,7 +208,7 @@ /ore/bauxite name = ORE_BAUXITE - display_name = "bauxite" + display_name = ORE_BAUXITE smelts_to = MAT_ALUMINIUM result_amount = 5 spread_chance = 25 @@ -218,7 +218,7 @@ */ /ore/rutile name = ORE_RUTILE - display_name = "rutile" + display_name = ORE_RUTILE smelts_to = MAT_TITANIUM result_amount = 5 spread_chance = 12 diff --git a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm index f5b52e0929..4a6e50cfcc 100644 --- a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm +++ b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm @@ -134,7 +134,7 @@ // ==== /datum/medical_effect/itch name = "Itch" - triggers = list("bliss" = 10) + triggers = list(REAGENT_ID_BLISS = 10) cures = list("inaprovaline") cure_message = "The itching stops..." diff --git a/code/modules/mob/living/carbon/human/chem_side_effects.dm b/code/modules/mob/living/carbon/human/chem_side_effects.dm index f5b52e0929..4a6e50cfcc 100644 --- a/code/modules/mob/living/carbon/human/chem_side_effects.dm +++ b/code/modules/mob/living/carbon/human/chem_side_effects.dm @@ -134,7 +134,7 @@ // ==== /datum/medical_effect/itch name = "Itch" - triggers = list("bliss" = 10) + triggers = list(REAGENT_ID_BLISS = 10) cures = list("inaprovaline") cure_message = "The itching stops..." diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 5756af7e0a..a0e41c8ab4 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1040,7 +1040,7 @@ /mob/living/carbon/human/revive() if(should_have_organ(O_HEART)) - vessel.add_reagent("blood",species.blood_volume-vessel.total_volume) + vessel.add_reagent(REAGENT_ID_BLOOD,species.blood_volume-vessel.total_volume) fixblood() species.create_organs(src) // Reset our organs/limbs. @@ -1313,9 +1313,9 @@ make_blood() if(vessel.total_volume < species.blood_volume) vessel.maximum_volume = species.blood_volume - vessel.add_reagent("blood", species.blood_volume - vessel.total_volume) + vessel.add_reagent(REAGENT_ID_BLOOD, species.blood_volume - vessel.total_volume) else if(vessel.total_volume > species.blood_volume) - vessel.remove_reagent("blood",vessel.total_volume - species.blood_volume) //This one should stay remove_reagent to work even lack of a O_heart + vessel.remove_reagent(REAGENT_ID_BLOOD,vessel.total_volume - species.blood_volume) //This one should stay remove_reagent to work even lack of a O_heart vessel.maximum_volume = species.blood_volume fixblood() species.update_attack_types() //VOREStation Edit - Required for any trait that updates unarmed_types in setup. @@ -1788,7 +1788,7 @@ if(species?.flags & NO_BLOOD) bloodtrail = 0 else - var/blood_volume = vessel.get_reagent_amount("blood") + var/blood_volume = vessel.get_reagent_amount(REAGENT_ID_BLOOD) if(blood_volume < species?.blood_volume*species?.blood_level_fatal) bloodtrail = 0 //Most of it's gone already, just leave it be else diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 6ccfeb5fb8..aff6851e97 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -436,7 +436,7 @@ This function restores the subjects blood to max. if(!should_have_organ(O_HEART)) return if(vessel.total_volume < species.blood_volume) - vessel.add_reagent("blood", species.blood_volume - vessel.total_volume) + vessel.add_reagent(REAGENT_ID_BLOOD, species.blood_volume - vessel.total_volume) /* This function restores all organs. diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index e66793b754..7f0d4d7ed3 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1942,7 +1942,7 @@ if(Pump) temp += Pump.standard_pulse_level - PULSE_NORM - if(round(vessel.get_reagent_amount("blood")) <= species.blood_volume*species.blood_level_danger) //how much blood do we have + if(round(vessel.get_reagent_amount(REAGENT_ID_BLOOD)) <= species.blood_volume*species.blood_level_danger) //how much blood do we have temp = temp + 3 //not enough :( if(status_flags & FAKEDEATH) diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 128d4d70b8..2ec37f00d8 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -41,8 +41,8 @@ var/show_ssd = "fast asleep" var/virus_immune var/short_sighted // Permanent weldervision. - var/blood_name = "blood" // Name for the species' blood. - var/blood_reagents = "iron" // Reagent(s) that restore lost blood. goes by reagent IDs. + var/blood_name = REAGENT_ID_BLOOD // Name for the species' blood. + var/blood_reagents = REAGENT_ID_IRON // Reagent(s) that restore lost blood. goes by reagent IDs. var/blood_volume = 560 // Initial blood volume. var/bloodloss_rate = 1 // Multiplier for how fast a species bleeds out. Higher = Faster var/blood_level_safe = 0.85 //"Safe" blood level; above this, you're OK 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 3123fa8670..60bbc3ac10 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -338,7 +338,7 @@ name = "fruit gland" desc = "A bulbous gourd-like structure." organ_tag = A_FRUIT - var/generated_reagents = list("sugar" = 2) //This actually allows them. This could be anything, but sugar seems most fitting. + var/generated_reagents = list(REAGENT_ID_SUGAR = 2) //This actually allows them. This could be anything, but sugar seems most fitting. var/usable_volume = 250 //Five fruit. var/transfer_amount = 50 var/empty_message = list("Your have no fruit on you.", "You have a distinct lack of fruit..") diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 4c027e07c3..eb4e6a8f5b 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -318,7 +318,7 @@ flash_mod = 1.2 chemOD_mod = 0.9 - blood_reagents = "copper" + blood_reagents = REAGENT_ID_COPPER bloodloss_rate = 1.5 ambiguous_genders = TRUE diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index fb8f73b952..0ccbaf0f19 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -87,9 +87,9 @@ /mob/living/carbon/human/proc/hasnutriment() - if (bloodstr.has_reagent("nutriment", 30) || src.bloodstr.has_reagent("protein", 15)) //protein needs half as much. For reference, a steak contains 9u protein. + if (bloodstr.has_reagent(REAGENT_ID_NUTRIMENT, 30) || src.bloodstr.has_reagent("protein", 15)) //protein needs half as much. For reference, a steak contains 9u protein. return TRUE - else if (ingested.has_reagent("nutriment", 60) || src.ingested.has_reagent("protein", 30)) //try forcefeeding them, why not. Less effective. + else if (ingested.has_reagent(REAGENT_ID_NUTRIMENT, 60) || src.ingested.has_reagent("protein", 30)) //try forcefeeding them, why not. Less effective. return TRUE else return FALSE @@ -1621,9 +1621,9 @@ continue if(L == src) //no getting high off your own supply, get a nif or something, nerd. continue - if(!L.resizable && (trait_injection_selected == "macrocillin" || trait_injection_selected == "microcillin" || trait_injection_selected == "normalcillin")) // If you're using a size reagent, ignore those with pref conflicts. + if(!L.resizable && (trait_injection_selected == REAGENT_ID_MACROCILLIN || trait_injection_selected == REAGENT_ID_MICROCILLIN || trait_injection_selected == REAGENT_ID_NORMALCILLIN)) // If you're using a size reagent, ignore those with pref conflicts. continue - if(!L.allow_spontaneous_tf && (trait_injection_selected == "androrovir" || trait_injection_selected == "gynorovir" || trait_injection_selected == "androgynorovir")) // If you're using a TF reagent, ignore those with pref conflicts. + if(!L.allow_spontaneous_tf && (trait_injection_selected == REAGENT_ID_ANDROROVIR || trait_injection_selected == REAGENT_ID_GYNOROVIR || trait_injection_selected == REAGENT_ID_ANDROGYNOROVIR)) // If you're using a TF reagent, ignore those with pref conflicts. continue targets += L diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 6532e7c749..ad66fdeefd 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -206,7 +206,7 @@ flesh_color = "#AFA59E" base_color = "#333333" blood_color = "#240bc4" - blood_reagents = "copper" + blood_reagents = REAGENT_ID_COPPER reagent_tag = IS_ZORREN color_mult = 1 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 b69a65d13b..bb17f937a6 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 @@ -170,17 +170,17 @@ /datum/trait/neutral/venom_bite/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..() add_verb(H, /mob/living/proc/injection) - H.trait_injection_reagents += "microcillin" // get small - H.trait_injection_reagents += "macrocillin" // get BIG - H.trait_injection_reagents += "normalcillin" // normal + H.trait_injection_reagents += REAGENT_ID_MICROCILLIN // get small + H.trait_injection_reagents += REAGENT_ID_MACROCILLIN // get BIG + H.trait_injection_reagents += REAGENT_ID_NORMALCILLIN // normal H.trait_injection_reagents += "numbenzyme" // no feelings - H.trait_injection_reagents += "androrovir" // -> MALE - H.trait_injection_reagents += "gynorovir" // -> FEMALE - H.trait_injection_reagents += "androgynorovir" // -> PLURAL + 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 += "rainbowtoxin" // Funny flashing lights. - H.trait_injection_reagents += "paralysistoxin" // Paralysis! - H.trait_injection_reagents += "painenzyme" // Pain INCREASER + 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 /datum/trait/neutral/long_vore name = "Long Predatorial Reach" diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm index ad240a4a56..3564a2c5a9 100644 --- a/code/modules/mob/living/carbon/metroid/items.dm +++ b/code/modules/mob/living/carbon/metroid/items.dm @@ -358,7 +358,7 @@ /obj/item/reagent_containers/food/snacks/egg/slime/Initialize() . = ..() - reagents.add_reagent("nutriment", 4) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 4) reagents.add_reagent("slimejelly", 1) addtimer(CALLBACK(src, ./proc/Grow), rand(120 SECONDS, 150 SECONDS)) diff --git a/code/modules/mob/living/carbon/taste.dm b/code/modules/mob/living/carbon/taste.dm index 90e249b79a..d1d4ef4a4c 100644 --- a/code/modules/mob/living/carbon/taste.dm +++ b/code/modules/mob/living/carbon/taste.dm @@ -37,7 +37,7 @@ calculate text size per text. for(var/datum/reagent/R in reagent_list) if(!R.taste_mult) continue - if(R.id == "nutriment") //this is ugly but apparently only nutriment (not subtypes) has taste data TODO figure out why + if(R.id == REAGENT_ID_NUTRIMENT) //this is ugly but apparently only nutriment (not subtypes) has taste data TODO figure out why var/list/taste_data = R.get_data() for(var/taste in taste_data) if(taste in tastes) diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index 0baa98d422..10b7738149 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -797,7 +797,7 @@ name = "Combat Triage Belly" desc = "A mounted sleeper that stabilizes patients and can inject reagents in the borg's reserves. This one is for more extreme combat scenarios." icon_state = "sleepersyndiemed" - injection_chems = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", "synthblood") + injection_chems = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", REAGENT_ID_SYNTHBLOOD) digest_multiplier = 2 /obj/item/dogborg/sleeper/K9/syndie 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 5a4c4ea64c..7ff7c3c125 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -260,7 +260,7 @@ var/global/list/robot_modules = list( var/obj/item/reagent_containers/spray/PS = new /obj/item/reagent_containers/spray(src) src.emag += PS - PS.reagents.add_reagent("pacid", 250) + PS.reagents.add_reagent(REAGENT_ID_PACID, 250) PS.name = "Polyacid spray" var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(10000) @@ -296,7 +296,7 @@ var/global/list/robot_modules = list( var/obj/item/reagent_containers/spray/PS = locate() in src.emag if(PS) - PS.reagents.add_reagent("pacid", 2 * amount) + PS.reagents.add_reagent(REAGENT_ID_PACID, 2 * amount) ..() @@ -319,7 +319,7 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/inflatable_dispenser/robot(src) var/obj/item/reagent_containers/spray/PS = new /obj/item/reagent_containers/spray(src) src.emag += PS - PS.reagents.add_reagent("pacid", 250) + PS.reagents.add_reagent(REAGENT_ID_PACID, 250) PS.name = "Polyacid spray" var/datum/matter_synth/medicine = new /datum/matter_synth/medicine(15000) @@ -355,7 +355,7 @@ var/global/list/robot_modules = list( var/obj/item/reagent_containers/spray/PS = locate() in src.emag if(PS) - PS.reagents.add_reagent("pacid", 2 * amount) + PS.reagents.add_reagent(REAGENT_ID_PACID, 2 * amount) ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index e951368c32..6c20b92636 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -161,7 +161,7 @@ return to_chat(user, span_notice("\The [src] seems too full to eat.")) return - var/nutriment_amount = O.reagents?.get_reagent_amount("nutriment") //does it have nutriment, if so how much? + var/nutriment_amount = O.reagents?.get_reagent_amount(REAGENT_ID_NUTRIMENT) //does it have nutriment, if so how much? var/protein_amount = O.reagents?.get_reagent_amount("protein") //does it have protein, if so how much? var/glucose_amount = O.reagents?.get_reagent_amount("glucose") //does it have glucose, if so how much? var/yum = nutriment_amount + protein_amount + glucose_amount diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm index 79a6786396..64791a2fb1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm @@ -168,4 +168,4 @@ GLOBAL_VAR_INIT(jellyfish_count, 0) /obj/item/reagent_containers/food/snacks/jellyfishcore/Initialize() nutriment_amt += inherited_nutriment . = ..() - reagents.add_reagent("nutriment", nutriment_amt, nutriment_desc) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, nutriment_amt, nutriment_desc) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm index 4f9e9188c2..a8f73c964b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm @@ -512,7 +512,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? if(nutrition >= 5000) user.visible_message(span_notice("\The [user] tries to feed \the [O] to \the [src]. It snoofs but does not eat."),span_notice("You try to feed \the [O] to \the [src], but it only snoofts at it.")) return - var/nutriment_amount = O.reagents?.get_reagent_amount("nutriment") //does it have nutriment, if so how much? + var/nutriment_amount = O.reagents?.get_reagent_amount(REAGENT_ID_NUTRIMENT) //does it have nutriment, if so how much? var/protein_amount = O.reagents?.get_reagent_amount("protein") //does it have protein, if so how much? var/glucose_amount = O.reagents?.get_reagent_amount("glucose") //does it have glucose, if so how much? var/yum = nutriment_amount + protein_amount + glucose_amount diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm index 779e871695..d263936fc8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/borer/borer.dm @@ -70,7 +70,7 @@ /mob/living/simple_mob/animal/borer/handle_special() if(host && !stat && !host.stat) // Handle docility. - if(host.reagents.has_reagent("sugar") && !docile) + if(host.reagents.has_reagent(REAGENT_ID_SUGAR) && !docile) var/message = "You feel the soporific flow of sugar in your host's blood, lulling you into docility." var/target = controlling ? host : src to_chat(target, span_warning(message)) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm index 3e8f88b01a..a8e84ebd62 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm @@ -109,7 +109,7 @@ /obj/item/reagent_containers/food/snacks/meat = 20 ) - var/poison_type = "spidertoxin" // The reagent that gets injected when it attacks. + var/poison_type = REAGENT_ID_SPIDERTOXIN // The reagent that gets injected when it attacks. var/poison_chance = 10 // Chance for injection to occur. var/poison_per_bite = 5 // Amount added per injection. diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm index d4d59ed4ac..5cbb3d9fa0 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm @@ -24,7 +24,7 @@ poison_chance = 15 poison_per_bite = 2 - poison_type = "psilocybin" + poison_type = REAGENT_ID_PSILOCYBIN ai_holder_type = /datum/ai_holder/simple_mob/ranged/electric_spider @@ -62,4 +62,4 @@ can_lay_eggs = FALSE /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless - can_lay_eggs = FALSE \ No newline at end of file + can_lay_eggs = FALSE diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/webslinger.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/webslinger.dm index d793e1ae53..425d37f0af 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/webslinger.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/webslinger.dm @@ -34,7 +34,7 @@ melee_damage_lower = 8 melee_damage_upper = 15 poison_per_bite = 2 - poison_type = "psilocybin" + poison_type = REAGENT_ID_PSILOCYBIN player_msg = "You can fire a ranged attack by clicking on an enemy or tile at a distance." ai_holder_type = /datum/ai_holder/simple_mob/ranged @@ -57,4 +57,4 @@ return B.old_style_target(A, src) B.fire() - set_AI_busy(FALSE) \ No newline at end of file + set_AI_busy(FALSE) 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 029b3986ce..4917eeff5a 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 @@ -198,7 +198,7 @@ chemicals -= 50 if(host.getOxyLoss() >= 30 && chemicals > 50) - host.reagents.add_reagent("iron", 10) + host.reagents.add_reagent(REAGENT_ID_IRON, 10) chemicals -= 40 if(host.getBrainLoss() >= 10 && chemicals > 100) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm index d75fc6e33c..87e5217d5b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm @@ -158,7 +158,7 @@ icon = 'icons/mob/snake_vr.dmi' icon_state = "snack_yellow" nutriment_amt = 1 - nutriment_desc = list("sugar" = 1) + nutriment_desc = list(REAGENT_ID_SUGAR = 1) /obj/item/reagent_containers/food/snacks/snakesnack/Initialize() . = ..() @@ -166,7 +166,7 @@ snack_colour = pick( list("yellow","green","pink","blue") ) icon_state = "snack_[snack_colour]" desc = "A little mouse treat made of coloured sugar. Noodle loves these! This one is [snack_colour]." - reagents.add_reagent("sugar", 2) + reagents.add_reagent(REAGENT_ID_SUGAR, 2) /obj/item/storage/box/snakesnackbox name = "box of Snake Snax" 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 dfa5a6967a..a23102b717 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 @@ -509,7 +509,7 @@ slime_color = "green" coretype = /obj/item/slime_extract/green glow_toggle = TRUE - reagent_injected = "radium" + reagent_injected = REAGENT_ID_RADIUM var/rads = 25 description_info = "This slime will irradiate anything nearby passively, and will inject radium on attack. \ diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm index faeafaa866..86c3b58848 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm @@ -40,7 +40,7 @@ faction = FACTION_BEE - var/poison_type = "spidertoxin" // The reagent that gets injected when it attacks, can be changed to different toxin. + var/poison_type = REAGENT_ID_SPIDERTOXIN // The reagent that gets injected when it attacks, can be changed to different toxin. var/poison_chance = 10 // Chance for injection to occur. var/poison_per_bite = 1 // Amount added per injection. diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm index 3036edd2f2..93c2958519 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm @@ -1007,7 +1007,7 @@ I think I covered everything. //Alternatively bully a coder (me) to make a unique digest_mode for mob healbellies that prevents death, or something. if(istype(A, /mob/living/carbon/human)) var/mob/living/carbon/human/P = L - var/list/to_inject = list("myelamine","osteodaxon","spaceacillin","peridaxon", "iron", "hyronalin") + var/list/to_inject = list("myelamine","osteodaxon","spaceacillin","peridaxon", REAGENT_ID_IRON, "hyronalin") //Lets not OD them... for(var/RG in to_inject) if(!P.reagents.has_reagent(RG)) diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index 3364d33068..efd5db1e7d 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -35,17 +35,17 @@ var/const/CE_STABLE_THRESHOLD = 0.5 return if(!amt) - vessel.add_reagent("blood",species.blood_volume) + vessel.add_reagent(REAGENT_ID_BLOOD,species.blood_volume) else - vessel.add_reagent("blood", clamp(amt, 1, species.blood_volume)) + vessel.add_reagent(REAGENT_ID_BLOOD, clamp(amt, 1, species.blood_volume)) //Resets blood data /mob/living/carbon/human/proc/fixblood() for(var/datum/reagent/blood/B in vessel.reagent_list) - if(B.id == "blood") + if(B.id == REAGENT_ID_BLOOD) B.data = list( "donor"=src,"viruses"=null,"species"=species.name,"blood_DNA"=dna.unique_enzymes,"blood_colour"= species.get_blood_colour(src),"blood_type"=dna.b_type, \ - "resistances"=null,"trace_chem"=null, "virus2" = null, "antibodies" = list(), "blood_name" = species.get_blood_name(src)) + "resistances"=null,"trace_chem"=null, "virus2" = null, REAGENT_ID_ANTIBODIES = list(), "blood_name" = species.get_blood_name(src)) if(isSynthetic()) B.data["species"] = "synthetic" @@ -63,7 +63,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5 if(stat != DEAD && bodytemperature >= 170) //Dead or cryosleep people do not pump the blood. - var/blood_volume_raw = vessel.get_reagent_amount("blood") + var/blood_volume_raw = vessel.get_reagent_amount(REAGENT_ID_BLOOD) var/blood_volume = round((blood_volume_raw/species.blood_volume)*100) // Percentage. //Blood regeneration if there is some space @@ -222,14 +222,14 @@ var/const/CE_STABLE_THRESHOLD = 0.5 if(!amt) return 0 - var/current_blood = vessel.get_reagent_amount("blood") + var/current_blood = vessel.get_reagent_amount(REAGENT_ID_BLOOD) if(current_blood < BLOOD_MINIMUM_STOP_PROCESS) return 0 //We stop processing under 3 units of blood because apparently weird shit can make it overflowrandomly. if(amt > current_blood) amt = current_blood - 2 // Bit of a safety net; it's impossible to add blood if there's not blood already in the vessel. - return vessel.remove_reagent("blood",amt) + return vessel.remove_reagent(REAGENT_ID_BLOOD,amt) /**************************************************** BLOOD TRANSFERS @@ -281,7 +281,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5 if(!should_have_organ(O_HEART)) return null - if(vessel.get_reagent_amount("blood") < max(amount, BLOOD_MINIMUM_STOP_PROCESS)) + if(vessel.get_reagent_amount(REAGENT_ID_BLOOD) < max(amount, BLOOD_MINIMUM_STOP_PROCESS)) return null . = ..() @@ -299,8 +299,8 @@ var/const/CE_STABLE_THRESHOLD = 0.5 ContractDisease(D) if (injected.data["resistances"] && prob(5)) antibodies |= injected.data["resistances"] - if (injected.data["antibodies"] && prob(5)) - antibodies |= injected.data["antibodies"] + if (injected.data[REAGENT_ID_ANTIBODIES] && prob(5)) + antibodies |= injected.data[REAGENT_ID_ANTIBODIES] var/list/chems = list() chems = params2list(injected.data["trace_chem"]) for(var/C in chems) @@ -311,7 +311,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5 /mob/living/carbon/human/inject_blood(var/datum/reagent/blood/injected, var/amount) if(!should_have_organ(O_HEART)) - reagents.add_reagent("blood", amount, injected.data) + reagents.add_reagent(REAGENT_ID_BLOOD, amount, injected.data) reagents.update_total() return @@ -329,7 +329,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5 log_debug("Failed to re-initialize blood datums on [src]!") return if(vessel.total_volume < species.blood_volume) - vessel.add_reagent("blood", species.blood_volume - vessel.total_volume) + vessel.add_reagent(REAGENT_ID_BLOOD, species.blood_volume - vessel.total_volume) else if(vessel.total_volume > species.blood_volume) vessel.maximum_volume = species.blood_volume fixblood() @@ -343,7 +343,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5 reagents.add_reagent("toxin",amount * 0.5) reagents.update_total() else - vessel.add_reagent("blood", amount, injected.data) + vessel.add_reagent(REAGENT_ID_BLOOD, amount, injected.data) vessel.update_total() ..() diff --git a/code/modules/organs/internal/stomach.dm b/code/modules/organs/internal/stomach.dm index 38fe8a3863..48d0b87472 100644 --- a/code/modules/organs/internal/stomach.dm +++ b/code/modules/organs/internal/stomach.dm @@ -47,7 +47,7 @@ /obj/item/organ/internal/stomach/xeno color = "#555555" - acidtype = "pacid" + acidtype = REAGENT_ID_PACID /obj/item/organ/internal/stomach/machine name = "reagent cycler" @@ -56,7 +56,7 @@ robotic = ORGAN_ROBOT - acidtype = "sacid" + acidtype = REAGENT_ID_SACID organ_verbs = list(/mob/living/carbon/human/proc/reagent_purge) //VOREStation Add diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 37f7d08b90..083b197307 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -177,7 +177,7 @@ var/list/organ_cache = list() if(!owner && reagents) var/datum/reagent/blood/B = locate(/datum/reagent/blood) in reagents.reagent_list if(B && prob(40) && !isbelly(loc)) //VOREStation Edit - reagents.remove_reagent("blood",0.1) + reagents.remove_reagent(REAGENT_ID_BLOOD,0.1) blood_splatter(src,B,1) if(CONFIG_GET(flag/organs_decay) && decays) damage += rand(1,3) if(damage >= max_damage) diff --git a/code/modules/power/antimatter/fuel.dm b/code/modules/power/antimatter/fuel.dm index b602ac1e49..40c51d1fa1 100644 --- a/code/modules/power/antimatter/fuel.dm +++ b/code/modules/power/antimatter/fuel.dm @@ -89,7 +89,7 @@ O.item = src O.s_loc = user.loc O.t_loc = M.loc - O.place = "fuel" + O.place = REAGENT_ID_FUEL M.requests += O spawn( 0 ) O.process() diff --git a/code/modules/power/fusion/fusion_reactions.dm b/code/modules/power/fusion/fusion_reactions.dm index 4835c788ba..5a62f7bc54 100644 --- a/code/modules/power/fusion/fusion_reactions.dm +++ b/code/modules/power/fusion/fusion_reactions.dm @@ -67,7 +67,7 @@ var/list/fusion_reactions /decl/fusion_reaction/deuterium_lithium p_react = "deuterium" - s_react = "lithium" + s_react = REAGENT_ID_LITHIUM energy_consumption = 2 energy_production = 0 radiation = 3 @@ -82,7 +82,7 @@ var/list/fusion_reactions energy_production = 0 instability = 5 radiation = 5 - products = list("silicon"= 1) + products = list(REAGENT_ID_SILICON= 1) /decl/fusion_reaction/iron_iron p_react = REAGENT_ID_IRON diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm index 15fb77c197..7e4f2643a6 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm @@ -270,7 +270,7 @@ */ /datum/particle_smasher_recipe - var/list/reagents // example: = list("pacid" = 5) + var/list/reagents // example: = list(REAGENT_ID_PACID = 5) var/list/items // example: = list(/obj/item/tool/crowbar, /obj/item/welder) Place /foo/bar before /foo. Do not include fruit. Maximum of 3 items. var/recipe_type = PS_RESULT_STACK // Are we producing a stack or an item? @@ -319,7 +319,7 @@ return . /datum/particle_smasher_recipe/deuterium_tritium - reagents = list("hydrogen" = 15) + reagents = list(REAGENT_ID_HYDROGEN = 15) result = /obj/item/stack/material/tritium required_material = /obj/item/stack/material/deuterium @@ -349,7 +349,7 @@ probability = 10 /datum/particle_smasher_recipe/osmium_lead - reagents = list("tungsten" = 10) + reagents = list(REAGENT_ID_TUNGSTEN = 10) result = /obj/item/stack/material/lead required_material = /obj/item/stack/material/osmium @@ -362,7 +362,7 @@ probability = 50 /datum/particle_smasher_recipe/phoron_valhollide - reagents = list(REAGENT_ID_PHORON = 10, "pacid" = 10) + reagents = list(REAGENT_ID_PHORON = 10, REAGENT_ID_PACID = 10) result = /obj/item/stack/material/valhollide required_material = /obj/item/stack/material/phoron diff --git a/code/modules/projectiles/projectile/arc.dm b/code/modules/projectiles/projectile/arc.dm index 0324d273cc..271e5f2576 100644 --- a/code/modules/projectiles/projectile/arc.dm +++ b/code/modules/projectiles/projectile/arc.dm @@ -190,7 +190,7 @@ var/obj/effect/effect/water/splash = new(T) splash.create_reagents(15) splash.reagents.add_reagent("stomacid", 5) - splash.reagents.add_reagent("blood", 10,list("blood_colour" = "#ec4940")) + splash.reagents.add_reagent(REAGENT_ID_BLOOD, 10,list("blood_colour" = "#ec4940")) splash.set_color() splash.set_up(F, 2, 3) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index d0a4865482..8efdf1caa1 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -510,8 +510,8 @@ if(M.health < M.maxHealth) var/obj/effect/overlay/pulse = new /obj/effect/overlay(get_turf(M)) pulse.icon = 'icons/effects/effects.dmi' - pulse.icon_state = "heal" - pulse.name = "heal" + pulse.icon_state = XENO_CHEM_HEAL + pulse.name = XENO_CHEM_HEAL pulse.anchored = TRUE spawn(20) qdel(pulse) diff --git a/code/modules/projectiles/projectile/blob.dm b/code/modules/projectiles/projectile/blob.dm index f73fe9d008..a20adf0df9 100644 --- a/code/modules/projectiles/projectile/blob.dm +++ b/code/modules/projectiles/projectile/blob.dm @@ -53,7 +53,7 @@ /obj/item/projectile/energy/blob/acid damage_type = BURN check_armour = "bio" - my_chems = list("sacid", "mold") + my_chems = list(REAGENT_ID_SACID, "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("fuel", "mold") + my_chems = list(REAGENT_ID_FUEL, "mold") /obj/item/projectile/energy/blob/freezing my_chems = list("frostoil") diff --git a/code/modules/random_map/noise/ore.dm b/code/modules/random_map/noise/ore.dm index 4fe1b65b94..d6a57da929 100644 --- a/code/modules/random_map/noise/ore.dm +++ b/code/modules/random_map/noise/ore.dm @@ -48,67 +48,67 @@ continue if(!priority_process) sleep(-1) T.resources = list() - T.resources["sand"] = rand(3,5) - T.resources["carbon"] = rand(3,5) + T.resources[ORE_SAND] = rand(3,5) + T.resources[ORE_CARBON] = rand(3,5) var/current_cell = map[get_map_cell(x,y)] if(current_cell < rare_val) // Surface metals. - T.resources["hematite"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) - T.resources["gold"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) - T.resources["silver"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) - T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) - T.resources["marble"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) - T.resources["diamond"] = 0 + T.resources[ORE_HEMATITE] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) + T.resources[ORE_GOLD] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) + T.resources[ORE_SILVER] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) + T.resources[ORE_URANIUM] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) + T.resources[ORE_MARBLE] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) + T.resources[ORE_DIAMOND] = 0 T.resources[ORE_PHORON] = 0 - T.resources["platinum"] = 0 - T.resources["mhydrogen"] = 0 - T.resources["verdantium"] = 0 - T.resources["lead"] = 0 - //T.resources["copper"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) - //T.resources["tin"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) - //T.resources["bauxite"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) + T.resources[ORE_PLATINUM] = 0 + T.resources[ORE_MHYDROGEN] = 0 + T.resources[ORE_VERDANTIUM] = 0 + T.resources[ORE_LEAD] = 0 + //T.resources[ORE_COPPER] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) + //T.resources[ORE_TIN] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) + //T.resources[ORE_BAUXITE] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources[ORE_RUTILE] = 0 - //T.resources["void opal"] = 0 - //T.resources["quartz"] = 0 - //T.resources["painite"] = 0 + //T.resources[ORE_VOPAL] = 0 + //T.resources[ORE_QUARTZ] = 0 + //T.resources[ORE_PAINITE] = 0 else if(current_cell < deep_val) // Rare metals. - T.resources["gold"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) - T.resources["silver"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) - T.resources["uranium"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) + T.resources[ORE_GOLD] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) + T.resources[ORE_SILVER] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) + T.resources[ORE_URANIUM] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources[ORE_PHORON] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) - T.resources["platinum"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) - T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) - T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) - T.resources["mhydrogen"] = 0 - T.resources["diamond"] = 0 - T.resources["hematite"] = 0 - T.resources["marble"] = 0 - //T.resources["copper"] = 0 - //T.resources["tin"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) - //T.resources["bauxite"] = 0 + T.resources[ORE_PLATINUM] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) + T.resources[ORE_VERDANTIUM] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) + T.resources[ORE_LEAD] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) + T.resources[ORE_MHYDROGEN] = 0 + T.resources[ORE_DIAMOND] = 0 + T.resources[ORE_HEMATITE] = 0 + T.resources[ORE_MARBLE] = 0 + //T.resources[ORE_COPPER] = 0 + //T.resources[ORE_TIN] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) + //T.resources[ORE_BAUXITE] = 0 T.resources[ORE_RUTILE] = 0 - //T.resources["void opal"] = 0 - //T.resources["quartz"] = 0 - //T.resources["painite"] = 0 + //T.resources[ORE_VOPAL] = 0 + //T.resources[ORE_QUARTZ] = 0 + //T.resources[ORE_PAINITE] = 0 else // Deep metals. - T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) - T.resources["diamond"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) - T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) + T.resources[ORE_URANIUM] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) + T.resources[ORE_DIAMOND] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) + T.resources[ORE_VERDANTIUM] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) T.resources[ORE_PHORON] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) - T.resources["platinum"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) - T.resources["mhydrogen"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) - T.resources["marble"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) - T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_HIGH_MAX) - T.resources["hematite"] = 0 - T.resources["gold"] = 0 - T.resources["silver"] = 0 - //T.resources["copper"] = 0 - //T.resources["tin"] = 0 - //T.resources["bauxite"] = 0 + T.resources[ORE_PLATINUM] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) + T.resources[ORE_MHYDROGEN] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) + T.resources[ORE_MARBLE] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) + T.resources[ORE_LEAD] = rand(RESOURCE_LOW_MIN, RESOURCE_HIGH_MAX) + T.resources[ORE_HEMATITE] = 0 + T.resources[ORE_GOLD] = 0 + T.resources[ORE_SILVER] = 0 + //T.resources[ORE_COPPER] = 0 + //T.resources[ORE_TIN] = 0 + //T.resources[ORE_BAUXITE] = 0 T.resources[ORE_RUTILE] = 0 - //T.resources["void opal"] = 0 - //T.resources["quartz"] = 0 - //T.resources["painite"] = 0 + //T.resources[ORE_VOPAL] = 0 + //T.resources[ORE_QUARTZ] = 0 + //T.resources[ORE_PAINITE] = 0 return /datum/random_map/noise/ore/get_map_char(var/value) diff --git a/code/modules/reagents/holder/holder.dm b/code/modules/reagents/holder/holder.dm index 96bd9a6e05..764edc03e5 100644 --- a/code/modules/reagents/holder/holder.dm +++ b/code/modules/reagents/holder/holder.dm @@ -109,7 +109,7 @@ for(var/datum/reagent/current in reagent_list) if(current.id == id) - if(current.id == "blood") + if(current.id == REAGENT_ID_BLOOD) if(LAZYLEN(data) && !isnull(data["species"]) && !isnull(current.data["species"]) && data["species"] != current.data["species"]) // Species bloodtypes are already incompatible, this just stops it from mixing into the one already in a container. continue diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm index 9f5be5b0b1..4163478a79 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm @@ -6,53 +6,53 @@ // Multiple /obj/item/reagent_containers/chem_disp_cartridge/water - spawn_reagent = "water" + spawn_reagent = REAGENT_ID_WATER /obj/item/reagent_containers/chem_disp_cartridge/sugar - spawn_reagent = "sugar" + spawn_reagent = REAGENT_ID_SUGAR // Chemistry /obj/item/reagent_containers/chem_disp_cartridge/hydrogen - spawn_reagent = "hydrogen" + spawn_reagent = REAGENT_ID_HYDROGEN /obj/item/reagent_containers/chem_disp_cartridge/lithium - spawn_reagent = "lithium" + spawn_reagent = REAGENT_ID_LITHIUM /obj/item/reagent_containers/chem_disp_cartridge/carbon - spawn_reagent = "carbon" + spawn_reagent = REAGENT_ID_CARBON /obj/item/reagent_containers/chem_disp_cartridge/nitrogen spawn_reagent = REAGENT_ID_NITROGEN /obj/item/reagent_containers/chem_disp_cartridge/oxygen spawn_reagent = REAGENT_ID_OXYGEN /obj/item/reagent_containers/chem_disp_cartridge/fluorine - spawn_reagent = "fluorine" + spawn_reagent = REAGENT_ID_FLUORINE /obj/item/reagent_containers/chem_disp_cartridge/sodium - spawn_reagent = "sodium" + spawn_reagent = REAGENT_ID_SODIUM /obj/item/reagent_containers/chem_disp_cartridge/aluminum - spawn_reagent = "aluminum" + spawn_reagent = REAGENT_ID_ALUMINIUM /obj/item/reagent_containers/chem_disp_cartridge/silicon - spawn_reagent = "silicon" + spawn_reagent = REAGENT_ID_SILICON /obj/item/reagent_containers/chem_disp_cartridge/phosphorus - spawn_reagent = "phosphorus" + spawn_reagent = REAGENT_ID_PHOSPHORUS /obj/item/reagent_containers/chem_disp_cartridge/sulfur - spawn_reagent = "sulfur" + spawn_reagent = REAGENT_ID_SULFUR /obj/item/reagent_containers/chem_disp_cartridge/chlorine - spawn_reagent = "chlorine" + spawn_reagent = REAGENT_ID_CHLORINE /obj/item/reagent_containers/chem_disp_cartridge/potassium - spawn_reagent = "potassium" + spawn_reagent = REAGENT_ID_POTASSIUM /obj/item/reagent_containers/chem_disp_cartridge/iron - spawn_reagent = "iron" + spawn_reagent = REAGENT_ID_IRON /obj/item/reagent_containers/chem_disp_cartridge/copper - spawn_reagent = "copper" + spawn_reagent = REAGENT_ID_COPPER /obj/item/reagent_containers/chem_disp_cartridge/mercury - spawn_reagent = "mercury" + spawn_reagent = REAGENT_ID_MERCURY /obj/item/reagent_containers/chem_disp_cartridge/radium - spawn_reagent = "radium" + spawn_reagent = REAGENT_ID_RADIUM /obj/item/reagent_containers/chem_disp_cartridge/ethanol - spawn_reagent = "ethanol" + spawn_reagent = REAGENT_ID_ETHANOL /obj/item/reagent_containers/chem_disp_cartridge/sacid - spawn_reagent = "sacid" + spawn_reagent = REAGENT_ID_SACID /obj/item/reagent_containers/chem_disp_cartridge/tungsten - spawn_reagent = "tungsten" + spawn_reagent = REAGENT_ID_TUNGSTEN /obj/item/reagent_containers/chem_disp_cartridge/calcium - spawn_reagent = "calcium" + spawn_reagent = REAGENT_ID_CALCIUM // Bar, alcoholic /obj/item/reagent_containers/chem_disp_cartridge/beer diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm index abd54931b7..767e269b87 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm @@ -6,7 +6,7 @@ mutagen spawn_reagent = "mutagen" //Biochem - nutriment spawn_reagent = "nutriment" + nutriment spawn_reagent = REAGENT_ID_NUTRIMENT protein spawn_reagent = "protein" //Special Ops @@ -14,4 +14,4 @@ carthatoline spawn_reagent = "carthatoline" corophizine spawn_reagent = "corophizine" myelamine spawn_reagent = "myelamine" - osteodaxon spawn_reagent = "osteodaxon" \ No newline at end of file + osteodaxon spawn_reagent = "osteodaxon" diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm index 37e1100f8d..771319a6e1 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm @@ -29,10 +29,10 @@ /obj/machinery/chemical_dispenser dispense_reagents = list( - "hydrogen", "lithium", "carbon", REAGENT_ID_NITROGEN, REAGENT_ID_OXYGEN, "fluorine", "sodium", - "aluminum", "silicon", "phosphorus", "sulfur", "chlorine", "potassium", "iron", - "copper", "mercury", "radium", "water", "ethanol", "sugar", "sacid", "tungsten", - "calcium" + REAGENT_ID_HYDROGEN, REAGENT_ID_LITHIUM, REAGENT_ID_CARBON, REAGENT_ID_NITROGEN, REAGENT_ID_OXYGEN, REAGENT_ID_FLUORINE, REAGENT_ID_SODIUM, + REAGENT_ID_ALUMINIUM, REAGENT_ID_SILICON, REAGENT_ID_PHOSPHORUS, REAGENT_ID_SULFUR, REAGENT_ID_CHLORINE, REAGENT_ID_POTASSIUM, REAGENT_ID_IRON, + REAGENT_ID_COPPER, REAGENT_ID_MERCURY, REAGENT_ID_RADIUM, REAGENT_ID_WATER, REAGENT_ID_ETHANOL, REAGENT_ID_SUGAR, REAGENT_ID_SACID, REAGENT_ID_TUNGSTEN, + REAGENT_ID_CALCIUM ) /obj/machinery/chemical_dispenser/ert @@ -46,13 +46,13 @@ /obj/machinery/chemical_dispenser/bar_soft dispense_reagents = list( - "water", "ice", "coffee", "cream", "tea", "icetea", "cola", "spacemountainwind", "dr_gibb", "space_up", "tonic", - "sodawater", "lemonjuice", "lemon_lime", "sugar", "orangejuice", "limejuice", "watermelonjuice", "thirteenloko", "grapesoda" + REAGENT_ID_WATER, "ice", "coffee", "cream", "tea", "icetea", "cola", "spacemountainwind", "dr_gibb", "space_up", "tonic", + "sodawater", "lemonjuice", "lemon_lime", REAGENT_ID_SUGAR, "orangejuice", "limejuice", "watermelonjuice", "thirteenloko", "grapesoda" ) /obj/machinery/chemical_dispenser/bar_alc dispense_reagents = list( - "lemon_lime", "sugar", "orangejuice", "limejuice", "sodawater", "tonic", "beer", "kahlua", + "lemon_lime", REAGENT_ID_SUGAR, "orangejuice", "limejuice", "sodawater", "tonic", "beer", "kahlua", "whiskey", "redwine", "whitewine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters" ) diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm index 5a09eac7df..81c6d97350 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( - "water", "sugar", "ethanol", "radium", "ammonia", "diethylamine", "plantbgone", "mutagen", "calcium" + REAGENT_ID_WATER, REAGENT_ID_SUGAR, REAGENT_ID_ETHANOL, REAGENT_ID_RADIUM, "ammonia", "diethylamine", "plantbgone", "mutagen", REAGENT_ID_CALCIUM ) /obj/machinery/chemical_dispenser/xenoflora/full @@ -22,7 +22,7 @@ name = "bioproduct dispenser" ui_title = "Bioproduct Dispenser" dispense_reagents = list( - "nutriment", "protein", "milk" + REAGENT_ID_NUTRIMENT, "protein", "milk" ) /obj/machinery/chemical_dispenser/biochemistry/full @@ -70,4 +70,4 @@ name = "chemical dispenser" icon = 'icons/obj/abductor_vr.dmi' icon_state = "dispenser_2way" - desc = "A mysterious machine which can fabricate many chemicals." \ No newline at end of file + desc = "A mysterious machine which can fabricate many chemicals." diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 9e823fb51a..3ad75cc46c 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -108,7 +108,7 @@ /obj/structure/reagent_dispensers/watertank/Initialize() . = ..() - reagents.add_reagent("water", 1000) + reagents.add_reagent(REAGENT_ID_WATER, 1000) /obj/structure/reagent_dispensers/watertank/high name = "high-capacity water tank" @@ -117,7 +117,7 @@ /obj/structure/reagent_dispensers/watertank/high/Initialize() . = ..() - reagents.add_reagent("water", 4000) + reagents.add_reagent(REAGENT_ID_WATER, 4000) /obj/structure/reagent_dispensers/watertank/barrel name = "water barrel" @@ -128,14 +128,14 @@ /obj/structure/reagent_dispensers/fueltank name = "fuel tank" desc = "A fuel tank." - icon_state = "fuel" + icon_state = REAGENT_ID_FUEL amount_per_transfer_from_this = 10 var/modded = 0 var/obj/item/assembly_holder/rig = null /obj/structure/reagent_dispensers/fueltank/Initialize() . = ..() - reagents.add_reagent("fuel",1000) + reagents.add_reagent(REAGENT_ID_FUEL,1000) /obj/structure/reagent_dispensers/fueltank/high name = "high-capacity fuel tank" @@ -144,7 +144,7 @@ /obj/structure/reagent_dispensers/fueltank/high/Initialize() . = ..() - reagents.add_reagent("fuel",4000) + reagents.add_reagent(REAGENT_ID_FUEL,4000) //Foam /obj/structure/reagent_dispensers/foam @@ -293,7 +293,7 @@ return amount = min(amount, reagents.total_volume) - reagents.remove_reagent("fuel",amount) + reagents.remove_reagent(REAGENT_ID_FUEL,amount) new /obj/effect/decal/cleanable/liquid_fuel(src.loc, amount,1) /obj/structure/reagent_dispensers/peppertank @@ -333,7 +333,7 @@ /obj/structure/reagent_dispensers/acid/Initialize() . = ..() - reagents.add_reagent("sacid", 1000) + reagents.add_reagent(REAGENT_ID_SACID, 1000) /obj/structure/reagent_dispensers/water_cooler name = "Water-Cooler" @@ -356,7 +356,7 @@ /obj/structure/reagent_dispensers/water_cooler/Initialize() . = ..() if(bottle) - reagents.add_reagent("water",2000) + reagents.add_reagent(REAGENT_ID_WATER,2000) update_icon() /obj/structure/reagent_dispensers/water_cooler/examine(mob/user) @@ -550,4 +550,4 @@ /obj/structure/reagent_dispensers/bloodbarrel/Initialize() . = ..() - reagents.add_reagent("blood", 1000, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"="O-","resistances"=null,"trace_chem"=null)) + reagents.add_reagent(REAGENT_ID_BLOOD, 1000, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"="O-","resistances"=null,"trace_chem"=null)) diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm index 61559ad6db..240a1d564a 100644 --- a/code/modules/reagents/machinery/grinder.dm +++ b/code/modules/reagents/machinery/grinder.dm @@ -1,53 +1,53 @@ // Don't need a new list for every grinder in the game var/global/list/sheet_reagents = list( //have a number of reagents divisible by REAGENTS_PER_SHEET (default 20) unless you like decimals. - /obj/item/stack/material/plastic = list("carbon","carbon",REAGENT_ID_OXYGEN,"chlorine","sulfur"), - /obj/item/stack/material/copper = list("copper"), - /obj/item/stack/material/wood = list("carbon","woodpulp",REAGENT_ID_NITROGEN,"potassium","sodium"), - /obj/item/stack/material/stick = list("carbon","woodpulp",REAGENT_ID_NITROGEN,"potassium","sodium"), - /obj/item/stack/material/log = list("carbon","woodpulp",REAGENT_ID_NITROGEN,"potassium","sodium"), - /obj/item/stack/material/algae = list("carbon",REAGENT_ID_NITROGEN,REAGENT_ID_NITROGEN,"phosphorus","phosphorus"), - /obj/item/stack/material/graphite = list("carbon"), - /obj/item/stack/material/aluminium = list("aluminum"), // The material is aluminium, but the reagent is aluminum... - /obj/item/stack/material/glass/reinforced = list("silicon","silicon","silicon","iron","carbon"), - /obj/item/stack/material/leather = list("carbon","carbon","protein","protein","triglyceride"), - /obj/item/stack/material/cloth = list("carbon","carbon","carbon","protein","sodium"), - /obj/item/stack/material/fiber = list("carbon","carbon","carbon","protein","sodium"), - /obj/item/stack/material/fur = list("carbon","carbon","carbon","sulfur","sodium"), - /obj/item/stack/material/deuterium = list("hydrogen"), - /obj/item/stack/material/glass/phoronrglass = list("silicon","silicon","silicon",REAGENT_ID_PHORON,REAGENT_ID_PHORON), - /obj/item/stack/material/diamond = list("carbon"), - /obj/item/stack/material/durasteel = list("iron","iron","carbon","carbon","platinum"), - /obj/item/stack/material/wax = list("ethanol","triglyceride"), - /obj/item/stack/material/iron = list("iron"), + /obj/item/stack/material/plastic = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_OXYGEN,REAGENT_ID_CHLORINE,REAGENT_ID_SULFUR), + /obj/item/stack/material/copper = list(REAGENT_ID_COPPER), + /obj/item/stack/material/wood = list(REAGENT_ID_CARBON,"woodpulp",REAGENT_ID_NITROGEN,REAGENT_ID_POTASSIUM,REAGENT_ID_SODIUM), + /obj/item/stack/material/stick = list(REAGENT_ID_CARBON,"woodpulp",REAGENT_ID_NITROGEN,REAGENT_ID_POTASSIUM,REAGENT_ID_SODIUM), + /obj/item/stack/material/log = list(REAGENT_ID_CARBON,"woodpulp",REAGENT_ID_NITROGEN,REAGENT_ID_POTASSIUM,REAGENT_ID_SODIUM), + /obj/item/stack/material/algae = list(REAGENT_ID_CARBON,REAGENT_ID_NITROGEN,REAGENT_ID_NITROGEN,REAGENT_ID_PHOSPHORUS,REAGENT_ID_PHOSPHORUS), + /obj/item/stack/material/graphite = list(REAGENT_ID_CARBON), + /obj/item/stack/material/aluminium = list(REAGENT_ID_ALUMINIUM), // The material is aluminium, but the reagent is aluminum... + /obj/item/stack/material/glass/reinforced = list(REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_IRON,REAGENT_ID_CARBON), + /obj/item/stack/material/leather = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,"protein","protein","triglyceride"), + /obj/item/stack/material/cloth = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,"protein",REAGENT_ID_SODIUM), + /obj/item/stack/material/fiber = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,"protein",REAGENT_ID_SODIUM), + /obj/item/stack/material/fur = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_SULFUR,REAGENT_ID_SODIUM), + /obj/item/stack/material/deuterium = list(REAGENT_ID_HYDROGEN), + /obj/item/stack/material/glass/phoronrglass = list(REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_SILICON,REAGENT_ID_PHORON,REAGENT_ID_PHORON), + /obj/item/stack/material/diamond = list(REAGENT_ID_CARBON), + /obj/item/stack/material/durasteel = list(REAGENT_ID_IRON,REAGENT_ID_IRON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,"platinum"), + /obj/item/stack/material/wax = list(REAGENT_ID_ETHANOL,"triglyceride"), + /obj/item/stack/material/iron = list(REAGENT_ID_IRON), /obj/item/stack/material/uranium = list("uranium"), /obj/item/stack/material/phoron = list(REAGENT_ID_PHORON), /obj/item/stack/material/gold = list("gold"), /obj/item/stack/material/silver = list("silver"), /obj/item/stack/material/platinum = list("platinum"), - /obj/item/stack/material/mhydrogen = list("hydrogen"), - /obj/item/stack/material/steel = list("iron", "carbon"), - /obj/item/stack/material/plasteel = list("iron", "iron", "carbon", "carbon", "platinum"), //8 iron, 8 carbon, 4 platinum, - /obj/item/stack/material/snow = list("water"), - /obj/item/stack/material/sandstone = list("silicon", REAGENT_ID_OXYGEN), - /obj/item/stack/material/glass = list("silicon"), - /obj/item/stack/material/glass/phoronglass = list("platinum", "silicon", "silicon", "silicon"), //5 platinum, 15 silicon, + /obj/item/stack/material/mhydrogen = list(REAGENT_ID_HYDROGEN), + /obj/item/stack/material/steel = list(REAGENT_ID_IRON, REAGENT_ID_CARBON), + /obj/item/stack/material/plasteel = list(REAGENT_ID_IRON, REAGENT_ID_IRON, REAGENT_ID_CARBON, REAGENT_ID_CARBON, "platinum"), //8 iron, 8 carbon, 4 platinum, + /obj/item/stack/material/snow = list(REAGENT_ID_WATER), + /obj/item/stack/material/sandstone = list(REAGENT_ID_SILICON, REAGENT_ID_OXYGEN), + /obj/item/stack/material/glass = list(REAGENT_ID_SILICON), + /obj/item/stack/material/glass/phoronglass = list("platinum", REAGENT_ID_SILICON, REAGENT_ID_SILICON, REAGENT_ID_SILICON), //5 platinum, 15 silicon, /obj/item/stack/material/supermatter = list("supermatter") ) var/global/list/ore_reagents = list( //have a number of reageents divisible by REAGENTS_PER_ORE (default 20) unless you like decimals. - /obj/item/ore/glass = list("silicon"), - /obj/item/ore/iron = list("iron"), - /obj/item/ore/coal = list("carbon"), + /obj/item/ore/glass = list(REAGENT_ID_SILICON), + /obj/item/ore/iron = list(REAGENT_ID_IRON), + /obj/item/ore/coal = list(REAGENT_ID_CARBON), /obj/item/ore/phoron = list(REAGENT_ID_PHORON), /obj/item/ore/silver = list("silver"), /obj/item/ore/gold = list("gold"), - /obj/item/ore/marble = list("silicon","aluminum","aluminum","sodium","calcium"), // Some nice variety here + /obj/item/ore/marble = list(REAGENT_ID_SILICON,REAGENT_ID_ALUMINIUM,REAGENT_ID_ALUMINIUM,REAGENT_ID_SODIUM,REAGENT_ID_CALCIUM), // Some nice variety here /obj/item/ore/uranium = list("uranium"), - /obj/item/ore/diamond = list("carbon"), + /obj/item/ore/diamond = list(REAGENT_ID_CARBON), /obj/item/ore/osmium = list("platinum"), // should contain osmium - /obj/item/ore/lead = list("lead"), - /obj/item/ore/hydrogen = list("hydrogen"), - /obj/item/ore/verdantium = list("radium",REAGENT_ID_PHORON,REAGENT_ID_NITROGEN,"phosphorus","sodium"), // Some fun stuff to be useful with - /obj/item/ore/rutile = list("tungsten",REAGENT_ID_OXYGEN) // Should be titanium + /obj/item/ore/lead = list(REAGENT_ID_LEAD), + /obj/item/ore/hydrogen = list(REAGENT_ID_HYDROGEN), + /obj/item/ore/verdantium = list(REAGENT_ID_RADIUM,REAGENT_ID_PHORON,REAGENT_ID_NITROGEN,REAGENT_ID_PHOSPHORUS,REAGENT_ID_SODIUM), // Some fun stuff to be useful with + /obj/item/ore/rutile = list(REAGENT_ID_TUNGSTEN,REAGENT_ID_OXYGEN) // Should be titanium ) /obj/machinery/reagentgrinder diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm index ed371c9673..a233d624aa 100644 --- a/code/modules/reagents/machinery/pump.dm +++ b/code/modules/reagents/machinery/pump.dm @@ -190,7 +190,7 @@ /turf/simulated/floor/water/pump_reagents(var/datum/reagents/R, var/volume) . = ..() - R.add_reagent("water", round(volume, 0.1)) + R.add_reagent(REAGENT_ID_WATER, round(volume, 0.1)) var/datum/gas_mixture/air = return_air() // v if(air.temperature <= T0C) // Uses the current air temp, instead of the turf starting temp @@ -202,11 +202,11 @@ /turf/simulated/floor/water/pool/pump_reagents(var/datum/reagents/R, var/volume) . = ..() - R.add_reagent("chlorine", round(volume / 10, 0.1)) + R.add_reagent(REAGENT_ID_CHLORINE, round(volume / 10, 0.1)) /turf/simulated/floor/water/deep/pool/pump_reagents(var/datum/reagents/R, var/volume) . = ..() - R.add_reagent("chlorine", round(volume / 10, 0.1)) + R.add_reagent(REAGENT_ID_CHLORINE, round(volume / 10, 0.1)) /turf/simulated/floor/water/contaminated/pump_reagents(var/datum/reagents/R, var/volume) . = ..() diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm index 043e88067f..7e77348a87 100644 --- a/code/modules/reagents/reactions/distilling/distilling.dm +++ b/code/modules/reagents/reactions/distilling/distilling.dm @@ -53,7 +53,7 @@ name = "Distilling Biomass" id = "distill_biomass" result = "biomass" - required_reagents = list("blood" = 1, "sugar" = 1, REAGENT_ID_PHORON = 0.5) + required_reagents = list(REAGENT_ID_BLOOD = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_PHORON = 0.5) result_amount = 1 // 40 units per sheet, requires actually using the machine, and having blood to spare. temp_range = list(T20C + 80, T20C + 130) @@ -118,8 +118,8 @@ /decl/chemical_reaction/distilling/synthplas name = "Distilling Synthplas" id = "distill_synthplas" - result = "synthblood_dilute" - required_reagents = list("protein" = 2, "antibodies" = 1, "bicaridine" = 1) + result = REAGENT_ID_SYNTHBLOOD_DILUTE + required_reagents = list("protein" = 2, REAGENT_ID_ANTIBODIES = 1, "bicaridine" = 1) result_amount = 3 reaction_rate = HALF_LIFE(15) @@ -131,7 +131,7 @@ name = "Distilling Beer" id = "distill_beer" result = "beer" - required_reagents = list("nutriment" = 1, "water" = 1, "sugar" = 1) + required_reagents = list(REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_WATER = 1, REAGENT_ID_SUGAR = 1) result_amount = 2 reaction_rate = HALF_LIFE(30) @@ -142,8 +142,8 @@ name = "Distilling Ale" id = "distill_ale" result = "ale" - required_reagents = list("nutriment" = 1, "beer" = 1) - inhibitors = list("water" = 1) + required_reagents = list(REAGENT_ID_NUTRIMENT = 1, "beer" = 1) + inhibitors = list(REAGENT_ID_WATER = 1) result_amount = 2 reaction_rate = HALF_LIFE(30) @@ -175,7 +175,7 @@ id = "distill_cryoslurry" result = "cryoslurry" required_reagents = list("frostoil" = 7, "enzyme" = 3, "plasticide" = 3, "foaming_agent" = 2) - inhibitors = list("water" = 5) + inhibitors = list(REAGENT_ID_WATER = 5) result_amount = 1 temp_range = list(0, 15) diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm index 2dae89f233..0ea27c54ef 100644 --- a/code/modules/reagents/reactions/instant/drinks.dm +++ b/code/modules/reagents/reactions/instant/drinks.dm @@ -2,49 +2,49 @@ name = "Coffee" id = "coffee" result = "coffee" - required_reagents = list("water" = 5, "coffeepowder" = 1) + required_reagents = list(REAGENT_ID_WATER = 5, "coffeepowder" = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/tea name = "Black tea" id = "tea" result = "tea" - required_reagents = list("water" = 5, "teapowder" = 1) + required_reagents = list(REAGENT_ID_WATER = 5, "teapowder" = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/hot_coco name = "Hot Coco" id = "hot_coco" result = "hot_coco" - required_reagents = list("water" = 5, "coco" = 1) + required_reagents = list(REAGENT_ID_WATER = 5, "coco" = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/grapejuice name = "Grape Juice" id = "grapejuice" result = "grapejuice" - required_reagents = list("water" = 3, "instantgrape" = 1) + required_reagents = list(REAGENT_ID_WATER = 3, "instantgrape" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/orangejuice name = "Orange Juice" id = "orangejuice" result = "orangejuice" - required_reagents = list("water" = 3, "instantorange" = 1) + required_reagents = list(REAGENT_ID_WATER = 3, "instantorange" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/watermelonjuice name = "Watermelon Juice" id = "watermelonjuice" result = "watermelonjuice" - required_reagents = list("water" = 3, "instantwatermelon" = 1) + required_reagents = list(REAGENT_ID_WATER = 3, "instantwatermelon" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/applejuice name = "Apple Juice" id = "applejuice" result = "applejuice" - required_reagents = list("water" = 3, "instantapple" = 1) + required_reagents = list(REAGENT_ID_WATER = 3, "instantapple" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/goldschlager @@ -93,7 +93,7 @@ name = "Moonshine" id = "moonshine" result = "moonshine" - required_reagents = list("nutriment" = 10) + required_reagents = list(REAGENT_ID_NUTRIMENT = 10) catalysts = list("enzyme" = 5) result_amount = 10 @@ -174,7 +174,7 @@ name = "Kahlua" id = "kahlua" result = "kahlua" - required_reagents = list("coffee" = 5, "sugar" = 5) + required_reagents = list("coffee" = 5, REAGENT_ID_SUGAR = 5) catalysts = list("enzyme" = 5) result_amount = 5 @@ -274,7 +274,7 @@ name = "Beepksy Smash" id = "beepksysmash" result = "beepskysmash" - required_reagents = list("limejuice" = 1, "whiskey" = 1, "iron" = 1) + required_reagents = list("limejuice" = 1, "whiskey" = 1, REAGENT_ID_IRON = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/doctor_delight @@ -302,7 +302,7 @@ name = "Hooch" id = "hooch" result = "hooch" - required_reagents = list ("sugar" = 1, "ethanol" = 2, "fuel" = 1) + required_reagents = list (REAGENT_ID_SUGAR = 1, REAGENT_ID_ETHANOL = 2, REAGENT_ID_FUEL = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/irish_coffee @@ -400,7 +400,7 @@ name = "Singulo" id = "singulo" result = "singulo" - required_reagents = list("vodka" = 5, "radium" = 1, "redwine" = 5) + required_reagents = list("vodka" = 5, REAGENT_ID_RADIUM = 1, "redwine" = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/alliescocktail @@ -414,7 +414,7 @@ name = "Demons Blood" id = "demonsblood" result = "demonsblood" - required_reagents = list("rum" = 3, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1) + required_reagents = list("rum" = 3, "spacemountainwind" = 1, REAGENT_ID_BLOOD = 1, "dr_gibb" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/booger @@ -456,14 +456,14 @@ name = "Red Mead" id = "red_mead" result = "red_mead" - required_reagents = list("blood" = 1, "mead" = 1) + required_reagents = list(REAGENT_ID_BLOOD = 1, "mead" = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/mead name = "Mead" id = "mead" result = "mead" - required_reagents = list("sugar" = 1, "water" = 1) + required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_WATER = 1) catalysts = list("enzyme" = 5) result_amount = 2 @@ -485,7 +485,7 @@ name = "Grog" id = "grog" result = "grog" - required_reagents = list("rum" = 1, "water" = 1) + required_reagents = list("rum" = 1, REAGENT_ID_WATER = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/soy_latte @@ -506,14 +506,14 @@ name = "Acid Spit" id = "acidspit" result = "acidspit" - required_reagents = list("sacid" = 1, "redwine" = 5) + required_reagents = list(REAGENT_ID_SACID = 1, "redwine" = 5) result_amount = 6 /decl/chemical_reaction/instant/drinks/amasec name = "Amasec" id = "amasec" result = "amasec" - required_reagents = list("iron" = 1, "redwine" = 5, "vodka" = 5) + required_reagents = list(REAGENT_ID_IRON = 1, "redwine" = 5, "vodka" = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/changelingsting @@ -541,7 +541,7 @@ name = "Snow White" id = "snowwhite" result = "snowwhite" - required_reagents = list("pineapplejuice" = 1, "rum" = 1, "lemon_lime" = 1, "egg" = 1, "kahlua" = 1, "sugar" = 1) //VoreStation Edit + required_reagents = list("pineapplejuice" = 1, "rum" = 1, "lemon_lime" = 1, "egg" = 1, "kahlua" = 1, REAGENT_ID_SUGAR = 1) //VoreStation Edit result_amount = 2 /decl/chemical_reaction/instant/drinks/irishcarbomb @@ -569,28 +569,28 @@ name = "Devils Kiss" id = "devilskiss" result = "devilskiss" - required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1) + required_reagents = list(REAGENT_ID_BLOOD = 1, "kahlua" = 1, "rum" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/hippiesdelight name = "Hippies Delight" id = "hippiesdelight" result = "hippiesdelight" - required_reagents = list("psilocybin" = 1, "gargleblaster" = 1) + required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, "gargleblaster" = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/bananahonk name = "Banana Honk" id = "bananahonk" result = "bananahonk" - required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1) + required_reagents = list("banana" = 1, "cream" = 1, REAGENT_ID_SUGAR = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/silencer name = "Silencer" id = "silencer" result = "silencer" - required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1) + required_reagents = list("nothing" = 1, "cream" = 1, REAGENT_ID_SUGAR = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/driestmartini @@ -604,21 +604,21 @@ name = "Lemonade" id = "lemonade" result = "lemonade" - required_reagents = list("lemonjuice" = 1, "sugar" = 1, "water" = 1) + required_reagents = list("lemonjuice" = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_WATER = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/melonade name = "Melonade" id = "melonade" result = "melonade" - required_reagents = list("watermelonjuice" = 1, "sugar" = 1, "sodawater" = 1) + required_reagents = list("watermelonjuice" = 1, REAGENT_ID_SUGAR = 1, "sodawater" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/appleade name = "Appleade" id = "appleade" result = "appleade" - required_reagents = list("applejuice" = 1, "sugar" = 1, "sodawater" = 1) + required_reagents = list("applejuice" = 1, REAGENT_ID_SUGAR = 1, "sodawater" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/pineappleade @@ -647,7 +647,7 @@ name = "Berry Cordial" id = "berrycordial" result = "berrycordial" - required_reagents = list("berryjuice" = 4, "sugar" = 1, "lemonjuice" = 1) + required_reagents = list("berryjuice" = 4, REAGENT_ID_SUGAR = 1, "lemonjuice" = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/tropicalfizz @@ -655,7 +655,7 @@ id = "tropicalfizz" result = "tropicalfizz" required_reagents = list("sodawater" = 6, "berryjuice" = 1, "mint" = 1, "limejuice" = 1, "lemonjuice" = 1, "pineapplejuice" = 1) - inhibitors = list("sugar" = 1) + inhibitors = list(REAGENT_ID_SUGAR = 1) result_amount = 8 /decl/chemical_reaction/instant/drinks/melonspritzer @@ -670,14 +670,14 @@ id = "fauxfizz" result = "fauxfizz" required_reagents = list("sodawater" = 2, "berryjuice" = 1, "applejuice" = 1, "limejuice" = 1, "honey" = 1) - inhibitors = list("sugar" = 1) + inhibitors = list(REAGENT_ID_SUGAR = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/firepunch name = "Fire Punch" id = "firepunch" result = "firepunch" - required_reagents = list("sugar" = 1, "rum" = 2) + required_reagents = list(REAGENT_ID_SUGAR = 1, "rum" = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/kiraspecial @@ -838,7 +838,7 @@ name = "Tamagozake" id = "tamagozake" result = "tamagozake" - required_reagents = list("sake" = 10, "sugar" = 5, "egg" = 3) + required_reagents = list("sake" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3) result_amount = 15 /decl/chemical_reaction/instant/drinks/ginzamary @@ -908,14 +908,14 @@ name = "Debugger" id = "debugger" result = "debugger" - required_reagents = list("fuel" = 1, "sugar" = 2, "cookingoil" = 2) + required_reagents = list(REAGENT_ID_FUEL = 1, REAGENT_ID_SUGAR = 2, "cookingoil" = 2) result_amount = 5 /decl/chemical_reaction/instant/drinks/spacersbrew name = "Spacer's Brew" id = "spacersbrew" result = "spacersbrew" - required_reagents = list("brownstar" = 4, "ethanol" = 1) + required_reagents = list("brownstar" = 4, REAGENT_ID_ETHANOL = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/binmanbliss @@ -966,7 +966,7 @@ name = "Love Potion" id = "lovepotion" result = "lovepotion" - required_reagents = list("cream" = 1, "berryjuice" = 1, "sugar" = 1) + required_reagents = list("cream" = 1, "berryjuice" = 1, REAGENT_ID_SUGAR = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/morningafter @@ -1001,7 +1001,7 @@ name = "Vox's Delight" id = "voxdelight" result = "voxdelight" - required_reagents = list(REAGENT_ID_PHORON = 3, "fuel" = 1, "water" = 1) + required_reagents = list(REAGENT_ID_PHORON = 3, REAGENT_ID_FUEL = 1, REAGENT_ID_WATER = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/screamingviking @@ -1029,14 +1029,14 @@ name = "Robustin" id = "robustin" result = "robustin" - required_reagents = list("antifreeze" = 1, REAGENT_ID_PHORON = 1, "fuel" = 1, "vodka" = 1) + required_reagents = list("antifreeze" = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_FUEL = 1, "vodka" = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/virginsip name = "Virgin Sip" id = "virginsip" result = "virginsip" - required_reagents = list("driestmartini" = 1, "water" = 1) + required_reagents = list("driestmartini" = 1, REAGENT_ID_WATER = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/chocoshake @@ -1092,28 +1092,28 @@ name = "Old Fashioned" id = "oldfashioned" result = "oldfashioned" - required_reagents = list("whiskey" = 3, "bitters" = 1, "sugar" = 1) + required_reagents = list("whiskey" = 3, "bitters" = 1, REAGENT_ID_SUGAR = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/whiskeysour name = "Whiskey Sour" id = "whiskeysour" result = "whiskeysour" - required_reagents = list("whiskey" = 2, "lemonjuice" = 1, "sugar" = 1) + required_reagents = list("whiskey" = 2, "lemonjuice" = 1, REAGENT_ID_SUGAR = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/daiquiri name = "Daiquiri" id = "daiquiri" result = "daiquiri" - required_reagents = list("rum" = 3, "limejuice" = 2, "sugar" = 1) + required_reagents = list("rum" = 3, "limejuice" = 2, REAGENT_ID_SUGAR = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/mintjulep name = "Mint Julep" id = "mintjulep" result = "mintjulep" - required_reagents = list("whiskey" = 2, "water" = 1, "mint" = 1) + required_reagents = list("whiskey" = 2, REAGENT_ID_WATER = 1, "mint" = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/paloma @@ -1134,14 +1134,14 @@ name = "Mojito" id = "virginmojito" result = "virginmojito" - required_reagents = list("sodawater" = 3, "limejuice" = 1, "mint" = 1, "sugar" = 1) + required_reagents = list("sodawater" = 3, "limejuice" = 1, "mint" = 1, REAGENT_ID_SUGAR = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/piscosour name = "Pisco Sour" id = "piscosour" result = "piscosour" - required_reagents = list("winebrandy" = 1, "lemonjuice" = 1, "sugar" = 1) + required_reagents = list("winebrandy" = 1, "lemonjuice" = 1, REAGENT_ID_SUGAR = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/coldfront @@ -1162,7 +1162,7 @@ name = "Godka" id = "godka" result = "godka" - required_reagents = list("vodka" = 1, "holywater" = 1, "ethanol" = 1, "carthatoline" = 1) + required_reagents = list("vodka" = 1, "holywater" = 1, REAGENT_ID_ETHANOL = 1, "carthatoline" = 1) catalysts = list("enzyme" = 5, "holywater" = 5) result_amount = 1 @@ -1234,14 +1234,14 @@ name = "Eggnog" id = "eggnog" result = "eggnog" - required_reagents = list("milk" = 5, "cream" = 5, "sugar" = 5, "egg" = 3) + required_reagents = list("milk" = 5, "cream" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3) result_amount = 15 /decl/chemical_reaction/instant/drinks/nuclearwaste_radium name = "Nuclear Waste" id = "nuclearwasterad" result = "nuclearwaste" - required_reagents = list("oilslick" = 1, "radium" = 1, "limejuice" = 1) + required_reagents = list("oilslick" = 1, REAGENT_ID_RADIUM = 1, "limejuice" = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/nuclearwaste_uranium @@ -1255,7 +1255,7 @@ name = "Soda Oil" id = "sodaoil" result = "sodaoil" - required_reagents = list("cookingoil" = 4, "sodawater" = 1, "carbon" = 1, "tricordrazine" = 1) + required_reagents = list("cookingoil" = 4, "sodawater" = 1, REAGENT_ID_CARBON = 1, "tricordrazine" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/fusionnaire diff --git a/code/modules/reagents/reactions/instant/drinks_vr.dm b/code/modules/reagents/reactions/instant/drinks_vr.dm index b14549d3b1..cc221db1c8 100644 --- a/code/modules/reagents/reactions/instant/drinks_vr.dm +++ b/code/modules/reagents/reactions/instant/drinks_vr.dm @@ -2,9 +2,9 @@ /// Special drinks /decl/chemical_reaction/instant/drinks/grubshake name = "Grub protein drink" - id = "grubshake" - result = "grubshake" - required_reagents = list("shockchem" = 5, "water" = 25) + id = REAGENT_ID_GRUBSHAKE + result = REAGENT_ID_GRUBSHAKE + required_reagents = list("shockchem" = 5, REAGENT_ID_WATER = 25) result_amount = 30 /decl/chemical_reaction/instant/drinks/deathbell @@ -15,227 +15,234 @@ result_amount = 3 /decl/chemical_reaction/instant/drinks/burnout - name = "Burnout" - id = "burnout" - result = "burnout" - required_reagents = list("antifreeze" = 1, "deathbell" = 1, "lovemaker" =1) + name = REAGENT_BURNOUT + id = REAGENT_ID_BURNOUT + result = REAGENT_ID_BURNOUT + required_reagents = list("antifreeze" = 1, "deathbell" = 1, REAGENT_ID_LOVEMAKER =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/monstertamer - name = "Monster Tamer" - id = "monstertamer" - result = "monstertamer" + name = REAGENT_MONSTERTAMER + id = REAGENT_ID_MONSTERTAMER + result = REAGENT_ID_MONSTERTAMER required_reagents = list("whiskey" = 1, "protein" = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/bigbeer - name = "Giant Beer" - id = "bigbeer" - result = "bigbeer" + name = REAGENT_BIGBEER + id = REAGENT_ID_BIGBEER + result = REAGENT_ID_BIGBEER required_reagents = list("syndicatebomb" = 1, "manlydorf" = 1, "grog" =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/sweettea name = "Sweetened Tea" - id = "sweettea" - result = "sweettea" - required_reagents = list("icetea" = 2, "sugar" = 1,) + id = REAGENT_ID_SWEETTEA + result = REAGENT_ID_SWEETTEA + required_reagents = list("icetea" = 2, REAGENT_ID_SUGAR = 1,) result_amount = 3 /decl/chemical_reaction/instant/drinks/unsweettea - name = "Unsweetened Tea" - id = "unsweettea" - result = "unsweettea" - required_reagents = list("sweettea" = 3, REAGENT_ID_PHORON = 1) + name = REAGENT_UNSWEETTEA + id = REAGENT_ID_UNSWEETTEA + result = REAGENT_ID_UNSWEETTEA + required_reagents = list(REAGENT_ID_SWEETTEA = 3, REAGENT_ID_PHORON = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/galacticpanic - name = "Galactic Panic Attack" - id = "galacticpanic" - result = "galacticpanic" + name = REAGENT_GALACTICPANIC + id = REAGENT_ID_GALACTICPANIC + result = REAGENT_ID_GALACTICPANIC required_reagents = list("gargleblaster" = 1, "singulo" = 1, "phoronspecial" =1, "neurotoxin" = 1, "atomicbomb" = 1, "hippiesdelight" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/bulldog - name = "Space Bulldog" - id = "bulldog" - result = "bulldog" + name = REAGENT_BULLDOG + id = REAGENT_ID_BULLDOG + result = REAGENT_ID_BULLDOG required_reagents = list("whiterussian" = 4, "cola" =1) result_amount = 4 /decl/chemical_reaction/instant/drinks/sbagliato - name = "Negroni Sbagliato" - id = "sbagliato" - result = "sbagliato" + name = REAGENT_SBAGLIATO + id = REAGENT_ID_SBAGLIATO + result = REAGENT_ID_SBAGLIATO required_reagents = list("redwine" = 1, "vermouth" = 1, "sodawater" =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/italiancrisis - name = "Italian Crisis" - id = "italiancrisis" - result = "italiancrisis" - required_reagents = list("bulldog" = 1, "sbagliato" = 1) + name = REAGENT_ITALIANCRISIS + id = REAGENT_ID_ITALIANCRISIS + result = REAGENT_ID_ITALIANCRISIS + required_reagents = list(REAGENT_ID_BULLDOG = 1, REAGENT_ID_SBAGLIATO = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/sugarrush - name = "Sweet Rush" - id = "sugarrush" - result = "sugarrush" - required_reagents = list("sugar" = 1, "sodawater" = 1, "vodka" =1) + name = REAGENT_SUGARRUSH + id = REAGENT_ID_SUGARRUSH + result = REAGENT_ID_SUGARRUSH + required_reagents = list(REAGENT_ID_SUGAR = 1, "sodawater" = 1, "vodka" =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/lotus - name = "Lotus" - id = "lotus" - result = "lotus" - required_reagents = list("sbagliato" = 1, "sugarrush" = 1) + name = REAGENT_LOTUS + id = REAGENT_ID_LOTUS + result = REAGENT_ID_LOTUS + required_reagents = list(REAGENT_ID_SBAGLIATO = 1, REAGENT_ID_SUGARRUSH = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/shroomjuice - name = "Dumb Shroom Juice" - id = "shroomjuice" - result = "shroomjuice" - required_reagents = list("psilocybin" = 1, "applejuice" = 1, "limejuice" =1) + name = REAGENT_SHROOMJUICE + id = REAGENT_ID_SHROOMJUICE + result = REAGENT_ID_SHROOMJUICE + required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, "applejuice" = 1, "limejuice" =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/russianroulette - name = "Russian Roulette" - id = "russianroulette" - result = "russianroulette" - required_reagents = list("whiterussian" = 5, "iron" = 1) + name = REAGENT_RUSSIANROULETTE + id =REAGENT_ID_RUSSIANROULETTE + result =REAGENT_ID_RUSSIANROULETTE + required_reagents = list("whiterussian" = 5, REAGENT_ID_IRON = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/lovemaker - name = "The Love Maker" - id = "lovemaker" - result = "lovemaker" + name = REAGENT_LOVEMAKER + id = REAGENT_ID_LOVEMAKER + result = REAGENT_ID_LOVEMAKER required_reagents = list("honey" = 1, "sexonthebeach" = 5) result_amount = 6 /decl/chemical_reaction/instant/drinks/honeyshot - name = "Honey Shot" - id = "honeyshot" - result = "honeyshot" + name = REAGENT_HONEYSHOT + id = REAGENT_ID_HONEYSHOT + result = REAGENT_ID_HONEYSHOT required_reagents = list("honey" = 1, "vodka" = 1, "grenadine" =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/appletini - name = "Appletini" - id = "appletini" - result = "appletini" + name = REAGENT_APPLETINI + id = REAGENT_ID_APPLETINIT + result = REAGENT_ID_APPLETINIT required_reagents = list("applejuice" = 2, "vodka" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/glowingappletini - name = "Glowing Appletini" - id = "glowingappletini" - result = "glowingappletini" - required_reagents = list("appletini" = 5, "uranium" = 1) + name = REAGENT_GLOWINGAPPLETINI + id = REAGENT_ID_GLOWINGAPPLETINI + result = REAGENT_ID_GLOWINGAPPLETINI + required_reagents = list(REAGENT_ID_APPLETINIT = 5, "uranium" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/scsatw - name = "Slow Comfortable Screw Against the Wall" - id = "scsatw" - result = "scsatw" + name = REAGENT_SCSATW + id = REAGENT_ID_SCSATW + result = REAGENT_ID_SCSATW required_reagents = list("screwdrivercocktail" = 3, "rum" =1, "whiskey" =1, "gin" =1) result_amount = 6 /decl/chemical_reaction/instant/drinks/choccymilk - name = "Choccy Milk" - id = "choccymilk" - result = "choccymilk" + name = REAGENT_CHOCCYMILK + id = REAGENT_ID_CHOCCYMILK + result = REAGENT_ID_CHOCCYMILK inhibitors = list("enzyme" = 1) required_reagents = list("milk" = 3, "coco" = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/redspaceflush name = "Redspace Flush" - id = "redspaceflush" - result = "redspaceflush" - required_reagents = list("rum" = 2, "whiskey" = 2, "blood" =1, REAGENT_ID_PHORON =1) + id = REAGENT_ID_REDSPACEFLUSH + result = REAGENT_ID_REDSPACEFLUSH + required_reagents = list("rum" = 2, "whiskey" = 2, REAGENT_ID_BLOOD =1, REAGENT_ID_PHORON =1) result_amount = 6 /decl/chemical_reaction/instant/drinks/graveyard - name = "Graveyard" - id = "graveyard" - result = "graveyard" + name = REAGENT_GRAVEYARD + id = REAGENT_ID_GRAVEYARD + result = REAGENT_ID_GRAVEYARD required_reagents = list("cola" = 1, "spacemountainwind" = 1, "dr_gibb" =1, "space_up" = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/hairoftherat - name = "Hair of the Rat" - id = "hairoftherat" - result = "hairoftherat" - required_reagents = list("monstertamer" = 2, "nutriment" = 1) + name = REAGENT_HAIROFTHERAT + id = REAGENT_ID_HAIROFTHERAT + result = REAGENT_ID_HAIROFTHERAT + required_reagents = list(REAGENT_ID_MONSTERTAMER = 2, REAGENT_ID_NUTRIMENT = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/pink_russian - name = "Pink Russian" - id = "pinkrussian" - result = "pinkrussian" + name = REAGENT_PINKRUSSIAN + id = REAGENT_ID_PINKRUSSIAN + result = REAGENT_ID_PINKRUSSIAN required_reagents = list("blackrussian" = 2, "berryshake" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/originalsin - name = "Original Sin" - id = "originalsin" - result = "originalsin" + name = REAGENT_ORIGINALSIN + id = REAGENT_ID_ORIGINALSIN + result = REAGENT_ID_ORIGINALSIN required_reagents = list("holywine" = 1) catalysts = list("applejuice" = 1) result_amount = 1 /decl/chemical_reaction/instant/drinks/windgarita - name = "WND-Garita" - id = "windgarita" - result = "windgarita" + name = REAGENT_WINDGARITA + id = REAGENT_ID_WINDGARITA + result = REAGENT_ID_WINDGARITA required_reagents = list("margarita" = 3, "spacemountainwind" = 2, "melonliquor" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/newyorksour - name = "New York Sour" - id = "newyorksour" - result = "newyorksour" + name = REAGENT_NEWYORKSOUR + id = REAGENT_ID_NEWYORKSOUR + result = REAGENT_ID_NEWYORKSOUR required_reagents = list("whiskeysour" = 3, "redwine" = 2, "egg" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/mudslide - name = "Mudslide" - id = "mudslide" - result = "mudslide" + name = REAGENT_MUDSLIDE + id = REAGENT_ID_MUDSLIDE + result = REAGENT_ID_MUDSLIDE required_reagents = list("blackrussian" = 1, "irishcream" = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/protein_shake - name = "Protein Shake" - id = "protein_shake" - result = "protein_shake" - required_reagents = list("water" = 5, "protein_powder" = 1) + name = REAGENT_PROTEINSHAKE + id = REAGENT_ID_PROTEINSHAKE + result = REAGENT_ID_PROTEINSHAKE + required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_PROTEINPOWDER = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/protein_shake/vanilla - name = "Vanilla Protein Shake" - id = "vanilla_protein_shake" - result = "vanilla_protein_shake" - required_reagents = list("water" = 5, "vanilla_protein_powder" = 1) + name = REAGENT_VANILLAPROTEINSHAKE + id = REAGENT_ID_VANILLAPROTEINSHAKER + result = REAGENT_ID_VANILLAPROTEINSHAKER + required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_VANILLAPROTEINPOWDER = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/protein_shake/banana - name = "Banana Protein Shake" - id = "banana_protein_shake" - result = "banana_protein_shake" - required_reagents = list("water" = 5, "banana_protein_powder" = 1) + name = REAGENT_BANANAPROTEINSHAKE + id = REAGENT_ID_BANANAPROTEINSHAKE + result = REAGENT_ID_BANANAPROTEINSHAKE + required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_BANANAPROTEINPOWDER = 1) + result_amount = 5 + +/decl/chemical_reaction/instant/drinks/protein_shake/chocolate + name = REAGENT_CHOCOLATEPROTEINSHAKE + id = REAGENT_ID_CHOCOLATEPROTEINSHAKE + result = REAGENT_ID_CHOCOLATEPROTEINSHAKE + required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_CHOCOLATEPROTEINPOWDER = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/protein_shake/strawberry - name = "Strawberry Protein Shake" - id = "strawberry_protein_shake" - result = "strawberry_protein_shake" - required_reagents = list("water" = 5, "strawberry_protein_powder" = 1) + name = REAGENT_STRAWBERRYPROTEINSHAKE + id = REAGENT_ID_STRAWBERRYPROTEINSHAKE + result = REAGENT_ID_STRAWBERRYPROTEINSHAKE + required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_STRAWBERRYPROTEINPOWDER = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/manager_summoner - name = "Manager Summoner" - id = "manager_summoner" - result = "manager_summoner" + name = REAGENT_MANAGERSUMMONER + id = REAGENT_ID_MANAGERSUMMONER + result = REAGENT_ID_MANAGERSUMMONER required_reagents = list("margarita" = 1, "redwine" = 1, "essential_oil" = 1) result_amount = 3 diff --git a/code/modules/reagents/reactions/instant/food.dm b/code/modules/reagents/reactions/instant/food.dm index 8f28921586..5ac6b07569 100644 --- a/code/modules/reagents/reactions/instant/food.dm +++ b/code/modules/reagents/reactions/instant/food.dm @@ -2,7 +2,7 @@ name = "Hot Ramen" id = "hot_ramen" result = "hot_ramen" - required_reagents = list("water" = 1, "dry_ramen" = 3) + required_reagents = list(REAGENT_ID_WATER = 1, "dry_ramen" = 3) result_amount = 3 /decl/chemical_reaction/instant/food/hell_ramen @@ -30,7 +30,7 @@ name = "Chocolate Bar" id = "chocolate_bar" result = null - required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2) + required_reagents = list("soymilk" = 2, "coco" = 2, REAGENT_ID_SUGAR = 2) catalysts = list("enzyme" = 5) result_amount = 1 @@ -44,7 +44,7 @@ name = "Chocolate Bar" id = "chocolate_bar" result = null - required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2) + required_reagents = list("milk" = 2, "coco" = 2, REAGENT_ID_SUGAR = 2) catalysts = list("enzyme" = 5) result_amount = 1 @@ -67,7 +67,7 @@ id = "cookingoilpeanut" result = "cookingoil" required_reagents = list("peanutoil" = 10) - inhibitors = list("sugar" = 1, "sodiumchloride" = 1) + inhibitors = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_SODIUMCHLORIDE = 1) catalysts = list("enzyme" = 5) result_amount = 10 @@ -75,28 +75,28 @@ name = "Soy Sauce" id = "soysauce" result = "soysauce" - required_reagents = list("soymilk" = 4, "sacid" = 1) + required_reagents = list("soymilk" = 4, REAGENT_ID_SACID = 1) result_amount = 5 /decl/chemical_reaction/instant/food/ketchup name = "Ketchup" id = "ketchup" result = "ketchup" - required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1) + required_reagents = list("tomatojuice" = 2, REAGENT_ID_WATER = 1, REAGENT_ID_SUGAR = 1) result_amount = 4 /decl/chemical_reaction/instant/food/barbecue name = "Barbeque Sauce" id = "barbecue" result = "barbecue" - required_reagents = list("tomatojuice" = 2, "applejuice" = 1, "sugar" = 1, "spacespice" = 1) + required_reagents = list("tomatojuice" = 2, "applejuice" = 1, REAGENT_ID_SUGAR = 1, "spacespice" = 1) result_amount = 4 /decl/chemical_reaction/instant/food/peanutbutter name = "Peanut Butter" id = "peanutbutter" result = "peanutbutter" - required_reagents = list("peanutoil" = 2, "sugar" = 1, "sodiumchloride" = 1) + required_reagents = list("peanutoil" = 2, REAGENT_ID_SUGAR = 1, REAGENT_ID_SODIUMCHLORIDE = 1) catalysts = list("enzyme" = 5) result_amount = 3 @@ -104,7 +104,7 @@ name = "mayonnaise" id = "mayo" result = "mayo" - required_reagents = list("egg" = 9, "cookingoil" = 5, "lemonjuice" = 5, "sodiumchloride" = 1) + required_reagents = list("egg" = 9, "cookingoil" = 5, "lemonjuice" = 5, REAGENT_ID_SODIUMCHLORIDE = 1) result_amount = 15 /decl/chemical_reaction/instant/food/cheesewheel @@ -140,7 +140,7 @@ id = "dough" result = null required_reagents = list("egg" = 3, "flour" = 10) - inhibitors = list("water" = 1, "beer" = 1, "sugar" = 1) //To prevent it messing with batter recipes + inhibitors = list(REAGENT_ID_WATER = 1, "beer" = 1, REAGENT_ID_SUGAR = 1) //To prevent it messing with batter recipes result_amount = 1 /decl/chemical_reaction/instant/food/dough/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -153,7 +153,7 @@ name = "Syntiflesh" id = "syntiflesh" result = null - required_reagents = list("blood" = 5, "clonexadone" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5, "clonexadone" = 5) result_amount = 1 /decl/chemical_reaction/instant/food/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -172,39 +172,39 @@ name = "Batter" id = "batter" result = "batter" - required_reagents = list("egg" = 3, "flour" = 10, "water" = 5, "sodiumchloride" = 2) + required_reagents = list("egg" = 3, "flour" = 10, REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 2) result_amount = 20 /decl/chemical_reaction/instant/food/coating/beerbatter name = "Beer Batter" id = "beerbatter" result = "beerbatter" - required_reagents = list("egg" = 3, "flour" = 10, "beer" = 5, "sodiumchloride" = 2) + required_reagents = list("egg" = 3, "flour" = 10, "beer" = 5, REAGENT_ID_SODIUMCHLORIDE = 2) result_amount = 20 /decl/chemical_reaction/instant/food/browniemix name = "Brownie Mix" id = "browniemix" result = "browniemix" - required_reagents = list("flour" = 5, "coco" = 5, "sugar" = 5) + required_reagents = list("flour" = 5, "coco" = 5, REAGENT_ID_SUGAR = 5) result_amount = 15 /decl/chemical_reaction/instant/food/cakebatter name = "Cake Batter" id = "cakebatter" result = "cakebatter" - required_reagents = list("flour" = 15, "milk" = 10, "sugar" = 15, "egg" = 3) + required_reagents = list("flour" = 15, "milk" = 10, REAGENT_ID_SUGAR = 15, "egg" = 3) result_amount = 60 /decl/chemical_reaction/instant/food/butter name = "Butter" id = "butter" result = null - required_reagents = list("cream" = 20, "sodiumchloride" = 1) + required_reagents = list("cream" = 20, REAGENT_ID_SODIUMCHLORIDE = 1) result_amount = 1 /decl/chemical_reaction/instant/food/butter/on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) for(var/i = 1, i <= created_volume, i++) new /obj/item/reagent_containers/food/snacks/spreads/butter(location) - return \ No newline at end of file + return diff --git a/code/modules/reagents/reactions/instant/food_vr.dm b/code/modules/reagents/reactions/instant/food_vr.dm index 684c23e944..7c39b10a75 100644 --- a/code/modules/reagents/reactions/instant/food_vr.dm +++ b/code/modules/reagents/reactions/instant/food_vr.dm @@ -1,2 +1,2 @@ /decl/chemical_reaction/instant/food/syntiflesh - required_reagents = list("blood" = 5, "clonexadone" = 1) + required_reagents = list(REAGENT_ID_BLOOD = 5, "clonexadone" = 1) diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm index 3664755e4d..7fbec5f420 100644 --- a/code/modules/reagents/reactions/instant/instant.dm +++ b/code/modules/reagents/reactions/instant/instant.dm @@ -7,21 +7,21 @@ name = "Inaprovaline" id = "inaprovaline" result = "inaprovaline" - required_reagents = list(REAGENT_ID_OXYGEN = 1, "carbon" = 1, "sugar" = 1) + required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_SUGAR = 1) result_amount = 3 /decl/chemical_reaction/instant/dylovene name = "Dylovene" id = "anti_toxin" result = "anti_toxin" - required_reagents = list("silicon" = 1, "potassium" = 1, REAGENT_ID_NITROGEN = 1) + required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_POTASSIUM = 1, REAGENT_ID_NITROGEN = 1) result_amount = 3 /decl/chemical_reaction/instant/carthatoline name = "Carthatoline" id = "carthatoline" result = "carthatoline" - required_reagents = list("anti_toxin" = 1, "carbon" = 2, REAGENT_ID_PHORON = 0.1) + required_reagents = list("anti_toxin" = 1, REAGENT_ID_CARBON = 2, REAGENT_ID_PHORON = 0.1) catalysts = list(REAGENT_ID_PHORON = 1) result_amount = 2 @@ -29,21 +29,21 @@ name = "Paracetamol" id = "paracetamol" result = "paracetamol" - required_reagents = list("inaprovaline" = 1, REAGENT_ID_NITROGEN = 1, "water" = 1) + required_reagents = list("inaprovaline" = 1, REAGENT_ID_NITROGEN = 1, REAGENT_ID_WATER = 1) result_amount = 2 /decl/chemical_reaction/instant/tramadol name = "Tramadol" id = "tramadol" result = "tramadol" - required_reagents = list("paracetamol" = 1, "ethanol" = 1, REAGENT_ID_OXYGEN = 1) + required_reagents = list("paracetamol" = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_OXYGEN = 1) result_amount = 3 /decl/chemical_reaction/instant/oxycodone name = "Oxycodone" id = "oxycodone" result = "oxycodone" - required_reagents = list("ethanol" = 1, "tramadol" = 1) + required_reagents = list(REAGENT_ID_ETHANOL = 1, "tramadol" = 1) catalysts = list(REAGENT_ID_PHORON = 5) result_amount = 1 @@ -51,91 +51,91 @@ name = "Sterilizine" id = "sterilizine" result = "sterilizine" - required_reagents = list("ethanol" = 1, "anti_toxin" = 1, "chlorine" = 1) + required_reagents = list(REAGENT_ID_ETHANOL = 1, "anti_toxin" = 1, REAGENT_ID_CHLORINE = 1) result_amount = 3 /decl/chemical_reaction/instant/silicate name = "Silicate" id = "silicate" result = "silicate" - required_reagents = list("aluminum" = 1, "silicon" = 1, REAGENT_ID_OXYGEN = 1) + required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_SILICON = 1, REAGENT_ID_OXYGEN = 1) result_amount = 3 /decl/chemical_reaction/instant/mutagen name = "Unstable mutagen" id = "mutagen" result = "mutagen" - required_reagents = list("radium" = 1, "phosphorus" = 1, "chlorine" = 1) + required_reagents = list(REAGENT_ID_RADIUM = 1, REAGENT_ID_PHOSPHORUS = 1, REAGENT_ID_CHLORINE = 1) result_amount = 3 /decl/chemical_reaction/instant/water name = REAGENT_WATER id = REAGENT_ID_WATER result = REAGENT_ID_WATER - required_reagents = list(REAGENT_ID_OXYGEN = 1, "hydrogen" = 2) + required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_HYDROGEN = 2) result_amount = 1 /decl/chemical_reaction/instant/thermite name = "Thermite" id = "thermite" result = "thermite" - required_reagents = list("aluminum" = 1, "iron" = 1, REAGENT_ID_OXYGEN = 1) + required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_IRON = 1, REAGENT_ID_OXYGEN = 1) result_amount = 3 /decl/chemical_reaction/instant/bliss - name = "Bliss" - id = "bliss" - result = "bliss" - required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1) + name = REAGENT_BLISS + id = REAGENT_ID_BLISS + result = REAGENT_ID_BLISS + required_reagents = list(REAGENT_ID_MERCURY = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_LITHIUM = 1) result_amount = 3 /decl/chemical_reaction/instant/lube name = "Space Lube" id = "lube" result = "lube" - required_reagents = list("water" = 1, "silicon" = 1, REAGENT_ID_OXYGEN = 1) + required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_SILICON = 1, REAGENT_ID_OXYGEN = 1) result_amount = 4 /decl/chemical_reaction/instant/pacid - name = "Polytrinic acid" - id = "pacid" - result = "pacid" - required_reagents = list("sacid" = 1, "chlorine" = 1, "potassium" = 1) + name = REAGENT_PACID + id = REAGENT_ID_PACID + result = REAGENT_ID_PACID + required_reagents = list(REAGENT_ID_SACID = 1, REAGENT_ID_CHLORINE = 1, REAGENT_ID_POTASSIUM = 1) result_amount = 3 /decl/chemical_reaction/instant/synaptizine name = "Synaptizine" id = "synaptizine" result = "synaptizine" - required_reagents = list("sugar" = 1, "lithium" = 1, "water" = 1) + required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_LITHIUM = 1, REAGENT_ID_WATER = 1) result_amount = 3 /decl/chemical_reaction/instant/hyronalin name = "Hyronalin" id = "hyronalin" result = "hyronalin" - required_reagents = list("radium" = 1, "anti_toxin" = 1) + required_reagents = list(REAGENT_ID_RADIUM = 1, "anti_toxin" = 1) result_amount = 2 /decl/chemical_reaction/instant/arithrazine name = "Arithrazine" id = "arithrazine" result = "arithrazine" - required_reagents = list("hyronalin" = 1, "hydrogen" = 1) + required_reagents = list("hyronalin" = 1, REAGENT_ID_HYDROGEN = 1) result_amount = 2 /decl/chemical_reaction/instant/impedrezene name = "Impedrezene" id = "impedrezene" result = "impedrezene" - required_reagents = list("mercury" = 1, REAGENT_ID_OXYGEN = 1, "sugar" = 1) + required_reagents = list(REAGENT_ID_MERCURY = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_SUGAR = 1) result_amount = 2 /decl/chemical_reaction/instant/kelotane name = "Kelotane" id = "kelotane" result = "kelotane" - required_reagents = list("silicon" = 1, "carbon" = 1) + required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_CARBON = 1) result_amount = 2 log_is_important = 1 @@ -169,18 +169,18 @@ name = "Gastirodaxon" id = "gastirodaxon" result = "gastirodaxon" - required_reagents = list("carthatoline" = 1, "biomass" = 2, "tungsten" = 2) + required_reagents = list("carthatoline" = 1, "biomass" = 2, REAGENT_ID_TUNGSTEN = 2) catalysts = list(REAGENT_ID_PHORON = 5) - inhibitors = list("lithium" = 1) + inhibitors = list(REAGENT_ID_LITHIUM = 1) result_amount = 3 /decl/chemical_reaction/instant/hepanephrodaxon name = "Hepanephrodaxon" id = "hepanephrodaxon" result = "hepanephrodaxon" - required_reagents = list("carthatoline" = 2, "biomass" = 2, "lithium" = 1) + required_reagents = list("carthatoline" = 2, "biomass" = 2, REAGENT_ID_LITHIUM = 1) catalysts = list(REAGENT_ID_PHORON = 5) - inhibitors = list("tungsten" = 1) + inhibitors = list(REAGENT_ID_TUNGSTEN = 1) result_amount = 2 /decl/chemical_reaction/instant/cordradaxon @@ -196,14 +196,14 @@ name = "Virus Food" id = "virusfood" result = "virusfood" - required_reagents = list("water" = 1, "milk" = 1) + required_reagents = list(REAGENT_ID_WATER = 1, "milk" = 1) result_amount = 5 /decl/chemical_reaction/instant/leporazine name = "Leporazine" id = "leporazine" result = "leporazine" - required_reagents = list("silicon" = 1, "copper" = 1) + required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_COPPER = 1) catalysts = list(REAGENT_ID_PHORON = 5) result_amount = 2 @@ -211,7 +211,7 @@ name = "Cryptobiolin" id = "cryptobiolin" result = "cryptobiolin" - required_reagents = list("potassium" = 1, REAGENT_ID_OXYGEN = 1, "sugar" = 1) + required_reagents = list(REAGENT_ID_POTASSIUM = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_SUGAR = 1) result_amount = 3 /decl/chemical_reaction/instant/tricordrazine @@ -225,7 +225,7 @@ name = "Alkysine" id = "alkysine" result = "alkysine" - required_reagents = list("chlorine" = 1, REAGENT_ID_NITROGEN = 1, "anti_toxin" = 1) + required_reagents = list(REAGENT_ID_CHLORINE = 1, REAGENT_ID_NITROGEN = 1, "anti_toxin" = 1) result_amount = 2 /decl/chemical_reaction/instant/dexalin @@ -234,72 +234,72 @@ result = "dexalin" required_reagents = list(REAGENT_ID_OXYGEN = 2, REAGENT_ID_PHORON = 0.1) catalysts = list(REAGENT_ID_PHORON = 1) - inhibitors = list("water" = 1) // Messes with cryox + inhibitors = list(REAGENT_ID_WATER = 1) // Messes with cryox result_amount = 1 /decl/chemical_reaction/instant/dermaline name = "Dermaline" id = "dermaline" result = "dermaline" - required_reagents = list(REAGENT_ID_OXYGEN = 1, "phosphorus" = 1, "kelotane" = 1) + required_reagents = list(REAGENT_ID_OXYGEN = 1, REAGENT_ID_PHOSPHORUS = 1, "kelotane" = 1) result_amount = 3 /decl/chemical_reaction/instant/dexalinp name = "Dexalin Plus" id = "dexalinp" result = "dexalinp" - required_reagents = list("dexalin" = 1, "carbon" = 1, "iron" = 1) + required_reagents = list("dexalin" = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_IRON = 1) result_amount = 3 /decl/chemical_reaction/instant/bicaridine name = "Bicaridine" id = "bicaridine" result = "bicaridine" - required_reagents = list("inaprovaline" = 1, "carbon" = 1) - inhibitors = list("sugar" = 1) // Messes up with inaprovaline + required_reagents = list("inaprovaline" = 1, REAGENT_ID_CARBON = 1) + inhibitors = list(REAGENT_ID_SUGAR = 1) // Messes up with inaprovaline result_amount = 2 /decl/chemical_reaction/instant/myelamine name = "Myelamine" id = "myelamine" result = "myelamine" - required_reagents = list("bicaridine" = 1, "iron" = 2, "spidertoxin" = 1) + required_reagents = list("bicaridine" = 1, REAGENT_ID_IRON = 2, REAGENT_ID_SPIDERTOXIN = 1) result_amount = 2 /decl/chemical_reaction/instant/hyperzine name = "Hyperzine" id = "hyperzine" result = "hyperzine" - required_reagents = list("sugar" = 1, "phosphorus" = 1, "sulfur" = 1) + required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_PHOSPHORUS = 1, REAGENT_ID_SULFUR = 1) result_amount = 3 /decl/chemical_reaction/instant/stimm name = "Stimm" id = "stimm" result = "stimm" - required_reagents = list("left4zed" = 1, "fuel" = 1) - catalysts = list("fuel" = 5) + required_reagents = list("left4zed" = 1, REAGENT_ID_FUEL = 1) + catalysts = list(REAGENT_ID_FUEL = 5) result_amount = 2 /decl/chemical_reaction/instant/ryetalyn name = "Ryetalyn" id = "ryetalyn" result = "ryetalyn" - required_reagents = list("arithrazine" = 1, "carbon" = 1) + required_reagents = list("arithrazine" = 1, REAGENT_ID_CARBON = 1) result_amount = 2 /decl/chemical_reaction/instant/cryoxadone name = "Cryoxadone" id = "cryoxadone" result = "cryoxadone" - required_reagents = list("dexalin" = 1, "water" = 1, REAGENT_ID_OXYGEN = 1) + required_reagents = list("dexalin" = 1, REAGENT_ID_WATER = 1, REAGENT_ID_OXYGEN = 1) result_amount = 3 /decl/chemical_reaction/instant/clonexadone name = "Clonexadone" id = "clonexadone" result = "clonexadone" - required_reagents = list("cryoxadone" = 1, "sodium" = 1, REAGENT_ID_PHORON = 0.1) + required_reagents = list("cryoxadone" = 1, REAGENT_ID_SODIUM = 1, REAGENT_ID_PHORON = 0.1) catalysts = list(REAGENT_ID_PHORON = 5) result_amount = 2 @@ -322,7 +322,7 @@ name = "Corophizine" id = "corophizine" result = "corophizine" - required_reagents = list("spaceacillin" = 1, "carbon" = 1, REAGENT_ID_PHORON = 0.1) + required_reagents = list("spaceacillin" = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_PHORON = 0.1) catalysts = list(REAGENT_ID_PHORON = 5) result_amount = 2 @@ -330,7 +330,7 @@ name = "Immunosuprizine" id = "immunosuprizine" result = "immunosuprizine" - required_reagents = list("corophizine" = 1, "tungsten" = 1, "sacid" = 1) + required_reagents = list("corophizine" = 1, REAGENT_ID_TUNGSTEN = 1, REAGENT_ID_SACID = 1) catalysts = list(REAGENT_ID_PHORON = 5) result_amount = 2 @@ -338,43 +338,43 @@ name = "imidazoline" id = "imidazoline" result = "imidazoline" - required_reagents = list("carbon" = 1, "hydrogen" = 1, "anti_toxin" = 1) + required_reagents = list(REAGENT_ID_CARBON = 1, REAGENT_ID_HYDROGEN = 1, "anti_toxin" = 1) result_amount = 2 /decl/chemical_reaction/instant/ethylredoxrazine name = "Ethylredoxrazine" id = "ethylredoxrazine" result = "ethylredoxrazine" - required_reagents = list(REAGENT_ID_OXYGEN = 1, "anti_toxin" = 1, "carbon" = 1) + required_reagents = list(REAGENT_ID_OXYGEN = 1, "anti_toxin" = 1, REAGENT_ID_CARBON = 1) result_amount = 3 /decl/chemical_reaction/instant/calciumcarbonate name = "Calcium Carbonate" id = "calciumcarbonate" result = "calciumcarbonate" - required_reagents = list(REAGENT_ID_OXYGEN = 3, "calcium" = 1, "carbon" = 1) + required_reagents = list(REAGENT_ID_OXYGEN = 3, REAGENT_ID_CALCIUM = 1, REAGENT_ID_CARBON = 1) result_amount = 2 /decl/chemical_reaction/instant/soporific name = "Soporific" id = "stoxin" result = "stoxin" - required_reagents = list("chloralhydrate" = 1, "sugar" = 4) - inhibitors = list("phosphorus") // Messes with the smoke + required_reagents = list("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" - required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1) + 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" - required_reagents = list("sodiumchloride" = 1, "potassium" = 1) + required_reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_POTASSIUM = 1) result_amount = 2 /decl/chemical_reaction/instant/potassium_chlorophoride @@ -388,44 +388,44 @@ name = "Zombie Powder" id = "zombiepowder" result = "zombiepowder" - required_reagents = list("carpotoxin" = 5, "stoxin" = 5, "copper" = 5) + required_reagents = list("carpotoxin" = 5, "stoxin" = 5, REAGENT_ID_COPPER = 5) result_amount = 2 /decl/chemical_reaction/instant/carpotoxin name = "Carpotoxin" id = "carpotoxin" result = "carpotoxin" - required_reagents = list("spidertoxin" = 2, "biomass" = 1, "sifsap" = 2) + required_reagents = list(REAGENT_ID_SPIDERTOXIN = 2, "biomass" = 1, "sifsap" = 2) catalysts = list("sifsap" = 10) - inhibitors = list("radium" = 1) + inhibitors = list(REAGENT_ID_RADIUM = 1) result_amount = 2 /decl/chemical_reaction/instant/mindbreaker name = "Mindbreaker Toxin" id = "mindbreaker" result = "mindbreaker" - required_reagents = list("silicon" = 1, "hydrogen" = 1, "anti_toxin" = 1) + required_reagents = list(REAGENT_ID_SILICON = 1, REAGENT_ID_HYDROGEN = 1, "anti_toxin" = 1) result_amount = 3 /decl/chemical_reaction/instant/lipozine name = "Lipozine" id = "Lipozine" result = "lipozine" - required_reagents = list("sodiumchloride" = 1, "ethanol" = 1, "radium" = 1) + required_reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_RADIUM = 1) result_amount = 3 /decl/chemical_reaction/instant/surfactant name = "Foam surfactant" id = "foam surfactant" result = "fluorosurfactant" - required_reagents = list("fluorine" = 2, "carbon" = 2, "sacid" = 1) + required_reagents = list(REAGENT_ID_FLUORINE = 2, REAGENT_ID_CARBON = 2, REAGENT_ID_SACID = 1) result_amount = 5 /decl/chemical_reaction/instant/ammonia name = "Ammonia" id = "ammonia" result = "ammonia" - required_reagents = list("hydrogen" = 3, REAGENT_ID_NITROGEN = 1) + required_reagents = list(REAGENT_ID_HYDROGEN = 3, REAGENT_ID_NITROGEN = 1) inhibitors = list(REAGENT_ID_PHORON = 1) // Messes with lexorin result_amount = 3 @@ -433,7 +433,7 @@ name = "Diethylamine" id = "diethylamine" result = "diethylamine" - required_reagents = list ("ammonia" = 1, "ethanol" = 1) + required_reagents = list ("ammonia" = 1, REAGENT_ID_ETHANOL = 1) result_amount = 2 /decl/chemical_reaction/instant/left4zed @@ -447,42 +447,42 @@ name = "RobustHarvest" id = "robustharvest" result = "robustharvest" - required_reagents = list ("ammonia" = 1, "calcium" = 1, "neurotoxic_protein" = 1) + required_reagents = list ("ammonia" = 1, REAGENT_ID_CALCIUM = 1, "neurotoxic_protein" = 1) result_amount = 3 /decl/chemical_reaction/instant/space_cleaner name = "Space cleaner" id = "cleaner" result = "cleaner" - required_reagents = list("ammonia" = 1, "water" = 1) + required_reagents = list("ammonia" = 1, REAGENT_ID_WATER = 1) result_amount = 2 /decl/chemical_reaction/instant/plantbgone name = "Plant-B-Gone" id = "plantbgone" result = "plantbgone" - required_reagents = list("toxin" = 1, "water" = 4) + required_reagents = list("toxin" = 1, REAGENT_ID_WATER = 4) result_amount = 5 /decl/chemical_reaction/instant/foaming_agent name = "Foaming Agent" id = "foaming_agent" result = "foaming_agent" - required_reagents = list("lithium" = 1, "hydrogen" = 1) + required_reagents = list(REAGENT_ID_LITHIUM = 1, REAGENT_ID_HYDROGEN = 1) result_amount = 1 /decl/chemical_reaction/instant/glycerol name = "Glycerol" id = "glycerol" result = "glycerol" - required_reagents = list("cornoil" = 3, "sacid" = 1) + required_reagents = list("cornoil" = 3, REAGENT_ID_SACID = 1) result_amount = 1 /decl/chemical_reaction/instant/sodiumchloride name = "Sodium Chloride" - id = "sodiumchloride" - result = "sodiumchloride" - required_reagents = list("sodium" = 1, "chlorine" = 1) + id = REAGENT_ID_SODIUMCHLORIDE + result = REAGENT_ID_SODIUMCHLORIDE + required_reagents = list(REAGENT_ID_SODIUM = 1, REAGENT_ID_CHLORINE = 1) result_amount = 2 /decl/chemical_reaction/instant/condensedcapsaicin @@ -497,7 +497,7 @@ name = "Coolant" id = "coolant" result = "coolant" - required_reagents = list("tungsten" = 1, REAGENT_ID_OXYGEN = 1, "water" = 1) + required_reagents = list(REAGENT_ID_TUNGSTEN = 1, REAGENT_ID_OXYGEN = 1, REAGENT_ID_WATER = 1) result_amount = 3 log_is_important = 1 @@ -505,34 +505,34 @@ name = "Rezadone" id = "rezadone" result = "rezadone" - required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, "copper" = 1) + required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, REAGENT_ID_COPPER = 1) result_amount = 3 /decl/chemical_reaction/instant/lexorin name = "Lexorin" id = "lexorin" result = "lexorin" - required_reagents = list(REAGENT_ID_PHORON = 1, "hydrogen" = 1, REAGENT_ID_NITROGEN = 1) + required_reagents = list(REAGENT_ID_PHORON = 1, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_NITROGEN = 1) result_amount = 3 /decl/chemical_reaction/instant/methylphenidate - name = "Methylphenidate" - id = "methylphenidate" - result = "methylphenidate" - required_reagents = list("mindbreaker" = 1, "hydrogen" = 1) + name = REAGENT_METHYLPHENIDATE + id = REAGENT_ID_METHYLPHENIDATE + result = REAGENT_ID_METHYLPHENIDATE + required_reagents = list("mindbreaker" = 1, REAGENT_ID_HYDROGEN = 1) result_amount = 3 /decl/chemical_reaction/instant/citalopram - name = "Citalopram" - id = "citalopram" - result = "citalopram" - required_reagents = list("mindbreaker" = 1, "carbon" = 1) + name = REAGENT_CITALOPRAM + id = REAGENT_ID_CITALOPRAM + result = REAGENT_ID_CITALOPRAM + required_reagents = list("mindbreaker" = 1, REAGENT_ID_CARBON = 1) result_amount = 3 /decl/chemical_reaction/instant/paroxetine - name = "Paroxetine" - id = "paroxetine" - result = "paroxetine" + name = REAGENT_PAROXETINE + id = REAGENT_ID_PAROXETINE + result = REAGENT_ID_PAROXETINE required_reagents = list("mindbreaker" = 1, REAGENT_ID_OXYGEN = 1, "inaprovaline" = 1) result_amount = 3 @@ -547,7 +547,7 @@ name = "Luminol" id = "luminol" result = "luminol" - required_reagents = list("hydrogen" = 2, "carbon" = 2, "ammonia" = 2) + required_reagents = list(REAGENT_ID_HYDROGEN = 2, REAGENT_ID_CARBON = 2, "ammonia" = 2) result_amount = 6 /* Solidification */ @@ -556,7 +556,7 @@ name = "Solid Iron" id = "solidiron" result = null - required_reagents = list("frostoil" = 5, "iron" = REAGENTS_PER_SHEET) + required_reagents = list("frostoil" = 5, REAGENT_ID_IRON = REAGENTS_PER_SHEET) result_amount = 1 var/sheet_to_give = /obj/item/stack/material/iron @@ -603,7 +603,7 @@ /decl/chemical_reaction/instant/solidification/hydrogen name = "Solid Hydrogen" id = "solidhydrogen" - required_reagents = list("frostoil" = 100, "hydrogen" = REAGENTS_PER_SHEET) + required_reagents = list("frostoil" = 100, REAGENT_ID_HYDROGEN = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/mhydrogen @@ -626,7 +626,7 @@ name = "Plastic" id = "solidplastic" result = null - required_reagents = list("pacid" = 1, "plasticide" = 2) + required_reagents = list(REAGENT_ID_PACID = 1, "plasticide" = 2) result_amount = 1 /decl/chemical_reaction/instant/plastication/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -692,7 +692,7 @@ /decl/chemical_reaction/instant/concrete name = "Concrete" id = "concretereagent" - required_reagents = list("calcium" = 2, "silicate" = 2, "water" = 2) + required_reagents = list(REAGENT_ID_CALCIUM = 2, "silicate" = 2, REAGENT_ID_WATER = 2) result_amount = 1 /decl/chemical_reaction/instant/concrete/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -705,7 +705,7 @@ name = "Explosion" id = "explosion_potassium" result = null - required_reagents = list("water" = 1, "potassium" = 1) + required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_POTASSIUM = 1) result_amount = 2 mix_message = null @@ -729,7 +729,7 @@ name = "Flash powder" id = "flash_powder" result = null - required_reagents = list("aluminum" = 1, "potassium" = 1, "sulfur" = 1 ) + required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_POTASSIUM = 1, REAGENT_ID_SULFUR = 1 ) result_amount = null /decl/chemical_reaction/instant/flash_powder/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -759,7 +759,7 @@ name = "EMP Pulse" id = "emp_pulse" result = null - required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense + required_reagents = list("uranium" = 1, REAGENT_ID_IRON = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense result_amount = 2 /decl/chemical_reaction/instant/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -777,7 +777,7 @@ name = "Nitroglycerin" id = "nitroglycerin" result = "nitroglycerin" - required_reagents = list("glycerol" = 1, "pacid" = 1, "sacid" = 1) + required_reagents = list("glycerol" = 1, REAGENT_ID_PACID = 1, REAGENT_ID_SACID = 1) result_amount = 2 log_is_important = 1 @@ -802,7 +802,7 @@ name = "Napalm" id = "napalm" result = null - required_reagents = list("aluminum" = 1, REAGENT_ID_PHORON = 1, "sacid" = 1 ) + required_reagents = list(REAGENT_ID_ALUMINIUM = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_SACID = 1 ) result_amount = 1 /decl/chemical_reaction/instant/napalm/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -817,7 +817,7 @@ name = "Chemsmoke" id = "chemsmoke" result = null - required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1) + required_reagents = list(REAGENT_ID_POTASSIUM = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_PHOSPHORUS = 1) result_amount = 0.4 /decl/chemical_reaction/instant/chemsmoke/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -838,7 +838,7 @@ name = "Foam" id = "foam" result = null - required_reagents = list("fluorosurfactant" = 1, "water" = 1) + required_reagents = list("fluorosurfactant" = 1, REAGENT_ID_WATER = 1) result_amount = 2 mix_message = "The solution violently bubbles!" @@ -861,7 +861,7 @@ name = "Metal Foam" id = "metalfoam" result = null - required_reagents = list("aluminum" = 3, "foaming_agent" = 1, "pacid" = 1) + required_reagents = list(REAGENT_ID_ALUMINIUM = 3, "foaming_agent" = 1, REAGENT_ID_PACID = 1) result_amount = 5 /decl/chemical_reaction/instant/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -879,7 +879,7 @@ name = "Iron Foam" id = "ironlfoam" result = null - required_reagents = list("iron" = 3, "foaming_agent" = 1, "pacid" = 1) + required_reagents = list(REAGENT_ID_IRON = 3, "foaming_agent" = 1, REAGENT_ID_PACID = 1) result_amount = 5 /decl/chemical_reaction/instant/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -899,7 +899,7 @@ name = "Red paint" id = "red_paint" result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_red" = 1) + required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_red" = 1) result_amount = 5 /decl/chemical_reaction/instant/red_paint/send_data() @@ -909,7 +909,7 @@ name = "Orange paint" id = "orange_paint" result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_orange" = 1) + required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_orange" = 1) result_amount = 5 /decl/chemical_reaction/instant/orange_paint/send_data() @@ -919,7 +919,7 @@ name = "Yellow paint" id = "yellow_paint" result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_yellow" = 1) + required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_yellow" = 1) result_amount = 5 /decl/chemical_reaction/instant/yellow_paint/send_data() @@ -929,7 +929,7 @@ name = "Green paint" id = "green_paint" result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_green" = 1) + required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_green" = 1) result_amount = 5 /decl/chemical_reaction/instant/green_paint/send_data() @@ -939,7 +939,7 @@ name = "Blue paint" id = "blue_paint" result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_blue" = 1) + required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_blue" = 1) result_amount = 5 /decl/chemical_reaction/instant/blue_paint/send_data() @@ -949,7 +949,7 @@ name = "Purple paint" id = "purple_paint" result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_purple" = 1) + required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_purple" = 1) result_amount = 5 /decl/chemical_reaction/instant/purple_paint/send_data() @@ -959,7 +959,7 @@ name = "Grey paint" id = "grey_paint" result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_grey" = 1) + required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_grey" = 1) result_amount = 5 /decl/chemical_reaction/instant/grey_paint/send_data() @@ -969,7 +969,7 @@ name = "Brown paint" id = "brown_paint" result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_brown" = 1) + required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, "marker_ink_brown" = 1) result_amount = 5 /decl/chemical_reaction/instant/brown_paint/send_data() @@ -979,11 +979,11 @@ name = "Blood paint" id = "blood_paint" result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "blood" = 2) + required_reagents = list("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) - var/t = T.get_data("blood") + var/t = T.get_data(REAGENT_ID_BLOOD) if(t && t["blood_colour"]) return t["blood_colour"] return "#FE191A" // Probably red @@ -992,7 +992,7 @@ name = "Milk paint" id = "milk_paint" result = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "milk" = 5) + required_reagents = list("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 = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "orangejuice" = 5) + required_reagents = list("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 = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "tomatojuice" = 5) + required_reagents = list("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 = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "limejuice" = 5) + required_reagents = list("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 = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "carrotjuice" = 5) + required_reagents = list("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 = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "berryjuice" = 5) + required_reagents = list("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 = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "grapejuice" = 5) + required_reagents = list("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 = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "poisonberryjuice" = 5) + required_reagents = list("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 = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "watermelonjuice" = 5) + required_reagents = list("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 = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "lemonjuice" = 5) + required_reagents = list("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 = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "banana" = 5) + required_reagents = list("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 = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "potatojuice" = 5) + required_reagents = list("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 = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "carbon" = 1) + required_reagents = list("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 = "paint" - required_reagents = list("plasticide" = 1, "water" = 3, "aluminum" = 1) + required_reagents = list("plasticide" = 1, REAGENT_ID_WATER = 3, REAGENT_ID_ALUMINIUM = 1) result_amount = 5 /decl/chemical_reaction/instant/aluminum_paint/send_data() @@ -1133,7 +1133,7 @@ name = "Black Carpet Dyeing" id = "carpetdyeblack" result = "liquidcarpetb" - required_reagents = list("liquidcarpet" = 5, "carbon" = 1) + required_reagents = list("liquidcarpet" = 5, REAGENT_ID_CARBON = 1) result_amount = 5 /decl/chemical_reaction/instant/carpetdye/blue @@ -1146,7 +1146,7 @@ name = "Turqouise Carpet Dyeing" id = "carpetdyetur" result = "liquidcarpettur" - required_reagents = list("liquidcarpet" = 5, "water" = 1) + required_reagents = list("liquidcarpet" = 5, REAGENT_ID_WATER = 1) /decl/chemical_reaction/instant/carpetdye/sblu name = "Silver Blue Carpet Dyeing" @@ -1178,7 +1178,7 @@ name = "Hydrophoron" id = "hydrophoron" result = "hydrophoron" - required_reagents = list("hydrogen" = 1, REAGENT_ID_PHORON = 1) + 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,29 +1186,29 @@ name = "Deuterium" id = "deuterium" result = "deuterium" - required_reagents = list("hydrophoron" = 1, "water" = 2) + required_reagents = list("hydrophoron" = 1, REAGENT_ID_WATER = 2) result_amount = 3 //Skrellian crap. /decl/chemical_reaction/instant/talum_quem - name = "Talum-quem" - id = "talum_quem" - result = "talum_quem" - required_reagents = list("bliss" = 2, "sugar" = 1, "amatoxin" = 1) + name = REAGENT_TALUMQUEM + id = REAGENT_ID_TALUMQUEM + result = REAGENT_ID_TALUMQUEM + required_reagents = list(REAGENT_ID_BLISS = 2, REAGENT_ID_SUGAR = 1, "amatoxin" = 1) result_amount = 4 /decl/chemical_reaction/instant/qerr_quem - name = "Qerr-quem" - id = "qerr_quem" - result = "qerr_quem" - required_reagents = list("nicotine" = 1, "carbon" = 1, "sugar" = 2) + name = REAGENT_QERRQUEM + id = REAGENT_ID_QERRQUEM + result = REAGENT_ID_QERRQUEM + required_reagents = list(REAGENT_ID_NICOTINE = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_SUGAR = 2) result_amount = 4 /decl/chemical_reaction/instant/malish_qualem name = "Malish-Qualem" id = "malish-qualem" result = "malish-qualem" - required_reagents = list("immunosuprizine" = 1, "qerr_quem" = 1, "inaprovaline" = 1) + required_reagents = list("immunosuprizine" = 1, REAGENT_ID_QERRQUEM = 1, "inaprovaline" = 1) catalysts = list(REAGENT_ID_PHORON = 5) result_amount = 2 @@ -1217,7 +1217,7 @@ name = "Biomass" id = "biomass" result = "biomass" - required_reagents = list("protein" = 1, "sugar" = 1, REAGENT_ID_PHORON = 1) + required_reagents = list("protein" = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_PHORON = 1) result_amount = 1 // Roughly 20u per phoron sheet // Neutralization. @@ -1240,5 +1240,5 @@ name = "Neutralize Spidertoxin" id = "spidertoxin_neutral" result = "protein" - required_reagents = list("enzyme" = 1, "spidertoxin" = 1, "sifsap" = 1) + required_reagents = list("enzyme" = 1, REAGENT_ID_SPIDERTOXIN = 1, "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 6461ce909f..f9e1fdfbff 100644 --- a/code/modules/reagents/reactions/instant/instant_vr.dm +++ b/code/modules/reagents/reactions/instant/instant_vr.dm @@ -2,42 +2,42 @@ /// Micro/Macro chemicals /decl/chemical_reaction/instant/sizeoxadone - name = "sizeoxadone" - id = "sizeoxadone" - result = "sizeoxadone" + name = REAGENT_SIZEOXADONE + id = REAGENT_ID_SIZEOXADONE + result = REAGENT_ID_SIZEOXADONE required_reagents = list("clonexadone" = 1, "tramadol" = 3, REAGENT_ID_PHORON = 1) catalysts = list(REAGENT_ID_PHORON = 5) result_amount = 5 /decl/chemical_reaction/instant/macrocillin - name = "Macrocillin" - id = "macrocillin" - result = "macrocillin" + name = REAGENT_MACROCILLIN + id = REAGENT_ID_MACROCILLIN + result = REAGENT_ID_MACROCILLIN // POLARISTODO requires_heating = 1 - required_reagents = list("sizeoxadone" = 20, "diethylamine" = 20) + required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, "diethylamine" = 20) result_amount = 1 /decl/chemical_reaction/instant/microcillin - name = "Microcillin" - id = "microcillin" - result = "microcillin" + name = REAGENT_MICROCILLIN + id = REAGENT_ID_MICROCILLIN + result = REAGENT_ID_MICROCILLIN // POLARISTODO requires_heating = 1 - required_reagents = list("sizeoxadone" = 20, "sodiumchloride" = 20) + required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, REAGENT_ID_SODIUMCHLORIDE = 20) result_amount = 1 /decl/chemical_reaction/instant/normalcillin - name = "Normalcillin" - id = "normalcillin" - result = "normalcillin" + name = REAGENT_NORMALCILLIN + id = REAGENT_ID_NORMALCILLIN + result = REAGENT_ID_NORMALCILLIN // POLARISTODO requires_heating = 1 - required_reagents = list("sizeoxadone" = 20, "leporazine" = 20) + required_reagents = list(REAGENT_ID_SIZEOXADONE = 20, "leporazine" = 20) result_amount = 1 /decl/chemical_reaction/instant/dontcrossthebeams name = "Don't Cross The Beams" id = "dontcrossthebeams" result = null - required_reagents = list("microcillin" = 1, "macrocillin" = 1) + required_reagents = list(REAGENT_ID_MICROCILLIN = 1, REAGENT_ID_MACROCILLIN = 1) /decl/chemical_reaction/instant/dontcrossthebeams/on_reaction(var/datum/reagents/holder, var/created_volume) var/location = get_turf(holder.my_atom) @@ -50,53 +50,53 @@ /////////////////////////////////////////////////////////////////////////////////// /// TF chemicals /decl/chemical_reaction/instant/amorphorovir - name = "Amorphorovir" - id = "amorphorovir" - result = "amorphorovir" + name = REAGENT_AMORPHOROVIR + id = REAGENT_ID_AMORPHOROVIR + result = REAGENT_ID_AMORPHOROVIR required_reagents = list("cryptobiolin" = 30, "biomass" = 30, "hyperzine" = 20) catalysts = list(REAGENT_ID_PHORON = 5) result_amount = 1 /decl/chemical_reaction/instant/androrovir - name = "Androrovir" - id = "androrovir" - result = "androrovir" - required_reagents = list("amorphorovir" = 1, "bicaridine" = 20, "iron" = 20, "ethanol" = 20) + name = REAGENT_ANDROROVIR + id = REAGENT_ID_ANDROROVIR + result = REAGENT_ID_ANDROROVIR + required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "bicaridine" = 20, REAGENT_ID_IRON = 20, REAGENT_ID_ETHANOL = 20) result_amount = 1 /decl/chemical_reaction/instant/gynorovir - name = "Gynorovir" - id = "gynorovir" - result = "gynorovir" - required_reagents = list("amorphorovir" = 1, "inaprovaline" = 20, "silicon" = 20, "sugar" = 20) + name = REAGENT_GYNOROVIR + id = REAGENT_ID_GYNOROVIR + result = REAGENT_ID_GYNOROVIR + required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "inaprovaline" = 20, REAGENT_ID_SILICON = 20, REAGENT_ID_SUGAR = 20) result_amount = 1 /decl/chemical_reaction/instant/androgynorovir - name = "Androgynorovir" - id = "androgynorovir" - result = "androgynorovir" - required_reagents = list("amorphorovir" = 1, "anti_toxin" = 20, "fluorine" = 20, "tungsten" = 20) + name = REAGENT_ANDROGYNOROVIR + id = REAGENT_ID_ANDROGYNOROVIR + result = REAGENT_ID_ANDROGYNOROVIR + required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "anti_toxin" = 20, REAGENT_ID_FLUORINE = 20, REAGENT_ID_TUNGSTEN = 20) result_amount = 1 /decl/chemical_reaction/instant/androrovir_bootleg name = "Bootleg Androrovir" id = "androrovir_bootleg" - result = "androrovir" - required_reagents = list("amorphorovir" = 1, "protein" = 10, "capsaicin" = 10) + result = REAGENT_ID_ANDROROVIR + required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "protein" = 10, "capsaicin" = 10) result_amount = 1 /decl/chemical_reaction/instant/gynorovir_bootleg name = "Bootleg Gynorovir" id = "gynorovir_bootleg" - result = "gynorovir" - required_reagents = list("amorphorovir" = 1, "soymilk" = 10, "sugar" = 10) + result = REAGENT_ID_GYNOROVIR + required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "soymilk" = 10, REAGENT_ID_SUGAR = 10) result_amount = 1 /decl/chemical_reaction/instant/androgynorovir_bootleg name = "Bootleg Androgynorovir" id = "androgynorovir_bootleg" - result = "androgynorovir" - required_reagents = list("amorphorovir" = 1, "cola" = 10, "berryjuice" = 10) + result = REAGENT_ID_ANDROGYNOROVIR + required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "cola" = 10, "berryjuice" = 10) result_amount = 1 /////////////////////////////////////////////////////////////////////////////////// @@ -109,33 +109,33 @@ name = "Firefighting Foam" id = "firefighting foam" result = "firefoam" - required_reagents = list("water" = 1) - catalysts = list("fluorine" = 10) + required_reagents = list(REAGENT_ID_WATER = 1) + catalysts = list(REAGENT_ID_FLUORINE = 10) result_amount = 1 /decl/chemical_reaction/instant/firefightingfoamqol //Please don't abuse this and make us remove it. Seriously. name = "Firefighting Foam EZ" id = "firefighting foam ez" result = "firefoam" - required_reagents = list("water" = 1) + required_reagents = list(REAGENT_ID_WATER = 1) catalysts = list("firefoam" = 5) - inhibitors = list("fluorine" = 0.01) + inhibitors = list(REAGENT_ID_FLUORINE = 0.01) result_amount = 1 /////////////////////////////////////////////////////////////////////////////////// /// Vore Drugs /decl/chemical_reaction/instant/ickypak - name = "Ickypak" - id = "ickypak" - result = "ickypak" + name = REAGENT_ICKYPAK + id = REAGENT_ID_ICKYPAK + result = REAGENT_ID_ICKYPAK required_reagents = list("hyperzine" = 4, "fluorosurfactant" = 1) result_amount = 5 /decl/chemical_reaction/instant/unsorbitol - name = "Unsorbitol" - id = "unsorbitol" - result = "unsorbitol" + name = REAGENT_UNSORBITOL + id = REAGENT_ID_UNSORBITOL + result = REAGENT_ID_UNSORBITOL required_reagents = list("mutagen" = 3, "lipozine" = 2) result_amount = 5 @@ -145,7 +145,7 @@ name = "Adranol" id = "adranol" result = "adranol" - required_reagents = list("milk" = 2, "hydrogen" = 1, "potassium" = 1) + required_reagents = list("milk" = 2, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_POTASSIUM = 1) result_amount = 3 /decl/chemical_reaction/instant/vermicetol @@ -160,7 +160,7 @@ name = "Prussian Blue" id = "prussian_blue" result = "prussian_blue" - required_reagents = list("carbon" = 3, "iron" = 1, REAGENT_ID_NITROGEN = 3) + required_reagents = list(REAGENT_ID_CARBON = 3, REAGENT_ID_IRON = 1, REAGENT_ID_NITROGEN = 3) result_amount = 7 /decl/chemical_reaction/instant/lipozilase @@ -174,23 +174,23 @@ name = "Lipostipo" id = "Lipostipo" result = "lipostipo" - required_reagents = list("lipozine" = 1, "nutriment" = 1, "fluorine" = 1) + required_reagents = list("lipozine" = 1, REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_FLUORINE = 1) result_amount = 3 /////////////////////////////////////////////////////////////////////////////////// /// Reagent colonies. /decl/chemical_reaction/instant/meatcolony name = "protein" - id = "meatcolony" + id = REAGENT_ID_MEATCOLONY result = "protein" - required_reagents = list("meatcolony" = 5, "virusfood" = 5) + required_reagents = list(REAGENT_ID_MEATCOLONY = 5, "virusfood" = 5) result_amount = 60 /decl/chemical_reaction/instant/plantcolony - name = "nutriment" - id = "plantcolony" - result = "nutriment" - required_reagents = list("plantcolony" = 5, "virusfood" = 5) + name = REAGENT_ID_NUTRIMENT + id = REAGENT_ID_PLANTCOLONY + result = REAGENT_ID_NUTRIMENT + required_reagents = list(REAGENT_ID_PLANTCOLONY = 5, "virusfood" = 5) result_amount = 60 /////////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm index d6bebd2769..dad34082dc 100644 --- a/code/modules/reagents/reactions/instant/virology.dm +++ b/code/modules/reagents/reactions/instant/virology.dm @@ -30,7 +30,7 @@ name = "sucrose agar" id = "sugarvirusfood" result = "sugarvirusfood" - required_reagents = list("sugar" = 1, "mutagenvirusfood" = 1) + required_reagents = list(REAGENT_ID_SUGAR = 1, "mutagenvirusfood" = 1) result_amount = 2 /decl/chemical_reaction/instant/virus_food_mutagen_inaprovaline @@ -44,7 +44,7 @@ name = "Mix Virus" id = "mixvirus" required_reagents = list("virusfood" = 1) - catalysts = list("blood" = 1) + catalysts = list(REAGENT_ID_BLOOD = 1) var/level_min = 0 var/level_max = 2 @@ -115,7 +115,7 @@ name = "Devolve Virus" id = "remvirus" required_reagents = list("adranol" = 1) - catalysts = list("blood" = 1) + catalysts = list(REAGENT_ID_BLOOD = 1) /decl/chemical_reaction/instant/mix_virus/rem_virus/on_reaction(var/datum/reagents/holder) var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list @@ -127,7 +127,7 @@ /decl/chemical_reaction/instant/antibodies name = "Antibodies" id = "antibodiesmix" - result = "antibodies" + result = REAGENT_ID_ANTIBODIES required_reagents = list("vaccine") catalysts = list("inaprovaline" = 0.1) result_amount = 0.5 diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 3cbdb38f64..cbbb56b872 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -27,7 +27,7 @@ var/label_text = "" var/blood_type = null - var/reag_id = "blood" + var/reag_id = REAGENT_ID_BLOOD /obj/item/reagent_containers/blood/Initialize() . = ..() @@ -98,11 +98,11 @@ /obj/item/reagent_containers/blood/synthplas blood_type = "O-" - reag_id = "synthblood_dilute" + reag_id = REAGENT_ID_SYNTHBLOOD_DILUTE /obj/item/reagent_containers/blood/synthblood blood_type = "O-" - reag_id = "synthblood" + reag_id = REAGENT_ID_SYNTHBLOOD /obj/item/reagent_containers/blood/empty name = "Empty BloodPack" diff --git a/code/modules/reagents/reagent_containers/blood_pack_vr.dm b/code/modules/reagents/reagent_containers/blood_pack_vr.dm index 5beff9b498..b2c73a41b2 100644 --- a/code/modules/reagents/reagent_containers/blood_pack_vr.dm +++ b/code/modules/reagents/reagent_containers/blood_pack_vr.dm @@ -4,7 +4,7 @@ var/remove_volume = volume* 0.1 //10% of what the bloodpack can hold. var/reagent_to_remove = reagents.get_master_reagent_id() switch(reagents.get_master_reagent_id()) - if("blood") + if(REAGENT_ID_BLOOD) user.show_message(span_warning("You sink your fangs into \the [src] and suck the blood out of it!")) user.visible_message(span_red("[user] sinks their fangs into \the [src] and drains it!")) user.adjust_nutrition(remove_volume*5) diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm index a84ea7c7e5..08a01ba3c1 100644 --- a/code/modules/reagents/reagent_containers/borghypo.dm +++ b/code/modules/reagents/reagent_containers/borghypo.dm @@ -32,7 +32,7 @@ desc = "An advanced nanite and chemical synthesizer and injection system, designed for heavy-duty medical equipment. This type is capable of safely bypassing \ thick materials that other hyposprays would struggle with." bypass_protection = TRUE // Because mercs tend to be in spacesuits. - reagent_ids = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", "synthblood") + reagent_ids = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", REAGENT_ID_SYNTHBLOOD) /obj/item/reagent_containers/borghypo/Initialize() . = ..() @@ -165,14 +165,14 @@ "spacemountainwind", "spacespice", "specialwhiskey", - "sugar", + REAGENT_ID_SUGAR, "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", - "water", + REAGENT_ID_WATER, "watermelonjuice", "whiskey") diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 0298998d7f..1e8447dc6d 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -285,7 +285,7 @@ prefill = list("cryoxadone" = 30) /obj/item/reagent_containers/glass/beaker/sulphuric - prefill = list("sacid" = 60) + prefill = list(REAGENT_ID_SACID = 60) /obj/item/reagent_containers/glass/beaker/stopperedbottle name = "stoppered bottle" diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm index 2249ddd764..6ecb0e2443 100644 --- a/code/modules/reagents/reagent_containers/glass_vr.dm +++ b/code/modules/reagents/reagent_containers/glass_vr.dm @@ -50,32 +50,32 @@ prefill = list("hyronalin" = 30) /obj/item/reagent_containers/glass/beaker/vial/amorphorovir - name = "vial (amorphorovir)" - prefill = list("amorphorovir" = 1) + name = "vial (" + REAGENT_ID_AMORPHOROVIR + ")" + prefill = list(REAGENT_ID_AMORPHOROVIR = 1) /obj/item/reagent_containers/glass/beaker/vial/androrovir - name = "vial (androrovir)" - prefill = list("androrovir" = 1) + name = "vial (" + REAGENT_ID_ANDROROVIR + ")" + prefill = list(REAGENT_ID_ANDROROVIR = 1) /obj/item/reagent_containers/glass/beaker/vial/gynorovir - name = "vial (gynorovir)" - prefill = list("gynorovir" = 1) + name = "vial (" + REAGENT_ID_GYNOROVIR + ")" + prefill = list(REAGENT_ID_GYNOROVIR = 1) /obj/item/reagent_containers/glass/beaker/vial/androgynorovir - name = "vial (androgynorovir)" - prefill = list("androgynorovir" = 1) + name = "vial (" + REAGENT_ID_ANDROGYNOROVIR + ")" + prefill = list(REAGENT_ID_ANDROGYNOROVIR = 1) /obj/item/reagent_containers/glass/beaker/vial/macrocillin - name = "vial (macrocillin)" - prefill = list("macrocillin" = 1) + name = "vial (" + REAGENT_ID_MACROCILLIN + ")" + prefill = list(REAGENT_ID_MACROCILLIN = 1) /obj/item/reagent_containers/glass/beaker/vial/microcillin - name = "vial (microcillin)" - prefill = list("microcillin" = 1) + name = "vial (" + REAGENT_ID_MICROCILLIN + ")" + prefill = list(REAGENT_ID_MICROCILLIN = 1) /obj/item/reagent_containers/glass/beaker/vial/normalcillin - name = "vial (normalcillin)" - prefill = list("normalcillin" = 1) + name = "vial (" + REAGENT_ID_NORMALCILLIN + ")" + prefill = list(REAGENT_ID_NORMALCILLIN = 1) /obj/item/reagent_containers/glass/beaker/vial/supermatter name = "vial (supermatter)" @@ -87,4 +87,4 @@ desc = "A measuring cup." icon = 'icons/obj/chemical_vr.dmi' icon_state = "measure_cup" - item_state = "measure_cup" \ No newline at end of file + item_state = "measure_cup" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 0ba2319418..14a7708260 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -312,7 +312,7 @@ name = "illicit injector" desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This one contains various illicit drugs, held inside a hypospray to make smuggling easier." - filled_reagents = list("bliss" = 15) + filled_reagents = list(REAGENT_ID_BLISS = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin name = "cryptobiolin injector" @@ -339,7 +339,7 @@ desc = "A refined version of the standard autoinjector, allowing greater capacity. \ This has psilocybin inside, which is a strong psychotropic derived from certain species of mushroom. \ This autoinjector likely was made by criminal elements to avoid detection from casual inspection." - filled_reagents = list("psilocybin" = 15) + filled_reagents = list(REAGENT_ID_PSILOCYBIN = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/mutagen name = "unstable mutagen injector" diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 88dde6b271..e23f019a36 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -206,7 +206,7 @@ /obj/item/reagent_containers/pill/methylphenidate/Initialize() . = ..() - reagents.add_reagent("methylphenidate", 15) + reagents.add_reagent(REAGENT_ID_METHYLPHENIDATE, 15) color = reagents.get_color() /obj/item/reagent_containers/pill/citalopram @@ -216,7 +216,7 @@ /obj/item/reagent_containers/pill/citalopram/Initialize() . = ..() - reagents.add_reagent("citalopram", 15) + reagents.add_reagent(REAGENT_ID_CITALOPRAM, 15) color = reagents.get_color() /obj/item/reagent_containers/pill/dexalin @@ -296,7 +296,7 @@ /obj/item/reagent_containers/pill/carbon/Initialize() . = ..() - reagents.add_reagent("carbon", 30) //VOREStation Edit + reagents.add_reagent(REAGENT_ID_CARBON, 30) //VOREStation Edit color = reagents.get_color() /obj/item/reagent_containers/pill/iron @@ -306,7 +306,7 @@ /obj/item/reagent_containers/pill/iron/Initialize() . = ..() - reagents.add_reagent("iron", 30) //VOREStation Edit + reagents.add_reagent(REAGENT_ID_IRON, 30) //VOREStation Edit color = reagents.get_color() /obj/item/reagent_containers/pill/copper @@ -316,7 +316,7 @@ /obj/item/reagent_containers/pill/copper/Initialize() . = ..() - reagents.add_reagent("copper", 30) + reagents.add_reagent(REAGENT_ID_COPPER, 30) color = reagents.get_color() //Not-quite-medicine @@ -327,8 +327,8 @@ /obj/item/reagent_containers/pill/happy/Initialize() . = ..() - reagents.add_reagent("bliss", 15) - reagents.add_reagent("sugar", 15) + reagents.add_reagent(REAGENT_ID_BLISS, 15) + reagents.add_reagent(REAGENT_ID_SUGAR, 15) color = reagents.get_color() /obj/item/reagent_containers/pill/zoom diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm index 02ebdebe67..f9605b9290 100644 --- a/code/modules/reagents/reagent_containers/pill_vr.dm +++ b/code/modules/reagents/reagent_containers/pill_vr.dm @@ -5,7 +5,7 @@ /obj/item/reagent_containers/pill/nutriment/Initialize() . = ..() - reagents.add_reagent("nutriment", 30) + reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30) /obj/item/reagent_containers/pill/protein name = "Protein (30u)" @@ -155,4 +155,4 @@ /obj/item/reagent_containers/pill/airlock/New() ..() reagents.add_reagent("anti_toxin", 15) - reagents.add_reagent("paracetamol", 5) \ No newline at end of file + reagents.add_reagent("paracetamol", 5) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index f51bc0b7f4..193e8c60d8 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -42,10 +42,10 @@ user.setClickCooldown(4) - if(reagents.has_reagent("sacid")) + if(reagents.has_reagent(REAGENT_ID_SACID)) message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].") log_game("[key_name(user)] fired sulphuric acid from \a [src].") - if(reagents.has_reagent("pacid")) + if(reagents.has_reagent(REAGENT_ID_PACID)) message_admins("[key_name_admin(user)] fired Polyacid from \a [src].") log_game("[key_name(user)] fired Polyacid from \a [src].") if(reagents.has_reagent("lube")) @@ -160,7 +160,7 @@ /obj/item/reagent_containers/spray/waterflower/Initialize() . = ..() - reagents.add_reagent("water", 10) + reagents.add_reagent(REAGENT_ID_WATER, 10) /obj/item/reagent_containers/spray/chemsprayer name = "chem sprayer" diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 7c5c3cc9c6..667ace2968 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -106,7 +106,7 @@ return if(ismob(target))//Blood! - if(reagents.has_reagent("blood")) + if(reagents.has_reagent(REAGENT_ID_BLOOD)) to_chat(user, span_notice("There is already a blood sample in this syringe.")) return @@ -368,7 +368,7 @@ /obj/item/reagent_containers/syringe/drugs/Initialize() . = ..() - reagents.add_reagent("bliss", 5) + reagents.add_reagent(REAGENT_ID_BLISS, 5) reagents.add_reagent("mindbreaker", 5) reagents.add_reagent("cryptobiolin", 5) //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped diff --git a/code/modules/reagents/reagent_containers/virology.dm b/code/modules/reagents/reagent_containers/virology.dm index a1d4403900..f09c34a4aa 100644 --- a/code/modules/reagents/reagent_containers/virology.dm +++ b/code/modules/reagents/reagent_containers/virology.dm @@ -13,7 +13,7 @@ . = ..() diseases += new /datum/disease/advance/cold data["viruses"] = diseases - reagents.add_reagent("blood", 10, data) + reagents.add_reagent(REAGENT_ID_BLOOD, 10, data) /obj/item/reagent_containers/glass/bottle/culture/flu name = "flu virus culture" @@ -23,4 +23,4 @@ . = ..() diseases += new /datum/disease/advance/flu data["viruses"] = diseases - reagents.add_reagent("blood", 10, data) + reagents.add_reagent(REAGENT_ID_BLOOD, 10, data) diff --git a/code/modules/reagents/reagents/core.dm b/code/modules/reagents/reagents/core.dm index dc014a44eb..44dc798feb 100644 --- a/code/modules/reagents/reagents/core.dm +++ b/code/modules/reagents/reagents/core.dm @@ -1,8 +1,8 @@ /datum/reagent/blood - data = new/list("donor" = null, "viruses" = null, "species" = SPECIES_HUMAN, "blood_DNA" = null, "blood_type" = null, "blood_colour" = "#A10808", "resistances" = null, "trace_chem" = null, "antibodies" = list()) - name = "Blood" - id = "blood" - taste_description = "iron" + data = new/list("donor" = null, "viruses" = null, "species" = SPECIES_HUMAN, "blood_DNA" = null, "blood_type" = null, "blood_colour" = "#A10808", "resistances" = null, "trace_chem" = null, REAGENT_ID_ANTIBODIES = list()) + name = REAGENT_BLOOD + id = REAGENT_ID_BLOOD + taste_description = REAGENT_ID_IRON taste_mult = 1.3 reagent_state = LIQUID metabolism = REM * 5 @@ -168,8 +168,8 @@ remove_self(volume) /datum/reagent/blood/synthblood - name = "synthetic blood" - id = "synthblood" + name = REAGENT_SYNTHBLOOD + id = REAGENT_ID_SYNTHBLOOD color = "#999966" volume_mod = 2 @@ -182,24 +182,24 @@ return /datum/reagent/blood/synthblood/dilute - name = "synthetic plasma" - id = "synthblood_dilute" + name = REAGENT_SYNTHBLOOD_DILUTE + id = REAGENT_ID_SYNTHBLOOD_DILUTE color = "#cacaaf" volume_mod = 1.2 // pure concentrated antibodies /datum/reagent/antibodies - data = list("antibodies"=list()) - name = "Antibodies" + data = list(REAGENT_ID_ANTIBODIES=list()) + name = REAGENT_ANTIBODIES taste_description = "slime" - id = "antibodies" + id = REAGENT_ID_ANTIBODIES reagent_state = LIQUID color = "#0050F0" mrate_static = TRUE /datum/reagent/antibodies/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(src.data) - M.antibodies |= src.data["antibodies"] + M.antibodies |= src.data[REAGENT_ID_ANTIBODIES] ..() #define WATER_LATENT_HEAT 19000 // How much heat is removed when applied to a hot turf, in J/unit (19000 makes 120 u of water roughly equivalent to 4L) @@ -301,8 +301,8 @@ #undef WATER_LATENT_HEAT /datum/reagent/fuel - name = "Welding fuel" - id = "fuel" + name = REAGENT_FUEL + id = REAGENT_ID_FUEL description = "Required for welders. Flamable." taste_description = "gross metal" reagent_state = LIQUID diff --git a/code/modules/reagents/reagents/dispenser.dm b/code/modules/reagents/reagents/dispenser.dm index 681860427c..cefc8627bb 100644 --- a/code/modules/reagents/reagents/dispenser.dm +++ b/code/modules/reagents/reagents/dispenser.dm @@ -1,6 +1,6 @@ /datum/reagent/aluminum - name = "Aluminum" - id = "aluminum" + name = REAGENT_ALUMINIUM + id = REAGENT_ID_ALUMINIUM description = "A silvery white and ductile member of the boron group of chemical elements." taste_description = "metal" taste_mult = 1.1 @@ -8,8 +8,8 @@ color = "#A8A8A8" /datum/reagent/calcium - name = "Calcium" - id = "calcium" + name = REAGENT_CALCIUM + id = REAGENT_ID_CALCIUM description = "A chemical element, the building block of bones." taste_description = "metallic chalk" // Apparently, calcium tastes like calcium. taste_mult = 1.3 @@ -29,8 +29,8 @@ //VOREStation Edit End /datum/reagent/carbon - name = "Carbon" - id = "carbon" + name = REAGENT_CARBON + id = REAGENT_ID_CARBON description = "A chemical element, the building block of life." taste_description = "sour chalk" taste_mult = 1.5 @@ -59,8 +59,8 @@ dirtoverlay.alpha = min(dirtoverlay.alpha + volume * 30, 255) /datum/reagent/chlorine - name = "Chlorine" - id = "chlorine" + name = REAGENT_CHLORINE + id = REAGENT_ID_CHLORINE description = "A chemical element with a characteristic odour." taste_description = "pool water" reagent_state = GAS @@ -73,15 +73,15 @@ M.take_organ_damage(1*REM, 0) /datum/reagent/copper - name = "Copper" - id = "copper" + name = REAGENT_COPPER + id = REAGENT_ID_COPPER description = "A highly ductile metal." taste_description = "pennies" color = "#6E3B08" /datum/reagent/ethanol - name = "Ethanol" //Parent class for all alcoholic reagents. - id = "ethanol" + name = REAGENT_ETHANOL //Parent class for all alcoholic reagents. + id = REAGENT_ID_ETHANOL description = "A well-known alcohol with a variety of applications." taste_description = "pure alcohol" reagent_state = LIQUID @@ -98,7 +98,7 @@ var/targ_temp = 310 var/halluci = 0 - glass_name = "ethanol" + glass_name = REAGENT_ID_ETHANOL glass_desc = "A well-known alcohol with a variety of applications." allergen_factor = 1 //simulates mixed drinks containing less of the allergen, as they have only a single actual reagent unlike food @@ -213,8 +213,8 @@ return /datum/reagent/fluorine - name = "Fluorine" - id = "fluorine" + name = REAGENT_FLUORINE + id = REAGENT_ID_FLUORINE description = "A highly-reactive chemical element." taste_description = "acid" reagent_state = GAS @@ -227,24 +227,24 @@ M.adjustToxLoss(removed) /datum/reagent/hydrogen - name = "Hydrogen" - id = "hydrogen" + name = REAGENT_HYDROGEN + id = REAGENT_ID_HYDROGEN description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas." taste_mult = 0 //no taste reagent_state = GAS color = "#808080" /datum/reagent/iron - name = "Iron" - id = "iron" + name = REAGENT_IRON + id = REAGENT_ID_IRON description = "Pure iron is a metal." taste_description = "metal" reagent_state = SOLID color = "#353535" /datum/reagent/lithium - name = "Lithium" - id = "lithium" + name = REAGENT_LITHIUM + id = REAGENT_ID_LITHIUM description = "A chemical element, used as antidepressant." taste_description = "metal" reagent_state = SOLID @@ -258,8 +258,8 @@ M.emote(pick("twitch", "drool", "moan")) /datum/reagent/mercury - name = "Mercury" - id = "mercury" + name = REAGENT_MERCURY + id = REAGENT_ID_MERCURY description = "A chemical element." taste_mult = 0 //mercury apparently is tasteless. IDK reagent_state = LIQUID @@ -294,24 +294,24 @@ M.adjustToxLoss(removed * 3) /datum/reagent/phosphorus - name = "Phosphorus" - id = "phosphorus" + name = REAGENT_PHOSPHORUS + id = REAGENT_ID_PHOSPHORUS description = "A chemical element, the backbone of biological energy carriers." taste_description = "vinegar" reagent_state = SOLID color = "#832828" /datum/reagent/potassium - name = "Potassium" - id = "potassium" + name = REAGENT_POTASSIUM + id = REAGENT_ID_POTASSIUM description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water." taste_description = "sweetness" //potassium is bitter in higher doses but sweet in lower ones. reagent_state = SOLID color = "#A0A0A0" /datum/reagent/radium - name = "Radium" - id = "radium" + name = REAGENT_RADIUM + id = REAGENT_ID_RADIUM description = "Radium is an alkaline earth metal. It is extremely radioactive." taste_mult = 0 //Apparently radium is tasteless reagent_state = SOLID @@ -331,8 +331,8 @@ return /datum/reagent/acid - name = "Sulphuric acid" - id = "sacid" + name = REAGENT_SACID + id = REAGENT_ID_SACID description = "A very corrosive mineral acid with the molecular formula H2SO4." taste_description = "acid" reagent_state = LIQUID @@ -419,31 +419,31 @@ remove_self(meltdose) // 10 units of acid will not melt EVERYTHING on the tile /datum/reagent/silicon - name = "Silicon" - id = "silicon" + name = REAGENT_SILICON + id = REAGENT_ID_SILICON description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon." taste_mult = 0 reagent_state = SOLID color = "#A8A8A8" /datum/reagent/sodium - name = "Sodium" - id = "sodium" + name = REAGENT_SODIUM + id = REAGENT_ID_SODIUM description = "A chemical element, readily reacts with water." taste_description = "salty metal" reagent_state = SOLID color = "#808080" /datum/reagent/sugar - name = "Sugar" - id = "sugar" + name = REAGENT_SUGAR + id = REAGENT_ID_SUGAR description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste." taste_description = "sugar" taste_mult = 1.8 reagent_state = SOLID color = "#FFFFFF" - glass_name = "sugar" + glass_name = REAGENT_ID_SUGAR glass_desc = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste." glass_icon = DRINK_ICON_NOISY @@ -469,16 +469,16 @@ M.drowsyness = max(M.drowsyness, 60) /datum/reagent/sulfur - name = "Sulfur" - id = "sulfur" + name = REAGENT_SULFUR + id = REAGENT_ID_SULFUR description = "A chemical element with a pungent smell." taste_description = "old eggs" reagent_state = SOLID color = "#BF8C00" /datum/reagent/tungsten - name = "Tungsten" - id = "tungsten" + name = REAGENT_TUNGSTEN + id = REAGENT_ID_TUNGSTEN description = "A chemical element, and a strong oxidising agent." taste_description = "metal" taste_mult = 0 //no taste diff --git a/code/modules/reagents/reagents/drugs.dm b/code/modules/reagents/reagents/drugs.dm index 8ce249cfe1..ee199f76a2 100644 --- a/code/modules/reagents/reagents/drugs.dm +++ b/code/modules/reagents/reagents/drugs.dm @@ -4,8 +4,8 @@ */ /datum/reagent/drugs - name = "generic drugs" - id = "drugs" + name = REAGENT_DRUGS + id = REAGENT_ID_DRUGS description = "Some generic drugs." taste_description = "a bad investment" taste_mult = 1.2 /// The overwhelming flavor of a good(?) time! @@ -40,8 +40,8 @@ prob_proc = TRUE /datum/reagent/drugs/bliss /// Replaces Space Drugs. - name = "Bliss" - id = "bliss" + name = REAGENT_BLISS + id = REAGENT_ID_BLISS description = "Known for providing a euphoric high, this psychoactive drug is often used recreationally." taste_description = "unpleasant bitterness" taste_mult = 0.4 @@ -80,8 +80,8 @@ ..() /datum/reagent/drugs/ambrosia_extract - name = "Ambrosia extract" - id = "ambrosia_extract" + name = REAGENT_AMBROSIAEXTRACT + id = REAGENT_ID_AMBROSIAEXTRACT description = "The extract from the plant family ambrosia, responsible for the more \"recreational\" effects." taste_description = "a strong-tasting plant" color = "#358f49" @@ -120,8 +120,8 @@ prob_proc = FALSE /datum/reagent/drugs/psilocybin - name = "Psilocybin" - id = "psilocybin" + name = REAGENT_PSILOCYBIN + id = REAGENT_ID_PSILOCYBIN description = "A strong psycotropic derived from certain species of mushroom." taste_description = "mushroom" color = "#E700E7" @@ -172,8 +172,8 @@ prob_proc = FALSE /datum/reagent/drugs/talum_quem - name = "Talum-quem" - id = "talum_quem" + name = REAGENT_TALUMQUEM + id = REAGENT_ID_TALUMQUEM description = " A very carefully tailored hallucinogen, for use of the Talum-Katish." taste_description = "bubblegum" taste_mult = 1.6 @@ -202,8 +202,8 @@ prob_proc = FALSE /datum/reagent/drugs/nicotine - name = "Nicotine" - id = "nicotine" + name = REAGENT_NICOTINE + id = REAGENT_ID_NICOTINE description = "A highly addictive stimulant extracted from the tobacco plant." taste_description = "sour staleness" color = "#181818" @@ -215,8 +215,8 @@ /// Psychiatric drugs use similar mechanics and will go under "drugs". ///// *//////////////////////////////////////////////////////////////////////////// /datum/reagent/drugs/methylphenidate - name = "Methylphenidate" - id = "methylphenidate" + name = REAGENT_METHYLPHENIDATE + id = REAGENT_ID_METHYLPHENIDATE description = "Improves the ability to concentrate." taste_description = "mild grape" ///Referencing real life oral solutions for these meds. color = "#BF80BF" @@ -224,8 +224,8 @@ sober_message_list = list("It becomes harder to focus...", "You feel distractible.") /datum/reagent/drugs/citalopram - name = "Citalopram" - id = "citalopram" + name = REAGENT_CITALOPRAM + id = REAGENT_ID_CITALOPRAM description = "Stabilizes the mind a little." taste_description = "mild peppermint" color = "#FF80FF" @@ -238,8 +238,8 @@ M.fear = max((M.fear - 3),0) /datum/reagent/drugs/paroxetine - name = "Paroxetine" - id = "paroxetine" + name = REAGENT_PAROXETINE + id = REAGENT_ID_PAROXETINE description = "Stabilizes the mind greatly, but has a chance of adverse effects." taste_description = "mild oranges" color = "#FF80BF" @@ -256,8 +256,8 @@ prob_proc = FALSE /datum/reagent/drugs/qerr_quem - name = "Qerr-quem" - id = "qerr_quem" + name = REAGENT_QERRQUEM + id = REAGENT_ID_QERRQUEM description = "A potent sedative and anti-anxiety medication, made for the Qerr-Katish." taste_description = "mint" color = "#e6efe3" diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index 258d19b89d..0c170aac67 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -1,8 +1,8 @@ /* Food */ /datum/reagent/nutriment - name = "Nutriment" - id = "nutriment" + name = REAGENT_NUTRIMENT + id = REAGENT_ID_NUTRIMENT description = "All the vitamins, minerals, and carbohydrates the body needs in pure form." taste_mult = 4 reagent_state = SOLID @@ -642,8 +642,8 @@ /* Non-food stuff like condiments */ /datum/reagent/sodiumchloride - name = "Table Salt" - id = "sodiumchloride" + name = REAGENT_SODIUMCHLORIDE + id = REAGENT_ID_SODIUMCHLORIDE description = "A salt made of sodium chloride. Commonly used to season food." taste_description = "salt" reagent_state = SOLID @@ -2412,13 +2412,13 @@ ..() if(alien == IS_DIONA) return - M.bloodstr.add_reagent("radium", 0.3) + M.bloodstr.add_reagent(REAGENT_ID_RADIUM, 0.3) /datum/reagent/drink/nuclearwaste/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() if(alien == IS_DIONA) return - M.ingested.add_reagent("radium", 0.25) + M.ingested.add_reagent(REAGENT_ID_RADIUM, 0.25) /datum/reagent/drink/sodaoil //Mixed with normal drinks to make a 'potable' version for Prometheans if mixed 1-1. Dilution is key. name = "Soda Oil" diff --git a/code/modules/reagents/reagents/food_drinks_vr.dm b/code/modules/reagents/reagents/food_drinks_vr.dm index 3f245ac219..388031b2fe 100644 --- a/code/modules/reagents/reagents/food_drinks_vr.dm +++ b/code/modules/reagents/reagents/food_drinks_vr.dm @@ -2,8 +2,8 @@ nutriment_factor = 10 /datum/reagent/toxin/meatcolony - name = "A colony of meat cells" - id = "meatcolony" + name = REAGENT_MEATCOLONY + id = REAGENT_ID_MEATCOLONY description = "Specialised cells designed to produce a large amount of meat once activated, whilst manufacturers have managed to stop these cells from taking over the body when ingested, it's still poisonous." taste_description = "a fibrous mess" reagent_state = LIQUID @@ -11,8 +11,8 @@ strength = 10 /datum/reagent/toxin/plantcolony - name = "A colony of plant cells" - id = "plantcolony" + name = REAGENT_PLANTCOLONY + id = REAGENT_ID_PLANTCOLONY description = "Specialised cells designed to produce a large amount of nutriment once activated, whilst manufacturers have managed to stop these cells from taking over the body when ingested, it's still poisonous." taste_description = "a fibrous mess" reagent_state = LIQUID @@ -20,8 +20,8 @@ strength = 10 /datum/reagent/nutriment/grubshake - name = "Grub shake" - id = "grubshake" + name = REAGENT_GRUBSHAKE + id = REAGENT_ID_GRUBSHAKE description = "An odd fluid made from grub guts, supposedly filling." taste_description = "sparkles" taste_mult = 1.3 @@ -32,8 +32,8 @@ M.adjust_nutrition(-20 * removed) /datum/reagent/ethanol/burnout - name = "Burnout" - id = "burnout" + name = REAGENT_BURNOUT + id = REAGENT_ID_BURNOUT description = "A bubbling orange alcoholic fluid that radiates a large amount of heat." taste_description = "powerful alcoholic inferno" color = "#cc5500" @@ -42,7 +42,7 @@ adj_temp = 10 targ_temp = 380 - glass_name = "Burnout" + glass_name = REAGENT_BURNOUT glass_desc = "A swirling brew of fluids that leaves even the glass itself hot to the touch." /datum/reagent/ethanol/burnout/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -67,8 +67,8 @@ M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]"), pick(span_danger("You feel like your insides are burning!"), span_danger("You feel like your insides are on fire!"), span_danger("You feel like your belly is full of lava!"))) /datum/reagent/ethanol/monstertamer - name = "Monster Tamer" - id = "monstertamer" + name = REAGENT_MONSTERTAMER + id = REAGENT_ID_MONSTERTAMER description = "A questionably-delicious blend of a carnivore's favorite food and a potent neural depressant." taste_description = "the gross yet satisfying combination of chewing on a raw steak while downing a shot of whiskey" strength = 50 @@ -77,7 +77,7 @@ var/alt_nutriment_factor = 5 //half as much as protein since it's half protein. //using a new variable instead of nutriment_factor so we can call ..() without that adding nutrition for us without taking factors for protein into account - glass_name = "Monster Tamer" + glass_name = REAGENT_MONSTERTAMER glass_desc = "This looks like a vaguely-alcoholic slurry of meat. Gross." /datum/reagent/ethanol/monstertamer/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -115,63 +115,63 @@ M.adjust_nutrition(alt_nutriment_factor * removed) /datum/reagent/ethanol/pink_russian - name = "Pink Russian" - id = "pinkrussian" + name = REAGENT_PINKRUSSIAN + id = REAGENT_ID_PINKRUSSIAN description = "Like a White Russian but with 100% more pink!" taste_description = "strawberry icecream, with a coffee kick" color = "#d789bd" strength = 15 - glass_name = "Pink Russian" + glass_name = REAGENT_PINKRUSSIAN glass_desc = "A very pink drink, yet with strong sense of power to it." /datum/reagent/ethanol/originalsin - name = "Original Sin" - id = "originalsin" + name = REAGENT_ORIGINALSIN + id = REAGENT_ID_ORIGINALSIN description = "Angel Ichor, entirely transformed by one drop of apple juice" taste_description = "the apple Eve gave to Adam" color = "#99CC35" strength = 17 - glass_name = "Original Sin" + glass_name = REAGENT_ORIGINALSIN glass_desc = "A drink so fine, you may just risk eternal damnation!" /datum/reagent/ethanol/newyorksour - name = "New York Sour" - id = "newyorksour" + name = REAGENT_NEWYORKSOUR + id = REAGENT_ID_NEWYORKSOUR description = "Whiskey sour, with a layer of wine and egg white." taste_description = "refreshing lemoned whiskey, smoothed with wine" color = "#FFBF3C" strength = 17 - glass_name = "New York Sour" + glass_name = REAGENT_NEWYORKSOUR glass_desc = "A carefully poured three layered drink" /datum/reagent/ethanol/windgarita - name = "WND-Garita" - id = "windgarita" + name = REAGENT_WINDGARITA + id = REAGENT_ID_WINDGARITA description = "A highly questionable combination of margarita and Space Mountain Wind" taste_description = "like sin, and some tequilia" color = "#90D93D" strength = 15 - glass_name = "WND-Garita" + glass_name = REAGENT_WINDGARITA glass_desc = "Who the hell comes up with these drinks?!" /datum/reagent/ethanol/mudslide - name = "Mudslide" - id = "mudslide" + name = REAGENT_MUDSLIDE + id = REAGENT_ID_MUDSLIDE description = "Vodka, Kahlua and Irish Cream together at last." taste_description = "a mocha milkshake, with a splash of vodka." color = "#8B6338" strength = 13 - glass_name = "Mudslide" + glass_name = REAGENT_MUDSLIDE glass_desc = "A richly coloured drink, comes with a chocolate garnish!" /datum/reagent/ethanol/galacticpanic - name = "Galactic Panic Attack" - id = "galacticpanic" + name = REAGENT_GALACTICPANIC + id = REAGENT_ID_GALACTICPANIC description = "The absolute worst thing you could ever put in your body." taste_description = "an entire galaxy collasping in on itself" strength = 10 @@ -180,7 +180,7 @@ var/adj_dizzy = 10 color = "#d3785d" - glass_name = "Galactic Panic Attack" + glass_name = REAGENT_GALACTICPANIC glass_desc = "Looking into this is like staring at the stars." /datum/reagent/ethanol/galacticpanic/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -197,30 +197,30 @@ M.slurring = max(M.slurring, 30) /datum/reagent/ethanol/bulldog - name = "Space Bulldog" - id = "bulldog" + name = REAGENT_BULLDOG + id = REAGENT_ID_BULLDOG description = "An inventive kahlua recipe." taste_description = "fizzy, creamy, soda and coffee hell" strength = 30 color = "#d3785d" - glass_name = "Space Bulldog" + glass_name = REAGENT_BULLDOG glass_desc = "It looks like someone poured cola in a cup of coffee." /datum/reagent/ethanol/sbagliato - name = "Negroni Sbagliato" - id = "sbagliato" + name = REAGENT_SBAGLIATO + id = REAGENT_ID_SBAGLIATO description = "A drink invented because a bartender was too drunk." taste_description = "sweet bubbly wine and vermouth" strength = 30 color = "#d3785d" - glass_name = "Negroni Sbagliato" + glass_name = REAGENT_SBAGLIATO glass_desc = "Bubbles constantly pop up to the surface with a quiet fizz." /datum/reagent/ethanol/italiancrisis - name = "Italian Crisis" - id = "italiancrisis" + name = REAGENT_ITALIANCRISIS + id = REAGENT_ID_ITALIANCRISIS description = "This drink was concocted by a madwoman, causing the Italian Crisis of 2123." taste_description = "cola, fruit, fizz, coffee, and cream swirled together in an old boot" strength = 20 @@ -229,34 +229,34 @@ var/adj_dizzy = 0 color = "#d3785d" - glass_name = "Italian Crisis" + glass_name = REAGENT_ITALIANCRISIS glass_desc = "This drink looks like it was a mistake." /datum/reagent/ethanol/sugarrush - name = "Sweet Rush" - id = "sugarrush" + name = REAGENT_SUGARRUSH + id = REAGENT_ID_SUGARRUSH description = "A favorite drink amongst poor bartenders living in Neo Detroit." taste_description = "sweet bubblegum vodka" strength = 30 color = "#d3785d" - glass_name = "Sweet Rush" + glass_name = REAGENT_SUGARRUSH glass_desc = "This looks like it might rot your teeth out." /datum/reagent/ethanol/lotus - name = "Lotus" - id = "lotus" + name = REAGENT_LOTUS + id = REAGENT_ID_LOTUS description = "The result of making one mistake after another and trying to cover it up with sugar." taste_description = "rich, sweet fruit and even more sugar" strength = 25 color = "#d3785d" - glass_name = "Lotus" + glass_name = REAGENT_LOTUS glass_desc = "A promotional drink for a movie that only ever played in Neo Detroit theatres." /datum/reagent/ethanol/shroomjuice - name = "Dumb Shroom Juice" - id = "shroomjuice" + name = REAGENT_SHROOMJUICE + id = REAGENT_ID_SHROOMJUICE description = "The mushroom farmer didn't sort through their stock very well." taste_description = "sweet and sour citrus with a savory kick" strength = 100 @@ -265,19 +265,19 @@ var/adj_dizzy = 30 color = "#d3785d" - glass_name = "Dumb Shroom Juice" + glass_name = REAGENT_SHROOMJUICE glass_desc = "Touch fuzzy, get dizzy." /datum/reagent/ethanol/russianroulette - name = "Russian Roulette" - id = "russianroulette" + name = REAGENT_RUSSIANROULETTE + id = REAGENT_ID_RUSSIANROULETTE description = "The perfect drink for wagering your liver on a game of cards." taste_description = "coffee, vodka, cream, and a hot metal slug" strength = 30 var/adj_dizzy = 30 color = "#d3785d" - glass_name = "Russian Roulette" + glass_name = REAGENT_RUSSIANROULETTE glass_desc = "A favorite drink amongst the Pan-Slavic speaking community." /datum/reagent/ethanol/russianroulette/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -287,8 +287,8 @@ M.Stun(2) /datum/reagent/ethanol/lovemaker - name = "The Love Maker" - id = "lovemaker" + name = REAGENT_LOVEMAKER + id = REAGENT_ID_LOVEMAKER description = "A drink said to help one find true love." taste_description = "sweet fruit and honey" strength = 30 @@ -299,35 +299,35 @@ targ_temp = 360 color = "#d3785d" - glass_name = "The Love Maker" + glass_name = REAGENT_LOVEMAKER glass_desc = "A drink said to help one find the perfect fuck." /datum/reagent/ethanol/honeyshot - name = "Honey Shot" - id = "honeyshot" + name = REAGENT_HONEYSHOT + id = REAGENT_ID_HONEYSHOT description = "The perfect drink for bees." taste_description = "sweet tart grenadine flavored with honey" strength = 40 var/adj_dizzy = 10 color = "#d3785d" - glass_name = "Honey shot" + glass_name = REAGENT_HONEYSHOT glass_desc = "A glass of golden liquid." /datum/reagent/ethanol/appletini - name = "Appletini" - id = "appletini" + name = REAGENT_APPLETINI + id = REAGENT_ID_APPLETINIT description = "A classic cocktail using every grandma's favorite fruit." taste_description = "green sour apple with a hint of alcohol" strength = 45 color = "#d3785d" - glass_name = "Appletini" + glass_name = REAGENT_APPLETINI glass_desc = "The perfect fruit cocktail for a fancy night at the bar." /datum/reagent/ethanol/glowingappletini - name = "Glowing Appletini" - id = "glowingappletini" + name = REAGENT_GLOWINGAPPLETINI + id = REAGENT_ID_GLOWINGAPPLETINI description = "A new nuclear take on a pre-modern classic!" taste_description = "overwhelmingly sour apples powered by a nuclear fission reactor" strength = 30 @@ -335,12 +335,12 @@ var/adj_dizzy = 20 color = "#d3785d" - glass_name = "Glowing Appletini" + glass_name = REAGENT_GLOWINGAPPLETINI glass_desc = "The atomic option to fruity cocktails." /datum/reagent/ethanol/scsatw - name = "Slow Comfortable Screw Against the Wall" - id = "scsatw" + name = REAGENT_SCSATW + id = REAGENT_ID_SCSATW description = "The screwdriver's bigger cousin." taste_description = "smooth, savory booze and tangy orange juice" strength = 30 @@ -349,22 +349,22 @@ var/adj_dizzy = 0 color = "#d3785d" - glass_name = "Slow Comfortable Screw Against the Wall" + glass_name = REAGENT_SCSATW glass_desc = "The best accessory to daydrinking." /datum/reagent/drink/choccymilk - name = "Choccy Milk" - id = "choccymilk" + name = REAGENT_CHOCCYMILK + id = REAGENT_ID_CHOCCYMILK description = "Coco and milk, a timeless classic." taste_description = "sophisticated bittersweet chocolate mixed with silky, creamy, whole milk" color = "#d3785d" - glass_name = "Choccy Milk" + glass_name = REAGENT_CHOCCYMILK glass_desc = "The most iconic duo in the galaxy, chocolate, and milk." /datum/reagent/ethanol/redspaceflush - name = "Red Space Flush" - id = "redspaceflush" + name = REAGENT_REDSPACEFLUSH + id = REAGENT_ID_REDSPACEFLUSH description = "A drink made by imbueing the essence of redspace into the spirits." taste_description = "whiskey and rum strung out through a hellish dimensional rift" strength = 30 @@ -372,66 +372,66 @@ var/adj_dizzy = 10 color = "#d3785d" - glass_name = "Redspace Flush" + glass_name = REAGENT_REDSPACEFLUSH glass_desc = "A drink imbued with the very essence of Redspace." /datum/reagent/drink/graveyard - name = "Graveyard" - id = "graveyard" + name = REAGENT_GRAVEYARD + id = REAGENT_ID_GRAVEYARD description = "The result of taking a cup and filling it with all the drinks at the fountain." taste_description = "sugar and fizz" color = "#d3785d" - glass_name = "Graveyard" + glass_name = REAGENT_GRAVEYARD glass_desc = "Hahaha softdrink machine go pshshhhhh..." /datum/reagent/ethanol/bigbeer - name = "Giant Beer" - id = "bigbeer" + name = REAGENT_BIGBEER + id = REAGENT_ID_BIGBEER description = "Bars in Neo Detroit started to sell this drink when the city put mandatory drink limits in 2289." taste_description = "beer, but bigger" strength = 40 color = "#d3785d" - glass_name = "Giant Beer" + glass_name = REAGENT_BIGBEER glass_desc = "The Neo Detroit beer and ale cocktail, perfect for your average drunk." /datum/reagent/ethanol/manager_summoner - name = "Manager Summoner" - id = "manager_summoner" + name = REAGENT_MANAGERSUMMONER + id = REAGENT_ID_MANAGERSUMMONER description = "A horrifying cocktail for those who desperately want feel above their peers." taste_description = "bitter and sweet, with a hint of superiority" strength = 30 color = "#c9716b" - glass_name = "Manager Summoner" + glass_name = REAGENT_MANAGERSUMMONER glass_desc = "The dreaded red juice of those who insist on taking advantage of minor positions of power to make the lives of bar staff unbearable." /datum/reagent/drink/sweettea - name = "Sweet Tea" - id = "sweettea" + name = REAGENT_SWEETTEA + id = REAGENT_ID_SWEETTEA description = "Tea that is sweetened with some form of sweetener." taste_description = "tea that is sweet" color = "#d3785d" - glass_name = "Sweet Tea" + glass_name = REAGENT_SWEETTEA glass_desc = "A southern classic. Southern what? You know, southern." /datum/reagent/ethanol/unsweettea - name = "Unsweetened Tea" - id = "unsweettea" + name = REAGENT_UNSWEETTEA + id = REAGENT_ID_UNSWEETTEA description = "A sick experiment to take the sweetness out of tea after sugar has been added resulted in this." taste_description = "bland, slightly bitter, discount black tea" strength = 80 druggy = 10 color = "#d3785d" - glass_name = "Unsweetened Tea" + glass_name = REAGENT_UNSWEETTEA glass_desc = "A drink with all the calories of sweet tea, but with none of the satisfaction. Slightly psychoactive." /datum/reagent/ethanol/hairoftherat - name = "Hair of the Rat" - id = "hairoftherat" + name = REAGENT_HAIROFTHERAT + id = REAGENT_ID_HAIROFTHERAT description = "A meatier version of the monster tamer, complete with extra meat." taste_description = "meat, whiskey, ground meat, and more meat" strength = 45 @@ -440,7 +440,7 @@ var/alt_nutriment_factor = 5 //half as much as protein since it's half protein. //using a new variable instead of nutriment_factor so we can call ..() without that adding nutrition for us without taking factors for protein into account - glass_name = "Hair of the Rat" + glass_name = REAGENT_HAIROFTHERAT glass_desc = "The alcoholic equivalent of saying your burger isn't cooked rare enough." /datum/reagent/ethanol/hairoftherat/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -480,8 +480,8 @@ //////////////////////Bepis Drinks (04/29/2021)////////////////////// /datum/reagent/drink/soda/bepis_cola - name = "Bepis" - id = "bepis" + name = REAGENT_BEPIS + id = REAGENT_ID_BEPIS description = "A weird cola-like beverage." taste_description = "bepsi" reagent_state = LIQUID @@ -489,13 +489,13 @@ adj_drowsy = -3 adj_temp = -5 - glass_name = "Bepis Cola" + glass_name = REAGENT_BEPIS glass_desc = "A glass of weird cola beverage." glass_special = list(DRINK_FIZZ) /datum/reagent/drink/soda/buzz_fuzz - name = "Buzz Fuzz" - id = "buzz_fuzz" + name = REAGENT_BUZZFUZZ + id = REAGENT_ID_BUZZFUZZ description = "A delicious frontier beverage that's simply a Hive of Flavour!" taste_description = "carbonated honey and pollen" reagent_state = LIQUID @@ -503,13 +503,13 @@ adj_drowsy = -3 adj_temp = -5 - glass_name = "Buzz Fuzz" + glass_name = REAGENT_BUZZFUZZ glass_desc = "A glass that's stinging with flavour." glass_special = list(DRINK_FIZZ) /datum/reagent/drink/soda/sprited_cranberry - name = "Sprited Cranberry" - id = "sprited_cranberry" + name = REAGENT_SPRITEDCRANBERRY + id = REAGENT_ID_SPRITEDCRANBERRY description = "A winter spiced cranberry drink. Perfect for year-round consumption." taste_description = "sweet spiced cranberry" reagent_state = LIQUID @@ -517,13 +517,13 @@ adj_drowsy = -3 adj_temp = -5 - glass_name = "Sprited Cranberry" + glass_name = REAGENT_SPRITEDCRANBERRY glass_desc = "A glass of sprited cranberry" glass_special = list(DRINK_FIZZ) /datum/reagent/drink/soda/shamblers - name = "Shambler's Juice" - id = "shamblers" + name = REAGENT_SHAMBLERS + id = REAGENT_ID_SHAMBLERS description = "A strange off-brand beverage that's bursting with flavor." taste_description = "carbonated metallic soda" reagent_state = LIQUID @@ -531,15 +531,15 @@ adj_drowsy = -3 adj_temp = -5 - glass_name = "Shambler's Juice" + glass_name = REAGENT_SHAMBLERS glass_desc = "A glass of something shambly" glass_special = list(DRINK_FIZZ) ////////////////START BrainzSnax Reagents//////////////// /datum/reagent/nutriment/protein/brainzsnax - name = "grey matter" - id = "brain_protein" + name = REAGENT_BRAINPROTEIN + id = REAGENT_ID_BRAINPROTEIN taste_description = "fatty, mushy meat and allspice" color = "#caa3c9" @@ -560,150 +560,150 @@ log_and_message_admins("is no longer feral.", H) /datum/reagent/nutriment/protein/brainzsnax/red - id = "red_brain_protein" + id = REAGENT_ID_REDBRAINPROTEIN taste_description = "fatty, mushy meat and cheap tomato sauce" color = "#a6898d" ////////////////END BrainzSnax Reagents//////////////// /datum/reagent/nutriment/protein_powder - name = "Protein Powder" - id = "protein_powder" + name = REAGENT_PROTEINPOWDER + id = REAGENT_ID_PROTEINPOWDER description = "Pure, powdered protein commonly used as a meal supplement." taste_description = "powdery protein" color = "#f4e6dd" /datum/reagent/nutriment/protein_shake - name = "Protein Shake" - id = "protein_shake" + name = REAGENT_PROTEINSHAKE + id = REAGENT_ID_PROTEINSHAKE description = "A mixture of water and protein commonly used as a meal supplement." taste_description = "pure protein" color = "#ebd8cb" /datum/reagent/nutriment/protein_powder/vanilla - name = "Vanilla Protein Powder" - id = "vanilla_protein_powder" + name = REAGENT_VANILLAPROTEINPOWDER + id = REAGENT_ID_VANILLAPROTEINPOWDER description = "Pure, powdered protein commonly used as a meal supplement. This one has added vanilla flavoring." taste_description = "powdery vanilla" color = "#fff7d2" /datum/reagent/nutriment/protein_shake/vanilla - name = "Vanilla Protein Shake" - id = "vanilla_protein_shake" + name = REAGENT_VANILLAPROTEINSHAKE + id = REAGENT_ID_VANILLAPROTEINSHAKER description = "A mixture of water and protein commonly used as a meal supplement. This one has added vanilla flavoring." taste_description = "vanilla" color = "#faefbc" /datum/reagent/nutriment/protein_powder/banana - name = "Banana Protein Powder" - id = "banana_protein_powder" + name = REAGENT_BANANAPROTEINPOWDER + id = REAGENT_ID_BANANAPROTEINPOWDER description = "Pure, powdered protein commonly used as a meal supplement. This one has added banana flavoring." taste_description = "powdery banana" color = "#faefbc" /datum/reagent/nutriment/protein_shake/banana - name = "Banana Protein Powder" - id = "banana_protein_shake" + name = REAGENT_BANANAPROTEINSHAKE + id = REAGENT_ID_BANANAPROTEINSHAKE description = "A mixture of water and protein commonly used as a meal supplement. This one has added banana flavoring." taste_description = "banana" color = "#e6daa1" /datum/reagent/nutriment/protein_powder/chocolate - name = "Chocolate Protein Powder" - id = "chocolate_protein_powder" + name = REAGENT_CHOCOLATEPROTEINPOWDER + id = REAGENT_ID_CHOCOLATEPROTEINPOWDER description = "Pure, powdered protein commonly used as a meal supplement. This one has added chocolate flavoring." taste_description = "powdery chocolate" color = "#865b3e" /datum/reagent/nutriment/protein_shake/chocolate - name = "Chocolate Protein Shake" - id = "chocolate_protein_shake" + name = REAGENT_CHOCOLATEPROTEINSHAKE + id = REAGENT_ID_CHOCOLATEPROTEINSHAKE description = "A mixture of water and protein commonly used as a meal supplement. This one has added chocolate flavoring." taste_description = "chocolate" color = "#644730" /datum/reagent/nutriment/protein_powder/strawberry - name = "Strawberry Protein Powder" - id = "strawberry_protein_powder" + name = REAGENT_STRAWBERRYPROTEINPOWDER + id = REAGENT_ID_STRAWBERRYPROTEINPOWDER description = "Pure, powdered protein commonly used as a meal supplement. This one has added strawberry flavoring." taste_description = "powdery strawberry" color = "#eba1a1" /datum/reagent/nutriment/protein_shake/strawberry - name = "Strawberry Protein Shake" - id = "strawberry_protein_shake" + name = REAGENT_STRAWBERRYPROTEINSHAKE + id = REAGENT_ID_STRAWBERRYPROTEINSHAKE description = "A mixture of water and protein commonly used as a meal supplement. This one has added strawberry flavoring." taste_description = "strawberry" color = "#e28585" //SOUPS. Don't use the base soup reagent. /datum/reagent/drink/soup - name = "Soup" - id = "generic_soup" + name = REAGENT_SOUP + id = REAGENT_ID_SOUP description = "An indistinct soupy mass of nominal goodness, but questionable flavour." taste_description = "upsettingly bland soup" color = "#9a9a9a" nutrition = 30 //same as base nutriment /datum/reagent/drink/soup/tomato - name = "Tomato Soup" - id = "tomato_soup" + name = REAGENT_TOMATOSOUP + id = REAGENT_ID_TOMATOSOUP description = "A thick and creamy tomato soup. Delicious! Definitely not ketchup." taste_description = "rich, creamy tomato" color = "#e4612d" allergen_type = ALLERGEN_FRUIT //tomatoes are fruit, etc. etc. /datum/reagent/drink/soup/mushroom - name = "Cream of Mushroom Soup" - id = "mushroom_soup" + name = REAGENT_MUSHROOMSOUP + id = REAGENT_ID_MUSHROOMSOUP description = "A rich, earthy mushroom soup." taste_description = "earthy mushrooms" color = "#a59a83" allergen_type = ALLERGEN_FUNGI //shrooms! /datum/reagent/drink/soup/chicken - name = "Cream of Chicken Soup" - id = "chicken_soup" + name = REAGENT_CHICKENSOUP + id = REAGENT_ID_CHICKENSOUP description = "A fairly thick, warming chicken-based soup." taste_description = "savoury chicken goodness" color = "#d4c574" allergen_type = ALLERGEN_MEAT //plain ol' chimken /datum/reagent/drink/soup/chicken_noodle - name = "Chicken Noodle Soup" - id = "chicken_noodle_soup" + name = REAGENT_CHICKENNOODLESOUP + id = REAGENT_ID_CHICKENNOODLESOUP description = "A thin chicken broth with added noodles. If you're lucky there might be some chunks of chicken and veggies in there! Maybe." taste_description = "savoury chicken-noodle goodness" color = "#a27a41" allergen_type = ALLERGEN_MEAT|ALLERGEN_GRAINS|ALLERGEN_VEGETABLE //chicken + grain-based noodles + veggie chunks /datum/reagent/drink/soup/onion - name = "Onion Soup" - id = "onion_soup" + name = REAGENT_ONIONSOUP + id = REAGENT_ID_ONIONSOUP description = "A humble staple of humanity throughout the centuries." taste_description = "caramelized onions" color = "#5d3918" allergen_type = ALLERGEN_VEGETABLE //onions are veg, right? /datum/reagent/drink/soup/vegetable - name = "Vegetable Soup" - id = "vegetable_soup" + name = REAGENT_VEGETABLESOUP + id = REAGENT_ID_VEGETABLESOUP description = "A mix of various kinds of tasty vegetables, in soup format!" taste_description = "mixed vegetables" color = "#824005" allergen_type = ALLERGEN_VEGETABLE //mixed veg /datum/reagent/drink/soup/beet - name = "Beet Soup" - id = "beet_soup" + name = REAGENT_BEETSOUP + id = REAGENT_ID_BEETSOUP description = "A hearty mix of tomatoes and beets, with a meat stock base." taste_description = "sour tomatoes and some killer beets" color = "#471b1c" allergen_type = ALLERGEN_MEAT|ALLERGEN_FRUIT|ALLERGEN_VEGETABLE //meat stock, tomatoes, and beets /datum/reagent/drink/soup/hot_and_sour - name = "Hot & Sour Soup" - id = "hot_n_sour_soup" + name = REAGENT_HOTNSOURSOUP + id = REAGENT_ID_HOTNSOURSOUP description = "A spicy tofu-based soup." taste_description = "spicy, sour tofu" color = "#5f1b06" @@ -713,8 +713,8 @@ /datum/reagent/drink/coffee/nukie - name = "Nukie" - id = "nukie" + name = REAGENT_NUKIE + id = REAGENT_ID_NUKIE description = "An extremely concentrated caffinated drink." color = "#102838" adj_temp = 0 @@ -722,70 +722,70 @@ adj_drowsy = -5 adj_sleepy = -10 - glass_name = "nukie" + glass_name = REAGENT_ID_NUKIE glass_desc = "A drink to perk you up and refresh you!" overdose = 30 taste_description = "flavourless energy" /datum/reagent/drink/coffee/nukie/peach - name = "Nukie Peach" - id = "nukie_peach" + name = REAGENT_NUKIEPEACH + id = REAGENT_ID_NUKIEPEACH color = "#ffc76e" taste_description = "battery acid with a hint of artificial peach" /datum/reagent/drink/coffee/nukie/pear - name = "Nukie Pear" - id = "nukie_pear" + name = REAGENT_NUKIEPEAR + id = REAGENT_ID_NUKIEPEAR color = "#d4c03d" taste_description = "electrostimulation with a hint of artificial pear" /datum/reagent/drink/coffee/nukie/cherry - name = "Nukie Cherry" - id = "nukie_cherry" + name = REAGENT_NUKIECHERRY + id = REAGENT_ID_NUKIECHERRY color = "#b00707" taste_description = "the rapid acceleration of tooth decay with a hint of artificial cherry" /datum/reagent/drink/coffee/nukie/melon - name = "Nukie Melon" - id = "nukie_melon" + name = REAGENT_NUKIEMELON + id = REAGENT_ID_NUKIEMELON color = "#00bf06" taste_description = "something is crawling under your skin with a hint of artificial melon" /datum/reagent/drink/coffee/nukie/banana - name = "Nukie Banana" - id = "nukie_banana" + name = REAGENT_NUKIEBANANA + id = REAGENT_ID_NUKIEBANANA color = "#ffee00" taste_description = "imminent cardiac arrest with a hint of something that doesn't really taste like banana at all but is clearly intending to be banana" /datum/reagent/drink/coffee/nukie/rose - name = "Nukie Rose" - id = "nukie_rose" + name = REAGENT_NUKIEROSE + id = REAGENT_ID_NUKIEROSE color = "#ff7df4" taste_description = "paint stripper, space cleaner and some sort of cheap perfume" /datum/reagent/drink/coffee/nukie/lemon - name = "Nukie Lemon" - id = "nukie_lemon" + name = REAGENT_NUKIELEMON + id = REAGENT_ID_NUKIELEMON color = "#c3ff00" taste_description = "something that once resembled lemon mixed thoroughly with literal toxic waste" /datum/reagent/drink/coffee/nukie/fruit - name = "Nukie Fruit" - id = "nukie_fruit" + name = REAGENT_NUKIEFRUIT + id = REAGENT_ID_NUKIEFRUIT color = "#b300ff" taste_description = "the colour purple" /datum/reagent/drink/coffee/nukie/special - name = "Nukie Limited Edition" - id = "nukie_special" + name = REAGENT_NUKIESPECIAL + id = REAGENT_ID_NUKIESPECIAL color = "#ffffff" taste_description = "sitting in your college dorm one week before your exams start, staring at a screen without anything particularly interesting on, knowing that you should really be studying, but you can put it off for another day right? Plus your friends are gonna be getting on soon and there's an event starting that you need to prep for" /datum/reagent/drink/coffee/nukie/mega - name = "Mega Nukie" - id = "nukie_mega" + name = REAGENT_NUKIEMEGA + id = REAGENT_ID_NUKIEMEGA description = "An extremely dangerously concentrated caffinated drink." color = "#102838" adj_temp = 0 @@ -793,15 +793,15 @@ adj_drowsy = -5 adj_sleepy = -10 - glass_name = "nukie" + glass_name = REAGENT_ID_NUKIE glass_desc = "A drink that might just explode your heart!" overdose = 5 taste_description = "flavourless energy" /datum/reagent/drink/coffee/nukie/mega/sight - name = "Nukie Mega Plum" - id = "nukie_mega_sight" + name = REAGENT_NUKIEMEGASIGHT + id = REAGENT_ID_NUKIEMEGASIGHT color = "#f4fc03" taste_description = "seeing beyond the margins of this world" @@ -819,8 +819,8 @@ M.add_chemical_effect(CE_DARKSIGHT, 1) /datum/reagent/drink/coffee/nukie/mega/heart //Heals you pretty damn well but damages your heart - name = "Nukie Mega Juice" - id = "nukie_mega_heart" + name = REAGENT_NUKIEMEGAHEART + id = REAGENT_ID_NUKIEMEGAHEART color = "#fc03e7" taste_description = "the end is rapidly approaching, yet remains forever far" @@ -840,8 +840,8 @@ ..() /datum/reagent/drink/coffee/nukie/mega/nega //Makes you both jittery and sleepy - name = "Nukie Nega" - id = "nukie_mega_sleep" + name = REAGENT_NUKIEMEGASLEEP + id = REAGENT_ID_NUKIEMEGASLEEP color = "#00dded" taste_description = "the void encompassing you" adj_drowsy = 0 @@ -854,8 +854,8 @@ ..() /datum/reagent/drink/coffee/nukie/mega/shock //Rapidly fills you up and even repairs your NIF, unless you don't have one in which case you'll be confused. - name = "Nukie Mega Shock" - id = "nukie_mega_shock" + name = REAGENT_NUKIEMEGASHOCK + id = REAGENT_ID_NUKIEMEGASHOCK color = "#ede500" taste_description = "a thousand volts running down your spine" @@ -875,8 +875,8 @@ /datum/reagent/drink/coffee/nukie/mega/fast //Like hyperzine, but instead of overdosing, it occassionally burns you - name = "Nukie Mega Rapid" - id = "nukie_mega_fast" + name = REAGENT_NUKIEMEGAFAST + id = REAGENT_ID_NUKIEMEGAFAST color = "#000000" taste_description = "more, more, now, quick, get yourself some more, don't stop" @@ -888,8 +888,8 @@ M.add_chemical_effect(CE_SPEEDBOOST, 1) /datum/reagent/drink/coffee/nukie/mega/high //Simultaneously makes you high and hungry - name = "Nukie Mega Sky" - id = "nukie_mega_high" + name = REAGENT_NUKIEMEGAHIGH + id = REAGENT_ID_NUKIEMEGAHIGH color = "#fafafa" taste_description = "moreishness, you could really go for a proper snack right now" @@ -931,8 +931,8 @@ M.emote(pick("twitch", "giggle")) /datum/reagent/drink/coffee/nukie/mega/shrink //Basically microcillin but for ingesting - name = "Nukie Mega Shrink" - id = "nukie_mega_shrink" + name = REAGENT_NUKIEMEGASHRINK + id = REAGENT_ID_NUKIEMEGASHRINK color = "#15ff00" taste_description = "a plastic bag floating gently on the breeze" @@ -941,8 +941,8 @@ M.resize((M.size_multiplier - 0.01), uncapped = M.has_large_resize_bounds(), aura_animation = FALSE) /datum/reagent/drink/coffee/nukie/mega/grow //Basically macrocillin but for ingesting - name = "Nukie Mega Growth" - id = "nukie_mega_growth" + name = REAGENT_NUKIEMEGAGROWTH + id = REAGENT_ID_NUKIEMEGAGROWTH color = "#90ed87" taste_description = "absurd hugeness" diff --git a/code/modules/reagents/reagents/other.dm b/code/modules/reagents/reagents/other.dm index 3bf60711ca..d99f8217f8 100644 --- a/code/modules/reagents/reagents/other.dm +++ b/code/modules/reagents/reagents/other.dm @@ -383,7 +383,7 @@ name = "Diethylamine" id = "diethylamine" description = "A secondary amine, mildly corrosive." - taste_description = "iron" + taste_description = REAGENT_ID_IRON reagent_state = LIQUID color = "#604030" @@ -576,10 +576,10 @@ var/datum/reagent/blood/coolant = H.get_blood(H.vessel) if(coolant) - H.vessel.add_reagent("blood", removed, coolant.data) + H.vessel.add_reagent(REAGENT_ID_BLOOD, removed, coolant.data) else - H.vessel.add_reagent("blood", removed) + H.vessel.add_reagent(REAGENT_ID_BLOOD, removed) H.fixblood() else diff --git a/code/modules/reagents/reagents/toxins.dm b/code/modules/reagents/reagents/toxins.dm index 9046ce5cfa..be61b6da43 100644 --- a/code/modules/reagents/reagents/toxins.dm +++ b/code/modules/reagents/reagents/toxins.dm @@ -466,8 +466,8 @@ affect_blood(M, alien, removed * 0.7) /datum/reagent/acid/polyacid - name = "Polytrinic acid" - id = "pacid" + name = REAGENT_PACID + id = REAGENT_ID_PACID description = "Polytrinic acid is a an extremely corrosive chemical substance." taste_description = "acid" reagent_state = LIQUID diff --git a/code/modules/reagents/reagents/vore_vr.dm b/code/modules/reagents/reagents/vore_vr.dm index 936f555cbc..ef28e716fe 100644 --- a/code/modules/reagents/reagents/vore_vr.dm +++ b/code/modules/reagents/reagents/vore_vr.dm @@ -4,8 +4,8 @@ //////////////////////////// /datum/reagent/macrocillin - name = "Macrocillin" - id = "macrocillin" + name = REAGENT_MACROCILLIN + id = REAGENT_ID_MACROCILLIN description = "Glowing yellow liquid." reagent_state = LIQUID color = "#FFFF00" // rgb: 255, 255, 0 @@ -17,8 +17,8 @@ return /datum/reagent/microcillin - name = "Microcillin" - id = "microcillin" + name = REAGENT_MICROCILLIN + id = REAGENT_ID_MICROCILLIN description = "Murky purple liquid." reagent_state = LIQUID color = "#800080" @@ -31,8 +31,8 @@ /datum/reagent/normalcillin - name = "Normalcillin" - id = "normalcillin" + name = REAGENT_NORMALCILLIN + id = REAGENT_ID_NORMALCILLIN description = "Translucent cyan liquid." reagent_state = LIQUID color = "#00FFFF" @@ -48,8 +48,8 @@ /datum/reagent/sizeoxadone - name = "Sizeoxadone" - id = "sizeoxadone" + name = REAGENT_SIZEOXADONE + id = REAGENT_ID_SIZEOXADONE description = "A volatile liquid used as a precursor to size-altering chemicals. Causes dizziness if taken unprocessed." reagent_state = LIQUID color = "#1E90FF" @@ -65,8 +65,8 @@ ////////////////////////// Anti-Noms Drugs ////////////////////////// /datum/reagent/ickypak - name = "Ickypak" - id = "ickypak" + name = REAGENT_ICKYPAK + id = REAGENT_ID_ICKYPAK description = "A foul-smelling green liquid, for inducing muscle contractions to expel accidentally ingested things." reagent_state = LIQUID color = "#0E900E" @@ -87,8 +87,8 @@ B.release_specific_contents(A) /datum/reagent/unsorbitol - name = "Unsorbitol" - id = "unsorbitol" + name = REAGENT_UNSORBITOL + id = REAGENT_ID_UNSORBITOL description = "A frothy pink liquid, for causing cellular-level hetrogenous structure separation." reagent_state = LIQUID color = "#EF77E5" @@ -118,15 +118,15 @@ ////////////////////////// TF Drugs ////////////////////////// /datum/reagent/amorphorovir - name = "Amorphorovir" - id = "amorphorovir" + name = REAGENT_AMORPHOROVIR + id = REAGENT_ID_AMORPHOROVIR description = "A base medical concoction, capable of rapidly altering genetic and physical structure of the body. Requires extra processing to allow for a targeted transformation." reagent_state = LIQUID color = "#AAAAAA" /datum/reagent/androrovir - name = "Androrovir" - id = "androrovir" + name = REAGENT_ANDROROVIR + id = REAGENT_ID_ANDROROVIR description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be male." reagent_state = LIQUID color = "#00BBFF" @@ -136,7 +136,7 @@ return if(ishuman(M)) var/mob/living/carbon/human/H = M - if(M.reagents.has_reagent("gynorovir") || M.reagents.has_reagent("androgynorovir")) + if(M.reagents.has_reagent(REAGENT_ID_GYNOROVIR) || M.reagents.has_reagent(REAGENT_ID_ANDROGYNOROVIR)) H.Confuse(1) else if(!(H.gender == MALE)) @@ -146,8 +146,8 @@ span_warning("Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became male.")) /datum/reagent/gynorovir - name = "Gynorovir" - id = "gynorovir" + name = REAGENT_GYNOROVIR + id = REAGENT_ID_GYNOROVIR description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be female." reagent_state = LIQUID color = "#FF00AA" @@ -157,7 +157,7 @@ return if(ishuman(M)) var/mob/living/carbon/human/H = M - if(M.reagents.has_reagent("androrovir") || M.reagents.has_reagent("androgynorovir")) + if(M.reagents.has_reagent(REAGENT_ID_ANDROROVIR) || M.reagents.has_reagent(REAGENT_ID_ANDROGYNOROVIR)) H.Confuse(1) else if(!(H.gender == FEMALE)) @@ -167,8 +167,8 @@ span_warning("Your body suddenly contorts, feeling very different in various ways... By the time the rushing feeling is over it seems you just became female.")) /datum/reagent/androgynorovir - name = "Androgynorovir" - id = "androgynorovir" + name = REAGENT_ANDROGYNOROVIR + id = REAGENT_ID_ANDROGYNOROVIR description = "A medical concoction, capable of rapidly altering genetic and physical structure of the body. This one seems to realign the target's gender to be mixed." reagent_state = LIQUID color = "#6600FF" @@ -178,7 +178,7 @@ return if(ishuman(M)) var/mob/living/carbon/human/H = M - if(M.reagents.has_reagent("gynorovir") || M.reagents.has_reagent("androrovir")) + if(M.reagents.has_reagent(REAGENT_ID_GYNOROVIR) || M.reagents.has_reagent(REAGENT_ID_ANDROROVIR)) H.Confuse(1) else if(!(H.gender == PLURAL)) @@ -191,8 +191,8 @@ ////////////////////////// Misc Drugs ////////////////////////// /datum/reagent/drugs/rainbow_toxin /// Replaces Space Drugs. - name = "Rainbow Toxin" - id = "rainbowtoxin" + name = REAGENT_RAINBOWTOXIN + id = REAGENT_ID_RAINBOWTOXIN description = "Known for providing a euphoric high, this psychoactive drug is often injected into unknowing prey by serpents and other fanged beasts. Highly valuable and frequently sought after by hypno-enthusiasts and party-goers." taste_description = "mixed euphoria" taste_mult = 0.8 //You ARE going to taste this! @@ -212,8 +212,8 @@ ..() /datum/reagent/paralysis_toxin - name = "Tetrodotoxin" - id = "paralysistoxin" + name = REAGENT_PARALYSISTOXIN + id = REAGENT_ID_PARALYSISTOXIN description = "A potent toxin commonly found in a plethora of species. When exposed to the toxin, causes extreme, paralysis for a prolonged period, with only essential functions of the body being unhindered. Commonly used by covert operatives and used as a crowd control tool." taste_description = "bitterness" reagent_state = LIQUID @@ -227,8 +227,8 @@ M.AdjustWeakened(5) //Stand in for paralyze so you can still talk/emote/see /datum/reagent/pain_enzyme - name = "Pain Enzyme" - id = "painenzyme" + name = REAGENT_PAINENZYME + id = REAGENT_ID_PAINENZYME description = "An enzyme found in a variety of species. When exposed to the toxin, will cause severe, agonizing pain. The effects can last for hours depending on the dose. Only known cure is an equally strong painkiller or dialysis." taste_description = "sourness" reagent_state = LIQUID diff --git a/code/modules/research/designs/circuits/circuits.dm b/code/modules/research/designs/circuits/circuits.dm index 972ee1b159..113bf9aaef 100644 --- a/code/modules/research/designs/circuits/circuits.dm +++ b/code/modules/research/designs/circuits/circuits.dm @@ -6,7 +6,7 @@ CIRCUITS BELOW build_type = IMPRINTER req_tech = list(TECH_DATA = 2) materials = list(MAT_GLASS = 2000) - chemicals = list("sacid" = 20) + chemicals = list(REAGENT_ID_SACID = 20) time = 5 /datum/design/circuit/AssembleDesignName() @@ -515,7 +515,7 @@ CIRCUITS BELOW id = "durand_main" req_tech = list(TECH_DATA = 4) materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250) - chemicals = list("sacid" = 20) + chemicals = list(REAGENT_ID_SACID = 20) build_path = /obj/item/circuitboard/mecha/durand/main sort_string = "NAADA" @@ -524,7 +524,7 @@ CIRCUITS BELOW id = "durand_peri" req_tech = list(TECH_DATA = 4) materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250) - chemicals = list("sacid" = 20) + chemicals = list(REAGENT_ID_SACID = 20) build_path = /obj/item/circuitboard/mecha/durand/peripherals sort_string = "NAADB" @@ -533,7 +533,7 @@ CIRCUITS BELOW id = "durand_targ" req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2) materials = list(MAT_GLASS = 2000, MAT_GRAPHITE = 1250) - chemicals = list("sacid" = 20) + chemicals = list(REAGENT_ID_SACID = 20) build_path = /obj/item/circuitboard/mecha/durand/targeting sort_string = "NAADC" diff --git a/code/modules/research/designs/circuits/disks.dm b/code/modules/research/designs/circuits/disks.dm index a386479cb9..21a17f5fcd 100644 --- a/code/modules/research/designs/circuits/disks.dm +++ b/code/modules/research/designs/circuits/disks.dm @@ -3,7 +3,7 @@ build_type = IMPRINTER req_tech = list(TECH_DATA = 3) materials = list(MAT_PLASTIC = 2000, MAT_GLASS = 1000) - chemicals = list("pacid" = 10) + chemicals = list(REAGENT_ID_PACID = 10) time = 5 /datum/design/circuit/disk/AssembleDesignName() diff --git a/code/modules/research/designs/uncommented.dm b/code/modules/research/designs/uncommented.dm index 68b3a2c70c..f537bd2cd5 100644 --- a/code/modules/research/designs/uncommented.dm +++ b/code/modules/research/designs/uncommented.dm @@ -19,7 +19,7 @@ id = "rust_core_control" req_tech = list("programming" = 4, "engineering" = 4) build_type = IMPRINTER - materials = list(MAT_GLASS = 2000, "sacid" = 20) + materials = list(MAT_GLASS = 2000, REAGENT_ID_SACID = 20) build_path = "/obj/item/circuitboard/rust_core_control" /datum/design/rust_fuel_control @@ -28,7 +28,7 @@ id = "rust_fuel_control" req_tech = list("programming" = 4, "engineering" = 4) build_type = IMPRINTER - materials = list(MAT_GLASS = 2000, "sacid" = 20) + materials = list(MAT_GLASS = 2000, REAGENT_ID_SACID = 20) build_path = "/obj/item/circuitboard/rust_fuel_control" /datum/design/rust_fuel_port @@ -37,7 +37,7 @@ id = "rust_fuel_port" req_tech = list("engineering" = 4, "materials" = 5) build_type = IMPRINTER - materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_URANIUM = 3000) + materials = list(MAT_GLASS = 2000, REAGENT_ID_SACID = 20, MAT_URANIUM = 3000) build_path = "/obj/item/module/rust_fuel_port" /datum/design/rust_fuel_compressor @@ -46,7 +46,7 @@ id = "rust_fuel_compressor" req_tech = list("materials" = 6, "phorontech" = 4) build_type = IMPRINTER - materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_PHORON = 3000, MAT_DIAMOND = 1000) + materials = list(MAT_GLASS = 2000, REAGENT_ID_SACID = 20, MAT_PHORON = 3000, MAT_DIAMOND = 1000) build_path = "/obj/item/module/rust_fuel_compressor" /datum/design/rust_core @@ -55,7 +55,7 @@ id = "pacman" req_tech = list(bluespace = 3, phorontech = 4, magnets = 5, powerstorage = 6) build_type = IMPRINTER - materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_PHORON = 3000, MAT_DIAMOND = 2000) + materials = list(MAT_GLASS = 2000, REAGENT_ID_SACID = 20, MAT_PHORON = 3000, MAT_DIAMOND = 2000) build_path = "/obj/item/circuitboard/rust_core" /datum/design/rust_injector @@ -64,6 +64,6 @@ id = "pacman" req_tech = list(powerstorage = 3, engineering = 4, phorontech = 4, materials = 6) build_type = IMPRINTER - materials = list(MAT_GLASS = 2000, "sacid" = 20, MAT_PHORON = 3000, MAT_URANIUM = 2000) + materials = list(MAT_GLASS = 2000, REAGENT_ID_SACID = 20, MAT_PHORON = 3000, MAT_URANIUM = 2000) build_path = "/obj/item/circuitboard/rust_core" */ diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index bbd4e10832..e4b0825ba3 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -1046,7 +1046,7 @@ var/list/rock_munch = list( MAT_URANIUM = list("nutrition" = 30, "remark" = "Crunching [O] in your jaws almost makes you wince, a horribly tangy and sour flavour radiating through your mouth. It goes down all the same.", "WTF" = FALSE), "hematite" = list("nutrition" = 15, "remark" = "The familiar texture and taste of [O] does the job but leaves little to the imagination and hardly sates your appetite.", "WTF" = FALSE), - "carbon" = list("nutrition" = 15, "remark" = "Utterly bitter, crunching down on [O] only makes you long for better things. But a snack's a snack...", "WTF" = FALSE), + REAGENT_ID_CARBON = list("nutrition" = 15, "remark" = "Utterly bitter, crunching down on [O] only makes you long for better things. But a snack's a snack...", "WTF" = FALSE), "marble" = list("nutrition" = 40, "remark" = "A fitting dessert, the sweet and savoury [O] lingers on the palate and satisfies your hunger.", "WTF" = FALSE), "sand" = list("nutrition" = 0, "remark" = "You crunch on [O] but its texture is almost gag-inducing. Stifling a cough, you somehow manage to swallow both [O] and your regrets.", "WTF" = FALSE), MAT_PHORON = list("nutrition" = 30, "remark" = "Crunching [O] to dust between your jaw you find pleasant, comforting warmth filling your mouth that briefly spreads down the throat to your chest as you swallow.", "WTF" = FALSE), diff --git a/code/modules/vore/fluffstuff/custom_implants_vr.dm b/code/modules/vore/fluffstuff/custom_implants_vr.dm index 1ad8493b1d..608b326ca4 100644 --- a/code/modules/vore/fluffstuff/custom_implants_vr.dm +++ b/code/modules/vore/fluffstuff/custom_implants_vr.dm @@ -468,7 +468,7 @@ /obj/item/reagent_containers/food/snacks/chocolateegg/roiz/New() ..() - reagents.add_reagent("sugar", 6) + reagents.add_reagent(REAGENT_ID_SUGAR, 6) reagents.add_reagent("coco", 6) reagents.add_reagent("milk", 2) bitesize = 2 diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index c9283e774f..6c0da1fe9c 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1396,7 +1396,7 @@ desc = "A small bottle of finely ground poppyseed and mixed dried berries." icon = 'icons/obj/chemical.dmi' icon_state = "bottle3" - prefill = list("bicaridine" = 30, "nutriment" = 30) + prefill = list("bicaridine" = 30, REAGENT_ID_NUTRIMENT = 30) /obj/item/clothing/accessory/storage/ritualharness/fluff/antoinette/Initialize() . = ..() diff --git a/code/modules/vore/smoleworld/smoleworld_vr.dm b/code/modules/vore/smoleworld/smoleworld_vr.dm index eca90161f5..7e43c79a21 100644 --- a/code/modules/vore/smoleworld/smoleworld_vr.dm +++ b/code/modules/vore/smoleworld/smoleworld_vr.dm @@ -423,7 +423,7 @@ icon_state = "sp_moon" bitesize = 1 nutriment_amt = 2 - nutriment_desc = list("sugar" = 2) + nutriment_desc = list(REAGENT_ID_SUGAR = 2) drop_sound = 'sound/items/drop/basketball.ogg' /obj/item/reagent_containers/food/snacks/snackplanet/virgo3b diff --git a/code/modules/xenoarcheaology/effect_master.dm b/code/modules/xenoarcheaology/effect_master.dm index fb7798ab50..1bfed91ff7 100644 --- a/code/modules/xenoarcheaology/effect_master.dm +++ b/code/modules/xenoarcheaology/effect_master.dm @@ -296,10 +296,10 @@ for(var/datum/artifact_effect/my_effect in my_effects) if (istype(W, /obj/item/reagent_containers)) - if(W.reagents.has_reagent("hydrogen", 1) || W.reagents.has_reagent("water", 1)) + if(W.reagents.has_reagent(REAGENT_ID_HYDROGEN, 1) || W.reagents.has_reagent(REAGENT_ID_WATER, 1)) if(my_effect.trigger == TRIGGER_WATER) my_effect.ToggleActivate() - else if(W.reagents.has_reagent("sacid", 1) || W.reagents.has_reagent("pacid", 1) || W.reagents.has_reagent("diethylamine", 1)) + else if(W.reagents.has_reagent(REAGENT_ID_SACID, 1) || W.reagents.has_reagent(REAGENT_ID_PACID, 1) || W.reagents.has_reagent("diethylamine", 1)) if(my_effect.trigger == TRIGGER_ACID) my_effect.ToggleActivate() else if(W.reagents.has_reagent(REAGENT_ID_PHORON, 1) || W.reagents.has_reagent("thermite", 1)) @@ -327,8 +327,8 @@ /datum/component/artifact_master/proc/on_reagent() var/datum/reagent/Touching = args[2] - var/list/water = list("hydrogen", "water") - var/list/acid = list("sacid", "pacid", "diethylamine") + var/list/water = list(REAGENT_ID_HYDROGEN, REAGENT_ID_WATER) + var/list/acid = list(REAGENT_ID_SACID, REAGENT_ID_PACID, "diethylamine") var/list/volatile = list(REAGENT_ID_PHORON,"thermite") var/list/toxic = list("toxin","cyanide","amatoxin","neurotoxin") diff --git a/code/modules/xenoarcheaology/effects/heal.dm b/code/modules/xenoarcheaology/effects/heal.dm index db0cf9d05e..6b6ea9b259 100644 --- a/code/modules/xenoarcheaology/effects/heal.dm +++ b/code/modules/xenoarcheaology/effects/heal.dm @@ -1,5 +1,5 @@ /datum/artifact_effect/heal - name = "heal" + name = XENO_CHEM_HEAL effect_type = EFFECT_ORGANIC effect_color = "#4649ff" @@ -17,7 +17,7 @@ if(affecting && istype(affecting)) affecting.heal_damage(25 * weakness, 25 * weakness) //H:heal_organ_damage(25, 25) - H.vessel.add_reagent("blood",5) + H.vessel.add_reagent(REAGENT_ID_BLOOD,5) H.adjust_nutrition(50 * weakness) H.adjustBrainLoss(-25 * weakness) H.radiation -= min(H.radiation, 25 * weakness) diff --git a/code/modules/xenoarcheaology/finds/finds_defines.dm b/code/modules/xenoarcheaology/finds/finds_defines.dm index 132d741937..d02022eb7e 100644 --- a/code/modules/xenoarcheaology/finds/finds_defines.dm +++ b/code/modules/xenoarcheaology/finds/finds_defines.dm @@ -1,12 +1,12 @@ var/global/list/responsive_carriers = list( - "carbon", - "potassium", - "hydrogen", + REAGENT_ID_CARBON, + REAGENT_ID_POTASSIUM, + REAGENT_ID_HYDROGEN, REAGENT_ID_NITROGEN, - "mercury", - "iron", - "chlorine", - "phosphorus", + REAGENT_ID_MERCURY, + REAGENT_ID_IRON, + REAGENT_ID_CHLORINE, + REAGENT_ID_PHOSPHORUS, REAGENT_ID_PHORON) var/global/list/finds_as_strings = list( @@ -23,15 +23,15 @@ var/global/list/finds_as_strings = list( /proc/get_responsive_reagent(var/find_type) switch(find_type) if(ARCHAEO_BOWL, ARCHAEO_URN, ARCHAEO_CUTLERY, ARCHAEO_STATUETTE, ARCHAEO_INSTRUMENT, ARCHAEO_HANDCUFFS, ARCHAEO_BEARTRAP, ARCHAEO_LIGHTER, ARCHAEO_BOX, ARCHAEO_GASTANK, ARCHAEO_PEN, ARCHAEO_UNKNOWN) - return "mercury" + return REAGENT_ID_MERCURY if(ARCHAEO_COIN, ARCHAEO_KNIFE, ARCHAEO_TOOL, ARCHAEO_METAL, ARCHAEO_CLAYMORE, ARCHAEO_RODS, ARCHAEO_KATANA, ARCHAEO_LASER, ARCHAEO_GUN) - return "iron" + return REAGENT_ID_IRON if(ARCHAEO_CRYSTAL, ARCHAEO_SHARD, ARCHAEO_SOULSTONE) return REAGENT_ID_NITROGEN if(ARCHAEO_CULTBLADE, ARCHAEO_TELEBEACON, ARCHAEO_CULTROBES, ARCHAEO_STOCKPARTS) - return "potassium" + return REAGENT_ID_POTASSIUM if(ARCHAEO_FOSSIL, ARCHAEO_SHELL, ARCHAEO_PLANT, ARCHAEO_REMAINS_HUMANOID, ARCHAEO_REMAINS_ROBOT, ARCHAEO_REMAINS_XENO, ARCHAEO_GASMASK) - return "carbon" + return REAGENT_ID_CARBON return REAGENT_ID_PHORON /proc/get_random_digsite_type() diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm index 0abe25ca7f..0a4a8689a7 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("blood","holywater","lube","stoxin","ethanol","ice","glycerol","fuel","cleaner") + spawning_id = pick(REAGENT_ID_BLOOD,"holywater","lube","stoxin",REAGENT_ID_ETHANOL,"ice","glycerol",REAGENT_ID_FUEL,"cleaner") /obj/item/reagent_containers/glass/replenishing/process() reagents.add_reagent(spawning_id, 0.3) diff --git a/code/modules/xenoarcheaology/sampling.dm b/code/modules/xenoarcheaology/sampling.dm index d00e86bd8d..1a224238a1 100644 --- a/code/modules/xenoarcheaology/sampling.dm +++ b/code/modules/xenoarcheaology/sampling.dm @@ -19,7 +19,7 @@ var/age_billion = 0 var/artifact_id = "" var/artifact_distance = -1 - var/source_mineral = "chlorine" + var/source_mineral = REAGENT_ID_CHLORINE var/list/find_presence = list() /datum/geosample/New(var/turf/simulated/mineral/container) @@ -47,10 +47,10 @@ source_mineral = container.mineral.xarch_source_mineral if(prob(75)) - find_presence["phosphorus"] = rand(1, 500) / 100 + find_presence[REAGENT_ID_PHOSPHORUS] = rand(1, 500) / 100 if(prob(25)) - find_presence["mercury"] = rand(1, 500) / 100 - find_presence["chlorine"] = rand(500, 2500) / 100 + find_presence[REAGENT_ID_MERCURY] = rand(1, 500) / 100 + find_presence[REAGENT_ID_CHLORINE] = rand(500, 2500) / 100 for(var/datum/find/F in container.finds) var/responsive_reagent = get_responsive_reagent(F.find_type) diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm index 5e8065ab9b..90493bd4d8 100644 --- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm +++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm @@ -46,7 +46,7 @@ /obj/machinery/radiocarbon_spectrometer/New() ..() create_reagents(500) - coolant_reagents_purity["water"] = 0.5 + coolant_reagents_purity[REAGENT_ID_WATER] = 0.5 coolant_reagents_purity["icecoffee"] = 0.6 coolant_reagents_purity["icetea"] = 0.6 coolant_reagents_purity["milkshake"] = 0.6 diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm index ed275edeef..6f23ce3cf2 100644 --- a/code/modules/xenobio/items/extracts.dm +++ b/code/modules/xenobio/items/extracts.dm @@ -86,7 +86,7 @@ name = "Slime Monkey" id = "m_monkey" result = null - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/grey @@ -150,8 +150,8 @@ /decl/chemical_reaction/instant/metamorphic/iron name = "Morph into Iron" id = "morph_iron" - required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "iron" = REAGENTS_PER_SHEET) - result = "iron" + required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_IRON = REAGENTS_PER_SHEET) + result = REAGENT_ID_IRON /decl/chemical_reaction/instant/metamorphic/silver @@ -193,7 +193,7 @@ /decl/chemical_reaction/instant/slime/metal_binding name = "Slime Binding" id = "m_binding" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result = "binding" result_amount = REAGENTS_PER_SHEET // Makes enough to make one sheet of any metal. required = /obj/item/slime_extract/metal @@ -221,7 +221,7 @@ name = "Bind into Steel" id = "bind_steel" result = "steel" - required_reagents = list("binding" = REAGENTS_PER_SHEET, "iron" = REAGENTS_PER_SHEET, "carbon" = REAGENTS_PER_SHEET) + required_reagents = list("binding" = REAGENTS_PER_SHEET, REAGENT_ID_IRON = REAGENTS_PER_SHEET, REAGENT_ID_CARBON = REAGENTS_PER_SHEET) result_amount = REAGENTS_PER_SHEET /datum/reagent/steel @@ -272,7 +272,7 @@ /decl/chemical_reaction/instant/slime/blue_stability name = "Slime Stability" id = "m_stability" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/blue @@ -355,7 +355,7 @@ /decl/chemical_reaction/instant/slime/yellow_emp name = "Slime EMP" id = "m_emp" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/yellow @@ -385,7 +385,7 @@ /decl/chemical_reaction/instant/slime/yellow_flashlight name = "Slime Flashlight" id = "m_flashlight" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/yellow @@ -446,7 +446,7 @@ name = "Slime Phoron" id = "m_phoron_harvest" result = REAGENT_ID_PHORON - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = REAGENTS_PER_SHEET * 2 required = /obj/item/slime_extract/dark_purple @@ -549,7 +549,7 @@ /decl/chemical_reaction/instant/slime/red_enrage name = "Slime Enrage" id = "m_enrage" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/red @@ -626,7 +626,7 @@ name = "Slime Clotting Med" id = "m_clotting" result = "slime_bleed_fixer" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 30 required = /obj/item/slime_extract/pink @@ -644,7 +644,7 @@ name = "Slime Organ Med" id = "m_organ_fixer" result = "slime_organ_fixer" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 30 required = /obj/item/slime_extract/pink @@ -685,7 +685,7 @@ /decl/chemical_reaction/instant/slime/oil_griff name = "Slime Explosion" id = "m_boom" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/oil @@ -723,7 +723,7 @@ /decl/chemical_reaction/instant/slime/bluespace_lesser name = "Slime Lesser Tele" id = "m_tele_lesser" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/bluespace @@ -791,7 +791,7 @@ /decl/chemical_reaction/instant/slime/amber_peoplefood name = "Slime Food" id = "m_people_food" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/amber @@ -863,7 +863,7 @@ /decl/chemical_reaction/instant/slime/ruby_loyalty name = "Slime Loyalty" id = "m_strength" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/ruby @@ -921,7 +921,7 @@ /decl/chemical_reaction/instant/slime/light_pink_docility name = "Slime Docility" id = "m_docile" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/light_pink @@ -981,7 +981,7 @@ /decl/chemical_reaction/instant/slime/rainbow_unity name = "Slime Unity" id = "m_unity" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/rainbow diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm index 77d7aab8e6..9c6a53d8ac 100644 --- a/code/modules/xenobio/items/extracts_vr.dm +++ b/code/modules/xenobio/items/extracts_vr.dm @@ -94,7 +94,7 @@ name = "Slime Monkey" id = "m_grey_monkey" result = null - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/grey @@ -108,7 +108,7 @@ name = "Slime Jelly" id = "m_grey_jelly" result = "slimejelly" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 30 required = /obj/item/slime_extract/grey @@ -142,7 +142,7 @@ /decl/chemical_reaction/instant/slime/metal_materials_adv name = "Slime Advanced Construction Materials" id = "m_metal_adv" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/metal @@ -156,7 +156,7 @@ /decl/chemical_reaction/instant/slime/metal_materials_weird name = "Slime Weird Construction Materials" id = "m_metal_weird" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/metal @@ -202,7 +202,7 @@ /decl/chemical_reaction/instant/slime/blue_stability name = "Slime Stability" id = "m_blue_stability" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/blue @@ -214,7 +214,7 @@ /decl/chemical_reaction/instant/slime/blue_calm name = "Slime Calm" id = "m_blue_calm" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/blue @@ -280,7 +280,7 @@ /decl/chemical_reaction/instant/slime/purple_infertility name = "Slime Infetility" id = "m_purple_infertility" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/purple @@ -292,7 +292,7 @@ /decl/chemical_reaction/instant/slime/purple_shrink name = "Slime Shrink" id = "m_purple_shrink" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/purple @@ -354,7 +354,7 @@ /decl/chemical_reaction/instant/slime/orange_heatwave name = "Slime Heat Wave" id = "m_orange_heatwave" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/orange @@ -410,7 +410,7 @@ /decl/chemical_reaction/instant/slime/orange_smoke name = "Slime Smoke" id = "m_orange_smoke" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/orange @@ -465,7 +465,7 @@ /decl/chemical_reaction/instant/slime/yellow_flashlight name = "Slime Flashlight" id = "m_yellow_flashlight" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/yellow @@ -477,7 +477,7 @@ /decl/chemical_reaction/instant/slime/yellow_emp name = "Slime EMP" id = "m_yellow_emp" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/yellow @@ -544,7 +544,7 @@ /decl/chemical_reaction/instant/slime/gold_hostile_mob name = "Slime Hostile Mob" id = "m_gold_hostile_mob" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/gold @@ -560,7 +560,7 @@ /decl/chemical_reaction/instant/slime/gold_safe_mob name = "Slime Safe Mob" id = "m_gold_safe_mob" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/gold @@ -616,7 +616,7 @@ /decl/chemical_reaction/instant/slime/silver_materials_adv name = "Slime Advanced Science Materials" id = "m_silver_adv" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/silver @@ -629,7 +629,7 @@ /decl/chemical_reaction/instant/slime/silver_materials_random name = "Slime Random Materials" id = "m_silver_random" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/silver @@ -677,7 +677,7 @@ name = "Slime Phoron" id = "m_darkpurple_phoron" result = REAGENT_ID_PHORON - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 30 required = /obj/item/slime_extract/dark_purple @@ -685,7 +685,7 @@ /decl/chemical_reaction/instant/slime/dark_purple_blood name = "Slime Blood" id = "m_darkpurple_blood" - result = "blood" + result = REAGENT_ID_BLOOD required_reagents = list("slimejelly" = 5) result_amount = 30 required = /obj/item/slime_extract/dark_purple @@ -775,7 +775,7 @@ /decl/chemical_reaction/instant/slime/dark_blue_temp_resist name = "Slime Temperature Resistance" id = "m_darkblue_temperature_resist" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/dark_blue @@ -802,7 +802,7 @@ name = "Slime Ice" id = "m_darkblue_ice" result = "ice" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 5 required = /obj/item/slime_extract/dark_blue @@ -846,7 +846,7 @@ /decl/chemical_reaction/instant/slime/red_enrage name = "Slime Enrage" id = "m_red_enrage" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/red @@ -882,7 +882,7 @@ name = "Slime Hot Sauce" id = "m_red_hotsauce" result = "capsaicin" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 30 required = /obj/item/slime_extract/red @@ -929,7 +929,7 @@ /decl/chemical_reaction/instant/slime/green_emitter name = "Slime Radiation Emitter" id = "m_green_emitter" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/green @@ -942,8 +942,8 @@ /decl/chemical_reaction/instant/slime/green_radium name = "Slime Radium" id = "m_green_radium" - result = "radium" - required_reagents = list("water" = 5) + result = REAGENT_ID_RADIUM + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 30 required = /obj/item/slime_extract/green @@ -984,7 +984,7 @@ name = "Slime Clotting Med" id = "m_pink_clotting" result = "slime_bleed_fixer" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 30 required = /obj/item/slime_extract/pink @@ -993,7 +993,7 @@ name = "Slime Organ Med" id = "m_pink_organ_fixer" result = "slime_organ_fixer" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 30 required = /obj/item/slime_extract/pink @@ -1032,7 +1032,7 @@ /decl/chemical_reaction/instant/slime/oil_fuel name = "Slime Fuel" id = "m_oil_fuel" - result = "fuel" + result = REAGENT_ID_FUEL required_reagents = list(REAGENT_ID_PHORON = 5) result_amount = 30 required = /obj/item/slime_extract/oil @@ -1042,7 +1042,7 @@ name = "Slime Oil" id = "m_oil_oil" result = "cookingoil" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 30 required = /obj/item/slime_extract/oil @@ -1050,7 +1050,7 @@ /decl/chemical_reaction/instant/slime/oil_fakesplosion name = "Slime Fake Explosion" id = "m_oil_fakeboom" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/oil @@ -1114,7 +1114,7 @@ /decl/chemical_reaction/instant/slime/bluespace_pouch name = "Slime Bluespace Pouch" id = "m_bs_pouch" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/bluespace @@ -1126,7 +1126,7 @@ /decl/chemical_reaction/instant/slime/bluespace_chaotic_tele name = "Slime Bluespace Chaos" id = "m_bs_chaos" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/bluespace @@ -1187,7 +1187,7 @@ /decl/chemical_reaction/instant/slime/cerulean_reinvigoration name = "Slime Reinvigoration" id = "m_cerulean_reinvigoration" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/cerulean @@ -1199,7 +1199,7 @@ /decl/chemical_reaction/instant/slime/cerulean_potion_mimic name = "Slime Potion Mimic" id = "m_cerulean_potion_mimic" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/cerulean @@ -1247,7 +1247,7 @@ /decl/chemical_reaction/instant/slime/amber_random_food name = "Slime Random Food" id = "m_amber_random_food" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/amber @@ -1270,7 +1270,7 @@ /decl/chemical_reaction/instant/slime/amber_snack name = "Slime Snack" id = "m_amber_snack" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/amber @@ -1317,7 +1317,7 @@ name = "Slime Mutation Toxins" id = "m_sapphire_mutation_tox" result = "mutationtoxin" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 30 required = /obj/item/slime_extract/sapphire @@ -1325,7 +1325,7 @@ /decl/chemical_reaction/instant/slime/sapphire_plushies name = "Slime Plushies" id = "m_sapphire_plushies" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/sapphire @@ -1392,7 +1392,7 @@ /decl/chemical_reaction/instant/slime/ruby_pull name = "Slime Pull" id = "m_ruby_pull" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/ruby @@ -1409,7 +1409,7 @@ name = "Slime Brute Juice" id = "m_ruby_brute_juice" result = "berserkmed" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 30 required = /obj/item/slime_extract/ruby @@ -1480,7 +1480,7 @@ /decl/chemical_reaction/instant/slime/emerald_speed name = "Slime Speed" id = "m_emerald_speed" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/emerald @@ -1505,7 +1505,7 @@ name = "Slime Hyperzine" id = "m_emerald_hyperzine" result = "hyperzine" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 30 required = /obj/item/slime_extract/emerald @@ -1554,7 +1554,7 @@ /decl/chemical_reaction/instant/slime/light_pink_loyalty name = "Slime Loyalty" id = "m_lightpink_loyalty" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/light_pink @@ -1566,7 +1566,7 @@ /decl/chemical_reaction/instant/slime/light_pink_docility name = "Slime Docility" id = "m_lightpink_docility" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/light_pink @@ -1626,7 +1626,7 @@ /decl/chemical_reaction/instant/slime/rainbow_random_extract name = "Slime Random Extract" id = "m_rainow_random_extract" - required_reagents = list("blood" = 5) + required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 1 required = /obj/item/slime_extract/rainbow @@ -1639,7 +1639,7 @@ /decl/chemical_reaction/instant/slime/rainbow_colors name = "Slime Colors" id = "m_rainbow_colors" - required_reagents = list("water" = 5) + required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 1 required = /obj/item/slime_extract/rainbow diff --git a/code/modules/xenobio/items/slime_objects.dm b/code/modules/xenobio/items/slime_objects.dm index b1530755b4..47b394624e 100644 --- a/code/modules/xenobio/items/slime_objects.dm +++ b/code/modules/xenobio/items/slime_objects.dm @@ -120,7 +120,7 @@ filling_color = "#FFBB00" center_of_mass = list("x"=17, "y"=10) nutriment_amt = 25 // Very filling. - nutriment_desc = list("slime" = 10, "sweetness" = 10, "bliss" = 5) + nutriment_desc = list("slime" = 10, "sweetness" = 10, REAGENT_ID_BLISS = 5) /obj/item/reagent_containers/food/snacks/slime/Initialize() . = ..() diff --git a/code/modules/xenobio2/_xeno_setup.dm b/code/modules/xenobio2/_xeno_setup.dm index a57e6adad1..b82d70f86d 100644 --- a/code/modules/xenobio2/_xeno_setup.dm +++ b/code/modules/xenobio2/_xeno_setup.dm @@ -49,24 +49,24 @@ #define MIN_MALEABLE 0 var/global/list/xenoChemList = list("mutationtoxin", - "psilocybin", + REAGENT_ID_PSILOCYBIN, "mindbreaker", "impedrezene", "cryptobiolin", - "bliss", + REAGENT_ID_BLISS, "chloralhydrate", "stoxin", "mutagen", "lexorin", - "pacid", + REAGENT_ID_PACID, "cyanide", REAGENT_ID_PHORON, "plasticide", "amatoxin", - "carbon", - "radium", - "sacid", - "sugar", + REAGENT_ID_CARBON, + REAGENT_ID_RADIUM, + REAGENT_ID_SACID, + REAGENT_ID_SUGAR, "kelotane", "dermaline", "anti_toxin", diff --git a/code/modules/xenobio2/_xeno_setup_vr.dm b/code/modules/xenobio2/_xeno_setup_vr.dm index ae17b1b733..36f4767a9e 100644 --- a/code/modules/xenobio2/_xeno_setup_vr.dm +++ b/code/modules/xenobio2/_xeno_setup_vr.dm @@ -17,15 +17,15 @@ xenoChemList += "spaceacillin" xenoChemList += "sterilizine" xenoChemList += "leporazine" - xenoChemList += "methylphenidate" - xenoChemList += "citalopram" - xenoChemList += "paroxetine" - xenoChemList += "macrocillin" - xenoChemList += "microcillin" - xenoChemList += "normalcillin" - xenoChemList += "sizeoxadone" - xenoChemList += "ickypak" - xenoChemList += "unsorbitol" + xenoChemList += REAGENT_ID_METHYLPHENIDATE + xenoChemList += REAGENT_ID_CITALOPRAM + xenoChemList += REAGENT_ID_PAROXETINE + xenoChemList += REAGENT_ID_MACROCILLIN + xenoChemList += REAGENT_ID_MICROCILLIN + xenoChemList += REAGENT_ID_NORMALCILLIN + xenoChemList += REAGENT_ID_SIZEOXADONE + xenoChemList += REAGENT_ID_ICKYPAK + xenoChemList += REAGENT_ID_UNSORBITOL xenoChemList += "toxin" xenoChemList += "carpotoxin" xenoChemList += "potassium_chloride" @@ -37,7 +37,7 @@ xenoChemList += "robustharvest" xenoChemList += "plantbgone" xenoChemList += "serotrotium" - xenoChemList += "nicotine" + xenoChemList += REAGENT_ID_NICOTINE xenoChemList += "uranium" xenoChemList += "silver" xenoChemList += "gold" @@ -54,12 +54,12 @@ xenoChemList += "glycerol" xenoChemList += "coolant" xenoChemList += "luminol" - xenoChemList += "nutriment" + xenoChemList += REAGENT_ID_NUTRIMENT xenoChemList += "cornoil" xenoChemList += "lipozine" - xenoChemList += "sodiumchloride" + xenoChemList += REAGENT_ID_SODIUMCHLORIDE xenoChemList += "frostoil" xenoChemList += "capsaicin" xenoChemList += "condensedcapsaicin" xenoChemList += "neurotoxin" - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm index 9abd7d9593..d5ddbd9f01 100644 --- a/code/modules/xenobio2/mob/slime/slime.dm +++ b/code/modules/xenobio2/mob/slime/slime.dm @@ -46,39 +46,39 @@ Slime definitions, Life and New live here. //Overlay information var/overlay = 1 // 1 = normal lighting, 0 = shiny, 2 = too shiny, -1 = no overlay - chemreact = list( "nutriment" = list("nutr" = 0.5), - "radium" = list("toxic" = 0.3, "mut" = 1), - "mutagen" = list("nutr" = 0.4, "mut" = 2), - "water" = list("nutr" = -0.1), - "milk" = list("nutr" = 0.3), - "sacid" = list("toxic" = 1), - "pacid" = list("toxic" = 2), - "chlorine" = list("toxic" = 0.5), - "ammonia" = list("toxic" = 0.5), - "sodawater" = list("toxic" = 0.1, "nutr" = -0.1), - "beer" = list("nutr" = 0.6), - "diethylamine" = list("nutr" = 0.9), - "sugar" = list("toxic" = 0.4, "nutr" = 0.2), - "eznutrient" = list("nutr" = 0.8), - "cryoxadone" = list("toxic" = 0.4), - "flourine" = list("toxic" = 0.1), - "robustharvest" = list("nutr" = 1.5), - "glucose" = list("nutr" = 0.5), - "blood" = list("nutr" = 0.75, "toxic" = 0.05, "mut" = 0.45), - "fuel" = list("toxic" = 0.4), - "toxin" = list("toxic" = 0.5), - "carpotoxin" = list("toxic" = 1, "mut" = 1.5), - REAGENT_ID_PHORON = list("toxic" = 1.5, "mut" = 0.03), - "virusfood" = list("nutr" = 1.5, "mut" = 0.32), - "cyanide" = list("toxic" = 3.5), - "slimejelly" = list("nutr" = 0.5), - "amutationtoxin" = list("toxic" = 0.1, "heal" = 1.5, "mut" = 3), - "mutationtoxin" = list("toxic" = 0.1, "heal" = 1, "mut" = 1.5), - "gold" = list("heal" = 0.3, "nutr" = 0.7, "mut" = 0.3), - "uranium" = list("heal" = 0.3, "toxic" = 0.7, "mut" = 1.2), - "glycerol" = list("nutr" = 0.6), - "woodpulp" = list("heal" = 0.1, "nutr" = 0.7), - "docilitytoxin" = list("nutr" = 0.3) ) + 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_WATER = list(XENO_CHEM_NUTRI = -0.1), + "milk" = list(XENO_CHEM_NUTRI = 0.3), + REAGENT_ID_SACID = list(XENO_CHEM_TOXIC = 1), + REAGENT_ID_PACID = list(XENO_CHEM_TOXIC = 2), + REAGENT_ID_CHLORINE = list(XENO_CHEM_TOXIC = 0.5), + "ammonia" = list(XENO_CHEM_TOXIC = 0.5), + "sodawater" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_NUTRI = -0.1), + "beer" = list(XENO_CHEM_NUTRI = 0.6), + "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), + "cryoxadone" = list(XENO_CHEM_TOXIC = 0.4), + "flourine" = list(XENO_CHEM_TOXIC = 0.1), + "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_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), + "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), + "gold" = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_NUTRI = 0.7, XENO_CHEM_MUT = 0.3), + "uranium" = list(XENO_CHEM_HEAL = 0.3, XENO_CHEM_TOXIC = 0.7, XENO_CHEM_MUT = 1.2), + "glycerol" = list(XENO_CHEM_NUTRI = 0.6), + "woodpulp" = list(XENO_CHEM_HEAL = 0.1, XENO_CHEM_NUTRI = 0.7), + "docilitytoxin" = list(XENO_CHEM_NUTRI = 0.3) ) /mob/living/simple_mob/xeno/slime/New() ..() diff --git a/code/modules/xenobio2/mob/xeno procs.dm b/code/modules/xenobio2/mob/xeno procs.dm index f2b48b8091..e01b18ade6 100644 --- a/code/modules/xenobio2/mob/xeno procs.dm +++ b/code/modules/xenobio2/mob/xeno procs.dm @@ -68,17 +68,17 @@ Divergence proc, used in mutation to make unique datums. if(!reagent_response) continue // just skip this reagent, rather than clearing the whole thing - if(reagent_response["toxic"]) - adjustToxLoss(reagent_response["toxic"] * reagent_total) + if(reagent_response[XENO_CHEM_TOXIC]) + adjustToxLoss(reagent_response[XENO_CHEM_TOXIC] * reagent_total) - if(reagent_response["heal"]) - heal_overall_damage(reagent_response["heal"] * reagent_total) + if(reagent_response[XENO_CHEM_HEAL]) + heal_overall_damage(reagent_response[XENO_CHEM_HEAL] * reagent_total) - if(reagent_response["nutr"]) - adjust_nutrition(reagent_response["nutr"] * reagent_total) + if(reagent_response[XENO_CHEM_NUTRI]) + adjust_nutrition(reagent_response[XENO_CHEM_NUTRI] * reagent_total) - if(reagent_response["mut"]) - mut_level += reagent_response["mut"] * reagent_total + if(reagent_response[XENO_CHEM_MUT]) + mut_level += reagent_response[XENO_CHEM_MUT] * reagent_total temp_chem_holder.reagents.clear_reagents() diff --git a/maps/stellar_delight/stellar_delight_turfs.dm b/maps/stellar_delight/stellar_delight_turfs.dm index 6e8e86fb33..8a5454d18e 100644 --- a/maps/stellar_delight/stellar_delight_turfs.dm +++ b/maps/stellar_delight/stellar_delight_turfs.dm @@ -52,30 +52,30 @@ VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/rocks) var/mineral_name if(rare_ore) mineral_name = pickweight(list( - "marble" = 7, - "uranium" = 10, - "platinum" = 10, - "hematite" = 10, - "carbon" = 10, - "diamond" = 4, - "gold" = 15, - "silver" = 15, - "lead" = 5, - "verdantium" = 2, - "rutile" = 10)) + ORE_MARBLE = 7, + ORE_URANIUM = 10, + ORE_PLATINUM = 10, + ORE_HEMATITE = 10, + ORE_CARBON = 10, + ORE_DIAMOND = 4, + ORE_GOLD = 15, + ORE_SILVER = 15, + ORE_LEAD = 5, + ORE_VERDANTIUM = 2, + ORE_RUTILE = 10)) else mineral_name = pickweight(list( - "marble" = 5, - "uranium" = 7, - "platinum" = 7, - "hematite" = 28, - "carbon" = 28, - "diamond" = 2, - "gold" = 7, - "silver" = 7, - "lead" = 4, - "verdantium" = 1, - "rutile" = 10)) + ORE_MARBLE = 5, + ORE_URANIUM = 7, + ORE_PLATINUM = 7, + ORE_HEMATITE = 28, + ORE_CARBON = 28, + ORE_DIAMOND = 2, + ORE_GOLD = 7, + ORE_SILVER = 7, + ORE_LEAD = 4, + ORE_VERDANTIUM = 1, + ORE_RUTILE = 10)) if(mineral_name && (mineral_name in GLOB.ore_data)) mineral = GLOB.ore_data[mineral_name] UpdateMineral()