diff --git a/code/__defines/reagents.dm b/code/__defines/_reagents.dm similarity index 69% rename from code/__defines/reagents.dm rename to code/__defines/_reagents.dm index 32e6df659bd..62db7c24937 100644 --- a/code/__defines/reagents.dm +++ b/code/__defines/_reagents.dm @@ -73,8 +73,6 @@ #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" @@ -223,7 +221,7 @@ #define REAGENT_MYELAMINE "Myelamine" #define REAGENT_ID_MYELAMINE "myelamine" #define REAGENT_RESPIRODAXON "Respirodaxon" -#define REAGENT_ID_RESPIRODAXON "respirodaxon +#define REAGENT_ID_RESPIRODAXON "respirodaxon" #define REAGENT_GASTIRODAXON "Gastirodaxon" #define REAGENT_ID_GASTIRODAXON "gastirodaxon" #define REAGENT_HEPANEPHRODAXON "Hepanephrodaxon" @@ -415,7 +413,7 @@ #define REAGENT_ID_ADMINORDRAZINE "adminordrazine" -// Food and Drinks +// Foods & Drinks #define REAGENT_MEATCOLONY "A colony of meat cells" #define REAGENT_ID_MEATCOLONY "meatcolony" #define REAGENT_PLANTCOLONY "A colony of plant cells" @@ -478,8 +476,6 @@ #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" @@ -511,7 +507,7 @@ #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_SOUP "Soup" #define REAGENT_ID_SOUP "generic_soup" #define REAGENT_TOMATOSOUP "Tomato Soup" #define REAGENT_ID_TOMATOSOUP "tomato_soup" @@ -567,13 +563,311 @@ #define REAGENT_ID_NUKIEMEGASHRINK "nukie_mega_shrink" #define REAGENT_NUKIEMEGAGROWTH "Nukie Mega Growth" #define REAGENT_ID_NUKIEMEGAGROWTH "nukie_mega_growth" - - - - - -#define REAGENT_PROTEIN "Protein" +#define REAGENT_COATING "coating" +#define REAGENT_ID_COATING "coating" +#define REAGENT_BATTER "batter mix" +#define REAGENT_ID_BATTER "batter" +#define REAGENT_BEERBATTER "beer batter mix" +#define REAGENT_ID_BEERBATTER "beerbatter" +#define REAGENT_TRIGLYCERIDE "triglyceride" +#define REAGENT_ID_TRIGLYCERIDE "triglyceride" +#define REAGENT_OIL "Oil" +#define REAGENT_ID_OIL "oil" +#define REAGENT_COOKINGOIL "Cooking Oil" +#define REAGENT_ID_COOKINGOIL "cookingoil" +#define REAGENT_CORNOIL "Corn Oil" +#define REAGENT_ID_CORNOIL "cornoil" +#define REAGENT_PEANUTOIL "Peanut Oil" +#define REAGENT_ID_PEANUTOIL "peanutoil" +#define REAGENT_GLUCOSE "Glucose" +#define REAGENT_ID_GLUCOSE "glucose" +#define REAGENT_PROTEIN "animal protein" #define REAGENT_ID_PROTEIN "protein" +#define REAGENT_TOFU "tofu protein" +#define REAGENT_ID_TOFU "tofu" +#define REAGENT_SEAFOOD "seafood protein" +#define REAGENT_ID_SEAFOOD "seafood" +#define REAGENT_CHEESE "cheese" +#define REAGENT_ID_CHEESE "cheese" +#define REAGENT_EGG "egg yolk" +#define REAGENT_ID_EGG "egg" +#define REAGENT_MURK_PROTEIN "murkfin protein" +#define REAGENT_ID_MURK_PROTEIN "murk_protein" +#define REAGENT_BEANPROTEIN "beans" +#define REAGENT_ID_BEANPROTEIN "bean_protein" +#define REAGENT_HONEY "Honey" +#define REAGENT_ID_HONEY "honey" +#define REAGENT_MAYO "Mayonnaise" +#define REAGENT_ID_MAYO "mayo" +#define REAGENT_YEAST "Yeast" +#define REAGENT_ID_YEAST "yeast" +#define REAGENT_FLOUR "Flour" +#define REAGENT_ID_FLOUR "flour" +#define REAGENT_COFFEEPOWDER "Coffee Powder" +#define REAGENT_ID_COFFEEPOWDER "coffeepowder" +#define REAGENT_TEAPOWDER "Tea Powder" +#define REAGENT_ID_TEAPOWDER "teapowder" +#define REAGENT_DECAFTEAPOWDER "Decaf Tea Powder" +#define REAGENT_ID_DECAFTEAPOWDER "decafteapowder" +#define REAGENT_COCO "Coco Powder" +#define REAGENT_ID_COCO "coco" +#define REAGENT_CHOCOLATE "Chocolate" +#define REAGENT_ID_CHOCOLATE "chocolate" +#define REAGENT_INSTANTJUICE "Juice Powder" +#define REAGENT_ID_INSTANTJUICE "instantjuice" +#define REAGENT_INSTANTGRAPE "Grape Juice Powder" +#define REAGENT_ID_INSTANTGRAPE "instantgrape" +#define REAGENT_INSTANTORANGE "Orange Juice Powder" +#define REAGENT_ID_INSTANTORANGE "instantorange" +#define REAGENT_INSTANTWATERMELON "Watermelon Juice Powder" +#define REAGENT_ID_INSTANTWATERMELON "instantwatermelon" +#define REAGENT_INSTANTAPPLE "Apple Juice Powder" +#define REAGENT_ID_INSTANTAPPLE "instantapple" +#define REAGENT_SOYSAUCE "Soy Sauce" +#define REAGENT_ID_SOYSAUCE "soysauce" +#define REAGENT_VINEGAR "Vinegar" +#define REAGENT_ID_VINEGAR "vinegar" +#define REAGENT_KETCHUP "Ketchup" +#define REAGENT_ID_KETCHUP "ketchup" +#define REAGENT_MUSTARD "Mustard" +#define REAGENT_ID_MUSTARD "mustard" +#define REAGENT_BARBECUE "Barbeque Sauce" +#define REAGENT_ID_BARBECUE "barbecue" +#define REAGENT_RICE "Rice" +#define REAGENT_ID_RICE "rice" +#define REAGENT_CHERRYJELLY "Cherry Jelly" +#define REAGENT_ID_CHERRYJELLY "cherryjelly" +#define REAGENT_PEANUTBUTTER "Peanut Butter" +#define REAGENT_ID_PEANUTBUTTER "peanutbutter" +#define REAGENT_VANILLA "Vanilla Extract" +#define REAGENT_ID_VANILLA "vanilla" +#define REAGENT_DURIANPASTE "Durian Paste" +#define REAGENT_ID_DURIANPASTE "durianpaste" +#define REAGENT_VIRUSFOOD "Virus Food" +#define REAGENT_ID_VIRUSFOOD "virusfood" +#define REAGENT_SPRINKLES "Sprinkles" +#define REAGENT_ID_SPRINKLES "sprinkles" +#define REAGENT_MINT "Mint" +#define REAGENT_ID_MINT "mint" +#define REAGENT_LIPOZINE "Lipozine" +#define REAGENT_ID_LIPOZINE "lipozine" +#define REAGENT_SODIUMCHLORIDE "Table Salt" +#define REAGENT_ID_SODIUMCHLORIDE "sodiumchloride" +#define REAGENT_BLACKPEPPER "Black Pepper" +#define REAGENT_ID_BLACKPEPPER "blackpepper" +#define REAGENT_ENZYME "Universal Enzyme" +#define REAGENT_ID_ENZYME "enzyme" +#define REAGENT_SPACESPICE "Wurmwoad" +#define REAGENT_ID_SPACESPICE "spacespice" +#define REAGENT_BROWNIEMIX "Brownie Mix" +#define REAGENT_ID_BROWNIEMIX "browniemix" +#define REAGENT_CAKEBATTER "Cake Batter" +#define REAGENT_ID_CAKEBATTER "cakebatter" +#define REAGENT_FROSTOIL "Frost Oil" +#define REAGENT_ID_FROSTOIL "frostoil" +#define REAGENT_CRYOTOXIN "Cryotoxin" +#define REAGENT_ID_CRYOTOXIN "cryotoxin" +#define REAGENT_CAPSAICIN "Capsaicin Oil" +#define REAGENT_ID_CAPSAICIN "capsaicin" +#define REAGENT_CONDENSEDCAPSAICIN "Condensed Capsaicin" +#define REAGENT_ID_CONDENSEDCAPSAICIN "condensedcapsaicin" + +#define REAGENT_DRINK "Drink" +#define REAGENT_ID_DRINK "drink" + +// Juices +#define REAGENT_BANANA "Banana Juice" +#define REAGENT_ID_BANANA "banana" +#define REAGENT_BERRYJUICE "Berry Juice" +#define REAGENT_ID_BERRYJUICE "berryjuice" +#define REAGENT_PINEAPPLEJUICE "Pineapple Juice" +#define REAGENT_ID_PINEAPPLEJUICE "pineapplejuice" +#define REAGENT_CARROTJUICE "Carrot juice" +#define REAGENT_ID_CARROTJUICE "carrotjuice" +#define REAGENT_LETTUCEJUICE "Lettuce Juice" +#define REAGENT_ID_LETTUCEJUICE "lettucejuice" +#define REAGENT_GRAPEJUICE "Grape Juice" +#define REAGENT_ID_GRAPEJUICE "grapejuice" +#define REAGENT_LEMONJUICE "Lemon Juice" +#define REAGENT_ID_LEMONJUICE "lemonjuice" +#define REAGENT_APPLEJUICE "Apple Juice" +#define REAGENT_ID_APPLEJUICE "applejuice" +#define REAGENT_LIMEJUICE "Lime Juice" +#define REAGENT_ID_LIMEJUICE "limejuice" +#define REAGENT_ORANGEJUICE "Orange juice" +#define REAGENT_ID_ORANGEJUICE "orangejuice" +#define REAGENT_POISONBERRYJUICE "Poison Berry Juice" +#define REAGENT_ID_POISONBERRYJUICE "poisonberryjuice" +#define REAGENT_POTATOJUICE "Potato Juice" +#define REAGENT_ID_POTATOJUICE "potatojuice" +#define REAGENT_TURNIPJUICE "Turnip Juice" +#define REAGENT_ID_TURNIPJUICE "turnipjuice" +#define REAGENT_TOMATOJUICE "Tomato Juice" +#define REAGENT_ID_TOMATOJUICE "tomatojuice" +#define REAGENT_WATERMELONJUICE "Watermelon Juice" +#define REAGENT_ID_WATERMELONJUICE "watermelonjuice" + +// Drinks +#define REAGENT_MILK "Milk" +#define REAGENT_ID_MILK "milk" +#define REAGENT_CHOCOLATEMILK "Chocolate Milk" +#define REAGENT_ID_CHOCOLATEMILK "chocolate_milk" +#define REAGENT_CREAM "Cream" +#define REAGENT_ID_CREAM "cream" +#define REAGENT_SOYMILK "Soy Milk" +#define REAGENT_ID_SOYMILK "soymilk" +#define REAGENT_MILKFOAM "Milk Foam" +#define REAGENT_ID_MILKFOAM "milk_foam" +#define REAGENT_TEA "Tea" +#define REAGENT_ID_TEA "tea" +#define REAGENT_TEADECAF "Decaf Tea" +#define REAGENT_ID_TEADECAF "teadecaf" +#define REAGENT_ICETEA "Iced Tea" +#define REAGENT_ID_ICETEA "icetea" +#define REAGENT_ICETEADECAF "Decaf Iced Tea" +#define REAGENT_ID_ICETEADECAF "iceteadecaf" +#define REAGENT_MINTTEA "Mint Tea" +#define REAGENT_ID_MINTTEA "minttea" +#define REAGENT_MINTTEADECAF "Decaf Mint Tea" +#define REAGENT_ID_MINTTEADECAF "mintteadecaf" +#define REAGENT_LEMONTEA "Lemon Tea" +#define REAGENT_ID_LEMONTEA "lemontea" +#define REAGENT_LEMONTEADECAF "Decaf Lemon Tea" +#define REAGENT_ID_LEMONTEADECAF "lemonteadecaf" +#define REAGENT_LIMETEA "Lime Tea" +#define REAGENT_ID_LIMETEA "limetea" +#define REAGENT_LIMETEADECAF "Decaf Lime Tea" +#define REAGENT_ID_LIMETEADECAF "limeteadecaf" +#define REAGENT_ORANGETEA "Orange Tea" +#define REAGENT_ID_ORANGETEA "orangetea" +#define REAGENT_ORANGETEADECAF "Decaf orange Tea" +#define REAGENT_ID_ORANGETEADECAF "orangeteadecaf" +#define REAGENT_BERRYTEA "Berry Tea" +#define REAGENT_ID_BERRYTEA "berrytea" +#define REAGENT_BERRYTEADECAF "Decaf Berry Tea" +#define REAGENT_ID_BERRYTEADECAF "berryteadecaf" +#define REAGENT_GREENTEA "Green Tea" +#define REAGENT_ID_GREENTEA "greentea" +#define REAGENT_CHAITEA "Chai Tea" +#define REAGENT_ID_CHAITEA "chaitea" +#define REAGENT_CHAITEADECAF "Decaf Chai Tea" +#define REAGENT_ID_CHAITEADECAF "chaiteadecaf" +#define REAGENT_COFFEE "Coffee" +#define REAGENT_ID_COFFEE "coffee" +#define REAGENT_ICECOFFEE "Iced Coffee" +#define REAGENT_ID_ICECOFFEE "icecoffee" +#define REAGENT_SOYLATTE "Soy Latte" +#define REAGENT_ID_SOYLATTE "soy_latte" +#define REAGENT_CAFELATTE "Cafe Latte" +#define REAGENT_ID_CAFELATTE "cafe_latte" +#define REAGENT_DECAF "Decaf Coffee" +#define REAGENT_ID_DECAF "decaf" +#define REAGENT_HOTCOCO "Hot Chocolate" +#define REAGENT_ID_HOTCOCO "hot_coco" +#define REAGENT_BLACKEYE "Black Eye Coffee" +#define REAGENT_ID_BLACKEYE "black_eye" +#define REAGENT_DRIPCOFFEE "Drip Coffee" +#define REAGENT_ID_DRIPCOFFEE "drip_coffee" +#define REAGENT_AMERICANO "Americano" +#define REAGENT_ID_AMERICANO "americano" +#define REAGENT_LONGBLACK "Long Black Coffee" +#define REAGENT_ID_LONGBLACK "long_black" +#define REAGENT_MACCHIATO "Macchiato" +#define REAGENT_ID_MACCHIATO "macchiato" +#define REAGENT_CORTADO "Cortado" +#define REAGENT_ID_CORTADO "cortado" +#define REAGENT_BREVE "Breve" +#define REAGENT_ID_BREVE "breve" +#define REAGENT_CAPPUCCINO "Cappuccino" +#define REAGENT_ID_CAPPUCCINO "cappuccino" +#define REAGENT_FLATWHITE "Flat White Coffee" +#define REAGENT_ID_FLATWHITE "flat_white" +#define REAGENT_MOCHA "Mocha" +#define REAGENT_ID_MOCHA "mocha" +#define REAGENT_VIENNA "Vienna" +#define REAGENT_ID_VIENNA "vienna" +#define REAGENT_SODAWATER "Soda Water" +#define REAGENT_ID_SODAWATER "sodawater" +#define REAGENT_TONIC "Tonic Water" +#define REAGENT_ID_TONIC "tonic" +#define REAGENT_LEMONADE "Lemonade" +#define REAGENT_ID_LEMONADE "lemonade" +#define REAGENT_MELONADE "Melonade" +#define REAGENT_ID_MELONADE "melonade" +#define REAGENT_APPLEADE "Appleade" +#define REAGENT_ID_APPLEADE "appleade" +#define REAGENT_PINEAPPLEADE "Pineappleade" +#define REAGENT_ID_PINEAPPLEADE "pineappleade" +#define REAGENT_KIRASPECIAL "Kira Special" +#define REAGENT_ID_KIRASPECIAL "kiraspecial" +#define REAGENT_BROWNSTAR "Brown Star" +#define REAGENT_ID_BROWNSTAR "brownstar" +#define REAGENT_BROWNSTARDECAF "Decaf Brown Star" +#define REAGENT_ID_BROWNSTARDECAF "brownstar_decaf" +#define REAGENT_MILKSHAKE "Milkshake" +#define REAGENT_ID_MILKSHAKE "milkshake" +#define REAGENT_CHOCOSHAKE "Chocolate Milkshake" +#define REAGENT_ID_CHOCOSHAKE "chocoshake" +#define REAGENT_BERRYSHAKE "Berry Milkshake" +#define REAGENT_ID_BERRYSHAKE "berryshake" +#define REAGENT_COFFEESHAKE "Coffee Milkshake" +#define REAGENT_ID_COFFEESHAKE "coffeeshake" +#define REAGENT_PEANUTMILKSHAKE "Peanut Milkshake" +#define REAGENT_ID_PEANUTMILKSHAKE "peanutmilkshake" +#define REAGENT_REWRITER "Rewriter" +#define REAGENT_ID_REWRITER "rewriter" +#define REAGENT_NUKACOLA "Nuka Cola" +#define REAGENT_ID_NUKACOLA "nuka_cola" +#define REAGENT_GRENADINE "Grenadine Syrup" +#define REAGENT_ID_GRENADINE "grenadine" +#define REAGENT_COLA "Space Cola" +#define REAGENT_ID_COLA "cola" +#define REAGENT_DECAFCOLA "Space Cola Free" +#define REAGENT_ID_DECAFCOLA "decafcola" +#define REAGENT_LEMONSODA "Lemon Soda" +#define REAGENT_ID_LEMONSODA "lemonsoda" +#define REAGENT_APPLESODA "Apple Soda" +#define REAGENT_ID_APPLESODA "applesoda" +#define REAGENT_STRAWSODA "Strawberry Soda" +#define REAGENT_ID_STRAWSODA "strawsoda" +#define REAGENT_ORANGESODA "Orange Soda" +#define REAGENT_ID_ORANGESODA "orangesoda" +#define REAGENT_GRAPESODA "Grape Soda" +#define REAGENT_ID_GRAPESODA "grapesoda" +#define REAGENT_SARSAPARILLA "Sarsaparilla" +#define REAGENT_ID_SARSAPARILLA "sarsaparilla" +#define REAGENT_PORKSODA "Bacon Soda" +#define REAGENT_ID_PORKSODA "porksoda" +#define REAGENT_SPACEMOUNTAINWIND "Mountain Wind" +#define REAGENT_ID_SPACEMOUNTAINWIND "spacemountainwind" +#define REAGENT_DRGIBB "Dr. Gibb" +#define REAGENT_ID_DRGIBB "dr_gibb" +#define REAGENT_SPACEUP "Space-Up" +#define REAGENT_ID_SPACEUP "space_up" +#define REAGENT_LEMONLIME "Lemon-Lime" +#define REAGENT_ID_LEMONLIME "lemon_lime" +#define REAGENT_GINGERALE "Ginger Ale" +#define REAGENT_ID_GINGERALE "gingerale" +#define REAGENT_ROOTBEER "R&D Root Beer" +#define REAGENT_ID_ROOTBEER "rootbeer" +#define REAGENT_DIETDRGIBB "Diet Dr. Gibb" +#define REAGENT_ID_DIETDRGIBB "diet_dr_gibb" +#define REAGENT_SHIRLEYTEMPLE "Shirley Temple" +#define REAGENT_ID_SHIRLEYTEMPLE "shirley_temple" +#define REAGENT_ROYROGERS "Roy Rogers" +#define REAGENT_ID_ROYROGERS "roy_rogers" +#define REAGENT_COLLINSMIX "Collins Mix" +#define REAGENT_ID_COLLINSMIX "collins_mix" +#define REAGENT_ARNOLDPALMER "Arnold Palmer" +#define REAGENT_ID_ARNOLDPALMER "arnold_palmer" +#define REAGENT_DOCTORSDELIGHT "The Doctor's Delight" +#define REAGENT_ID_DOCTORSDELIGHT "doctorsdelight" +#define REAGENT_DRYRAMEN "Dry Ramen" +#define REAGENT_ID_DRYRAMEN "dry_ramen" + + + + #define REAGENT_ #define REAGENT_ID_ #define REAGENT_ diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm index a730c1a4493..af2301e2655 100644 --- a/code/__defines/chemistry.dm +++ b/code/__defines/chemistry.dm @@ -49,7 +49,7 @@ #define ANTIBIO_SUPER 3 // Chemistry lists. -var/list/tachycardics = list("coffee", REAGENT_ID_INAPROVALINE, REAGENT_ID_HYPERZINE, REAGENT_ID_NITROGLYCERIN, "thirteenloko", REAGENT_ID_NICOTINE) // Increase heart rate. +var/list/tachycardics = list(REAGENT_ID_COFFEE, REAGENT_ID_INAPROVALINE, REAGENT_ID_HYPERZINE, REAGENT_ID_NITROGLYCERIN, "thirteenloko", REAGENT_ID_NICOTINE) // Increase heart rate. var/list/bradycardics = list("neurotoxin", REAGENT_ID_CRYOXADONE, REAGENT_ID_CLONEXADONE, REAGENT_ID_BLISS, REAGENT_ID_STOXIN, REAGENT_ID_AMBROSIAEXTRACT) // Decrease heart rate. var/list/heartstopper = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE, REAGENT_ID_ZOMBIEPOWDER) // This stops the heart. var/list/cheartstopper = list(REAGENT_ID_POTASSIUMCHLORIDE) // This stops the heart when overdose is met. -- c = conditional diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index d9aac00b577..4d221c9c4f8 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -431,7 +431,7 @@ if(C.internals) C.internals.icon_state = "internal1" else - to_chat(C, span_notice("You don't have a[breathes==GAS_O2 ? "n " + GAS_O2 + " : addtext(" ",breathes)] tank.")) + to_chat(C, span_notice("You don't have a[breathes==GAS_O2 ? "n " + GAS_O2 : addtext(" ",breathes)] tank.")) if("act_intent") usr.a_intent_change("right") if(I_HELP) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 4ef18ca30e3..ecf4ff22fc3 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( - REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, "orangejuice", - REAGENT_ID_SPACEACILLIN, "glucose", REAGENT_ID_ETHANOL, + REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, + REAGENT_ID_SPACEACILLIN, REAGENT_ID_GLUCOSE, REAGENT_ID_ETHANOL, REAGENT_ID_LEPORAZINE, REAGENT_ID_IMPEDREZENE, REAGENT_ID_HEPANEPHRODAXON, REAGENT_ID_SILVER, REAGENT_ID_GOLD )) diff --git a/code/game/gamemodes/changeling/powers/cryo_sting.dm b/code/game/gamemodes/changeling/powers/cryo_sting.dm index adf6cc07514..b61b5b00ed3 100644 --- a/code/game/gamemodes/changeling/powers/cryo_sting.dm +++ b/code/game/gamemodes/changeling/powers/cryo_sting.dm @@ -22,7 +22,7 @@ inject_amount = inject_amount * 1.5 to_chat(src, span_notice("We inject extra chemicals.")) if(T.reagents) - T.reagents.add_reagent("cryotoxin", inject_amount) + T.reagents.add_reagent(REAGENT_ID_CRYOTOXIN, inject_amount) feedback_add_details("changeling_powers","CS") remove_verb(src, /mob/proc/changeling_cryo_sting) spawn(3 MINUTES) diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index a4df3f8814c..cafdd36a148 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -64,16 +64,16 @@ item_list = list() item_list["Food Items"] = list( - BIOGEN_REAGENT("Milk x10", "milk", 10, 20), - BIOGEN_REAGENT("Milk x50", "milk", 50, 95), - BIOGEN_REAGENT("Cream x10", "cream", 10, 30), - BIOGEN_REAGENT("Cream x50", "cream", 50, 120), + BIOGEN_REAGENT("Milk x10", REAGENT_ID_MILK, 10, 20), + BIOGEN_REAGENT("Milk x50", REAGENT_ID_MILK, 50, 95), + BIOGEN_REAGENT("Cream x10", REAGENT_ID_CREAM, 10, 30), + BIOGEN_REAGENT("Cream x50", REAGENT_ID_CREAM, 50, 120), BIOGEN_ITEM("Slab of meat", /obj/item/reagent_containers/food/snacks/meat, 1, 50), BIOGEN_ITEM("Slabs of meat x5", /obj/item/reagent_containers/food/snacks/meat, 5, 250), ) item_list["Cooking Ingredients"] = list( - BIOGEN_REAGENT("Universal Enzyme x10", "enzyme", 10, 30), - BIOGEN_REAGENT("Universal Enzyme x50", "enzyme", 50, 120), + BIOGEN_REAGENT("Universal Enzyme x10", REAGENT_ID_ENZYME, 10, 30), + BIOGEN_REAGENT("Universal Enzyme x50", REAGENT_ID_ENZYME, 50, 120), BIOGEN_ITEM("Nutri-spread", /obj/item/reagent_containers/food/snacks/spreads, 1, 30), BIOGEN_ITEM("Nutri-spread x5", /obj/item/reagent_containers/food/snacks/spreads, 5, 120), ) diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index 1f57b7a9c47..fa69ce9b4a1 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -226,7 +226,7 @@ /obj/item/clothing/mask/chewable/candy/gum/Initialize() . = ..() - reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),10) + reagents.add_reagent(pick(REAGENT_ID_BANANA,REAGENT_ID_BERRYJUICE,REAGENT_ID_GRAPEJUICE,REAGENT_ID_LEMONJUICE,REAGENT_ID_LIMEJUICE,REAGENT_ID_ORANGEJUICE,REAGENT_ID_WATERMELONJUICE),10) color = reagents.get_color() update_icon() @@ -263,7 +263,7 @@ /obj/item/clothing/mask/chewable/candy/lolli/Initialize() . = ..() - reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),20) + reagents.add_reagent(pick(REAGENT_ID_BANANA,REAGENT_ID_BERRYJUICE,REAGENT_ID_GRAPEJUICE,REAGENT_ID_LEMONJUICE,REAGENT_ID_LIMEJUICE,REAGENT_ID_ORANGEJUICE,REAGENT_ID_WATERMELONJUICE),20) color = reagents.get_color() update_icon() @@ -287,7 +287,7 @@ desc = "A chocolate-coated biscuit stick." icon_state = "pockystick" item_state = "pocky" - filling = list(REAGENT_ID_SUGAR = 2, "chocolate" = 5) + filling = list(REAGENT_ID_SUGAR = 2, REAGENT_ID_CHOCOLATE = 5) type_butt = null /obj/item/clothing/mask/chewable/candy/pocky/process() diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm index 973239a7771..423e7df8cd1 100644 --- a/code/game/objects/items/weapons/ecigs.dm +++ b/code/game/objects/items/weapons/ecigs.dm @@ -196,7 +196,7 @@ ..() reagents.add_reagent(REAGENT_ID_NICOTINE, 5) reagents.add_reagent(REAGENT_ID_WATER, 10) - reagents.add_reagent("orangejuice", 5) + reagents.add_reagent(REAGENT_ID_ORANGEJUICE, 5) /obj/item/reagent_containers/ecig_cartridge/mint name = "mint flavour cartridge" @@ -214,7 +214,7 @@ ..() reagents.add_reagent(REAGENT_ID_NICOTINE, 5) reagents.add_reagent(REAGENT_ID_WATER, 10) - reagents.add_reagent("watermelonjuice", 5) + reagents.add_reagent(REAGENT_ID_WATERMELONJUICE, 5) /obj/item/reagent_containers/ecig_cartridge/grape name = "grape flavour cartridge" @@ -223,7 +223,7 @@ ..() reagents.add_reagent(REAGENT_ID_NICOTINE, 5) reagents.add_reagent(REAGENT_ID_WATER, 10) - reagents.add_reagent("grapejuice", 5) + reagents.add_reagent(REAGENT_ID_GRAPEJUICE, 5) /obj/item/reagent_containers/ecig_cartridge/lemonlime name = "lemon-lime flavour cartridge" @@ -232,7 +232,7 @@ ..() reagents.add_reagent(REAGENT_ID_NICOTINE, 5) reagents.add_reagent(REAGENT_ID_WATER, 10) - reagents.add_reagent("lemon_lime", 5) + reagents.add_reagent(REAGENT_ID_LEMONLIME, 5) /obj/item/reagent_containers/ecig_cartridge/coffee name = "coffee flavour cartridge" @@ -241,7 +241,7 @@ ..() reagents.add_reagent(REAGENT_ID_NICOTINE, 5) reagents.add_reagent(REAGENT_ID_WATER, 10) - reagents.add_reagent("coffee", 5) + reagents.add_reagent(REAGENT_ID_COFFEE, 5) /* /obj/item/reagent_containers/ecig_cartridge/cannabis name = "herb flavour cartridge" diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 03801310ac2..4055039a990 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -306,9 +306,9 @@ B1.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 40) B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 40) - B1.reagents.add_reagent("condensedcapsaicin", 40) + B1.reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 40) B2.reagents.add_reagent(REAGENT_ID_SUGAR, 40) - B2.reagents.add_reagent("condensedcapsaicin", 80) + B2.reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 80) detonator = new/obj/item/assembly_holder/timer_igniter(src) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index eeb20d7da98..bcc1ecb732b 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -50,7 +50,7 @@ /obj/item/storage/fancy/egg_box icon = 'icons/obj/food.dmi' icon_state = "eggbox" - icon_type = "egg" + icon_type = REAGENT_ID_EGG name = "egg box" center_of_mass = list("x" = 16,"y" = 7) storage_slots = 12 diff --git a/code/game/objects/items/weapons/storage/firstaid_vr.dm b/code/game/objects/items/weapons/storage/firstaid_vr.dm index 35bd4f4dea0..35e80cc1ce6 100644 --- a/code/game/objects/items/weapons/storage/firstaid_vr.dm +++ b/code/game/objects/items/weapons/storage/firstaid_vr.dm @@ -154,7 +154,7 @@ /obj/item/reagent_containers/pill/copper = 5) /obj/item/storage/pill_bottle/adminordrazine - name = "pill bottle (Adminordrazine)" + name = "pill bottle (" + REAGENT_ADMINORDRAZINE + ")" desc = "It's magic. We don't have to explain it." starts_with = list(/obj/item/reagent_containers/pill/adminordrazine = 21) @@ -164,37 +164,37 @@ starts_with = list(/obj/item/reagent_containers/pill/nutriment = 7, /obj/item/reagent_containers/pill/protein = 7) /obj/item/storage/pill_bottle/rezadone - name = "pill bottle (Rezadone)" + name = "pill bottle (" + REAGENT_REZADONE + ")" desc = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." starts_with = list(/obj/item/reagent_containers/pill/rezadone = 14) wrapper_color = COLOR_GREEN_GRAY /obj/item/storage/pill_bottle/peridaxon - name = "pill bottle (Peridaxon)" + name = "pill bottle (" + REAGENT_PERIDAXON + ")" desc = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously." starts_with = list(/obj/item/reagent_containers/pill/peridaxon = 14) wrapper_color = COLOR_PURPLE /obj/item/storage/pill_bottle/carthatoline - name = "pill bottle (Carthatoline)" - desc = "Carthatoline is strong evacuant used to treat severe poisoning." + name = "pill bottle (" + REAGENT_CARTHATOLINE + ")" + desc = REAGENT_CARTHATOLINE + " is strong evacuant used to treat severe poisoning." starts_with = list(/obj/item/reagent_containers/pill/carthatoline = 14) wrapper_color = COLOR_GREEN_GRAY /obj/item/storage/pill_bottle/alkysine - name = "pill bottle (Alkysine)" - desc = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." + name = "pill bottle (" + REAGENT_ALKYSINE + ")" + desc = REAGENT_ALKYSINE + " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." starts_with = list(/obj/item/reagent_containers/pill/alkysine = 14) wrapper_color = COLOR_YELLOW /obj/item/storage/pill_bottle/imidazoline - name = "pill bottle (Imidazoline)" + name = "pill bottle (" + REAGENT_IMIDAZOLINE + ")" desc = "Heals eye damage." starts_with = list(/obj/item/reagent_containers/pill/imidazoline = 14) wrapper_color = COLOR_PURPLE_GRAY /obj/item/storage/pill_bottle/osteodaxon - name = "pill bottle (Osteodaxon)" + name = "pill bottle (" + REAGENT_OSTEODAXON + ")" desc = "An experimental drug used to heal bone fractures." starts_with = list(/obj/item/reagent_containers/pill/osteodaxon = 14) wrapper_color = COLOR_WHITE @@ -206,36 +206,36 @@ wrapper_color = COLOR_PALE_PURPLE_GRAY /obj/item/storage/pill_bottle/hyronalin - name = "pill bottle (Hyronalin)" - desc = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." + name = "pill bottle (" + REAGENT_HYRONALIN + ")" + desc = REAGENT_HYRONALIN + " is a medicinal drug used to counter the effect of radiation poisoning." starts_with = list(/obj/item/reagent_containers/pill/hyronalin = 14) wrapper_color = COLOR_TEAL /obj/item/storage/pill_bottle/arithrazine - name = "pill bottle (Arithrazine)" - desc = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning." + name = "pill bottle (" + REAGENT_ARITHRAZINE + ")" + desc = REAGENT_ARITHRAZINE + " is an unstable medication used for the most extreme cases of radiation poisoning." starts_with = list(/obj/item/reagent_containers/pill/arithrazine = 14) wrapper_color = COLOR_TEAL /obj/item/storage/pill_bottle/corophizine - name = "pill bottle (Corophizine)" + name = "pill bottle (" + REAGENT_COROPHIZINE + ")" desc = "A wide-spectrum antibiotic drug. Powerful and uncomfortable in equal doses." starts_with = list(/obj/item/reagent_containers/pill/corophizine = 14) wrapper_color = COLOR_PALE_GREEN_GRAY /obj/item/storage/pill_bottle/vermicetol - name = "pill bottle (Vermicetol)" + name = "pill bottle (" + REAGENT_VERMICETOL + ")" desc = "Contains pills used to stabilize the extremely injured." starts_with = list(/obj/item/reagent_containers/pill/vermicetol = 14) wrapper_color = COLOR_MAROON /obj/item/storage/pill_bottle/healing_nanites - name = "pill bottle (Healing nanites)" + name = "pill bottle (" + REAGENT_HEALINGNANITES + ")" desc = "Miniature medical robots that swiftly restore bodily damage." starts_with = list(/obj/item/reagent_containers/pill/healing_nanites = 14) /obj/item/storage/pill_bottle/sleevingcure - name = "pill bottle (Kitsuhanan Cure)" + name = "pill bottle (" + REAGENT_SLEEVINGCURE + ")" desc = "A rare cure provided by KHI that helps counteract negative side effects of using imperfect resleeving machinery." starts_with = list(/obj/item/reagent_containers/pill/sleevingcure = 7) @@ -250,18 +250,18 @@ can_hold = list(/obj/item/reagent_containers/pill) /obj/item/storage/mrebag/pill/sleevingcure - name = "vacuum-sealed pill (Kitsuhanan Cure)" + name = "vacuum-sealed pill (" + REAGENT_SLEEVINGCURE + ")" desc = "A small vacuum-sealed package containing a singular pill. For emergencies only." starts_with = list(/obj/item/reagent_containers/pill/sleevingcure) /obj/item/storage/pill_bottle/paracetamol - name = "pill bottle (Paracetamol)" + name = "pill bottle (" + REAGENT_PARACETAMOL + ")" desc = "Contains over the counter medicine to treat pain." starts_with = list(/obj/item/reagent_containers/pill/paracetamol = 14) wrapper_color = COLOR_GRAY /obj/item/storage/pill_bottle/dexalin - name = "pill bottle (Dexalin)" + name = "pill bottle (" + REAGENT_DEXALIN + ")" desc = "Contains pills used to treat oxygen deprivation." starts_with = list(/obj/item/reagent_containers/pill/dexalin = 14) wrapper_color = "#3366cc" 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 6c29ebe4bea..3a2d29c9e32 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/chem_dispenser.dm @@ -18,7 +18,7 @@ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80), list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80), list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80), - list("nutrients", "glucose", 0, 80), + list("nutrients", REAGENT_ID_GLUCOSE, 0, 80), list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80), list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80) ) @@ -35,7 +35,7 @@ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 30), list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 30), list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 60), - list("nutrients", "glucose", 0, 80), + list("nutrients", REAGENT_ID_GLUCOSE, 0, 80), list(REAGENT_ID_BICARIDINE, REAGENT_ID_BICARIDINE, 0, 30), list("clotting agent", REAGENT_ID_MYELAMINE, 0, 30), list(REAGENT_ID_PERIDAXON, REAGENT_ID_PERIDAXON, 0, 30), @@ -127,7 +127,7 @@ list(REAGENT_ID_SYNAPTIZINE, REAGENT_ID_SYNAPTIZINE, 0, 30), list(REAGENT_ID_HYPERZINE, REAGENT_ID_HYPERZINE, 0, 30), list(REAGENT_ID_OXYCODONE, REAGENT_ID_OXYCODONE, 0, 30), - list("nutrients", "glucose", 0, 80), + list("nutrients", REAGENT_ID_GLUCOSE, 0, 80), list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80) ) @@ -154,7 +154,7 @@ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80), list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80), list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80), - list("nutrients", "glucose", 0, 80), + list("nutrients", REAGENT_ID_GLUCOSE, 0, 80), list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80), list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80), list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80) @@ -167,7 +167,7 @@ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 0), list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 0), list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 0), - list("nutrients", "glucose", 0, 0), + list("nutrients", REAGENT_ID_GLUCOSE, 0, 0), list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 0), list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 0), list("clotting agent", REAGENT_ID_MYELAMINE, 0, 0) diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 17825ed6370..2bf7344c975 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -148,7 +148,7 @@ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80), list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80), list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80), - list("nutrients", "glucose", 0, 80), + list("nutrients", REAGENT_ID_GLUCOSE, 0, 80), list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80), list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80) ) @@ -165,7 +165,7 @@ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 30), list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 30), list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 60), - list("nutrients", "glucose", 0, 80), + list("nutrients", REAGENT_ID_GLUCOSE, 0, 80), list(REAGENT_ID_BICARIDINE, REAGENT_ID_BICARIDINE, 0, 30), list("clotting agent", REAGENT_ID_MYELAMINE, 0, 30), list(REAGENT_ID_PERIDAXON, REAGENT_ID_PERIDAXON, 0, 30), @@ -257,7 +257,7 @@ list(REAGENT_ID_SYNAPTIZINE, REAGENT_ID_SYNAPTIZINE, 0, 30), list(REAGENT_ID_HYPERZINE, REAGENT_ID_HYPERZINE, 0, 30), list(REAGENT_ID_OXYCODONE, REAGENT_ID_OXYCODONE, 0, 30), - list("nutrients", "glucose", 0, 80), + list("nutrients", REAGENT_ID_GLUCOSE, 0, 80), list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80) ) @@ -284,7 +284,7 @@ list("dexalin plus", REAGENT_ID_DEXALINP, 0, 80), list("antibiotics", REAGENT_ID_SPACEACILLIN, 0, 80), list("antitoxins", REAGENT_ID_ANTITOXIN, 0, 80), - list("nutrients", "glucose", 0, 80), + list("nutrients", REAGENT_ID_GLUCOSE, 0, 80), list(REAGENT_ID_HYRONALIN, REAGENT_ID_HYRONALIN, 0, 80), list(REAGENT_ID_RADIUM, REAGENT_ID_RADIUM, 0, 80), list("clotting agent", REAGENT_ID_MYELAMINE, 0, 80) diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index 9910f4e5f9a..817da5baf8c 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 == REAGENT_ID_NUTRIMENT || re.id == "protein" || re.id == "glucose" || re.id == REAGENT_ID_FISHBAIT) + if(re.id == REAGENT_ID_NUTRIMENT || re.id == REAGENT_ID_PROTEIN || re.id == REAGENT_ID_GLUCOSE || re.id == REAGENT_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/shaker.dm b/code/modules/food/drinkingglass/shaker.dm index 1369441664f..4ed66b69f50 100644 --- a/code/modules/food/drinkingglass/shaker.dm +++ b/code/modules/food/drinkingglass/shaker.dm @@ -34,7 +34,7 @@ cut_overlays() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30) reagents.add_reagent(REAGENT_ID_IRON, 10) - reagents.add_reagent("protein", 35) + reagents.add_reagent(REAGENT_ID_PROTEIN, 35) reagents.add_reagent(REAGENT_ID_WATER, 25) /obj/item/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake/update_icon() diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index ec7c739dee4..f88e09cf79b 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -17,7 +17,7 @@ /obj/item/reagent_containers/food/drinks/cans/cola/Initialize() . = ..() - reagents.add_reagent("cola", 30) + reagents.add_reagent(REAGENT_ID_COLA, 30) /obj/item/reagent_containers/food/drinks/cans/decaf_cola name = "\improper Space Cola Free" @@ -28,7 +28,7 @@ /obj/item/reagent_containers/food/drinks/cans/decaf_cola/Initialize() . = ..() - reagents.add_reagent("decafcola", 30) + reagents.add_reagent(REAGENT_ID_DECAFCOLA, 30) /obj/item/reagent_containers/food/drinks/cans/waterbottle name = "bottled water" @@ -52,7 +52,7 @@ /obj/item/reagent_containers/food/drinks/cans/space_mountain_wind/Initialize() . = ..() - reagents.add_reagent("spacemountainwind", 30) + reagents.add_reagent(REAGENT_ID_SPACEMOUNTAINWIND, 30) /obj/item/reagent_containers/food/drinks/cans/thirteenloko name = "\improper Thirteen Loko" @@ -73,7 +73,7 @@ /obj/item/reagent_containers/food/drinks/cans/dr_gibb/Initialize() ..() - reagents.add_reagent("dr_gibb", 30) + reagents.add_reagent(REAGENT_ID_DRGIBB, 30) /obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet name = "\improper Diet Dr. Gibb" @@ -84,7 +84,7 @@ /obj/item/reagent_containers/food/drinks/cans/dr_gibb_diet/Initialize() ..() - reagents.add_reagent("diet_dr_gibb", 30) + reagents.add_reagent(REAGENT_ID_DIETDRGIBB, 30) /obj/item/reagent_containers/food/drinks/cans/starkist name = "\improper Star-kist" @@ -95,7 +95,7 @@ /obj/item/reagent_containers/food/drinks/cans/starkist/Initialize() . = ..() - reagents.add_reagent("brownstar", 30) + reagents.add_reagent(REAGENT_ID_BROWNSTAR, 30) /obj/item/reagent_containers/food/drinks/cans/starkistdecaf name = "\improper Star-kist Classic" @@ -106,7 +106,7 @@ /obj/item/reagent_containers/food/drinks/cans/starkistdecaf/Initialize() . = ..() - reagents.add_reagent("brownstar_decaf", 30) + reagents.add_reagent(REAGENT_ID_BROWNSTARDECAF, 30) /obj/item/reagent_containers/food/drinks/cans/space_up name = "\improper Space-Up" @@ -117,7 +117,7 @@ /obj/item/reagent_containers/food/drinks/cans/space_up/Initialize() . = ..() - reagents.add_reagent("space_up", 30) + reagents.add_reagent(REAGENT_ID_SPACEUP, 30) /obj/item/reagent_containers/food/drinks/cans/lemon_lime name = "\improper Lemon-Lime" @@ -128,7 +128,7 @@ /obj/item/reagent_containers/food/drinks/cans/lemon_lime/Initialize() . = ..() - reagents.add_reagent("lemon_lime", 30) + reagents.add_reagent(REAGENT_ID_LEMONLIME, 30) /obj/item/reagent_containers/food/drinks/cans/iced_tea name = "\improper Vrisk Serket Iced Tea" @@ -139,7 +139,7 @@ /obj/item/reagent_containers/food/drinks/cans/iced_tea/Initialize() . = ..() - reagents.add_reagent("icetea", 30) + reagents.add_reagent(REAGENT_ID_ICETEA, 30) /obj/item/reagent_containers/food/drinks/cans/grape_juice name = "\improper Grapel Juice" @@ -150,7 +150,7 @@ /obj/item/reagent_containers/food/drinks/cans/grape_juice/Initialize() . = ..() - reagents.add_reagent("grapejuice", 30) + reagents.add_reagent(REAGENT_ID_GRAPEJUICE, 30) /obj/item/reagent_containers/food/drinks/cans/tonic name = "\improper T-Borg's Tonic Water" @@ -161,7 +161,7 @@ /obj/item/reagent_containers/food/drinks/cans/tonic/Initialize() . = ..() - reagents.add_reagent("tonic", 30) + reagents.add_reagent(REAGENT_ID_TONIC, 30) /obj/item/reagent_containers/food/drinks/cans/sodawater name = "soda water" @@ -171,7 +171,7 @@ /obj/item/reagent_containers/food/drinks/cans/sodawater/Initialize() . = ..() - reagents.add_reagent("sodawater", 30) + reagents.add_reagent(REAGENT_ID_SODAWATER, 30) /obj/item/reagent_containers/food/drinks/cans/gingerale name = "\improper Classic Ginger Ale" @@ -182,7 +182,7 @@ /obj/item/reagent_containers/food/drinks/cans/gingerale/Initialize() . = ..() - reagents.add_reagent("gingerale", 30) + reagents.add_reagent(REAGENT_ID_GINGERALE, 30) /obj/item/reagent_containers/food/drinks/cans/root_beer name = "\improper R&D Root Beer" @@ -193,7 +193,7 @@ /obj/item/reagent_containers/food/drinks/cans/root_beer/Initialize() . = ..() - reagents.add_reagent("rootbeer", 30) + reagents.add_reagent(REAGENT_ID_ROOTBEER, 30) /////////////////////////BODA VENDOR DRINKS///////////////////////// @@ -227,7 +227,7 @@ /obj/item/reagent_containers/food/drinks/cans/boda/Initialize() . = ..() - reagents.add_reagent("sodawater", 30) + reagents.add_reagent(REAGENT_ID_SODAWATER, 30) /obj/item/reagent_containers/food/drinks/cans/bodaplus name = "\improper Boda-Plyus" @@ -237,16 +237,16 @@ /obj/item/reagent_containers/food/drinks/cans/bodaplus/Initialize() . = ..() - reagents.add_reagent("sodawater", 15) + reagents.add_reagent(REAGENT_ID_SODAWATER, 15) reagents.add_reagent(pick(list( - "applejuice", - "grapejuice", - "lemonjuice", - "limejuice", - "watermelonjuice", - "banana", - "berryjuice", - "pineapplejuice")), 15) + REAGENT_ID_APPLEJUICE, + REAGENT_ID_GRAPEJUICE, + REAGENT_ID_LEMONJUICE, + REAGENT_ID_LIMEJUICE, + REAGENT_ID_WATERMELONJUICE, + REAGENT_ID_BANANA, + REAGENT_ID_BERRYJUICE, + REAGENT_ID_PINEAPPLEJUICE)), 15) /obj/item/reagent_containers/food/drinks/cans/redarmy name = "\improper Red Army Twist" @@ -256,8 +256,8 @@ /obj/item/reagent_containers/food/drinks/cans/redarmy/Initialize() . = ..() - reagents.add_reagent("potatojuice", 15) - reagents.add_reagent("sodawater", 15) + reagents.add_reagent(REAGENT_ID_POTATOJUICE, 15) + reagents.add_reagent(REAGENT_ID_SODAWATER, 15) /obj/item/reagent_containers/food/drinks/cans/arstbru name = "\improper Arstotzka BrĂ¼" @@ -267,7 +267,7 @@ /obj/item/reagent_containers/food/drinks/cans/arstbru/Initialize() . = ..() - reagents.add_reagent("turnipjuice", 30) + reagents.add_reagent(REAGENT_ID_TURNIPJUICE, 30) /obj/item/reagent_containers/food/drinks/cans/terra_cola name = "\improper Terra-Cola" @@ -291,7 +291,7 @@ /obj/item/reagent_containers/food/drinks/cans/straw_cola/Initialize() . = ..() - reagents.add_reagent("strawsoda", 30) + reagents.add_reagent(REAGENT_ID_STRAWSODA, 30) /obj/item/reagent_containers/food/drinks/cans/apple_cola name = "\improper Andromeda Apple" @@ -301,7 +301,7 @@ /obj/item/reagent_containers/food/drinks/cans/apple_cola/Initialize() . = ..() - reagents.add_reagent("applesoda", 30) + reagents.add_reagent(REAGENT_ID_APPLESODA, 30) /obj/item/reagent_containers/food/drinks/cans/lemon_cola name = "\improper Lunar Lemon" @@ -311,7 +311,7 @@ /obj/item/reagent_containers/food/drinks/cans/lemon_cola/Initialize() . = ..() - reagents.add_reagent("lemonsoda", 30) + reagents.add_reagent(REAGENT_ID_LEMONSODA, 30) /obj/item/reagent_containers/food/drinks/cans/sarsaparilla name = "\improper Starship Sarsaparilla" @@ -321,7 +321,7 @@ /obj/item/reagent_containers/food/drinks/cans/sarsaparilla/Initialize() . = ..() - reagents.add_reagent("sarsaparilla", 30) + reagents.add_reagent(REAGENT_ID_SARSAPARILLA, 30) /obj/item/reagent_containers/food/drinks/cans/grape_cola name = "\improper Gravity Grape" @@ -331,7 +331,7 @@ /obj/item/reagent_containers/food/drinks/cans/grape_cola/Initialize() . = ..() - reagents.add_reagent("grapesoda", 30) + reagents.add_reagent(REAGENT_ID_GRAPESODA, 30) /obj/item/reagent_containers/food/drinks/cans/orange_cola name = "\improper Orion Orange" @@ -341,7 +341,7 @@ /obj/item/reagent_containers/food/drinks/cans/orange_cola/Initialize() . = ..() - reagents.add_reagent("orangesoda", 30) + reagents.add_reagent(REAGENT_ID_ORANGESODA, 30) /obj/item/reagent_containers/food/drinks/cans/baconsoda name = "\improper Bacon Soda" @@ -351,7 +351,7 @@ /obj/item/reagent_containers/food/drinks/cans/baconsoda/Initialize() . = ..() - reagents.add_reagent("porksoda", 30) + reagents.add_reagent(REAGENT_ID_PORKSODA, 30) /obj/item/reagent_containers/food/drinks/cans/bepis name = "\improper Bepis" @@ -392,7 +392,7 @@ /obj/item/reagent_containers/food/drinks/cans/icecoffee/Initialize() . = ..() - reagents.add_reagent("icecoffee", 30) + reagents.add_reagent(REAGENT_ID_ICECOFFEE, 30) /obj/item/reagent_containers/food/drinks/cans/buzz name = "\improper Buzz Fuzz" diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index fd10a97bd73..05f7d2cb243 100644 --- a/code/modules/food/food/condiment.dm +++ b/code/modules/food/food/condiment.dm @@ -56,37 +56,37 @@ /obj/item/reagent_containers/food/condiment/on_reagent_change() if(reagents.reagent_list.len > 0) switch(reagents.get_master_reagent_id()) - if("ketchup") - name = "Ketchup" + if(REAGENT_ID_KETCHUP) + name = REAGENT_KETCHUP desc = "You feel more American already." icon_state = "ketchup" center_of_mass = list("x"=16, "y"=6) - if("mustard") - name = "Mustard" + if(REAGENT_ID_MUSTARD) + name = REAGENT_MUSTARD desc = "A somewhat bitter topping." icon_state = "mustard" center_of_mass = list("x"=16, "y"=6) - if("capsaicin") + if(REAGENT_ID_CAPSAICIN) name = "Hotsauce" desc = "You can almost TASTE the stomach ulcers now!" icon_state = "hotsauce" center_of_mass = list("x"=16, "y"=6) - if("enzyme") - name = "Universal Enzyme" + if(REAGENT_ID_ENZYME) + name = REAGENT_ENZYME desc = "Used in cooking various dishes." icon_state = "enzyme" center_of_mass = list("x"=16, "y"=6) - if("soysauce") - name = "Soy Sauce" + if(REAGENT_ID_SOYSAUCE) + name = REAGENT_SOYSAUCE desc = "A salty soy-based flavoring." icon_state = "soysauce" center_of_mass = list("x"=16, "y"=6) - if("vinegar") - name = "Vinegar" + if(REAGENT_ID_VINEGAR) + name = REAGENT_VINEGAR desc = "An acetic acid used in various dishes." icon_state = "vinegar" center_of_mass = list("x"=16, "y"=6) - if("frostoil") + if(REAGENT_ID_FROSTOIL) name = "Coldsauce" desc = "Leaves the tongue numb in its passage." icon_state = "coldsauce" @@ -96,13 +96,13 @@ desc = "Salt. From space oceans, presumably." icon_state = "saltshaker" center_of_mass = list("x"=17, "y"=11) - if("blackpepper") + if(REAGENT_ID_BLACKPEPPER) name = "Pepper Mill" desc = "Often used to flavor food or make people sneeze." icon_state = "peppermillsmall" center_of_mass = list("x"=17, "y"=11) - if("cookingoil") - name = "Cooking Oil" + if(REAGENT_ID_COOKINGOIL) + name = REAGENT_COOKINGOIL desc = "A delicious oil used in cooking. General purpose." icon_state = "oliveoil" center_of_mass = list("x"=16, "y"=6) @@ -110,33 +110,33 @@ name = "Sugar" desc = "Tastey space sugar!" center_of_mass = list("x"=16, "y"=6) - if("peanutbutter") - name = "Peanut Butter" + if(REAGENT_ID_PEANUTBUTTER) + name = REAGENT_PEANUTBUTTER desc = "A jar of smooth peanut butter." icon_state = "peanutbutter" center_of_mass = list("x"=16, "y"=6) - if("mayo") - name = "Mayonnaise" + if(REAGENT_ID_MAYO) + name = REAGENT_MAYO desc = "A jar of mayonnaise!" icon_state = "mayo" center_of_mass = list("x"=16, "y"=6) - if("yeast") - name = "Yeast" + if(REAGENT_ID_YEAST) + name = REAGENT_YEAST desc = "This is what you use to make bread fluffy." icon_state = "yeast" center_of_mass = list("x"=16, "y"=6) - if("spacespice") + if(REAGENT_ID_SPACESPICE) name = "bottle of space spice" desc = "An exotic blend of spices for cooking. Definitely not worms." icon_state = "spacespicebottle" center_of_mass = list("x"=16, "y"=6) - if("barbecue") + if(REAGENT_ID_BARBECUE) name = "barbecue sauce" desc = "Barbecue sauce, it's labeled 'sweet and spicy'." icon_state = "barbecue" center_of_mass = list("x"=16, "y"=6) - if("sprinkles") - name = "sprinkles" + if(REAGENT_ID_SPRINKLES) + name = REAGENT_ID_SPRINKLES desc = "Bottle of sprinkles, colourful!" icon_state= "sprinkles" center_of_mass = list("x"=16, "y"=6) @@ -156,13 +156,13 @@ return /obj/item/reagent_containers/food/condiment/enzyme - name = "Universal Enzyme" + name = REAGENT_ENZYME desc = "Used in cooking various dishes." icon_state = "enzyme" /obj/item/reagent_containers/food/condiment/enzyme/Initialize() . = ..() - reagents.add_reagent("enzyme", 50) + reagents.add_reagent(REAGENT_ID_ENZYME, 50) /obj/item/reagent_containers/food/condiment/sugar/Initialize() . = ..() @@ -170,55 +170,55 @@ /obj/item/reagent_containers/food/condiment/ketchup/Initialize() . = ..() - reagents.add_reagent("ketchup", 50) + reagents.add_reagent(REAGENT_ID_KETCHUP, 50) /obj/item/reagent_containers/food/condiment/mustard/Initialize() . = ..() - reagents.add_reagent("mustard", 50) + reagents.add_reagent(REAGENT_ID_MUSTARD, 50) /obj/item/reagent_containers/food/condiment/hotsauce/Initialize() . = ..() - reagents.add_reagent("capsaicin", 50) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 50) /obj/item/reagent_containers/food/condiment/cookingoil - name = "Cooking Oil" + name = REAGENT_COOKINGOIL /obj/item/reagent_containers/food/condiment/cookingoil/Initialize() . = ..() - reagents.add_reagent("cookingoil", 50) + reagents.add_reagent(REAGENT_ID_COOKINGOIL, 50) /obj/item/reagent_containers/food/condiment/cornoil - name = "Corn Oil" + name = REAGENT_CORNOIL /obj/item/reagent_containers/food/condiment/cornoil/Initialize() . = ..() - reagents.add_reagent("cornoil", 50) + reagents.add_reagent(REAGENT_ID_CORNOIL, 50) /obj/item/reagent_containers/food/condiment/coldsauce/Initialize() . = ..() - reagents.add_reagent("frostoil", 50) + reagents.add_reagent(REAGENT_ID_FROSTOIL, 50) /obj/item/reagent_containers/food/condiment/soysauce/Initialize() . = ..() - reagents.add_reagent("soysauce", 50) + reagents.add_reagent(REAGENT_ID_SOYSAUCE, 50) /obj/item/reagent_containers/food/condiment/vinegar/Initialize() . = ..() - reagents.add_reagent("vinegar", 50) + reagents.add_reagent(REAGENT_ID_VINEGAR, 50) /obj/item/reagent_containers/food/condiment/yeast - name = "Yeast" + name = REAGENT_YEAST /obj/item/reagent_containers/food/condiment/yeast/Initialize() . = ..() - reagents.add_reagent("yeast", 50) + reagents.add_reagent(REAGENT_ID_YEAST, 50) /obj/item/reagent_containers/food/condiment/sprinkles - name = "Sprinkles" + name = REAGENT_SPRINKLES /obj/item/reagent_containers/food/condiment/sprinkles/Initialize() . = ..() - reagents.add_reagent("sprinkles", 50) + reagents.add_reagent(REAGENT_ID_SPRINKLES, 50) /obj/item/reagent_containers/food/condiment/small possible_transfer_amounts = list(1,20) @@ -247,7 +247,7 @@ /obj/item/reagent_containers/food/condiment/small/peppermill/Initialize() . = ..() - reagents.add_reagent("blackpepper", 20) + reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 20) /obj/item/reagent_containers/food/condiment/small/peppergrinder name = "pepper mill" @@ -257,7 +257,7 @@ /obj/item/reagent_containers/food/condiment/small/peppermill/Initialize() . = ..() - reagents.add_reagent("blackpepper", 30) + reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 30) /obj/item/reagent_containers/food/condiment/small/sugar name = REAGENT_ID_SUGAR @@ -293,7 +293,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/pepper/Initialize() . = ..() - reagents.add_reagent("blackpepper", 5) + reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 5) /obj/item/reagent_containers/food/condiment/small/packet/sugar name = "sugar packet" @@ -312,7 +312,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/jelly/Initialize() . = ..() - reagents.add_reagent("cherryjelly", 10) + reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 10) /obj/item/reagent_containers/food/condiment/small/packet/honey name = "honey packet" @@ -322,7 +322,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/honey/Initialize() . = ..() - reagents.add_reagent("honey", 10) + reagents.add_reagent(REAGENT_ID_HONEY, 10) /obj/item/reagent_containers/food/condiment/small/packet/capsaicin name = "hot sauce packet" @@ -331,7 +331,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/capsaicin/Initialize() . = ..() - reagents.add_reagent("capsaicin", 5) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 5) /obj/item/reagent_containers/food/condiment/small/packet/ketchup name = "ketchup packet" @@ -340,7 +340,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/ketchup/Initialize() . = ..() - reagents.add_reagent("ketchup", 5) + reagents.add_reagent(REAGENT_ID_KETCHUP, 5) /obj/item/reagent_containers/food/condiment/small/packet/mayo name = "mayonnaise packet" @@ -349,7 +349,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/mayo/Initialize() . = ..() - reagents.add_reagent("mayo", 5) + reagents.add_reagent(REAGENT_ID_MAYO, 5) /obj/item/reagent_containers/food/condiment/small/packet/soy name = "soy sauce packet" @@ -358,7 +358,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/soy/Initialize() . = ..() - reagents.add_reagent("soysauce", 5) + reagents.add_reagent(REAGENT_ID_SOYSAUCE, 5) /obj/item/reagent_containers/food/condiment/small/packet/coffee name = "coffee powder packet" @@ -366,7 +366,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/coffee/Initialize() . = ..() - reagents.add_reagent("coffeepowder", 5) + reagents.add_reagent(REAGENT_ID_COFFEEPOWDER, 5) /obj/item/reagent_containers/food/condiment/small/packet/tea name = "tea powder packet" @@ -374,7 +374,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/tea/Initialize() . = ..() - reagents.add_reagent("tea", 5) + reagents.add_reagent(REAGENT_ID_TEA, 5) /obj/item/reagent_containers/food/condiment/small/packet/cocoa name = "cocoa powder packet" @@ -382,7 +382,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/cocoa/Initialize() . = ..() - reagents.add_reagent("coco", 5) + reagents.add_reagent(REAGENT_ID_COCO, 5) /obj/item/reagent_containers/food/condiment/small/packet/grape name = "grape juice powder packet" @@ -390,7 +390,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/grape/Initialize() . = ..() - reagents.add_reagent("instantgrape", 5) + reagents.add_reagent(REAGENT_ID_INSTANTGRAPE, 5) /obj/item/reagent_containers/food/condiment/small/packet/orange name = "orange juice powder packet" @@ -398,7 +398,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/orange/Initialize() . = ..() - reagents.add_reagent("instantorange", 5) + reagents.add_reagent(REAGENT_ID_INSTANTORANGE, 5) /obj/item/reagent_containers/food/condiment/small/packet/watermelon name = "watermelon juice powder packet" @@ -406,7 +406,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/watermelon/Initialize() . = ..() - reagents.add_reagent("instantwatermelon", 5) + reagents.add_reagent(REAGENT_ID_INSTANTWATERMELON, 5) /obj/item/reagent_containers/food/condiment/small/packet/apple name = "apple juice powder packet" @@ -414,7 +414,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/apple/Initialize() . = ..() - reagents.add_reagent("instantapple", 5) + reagents.add_reagent(REAGENT_ID_INSTANTAPPLE, 5) /obj/item/reagent_containers/food/condiment/small/packet/protein name = "protein powder packet" @@ -424,7 +424,7 @@ /obj/item/reagent_containers/food/condiment/small/packet/protein/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) /obj/item/reagent_containers/food/condiment/small/packet/crayon name = "crayon powder packet" @@ -474,7 +474,7 @@ /obj/item/reagent_containers/food/condiment/carton/flour/Initialize() . = ..() - reagents.add_reagent("flour", 200) + reagents.add_reagent(REAGENT_ID_FLOUR, 200) randpixel_xy() /obj/item/reagent_containers/food/condiment/carton/update_icon() @@ -525,7 +525,7 @@ /obj/item/reagent_containers/food/condiment/spacespice/Initialize() . = ..() - reagents.add_reagent("spacespice", 40) + reagents.add_reagent(REAGENT_ID_SPACESPICE, 40) /obj/item/reagent_containers/food/condiment/small/packet/protein_powder name = "protein powder packet" diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 50216ed9276..49cdf765625 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -252,7 +252,7 @@ /obj/item/reagent_containers/food/drinks/milk/Initialize() . = ..() - reagents.add_reagent("milk", 50) + reagents.add_reagent(REAGENT_ID_MILK, 50) /obj/item/reagent_containers/food/drinks/soymilk name = "soymilk carton" @@ -266,7 +266,7 @@ /obj/item/reagent_containers/food/drinks/soymilk/Initialize() . = ..() - reagents.add_reagent("soymilk", 50) + reagents.add_reagent(REAGENT_ID_SOYMILK, 50) /obj/item/reagent_containers/food/drinks/smallmilk name = "small milk carton" @@ -281,7 +281,7 @@ /obj/item/reagent_containers/food/drinks/smallmilk/Initialize() . = ..() - reagents.add_reagent("milk", 30) + reagents.add_reagent(REAGENT_ID_MILK, 30) /obj/item/reagent_containers/food/drinks/smallchocmilk name = "small chocolate milk carton" @@ -296,7 +296,7 @@ /obj/item/reagent_containers/food/drinks/smallchocmilk/Initialize() . = ..() - reagents.add_reagent("chocolate_milk", 30) + reagents.add_reagent(REAGENT_ID_CHOCOLATEMILK, 30) /obj/item/reagent_containers/food/drinks/coffee name = "\improper Robust Coffee" @@ -310,7 +310,7 @@ /obj/item/reagent_containers/food/drinks/coffee/Initialize() . = ..() - reagents.add_reagent("coffee", 30) + reagents.add_reagent(REAGENT_ID_COFFEE, 30) /obj/item/reagent_containers/food/drinks/tea name = "cup of Duke Purple tea" @@ -325,7 +325,7 @@ /obj/item/reagent_containers/food/drinks/tea/Initialize() . = ..() - reagents.add_reagent("tea", 30) + reagents.add_reagent(REAGENT_ID_TEA, 30) /obj/item/reagent_containers/food/drinks/decaf_tea name = "cup of Count Mauve decaffeinated tea" @@ -340,7 +340,7 @@ /obj/item/reagent_containers/food/drinks/decaf_tea/Initialize() . = ..() - reagents.add_reagent("teadecaf", 30) + reagents.add_reagent(REAGENT_ID_TEADECAF, 30) /obj/item/reagent_containers/food/drinks/ice name = "cup of ice" @@ -364,7 +364,7 @@ /obj/item/reagent_containers/food/drinks/h_chocolate/Initialize() . = ..() - reagents.add_reagent("hot_coco", 30) + reagents.add_reagent(REAGENT_ID_HOTCOCO, 30) /obj/item/reagent_containers/food/drinks/greentea name = "cup of green tea" @@ -379,7 +379,7 @@ /obj/item/reagent_containers/food/drinks/greentea/Initialize() . = ..() - reagents.add_reagent("greentea", 30) + reagents.add_reagent(REAGENT_ID_GREENTEA, 30) /obj/item/reagent_containers/food/drinks/chaitea name = "cup of chai tea" @@ -394,7 +394,7 @@ /obj/item/reagent_containers/food/drinks/chaitea/Initialize() . = ..() - reagents.add_reagent("chaitea", 30) + reagents.add_reagent(REAGENT_ID_CHAITEA, 30) /obj/item/reagent_containers/food/drinks/decaf name = "cup of decaf coffee" @@ -409,7 +409,7 @@ /obj/item/reagent_containers/food/drinks/decaf/Initialize() . = ..() - reagents.add_reagent("decaf", 30) + reagents.add_reagent(REAGENT_ID_DECAF, 30) /obj/item/reagent_containers/food/drinks/dry_ramen name = "Cup Ramen" @@ -423,7 +423,7 @@ /obj/item/reagent_containers/food/drinks/dry_ramen/Initialize() . = ..() - reagents.add_reagent("dry_ramen", 30) + reagents.add_reagent(REAGENT_ID_DRYRAMEN, 30) /obj/item/reagent_containers/food/drinks/sillycup name = "paper cup" diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index e270451a782..ae3c7ebae3c 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -502,7 +502,7 @@ /obj/item/reagent_containers/food/drinks/bottle/cola/Initialize() . = ..() - reagents.add_reagent("cola", 100) + reagents.add_reagent(REAGENT_ID_COLA, 100) /obj/item/reagent_containers/food/drinks/bottle/decaf_cola name = "\improper two-liter Space Cola Free" @@ -512,7 +512,7 @@ /obj/item/reagent_containers/food/drinks/bottle/decaf_cola/Initialize() . = ..() - reagents.add_reagent("decafcola", 100) + reagents.add_reagent(REAGENT_ID_DECAFCOLA, 100) /obj/item/reagent_containers/food/drinks/bottle/space_up name = "\improper two-liter Space-Up" @@ -522,7 +522,7 @@ /obj/item/reagent_containers/food/drinks/bottle/space_up/Initialize() . = ..() - reagents.add_reagent("space_up", 100) + reagents.add_reagent(REAGENT_ID_SPACEUP, 100) /obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind name = "\improper two-liter Space Mountain Wind" @@ -532,7 +532,7 @@ /obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind/Initialize() . = ..() - reagents.add_reagent("spacemountainwind", 100) + reagents.add_reagent(REAGENT_ID_SPACEMOUNTAINWIND, 100) /obj/item/reagent_containers/food/drinks/bottle/dr_gibb name = "\improper two-liter Dr. Gibb" @@ -542,7 +542,7 @@ /obj/item/reagent_containers/food/drinks/bottle/dr_gibb/Initialize() . = ..() - reagents.add_reagent("dr_gibb", 100) + reagents.add_reagent(REAGENT_ID_DRGIBB, 100) /obj/item/reagent_containers/food/drinks/bottle/orangejuice name = "Orange Juice" @@ -554,10 +554,10 @@ /obj/item/reagent_containers/food/drinks/bottle/orangejuice/Initialize() . = ..() - reagents.add_reagent("orangejuice", 100) + reagents.add_reagent(REAGENT_ID_ORANGEJUICE, 100) /obj/item/reagent_containers/food/drinks/bottle/applejuice - name = "Apple Juice" + name = REAGENT_APPLEJUICE desc = "Squeezed, pressed and ground to perfection!" icon_state = "applejuice" item_state = "carton" @@ -566,7 +566,7 @@ /obj/item/reagent_containers/food/drinks/bottle/applejuice/Initialize() . = ..() - reagents.add_reagent("applejuice", 100) + reagents.add_reagent(REAGENT_ID_APPLEJUICE, 100) /obj/item/reagent_containers/food/drinks/bottle/milk name = "Large Milk Carton" @@ -578,7 +578,7 @@ /obj/item/reagent_containers/food/drinks/bottle/milk/Initialize() . = ..() - reagents.add_reagent("milk", 100) + reagents.add_reagent(REAGENT_ID_MILK, 100) /obj/item/reagent_containers/food/drinks/bottle/cream name = "Milk Cream" @@ -590,10 +590,10 @@ /obj/item/reagent_containers/food/drinks/bottle/cream/Initialize() . = ..() - reagents.add_reagent("cream", 100) + reagents.add_reagent(REAGENT_ID_CREAM, 100) /obj/item/reagent_containers/food/drinks/bottle/tomatojuice - name = "Tomato Juice" + name = REAGENT_TOMATOJUICE desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness." icon_state = "tomatojuice" item_state = "carton" @@ -602,10 +602,10 @@ /obj/item/reagent_containers/food/drinks/bottle/tomatojuice/Initialize() . = ..() - reagents.add_reagent("tomatojuice", 100) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 100) /obj/item/reagent_containers/food/drinks/bottle/limejuice - name = "Lime Juice" + name = REAGENT_LIMEJUICE desc = "Sweet-sour goodness." icon_state = "limejuice" item_state = "carton" @@ -614,10 +614,10 @@ /obj/item/reagent_containers/food/drinks/bottle/limejuice/Initialize() . = ..() - reagents.add_reagent("limejuice", 100) + reagents.add_reagent(REAGENT_ID_LIMEJUICE, 100) /obj/item/reagent_containers/food/drinks/bottle/lemonjuice - name = "Lemon Juice" + name = REAGENT_LEMONJUICE desc = "Sweet-sour goodness. Minus the sweet." icon_state = "lemonjuice" item_state = "carton" @@ -626,7 +626,7 @@ /obj/item/reagent_containers/food/drinks/bottle/lemonjuice/Initialize() . = ..() - reagents.add_reagent("lemonjuice", 100) + reagents.add_reagent(REAGENT_ID_LEMONJUICE, 100) /obj/item/reagent_containers/food/drinks/bottle/grenadine name = "Briar Rose Grenadine Syrup" @@ -636,7 +636,7 @@ /obj/item/reagent_containers/food/drinks/bottle/grenadine/Initialize() . = ..() - reagents.add_reagent("grenadine", 100) + reagents.add_reagent(REAGENT_ID_GRENADINE, 100) /obj/item/reagent_containers/food/drinks/bottle/grapejuice name = "Special Blend Grapejuice" @@ -646,7 +646,7 @@ /obj/item/reagent_containers/food/drinks/bottle/grapejuice/Initialize() . = ..() - reagents.add_reagent("grapejuice", 100) + reagents.add_reagent(REAGENT_ID_GRAPEJUICE, 100) //////////////////////////SMALL BOTTLES/////////////////////// @@ -723,24 +723,24 @@ //////////////////////////SMALL BOTTLED SODA/////////////////////// /obj/item/reagent_containers/food/drinks/bottle/small/cola - name = "Space Cola" + name = REAGENT_COLA desc = "Cola. In space." icon_state = "colabottle2" center_of_mass = list("x"=16, "y"=6) /obj/item/reagent_containers/food/drinks/bottle/small/cola/Initialize() . = ..() - reagents.add_reagent("cola", 50) + reagents.add_reagent(REAGENT_ID_COLA, 50) /obj/item/reagent_containers/food/drinks/bottle/small/space_up - name = "Space-Up" + name = REAGENT_SPACEUP desc = "Tastes like a hull breach in your mouth." icon_state = "space-up_bottle2" center_of_mass = list("x"=16, "y"=6) /obj/item/reagent_containers/food/drinks/bottle/small/space_up/Initialize() . = ..() - reagents.add_reagent("space_up", 50) + reagents.add_reagent(REAGENT_ID_SPACEUP, 50) /obj/item/reagent_containers/food/drinks/bottle/small/space_mountain_wind name = "Space Mountain Wind" @@ -750,14 +750,14 @@ /obj/item/reagent_containers/food/drinks/bottle/small/space_mountain_wind/Initialize() . = ..() - reagents.add_reagent("spacemountainwind", 50) + reagents.add_reagent(REAGENT_ID_SPACEMOUNTAINWIND, 50) /obj/item/reagent_containers/food/drinks/bottle/small/dr_gibb - name = "Dr. Gibb" + name = REAGENT_DRGIBB desc = "A delicious mixture of 42 different flavors." icon_state = "dr_gibb_bottle2" center_of_mass = list("x"=16, "y"=6) /obj/item/reagent_containers/food/drinks/bottle/small/dr_gibb/Initialize() . = ..() - reagents.add_reagent("dr_gibb", 50) + reagents.add_reagent(REAGENT_ID_DRGIBB, 50) diff --git a/code/modules/food/food/drinks/drinkingglass.dm b/code/modules/food/food/drinks/drinkingglass.dm index 78e7449862d..f33e5ef78de 100644 --- a/code/modules/food/food/drinks/drinkingglass.dm +++ b/code/modules/food/food/drinks/drinkingglass.dm @@ -94,11 +94,11 @@ // for /obj/machinery/vending/sovietsoda /obj/item/reagent_containers/food/drinks/drinkingglass/soda/New() ..() - reagents.add_reagent("sodawater", 50) + reagents.add_reagent(REAGENT_ID_SODAWATER, 50) /obj/item/reagent_containers/food/drinks/drinkingglass/cola/New() ..() - reagents.add_reagent("cola", 50) + reagents.add_reagent(REAGENT_ID_COLA, 50) /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass name = "shot glass" @@ -164,7 +164,7 @@ . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30) reagents.add_reagent(REAGENT_ID_IRON, 10) - reagents.add_reagent("protein", 15) + reagents.add_reagent(REAGENT_ID_PROTEIN, 15) reagents.add_reagent(REAGENT_ID_WATER, 45) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index d0fae7402d2..5b48d1d1e81 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -447,7 +447,7 @@ /obj/item/reagent_containers/food/snacks/aesirsalad/Initialize() . = ..() - reagents.add_reagent("doctorsdelight", 8) + reagents.add_reagent(REAGENT_ID_DOCTORSDELIGHT, 8) reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 8) /obj/item/reagent_containers/food/snacks/candy/donor @@ -484,13 +484,13 @@ filling_color = "#7D5F46" center_of_mass = list("x"=15, "y"=15) nutriment_amt = 2 - nutriment_desc = list("chocolate" = 5) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 5) bitesize = 2 /obj/item/reagent_containers/food/snacks/chocolatebar/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 2) - reagents.add_reagent("coco", 2) + reagents.add_reagent(REAGENT_ID_COCO, 2) /obj/item/reagent_containers/food/snacks/chocolatepiece name = "chocolate piece" @@ -499,7 +499,7 @@ filling_color = "#7D5F46" center_of_mass = list("x"=15, "y"=15) nutriment_amt = 1 - nutriment_desc = list("chocolate" = 3, "caramel" = 2, "lusciousness" = 1) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 3, "caramel" = 2, "lusciousness" = 1) bitesize = 2 /obj/item/reagent_containers/food/snacks/chocolatepiece/white @@ -513,7 +513,7 @@ name = "chocolate truffle" desc = "A bite-sized milk chocolate truffle that could buy anyone's love." icon_state = "chocolatepiece_truffle" - nutriment_desc = list("chocolate" = 3, "undying devotion" = 3) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 3, "undying devotion" = 3) /obj/item/reagent_containers/food/snacks/chocolateegg name = "Chocolate Egg" @@ -522,13 +522,13 @@ filling_color = "#7D5F46" center_of_mass = list("x"=16, "y"=13) nutriment_amt = 3 - nutriment_desc = list("chocolate" = 5) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 5) bitesize = 2 /obj/item/reagent_containers/food/snacks/chocolateegg/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 2) - reagents.add_reagent("coco", 2) + reagents.add_reagent(REAGENT_ID_COCO, 2) /obj/item/reagent_containers/food/snacks/donut name = "donut" @@ -557,7 +557,7 @@ /obj/item/reagent_containers/food/snacks/donut/plain/jelly/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("berryjuice", 5) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/donut/pink name = "pink frosted donut" @@ -575,7 +575,7 @@ /obj/item/reagent_containers/food/snacks/donut/pink/jelly/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("berryjuice", 5) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/donut/purple name = "purple frosted donut" @@ -593,7 +593,7 @@ /obj/item/reagent_containers/food/snacks/donut/purple/jelly/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("berryjuice", 5) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/donut/green name = "green frosted donut" @@ -611,7 +611,7 @@ /obj/item/reagent_containers/food/snacks/donut/green/jelly/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("berryjuice", 5) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/donut/beige name = "beige frosted donut" @@ -629,7 +629,7 @@ /obj/item/reagent_containers/food/snacks/donut/beige/jelly/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("berryjuice", 5) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/donut/choc name = "chocolate frosted donut" @@ -639,7 +639,7 @@ /obj/item/reagent_containers/food/snacks/donut/choc/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("chocolate", 5) + reagents.add_reagent(REAGENT_ID_CHOCOLATE, 5) /obj/item/reagent_containers/food/snacks/donut/choc/jelly name = "chocolate frosted jelly donut" @@ -648,8 +648,8 @@ /obj/item/reagent_containers/food/snacks/donut/choc/jelly/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("berryjuice", 5) - reagents.add_reagent("chocolate", 5) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) + reagents.add_reagent(REAGENT_ID_CHOCOLATE, 5) /obj/item/reagent_containers/food/snacks/donut/blue name = "blue frosted donut" @@ -667,7 +667,7 @@ /obj/item/reagent_containers/food/snacks/donut/blue/jelly/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("berryjuice", 5) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/donut/yellow name = "yellow frosted donut" @@ -685,7 +685,7 @@ /obj/item/reagent_containers/food/snacks/donut/yellow/jelly/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("berryjuice", 5) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/donut/olive name = "olive frosted donut" @@ -703,7 +703,7 @@ /obj/item/reagent_containers/food/snacks/donut/olive/jelly/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("berryjuice", 5) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/donut/homer name = "frosted donut with sprinkles" @@ -713,7 +713,7 @@ /obj/item/reagent_containers/food/snacks/donut/homer/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("sprinkles", 1) + reagents.add_reagent(REAGENT_ID_SPRINKLES, 1) /obj/item/reagent_containers/food/snacks/donut/homer/jelly name = "frosted jelly donut with sprinkles" @@ -722,8 +722,8 @@ /obj/item/reagent_containers/food/snacks/donut/homer/jelly/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("berryjuice", 5) + reagents.add_reagent(REAGENT_ID_SPRINKLES, 1) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/donut/choc_sprinkles name = "chocolate sprinkles donut" @@ -733,8 +733,8 @@ /obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("chocolate", 1) + reagents.add_reagent(REAGENT_ID_SPRINKLES, 1) + reagents.add_reagent(REAGENT_ID_CHOCOLATE, 1) /obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly name = "chocolate sprinkles jelly donut" @@ -743,9 +743,9 @@ /obj/item/reagent_containers/food/snacks/donut/choc_sprinkles/jelly/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("sprinkles", 1) - reagents.add_reagent("berryjuice", 5) - reagents.add_reagent("chocolate", 1) + reagents.add_reagent(REAGENT_ID_SPRINKLES, 1) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) + reagents.add_reagent(REAGENT_ID_CHOCOLATE, 1) /obj/item/reagent_containers/food/snacks/donut/meat name = "meat donut" @@ -754,7 +754,7 @@ overlay_state = "donut_meat_inbox" /obj/item/reagent_containers/food/snacks/donut/meat/Initialize() . = ..() - reagents.add_reagent("protein", 3, nutriment_desc) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3, nutriment_desc) /obj/item/reagent_containers/food/snacks/donut/laugh name = "laugh donut" @@ -772,7 +772,7 @@ /obj/item/reagent_containers/food/snacks/donut/laugh/jelly/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) - reagents.add_reagent("berryjuice", 5) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/donut/chaos @@ -786,26 +786,26 @@ /obj/item/reagent_containers/food/snacks/donut/chaos/Initialize() . = ..() - reagents.add_reagent("sprinkles", 1) + reagents.add_reagent(REAGENT_ID_SPRINKLES, 1) switch(rand(1,10)) if(1) reagents.add_reagent(REAGENT_ID_NUTRIMENT, 3, nutriment_desc) if(2) - reagents.add_reagent("capsaicin", 3) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 3) if(3) - reagents.add_reagent("frostoil", 3) + reagents.add_reagent(REAGENT_ID_FROSTOIL, 3) if(4) - reagents.add_reagent("sprinkles", 3) + reagents.add_reagent(REAGENT_ID_SPRINKLES, 3) if(5) reagents.add_reagent(REAGENT_ID_PHORON, 3) if(6) - reagents.add_reagent("coco", 3) + reagents.add_reagent(REAGENT_ID_COCO, 3) if(7) reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 3) if(8) - reagents.add_reagent("banana", 3) + reagents.add_reagent(REAGENT_ID_BANANA, 3) if(9) - reagents.add_reagent("berryjuice", 3) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 3) if(10) reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 3) @@ -814,7 +814,7 @@ /obj/item/reagent_containers/food/snacks/donut/plain/jelly/poisonberry/Initialize() . = ..() - reagents.add_reagent("poisonberryjuice", 5) + reagents.add_reagent(REAGENT_ID_POISONBERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/donut/plain/jelly/slimejelly filling_color = "#ED1169" @@ -828,7 +828,7 @@ /obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly/Initialize() . = ..() - reagents.add_reagent("cherryjelly", 5) + reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 5) /obj/item/reagent_containers/food/snacks/egg @@ -841,7 +841,7 @@ /obj/item/reagent_containers/food/snacks/egg/Initialize() . = ..() - reagents.add_reagent("egg", 3) + reagents.add_reagent(REAGENT_ID_EGG, 3) /obj/item/reagent_containers/food/snacks/egg/afterattack(obj/O as obj, mob/user as mob, proximity) if(istype(O,/obj/machinery/microwave)) @@ -908,9 +908,9 @@ /obj/item/reagent_containers/food/snacks/friedegg/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) - reagents.add_reagent("blackpepper", 1) + reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1) /obj/item/reagent_containers/food/snacks/boiledegg name = "Boiled egg" @@ -920,7 +920,7 @@ /obj/item/reagent_containers/food/snacks/boiledegg/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/organ name = "organ" @@ -933,17 +933,17 @@ /obj/item/reagent_containers/food/snacks/organ/Initialize() . = ..() - reagents.add_reagent("protein", rand(3,5)) + reagents.add_reagent(REAGENT_ID_PROTEIN, rand(3,5)) reagents.add_reagent(REAGENT_ID_TOXIN, rand(1,3)) /obj/item/reagent_containers/food/snacks/tofu name = "Tofu" - icon_state = "tofu" + icon_state = REAGENT_ID_TOFU desc = "We all love tofu." filling_color = "#FFFEE0" center_of_mass = list("x"=17, "y"=10) nutriment_amt = 3 - nutriment_desc = list("tofu" = 3, "goeyness" = 3) + nutriment_desc = list(REAGENT_ID_TOFU = 3, "goeyness" = 3) bitesize = 3 /obj/item/reagent_containers/food/snacks/tofurkey @@ -953,7 +953,7 @@ filling_color = "#FFFEE0" center_of_mass = list("x"=16, "y"=8) nutriment_amt = 12 - nutriment_desc = list("turkey" = 3, "tofu" = 5, "goeyness" = 4) + nutriment_desc = list("turkey" = 3, REAGENT_ID_TOFU = 5, "goeyness" = 4) bitesize = 3 /obj/item/reagent_containers/food/snacks/stuffing @@ -979,7 +979,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat/Initialize() . = ..() - reagents.add_reagent("seafood", 3) + reagents.add_reagent(REAGENT_ID_SEAFOOD, 3) if(toxin_type && toxin_amount) reagents.add_reagent(toxin_type, toxin_amount) @@ -1015,7 +1015,7 @@ /obj/item/reagent_containers/food/snacks/crab_legs/Initialize() . = ..() - reagents.add_reagent("seafood", 6) + reagents.add_reagent(REAGENT_ID_SEAFOOD, 6) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) /obj/item/reagent_containers/food/snacks/fishfingers @@ -1028,7 +1028,7 @@ /obj/item/reagent_containers/food/snacks/fishfingers/Initialize() . = ..() - reagents.add_reagent("seafood", 4) + reagents.add_reagent(REAGENT_ID_SEAFOOD, 4) /obj/item/reagent_containers/food/snacks/zestfish name = "Zesty Fish" @@ -1040,7 +1040,7 @@ /obj/item/reagent_containers/food/snacks/zestfish/Initialize() . = ..() - reagents.add_reagent("seafood", 4) + reagents.add_reagent(REAGENT_ID_SEAFOOD, 4) /obj/item/reagent_containers/food/snacks/mushroomslice name = "mushroom slice" @@ -1076,7 +1076,7 @@ /obj/item/reagent_containers/food/snacks/bearmeat/Initialize() . = ..() - reagents.add_reagent("protein", 12) + reagents.add_reagent(REAGENT_ID_PROTEIN, 12) reagents.add_reagent(REAGENT_ID_HYPERZINE, 5) /obj/item/reagent_containers/food/snacks/xenomeat @@ -1089,7 +1089,7 @@ /obj/item/reagent_containers/food/snacks/xenomeat/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_PACID,6) /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat. @@ -1115,7 +1115,7 @@ /obj/item/reagent_containers/food/snacks/meatball/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/sausage name = "Sausage" @@ -1127,7 +1127,7 @@ /obj/item/reagent_containers/food/snacks/sausage/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) /obj/item/reagent_containers/food/snacks/donkpocket name = "\improper Donk-pocket" @@ -1143,7 +1143,7 @@ /obj/item/reagent_containers/food/snacks/donkpocket/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/donkpocket/proc/heat() warm = 1 @@ -1183,14 +1183,14 @@ desc = "Delicious, cheesy and surprisingly filling." icon_state = "donkpocketpizza" nutriment_amt = 2 - nutriment_desc = list("meat" = 1, "dough" = 2, "cheese"= 2) + nutriment_desc = list("meat" = 1, "dough" = 2, REAGENT_ID_CHEESE= 2) /obj/item/reagent_containers/food/snacks/donkpocket/honk name = "\improper Honk-pocket" desc = "The award-winning donk-pocket that won the hearts of clowns and humans alike." icon_state = "donkpocketbanana" nutriment_amt = 2 - nutriment_desc = list("banana" = 1, "dough" = 2, "children's antibiotics"= 1) + nutriment_desc = list(REAGENT_ID_BANANA = 1, "dough" = 2, "children's antibiotics"= 1) /obj/item/reagent_containers/food/snacks/donkpocket/berry name = "\improper Berry-pocket" @@ -1218,7 +1218,7 @@ name = "\improper Sin-pocket" desc = "The food of choice for the veteran. Do NOT overconsume." filling_color = "#6D6D00" - heated_reagents = list("doctorsdelight" = 5, REAGENT_ID_HYPERZINE = 0.75, REAGENT_ID_SYNAPTIZINE = 0.25) + heated_reagents = list(REAGENT_ID_DOCTORSDELIGHT = 5, REAGENT_ID_HYPERZINE = 0.75, REAGENT_ID_SYNAPTIZINE = 0.25) var/has_been_heated = 0 /obj/item/reagent_containers/food/snacks/donkpocket/sinpocket/attack_self(mob/user) @@ -1243,7 +1243,7 @@ /obj/item/reagent_containers/food/snacks/brainburger/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_ALKYSINE, 6) /obj/item/reagent_containers/food/snacks/ghostburger @@ -1270,7 +1270,7 @@ /obj/item/reagent_containers/food/snacks/human/burger/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) /obj/item/reagent_containers/food/snacks/cheeseburger name = "cheeseburger" @@ -1278,11 +1278,11 @@ icon_state = "cheeseburger" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 2 - nutriment_desc = list("cheese" = 2, "bun" = 2) + nutriment_desc = list(REAGENT_ID_CHEESE = 2, "bun" = 2) /obj/item/reagent_containers/food/snacks/cheeseburger/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/monkeyburger name = "burger" @@ -1296,7 +1296,7 @@ /obj/item/reagent_containers/food/snacks/monkeyburger/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/fishburger name = "Fillet -o- Carp Sandwich" @@ -1308,7 +1308,7 @@ /obj/item/reagent_containers/food/snacks/fishburger/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) /obj/item/reagent_containers/food/snacks/tofuburger name = "Tofu Burger" @@ -1349,7 +1349,7 @@ /obj/item/reagent_containers/food/snacks/xenoburger/Initialize() . = ..() - reagents.add_reagent("protein", 8) + reagents.add_reagent(REAGENT_ID_PROTEIN, 8) /obj/item/reagent_containers/food/snacks/clownburger name = JOB_CLOWN + " Burger" @@ -1383,7 +1383,7 @@ /obj/item/reagent_containers/food/snacks/omelette/Initialize() . = ..() - reagents.add_reagent("protein", 8) + reagents.add_reagent(REAGENT_ID_PROTEIN, 8) /obj/item/reagent_containers/food/snacks/muffin name = "Muffin" @@ -1404,12 +1404,12 @@ filling_color = "#FBFFB8" center_of_mass = list("x"=16, "y"=13) nutriment_amt = 4 - nutriment_desc = list("pie" = 3, "cream" = 2) + nutriment_desc = list("pie" = 3, REAGENT_ID_CREAM = 2) bitesize = 3 /obj/item/reagent_containers/food/snacks/pie/Initialize() . = ..() - reagents.add_reagent("banana",5) + reagents.add_reagent(REAGENT_ID_BANANA,5) /obj/item/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom) . = ..() @@ -1429,11 +1429,11 @@ /obj/item/reagent_containers/food/snacks/berryclafoutis/berry/Initialize() . = ..() - reagents.add_reagent("berryjuice", 5) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/berryclafoutis/poison/Initialize() . = ..() - reagents.add_reagent("poisonberryjuice", 5) + reagents.add_reagent(REAGENT_ID_POISONBERRYJUICE, 5) /obj/item/reagent_containers/food/snacks/waffles name = "waffles" @@ -1454,7 +1454,7 @@ filling_color = "#4D2F5E" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 6 - nutriment_desc = list("cheese" = 3, "eggplant" = 3) + nutriment_desc = list(REAGENT_ID_CHEESE = 3, "eggplant" = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/soylentgreen @@ -1468,7 +1468,7 @@ /obj/item/reagent_containers/food/snacks/soylentgreen/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) /obj/item/reagent_containers/food/snacks/soylenviridians name = "Soylen Virdians" @@ -1492,7 +1492,7 @@ /obj/item/reagent_containers/food/snacks/meatpie/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) /obj/item/reagent_containers/food/snacks/tofupie name = "Tofu-pie" @@ -1502,7 +1502,7 @@ filling_color = "#FFFEE0" center_of_mass = list("x"=16, "y"=13) nutriment_amt = 10 - nutriment_desc = list("tofu" = 2, "pie" = 8) + nutriment_desc = list(REAGENT_ID_TOFU = 2, "pie" = 8) bitesize = 2 /obj/item/reagent_containers/food/snacks/amanita_pie @@ -1549,7 +1549,7 @@ /obj/item/reagent_containers/food/snacks/xemeatpie/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) /obj/item/reagent_containers/food/snacks/wingfangchu name = "Wing Fang Chu" @@ -1562,7 +1562,7 @@ /obj/item/reagent_containers/food/snacks/wingfangchu/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) /obj/item/reagent_containers/food/snacks/human/kabob name = "-kabob" @@ -1575,7 +1575,7 @@ /obj/item/reagent_containers/food/snacks/human/kabob/Initialize() . = ..() - reagents.add_reagent("protein", 8) + reagents.add_reagent(REAGENT_ID_PROTEIN, 8) /obj/item/reagent_containers/food/snacks/monkeykabob name = "Meat-kabob" @@ -1588,7 +1588,7 @@ /obj/item/reagent_containers/food/snacks/monkeykabob/Initialize() . = ..() - reagents.add_reagent("protein", 8) + reagents.add_reagent(REAGENT_ID_PROTEIN, 8) /obj/item/reagent_containers/food/snacks/tofukabob name = "Tofu-kabob" @@ -1599,7 +1599,7 @@ bitesize = 2 center_of_mass = list("x"=17, "y"=15) nutriment_amt = 8 - nutriment_desc = list("tofu" = 3, "metal" = 1) + nutriment_desc = list(REAGENT_ID_TOFU = 3, "metal" = 1) /obj/item/reagent_containers/food/snacks/cubancarp name = "Cuban Carp" @@ -1614,8 +1614,8 @@ /obj/item/reagent_containers/food/snacks/cubancarp/Initialize() . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("capsaicin", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 3) /obj/item/reagent_containers/food/snacks/popcorn name = "Popcorn" @@ -1659,7 +1659,7 @@ /obj/item/reagent_containers/food/snacks/fries/Initialize() . = ..() - reagents.add_reagent("oil", 1.2)//This is mainly for the benefit of adminspawning + reagents.add_reagent(REAGENT_ID_OIL, 1.2)//This is mainly for the benefit of adminspawning /obj/item/reagent_containers/food/snacks/onionrings name = "onion rings" @@ -1717,12 +1717,12 @@ filling_color = "#EDDD00" center_of_mass = list("x"=16, "y"=11) nutriment_amt = 4 - nutriment_desc = list("fresh fries" = 3, "cheese" = 3) + nutriment_desc = list("fresh fries" = 3, REAGENT_ID_CHEESE = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/cheesyfries/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/chilicheesefries name = "chili cheese fries" @@ -1738,8 +1738,8 @@ /obj/item/reagent_containers/food/snacks/chilicheesefries/Initialize() . = ..() - reagents.add_reagent("protein", 2) - reagents.add_reagent("capsaicin", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2) /obj/item/reagent_containers/food/snacks/blackpudding name = "Black Pudding" @@ -1751,7 +1751,7 @@ /obj/item/reagent_containers/food/snacks/blackpudding/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) reagents.add_reagent(REAGENT_ID_BLOOD, 5) /obj/item/reagent_containers/food/snacks/soydope @@ -1799,9 +1799,9 @@ /obj/item/reagent_containers/food/snacks/meatsteak/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) - reagents.add_reagent("blackpepper", 1) + reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1) /obj/item/reagent_containers/food/snacks/spacylibertyduff name = "Spacy Liberty Duff" @@ -1859,7 +1859,7 @@ /obj/item/reagent_containers/food/snacks/monkeycube/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) /obj/item/reagent_containers/food/snacks/monkeycube/attack_self(mob/user as mob) if(wrapped) @@ -1949,7 +1949,7 @@ /obj/item/reagent_containers/food/snacks/bigbiteburger/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) /obj/item/reagent_containers/food/snacks/enchiladas name = "Enchiladas" @@ -1964,8 +1964,8 @@ /obj/item/reagent_containers/food/snacks/enchiladas/Initialize() . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("capsaicin", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 6) /obj/item/reagent_containers/food/snacks/monkeysdelight name = "monkey's Delight" @@ -1978,9 +1978,9 @@ /obj/item/reagent_containers/food/snacks/monkeysdelight/Initialize() . = ..() - reagents.add_reagent("protein", 10) - reagents.add_reagent("banana", 5) - reagents.add_reagent("blackpepper", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) + reagents.add_reagent(REAGENT_ID_BANANA, 5) + reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) /obj/item/reagent_containers/food/snacks/baguette @@ -1995,7 +1995,7 @@ /obj/item/reagent_containers/food/snacks/baguette/Initialize() . = ..() - reagents.add_reagent("blackpepper", 1) + reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) /obj/item/reagent_containers/food/snacks/fishandchips @@ -2010,7 +2010,7 @@ /obj/item/reagent_containers/food/snacks/fishandchips/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/rofflewaffles name = "Roffle Waffles" @@ -2039,7 +2039,7 @@ /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry/Initialize() . = ..() - reagents.add_reagent("cherryjelly", 5) + reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 5) /obj/item/reagent_containers/food/snacks/jelliedtoast/slime/Initialize() . = ..() @@ -2081,7 +2081,7 @@ /obj/item/reagent_containers/food/snacks/jellyburger/cherry/Initialize() . = ..() - reagents.add_reagent("cherryjelly", 5) + reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 5) /obj/item/reagent_containers/food/snacks/stewedsoymeat name = "Stewed Soy Meat" @@ -2112,7 +2112,7 @@ filling_color = "#FFFBDB" center_of_mass = list("x"=17, "y"=11) nutriment_amt = 2 - nutriment_desc = list("rice" = 2) + nutriment_desc = list(REAGENT_ID_RICE = 2) bitesize = 2 /obj/item/reagent_containers/food/snacks/ricepudding @@ -2123,7 +2123,7 @@ filling_color = "#FFFBDB" center_of_mass = list("x"=17, "y"=11) nutriment_amt = 4 - nutriment_desc = list("rice" = 2) + nutriment_desc = list(REAGENT_ID_RICE = 2) bitesize = 2 /obj/item/reagent_containers/food/snacks/kudzudonburi @@ -2134,12 +2134,12 @@ filling_color = "#FFFBDB" center_of_mass = list("x"=17, "y"=11) nutriment_amt = 16 - nutriment_desc = list("rice" = 2, "gauze" = 4, "fish" = 10) + nutriment_desc = list(REAGENT_ID_RICE = 2, "gauze" = 4, "fish" = 10) bitesize = 2 /obj/item/reagent_containers/food/snacks/kudzudonburi/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/pastatomato name = "Spaghetti" @@ -2154,7 +2154,7 @@ /obj/item/reagent_containers/food/snacks/pastatomato/Initialize() . = ..() - reagents.add_reagent("tomatojuice", 10) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 10) /obj/item/reagent_containers/food/snacks/meatballspagetti name = "Spaghetti & Meatballs" @@ -2169,7 +2169,7 @@ /obj/item/reagent_containers/food/snacks/meatballspagetti/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/spesslaw name = "Spesslaw" @@ -2183,7 +2183,7 @@ /obj/item/reagent_containers/food/snacks/spesslaw/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/superbiteburger name = "Super Bite Burger" @@ -2197,7 +2197,7 @@ /obj/item/reagent_containers/food/snacks/superbiteburger/Initialize() . = ..() - reagents.add_reagent("protein", 25) + reagents.add_reagent(REAGENT_ID_PROTEIN, 25) /obj/item/reagent_containers/food/snacks/caramelapple name = "Caramel Apple" @@ -2261,12 +2261,12 @@ filling_color = "#D9BE29" center_of_mass = list("x"=16, "y"=4) nutriment_amt = 3 - nutriment_desc = list("bread" = 3, "cheese" = 3) + nutriment_desc = list("bread" = 3, REAGENT_ID_CHEESE = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/sandwich/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/clubsandwich name = "Club Sandwich" @@ -2284,12 +2284,12 @@ filling_color = "#D9BE29" center_of_mass = list("x"=16, "y"=4) nutriment_amt = 3 - nutriment_desc = list("toasted bread" = 3, "cheese" = 3) + nutriment_desc = list("toasted bread" = 3, REAGENT_ID_CHEESE = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/toastedsandwich/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_CARBON, 2) /obj/item/reagent_containers/food/snacks/grilledcheese @@ -2298,12 +2298,12 @@ icon_state = "toastedsandwich" filling_color = "#D9BE29" nutriment_amt = 3 - nutriment_desc = list("toasted bread" = 3, "cheese" = 3) + nutriment_desc = list("toasted bread" = 3, REAGENT_ID_CHEESE = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/grilledcheese/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/jellysandwich name = "Jelly Sandwich" @@ -2321,7 +2321,7 @@ /obj/item/reagent_containers/food/snacks/jellysandwich/cherry/Initialize() . = ..() - reagents.add_reagent("cherryjelly", 5) + reagents.add_reagent(REAGENT_ID_CHERRYJELLY, 5) /obj/item/reagent_containers/food/snacks/jellysandwich/peanutbutter desc = "You wish you had some peanut butter to go with this... Oh wait!" @@ -2329,7 +2329,7 @@ /obj/item/reagent_containers/food/snacks/jellysandwich/peanutbutter/Initialize() . = ..() - reagents.add_reagent("peanutbutter", 5) + reagents.add_reagent(REAGENT_ID_PEANUTBUTTER, 5) // End Sandwiches ////////////////////////////////////////////// @@ -2371,7 +2371,7 @@ /obj/item/reagent_containers/food/snacks/chawanmushi/Initialize() . = ..() - reagents.add_reagent("protein", 5) + reagents.add_reagent(REAGENT_ID_PROTEIN, 5) /obj/item/reagent_containers/food/snacks/tossedsalad name = "tossed salad" @@ -2397,7 +2397,7 @@ /obj/item/reagent_containers/food/snacks/validsalad/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/appletart name = "golden apple streusel tart" @@ -2430,7 +2430,7 @@ /obj/item/reagent_containers/food/snacks/meatballsoup/Initialize() . = ..() - reagents.add_reagent("protein", 8) + reagents.add_reagent(REAGENT_ID_PROTEIN, 8) reagents.add_reagent(REAGENT_ID_WATER, 5) /obj/item/reagent_containers/food/snacks/slimesoup @@ -2457,7 +2457,7 @@ /obj/item/reagent_containers/food/snacks/bloodsoup/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) reagents.add_reagent(REAGENT_ID_BLOOD, 10) reagents.add_reagent(REAGENT_ID_WATER, 5) @@ -2474,7 +2474,7 @@ /obj/item/reagent_containers/food/snacks/clownstears/Initialize() . = ..() - reagents.add_reagent("banana", 5) + reagents.add_reagent(REAGENT_ID_BANANA, 5) reagents.add_reagent(REAGENT_ID_WATER, 10) /obj/item/reagent_containers/food/snacks/vegetablesoup @@ -2500,7 +2500,7 @@ filling_color = "#AFC4B5" center_of_mass = list("x"=16, "y"=7) nutriment_amt = 8 - nutriment_desc = list("salad" = 4, "egg" = 2, "potato" = 2) + nutriment_desc = list("salad" = 4, REAGENT_ID_EGG = 2, "potato" = 2) bitesize = 5 eating_sound = 'sound/items/drink.ogg' @@ -2527,12 +2527,12 @@ switch(mysteryselect) if(1) reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc) - reagents.add_reagent("capsaicin", 3) - reagents.add_reagent("tomatojuice", 2) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 3) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 2) if(2) reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc) - reagents.add_reagent("frostoil", 3) - reagents.add_reagent("tomatojuice", 2) + reagents.add_reagent(REAGENT_ID_FROSTOIL, 3) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 2) if(3) reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc) reagents.add_reagent(REAGENT_ID_WATER, 5) @@ -2542,7 +2542,7 @@ reagents.add_reagent(REAGENT_ID_WATER, 10) if(5) reagents.add_reagent(REAGENT_ID_NUTRIMENT, 2, nutriment_desc) - reagents.add_reagent("banana", 10) + reagents.add_reagent(REAGENT_ID_BANANA, 10) if(6) reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc) reagents.add_reagent(REAGENT_ID_BLOOD, 10) @@ -2554,10 +2554,10 @@ reagents.add_reagent(REAGENT_ID_TOXIN, 10) if(9) reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5, nutriment_desc) - reagents.add_reagent("tomatojuice", 10) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 10) if(10) reagents.add_reagent(REAGENT_ID_NUTRIMENT, 6, nutriment_desc) - reagents.add_reagent("tomatojuice", 5) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 5) reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5) /obj/item/reagent_containers/food/snacks/wishsoup @@ -2661,8 +2661,8 @@ /obj/item/reagent_containers/food/snacks/stew/Initialize() . = ..() - reagents.add_reagent("protein", 4) - reagents.add_reagent("tomatojuice", 5) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 5) reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5) reagents.add_reagent(REAGENT_ID_WATER, 5) @@ -2680,9 +2680,9 @@ /obj/item/reagent_containers/food/snacks/bearstew/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) reagents.add_reagent(REAGENT_ID_HYPERZINE, 5) - reagents.add_reagent("tomatojuice", 5) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 5) reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5) reagents.add_reagent(REAGENT_ID_WATER, 5) @@ -2701,9 +2701,9 @@ /obj/item/reagent_containers/food/snacks/hotchili/Initialize() . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("capsaicin", 3) - reagents.add_reagent("tomatojuice", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 3) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 2) /obj/item/reagent_containers/food/snacks/coldchili name = "Cold Chili" @@ -2719,9 +2719,9 @@ /obj/item/reagent_containers/food/snacks/coldchili/Initialize() . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("frostoil", 3) - reagents.add_reagent("tomatojuice", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) + reagents.add_reagent(REAGENT_ID_FROSTOIL, 3) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 2) /obj/item/reagent_containers/food/snacks/bearchili @@ -2739,9 +2739,9 @@ /obj/item/reagent_containers/food/snacks/bearchili/Initialize() . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("capsaicin", 3) - reagents.add_reagent("tomatojuice", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 3) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 2) reagents.add_reagent(REAGENT_ID_HYPERZINE, 5) /////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -2798,7 +2798,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/meatbread/Initialize() . = ..() - reagents.add_reagent("protein", 20) + reagents.add_reagent(REAGENT_ID_PROTEIN, 20) /obj/item/reagent_containers/food/snacks/slice/meatbread name = "meatbread slice" @@ -2827,7 +2827,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/xenomeatbread/Initialize() . = ..() - reagents.add_reagent("protein", 20) + reagents.add_reagent(REAGENT_ID_PROTEIN, 20) /obj/item/reagent_containers/food/snacks/slice/xenomeatbread name = "xenomeatbread slice" @@ -2856,7 +2856,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/bananabread/Initialize() . = ..() - reagents.add_reagent("banana", 20) + reagents.add_reagent(REAGENT_ID_BANANA, 20) /obj/item/reagent_containers/food/snacks/slice/bananabread name = "Banana-nut bread slice" @@ -2878,7 +2878,7 @@ slices_num = 5 filling_color = "#F7FFE0" center_of_mass = list("x"=16, "y"=9) - nutriment_desc = list("tofu" = 10) + nutriment_desc = list(REAGENT_ID_TOFU = 10) nutriment_amt = 10 bitesize = 2 @@ -2916,13 +2916,13 @@ slices_num = 5 filling_color = "#FFF896" center_of_mass = list("x"=16, "y"=9) - nutriment_desc = list("bread" = 6, "cream" = 3, "cheese" = 3) + nutriment_desc = list("bread" = 6, REAGENT_ID_CREAM = 3, REAGENT_ID_CHEESE = 3) nutriment_amt = 5 bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/creamcheesebread/Initialize() . = ..() - reagents.add_reagent("protein", 15) + reagents.add_reagent(REAGENT_ID_PROTEIN, 15) /obj/item/reagent_containers/food/snacks/slice/creamcheesebread name = "Cream Cheese Bread slice" @@ -2979,7 +2979,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/braincake/Initialize() . = ..() - reagents.add_reagent("protein", 25) + reagents.add_reagent(REAGENT_ID_PROTEIN, 25) reagents.add_reagent(REAGENT_ID_ALKYSINE, 10) /obj/item/reagent_containers/food/snacks/slice/braincake @@ -3003,13 +3003,13 @@ slices_num = 5 filling_color = "#FAF7AF" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "cream" = 10, "cheese" = 15) + nutriment_desc = list("cake" = 10, REAGENT_ID_CREAM = 10, REAGENT_ID_CHEESE = 15) nutriment_amt = 10 bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/cheesecake/Initialize() . = ..() - reagents.add_reagent("protein", 15) + reagents.add_reagent(REAGENT_ID_PROTEIN, 15) /obj/item/reagent_containers/food/snacks/slice/cheesecake name = "Cheese Cake slice" @@ -3038,7 +3038,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/peanutcake/Initialize() . = ..() - reagents.add_reagent("protein", 5) + reagents.add_reagent(REAGENT_ID_PROTEIN, 5) /obj/item/reagent_containers/food/snacks/slice/peanutcake name = "Peanut Cake slice" @@ -3061,7 +3061,7 @@ slices_num = 5 filling_color = "#F7EDD5" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "vanilla" = 15) + nutriment_desc = list("cake" = 10, "sweetness" = 10, REAGENT_ID_VANILLA = 15) nutriment_amt = 20 /obj/item/reagent_containers/food/snacks/slice/plaincake @@ -3158,7 +3158,7 @@ slices_num = 5 filling_color = "#805930" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cake" = 10, "sweetness" = 10, "chocolate" = 15) + nutriment_desc = list("cake" = 10, "sweetness" = 10, REAGENT_ID_CHOCOLATE = 15) nutriment_amt = 20 /obj/item/reagent_containers/food/snacks/slice/chocolatecake @@ -3182,13 +3182,13 @@ slices_num = 5 filling_color = "#FFF700" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("cheese" = 10) + nutriment_desc = list(REAGENT_ID_CHEESE = 10) nutriment_amt = 10 bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) /obj/item/reagent_containers/food/snacks/cheesewedge name = "Cheese wedge" @@ -3212,7 +3212,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake/Initialize() . = ..() - reagents.add_reagent("sprinkles", 10) + reagents.add_reagent(REAGENT_ID_SPRINKLES, 10) /obj/item/reagent_containers/food/snacks/slice/birthdaycake name = "Birthday Cake slice" @@ -3279,7 +3279,7 @@ slices_num = 5 filling_color = "#F5B951" center_of_mass = list("x"=16, "y"=10) - nutriment_desc = list("pie" = 5, "cream" = 5, "pumpkin" = 5) + nutriment_desc = list("pie" = 5, REAGENT_ID_CREAM = 5, "pumpkin" = 5) nutriment_amt = 15 /obj/item/reagent_containers/food/snacks/slice/pumpkinpie @@ -3315,7 +3315,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/grilled_carp/Initialize() . = ..() - reagents.add_reagent("seafood", 12) + reagents.add_reagent(REAGENT_ID_SEAFOOD, 12) /obj/item/reagent_containers/food/snacks/grilled_carp_slice name = "korlaaskak slice" @@ -3336,7 +3336,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/keylimepie/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/keylimepieslice name = "slice of key lime pie" @@ -3359,12 +3359,12 @@ slices_num = 5 filling_color = "#F5B951" nutriment_amt = 10 - nutriment_desc = list("cheese" = 5, "egg" = 5) + nutriment_desc = list(REAGENT_ID_CHEESE = 5, REAGENT_ID_EGG = 5) center_of_mass = list("x"=16, "y"=10) /obj/item/reagent_containers/food/snacks/sliceable/quiche/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) /obj/item/reagent_containers/food/snacks/quicheslice name = "slice of quiche" @@ -3381,7 +3381,7 @@ /obj/item/reagent_containers/food/snacks/quicheslice/filled/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) /obj/item/reagent_containers/food/snacks/sliceable/brownies name = "brownies" @@ -3399,7 +3399,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/brownies/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/browniesslice name = "brownie" @@ -3416,7 +3416,7 @@ /obj/item/reagent_containers/food/snacks/browniesslice/filled/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) /obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies name = "cosmic brownies" @@ -3434,7 +3434,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) reagents.add_reagent(REAGENT_ID_AMBROSIAEXTRACT, 2) reagents.add_reagent(REAGENT_ID_BICARIDINE, 1) reagents.add_reagent(REAGENT_ID_KELOTANE, 1) @@ -3455,7 +3455,7 @@ /obj/item/reagent_containers/food/snacks/cosmicbrowniesslice/filled/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) /obj/item/reagent_containers/food/snacks/lasagna name = "lasagna" @@ -3467,7 +3467,7 @@ /obj/item/reagent_containers/food/snacks/lasagna/Initialize() . = ..() - reagents.add_reagent("protein", 2) //For meaty things. + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) //For meaty things. /obj/item/reagent_containers/food/snacks/gigapuddi name = "Astro-Pudding" @@ -3504,7 +3504,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/buchedenoel/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 9) - reagents.add_reagent("coco", 5) + reagents.add_reagent(REAGENT_ID_COCO, 5) /obj/item/reagent_containers/food/snacks/bucheslice name = "\improper Buche de Noel slice" @@ -3530,9 +3530,9 @@ /obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize() . = ..() - reagents.add_reagent("blackpepper", 1) + reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) - reagents.add_reagent("cookingoil", 1) + reagents.add_reagent(REAGENT_ID_COOKINGOIL, 1) /obj/item/reagent_containers/food/snacks/turkeyslice name = "turkey drumstick" @@ -3560,9 +3560,9 @@ /obj/item/reagent_containers/food/snacks/sliceable/turkey/Initialize() . = ..() - reagents.add_reagent("blackpepper", 1) + reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 1) - reagents.add_reagent("cookingoil", 1) + reagents.add_reagent(REAGENT_ID_COOKINGOIL, 1) /obj/item/reagent_containers/food/snacks/sliceable/turkey/on_slice_extra() for(var/i in extra_product) @@ -3656,14 +3656,14 @@ slice_path = /obj/item/reagent_containers/food/snacks/slice/margherita slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 15) + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 15) nutriment_amt = 35 bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita/Initialize() . = ..() - reagents.add_reagent("protein", 5) - reagents.add_reagent("tomatojuice", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 5) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6) /obj/item/reagent_containers/food/snacks/slice/margherita name = "Margherita slice" @@ -3690,9 +3690,9 @@ /obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple/Initialize() . = ..() - reagents.add_reagent("protein", 4) - reagents.add_reagent("cheese", 5) - reagents.add_reagent("tomatojuice", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) + reagents.add_reagent(REAGENT_ID_CHEESE, 5) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6) /obj/item/reagent_containers/food/snacks/pineappleslice name = "ham & pineapple pizza slice" @@ -3713,14 +3713,14 @@ slice_path = /obj/item/reagent_containers/food/snacks/slice/meatpizza slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 15, "meat" = 10) + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 15, "meat" = 10) nutriment_amt = 10 bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza/Initialize() . = ..() - reagents.add_reagent("protein", 34) - reagents.add_reagent("tomatojuice", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 34) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6) /obj/item/reagent_containers/food/snacks/slice/meatpizza name = "Meatpizza slice" @@ -3741,13 +3741,13 @@ slice_path = /obj/item/reagent_containers/food/snacks/slice/mushroompizza slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 5, "mushroom" = 10) + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 5, "mushroom" = 10) nutriment_amt = 35 bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/Initialize() . = ..() - reagents.add_reagent("protein", 5) + reagents.add_reagent(REAGENT_ID_PROTEIN, 5) /obj/item/reagent_containers/food/snacks/slice/mushroompizza name = "Mushroompizza slice" @@ -3768,14 +3768,14 @@ slice_path = /obj/item/reagent_containers/food/snacks/slice/vegetablepizza slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5) + nutriment_desc = list("pizza crust" = 10, "tomato" = 10, REAGENT_ID_CHEESE = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5) nutriment_amt = 25 bitesize = 2 /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/Initialize() . = ..() - reagents.add_reagent("protein", 5) - reagents.add_reagent("tomatojuice", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 5) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6) reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 12) /obj/item/reagent_containers/food/snacks/slice/vegetablepizza @@ -3822,8 +3822,8 @@ /obj/item/reagent_containers/food/snacks/sliceable/pizza/oldpizza/Initialize() . = ..() - reagents.add_reagent("protein", 5) - reagents.add_reagent("tomatojuice", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 5) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 6) reagents.add_reagent(REAGENT_ID_MOLD, 8) /obj/item/reagent_containers/food/snacks/slice/oldpizza @@ -4053,7 +4053,7 @@ /obj/item/reagent_containers/food/snacks/dough/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) // Dough + rolling pin = flat dough /obj/item/reagent_containers/food/snacks/dough/attackby(obj/item/W as obj, mob/user as mob) @@ -4076,7 +4076,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/flatdough/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) /obj/item/reagent_containers/food/snacks/doughslice name = "dough slice" @@ -4160,11 +4160,11 @@ bitesize = 3 center_of_mass = list("x"=21, "y"=12) nutriment_amt = 4 - nutriment_desc = list("cheese" = 2,"taco shell" = 2) + nutriment_desc = list(REAGENT_ID_CHEESE = 2,"taco shell" = 2) /obj/item/reagent_containers/food/snacks/taco/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/rawcutlet name = "raw cutlet" @@ -4176,7 +4176,7 @@ /obj/item/reagent_containers/food/snacks/rawcutlet/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) /obj/item/reagent_containers/food/snacks/cutlet name = "cutlet" @@ -4188,7 +4188,7 @@ /obj/item/reagent_containers/food/snacks/cutlet/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/rawmeatball name = "raw meatball" @@ -4200,7 +4200,7 @@ /obj/item/reagent_containers/food/snacks/rawmeatball/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/hotdog name = "hotdog" @@ -4211,7 +4211,7 @@ /obj/item/reagent_containers/food/snacks/hotdog/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) ///obj/item/reagent_containers/food/snacks/hotdog/old (Commented out on 4/23/2021 to make room for ancient hotdog) // name = "old hotdog" @@ -4294,7 +4294,7 @@ /obj/item/reagent_containers/food/snacks/bellefritter/Initialize() . = ..() - reagents.add_reagent("batter", 10) + reagents.add_reagent(REAGENT_ID_BATTER, 10) reagents.add_reagent(REAGENT_ID_SUGAR, 5) /obj/item/reagent_containers/food/snacks/roastedsunflower @@ -4348,7 +4348,7 @@ /obj/item/reagent_containers/food/snacks/liquidprotein/Initialize() . = ..() - reagents.add_reagent("protein", 30) + reagents.add_reagent(REAGENT_ID_PROTEIN, 30) reagents.add_reagent(REAGENT_ID_IRON, 3) /obj/item/reagent_containers/food/snacks/liquidvitamin @@ -4364,10 +4364,10 @@ /obj/item/reagent_containers/food/snacks/liquidvitamin/Initialize() . = ..() - reagents.add_reagent("flour", 20) + reagents.add_reagent(REAGENT_ID_FLOUR, 20) reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5) reagents.add_reagent(REAGENT_ID_PARACETAMOL, 5) - reagents.add_reagent("enzyme", 1) + reagents.add_reagent(REAGENT_ID_ENZYME, 1) reagents.add_reagent(REAGENT_ID_IRON, 3) /obj/item/reagent_containers/food/snacks/meatcube @@ -4380,7 +4380,7 @@ /obj/item/reagent_containers/food/snacks/meatcube/Initialize() . = ..() - reagents.add_reagent("protein", 15) + reagents.add_reagent(REAGENT_ID_PROTEIN, 15) /obj/item/reagent_containers/food/snacks/tastybread name = "bread tube" @@ -4423,8 +4423,8 @@ /obj/item/reagent_containers/food/snacks/unajerky/Initialize() . =..() - reagents.add_reagent("protein", 8) - reagents.add_reagent("capsaicin", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 8) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2) /obj/item/reagent_containers/food/snacks/sashimi name = "sashimi" @@ -4436,7 +4436,7 @@ /obj/item/reagent_containers/food/snacks/sashimi/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/benedict name = "eggs benedict" @@ -4444,12 +4444,12 @@ filling_color = "#FFDF78" icon_state = "benedict" nutriment_amt = 4 - nutriment_desc = list("bread" = 2, "bacon" = 2, "egg" = 2) + nutriment_desc = list("bread" = 2, "bacon" = 2, REAGENT_ID_EGG = 2) bitesize = 2 /obj/item/reagent_containers/food/snacks/benedict/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/beans name = "baked beans" @@ -4460,7 +4460,7 @@ /obj/item/reagent_containers/food/snacks/beans/Initialize() . = ..() - reagents.add_reagent("bean_protein", 6) + reagents.add_reagent(REAGENT_ID_BEANPROTEIN, 6) /obj/item/reagent_containers/food/snacks/cookie name = "chocolate chip cookie" @@ -4468,7 +4468,7 @@ filling_color = "#DBC94F" icon_state = "cookie" nutriment_amt = 5 - nutriment_desc = list("sweetness" = 2, "cookie" = 1, "chocolate" = 2) + nutriment_desc = list("sweetness" = 2, "cookie" = 1, REAGENT_ID_CHOCOLATE = 2) bitesize = 1 /obj/item/reagent_containers/food/snacks/sugarcookie @@ -4502,11 +4502,11 @@ /obj/item/reagent_containers/food/snacks/berrymuffin/berry/Initialize() . = ..() - reagents.add_reagent("berryjuice", 3) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 3) /obj/item/reagent_containers/food/snacks/berrymuffin/poison/Initialize() . = ..() - reagents.add_reagent("poisonberryjuice", 3) + reagents.add_reagent(REAGENT_ID_POISONBERRYJUICE, 3) /obj/item/reagent_containers/food/snacks/ghostmuffin name = "booberry muffin" @@ -4520,11 +4520,11 @@ /obj/item/reagent_containers/food/snacks/ghostmuffin/berry/Initialize() . = ..() - reagents.add_reagent("berryjuice", 3) + reagents.add_reagent(REAGENT_ID_BERRYJUICE, 3) /obj/item/reagent_containers/food/snacks/ghostmuffin/poison/Initialize() . = ..() - reagents.add_reagent("poisonberryjuice", 3) + reagents.add_reagent(REAGENT_ID_POISONBERRYJUICE, 3) /obj/item/reagent_containers/food/snacks/devilledegg name = "devilled eggs" @@ -4533,12 +4533,12 @@ filling_color = "#799ACE" center_of_mass = list("x"=17, "y"=16) nutriment_amt = 8 - nutriment_desc = list("egg" = 4, "chili" = 4) + nutriment_desc = list(REAGENT_ID_EGG = 4, "chili" = 4) bitesize = 2 /obj/item/reagent_containers/food/snacks/devilledegg/Initialize() . = ..() - reagents.add_reagent("capsaicin", 2) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2) /obj/item/reagent_containers/food/snacks/fruitsalad name = "fruit salad" @@ -4578,12 +4578,12 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" nutriment_amt = 6 - nutriment_desc = list("rice" = 2, "egg" = 4) + nutriment_desc = list(REAGENT_ID_RICE = 2, REAGENT_ID_EGG = 4) bitesize = 2 /obj/item/reagent_containers/food/snacks/eggbowl/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/tortilla name = "tortilla" @@ -4598,24 +4598,24 @@ desc = "That's some dangerously spicy nachos." icon_state = "cubannachos" nutriment_amt = 6 - nutriment_desc = list("salt" = 1, "cheese" = 2, "chili peppers" = 3) + nutriment_desc = list("salt" = 1, REAGENT_ID_CHEESE = 2, "chili peppers" = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/cubannachos/Initialize() . = ..() - reagents.add_reagent("capsaicin", 4) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 4) /obj/item/reagent_containers/food/snacks/curryrice name = "curry rice" desc = "That's some dangerously spicy rice." icon_state = "curryrice" nutriment_amt = 6 - nutriment_desc = list("salt" = 1, "rice" = 2, "chili peppers" = 3) + nutriment_desc = list("salt" = 1, REAGENT_ID_RICE = 2, "chili peppers" = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/curryrice/Initialize() . = ..() - reagents.add_reagent("capsaicin", 4) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 4) /obj/item/reagent_containers/food/snacks/piginblanket name = "pig in a blanket" @@ -4627,7 +4627,7 @@ /obj/item/reagent_containers/food/snacks/piginblanket/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/wormsickly name = "sickly worm" @@ -4641,7 +4641,7 @@ /obj/item/reagent_containers/food/snacks/wormsickly/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_FISHBAIT, 9) - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/worm name = "strange worm" @@ -4655,7 +4655,7 @@ /obj/item/reagent_containers/food/snacks/worm/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_FISHBAIT, 15) - reagents.add_reagent("protein", 5) + reagents.add_reagent(REAGENT_ID_PROTEIN, 5) /obj/item/reagent_containers/food/snacks/wormdeluxe name = "deluxe worm" @@ -4669,7 +4669,7 @@ /obj/item/reagent_containers/food/snacks/wormdeluxe/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_FISHBAIT, 30) - reagents.add_reagent("protein", 10) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) /obj/item/reagent_containers/food/snacks/siffruit name = "pulsing fruit" @@ -4715,12 +4715,12 @@ desc = "This bread's got cheese n' chutzpah!" icon_state = "bagelcheese" nutriment_amt = 8 - nutriment_desc = list("bread" = 4, "cheese" = 4) + nutriment_desc = list("bread" = 4, REAGENT_ID_CHEESE = 4) bitesize = 2 /obj/item/reagent_containers/food/snacks/bagelcheese/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/bagelraisin name = "cinnamon raisin bagel" @@ -4943,9 +4943,9 @@ /obj/item/reagent_containers/food/snacks/sausage/battered/Initialize() . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("batter", 1.7) - reagents.add_reagent("oil", 1.5) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) + reagents.add_reagent(REAGENT_ID_BATTER, 1.7) + reagents.add_reagent(REAGENT_ID_OIL, 1.5) /obj/item/reagent_containers/food/snacks/jalapeno_poppers name = "jalapeno popper" @@ -4960,8 +4960,8 @@ /obj/item/reagent_containers/food/snacks/jalapeno_poppers/Initialize() . = ..() - reagents.add_reagent("batter", 2) - reagents.add_reagent("oil", 2) + reagents.add_reagent(REAGENT_ID_BATTER, 2) + reagents.add_reagent(REAGENT_ID_OIL, 2) /obj/item/reagent_containers/food/snacks/mouseburger name = "mouse burger" @@ -4972,7 +4972,7 @@ /obj/item/reagent_containers/food/snacks/mouseburger/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/chickenkatsu name = "chicken katsu" @@ -4986,16 +4986,16 @@ /obj/item/reagent_containers/food/snacks/chickenkatsu/Initialize() . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("beerbatter", 2) - reagents.add_reagent("oil", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) + reagents.add_reagent(REAGENT_ID_BEERBATTER, 2) + reagents.add_reagent(REAGENT_ID_OIL, 1) /obj/item/reagent_containers/food/snacks/sliceable/pizza/crunch/Initialize() . = ..() - reagents.add_reagent("batter", 6.5) - coating = reagents.get_reagent("batter") - reagents.add_reagent("oil", 4) + reagents.add_reagent(REAGENT_ID_BATTER, 6.5) + coating = reagents.get_reagent(REAGENT_ID_BATTER) + reagents.add_reagent(REAGENT_ID_OIL, 4) /obj/item/reagent_containers/food/snacks/funnelcake name = "funnel cake" @@ -5008,7 +5008,7 @@ /obj/item/reagent_containers/food/snacks/funnelcake/Initialize() . = ..() - reagents.add_reagent("batter", 10) + reagents.add_reagent(REAGENT_ID_BATTER, 10) reagents.add_reagent(REAGENT_ID_SUGAR, 5) /obj/item/reagent_containers/food/snacks/spreads @@ -5030,7 +5030,7 @@ /obj/item/reagent_containers/food/snacks/spreads/Initialize() . = ..() - reagents.add_reagent("triglyceride", 20) + reagents.add_reagent(REAGENT_ID_TRIGLYCERIDE, 20) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE,1) /obj/item/reagent_containers/food/snacks/rawcutlet/attackby(obj/item/W as obj, mob/user as mob) @@ -5051,7 +5051,7 @@ /obj/item/reagent_containers/food/snacks/rawbacon/Initialize() . = ..() - reagents.add_reagent("protein", 0.33) + reagents.add_reagent(REAGENT_ID_PROTEIN, 0.33) /obj/item/reagent_containers/food/snacks/bacon name = "bacon" @@ -5076,8 +5076,8 @@ /obj/item/reagent_containers/food/snacks/bacon/Initialize() . = ..() - reagents.add_reagent("protein", 0.33) - reagents.add_reagent("triglyceride", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 0.33) + reagents.add_reagent(REAGENT_ID_TRIGLYCERIDE, 1) /obj/item/reagent_containers/food/snacks/bacon_stick name = "eggpop" @@ -5087,8 +5087,8 @@ /obj/item/reagent_containers/food/snacks/bacon_stick/Initialize() . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("egg", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) + reagents.add_reagent(REAGENT_ID_EGG, 1) /obj/item/reagent_containers/food/snacks/chilied_eggs name = "Redeemed eggs" @@ -5098,8 +5098,8 @@ /obj/item/reagent_containers/food/snacks/chilied_eggs/Initialize() . = ..() - reagents.add_reagent("egg", 6) - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_EGG, 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/bacon_and_eggs name = "bacon and eggs" @@ -5109,8 +5109,8 @@ /obj/item/reagent_containers/food/snacks/bacon_and_eggs/Initialize() . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("egg", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) + reagents.add_reagent(REAGENT_ID_EGG, 1) /obj/item/reagent_containers/food/snacks/sweet_and_sour name = "sweet and sour pork" @@ -5122,7 +5122,7 @@ /obj/item/reagent_containers/food/snacks/sweet_and_sour/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/corn_dog name = "corn dog" @@ -5134,7 +5134,7 @@ /obj/item/reagent_containers/food/snacks/corn_dog/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/truffle name = "chocolate truffle" @@ -5145,7 +5145,7 @@ /obj/item/reagent_containers/food/snacks/truffle/Initialize() . = ..() - reagents.add_reagent("coco", 6) + reagents.add_reagent(REAGENT_ID_COCO, 6) /obj/item/reagent_containers/food/snacks/truffle/random name = "mystery chocolate truffle" @@ -5153,7 +5153,7 @@ /obj/item/reagent_containers/food/snacks/truffle/random/Initialize() . = ..() - var/reagent_string = pick(list("cream","cherryjelly","mint","frostoil","capsaicin","cream","coffee","milkshake")) + var/reagent_string = pick(list(REAGENT_ID_CREAM,REAGENT_ID_CHERRYJELLY,REAGENT_ID_MINT,REAGENT_ID_FROSTOIL,REAGENT_ID_CAPSAICIN,REAGENT_ID_CREAM,REAGENT_ID_COFFEE,REAGENT_ID_MILKSHAKE)) reagents.add_reagent(reagent_string, 4) /obj/item/reagent_containers/food/snacks/bacon_flatbread @@ -5165,7 +5165,7 @@ /obj/item/reagent_containers/food/snacks/bacon_flatbread/Initialize() . = ..() - reagents.add_reagent("protein", 5) + reagents.add_reagent(REAGENT_ID_PROTEIN, 5) /obj/item/reagent_containers/food/snacks/meat_pocket name = "meat pocket" @@ -5176,7 +5176,7 @@ /obj/item/reagent_containers/food/snacks/meat_pocket/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/fish_taco name = "fish taco" @@ -5187,7 +5187,7 @@ /obj/item/reagent_containers/food/snacks/fish_taco/Initialize() . = ..() - reagents.add_reagent("seafood",3) + reagents.add_reagent(REAGENT_ID_SEAFOOD,3) /obj/item/reagent_containers/food/snacks/nt_muffin name = "breakfast muffin" @@ -5198,7 +5198,7 @@ /obj/item/reagent_containers/food/snacks/nt_muffin/Initialize() . = ..() - reagents.add_reagent("protein",5) + reagents.add_reagent(REAGENT_ID_PROTEIN,5) /obj/item/reagent_containers/food/snacks/pineapple_ring name = "pineapple rings" @@ -5209,7 +5209,7 @@ /obj/item/reagent_containers/food/snacks/pineapple_ring/Initialize() . = ..() - reagents.add_reagent("pineapplejuice",3) + reagents.add_reagent(REAGENT_ID_PINEAPPLEJUICE,3) /obj/item/reagent_containers/food/snacks/burger/bacon @@ -5224,7 +5224,7 @@ /obj/item/reagent_containers/food/snacks/burger/bacon/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/blt name = "BLT" @@ -5238,7 +5238,7 @@ /obj/item/reagent_containers/food/snacks/blt/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/porkbowl name = "pork bowl" @@ -5250,8 +5250,8 @@ /obj/item/reagent_containers/food/snacks/porkbowl/Initialize() . = ..() - reagents.add_reagent("rice", 6) - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_RICE, 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/mashedpotato name = "mashed potato" @@ -5276,7 +5276,7 @@ /obj/item/reagent_containers/food/snacks/loadedbakedpotato/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/bangersandmash name = "Bangers and Mash" @@ -5291,7 +5291,7 @@ /obj/item/reagent_containers/food/snacks/bangersandmash/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/cheesymash name = "Cheesy Mashed Potato" @@ -5306,7 +5306,7 @@ /obj/item/reagent_containers/food/snacks/cheesymash/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/croissant name = "croissant" @@ -5347,7 +5347,7 @@ var/shape = pick("lump", "star", "lizard", "corgi") desc = "A chicken nugget vaguely shaped like a [shape]." icon_state = "nugget_[shape]" - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/icecreamsandwich name = "ice cream sandwich" @@ -5368,7 +5368,7 @@ /obj/item/reagent_containers/food/snacks/honeybun/Initialize() . = ..() - reagents.add_reagent("honey", 3) + reagents.add_reagent(REAGENT_ID_HONEY, 3) // Moved /bun/attackby() from /code/modules/food/food/snacks.dm /obj/item/reagent_containers/food/snacks/bun/attackby(obj/item/W as obj, mob/user as mob) @@ -5627,7 +5627,7 @@ /obj/item/reagent_containers/food/snacks/fuegoburrito/Initialize() . = ..() - reagents.add_reagent("capsaicin", 4) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 4) /obj/item/reagent_containers/food/snacks/meatburrito name = "carne asada burrito" @@ -5639,19 +5639,19 @@ /obj/item/reagent_containers/food/snacks/meatburrito/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) /obj/item/reagent_containers/food/snacks/cheeseburrito name = "Cheese burrito" desc = "It's a burrito filled with beans and cheese." icon_state = "cheeseburrito" nutriment_amt = 6 - nutriment_desc = list("tortilla" = 3, "cheese" = 3) + nutriment_desc = list("tortilla" = 3, REAGENT_ID_CHEESE = 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/cheeseburrito/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/eggroll name = "egg roll" @@ -5660,12 +5660,12 @@ filling_color = "#799ACE" center_of_mass = list("x"=17, "y"=4) nutriment_amt = 4 - nutriment_desc = list("egg" = 4) + nutriment_desc = list(REAGENT_ID_EGG = 4) bitesize = 2 /obj/item/reagent_containers/food/snacks/eggroll/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/burrito name = "chilli burrito" @@ -5678,7 +5678,7 @@ /obj/item/reagent_containers/food/snacks/burrito/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/burrito_spicy name = "spicy burrito" @@ -5691,7 +5691,7 @@ /obj/item/reagent_containers/food/snacks/burrito_spicy/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) /obj/item/reagent_containers/food/snacks/burrito_cheese name = "carne queso burrito" @@ -5704,7 +5704,7 @@ /obj/item/reagent_containers/food/snacks/burrito_cheese/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) /obj/item/reagent_containers/food/snacks/burrito_cheese_spicy name = "spicy cheese burrito" @@ -5717,7 +5717,7 @@ /obj/item/reagent_containers/food/snacks/burrito_cheese_spicy/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) /obj/item/reagent_containers/food/snacks/burrito_vegan name = "vegan burrito" @@ -5730,7 +5730,7 @@ /obj/item/reagent_containers/food/snacks/burrito_vegan/Initialize() . = ..() - reagents.add_reagent("tofu", 6) + reagents.add_reagent(REAGENT_ID_TOFU, 6) /obj/item/reagent_containers/food/snacks/breakfast_wrap name = "breakfast wrap" @@ -5761,8 +5761,8 @@ /obj/item/reagent_containers/food/snacks/burrito_hell/Initialize() . = ..() - reagents.add_reagent("protein", 9) - reagents.add_reagent("condensedcapsaicin", 10) //what could possibly go wrong + reagents.add_reagent(REAGENT_ID_PROTEIN, 9) + reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 10) //what could possibly go wrong //End Burritos/////////////////////////////////// @@ -5774,8 +5774,8 @@ /obj/item/reagent_containers/food/snacks/hatchling_suprise/Initialize() . = ..() - reagents.add_reagent("egg", 2) - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_EGG, 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/red_sun_special name = "red sun special" @@ -5785,7 +5785,7 @@ /obj/item/reagent_containers/food/snacks/red_sun_special/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/riztizkzi_sea name = "moghesian sea delight" @@ -5795,7 +5795,7 @@ /obj/item/reagent_containers/food/snacks/riztizkzi_sea/Initialize() . = ..() - reagents.add_reagent("egg", 4) + reagents.add_reagent(REAGENT_ID_EGG, 4) /obj/item/reagent_containers/food/snacks/father_breakfast name = "breakfast of champions" @@ -5805,8 +5805,8 @@ /obj/item/reagent_containers/food/snacks/father_breakfast/Initialize() . = ..() - reagents.add_reagent("egg", 4) - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_EGG, 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) /obj/item/reagent_containers/food/snacks/stuffed_meatball name = "stuffed meatball" //YES @@ -5816,7 +5816,7 @@ /obj/item/reagent_containers/food/snacks/stuffed_meatball/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/egg_pancake name = "meat pancake" @@ -5826,8 +5826,8 @@ /obj/item/reagent_containers/food/snacks/egg_pancake/Initialize() . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("egg", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) + reagents.add_reagent(REAGENT_ID_EGG, 2) /obj/item/reagent_containers/food/snacks/redcurry name = "red curry" @@ -5843,7 +5843,7 @@ /obj/item/reagent_containers/food/snacks/redcurry/Initialize() . = ..() - reagents.add_reagent("protein", 7) + reagents.add_reagent(REAGENT_ID_PROTEIN, 7) /obj/item/reagent_containers/food/snacks/greencurry name = "green curry" @@ -5859,8 +5859,8 @@ /obj/item/reagent_containers/food/snacks/greencurry/Initialize() . = ..() - reagents.add_reagent("protein", 1) - reagents.add_reagent("capsaicin", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2) /obj/item/reagent_containers/food/snacks/yellowcurry name = "yellow curry" @@ -5876,7 +5876,7 @@ /obj/item/reagent_containers/food/snacks/yellowcurry/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/bearburger name = "bearburger" @@ -5888,7 +5888,7 @@ /obj/item/reagent_containers/food/snacks/bearburger/Initialize() . = ..() - reagents.add_reagent("protein", 4) //So spawned burgers will not be empty I guess? + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) //So spawned burgers will not be empty I guess? /obj/item/reagent_containers/food/snacks/bibimbap name = "bibimbap bowl" @@ -5897,13 +5897,13 @@ trash = /obj/item/trash/snack_bowl filling_color = "#4f2100" nutriment_amt = 10 - nutriment_desc = list("egg" = 5, "vegetables" = 5) + nutriment_desc = list(REAGENT_ID_EGG = 5, "vegetables" = 5) center_of_mass = list("x"=15, "y"=9) bitesize = 4 /obj/item/reagent_containers/food/snacks/bibimbap/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) /obj/item/reagent_containers/food/snacks/lomein name = "lo mein" @@ -5919,7 +5919,7 @@ /obj/item/reagent_containers/food/snacks/lomein/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/friedrice name = "fried rice" @@ -5929,7 +5929,7 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" nutriment_amt = 7 - nutriment_desc = list("rice" = 7) + nutriment_desc = list(REAGENT_ID_RICE = 7) center_of_mass = list("x"=17, "y"=11) bitesize = 2 @@ -5945,7 +5945,7 @@ /obj/item/reagent_containers/food/snacks/chickenfillet/Initialize() . = ..() - reagents.add_reagent("protein", 8) + reagents.add_reagent(REAGENT_ID_PROTEIN, 8) /obj/item/reagent_containers/food/snacks/friedmushroom name = "fried mushroom" @@ -5959,7 +5959,7 @@ /obj/item/reagent_containers/food/snacks/friedmushroom/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/pisanggoreng name = "pisang goreng" @@ -5975,7 +5975,7 @@ /obj/item/reagent_containers/food/snacks/pisanggoreng/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) /obj/item/reagent_containers/food/snacks/meatbun name = "meat and leaf bun" @@ -5989,7 +5989,7 @@ /obj/item/reagent_containers/food/snacks/meatbun/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/spicedmeatbun name = "char sui meat bun" @@ -6003,7 +6003,7 @@ /obj/item/reagent_containers/food/snacks/spicedmeatbun/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/custardbun name = "custard bun" @@ -6029,7 +6029,7 @@ /obj/item/reagent_containers/food/snacks/chickenmomo/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) /obj/item/reagent_containers/food/snacks/veggiemomo name = "veggie momo" @@ -6045,7 +6045,7 @@ /obj/item/reagent_containers/food/snacks/veggiemomo/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/risotto name = "risotto" @@ -6055,13 +6055,13 @@ trash = /obj/item/trash/snack_bowl filling_color = "#edd7d7" nutriment_amt = 9 - nutriment_desc = list("savory rice" = 6, "cream" = 3) + nutriment_desc = list("savory rice" = 6, REAGENT_ID_CREAM = 3) center_of_mass = list("x"=15, "y"=9) bitesize = 2 /obj/item/reagent_containers/food/snacks/risotto/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) /obj/item/reagent_containers/food/snacks/risottoballs name = "risotto balls" @@ -6071,7 +6071,7 @@ trash = /obj/item/trash/snack_bowl filling_color = "#edd7d7" nutriment_amt = 1 - nutriment_desc = list("batter" = 1) + nutriment_desc = list(REAGENT_ID_BATTER = 1) center_of_mass = list("x"=15, "y"=9) bitesize = 3 @@ -6082,14 +6082,14 @@ trash = /obj/item/trash/plate filling_color = "#FFDF78" nutriment_amt = 1 - nutriment_desc = list("egg" = 1) + nutriment_desc = list(REAGENT_ID_EGG = 1) center_of_mass = list("x"=16, "y"=14) bitesize = 2 /obj/item/reagent_containers/food/snacks/poachedegg/Initialize() . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent("blackpepper", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) + reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1) /obj/item/reagent_containers/food/snacks/ribplate name = "plate of ribs" @@ -6098,16 +6098,16 @@ trash = /obj/item/trash/plate filling_color = "#7A3D11" nutriment_amt = 6 - nutriment_desc = list("barbecue" = 6) + nutriment_desc = list(REAGENT_ID_BARBECUE = 6) center_of_mass = list("x"=16, "y"=13) bitesize = 4 /obj/item/reagent_containers/food/snacks/ribplate/Initialize() . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("triglyceride", 2) - reagents.add_reagent("blackpepper", 1) - reagents.add_reagent("honey", 5) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) + reagents.add_reagent(REAGENT_ID_TRIGLYCERIDE, 2) + reagents.add_reagent(REAGENT_ID_BLACKPEPPER, 1) + reagents.add_reagent(REAGENT_ID_HONEY, 5) /obj/item/reagent_containers/food/snacks/omurice name = "omelette rice" @@ -6116,7 +6116,7 @@ icon_state = "omurice" trash = /obj/item/trash/plate nutriment_amt = 8 - nutriment_desc = list("rice" = 4, "egg" = 4) + nutriment_desc = list(REAGENT_ID_RICE = 4, REAGENT_ID_EGG = 4) bitesize = 1 /obj/item/reagent_containers/food/snacks/omurice/heart @@ -6142,7 +6142,7 @@ //////////////////////////////////////////////////////////////////////////// /obj/item/reagent_containers/food/snacks/mint - name = "mint" + name = REAGENT_ID_MINT desc = "it is only wafer thin." icon_state = "mint" filling_color = "#F2F2F2" @@ -6151,7 +6151,7 @@ /obj/item/reagent_containers/food/snacks/mint/Initialize() . = ..() - reagents.add_reagent("mint", 1) + reagents.add_reagent(REAGENT_ID_MINT, 1) /obj/item/reagent_containers/food/snacks/mint/admints desc = "Spearmint, peppermint's non-festive cousin." @@ -6216,12 +6216,12 @@ icon_state = "proteinbar" trash = /obj/item/trash/candy/proteinbar nutriment_amt = 9 - nutriment_desc = list("candy" = 1, "protein" = 8) + nutriment_desc = list("candy" = 1, REAGENT_ID_PROTEIN = 8) bitesize = 6 /obj/item/reagent_containers/food/snacks/candy/proteinbar/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) reagents.add_reagent(REAGENT_ID_SUGAR, 4) /obj/item/reagent_containers/food/snacks/candy/gummy @@ -6296,7 +6296,7 @@ icon_state = "cb02" trash = /obj/item/trash/candy/cb02 nutriment_amt = 4 - nutriment_desc = list("chocolate" = 2, "caramel" = 1, "puffed rice" = 1) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "caramel" = 1, "puffed rice" = 1) w_class = 1 bitesize = 2 @@ -6313,7 +6313,7 @@ icon_state = "cb03" trash = /obj/item/trash/candy/cb03 nutriment_amt = 4 - nutriment_desc = list("chocolate" = 4) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 4) w_class = 1 bitesize = 2 @@ -6330,7 +6330,7 @@ icon_state = "cb04" trash = /obj/item/trash/candy/cb04 nutriment_amt = 4 - nutriment_desc = list("chocolate" = 2, "salt = 1", "licorice" = 1) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "salt = 1", "licorice" = 1) w_class = 1 bitesize = 2 @@ -6364,14 +6364,14 @@ icon_state = "cb06" trash = /obj/item/trash/candy/cb06 nutriment_amt = 4 - nutriment_desc = list("chocolate" = 2, "coffee" = 1, "vanilla wafer" = 1) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, REAGENT_ID_COFFEE = 1, "vanilla wafer" = 1) w_class = 1 bitesize = 3 /obj/item/reagent_containers/food/snacks/cb06/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 1) - reagents.add_reagent("coffee", 1) + reagents.add_reagent(REAGENT_ID_COFFEE, 1) /obj/item/reagent_containers/food/snacks/cb07 name = "\improper TaroMilk Bar" @@ -6382,7 +6382,7 @@ icon_state = "cb07" trash = /obj/item/trash/candy/cb07 nutriment_amt = 4 - nutriment_desc = list("chocolate" = 2, "taro" = 2) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "taro" = 2) w_class = 1 bitesize = 3 @@ -6399,7 +6399,7 @@ icon_state = "cb08" trash = /obj/item/trash/candy/cb08 nutriment_amt = 3 - nutriment_desc = list("chocolate" = 2, "malt puffs" = 1) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "malt puffs" = 1) w_class = 1 bitesize = 3 @@ -6423,8 +6423,8 @@ /obj/item/reagent_containers/food/snacks/cb09/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 1) - reagents.add_reagent("milk", 1) - reagents.add_reagent("peanutoil", 1) + reagents.add_reagent(REAGENT_ID_MILK, 1) + reagents.add_reagent(REAGENT_ID_PEANUTOIL, 1) /obj/item/reagent_containers/food/snacks/cb10 name = "\improper Shantak Bar" @@ -6435,15 +6435,15 @@ icon_state = "cb10" trash = /obj/item/trash/candy/cb10 nutriment_amt = 5 - nutriment_desc = list("chocolate" = 2, "caramel" = 1, "peanuts" = 1, "nougat" = 1) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "caramel" = 1, "peanuts" = 1, "nougat" = 1) w_class = 1 bitesize = 3 /obj/item/reagent_containers/food/snacks/cb10/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_SUGAR, 1) - reagents.add_reagent("protein", 1) - reagents.add_reagent("peanutoil", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) + reagents.add_reagent(REAGENT_ID_PEANUTOIL, 1) ////////////////////Misc Vend Items//////////////////////////////////////////////////////////////// @@ -6478,7 +6478,7 @@ icon_state = "chips_snv" trash = /obj/item/trash/chips/snv nutriment_amt = 3 - nutriment_desc = list("salt" = 1, "vinegar" = 2) + nutriment_desc = list("salt" = 1, REAGENT_ID_VINEGAR = 2) /obj/item/reagent_containers/food/snacks/tastybread name = "bread tube" @@ -6519,7 +6519,7 @@ /obj/item/reagent_containers/food/snacks/sosjerky/Initialize() . =..() - reagents.add_reagent("protein", 8) + reagents.add_reagent(REAGENT_ID_PROTEIN, 8) /obj/item/reagent_containers/food/snacks/unajerky name = "Moghes Imported Sissalik Jerky" @@ -6536,8 +6536,8 @@ /obj/item/reagent_containers/food/snacks/unajerky/Initialize() . =..() - reagents.add_reagent("protein", 8) - reagents.add_reagent("capsaicin", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 8) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 2) /obj/item/reagent_containers/food/snacks/tuna name = "\improper Tuna Snax" @@ -6554,7 +6554,7 @@ /obj/item/reagent_containers/food/snacks/tuna/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/pistachios name = "pistachios" @@ -6594,7 +6594,7 @@ /obj/item/reagent_containers/food/snacks/squid/true/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/croutons name = "\improper Suhariki" @@ -6622,7 +6622,7 @@ /obj/item/reagent_containers/food/snacks/salo/true/Initialize() . = ..() - reagents.add_reagent("protein", 8) + reagents.add_reagent(REAGENT_ID_PROTEIN, 8) /obj/item/reagent_containers/food/snacks/driedfish name = "\improper Vobla" @@ -6638,7 +6638,7 @@ /obj/item/reagent_containers/food/snacks/driedfish/Initialize() .=..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/no_raisin name = "4no Raisins" @@ -6676,7 +6676,7 @@ filling_color = "#FFA305" center_of_mass = list("x"=15, "y"=9) nutriment_amt = 4 - nutriment_desc = list("cheese" = 5, "chips" = 2) + nutriment_desc = list(REAGENT_ID_CHEESE = 5, "chips" = 2) bitesize = 2 /obj/item/reagent_containers/food/snacks/syndicake @@ -6694,7 +6694,7 @@ /obj/item/reagent_containers/food/snacks/syndicake/Initialize() . = ..() - reagents.add_reagent("doctorsdelight", 5) + reagents.add_reagent(REAGENT_ID_DOCTORSDELIGHT, 5) ////////////////////sol_vend (Mars Mart)//////////////////////////////////////////////////// @@ -6730,7 +6730,7 @@ trash = /obj/item/trash/jupiter filling_color = "#dc1919" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("sweetness" = 4, "vanilla" = 1) + nutriment_desc = list("sweetness" = 4, REAGENT_ID_VANILLA = 1) nutriment_amt = 5 bitesize = 2 @@ -6754,7 +6754,7 @@ trash = /obj/item/trash/mars filling_color = "#d2c63f" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("eggs" = 4, "potato" = 4, "mustard" = 2) + nutriment_desc = list("eggs" = 4, "potato" = 4, REAGENT_ID_MUSTARD = 2) nutriment_amt = 8 bitesize = 2 @@ -6772,7 +6772,7 @@ /obj/item/reagent_containers/food/snacks/venus/Initialize() .=..() - reagents.add_reagent("capsaicin", 5) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 5) /obj/item/reagent_containers/food/snacks/sun_snax name = "\improper Sun Snax!" @@ -6788,7 +6788,7 @@ /obj/item/reagent_containers/food/snacks/sun_snax/Initialize() .=..() - reagents.add_reagent("capsaicin", 6) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 6) /obj/item/reagent_containers/food/snacks/oort name = "\improper Oort Cloud Rocks" @@ -6804,7 +6804,7 @@ /obj/item/reagent_containers/food/snacks/oort/Initialize() .=..() - reagents.add_reagent("frostoil",5) + reagents.add_reagent(REAGENT_ID_FROSTOIL,5) /obj/item/reagent_containers/food/snacks/pretzels name = "\improper Value Pretzel Snack" @@ -6838,7 +6838,7 @@ icon = 'icons/obj/food_snacks.dmi' icon_state = "ricecake" desc = "Ancient earth snack food made from balled up rice." - nutriment_desc = list("rice" = 4, "sweetness" = 1) + nutriment_desc = list(REAGENT_ID_RICE = 4, "sweetness" = 1) nutriment_amt = 5 bitesize = 2 @@ -6872,7 +6872,7 @@ /obj/item/reagent_containers/food/snacks/weebonuts/Initialize() .=..() - reagents.add_reagent("capsaicin",1) + reagents.add_reagent(REAGENT_ID_CAPSAICIN,1) /obj/item/reagent_containers/food/snacks/wasabi_peas name = "\improper Hadokikku Peas" @@ -6886,7 +6886,7 @@ /obj/item/reagent_containers/food/snacks/wasabi_peas/Initialize() .=..() - reagents.add_reagent("capsaicin",1) + reagents.add_reagent(REAGENT_ID_CAPSAICIN,1) /obj/item/reagent_containers/food/snacks/chocobanana name = "\improper Choco Banana" @@ -6894,13 +6894,13 @@ icon_state = "chocobanana" trash = /obj/item/trash/stick desc = "A chocolate and sprinkles coated banana. On a stick." - nutriment_desc = list("chocolate banana" = 4, "sprinkles" = 1) + nutriment_desc = list("chocolate banana" = 4, REAGENT_ID_SPRINKLES = 1) nutriment_amt = 5 bitesize = 2 /obj/item/reagent_containers/food/snacks/chocobanana/Initialize() .=..() - reagents.add_reagent("sprinkles", 10) + reagents.add_reagent(REAGENT_ID_SPRINKLES, 10) /obj/item/reagent_containers/food/snacks/goma_dango name = "\improper Goma dango" @@ -6908,7 +6908,7 @@ icon_state = "goma_dango" trash = /obj/item/trash/stick desc = "Sticky rice balls served on a skewer with a crispy rice flour outer layer and a thick red bean paste inner layer." - nutriment_desc = list("rice" = 4, "earthy flavor" = 1) + nutriment_desc = list(REAGENT_ID_RICE = 4, "earthy flavor" = 1) nutriment_amt = 5 bitesize = 2 @@ -6919,7 +6919,7 @@ trash = /obj/item/trash/stick desc = "Three rice balls, each with a unique flavoring, served on a skewer. A traditional Japanese treat." description_fluff = "Hanami dango is a traditional Japanese treat that is normally served during Hanami, a tradition dated back as early as the 8th century. Hanami, or cherry blossom viewing, is a spring time celebration that celebrates the cherry blossoms turning of color. It is a time of renewal, of life, and of beauty." - nutriment_desc = list("rice" = 4, "earthy flavor" = 1) + nutriment_desc = list(REAGENT_ID_RICE = 4, "earthy flavor" = 1) nutriment_amt = 5 bitesize = 2 @@ -6996,7 +6996,7 @@ /obj/item/reagent_containers/food/snacks/canned/beef/Initialize() .=..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2) /obj/item/reagent_containers/food/snacks/canned/beans @@ -7007,13 +7007,13 @@ canned_open_state = "beans-open" filling_color = "#ff6633" center_of_mass = list("x"=15, "y"=9) - nutriment_desc = list("beans" = 1, "tomato sauce" = 1) + nutriment_desc = list(REAGENT_BEANPROTEIN = 1, "tomato sauce" = 1) bitesize = 2 /obj/item/reagent_containers/food/snacks/canned/beans/Initialize() .=..() - reagents.add_reagent("bean_protein", 5) - reagents.add_reagent("tomatojuice", 5) + reagents.add_reagent(REAGENT_ID_BEANPROTEIN, 5) + reagents.add_reagent(REAGENT_ID_TOMATOJUICE, 5) /obj/item/reagent_containers/food/snacks/canned/tomato name = "tomato soup" @@ -7061,7 +7061,7 @@ /obj/item/reagent_containers/food/snacks/canned/caviar/Initialize() . = ..() - reagents.add_reagent("seafood", 5) + reagents.add_reagent(REAGENT_ID_SEAFOOD, 5) /obj/item/reagent_containers/food/snacks/canned/caviar/true name = "\improper Classic Terran Caviar" @@ -7076,7 +7076,7 @@ /obj/item/reagent_containers/food/snacks/canned/caviar/true/Initialize() . = ..() - reagents.add_reagent("seafood", 4) + reagents.add_reagent(REAGENT_ID_SEAFOOD, 4) reagents.add_reagent(REAGENT_ID_CARPOTOXIN, 1) /obj/item/reagent_containers/food/snacks/canned/maps @@ -7091,7 +7091,7 @@ /obj/item/reagent_containers/food/snacks/canned/maps/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_SODIUMCHLORIDE, 2) /obj/item/reagent_containers/food/snacks/canned/appleberry @@ -7107,7 +7107,7 @@ /obj/item/reagent_containers/food/snacks/canned/appleberry/Initialize() . = ..() - reagents.add_reagent("milk", 8) + reagents.add_reagent(REAGENT_ID_MILK, 8) reagents.add_reagent(REAGENT_ID_SUGAR, 5) /obj/item/reagent_containers/food/snacks/canned/ntbeans @@ -7122,8 +7122,8 @@ /obj/item/reagent_containers/food/snacks/canned/ntbeans/Initialize() . = ..() - reagents.add_reagent("bean_protein", 6) - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_BEANPROTEIN, 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/canned/brainzsnax name = "\improper BrainzSnax" @@ -7175,7 +7175,7 @@ filling_color = "#ffffff" center_of_mass = list("x"=15, "y"=9) nutriment_amt = 6 - nutriment_desc = list("sweetness" = 4, "vanilla" = 1) + nutriment_desc = list("sweetness" = 4, REAGENT_ID_VANILLA = 1) bitesize = 2 /obj/item/reagent_containers/food/snacks/packaged/darklunacake @@ -7187,7 +7187,7 @@ filling_color = "#ffffff" center_of_mass = list("x"=15, "y"=9) nutriment_amt = 6 - nutriment_desc = list("sweetness" = 4, "chocolate" = 1) + nutriment_desc = list("sweetness" = 4, REAGENT_ID_CHOCOLATE = 1) bitesize = 2 /obj/item/reagent_containers/food/snacks/packaged/mochicake @@ -7199,7 +7199,7 @@ filling_color = "#ffffff" center_of_mass = list("x"=15, "y"=9) nutriment_amt = 6 - nutriment_desc = list("sweetness" = 4, "rice" = 1) + nutriment_desc = list("sweetness" = 4, REAGENT_ID_RICE = 1) bitesize = 2 //////////////Advanced Package Foods////////////// @@ -7249,7 +7249,7 @@ /obj/item/reagent_containers/food/snacks/packaged/meatration/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/packaged/vegration name = "veggie ration" diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm index b236c3fd349..485b4ab093b 100644 --- a/code/modules/food/food/snacks/meat.dm +++ b/code/modules/food/food/snacks/meat.dm @@ -8,8 +8,8 @@ /obj/item/reagent_containers/food/snacks/meat/Initialize() . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("triglyceride", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) + reagents.add_reagent(REAGENT_ID_TRIGLYCERIDE, 2) src.bitesize = 1.5 /obj/item/reagent_containers/food/snacks/meat/cook() @@ -55,7 +55,7 @@ /obj/item/reagent_containers/food/snacks/meat/chicken/Initialize() . = ..() - reagents.remove_reagent("triglyceride", INFINITY) + reagents.remove_reagent(REAGENT_ID_TRIGLYCERIDE, INFINITY) //Chicken is low fat. Less total calories than other meats /obj/item/reagent_containers/food/snacks/crabmeat @@ -66,7 +66,7 @@ /obj/item/reagent_containers/food/snacks/crabmeat/Initialize() . = ..() - reagents.add_reagent("seafood", 2) + reagents.add_reagent(REAGENT_ID_SEAFOOD, 2) /obj/item/reagent_containers/food/snacks/hugemushroomslice name = "fungus slice" @@ -102,7 +102,7 @@ /obj/item/reagent_containers/food/snacks/bearmeat/Initialize() . = ..() - reagents.add_reagent("protein", 12) + reagents.add_reagent(REAGENT_ID_PROTEIN, 12) reagents.add_reagent(REAGENT_ID_HYPERZINE, 5) /obj/item/reagent_containers/food/snacks/xenomeat @@ -115,7 +115,7 @@ /obj/item/reagent_containers/food/snacks/xenomeat/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_PACID,6) /obj/item/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat. @@ -139,7 +139,7 @@ /obj/item/reagent_containers/food/snacks/rawturkey/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) /obj/item/reagent_containers/food/snacks/meat/fox name = "foxmeat" @@ -154,7 +154,7 @@ /obj/item/reagent_containers/food/snacks/meat/grubmeat/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6) bitesize = 6 @@ -168,7 +168,7 @@ /obj/item/reagent_containers/food/snacks/meat/worm/Initialize() . = ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) reagents.add_reagent(REAGENT_ID_PHORON, 3) reagents.add_reagent(REAGENT_ID_MYELAMINE, 3) src.bitesize = 3 diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 204d1501244..17cc46f6a9f 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -6,12 +6,12 @@ icon_state = "sushi" slice_path = /obj/item/reagent_containers/food/snacks/slice/sushi/filled slices_num = 5 - nutriment_desc = list("rice" = 5, "fish" = 5) + nutriment_desc = list(REAGENT_ID_RICE = 5, "fish" = 5) nutriment_amt = 15 /obj/item/reagent_containers/food/snacks/sliceable/sushi/Initialize() . = ..() - reagents.add_reagent("protein", 10) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) bitesize = 5 /obj/item/reagent_containers/food/snacks/slice/sushi/filled @@ -37,7 +37,7 @@ /obj/item/reagent_containers/food/snacks/goulash/Initialize() . = ..() - reagents.add_reagent("protein", 3) //For meaty things. + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) //For meaty things. reagents.add_reagent(REAGENT_ID_WATER, 5) @@ -51,7 +51,7 @@ /obj/item/reagent_containers/food/snacks/donerkebab/Initialize() . = ..() - reagents.add_reagent("protein", 2) //For meaty things. + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) //For meaty things. /obj/item/reagent_containers/food/snacks/roastbeef @@ -65,7 +65,7 @@ /obj/item/reagent_containers/food/snacks/roastbeef/Initialize() . = ..() - reagents.add_reagent("protein", 4) //For meaty things. + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) //For meaty things. bitesize = 2 @@ -75,7 +75,7 @@ icon = 'icons/obj/food_vr.dmi' icon_state = "reishiscup" nutriment_amt = 3 - nutriment_desc = list("chocolate" = 4, "colors" = 2) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 4, "colors" = 2) /obj/item/reagent_containers/food/snacks/reishicup/Initialize() . = ..() @@ -117,7 +117,7 @@ /obj/item/reagent_containers/food/snacks/chickenwing/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) bitesize = 3 @@ -128,7 +128,7 @@ icon_state = "hotandsoursoup" trash = /obj/item/trash/asian_bowl nutriment_amt = 6 - nutriment_desc = list("spicyness" = 4, "sourness" = 4, "tofu" = 1) + nutriment_desc = list("spicyness" = 4, "sourness" = 4, REAGENT_ID_TOFU = 1) eating_sound = 'sound/items/drink.ogg' /obj/item/reagent_containers/food/snacks/hotandsoursoup/Initialize() @@ -161,7 +161,7 @@ /obj/item/reagent_containers/food/snacks/generalschicken/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) bitesize = 2 /obj/item/reagent_containers/food/snacks/bugball @@ -177,7 +177,7 @@ /obj/item/reagent_containers/food/snacks/bugball/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) reagents.add_reagent(REAGENT_ID_CARBON, 5) bitesize = 7 @@ -192,7 +192,7 @@ /obj/item/reagent_containers/food/snacks/pillbug/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6) bitesize = 6 @@ -206,7 +206,7 @@ /obj/item/reagent_containers/food/snacks/pillbug/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) reagents.add_reagent(REAGENT_ID_CARBON, 5) bitesize = 3 @@ -234,7 +234,7 @@ /obj/item/reagent_containers/food/snacks/makaroni/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) reagents.add_reagent(REAGENT_ID_SHOCKCHEM, 6) bitesize = 7 @@ -261,7 +261,7 @@ /obj/item/reagent_containers/food/snacks/lobstercooked/Initialize() . = ..() bitesize = 5 - reagents.add_reagent("protein", 20) + reagents.add_reagent(REAGENT_ID_PROTEIN, 20) reagents.add_reagent(REAGENT_ID_TRICORDRAZINE, 5) reagents.add_reagent(REAGENT_ID_IRON, 5) @@ -287,7 +287,7 @@ /obj/item/reagent_containers/food/snacks/cuttlefishcooked/Initialize() . = ..() bitesize = 5 - reagents.add_reagent("protein", 10) + reagents.add_reagent(REAGENT_ID_PROTEIN, 10) /obj/item/reagent_containers/food/snacks/sliceable/monkfish name = "extra large monkfish" @@ -314,7 +314,7 @@ /obj/item/reagent_containers/food/snacks/monkfishfillet/Initialize() . = ..() bitesize = 3 - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) /obj/item/reagent_containers/food/snacks/monkfishcooked name = "seasoned monkfish" @@ -322,13 +322,13 @@ icon = 'icons/obj/food_vr.dmi' icon_state = "monkfish_cooked" nutriment_amt = 10 - nutriment_desc = list("fish" = 3, "oil" = 1, "sweet chili" = 3, "spring onion" = 2) + nutriment_desc = list("fish" = 3, REAGENT_ID_OIL = 1, "sweet chili" = 3, "spring onion" = 2) trash = /obj/item/trash/fancyplate /obj/item/reagent_containers/food/snacks/monkfishcooked/Initialize() . = ..() bitesize = 4 - reagents.add_reagent("protein", 5) + reagents.add_reagent(REAGENT_ID_PROTEIN, 5) /obj/item/reagent_containers/food/snacks/sliceable/monkfishremains name = "monkfish remains" @@ -358,7 +358,7 @@ /obj/item/reagent_containers/food/snacks/sliceable/sharkchunk/Initialize() . = ..() bitesize = 3 - reagents.add_reagent("protein", 20) + reagents.add_reagent(REAGENT_ID_PROTEIN, 20) /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat name = "slice of sharkmeat" @@ -371,7 +371,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat/fish/sharkmeat/Initialize() . = ..() bitesize = 3 - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/sharkmeatcooked name = "shark steak" @@ -386,7 +386,7 @@ /obj/item/reagent_containers/food/snacks/sharkmeatcooked/Initialize() . = ..() bitesize = 3 - reagents.add_reagent("protein", 8) + reagents.add_reagent(REAGENT_ID_PROTEIN, 8) /obj/item/reagent_containers/food/snacks/sharkmeatdip name = "hot shark shank" @@ -400,8 +400,8 @@ /obj/item/reagent_containers/food/snacks/sharkmeatdip/Initialize() . = ..() bitesize = 3 - reagents.add_reagent("capsaicin", 4) - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_CAPSAICIN, 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/sharkmeatcubes name = "shark cubes" @@ -415,7 +415,7 @@ /obj/item/reagent_containers/food/snacks/sharkmeatcubes/Initialize() . = ..() bitesize = 10 - reagents.add_reagent("potatojuice", 30) // for people who want to get fat, FAST. + reagents.add_reagent(REAGENT_ID_POTATOJUICE, 30) // for people who want to get fat, FAST. /obj/item/reagent_containers/food/snacks/monkeycube/sobakacube name = "sobaka cube" @@ -492,7 +492,7 @@ /obj/item/reagent_containers/food/snacks/proteinslab/Initialize() . = ..() - reagents.add_reagent("protein", 30) + reagents.add_reagent(REAGENT_ID_PROTEIN, 30) /obj/item/reagent_containers/food/snacks/cube/nutriment name = "Nutriment cube" @@ -546,7 +546,7 @@ icon_state = "honeybun" bitesize = 2 nutriment_amt = 4 - nutriment_desc = list("honey" = 2, "pastry" = 1) + nutriment_desc = list(REAGENT_ID_HONEY = 2, "pastry" = 1) /obj/item/reagent_containers/food/snacks/bun/Initialize() . = ..() @@ -569,12 +569,12 @@ desc = "The delicious combination of nachos and melting cheese." icon_state = "cheesenachos" nutriment_amt = 5 - nutriment_desc = list("salt" = 2, "cheese" = 3) + nutriment_desc = list("salt" = 2, REAGENT_ID_CHEESE = 3) /obj/item/reagent_containers/food/snacks/cheesenachos/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 5) - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) bitesize = 2 /obj/item/reagent_containers/food/snacks/milosoup @@ -630,7 +630,7 @@ /obj/item/reagent_containers/food/snacks/grub/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) bitesize = 3 /obj/item/reagent_containers/food/snacks/grub_pink @@ -692,7 +692,7 @@ /obj/item/reagent_containers/food/snacks/scorpion_cooked/Initialize() . = ..() reagents.add_reagent(REAGENT_ID_NUTRIMENT, 2) - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) bitesize = 4 /obj/item/reagent_containers/food/snacks/ant @@ -707,8 +707,8 @@ /obj/item/reagent_containers/food/snacks/ant/Initialize() . = ..() - reagents.add_reagent("honey", 2) - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_HONEY, 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) bitesize = 1 /obj/item/reagent_containers/food/snacks/antball @@ -721,7 +721,7 @@ /obj/item/reagent_containers/food/snacks/antball/Initialize() . = ..() - reagents.add_reagent("honey", 2) + reagents.add_reagent(REAGENT_ID_HONEY, 2) bitesize = 1 /obj/item/reagent_containers/food/snacks/honey_candy @@ -730,7 +730,7 @@ icon = 'icons/obj/food_vr.dmi' icon_state = "candy_honey" nutriment_amt = 4 - nutriment_desc = list("goo" = 1, "honey" = 1) + nutriment_desc = list("goo" = 1, REAGENT_ID_HONEY = 1) slice_path = /obj/item/reagent_containers/food/snacks/antball slices_num = 1 @@ -749,7 +749,7 @@ /obj/item/reagent_containers/food/snacks/locust/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent(REAGENT_ID_PROTEIN, 1) bitesize = 2 /obj/item/reagent_containers/food/snacks/locust_cooked @@ -762,7 +762,7 @@ /obj/item/reagent_containers/food/snacks/locust_cooked/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) bitesize = 2 /obj/item/reagent_containers/food/snacks/donkpocket/ascended @@ -801,7 +801,7 @@ package = TRUE trash = /obj/item/trash/ratveg nutriment_amt = 3 - nutriment_desc = list("fresh mixed veggies" = 3, "vinegar" = 1) + nutriment_desc = list("fresh mixed veggies" = 3, REAGENT_ID_VINEGAR = 1) /obj/item/reagent_containers/food/snacks/ratliquid name = "Admiral's Choice Space-Safe Meal" @@ -817,7 +817,7 @@ /obj/item/reagent_containers/food/snacks/ratliquid/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent(REAGENT_ID_PROTEIN, 4) /obj/item/reagent_containers/food/snacks/ratsteak name = "altevian traditional steak" @@ -830,7 +830,7 @@ /obj/item/reagent_containers/food/snacks/ratsteak/Initialize() . = ..() - reagents.add_reagent("protein", 3) + reagents.add_reagent(REAGENT_ID_PROTEIN, 3) /obj/item/reagent_containers/food/snacks/ratfruitcake name = "Premade Fruit Block" @@ -917,7 +917,7 @@ package = TRUE trash = /obj/item/trash/ratpacktaco nutriment_amt = 2 - nutriment_desc = list("salsa sauce" = 2, "meat chunks" = 4, "cheese" = 3) + nutriment_desc = list("salsa sauce" = 2, "meat chunks" = 4, REAGENT_ID_CHEESE = 3) /obj/item/reagent_containers/food/snacks/ratpackcake name = "Instant Sweet Celebration" @@ -953,11 +953,11 @@ icon_state = "jaffacake" nutriment_amt = 1 bitesize = 2 - nutriment_desc = list("chocolate" = 2, "orange" = 4, "cake" = 3) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 2, "orange" = 4, "cake" = 3) /obj/item/reagent_containers/food/snacks/bourbon/Initialize() . = ..() - reagents.add_reagent("coco", 2) + reagents.add_reagent(REAGENT_ID_COCO, 2) /obj/item/storage/box/jaffacake //This is kinda like the donut box. name = "Desatti Jaffa Cakes" @@ -1002,7 +1002,7 @@ /obj/item/reagent_containers/food/snacks/winegum/white icon_state = "winegum_white" - nutriment_desc = list(REAGENT_ID_SUGAR = 5, "pineapplejuice" = 2) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_PINEAPPLEJUICE = 2) /obj/item/storage/box/winegum //This is kinda like the donut box. name = "Desatti Wine Gums" @@ -1034,7 +1034,7 @@ /obj/item/reagent_containers/food/snacks/packaged/pasty/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/saucer name = "Sherbert Saucer" @@ -1072,7 +1072,7 @@ icon_state = "custard_cream" nutriment_amt = 1 bitesize = 1 - nutriment_desc = list("biscuit" = 5, "cream" = 3, "custard" = 3) + nutriment_desc = list("biscuit" = 5, REAGENT_ID_CREAM = 3, "custard" = 3) /obj/item/storage/box/custardcream //This is kinda like the donut box. name = "Desatti Custard Creams" @@ -1095,7 +1095,7 @@ icon_state = "bourbon" nutriment_amt = 1 bitesize = 1 - nutriment_desc = list("biscuit" = 5, "cream" = 3, "chocolate" = 5) + nutriment_desc = list("biscuit" = 5, REAGENT_ID_CREAM = 3, REAGENT_ID_CHOCOLATE = 5) /obj/item/storage/box/bourbon //This is kinda like the donut box. name = "Desatti Bourbons" @@ -1113,7 +1113,7 @@ /obj/item/reagent_containers/food/snacks/bourbon/Initialize() . = ..() - reagents.add_reagent("coco", 2) + reagents.add_reagent(REAGENT_ID_COCO, 2) /obj/item/reagent_containers/food/snacks/packaged/sausageroll name = "Sausage Roll" @@ -1126,7 +1126,7 @@ /obj/item/reagent_containers/food/snacks/packaged/sausageroll/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/packaged/scotchegg name = "Scotch Egg" @@ -1135,11 +1135,11 @@ package_trash = /obj/item/trash/scotchegg package_open_state = "scotchegg_open" nutriment_amt = 3 - nutriment_desc = list("egg" = 5, "meat" = 5, "bread" = 2) + nutriment_desc = list(REAGENT_ID_EGG = 5, "meat" = 5, "bread" = 2) /obj/item/reagent_containers/food/snacks/packaged/scotchegg/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) /obj/item/reagent_containers/food/snacks/foam_banana name = "Foam Banana" @@ -1149,7 +1149,7 @@ w_class = ITEMSIZE_TINY nutriment_amt = 1 bitesize = 2 - nutriment_desc = list(REAGENT_ID_SUGAR = 5, "banana" = 3) + nutriment_desc = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_BANANA = 3) /obj/item/reagent_containers/food/snacks/foam_shrimp name = "Foam Shrimp" @@ -1216,4 +1216,4 @@ /obj/item/reagent_containers/food/snacks/packaged/porkpie/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent(REAGENT_ID_PROTEIN, 2) diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm index 99e2fa3ba7f..42a789a30b2 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, REAGENT_ID_SUGAR = 10, "egg" = 9) + reagents = list(REAGENT_ID_FLOUR = 30,REAGENT_ID_MILK = 20, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 9) fruit = list("poisonberries" = 2, "cherries" = 2) items = list( /obj/item/reagent_containers/food/snacks/meat/, @@ -12,8 +12,8 @@ result = /obj/structure/chaoscake /datum/recipe/chaoscake_layertwo - reagents = list("flour" = 30, "milk" = 20, REAGENT_ID_SUGAR = 10, "egg" = 9, ) - fruit = list("vanilla" = 2, "banana" = 2) + reagents = list(REAGENT_ID_FLOUR = 30, REAGENT_ID_MILK = 20, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 9, ) + fruit = list(REAGENT_ID_VANILLA = 2, REAGENT_ID_BANANA = 2) items = list( /obj/item/reagent_containers/food/snacks/dough, /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, REAGENT_ID_SUGAR = 10, "egg" = 6, "deathbell" = 10) + reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_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, REAGENT_ID_SUGAR = 10, "egg" = 6, "milkshake" = 30) + reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_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, REAGENT_ID_SUGAR = 10, "egg" = 6, REAGENT_ID_BLOOD = 30) + reagents = list(REAGENT_ID_FLOUR = 20, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 10, REAGENT_ID_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, REAGENT_ID_SUGAR = 10, "egg" = 6, "sprinkles" = 5) + reagents = list(REAGENT_ID_FLOUR = 20, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_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, REAGENT_ID_SUGAR = 5, "egg" = 3, "devilskiss" = 20) + reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_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, REAGENT_ID_SUGAR = 5, "egg" = 3, "cream" = 20) + reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, REAGENT_ID_CREAM = 20) fruit = list("lemon" = 1) items = list( /obj/item/reagent_containers/food/snacks/dough, diff --git a/code/modules/food/glass/bottle.dm b/code/modules/food/glass/bottle.dm index 38b31aa67cd..341a79c09b9 100644 --- a/code/modules/food/glass/bottle.dm +++ b/code/modules/food/glass/bottle.dm @@ -161,14 +161,14 @@ desc = "A small bottle. Contains hot sauce." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-4" - prefill = list("capsaicin" = 60) + prefill = list(REAGENT_ID_CAPSAICIN = 60) /obj/item/reagent_containers/glass/bottle/frostoil name = "frost oil bottle" desc = "A small bottle. Contains cold sauce." icon = 'icons/obj/chemical.dmi' icon_state = "bottle-4" - prefill = list("frostoil" = 60) + prefill = list(REAGENT_ID_FROSTOIL = 60) /obj/item/reagent_containers/glass/bottle/biomass name = "biomass bottle" diff --git a/code/modules/food/glass/bottle_potion.dm b/code/modules/food/glass/bottle_potion.dm index c6328c6e389..86eda9b0531 100644 --- a/code/modules/food/glass/bottle_potion.dm +++ b/code/modules/food/glass/bottle_potion.dm @@ -60,7 +60,7 @@ /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(REAGENT_ID_MACROCILLIN = 1, "capsaicin" = 5) + prefill = list(REAGENT_ID_MACROCILLIN = 1, REAGENT_ID_CAPSAICIN = 5) /obj/item/reagent_containers/glass/bottle/potion/pain name = "grit potion" @@ -137,7 +137,7 @@ /obj/item/reagent_containers/glass/bottle/potion/capsaicin name = "warm potion" desc = "A small green bottle containing some red liquid." - prefill = list("capsaicin" = 30) + prefill = list(REAGENT_ID_CAPSAICIN = 30) /obj/item/reagent_containers/glass/bottle/potion/soporific name = "still potion" diff --git a/code/modules/food/glass/bottle_vr.dm b/code/modules/food/glass/bottle_vr.dm index 157bbc0b7aa..edceb1a80a0 100644 --- a/code/modules/food/glass/bottle_vr.dm +++ b/code/modules/food/glass/bottle_vr.dm @@ -151,5 +151,5 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose/Initialize() . = ..() - reagents.add_reagent("glucose", 100) + reagents.add_reagent(REAGENT_ID_GLUCOSE, 100) on_reagent_change() diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm index 067006e9567..49700ae28a9 100644 --- a/code/modules/food/kitchen/cooking_machines/_appliance.dm +++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm @@ -721,7 +721,7 @@ if(istype(src, /mob/living/carbon/human/diona) || istype(src, /mob/living/carbon/alien/diona)) src.composition_reagent = REAGENT_ID_NUTRIMENT // diona are plants, not meat else - src.composition_reagent = "protein" + src.composition_reagent = REAGENT_ID_PROTEIN if(istype(src, /mob/living/carbon/human)) var/mob/living/carbon/human/H = src if(istype(H.species, /datum/species/diona)) diff --git a/code/modules/food/kitchen/cooking_machines/fryer.dm b/code/modules/food/kitchen/cooking_machines/fryer.dm index 57ed1bb7d5a..d46a841be9f 100644 --- a/code/modules/food/kitchen/cooking_machines/fryer.dm +++ b/code/modules/food/kitchen/cooking_machines/fryer.dm @@ -45,7 +45,7 @@ if(prob(20)) // Sometimes the fryer will start with much less than full oil, significantly impacting efficiency until filled variance = rand()*0.5 - oil.add_reagent("cookingoil", optimal_oil*(1 - variance)) + oil.add_reagent(REAGENT_ID_COOKINGOIL, optimal_oil*(1 - variance)) /obj/machinery/appliance/cooker/fryer/Destroy() QDEL_NULL(fry_loop) diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm index fa9ac03798b..d38bbdc6537 100644 --- a/code/modules/food/kitchen/icecream.dm +++ b/code/modules/food/kitchen/icecream.dm @@ -24,17 +24,17 @@ /obj/machinery/icecream_vat/proc/get_ingredient_list(var/type) switch(type) if(ICECREAM_CHOCOLATE) - return list("milk", "ice", "coco") + return list(REAGENT_ID_MILK, "ice", REAGENT_ID_COCO) if(ICECREAM_STRAWBERRY) - return list("milk", "ice", "berryjuice") + return list(REAGENT_ID_MILK, "ice", REAGENT_ID_BERRYJUICE) if(ICECREAM_BLUE) - return list("milk", "ice", "singulo") + return list(REAGENT_ID_MILK, "ice", "singulo") if(CONE_WAFFLE) - return list("flour", REAGENT_ID_SUGAR) + return list(REAGENT_ID_FLOUR, REAGENT_ID_SUGAR) if(CONE_CHOC) - return list("flour", REAGENT_ID_SUGAR, "coco") + return list(REAGENT_ID_FLOUR, REAGENT_ID_SUGAR, REAGENT_ID_COCO) else - return list("milk", "ice") + return list(REAGENT_ID_MILK, "ice") /obj/machinery/icecream_vat/proc/get_flavour_name(var/flavour_type) switch(flavour_type) @@ -56,8 +56,8 @@ create_reagents(100) while(product_types.len < 6) product_types.Add(5) - reagents.add_reagent("milk", 5) - reagents.add_reagent("flour", 5) + reagents.add_reagent(REAGENT_ID_MILK, 5) + reagents.add_reagent(REAGENT_ID_FLOUR, 5) reagents.add_reagent(REAGENT_ID_SUGAR, 5) reagents.add_reagent("ice", 5) diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 8b712a044f8..9cd7ccd1bc5 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -276,9 +276,9 @@ var/list/reagents_data = list() for(var/datum/reagent/R in reagents.reagent_list) var/display_name = R.name - if(R.id == "capsaicin") + if(R.id == REAGENT_ID_CAPSAICIN) display_name = "Hotsauce" - if(R.id == "frostoil") + if(R.id == REAGENT_ID_FROSTOIL) display_name = "Coldsauce" UNTYPED_LIST_ADD(reagents_data, list( "name" = display_name, diff --git a/code/modules/food/recipe.dm b/code/modules/food/recipe.dm index 9d71101365b..f656b31b87a 100644 --- a/code/modules/food/recipe.dm +++ b/code/modules/food/recipe.dm @@ -31,7 +31,7 @@ * */ /datum/recipe - var/list/reagents // Example: = list("berryjuice" = 5) // do not list same reagent twice + var/list/reagents // Example: = list(REAGENT_ID_BERRYJUICE = 5) // do not list same reagent twice var/list/items // Example: = list(/obj/item/tool/crowbar, /obj/item/welder) // place /foo/bar before /foo var/list/fruit // Example: = list("fruit" = 3) var/coating = null // Required coating on all items in the recipe. The default value of null explitly requires no coating diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm index a73fb2e1bc5..f137dd6c78e 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(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_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 @@ -120,7 +120,7 @@ /obj/item/reagent_containers/food/snacks/bacon, /obj/item/reagent_containers/food/snacks/cutlet ) - reagents = list("soysauce" = 5, "batter" = 10) + reagents = list(REAGENT_ID_SOYSAUCE = 5, REAGENT_ID_BATTER = 10) result = /obj/item/reagent_containers/food/snacks/sweet_and_sour //Sweet Recipes. @@ -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, REAGENT_ID_SUGAR = 5) + reagents = list(REAGENT_ID_BERRYJUICE = 5, REAGENT_ID_SUGAR = 5) items = list( /obj/item/reagent_containers/food/snacks/doughslice ) @@ -136,7 +136,7 @@ result_quantity = 2 /datum/recipe/jellydonut/poisonberry - reagents = list("poisonberryjuice" = 5, REAGENT_ID_SUGAR = 5) + reagents = list(REAGENT_ID_POISONBERRYJUICE = 5, REAGENT_ID_SUGAR = 5) items = list( /obj/item/reagent_containers/food/snacks/dough ) @@ -147,7 +147,7 @@ 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, REAGENT_ID_SUGAR = 5) + reagents = list(REAGENT_ID_CHERRYJELLY = 5, REAGENT_ID_SUGAR = 5) result = /obj/item/reagent_containers/food/snacks/donut/plain/jelly/cherryjelly /datum/recipe/donut @@ -161,7 +161,7 @@ /datum/recipe/chaosdonut appliance = FRYER - reagents = list("frostoil" = 10, "capsaicin" = 10, REAGENT_ID_SUGAR = 10) + reagents = list(REAGENT_ID_FROSTOIL = 10, REAGENT_ID_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(REAGENT_ID_SUGAR = 5, "batter" = 10) + reagents = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_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, REAGENT_ID_SUGAR = 2, "batter" = 10) + reagents = list(REAGENT_ID_CAPSAICIN = 2, REAGENT_ID_SUGAR = 2, REAGENT_ID_BATTER = 10) items = list( /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat @@ -194,7 +194,7 @@ /datum/recipe/chickenwings appliance = FRYER - reagents = list("capsaicin" = 5, "batter" = 10) + reagents = list(REAGENT_ID_CAPSAICIN = 5, REAGENT_ID_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 9b2bc5d49d1..a0f7689eebe 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, REAGENT_ID_SUGAR = 2, "batter" = 10) + reagents = list(REAGENT_ID_CAPSAICIN = 2, REAGENT_ID_SUGAR = 2, REAGENT_ID_BATTER = 10) items = list( /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat @@ -9,7 +9,7 @@ /datum/recipe/chickenwings appliance = FRYER - reagents = list("capsaicin" = 5, "batter" = 10) + reagents = list(REAGENT_ID_CAPSAICIN = 5, REAGENT_ID_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_grill.dm b/code/modules/food/recipes_grill.dm index eda4541ba06..9598c6732fa 100644 --- a/code/modules/food/recipes_grill.dm +++ b/code/modules/food/recipes_grill.dm @@ -179,14 +179,14 @@ /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, ) - reagents = list("egg" = 3) + reagents = list(REAGENT_ID_EGG = 3) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/bigbiteburger /datum/recipe/superbiteburger appliance = GRILL fruit = list("tomato" = 1) - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 5, "blackpepper" = 5) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 5, REAGENT_ID_BLACKPEPPER = 5) items = list( /obj/item/reagent_containers/food/snacks/bigbiteburger, /obj/item/reagent_containers/food/snacks/dough, @@ -206,7 +206,7 @@ /datum/recipe/jellyburger appliance = GRILL - reagents = list("cherryjelly" = 5) + reagents = list(REAGENT_ID_CHERRYJELLY = 5) items = list( /obj/item/reagent_containers/food/snacks/bun ) @@ -236,34 +236,34 @@ /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/cheesewedge, ) - reagents = list("egg" = 6) + reagents = list(REAGENT_ID_EGG = 6) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/omelette /datum/recipe/omurice appliance = GRILL - reagents = list("rice" = 5, "ketchup" = 5, "egg" = 3) + reagents = list(REAGENT_ID_RICE = 5, REAGENT_ID_KETCHUP = 5, REAGENT_ID_EGG = 3) result = /obj/item/reagent_containers/food/snacks/omurice /datum/recipe/omurice/heart appliance = GRILL - reagents = list("rice" = 5, "ketchup" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3) + reagents = list(REAGENT_ID_RICE = 5, REAGENT_ID_KETCHUP = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3) result = /obj/item/reagent_containers/food/snacks/omurice/heart /datum/recipe/omurice/face appliance = GRILL - reagents = list("rice" = 5, "ketchup" = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "egg" = 3) + reagents = list(REAGENT_ID_RICE = 5, REAGENT_ID_KETCHUP = 5, REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_EGG = 3) result = /obj/item/reagent_containers/food/snacks/omurice/face /datum/recipe/meatsteak appliance = GRILL - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1) items = list(/obj/item/reagent_containers/food/snacks/meat) result = /obj/item/reagent_containers/food/snacks/meatsteak /datum/recipe/honeytoast appliance = GRILL - reagents = list("honey" = 5) + reagents = list(REAGENT_ID_HONEY = 5) items = list( /obj/item/reagent_containers/food/snacks/slice/bread ) @@ -280,7 +280,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat, /obj/item/reagent_containers/food/snacks/carpmeat ) - reagents = list("spacespice" = 1) + reagents = list(REAGENT_ID_SPACESPICE = 1) fruit = list("lettuce" = 1, "lime" = 1) result = /obj/item/reagent_containers/food/snacks/sliceable/grilled_carp @@ -307,7 +307,7 @@ /obj/item/reagent_containers/food/snacks/slice/bread, /obj/item/reagent_containers/food/snacks/cheesewedge ) - reagents = list("spacespice" = 1) + reagents = list(REAGENT_ID_SPACESPICE = 1) result = /obj/item/reagent_containers/food/snacks/cheesetoast result_quantity = 4 diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 0ce5cde9797..afcae6ebe32 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -20,7 +20,7 @@ I said no! */ /datum/recipe/friedegg - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1) 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(REAGENT_ID_SODIUMCHLORIDE = 2, "mayo" = 5) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_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, REAGENT_ID_SUGAR = 5) + reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5) reagent_mix = RECIPE_REAGENT_REPLACE items = list( /obj/item/reagent_containers/food/snacks/dough, @@ -85,12 +85,12 @@ I said no! /datum/recipe/soylenviridians fruit = list("soybeans" = 1) - reagents = list("flour" = 10) + reagents = list(REAGENT_ID_FLOUR = 10) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/soylenviridians /datum/recipe/soylentgreen - reagents = list("flour" = 10) + reagents = list(REAGENT_ID_FLOUR = 10) reagent_mix = RECIPE_REAGENT_REPLACE items = list( /obj/item/reagent_containers/food/snacks/meat/human, @@ -113,7 +113,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/berryclafoutis/poison /datum/recipe/wingfangchu - reagents = list("soysauce" = 5) + reagents = list(REAGENT_ID_SOYSAUCE = 5) items = list( /obj/item/reagent_containers/food/snacks/xenomeat ) @@ -165,7 +165,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/fortunecookie /datum/recipe/syntisteak - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1) items = list(/obj/item/reagent_containers/food/snacks/meat/syntiflesh) result = /obj/item/reagent_containers/food/snacks/meatsteak @@ -195,7 +195,7 @@ I said no! /datum/recipe/nettlesoup fruit = list("nettle" = 1, "potato" = 1) - reagents = list(REAGENT_ID_WATER = 10, "egg" = 3) + reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_EGG = 3) result = /obj/item/reagent_containers/food/snacks/nettlesoup /datum/recipe/wishsoup @@ -229,7 +229,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/sandwich /datum/recipe/peanutbutterjellysandwich - reagents = list("cherryjelly" = 5, "peanutbutter" = 5) + reagents = list(REAGENT_ID_CHERRYJELLY = 5, REAGENT_ID_PEANUTBUTTER = 5) items = list( /obj/item/reagent_containers/food/snacks/slice/bread, /obj/item/reagent_containers/food/snacks/slice/bread @@ -237,7 +237,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/jellysandwich/peanutbutter /datum/recipe/clubsandwich - reagents = list("mayo" = 5) + reagents = list(REAGENT_ID_MAYO = 5) items = list( /obj/item/reagent_containers/food/snacks/slice/bread, /obj/item/reagent_containers/food/snacks/slice/bread, @@ -276,7 +276,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime /datum/recipe/jelliedtoast - reagents = list("cherryjelly" = 5) + reagents = list(REAGENT_ID_CHERRYJELLY = 5) items = list( /obj/item/reagent_containers/food/snacks/slice/bread, ) @@ -308,11 +308,11 @@ I said no! result = /obj/item/reagent_containers/food/snacks/boiledspagetti /datum/recipe/boiledrice - reagents = list(REAGENT_ID_WATER = 5, "rice" = 10) + reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_RICE = 10) result = /obj/item/reagent_containers/food/snacks/boiledrice /datum/recipe/ricepudding - reagents = list("milk" = 5, "rice" = 10) + reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_RICE = 10) result = /obj/item/reagent_containers/food/snacks/ricepudding /datum/recipe/pastatomato @@ -348,7 +348,7 @@ I said no! /datum/recipe/caramelapple fruit = list("apple" = 1) - reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5) //Since caramel can be made with milk I thought this was appropriate + reagents = list(REAGENT_ID_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 @@ -368,7 +368,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/jellysandwich/slime /datum/recipe/cherrysandwich - reagents = list("cherryjelly" = 5) + reagents = list(REAGENT_ID_CHERRYJELLY = 5) items = list( /obj/item/reagent_containers/food/snacks/slice/bread, /obj/item/reagent_containers/food/snacks/slice/bread, @@ -408,14 +408,14 @@ I said no! /datum/recipe/kudzudonburi fruit = list("kudzu" = 1) - reagents = list("rice" = 10) + reagents = list(REAGENT_ID_RICE = 10) items = list( /obj/item/reagent_containers/food/snacks/carpmeat ) result = /obj/item/reagent_containers/food/snacks/kudzudonburi /datum/recipe/mysterysoup - reagents = list(REAGENT_ID_WATER = 10, "egg" = 3) + reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_EGG = 3) items = list( /obj/item/reagent_containers/food/snacks/badrecipe, /obj/item/reagent_containers/food/snacks/tofu, @@ -426,19 +426,19 @@ I said no! /datum/recipe/plumphelmetbiscuit fruit = list("plumphelmet" = 1) - reagents = list(REAGENT_ID_WATER = 5, "flour" = 5) + reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_FLOUR = 5) result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit result_quantity = 2 /datum/recipe/mushroomsoup fruit = list("mushroom" = 1) - reagents = list(REAGENT_ID_WATER = 5, "milk" = 5) + reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_MILK = 5) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/mushroomsoup /datum/recipe/chawanmushi fruit = list("mushroom" = 1) - reagents = list(REAGENT_ID_WATER = 5, "soysauce" = 5, "egg" = 6) + reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SOYSAUCE = 5, REAGENT_ID_EGG = 6) result = /obj/item/reagent_containers/food/snacks/chawanmushi /datum/recipe/beetsoup @@ -487,7 +487,7 @@ I said no! being_cooked.reagents.del_reagent(REAGENT_ID_TOXIN) /datum/recipe/stuffing - reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1) items = list( /obj/item/reagent_containers/food/snacks/sliceable/bread, ) @@ -502,7 +502,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/mashedpotato /datum/recipe/icecreamsandwich - reagents = list("milk" = 5, "ice" = 5) + reagents = list(REAGENT_ID_MILK = 5, "ice" = 5) items = list( /obj/item/reagent_containers/food/snacks/icecream ) @@ -539,7 +539,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/cutlet /datum/recipe/roastedcornsunflowerseeds - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "cornoil" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_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(REAGENT_ID_SODIUMCHLORIDE = 1, "cookingoil" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_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(REAGENT_ID_SODIUMCHLORIDE = 1, "peanutoil" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_PEANUTOIL = 1) items = list( /obj/item/reagent_containers/food/snacks/rawsunflower ) @@ -564,28 +564,28 @@ I said no! /datum/recipe/roastedpeanuts fruit = list("peanut" = 2) - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "cookingoil" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_COOKINGOIL = 1) result = /obj/item/reagent_containers/food/snacks/roastedpeanuts result_quantity = 2 /datum/recipe/roastedpeanutscorn fruit = list("peanut" = 2) - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "cornoil" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_CORNOIL = 1) result = /obj/item/reagent_containers/food/snacks/roastedpeanuts result_quantity = 2 /datum/recipe/roastedpeanutspeanut fruit = list("peanut" = 2) - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "peanutoil" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_PEANUTOIL = 1) result = /obj/item/reagent_containers/food/snacks/roastedpeanuts result_quantity = 2 /datum/recipe/mint - reagents = list(REAGENT_ID_SUGAR = 5, "frostoil" = 5) + reagents = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_FROSTOIL = 5) result = /obj/item/reagent_containers/food/snacks/mint /datum/recipe/sashimi - reagents = list("soysauce" = 5) + reagents = list(REAGENT_ID_SOYSAUCE = 5) items = list( /obj/item/reagent_containers/food/snacks/carpmeat ) @@ -601,19 +601,19 @@ I said no! /datum/recipe/bakedbeans fruit = list("soybeans" = 2) - reagents = list("ketchup" = 5) + reagents = list(REAGENT_ID_KETCHUP = 5) result = /obj/item/reagent_containers/food/snacks/beans /datum/recipe/sugarcookie items = list( /obj/item/reagent_containers/food/snacks/dough ) - reagents = list(REAGENT_ID_SUGAR = 5, "egg" = 3) + reagents = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3) result = /obj/item/reagent_containers/food/snacks/sugarcookie result_quantity = 4 /datum/recipe/berrymuffin - reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5) + reagents = list(REAGENT_ID_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, REAGENT_ID_SUGAR = 5) + reagents = list(REAGENT_ID_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, REAGENT_ID_SUGAR = 5) + reagents = list(REAGENT_ID_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, REAGENT_ID_SUGAR = 5) + reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/ectoplasm @@ -651,7 +651,7 @@ I said no! result_quantity = 2 /datum/recipe/eggroll - reagents = list("soysauce" = 10) + reagents = list(REAGENT_ID_SOYSAUCE = 10) items = list( /obj/item/reagent_containers/food/snacks/friedegg ) @@ -663,11 +663,11 @@ I said no! result = /obj/item/reagent_containers/food/snacks/fruitsalad /datum/recipe/eggbowl - reagents = list(REAGENT_ID_WATER = 5, "rice" = 10, "egg" = 3) + reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_RICE = 10, REAGENT_ID_EGG = 3) result = /obj/item/reagent_containers/food/snacks/eggbowl /datum/recipe/porkbowl - reagents = list(REAGENT_ID_WATER = 5, "rice" = 10) + reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_RICE = 10) items = list( /obj/item/reagent_containers/food/snacks/cutlet ) @@ -675,7 +675,7 @@ I said no! /datum/recipe/cubannachos fruit = list("chili" = 1) - reagents = list("ketchup" = 5) + reagents = list(REAGENT_ID_KETCHUP = 5) items = list( /obj/item/reagent_containers/food/snacks/tortilla ) @@ -683,7 +683,7 @@ I said no! /datum/recipe/curryrice fruit = list("chili" = 1) - reagents = list("rice" = 10) + reagents = list(REAGENT_ID_RICE = 10) result = /obj/item/reagent_containers/food/snacks/curryrice /datum/recipe/piginblanket @@ -754,7 +754,7 @@ I said no! //to reduce the risk of future recipe conflicts. /datum/recipe/redcurry - reagents = list("cream" = 5, "spacespice" = 2, "rice" = 5) + reagents = list(REAGENT_ID_CREAM = 5, REAGENT_ID_SPACESPICE = 2, REAGENT_ID_RICE = 5) items = list( /obj/item/reagent_containers/food/snacks/cutlet, /obj/item/reagent_containers/food/snacks/cutlet @@ -763,7 +763,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/redcurry /datum/recipe/greencurry - reagents = list("cream" = 5, "spacespice" = 2, "rice" = 5) + reagents = list(REAGENT_ID_CREAM = 5, REAGENT_ID_SPACESPICE = 2, REAGENT_ID_RICE = 5) fruit = list("chili" = 1) items = list( /obj/item/reagent_containers/food/snacks/tofu, @@ -773,7 +773,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/greencurry /datum/recipe/yellowcurry - reagents = list("cream" = 5, "spacespice" = 2, "rice" = 5) + reagents = list(REAGENT_ID_CREAM = 5, REAGENT_ID_SPACESPICE = 2, REAGENT_ID_RICE = 5) fruit = list("peanut" = 2, "potato" = 1) reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product result = /obj/item/reagent_containers/food/snacks/yellowcurry @@ -793,7 +793,7 @@ I said no! /datum/recipe/bibimbap fruit = list("carrot" = 1, "cabbage" = 1, "mushroom" = 1) - reagents = list("rice" = 5, "spacespice" = 2) + reagents = list(REAGENT_ID_RICE = 5, REAGENT_ID_SPACESPICE = 2) items = list( /obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/cutlet @@ -802,13 +802,13 @@ I said no! result = /obj/item/reagent_containers/food/snacks/bibimbap /datum/recipe/friedrice - reagents = list(REAGENT_ID_WATER = 5, "rice" = 10, "soysauce" = 5) + reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_RICE = 10, REAGENT_ID_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(REAGENT_ID_WATER = 5, "soysauce" = 5) + reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_SOYSAUCE = 5) fruit = list("carrot" = 1, "cabbage" = 1) items = list( /obj/item/reagent_containers/food/snacks/spagetti @@ -833,13 +833,13 @@ I said no! result = /obj/item/reagent_containers/food/snacks/chilicheesefries /datum/recipe/risotto - reagents = list("redwine" = 5, "rice" = 10, "spacespice" = 1) + reagents = list("redwine" = 5, REAGENT_ID_RICE = 10, REAGENT_ID_SPACESPICE = 1) fruit = list("mushroom" = 1) reagent_mix = RECIPE_REAGENT_REPLACE //Get that rice and wine outta here result = /obj/item/reagent_containers/food/snacks/risotto /datum/recipe/poachedegg - reagents = list("spacespice" = 1, REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, REAGENT_ID_WATER = 5) + reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1, REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/egg ) @@ -847,7 +847,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/poachedegg /datum/recipe/nugget - reagents = list("flour" = 5) + reagents = list(REAGENT_ID_FLOUR = 5) items = list( /obj/item/reagent_containers/food/snacks/meat/chicken ) @@ -857,7 +857,7 @@ I said no! // Chip update /datum/recipe/microwavetortilla - reagents = list("flour" = 5, REAGENT_ID_WATER = 5) + reagents = list(REAGENT_ID_FLOUR = 5, REAGENT_ID_WATER = 5) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough ) @@ -889,13 +889,13 @@ I said no! /datum/recipe/salsa fruit = list("chili" = 1, "tomato" = 1, "lime" = 1) - reagents = list("spacespice" = 1, "blackpepper" = 1,REAGENT_ID_SODIUMCHLORIDE = 1) + reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_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,REAGENT_ID_SODIUMCHLORIDE = 1) + reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_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,REAGENT_ID_SODIUMCHLORIDE = 1) + reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_BLACKPEPPER = 1,REAGENT_ID_SODIUMCHLORIDE = 1) items = list( /obj/item/reagent_containers/food/snacks/cheesewedge ) @@ -917,7 +917,7 @@ I said no! /obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/meatball ) - reagents = list("spacespice" = 1) + reagents = list(REAGENT_ID_SPACESPICE = 1) result = /obj/item/reagent_containers/food/snacks/burrito /datum/recipe/burrito_vegan @@ -947,7 +947,7 @@ I said no! /datum/recipe/burrito_hell fruit = list("soybeans" = 1, "chili" = 10) - reagents = list("spacespice" = 1) + reagents = list(REAGENT_ID_SPACESPICE = 1) items = list( /obj/item/reagent_containers/food/snacks/tortilla, /obj/item/reagent_containers/food/snacks/meatball, @@ -1045,7 +1045,7 @@ I said no! /obj/item/reagent_containers/food/snacks/sausage, /obj/item/reagent_containers/food/snacks/meatsteak ) - reagents = list("egg" = 6) + reagents = list(REAGENT_ID_EGG = 6) result = /obj/item/reagent_containers/food/snacks/father_breakfast /datum/recipe/stuffed_meatball @@ -1063,7 +1063,7 @@ I said no! /obj/item/reagent_containers/food/snacks/meatball, /obj/item/reagent_containers/food/snacks/meatball ) - reagents = list("egg" = 6) + reagents = list(REAGENT_ID_EGG = 6) result = /obj/item/reagent_containers/food/snacks/egg_pancake /datum/recipe/bacon_stick @@ -1108,7 +1108,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/blt /datum/recipe/gigapuddi - reagents = list("milk" = 15) + reagents = list(REAGENT_ID_MILK = 15) items = list( /obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/egg @@ -1116,7 +1116,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/gigapuddi /datum/recipe/gigapuddi/happy - reagents = list("milk" = 15, REAGENT_ID_SUGAR = 5) + reagents = list(REAGENT_ID_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, REAGENT_ID_SODIUMCHLORIDE = 5) + reagents = list(REAGENT_ID_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 9e68234e4a2..a8bd0857841 100644 --- a/code/modules/food/recipes_microwave_vr.dm +++ b/code/modules/food/recipes_microwave_vr.dm @@ -12,7 +12,7 @@ /datum/recipe/sushi fruit = list("cabbage" = 1) - reagents = list("rice" = 20) + reagents = list(REAGENT_ID_RICE = 20) items = list( /obj/item/reagent_containers/food/snacks/meat, /obj/item/reagent_containers/food/snacks/meat, @@ -54,14 +54,14 @@ /datum/recipe/hotandsoursoup fruit = list("cabbage" = 1, "mushroom" = 1) - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, "blackpepper" = 2, REAGENT_ID_WATER = 10) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 2, REAGENT_ID_BLACKPEPPER = 2, REAGENT_ID_WATER = 10) items = list( /obj/item/reagent_containers/food/snacks/tofu ) result = /obj/item/reagent_containers/food/snacks/hotandsoursoup /datum/recipe/kitsuneudon - reagents = list("egg" = 3) + reagents = list(REAGENT_ID_EGG = 3) items = list( /obj/item/reagent_containers/food/snacks/spagetti, /obj/item/reagent_containers/food/snacks/tofu @@ -77,11 +77,11 @@ /datum/recipe/mammi fruit = list("orange" = 1) - reagents = list(REAGENT_ID_WATER = 10, "flour" = 10, "milk" = 5, REAGENT_ID_SODIUMCHLORIDE = 1) + reagents = list(REAGENT_ID_WATER = 10, REAGENT_ID_FLOUR = 10, REAGENT_ID_MILK = 5, REAGENT_ID_SODIUMCHLORIDE = 1) result = /obj/item/reagent_containers/food/snacks/mammi /datum/recipe/makaroni - reagents = list("flour" = 15, "milk" = 5) + reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 5) items = list( /obj/item/reagent_containers/food/snacks/meat/grubmeat, /obj/item/reagent_containers/food/snacks/egg, @@ -92,7 +92,7 @@ /datum/recipe/carpsushi fruit = list("cabbage" = 1) - reagents = list("rice" = 20) + reagents = list(REAGENT_ID_RICE = 20) items = list( /obj/item/reagent_containers/food/snacks/carpmeat, /obj/item/reagent_containers/food/snacks/carpmeat, @@ -121,7 +121,7 @@ result = /obj/item/reagent_containers/food/snacks/monkfishcooked /datum/recipe/sharksteak - reagents = list("blackpepper"= 1, REAGENT_ID_SODIUMCHLORIDE = 1) + reagents = list(REAGENT_ID_BLACKPEPPER= 1, REAGENT_ID_SODIUMCHLORIDE = 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, REAGENT_ID_SODIUMCHLORIDE = 1) + reagents = list(REAGENT_ID_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, REAGENT_ID_NUTRIMENT = 15, "protein" = 15) // labor intensive + reagents = list(REAGENT_ID_ENZYME = 20, REAGENT_ID_VIRUSFOOD = 5, REAGENT_ID_NUTRIMENT = 15, REAGENT_ID_PROTEIN = 15) // labor intensive items = list() result = /obj/item/storage/box/wings/tray diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index d08f88b8e45..e5c84673c04 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -19,7 +19,7 @@ /datum/recipe/monkeysdelight appliance = OVEN fruit = list("banana" = 1) - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, "flour" = 10) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1, REAGENT_ID_FLOUR = 10) items = list( /obj/item/reagent_containers/food/snacks/monkeycube ) @@ -28,7 +28,7 @@ /datum/recipe/ribplate appliance = OVEN - reagents = list("honey" = 5, "spacespice" = 2, "blackpepper" = 1) + reagents = list(REAGENT_ID_HONEY = 5, REAGENT_ID_SPACESPICE = 2, REAGENT_ID_BLACKPEPPER = 1) items = list(/obj/item/reagent_containers/food/snacks/meat) reagent_mix = RECIPE_REAGENT_REPLACE result = /obj/item/reagent_containers/food/snacks/ribplate @@ -36,7 +36,7 @@ /* OLD RECIPE /datum/recipe/turkey appliance = OVEN - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_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(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_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(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1) items = list( /obj/item/reagent_containers/food/snacks/tofu, /obj/item/reagent_containers/food/snacks/tofu, @@ -91,12 +91,12 @@ /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough ) - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "yeast" = 5) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_YEAST = 5) result = /obj/item/reagent_containers/food/snacks/sliceable/bread /datum/recipe/baguette appliance = OVEN - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, "blackpepper" = 1, "yeast" = 5) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_BLACKPEPPER = 1, REAGENT_ID_YEAST = 5) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough @@ -136,7 +136,7 @@ /datum/recipe/tortilla appliance = OVEN - reagents = list("flour" = 5) + reagents = list(REAGENT_ID_FLOUR = 5) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough ) @@ -182,7 +182,7 @@ /datum/recipe/bananabread appliance = OVEN fruit = list("banana" = 1) - reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15) + reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 15) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/dough @@ -278,13 +278,13 @@ /datum/recipe/keylimepie appliance = OVEN fruit = list("lime" = 2) - reagents = list("milk" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3, "flour" = 10) + reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, REAGENT_ID_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 /datum/recipe/quiche appliance = OVEN - reagents = list("milk" = 5, "egg" = 9, "flour" = 10) + reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_EGG = 9, REAGENT_ID_FLOUR = 10) items = list(/obj/item/reagent_containers/food/snacks/cheesewedge) result = /obj/item/reagent_containers/food/snacks/sliceable/quiche 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, REAGENT_ID_SUGAR = 10) + reagents = list(REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 10) items = list( /obj/item/reagent_containers/food/snacks/dough, /obj/item/reagent_containers/food/snacks/chocolatebar @@ -329,13 +329,13 @@ /datum/recipe/brownies appliance = OVEN - reagents = list("browniemix" = 10, "egg" = 3) + reagents = list(REAGENT_ID_BROWNIEMIX = 10, REAGENT_ID_EGG = 3) reagent_mix = RECIPE_REAGENT_REPLACE //No egg or mix in final recipe result = /obj/item/reagent_containers/food/snacks/sliceable/brownies /datum/recipe/cosmicbrownies appliance = OVEN - reagents = list("browniemix" = 10, "egg" = 3) + reagents = list(REAGENT_ID_BROWNIEMIX = 10, REAGENT_ID_EGG = 3) fruit = list("ambrosia" = 1) reagent_mix = RECIPE_REAGENT_REPLACE //No egg or mix in final recipe result = /obj/item/reagent_containers/food/snacks/sliceable/cosmicbrownies @@ -343,12 +343,12 @@ /datum/recipe/buchedenoel appliance = OVEN fruit = list("berries" = 2) - reagents = list("cakebatter" = 20, "cream" = 10, "coco" = 5) + reagents = list(REAGENT_ID_CAKEBATTER = 20, REAGENT_ID_CREAM = 10, REAGENT_ID_COCO = 5) result = /obj/item/reagent_containers/food/snacks/sliceable/buchedenoel /datum/recipe/cinnamonbun appliance = OVEN - reagents = list(REAGENT_ID_SUGAR = 15, "cream" = 10) + reagents = list(REAGENT_ID_SUGAR = 15, REAGENT_ID_CREAM = 10) items = list( /obj/item/reagent_containers/food/snacks/dough ) @@ -358,7 +358,7 @@ /datum/recipe/jaffacake appliance = OVEN fruit = list("orange" = 1) - reagents = list("cakebatter" = 15, "coco" = 10) + reagents = list(REAGENT_ID_CAKEBATTER = 15, REAGENT_ID_COCO = 10) result = /obj/item/reagent_containers/food/snacks/jaffacake result_quantity = 6 @@ -448,19 +448,19 @@ //============ /datum/recipe/cake appliance = OVEN - reagents = list("cakebatter" = 30, "vanilla" = 2) + reagents = list(REAGENT_ID_CAKEBATTER = 30, REAGENT_ID_VANILLA = 2) result = /obj/item/reagent_containers/food/snacks/sliceable/plaincake reagent_mix = RECIPE_REAGENT_REPLACE /datum/recipe/cake/carrot appliance = OVEN fruit = list("carrot" = 3) - reagents = list("cakebatter" = 30) + reagents = list(REAGENT_ID_CAKEBATTER = 30) result = /obj/item/reagent_containers/food/snacks/sliceable/carrotcake /datum/recipe/cake/cheese appliance = OVEN - reagents = list("cakebatter" = 30) + reagents = list(REAGENT_ID_CAKEBATTER = 30) items = list( /obj/item/reagent_containers/food/snacks/cheesewedge, /obj/item/reagent_containers/food/snacks/cheesewedge @@ -469,53 +469,53 @@ /datum/recipe/cake/peanut fruit = list("peanut" = 1) - reagents = list("cakebatter" = 30, "peanutbutter" = 5) + reagents = list(REAGENT_ID_CAKEBATTER = 30, REAGENT_ID_PEANUTBUTTER = 5) result = /obj/item/reagent_containers/food/snacks/sliceable/peanutcake /datum/recipe/cake/orange appliance = OVEN fruit = list("orange" = 2) - reagents = list("cakebatter" = 30) + reagents = list(REAGENT_ID_CAKEBATTER = 30) result = /obj/item/reagent_containers/food/snacks/sliceable/orangecake /datum/recipe/cake/lime appliance = OVEN fruit = list("lime" = 2) - reagents = list("cakebatter" = 30) + reagents = list(REAGENT_ID_CAKEBATTER = 30) result = /obj/item/reagent_containers/food/snacks/sliceable/limecake /datum/recipe/cake/lemon appliance = OVEN fruit = list("lemon" = 2) - reagents = list("cakebatter" = 30) + reagents = list(REAGENT_ID_CAKEBATTER = 30) result = /obj/item/reagent_containers/food/snacks/sliceable/lemoncake /datum/recipe/cake/chocolate appliance = OVEN - reagents = list("cakebatter" = 30, "coco" = 5) + reagents = list(REAGENT_ID_CAKEBATTER = 30, REAGENT_ID_COCO = 5) result = /obj/item/reagent_containers/food/snacks/sliceable/chocolatecake /datum/recipe/cake/birthday appliance = OVEN - reagents = list("cakebatter" = 30) + reagents = list(REAGENT_ID_CAKEBATTER = 30) items = list(/obj/item/clothing/head/cakehat) result = /obj/item/reagent_containers/food/snacks/sliceable/birthdaycake /datum/recipe/cake/apple appliance = OVEN fruit = list("apple" = 2) - reagents = list("cakebatter" = 30) + reagents = list(REAGENT_ID_CAKEBATTER = 30) result = /obj/item/reagent_containers/food/snacks/sliceable/applecake /datum/recipe/cake/brain appliance = OVEN - reagents = list("cakebatter" = 30) + reagents = list(REAGENT_ID_CAKEBATTER = 30) items = list(/obj/item/organ/internal/brain) result = /obj/item/reagent_containers/food/snacks/sliceable/braincake /datum/recipe/pancakes appliance = OVEN - reagents = list("milk" = 5, REAGENT_ID_SUGAR = 15) + reagents = list(REAGENT_ID_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, REAGENT_ID_SUGAR = 15) + reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_SUGAR = 15) items = list( /obj/item/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/reagent_containers/food/snacks/sliceable/flatdough @@ -551,7 +551,7 @@ items = list( /obj/item/reagent_containers/food/snacks/dough ) - reagents = list("milk" = 5, "egg" = 3,"honey" = 5) + reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_EGG = 3,REAGENT_ID_HONEY = 5) result = /obj/item/reagent_containers/food/snacks/honeybun result_quantity = 4 @@ -595,7 +595,7 @@ /datum/recipe/truffle appliance = OVEN - reagents = list(REAGENT_ID_SUGAR = 5, "cream" = 5) + reagents = list(REAGENT_ID_SUGAR = 5, REAGENT_ID_CREAM = 5) items = list( /obj/item/reagent_containers/food/snacks/chocolatebar ) @@ -605,7 +605,7 @@ /datum/recipe/croissant appliance = OVEN - reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_WATER = 5, "milk" = 5, "yeast" = 5) + reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_WATER = 5, REAGENT_ID_MILK = 5, REAGENT_ID_YEAST = 5) reagent_mix = RECIPE_REAGENT_REPLACE items = list(/obj/item/reagent_containers/food/snacks/dough) result = /obj/item/reagent_containers/food/snacks/croissant @@ -613,7 +613,7 @@ /datum/recipe/macncheese appliance = OVEN - reagents = list("milk" = 5) + reagents = list(REAGENT_ID_MILK = 5) reagent_mix = RECIPE_REAGENT_REPLACE items = list( /obj/item/reagent_containers/food/snacks/spagetti, @@ -623,7 +623,7 @@ /datum/recipe/suppermatter appliance = OVEN - reagents = list(REAGENT_ID_RADIUM = 5, "milk" = 5) + reagents = list(REAGENT_ID_RADIUM = 5, REAGENT_ID_MILK = 5) items = list( /obj/item/reagent_containers/food/snacks/sliceable/cheesecake ) @@ -632,7 +632,7 @@ /datum/recipe/excitingsuppermatter appliance = OVEN - reagents = list(REAGENT_ID_RADIUM = 5, "spacespice" = 5) + reagents = list(REAGENT_ID_RADIUM = 5, REAGENT_ID_SPACESPICE = 5) items = list( /obj/item/reagent_containers/food/snacks/sliceable/cheesecake ) @@ -669,7 +669,7 @@ /datum/recipe/spicedmeatbun appliance = OVEN - reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5) + reagents = list(REAGENT_ID_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, REAGENT_ID_WATER = 5, "egg" = 3) + reagents = list(REAGENT_ID_SPACESPICE = 1, REAGENT_ID_WATER = 5, REAGENT_ID_EGG = 3) items = list( /obj/item/reagent_containers/food/snacks/doughslice ) @@ -689,7 +689,7 @@ /datum/recipe/chickenmomo appliance = OVEN - reagents = list("spacespice" = 2, REAGENT_ID_WATER = 5) + reagents = list(REAGENT_ID_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, REAGENT_ID_WATER = 5) + reagents = list(REAGENT_ID_SPACESPICE = 2, REAGENT_ID_WATER = 5) fruit = list("carrot" = 1, "cabbage" = 1) items = list( /obj/item/reagent_containers/food/snacks/doughslice, diff --git a/code/modules/hydroponics/backtank.dm b/code/modules/hydroponics/backtank.dm index d3cbc4d3901..b2962061dc6 100644 --- a/code/modules/hydroponics/backtank.dm +++ b/code/modules/hydroponics/backtank.dm @@ -202,7 +202,7 @@ /obj/item/watertank/pepperspray/Initialize() . = ..() - reagents.add_reagent("condensedcapsaicin", 1000) + reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 1000) /obj/item/watertank/pepperspray/make_noz() return new /obj/item/reagent_containers/spray/mister/pepperspray(src) @@ -236,7 +236,7 @@ reagents.add_reagent(REAGENT_ID_FUEL, 500) reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, 500) reagents.add_reagent(REAGENT_ID_PHORON, 500) - reagents.add_reagent("condensedcapsaicin", 500) + reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 500) /obj/item/watertank/op/make_noz() return new /obj/item/reagent_containers/spray/mister/op(src) diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm index af43ffd97bc..bc4f8ef2c9d 100644 --- a/code/modules/hydroponics/beekeeping/beehive.dm +++ b/code/modules/hydroponics/beekeeping/beehive.dm @@ -196,7 +196,7 @@ return var/obj/item/reagent_containers/glass/G = I var/transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, honey) - G.reagents.add_reagent("honey", transferred) + G.reagents.add_reagent(REAGENT_ID_HONEY, transferred) honey -= transferred user.visible_message(span_notice("[user] collects honey from \the [src] into \the [G]."), span_notice("You collect [transferred] units of honey from \the [src] into \the [G].")) return 1 diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index c1fef236952..01d1c0c9b80 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -70,19 +70,19 @@ desc = SSplants.product_descs["[seed.uid]"] else var/list/descriptors = list() - if(reagents.has_reagent(REAGENT_ID_SUGAR) || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice")) + if(reagents.has_reagent(REAGENT_ID_SUGAR) || reagents.has_reagent(REAGENT_ID_CHERRYJELLY) || reagents.has_reagent(REAGENT_ID_HONEY) || reagents.has_reagent(REAGENT_ID_BERRYJUICE)) descriptors |= "sweet" if(reagents.has_reagent(REAGENT_ID_ANTITOXIN)) descriptors |= "astringent" - if(reagents.has_reagent("frostoil")) + if(reagents.has_reagent(REAGENT_ID_FROSTOIL)) descriptors |= "numbing" if(reagents.has_reagent(REAGENT_ID_NUTRIMENT)) descriptors |= "nutritious" - if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin")) + if(reagents.has_reagent(REAGENT_ID_CONDENSEDCAPSAICIN) || reagents.has_reagent(REAGENT_ID_CAPSAICIN)) descriptors |= "spicy" - if(reagents.has_reagent("coco")) + if(reagents.has_reagent(REAGENT_ID_COCO)) descriptors |= "bitter" - if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice")) + if(reagents.has_reagent(REAGENT_ID_ORANGEJUICE) || reagents.has_reagent(REAGENT_ID_LEMONJUICE) || reagents.has_reagent(REAGENT_ID_LIMEJUICE)) descriptors |= "sweet-sour" if(reagents.has_reagent(REAGENT_ID_RADIUM) || reagents.has_reagent(REAGENT_ID_URANIUM)) descriptors |= "radioactive" @@ -226,19 +226,19 @@ qdel(src) return - if(!isnull(seed.chems["carrotjuice"])) + if(!isnull(seed.chems[REAGENT_ID_CARROTJUICE])) to_chat(user, span_filter_notice("You slice \the [src] into sticks.")) new /obj/item/reagent_containers/food/snacks/carrotfries(get_turf(src)) qdel(src) return - if(!isnull(seed.chems["pineapplejuice"])) + if(!isnull(seed.chems[REAGENT_ID_PINEAPPLEJUICE])) to_chat(user, span_filter_notice("You slice \the [src] into rings.")) new /obj/item/reagent_containers/food/snacks/pineapple_ring(get_turf(src)) qdel(src) return - if(!isnull(seed.chems["soymilk"])) + if(!isnull(seed.chems[REAGENT_ID_SOYMILK])) to_chat(user, span_filter_notice("You roughly chop up \the [src].")) new /obj/item/reagent_containers/food/snacks/soydope(get_turf(src)) qdel(src) diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 6a49d3c7254..321a32386a4 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", REAGENT_ID_SUGAR, "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown", + possible_prefixes |= list("butter", "shad", "sugar", "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown", "black", "white", "paper", "slippery", "honey", "bitter") prefix = pick(possible_prefixes) diff --git a/code/modules/hydroponics/seedtypes/amauri.dm b/code/modules/hydroponics/seedtypes/amauri.dm index 4e9126df1ac..c3d5e893111 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(REAGENT_ID_ZOMBIEPOWDER = list(1,10),"condensedcapsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) + chems = list(REAGENT_ID_ZOMBIEPOWDER = list(1,10),REAGENT_ID_CONDENSEDCAPSAICIN = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/amauri/New() ..() diff --git a/code/modules/hydroponics/seedtypes/apples.dm b/code/modules/hydroponics/seedtypes/apples.dm index 15d223ae36c..09f3075249e 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(REAGENT_ID_NUTRIMENT = list(1,10),"applejuice" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10),REAGENT_ID_APPLEJUICE = list(10,20)) /datum/seed/apple/New() ..() diff --git a/code/modules/hydroponics/seedtypes/banana.dm b/code/modules/hydroponics/seedtypes/banana.dm index c5cc980698f..ab6f8ef7717 100644 --- a/code/modules/hydroponics/seedtypes/banana.dm +++ b/code/modules/hydroponics/seedtypes/banana.dm @@ -3,7 +3,7 @@ seed_name = "banana" display_name = "banana tree" kitchen_tag = "banana" - chems = list("banana" = list(10,10)) + chems = list(REAGENT_ID_BANANA = list(10,10)) trash_type = /obj/item/bananapeel /datum/seed/banana/New() @@ -18,4 +18,4 @@ set_trait(TRAIT_PLANT_ICON,"tree4") set_trait(TRAIT_IDEAL_HEAT, 298) set_trait(TRAIT_IDEAL_LIGHT, 7) - 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/berries.dm b/code/modules/hydroponics/seedtypes/berries.dm index 75c98883adf..dcef36a1ff6 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(REAGENT_ID_NUTRIMENT = list(1,10), "berryjuice" = list(10,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_BERRYJUICE = list(10,10)) /datum/seed/berry/New() ..() @@ -47,7 +47,7 @@ kitchen_tag = "poisonberries" display_name = "poison berry bush" mutants = list("deathberries") - chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_TOXIN = list(3,5), "poisonberryjuice" = list(10,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_TOXIN = list(3,5), REAGENT_ID_POISONBERRYJUICE = list(10,5)) /datum/seed/berry/poison/New() ..() @@ -74,7 +74,7 @@ seed_name = "peppercorn berry" kitchen_tag = "peppercorns" display_name = "peppercorn bush" - chems = list("blackpepper" = list(5,10)) + chems = list(REAGENT_ID_BLACKPEPPER = list(5,10)) /datum/seed/berry/peppercorn/New() ..() diff --git a/code/modules/hydroponics/seedtypes/carrots.dm b/code/modules/hydroponics/seedtypes/carrots.dm index be905b8d6a0..5012ac1aa59 100644 --- a/code/modules/hydroponics/seedtypes/carrots.dm +++ b/code/modules/hydroponics/seedtypes/carrots.dm @@ -3,7 +3,7 @@ seed_name = "carrot" display_name = "carrots" kitchen_tag = "carrot" - chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_IMIDAZOLINE = list(3,5), "carrotjuice" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_IMIDAZOLINE = list(3,5), REAGENT_ID_CARROTJUICE = list(10,20)) /datum/seed/carrots/New() ..() diff --git a/code/modules/hydroponics/seedtypes/cherries.dm b/code/modules/hydroponics/seedtypes/cherries.dm index 77672630238..2f5896f59cd 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(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_SUGAR = list(1,15), "cherryjelly" = list(10,15)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_SUGAR = list(1,15), REAGENT_ID_CHERRYJELLY = list(10,15)) /datum/seed/cherries/New() ..() diff --git a/code/modules/hydroponics/seedtypes/chili.dm b/code/modules/hydroponics/seedtypes/chili.dm index 59adafd8fd2..b667cfa156d 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), REAGENT_ID_NUTRIMENT = list(1,25)) + chems = list(REAGENT_ID_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), REAGENT_ID_NUTRIMENT = list(1,50)) + chems = list(REAGENT_ID_FROSTOIL = list(3,5), REAGENT_ID_NUTRIMENT = list(1,50)) /datum/seed/chili/ice/New() ..() @@ -40,7 +40,7 @@ display_name = "ghost chili plants" kitchen_tag = "ghostchili" mutants = null - chems = list("condensedcapsaicin" = list (3,10), REAGENT_ID_NUTRIMENT = list (1,25)) + chems = list(REAGENT_ID_CONDENSEDCAPSAICIN = list (3,10), REAGENT_ID_NUTRIMENT = list (1,25)) /datum/seed/chili/ghost/New() ..() diff --git a/code/modules/hydroponics/seedtypes/citrus.dm b/code/modules/hydroponics/seedtypes/citrus.dm index 063026342bc..ad701a74def 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(REAGENT_ID_NUTRIMENT = list(1,20), "limejuice" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_LIMEJUICE = list(10,20)) /datum/seed/citrus/New() ..() @@ -23,7 +23,7 @@ seed_name = "lemon" display_name = "lemon trees" kitchen_tag = "lemon" - chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lemonjuice" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_LEMONJUICE = list(10,20)) /datum/seed/citrus/lemon/New() ..() @@ -38,7 +38,7 @@ seed_name = "orange" display_name = "orange trees" kitchen_tag = "orange" - chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "orangejuice" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_ORANGEJUICE = list(10,20)) /datum/seed/citrus/orange/New() ..() diff --git a/code/modules/hydroponics/seedtypes/cocoa.dm b/code/modules/hydroponics/seedtypes/cocoa.dm index c89bfcf0e6c..7233db5d695 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(REAGENT_ID_NUTRIMENT = list(1,10), "coco" = list(4,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_COCO = list(4,5)) /datum/seed/cocoa/New() ..() diff --git a/code/modules/hydroponics/seedtypes/corn.dm b/code/modules/hydroponics/seedtypes/corn.dm index e46cf0f2d95..67fca53d8f0 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(REAGENT_ID_NUTRIMENT = list(1,10), "cornoil" = list(3,15)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_CORNOIL = list(3,15)) trash_type = /obj/item/corncob /datum/seed/corn/New() diff --git a/code/modules/hydroponics/seedtypes/durian.dm b/code/modules/hydroponics/seedtypes/durian.dm index b0ad06f6483..f2828554641 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(REAGENT_ID_NUTRIMENT = list(1,5), "durianpaste" = list(1, 20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_DURIANPASTE = list(1, 20)) /datum/seed/durian/New() ..() diff --git a/code/modules/hydroponics/seedtypes/eggplant.dm b/code/modules/hydroponics/seedtypes/eggplant.dm index 1661aabe40c..4bcee3db256 100644 --- a/code/modules/hydroponics/seedtypes/eggplant.dm +++ b/code/modules/hydroponics/seedtypes/eggplant.dm @@ -27,5 +27,5 @@ display_name = "egg-plants" kitchen_tag = "egg-plant" mutants = null - chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "egg" = list(3,12)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_EGG = list(3,12)) has_item_product = /obj/item/reagent_containers/food/snacks/egg/purple diff --git a/code/modules/hydroponics/seedtypes/gelthi.dm b/code/modules/hydroponics/seedtypes/gelthi.dm index 3ced3c0e67f..3121c2a4787 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(REAGENT_ID_STOXIN = list(1,5),"capsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) + chems = list(REAGENT_ID_STOXIN = list(1,5),REAGENT_ID_CAPSAICIN = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/gelthi/New() ..() diff --git a/code/modules/hydroponics/seedtypes/grapes.dm b/code/modules/hydroponics/seedtypes/grapes.dm index 0da587e729b..73a7853221a 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(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SUGAR = list(1,5), "grapejuice" = list(10,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SUGAR = list(1,5), REAGENT_ID_GRAPEJUICE = list(10,10)) /datum/seed/grapes/New() ..() @@ -26,7 +26,7 @@ seed_name = "green grape" display_name = "green grapevines" mutants = null - chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_KELOTANE = list(3,5), "grapejuice" = list(10,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_KELOTANE = list(3,5), REAGENT_ID_GRAPEJUICE = list(10,10)) /datum/seed/grapes/green/New() ..() diff --git a/code/modules/hydroponics/seedtypes/malanitear.dm b/code/modules/hydroponics/seedtypes/malanitear.dm index 67106e41f73..f4878ca0032 100644 --- a/code/modules/hydroponics/seedtypes/malanitear.dm +++ b/code/modules/hydroponics/seedtypes/malanitear.dm @@ -3,7 +3,7 @@ seed_name = "Malani's tear" display_name = "Malani's tear leaves" kitchen_tag = "mtear" - chems = list("honey" = list(1,10), REAGENT_ID_KELOTANE = list(3,5)) + chems = list(REAGENT_ID_HONEY = list(1,10), REAGENT_ID_KELOTANE = list(3,5)) /datum/seed/mtear/New() ..() diff --git a/code/modules/hydroponics/seedtypes/peanuts.dm b/code/modules/hydroponics/seedtypes/peanuts.dm index 8dfa76addb4..db0a3c0f368 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(REAGENT_ID_NUTRIMENT = list(1,10), "peanutoil" = list(3,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_PEANUTOIL = list(3,10)) /datum/seed/peanuts/New() ..() diff --git a/code/modules/hydroponics/seedtypes/pineapple.dm b/code/modules/hydroponics/seedtypes/pineapple.dm index 27e14c6c925..3ac1d79e8d5 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(REAGENT_ID_NUTRIMENT = list(1,5), "pineapplejuice" = list(1, 20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_PINEAPPLEJUICE = list(1, 20)) /datum/seed/pineapple/New() ..() @@ -30,7 +30,7 @@ seed_name = "spineapple" display_name = "spineapple" kitchen_tag = "spineapple" - chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,5), REAGENT_ID_ENZYME = list(1,5), REAGENT_ID_PINEAPPLEJUICE = list(1, 20)) /datum/seed/spineapple/New() ..() diff --git a/code/modules/hydroponics/seedtypes/potato.dm b/code/modules/hydroponics/seedtypes/potato.dm index f3a76300a65..59aebee0c6a 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(REAGENT_ID_NUTRIMENT = list(1,10), "potatojuice" = list(10,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_POTATOJUICE = list(10,10)) /datum/seed/potato/New() ..() diff --git a/code/modules/hydroponics/seedtypes/rice.dm b/code/modules/hydroponics/seedtypes/rice.dm index e90c6b1e961..f52154c98b8 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(REAGENT_ID_NUTRIMENT = list(1,25), "rice" = list(10,15)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,25), REAGENT_ID_RICE = list(10,15)) /datum/seed/rice/New() ..() diff --git a/code/modules/hydroponics/seedtypes/soybean.dm b/code/modules/hydroponics/seedtypes/soybean.dm index c12d36803af..081949bde74 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(REAGENT_ID_NUTRIMENT = list(1,20), "soymilk" = list(10,20)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_SOYMILK = list(10,20)) /datum/seed/soybean/New() ..() diff --git a/code/modules/hydroponics/seedtypes/thaadra.dm b/code/modules/hydroponics/seedtypes/thaadra.dm index 7d2aaa1d939..c7ccb40f7d9 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),REAGENT_ID_NUTRIMENT = list(1,5)) + chems = list(REAGENT_ID_FROSTOIL = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5)) /datum/seed/thaadra/New() ..() diff --git a/code/modules/hydroponics/seedtypes/tomatoes.dm b/code/modules/hydroponics/seedtypes/tomatoes.dm index 3161361315c..ce45ff774cb 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(REAGENT_ID_NUTRIMENT = list(1,10), "tomatojuice" = list(10,10)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_TOMATOJUICE = list(10,10)) kitchen_tag = "tomato" /datum/seed/tomato/New() diff --git a/code/modules/hydroponics/seedtypes/vanilla.dm b/code/modules/hydroponics/seedtypes/vanilla.dm index 2d42a80c65a..a9b57d14e0a 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(REAGENT_ID_NUTRIMENT = list(1,10), "vanilla" = list(2,8), REAGENT_ID_SUGAR = list(1, 4)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_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 db3dde13f9a..253dccae168 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(REAGENT_ID_NUTRIMENT = list(1,10), "protein" = list(1,5), "enzyme" = list(0,3)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_PROTEIN = list(1,5), REAGENT_ID_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(REAGENT_ID_NUTRIMENT = list(1,3), "protein" = list(1,10), REAGENT_ID_SEROTROTIUMV = list(0,1)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,3), REAGENT_ID_PROTEIN = list(1,10), REAGENT_ID_SEROTROTIUMV = list(0,1)) /datum/seed/wabback/vine/New() ..() @@ -44,7 +44,7 @@ display_name = "wild wabback" mutants = list("whitewabback") has_item_product = null - chems = list(REAGENT_ID_NUTRIMENT = list(1,15), "protein" = list(0,2), "enzyme" = list(0,1)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_PROTEIN = list(0,2), REAGENT_ID_ENZYME = list(0,1)) /datum/seed/wabback/wild/New() ..() diff --git a/code/modules/hydroponics/seedtypes/watermelon.dm b/code/modules/hydroponics/seedtypes/watermelon.dm index 0999d88cba1..32d98d3f829 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(REAGENT_ID_NUTRIMENT = list(1,6), "watermelonjuice" = list(10,6)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,6), REAGENT_ID_WATERMELONJUICE = list(10,6)) /datum/seed/watermelon/New() ..() diff --git a/code/modules/hydroponics/seedtypes/wheat.dm b/code/modules/hydroponics/seedtypes/wheat.dm index 5febc076fb9..293d5cc047d 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(REAGENT_ID_NUTRIMENT = list(1,25), "flour" = list(10,30)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,25), REAGENT_ID_FLOUR = list(10,30)) /datum/seed/wheat/New() ..() diff --git a/code/modules/hydroponics/seedtypes/wurmwoad.dm b/code/modules/hydroponics/seedtypes/wurmwoad.dm index 3ca70c9af6e..f677ec89936 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(REAGENT_ID_NUTRIMENT = list(1,10), "spacespice" = list(5,15)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SPACESPICE = list(5,15)) kitchen_tag = "wurmwoad" /datum/seed/wurmwoad/New() diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index c11ac18bb68..f0defd9f456 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -66,11 +66,11 @@ REAGENT_ID_RADIUM = 2 ) var/static/list/nutrient_reagents = list( - "milk" = 0.1, + REAGENT_ID_MILK = 0.1, "beer" = 0.25, REAGENT_ID_PHOSPHORUS = 0.1, REAGENT_ID_SUGAR = 0.1, - "sodawater" = 0.1, + REAGENT_ID_SODAWATER = 0.1, REAGENT_ID_AMMONIA = 1, REAGENT_ID_DIETHYLAMINE = 2, REAGENT_ID_NUTRIMENT = 1, @@ -97,13 +97,13 @@ var/static/list/water_reagents = list( REAGENT_ID_WATER = 1, REAGENT_ID_ADMINORDRAZINE = 1, - "milk" = 0.9, + REAGENT_ID_MILK = 0.9, "beer" = 0.7, REAGENT_ID_FLUORINE = -0.5, REAGENT_ID_CHLORINE = -0.5, REAGENT_ID_PHOSPHORUS = -0.5, REAGENT_ID_WATER = 1, - "sodawater" = 1, + REAGENT_ID_SODAWATER = 1, ) // Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order). @@ -112,7 +112,7 @@ 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 ), + REAGENT_ID_SODAWATER = list( 0.1, 0, 0 ), REAGENT_ID_SACID = list( -1, 0, 0 ), REAGENT_ID_PACID = list( -2, 0, 0 ), REAGENT_ID_PLANTBGONE = list( -2, 0, 0.2), @@ -164,7 +164,7 @@ return if(weedlevel > 0) - nymph.reagents.add_reagent("glucose", weedlevel) + nymph.reagents.add_reagent(REAGENT_ID_GLUCOSE, weedlevel) weedlevel = 0 nymph.visible_message(span_notice(span_bold("[nymph]") + " begins rooting through [src], ripping out weeds and eating them noisily."),span_notice("You begin rooting through [src], ripping out weeds and eating them noisily.")) else if(nymph.nutrition > 100 && nutrilevel < 10) 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 7be8f1fee37..f24185eff6e 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(REAGENT_ID_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(REAGENT_ID_PROTEIN, 15)) //protein needs half as much. For reference, a steak contains 9u protein. return TRUE - else if (ingested.has_reagent(REAGENT_ID_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(REAGENT_ID_PROTEIN, 30)) //try forcefeeding them, why not. Less effective. return TRUE else return FALSE 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 e0da78daf72..f5d67bf50b9 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 @@ -748,7 +748,7 @@ name = "Supply Storage" desc = "A mounted survival unit with fuel processor, helpful with both deliveries and assisting injured miners." icon_state = "sleeperc" - injection_chems = list("glucose",REAGENT_ID_INAPROVALINE,REAGENT_ID_TRICORDRAZINE) + injection_chems = list(REAGENT_ID_GLUCOSE,REAGENT_ID_INAPROVALINE,REAGENT_ID_TRICORDRAZINE) max_item_count = 10 recycles = FALSE stabilizer = TRUE diff --git a/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/code/modules/mob/living/silicon/robot/sprites/civilian.dm index ad912f5180a..0f3f6ed6394 100644 --- a/code/modules/mob/living/silicon/robot/sprites/civilian.dm +++ b/code/modules/mob/living/silicon/robot/sprites/civilian.dm @@ -209,10 +209,10 @@ var/list/booze_options = list("Beer" = "booze", "Space Mountain Wind" = "boozegreen", "Curacao" = "boozeblue", - "Grape Soda" = "boozepurple", + REAGENT_GRAPESODA = "boozepurple", "Demon's Blood" = "boozered", "Whiskey Soda" = "boozeorange", - "Coffee" = "boozebrown") + REAGENT_COFFEE = "boozebrown") /datum/robot_sprite/dogborg/service/booze/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg) if(!("boozehound" in ourborg.sprite_extra_customization) || !ourborg.sprite_extra_customization["boozehound"]) 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 6c20b92636c..4dd3823f02e 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 @@ -162,8 +162,8 @@ to_chat(user, span_notice("\The [src] seems too full to eat.")) return 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/protein_amount = O.reagents?.get_reagent_amount(REAGENT_ID_PROTEIN) //does it have protein, if so how much? + var/glucose_amount = O.reagents?.get_reagent_amount(REAGENT_ID_GLUCOSE) //does it have glucose, if so how much? var/yum = nutriment_amount + protein_amount + glucose_amount if(yum) yum = (yum * 20) / 3 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 a8f73c964be..a119d03c73e 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 @@ -513,8 +513,8 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? 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(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/protein_amount = O.reagents?.get_reagent_amount(REAGENT_ID_PROTEIN) //does it have protein, if so how much? + var/glucose_amount = O.reagents?.get_reagent_amount(REAGENT_ID_GLUCOSE) //does it have glucose, if so how much? var/yum = nutriment_amount + protein_amount + glucose_amount if(yum) if(!teppi_adult) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm index 4ef95170e82..556d10d678a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm @@ -33,7 +33,7 @@ var/obj/item/reagent_containers/glass/G = O if(stat == CONSCIOUS && istype(G) && G.is_open_container()) user.visible_message(span_notice("[user] milks [src] using \the [O].")) - var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) + var/transfered = udder.trans_id_to(G, REAGENT_ID_MILK, rand(5,10)) if(G.reagents.total_volume >= G.volume) to_chat(user, span_red("The [O] is full.")) if(!transfered) @@ -45,7 +45,7 @@ . = ..() if(stat == CONSCIOUS) if(udder && prob(5)) - udder.add_reagent("milk", rand(5, 10)) + udder.add_reagent(REAGENT_ID_MILK, rand(5, 10)) /mob/living/simple_mob/animal/passive/cow/attack_hand(mob/living/carbon/M as mob) if(!stat && M.a_intent == I_DISARM && icon_state != icon_dead) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm index a1fccf962c3..4b949d687f1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm @@ -37,7 +37,7 @@ if(.) if(stat == CONSCIOUS) if(udder && prob(5)) - udder.add_reagent("milk", rand(5, 10)) + udder.add_reagent(REAGENT_ID_MILK, rand(5, 10)) if(locate(/obj/effect/plant) in loc) var/obj/effect/plant/SV = locate() in loc @@ -64,7 +64,7 @@ var/obj/item/reagent_containers/glass/G = O if(stat == CONSCIOUS && istype(G) && G.is_open_container()) user.visible_message(span_notice("[user] milks [src] using \the [O].")) - var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) + var/transfered = udder.trans_id_to(G, REAGENT_ID_MILK, rand(5,10)) if(G.reagents.total_volume >= G.volume) to_chat(user, span_red("The [O] is full.")) if(!transfered) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/frost.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/frost.dm index 2128b98ef4a..4b44839d9b3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/frost.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/frost.dm @@ -27,7 +27,7 @@ health = 175 poison_per_bite = 5 - poison_type = "cryotoxin" + poison_type = REAGENT_ID_CRYOTOXIN heat_resist = -0.50 cold_resist = 0.75 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 261d37a7c51..420b7a1aa18 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm @@ -49,7 +49,7 @@ var/list/bodypart_targets = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD) var/infest_target = BP_TORSO // The currently chosen bodypart to infest. var/mob/living/carbon/host // Our humble host. - var/list/produceable_chemicals = list(REAGENT_ID_INAPROVALINE,REAGENT_ID_ANTITOXIN,REAGENT_ID_ALKYSINE,REAGENT_ID_BICARIDINE,REAGENT_ID_TRAMADOL,REAGENT_ID_KELOTANE,REAGENT_ID_LEPORAZINE,REAGENT_ID_IRON,REAGENT_ID_PHORON,REAGENT_ID_CONDENSEDCAPSAICINV,"frostoil") + var/list/produceable_chemicals = list(REAGENT_ID_INAPROVALINE,REAGENT_ID_ANTITOXIN,REAGENT_ID_ALKYSINE,REAGENT_ID_BICARIDINE,REAGENT_ID_TRAMADOL,REAGENT_ID_KELOTANE,REAGENT_ID_LEPORAZINE,REAGENT_ID_IRON,REAGENT_ID_PHORON,REAGENT_ID_CONDENSEDCAPSAICINV,REAGENT_ID_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 = REAGENT_ID_PARACETAMOL // Reagent passively produced by the leech. Should usually be a painkiller. @@ -188,7 +188,7 @@ chemicals -= 30 if(host.getToxLoss() >= 30 && chemicals > 50) - var/randomchem = pickweight(list(REAGENT_ID_TRAMADOL = 7, REAGENT_ID_ANTITOXIN = 15, "frostoil" = 3)) + var/randomchem = pickweight(list(REAGENT_ID_TRAMADOL = 7, REAGENT_ID_ANTITOXIN = 15, REAGENT_ID_FROSTOIL = 3)) host.reagents.add_reagent(randomchem, 5) chemicals -= 50 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 5dd0edb14db..0feabb6987d 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 @@ -57,7 +57,7 @@ color = "#19FFFF" slime_color = "blue" coretype = /obj/item/slime_extract/blue - reagent_injected = "cryotoxin" + reagent_injected = REAGENT_ID_CRYOTOXIN cold_resist = 0.50 // Not as strong as dark blue, which has immunity. description_info = "The slime is resistant to the cold, and attacks from this slime can inject cryotoxin into you. \ diff --git a/code/modules/projectiles/projectile/blob.dm b/code/modules/projectiles/projectile/blob.dm index 752e70cd4a7..291bfec6b28 100644 --- a/code/modules/projectiles/projectile/blob.dm +++ b/code/modules/projectiles/projectile/blob.dm @@ -64,7 +64,7 @@ my_chems = list(REAGENT_ID_FUEL, REAGENT_ID_MOLD) /obj/item/projectile/energy/blob/freezing - my_chems = list("frostoil") + my_chems = list(REAGENT_ID_FROSTOIL) modifier_type_to_apply = /datum/modifier/chilled modifier_duration = 1 MINUTE diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm index a6912dfea73..30072ff930b 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm @@ -90,65 +90,65 @@ /obj/item/reagent_containers/chem_disp_cartridge/ice spawn_reagent = "ice" /obj/item/reagent_containers/chem_disp_cartridge/tea - spawn_reagent = "tea" + spawn_reagent = REAGENT_ID_TEA /obj/item/reagent_containers/chem_disp_cartridge/icetea - spawn_reagent = "icetea" + spawn_reagent = REAGENT_ID_ICETEA /obj/item/reagent_containers/chem_disp_cartridge/cola - spawn_reagent = "cola" + spawn_reagent = REAGENT_ID_COLA /obj/item/reagent_containers/chem_disp_cartridge/smw - spawn_reagent = "spacemountainwind" + spawn_reagent = REAGENT_ID_SPACEMOUNTAINWIND /obj/item/reagent_containers/chem_disp_cartridge/dr_gibb - spawn_reagent = "dr_gibb" + spawn_reagent = REAGENT_ID_DRGIBB /obj/item/reagent_containers/chem_disp_cartridge/spaceup - spawn_reagent = "space_up" + spawn_reagent = REAGENT_ID_SPACEUP /obj/item/reagent_containers/chem_disp_cartridge/tonic - spawn_reagent = "tonic" + spawn_reagent = REAGENT_ID_TONIC /obj/item/reagent_containers/chem_disp_cartridge/sodawater - spawn_reagent = "sodawater" + spawn_reagent = REAGENT_ID_SODAWATER /obj/item/reagent_containers/chem_disp_cartridge/lemon_lime - spawn_reagent = "lemon_lime" + spawn_reagent = REAGENT_ID_LEMONLIME /obj/item/reagent_containers/chem_disp_cartridge/orange - spawn_reagent = "orangejuice" + spawn_reagent = REAGENT_ID_ORANGEJUICE /obj/item/reagent_containers/chem_disp_cartridge/lime - spawn_reagent = "limejuice" + spawn_reagent = REAGENT_ID_LIMEJUICE /obj/item/reagent_containers/chem_disp_cartridge/watermelon - spawn_reagent = "watermelonjuice" + spawn_reagent = REAGENT_ID_WATERMELONJUICE /obj/item/reagent_containers/chem_disp_cartridge/lemon - spawn_reagent = "lemonjuice" + spawn_reagent = REAGENT_ID_LEMONJUICE /obj/item/reagent_containers/chem_disp_cartridge/grapesoda - spawn_reagent = "grapesoda" + spawn_reagent = REAGENT_ID_GRAPESODA /obj/item/reagent_containers/chem_disp_cartridge/pineapple - spawn_reagent = "pineapplejuice" + spawn_reagent = REAGENT_ID_PINEAPPLEJUICE // Bar, coffee /obj/item/reagent_containers/chem_disp_cartridge/coffee - spawn_reagent = "coffee" + spawn_reagent = REAGENT_ID_COFFEE /obj/item/reagent_containers/chem_disp_cartridge/drip_coffee - spawn_reagent = "drip_coffee" + spawn_reagent = REAGENT_ID_DRIPCOFFEE /obj/item/reagent_containers/chem_disp_cartridge/cafe_latte - spawn_reagent = "cafe_latte" + spawn_reagent = REAGENT_ID_CAFELATTE /obj/item/reagent_containers/chem_disp_cartridge/soy_latte - spawn_reagent = "soy_latte" + spawn_reagent = REAGENT_ID_SOYLATTE /obj/item/reagent_containers/chem_disp_cartridge/hot_coco - spawn_reagent = "hot_coco" + spawn_reagent = REAGENT_ID_HOTCOCO /obj/item/reagent_containers/chem_disp_cartridge/milk - spawn_reagent = "milk" + spawn_reagent = REAGENT_ID_MILK /obj/item/reagent_containers/chem_disp_cartridge/milk_foam - spawn_reagent = "milk_foam" + spawn_reagent = REAGENT_ID_MILKFOAM /obj/item/reagent_containers/chem_disp_cartridge/cream - spawn_reagent = "cream" + spawn_reagent = REAGENT_ID_CREAM /obj/item/reagent_containers/chem_disp_cartridge/mint - spawn_reagent = "mint" + spawn_reagent = REAGENT_ID_MINT /obj/item/reagent_containers/chem_disp_cartridge/berry - spawn_reagent = "berryjuice" + spawn_reagent = REAGENT_ID_BERRYJUICE /obj/item/reagent_containers/chem_disp_cartridge/greentea - spawn_reagent = "greentea" + spawn_reagent = REAGENT_ID_GREENTEA /obj/item/reagent_containers/chem_disp_cartridge/decaf - spawn_reagent = "decaf" + spawn_reagent = REAGENT_ID_DECAF /obj/item/reagent_containers/chem_disp_cartridge/chaitea - spawn_reagent = "chaitea" + spawn_reagent = REAGENT_ID_CHAITEA /obj/item/reagent_containers/chem_disp_cartridge/decafchai - spawn_reagent = "chaiteadecaf" + spawn_reagent = REAGENT_ID_CHAITEADECAF // syrups /obj/item/reagent_containers/chem_disp_cartridge/syrup_pumpkin @@ -172,7 +172,7 @@ /obj/item/reagent_containers/chem_disp_cartridge/syrup_cherry spawn_reagent = "syrup_cherry" /obj/item/reagent_containers/chem_disp_cartridge/grenadine - spawn_reagent = "grenadine" + spawn_reagent = REAGENT_ID_GRENADINE /obj/item/reagent_containers/chem_disp_cartridge/syrup_butterscotch spawn_reagent = "syrup_butterscotch" /obj/item/reagent_containers/chem_disp_cartridge/syrup_chocolate diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm index e6de541cef0..08f50c48985 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets_vr.dm @@ -7,7 +7,7 @@ //Biochem nutriment spawn_reagent = REAGENT_ID_NUTRIMENT - protein spawn_reagent = "protein" + protein spawn_reagent = REAGENT_ID_PROTEIN //Special Ops biomass spawn_reagent = REAGENT_ID_BIOMASS diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm index 30dad26e77b..675d8e32439 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm @@ -46,25 +46,25 @@ /obj/machinery/chemical_dispenser/bar_soft dispense_reagents = list( - 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", "pineapplejuice" + REAGENT_ID_WATER, "ice", REAGENT_ID_COFFEE, REAGENT_ID_CREAM, REAGENT_ID_TEA, REAGENT_ID_ICETEA, REAGENT_ID_COLA, REAGENT_ID_SPACEMOUNTAINWIND, REAGENT_ID_DRGIBB, REAGENT_ID_SPACEUP, REAGENT_ID_TONIC, + REAGENT_ID_SODAWATER, REAGENT_ID_LEMONJUICE, REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_WATERMELONJUICE, "thirteenloko", REAGENT_ID_GRAPESODA, REAGENT_ID_PINEAPPLEJUICE ) /obj/machinery/chemical_dispenser/bar_alc dispense_reagents = list( - "lemon_lime", REAGENT_ID_SUGAR, "orangejuice", "limejuice", "sodawater", "tonic", "beer", "kahlua", + REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_SODAWATER, REAGENT_ID_TONIC, "beer", "kahlua", "whiskey", "redwine", "whitewine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters" ) /obj/machinery/chemical_dispenser/bar_coffee dispense_reagents = list( - "coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice", "water", - "orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint", "decaf", "greentea", "milk_foam", "drip_coffee" + REAGENT_ID_COFFEE, REAGENT_ID_CAFELATTE, REAGENT_ID_SOYLATTE, REAGENT_ID_HOTCOCO, REAGENT_ID_MILK, REAGENT_ID_CREAM, REAGENT_ID_TEA, "ice", "water", + REAGENT_ID_ORANGEJUICE, REAGENT_ID_LEMONJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_BERRYJUICE, REAGENT_ID_MINT, REAGENT_ID_DECAF, REAGENT_ID_GREENTEA, REAGENT_ID_MILKFOAM, REAGENT_ID_DRIPCOFFEE ) /obj/machinery/chemical_dispenser/bar_syrup dispense_reagents = list( "syrup_pumpkin", "syrup_caramel", "syrup_salted_caramel", "syrup_irish", "syrup_almond", "syrup_cinnamon", "syrup_pistachio", - "syrup_vanilla", "syrup_toffee", "grenadine", "syrup_cherry", "syrup_butterscotch", "syrup_chocolate", "syrup_white_chocolate", "syrup_strawberry", + "syrup_vanilla", "syrup_toffee", REAGENT_ID_GRENADINE, "syrup_cherry", "syrup_butterscotch", "syrup_chocolate", "syrup_white_chocolate", "syrup_strawberry", "syrup_coconut", "syrup_ginger", "syrup_gingerbread", "syrup_peppermint", "syrup_birthday" ) diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm index 3a9ae7e7ed8..7814c13f6ec 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser_presets_vr.dm @@ -22,7 +22,7 @@ name = "bioproduct dispenser" ui_title = "Bioproduct Dispenser" dispense_reagents = list( - REAGENT_ID_NUTRIMENT, "protein", "milk" + REAGENT_ID_NUTRIMENT, REAGENT_ID_PROTEIN, REAGENT_ID_MILK ) /obj/machinery/chemical_dispenser/biochemistry/full diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 4a3fe22e9fc..27ceeee2d04 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -307,7 +307,7 @@ /obj/structure/reagent_dispensers/peppertank/Initialize() . = ..() - reagents.add_reagent("condensedcapsaicin",1000) + reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN,1000) /obj/structure/reagent_dispensers/virusfood name = "Virus Food Dispenser" @@ -320,7 +320,7 @@ /obj/structure/reagent_dispensers/virusfood/Initialize() . = ..() - reagents.add_reagent("virusfood", 1000) + reagents.add_reagent(REAGENT_ID_VIRUSFOOD, 1000) /obj/structure/reagent_dispensers/acid name = "Sulphuric Acid Dispenser" @@ -527,7 +527,7 @@ /obj/structure/reagent_dispensers/cookingoil/Initialize() . = ..() - reagents.add_reagent("cookingoil",5000) + reagents.add_reagent(REAGENT_ID_COOKINGOIL,5000) /obj/structure/reagent_dispensers/cookingoil/bullet_act(var/obj/item/projectile/Proj) if(Proj.get_structure_damage()) diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm index 399e921d242..d6d576c8d7d 100644 --- a/code/modules/reagents/machinery/grinder.dm +++ b/code/modules/reagents/machinery/grinder.dm @@ -9,15 +9,15 @@ var/global/list/sheet_reagents = list( //have a number of reagents divisible by /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/leather = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_PROTEIN,REAGENT_ID_PROTEIN,REAGENT_ID_TRIGLYCERIDE), + /obj/item/stack/material/cloth = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_PROTEIN,REAGENT_ID_SODIUM), + /obj/item/stack/material/fiber = list(REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_CARBON,REAGENT_ID_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,REAGENT_ID_PLATINUM), - /obj/item/stack/material/wax = list(REAGENT_ID_ETHANOL,"triglyceride"), + /obj/item/stack/material/wax = list(REAGENT_ID_ETHANOL,REAGENT_ID_TRIGLYCERIDE), /obj/item/stack/material/iron = list(REAGENT_ID_IRON), /obj/item/stack/material/uranium = list(REAGENT_ID_URANIUM), /obj/item/stack/material/phoron = list(REAGENT_ID_PHORON), diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm index 65b32a14409..ef5f5e46dc0 100644 --- a/code/modules/reagents/reactions/distilling/distilling.dm +++ b/code/modules/reagents/reactions/distilling/distilling.dm @@ -119,7 +119,7 @@ name = "Distilling Synthplas" id = "distill_synthplas" result = REAGENT_ID_SYNTHBLOOD_DILUTE - required_reagents = list("protein" = 2, REAGENT_ID_ANTIBODIES = 1, REAGENT_ID_BICARIDINE = 1) + required_reagents = list(REAGENT_ID_PROTEIN = 2, REAGENT_ID_ANTIBODIES = 1, REAGENT_ID_BICARIDINE = 1) result_amount = 3 reaction_rate = HALF_LIFE(15) @@ -174,7 +174,7 @@ name = "Distilling Cryogellatin" id = "distill_cryoslurry" result = REAGENT_ID_CRYOSLURRY - required_reagents = list("frostoil" = 7, "enzyme" = 3, REAGENT_ID_PLASTICIDE = 3, REAGENT_ID_FOAMINGAGENT = 2) + required_reagents = list(REAGENT_ID_FROSTOIL = 7, REAGENT_ID_ENZYME = 3, REAGENT_ID_PLASTICIDE = 3, REAGENT_ID_FOAMINGAGENT = 2) inhibitors = list(REAGENT_ID_WATER = 5) result_amount = 1 diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm index 4e69751c478..174431ef251 100644 --- a/code/modules/reagents/reactions/instant/drinks.dm +++ b/code/modules/reagents/reactions/instant/drinks.dm @@ -1,50 +1,50 @@ /decl/chemical_reaction/instant/drinks/coffee - name = "Coffee" - id = "coffee" - result = "coffee" - required_reagents = list(REAGENT_ID_WATER = 5, "coffeepowder" = 1) + name = REAGENT_COFFEE + id = REAGENT_ID_COFFEE + result = REAGENT_ID_COFFEE + required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_COFFEEPOWDER = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/tea name = "Black tea" - id = "tea" - result = "tea" - required_reagents = list(REAGENT_ID_WATER = 5, "teapowder" = 1) + id = REAGENT_ID_TEA + result = REAGENT_ID_TEA + required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_TEAPOWDER = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/hot_coco name = "Hot Coco" - id = "hot_coco" - result = "hot_coco" - required_reagents = list(REAGENT_ID_WATER = 5, "coco" = 1) + id = REAGENT_ID_HOTCOCO + result = REAGENT_ID_HOTCOCO + required_reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_COCO = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/grapejuice - name = "Grape Juice" - id = "grapejuice" - result = "grapejuice" - required_reagents = list(REAGENT_ID_WATER = 3, "instantgrape" = 1) + name = REAGENT_GRAPEJUICE + id = REAGENT_ID_GRAPEJUICE + result = REAGENT_ID_GRAPEJUICE + required_reagents = list(REAGENT_ID_WATER = 3, REAGENT_ID_INSTANTGRAPE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/orangejuice - name = "Orange Juice" - id = "orangejuice" - result = "orangejuice" - required_reagents = list(REAGENT_ID_WATER = 3, "instantorange" = 1) + name = REAGENT_ORANGEJUICE + id = REAGENT_ID_ORANGEJUICE + result = REAGENT_ID_ORANGEJUICE + required_reagents = list(REAGENT_ID_WATER = 3, REAGENT_ID_INSTANTORANGE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/watermelonjuice - name = "Watermelon Juice" - id = "watermelonjuice" - result = "watermelonjuice" - required_reagents = list(REAGENT_ID_WATER = 3, "instantwatermelon" = 1) + name = REAGENT_WATERMELONJUICE + id = REAGENT_ID_WATERMELONJUICE + result = REAGENT_ID_WATERMELONJUICE + required_reagents = list(REAGENT_ID_WATER = 3, REAGENT_ID_INSTANTWATERMELON = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/applejuice - name = "Apple Juice" - id = "applejuice" - result = "applejuice" - required_reagents = list(REAGENT_ID_WATER = 3, "instantapple" = 1) + name = REAGENT_APPLEJUICE + id = REAGENT_ID_APPLEJUICE + result = REAGENT_ID_APPLEJUICE + required_reagents = list(REAGENT_ID_WATER = 3, REAGENT_ID_INSTANTAPPLE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/goldschlager @@ -65,112 +65,112 @@ name = "Bilk" id = "bilk" result = "bilk" - required_reagents = list("milk" = 1, "beer" = 1) + required_reagents = list(REAGENT_ID_MILK = 1, "beer" = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/icetea - name = "Iced Tea" - id = "icetea" - result = "icetea" - required_reagents = list("ice" = 1, "tea" = 2) + name = REAGENT_ICETEA + id = REAGENT_ID_ICETEA + result = REAGENT_ID_ICETEA + required_reagents = list("ice" = 1, REAGENT_ID_TEA = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/icecoffee - name = "Iced Coffee" - id = "icecoffee" - result = "icecoffee" - required_reagents = list("ice" = 1, "coffee" = 2) + name = REAGENT_ICECOFFEE + id = REAGENT_ID_ICECOFFEE + result = REAGENT_ID_ICECOFFEE + required_reagents = list("ice" = 1, REAGENT_ID_COFFEE = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/icecoffee/alt name = "Iced Drip Coffee" - id = "icecoffee" - result = "icecoffee" - required_reagents = list("ice" = 1, "drip_coffee" = 2) + id = REAGENT_ID_ICECOFFEE + result = REAGENT_ID_ICECOFFEE + required_reagents = list("ice" = 1, REAGENT_ID_DRIPCOFFEE = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/blackeye - name = "Black Eye Coffee" - id = "black_eye" - result = "black_eye" - required_reagents = list("drip_coffee" = 1, "coffee" = 1) + name = REAGENT_BLACKEYE + id = REAGENT_ID_BLACKEYE + result = REAGENT_ID_BLACKEYE + required_reagents = list(REAGENT_ID_DRIPCOFFEE = 1, REAGENT_ID_COFFEE = 1) result_amount = 1 /decl/chemical_reaction/instant/drinks/americano - name = "Americano" - id = "americano" - result = "americano" - required_reagents = list("water" = 1, "long_black" = 2) + name = REAGENT_AMERICANO + id = REAGENT_ID_AMERICANO + result = REAGENT_ID_AMERICANO + required_reagents = list("water" = 1, REAGENT_ID_LONGBLACK = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/long_black - name = "Long Black Coffee" - id = "long_black" - result = "long_black" - required_reagents = list("water" = 1, "coffee" = 1) + name = REAGENT_LONGBLACK + id = REAGENT_ID_LONGBLACK + result = REAGENT_ID_LONGBLACK + required_reagents = list("water" = 1, REAGENT_ID_COFFEE = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/macchiato - name = "Macchiato" - id = "macchiato" - result = "macchiato" - required_reagents = list("milk" = 1, "coffee" = 2) + name = REAGENT_MACCHIATO + id = REAGENT_ID_MACCHIATO + result = REAGENT_ID_MACCHIATO + required_reagents = list(REAGENT_ID_MILK = 1, REAGENT_ID_COFFEE = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/cortado - name = "Cortado" - id = "cortado" - result = "cortado" - required_reagents = list("macchiato" = 3, "milk_foam" = 1) // 2 coffee, 1 milk, 1 milk foam + name = REAGENT_CORTADO + id = REAGENT_ID_CORTADO + result = REAGENT_ID_CORTADO + required_reagents = list(REAGENT_ID_MACCHIATO = 3, REAGENT_ID_MILKFOAM = 1) // 2 coffee, 1 milk, 1 milk foam result_amount = 4 /decl/chemical_reaction/instant/drinks/breve - name = "Breve" - id = "breve" - result = "breve" - required_reagents = list("cortado" = 4, "cream" = 1) // 2 coffee, 1 milk, 1 milk foam, 1 cream + name = REAGENT_BREVE + id = REAGENT_ID_BREVE + result = REAGENT_ID_BREVE + required_reagents = list(REAGENT_ID_CORTADO = 4, REAGENT_ID_CREAM = 1) // 2 coffee, 1 milk, 1 milk foam, 1 cream result_amount = 5 /decl/chemical_reaction/instant/drinks/cappuccino - name = "Cappuccino" - id = "cappuccino" - result = "cappuccino" - required_reagents = list("milk" = 1, "milk_foam" = 1, "cortado" = 4) // 2 coffee, 2 milk, 2 milk foam + name = REAGENT_CAPPUCCINO + id = REAGENT_ID_CAPPUCCINO + result = REAGENT_ID_CAPPUCCINO + required_reagents = list(REAGENT_ID_MILK = 1, REAGENT_ID_MILKFOAM = 1, REAGENT_ID_CORTADO = 4) // 2 coffee, 2 milk, 2 milk foam result_amount = 6 /decl/chemical_reaction/instant/drinks/flat_white - name = "Flat White Coffee" - id = "flat_white" - result = "flat_white" - required_reagents = list("milk" = 2, "drip_coffee" = 1) // 2 drip coffee, 4 milk I'M SORRY THAT ITS DRIP COFFEE, otherwise it just gets in the way of all other reactions + name = REAGENT_FLATWHITE + id = REAGENT_ID_FLATWHITE + result = REAGENT_ID_FLATWHITE + required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_DRIPCOFFEE = 1) // 2 drip coffee, 4 milk I'M SORRY THAT ITS DRIP COFFEE, otherwise it just gets in the way of all other reactions result_amount = 3 /decl/chemical_reaction/instant/drinks/mocha - name = "Mocha" - id = "mocha" - result = "mocha" - required_reagents = list("milk" = 1, "cream" = 1, "milk_foam" = 1, "hot_coco" = 2, "breve" = 5) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco + name = REAGENT_MOCHA + id = REAGENT_ID_MOCHA + result = REAGENT_ID_MOCHA + required_reagents = list(REAGENT_ID_MILK = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_MILKFOAM = 1, REAGENT_ID_HOTCOCO = 2, REAGENT_ID_BREVE = 5) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco result_amount = 10 /decl/chemical_reaction/instant/drinks/mocha/alt //incase they use cream before milk - name = "Mocha" - id = "mocha" - result = "mocha" - required_reagents = list("cream" = 2, "hot_coco" = 2, "cappuccino" = 6) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco + name = REAGENT_MOCHA + id = REAGENT_ID_MOCHA + result = REAGENT_ID_MOCHA + required_reagents = list(REAGENT_ID_CREAM = 2, REAGENT_ID_HOTCOCO = 2, REAGENT_ID_CAPPUCCINO = 6) // 2 coffee, 2 milk, 2 cream, 2 milk foam and 2 hot coco result_amount = 10 /decl/chemical_reaction/instant/drinks/vienna - name = "Vienna" - id = "vienna" - result = "vienna" - required_reagents = list("cream" = 2, "coffee" = 1) + name = REAGENT_VIENNA + id = REAGENT_ID_VIENNA + result = REAGENT_ID_VIENNA + required_reagents = list(REAGENT_ID_CREAM = 2, REAGENT_ID_COFFEE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/nuka_cola name = "Nuclear Cola" - id = "nuka_cola" - result = "nuka_cola" - required_reagents = list(REAGENT_ID_URANIUM = 1, "cola" = 5) + id = REAGENT_ID_NUKACOLA + result = REAGENT_ID_NUKACOLA + required_reagents = list(REAGENT_ID_URANIUM = 1, REAGENT_ID_COLA = 5) result_amount = 5 /decl/chemical_reaction/instant/drinks/moonshine @@ -178,71 +178,71 @@ id = "moonshine" result = "moonshine" required_reagents = list(REAGENT_ID_NUTRIMENT = 10) - catalysts = list("enzyme" = 5) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/grenadine - name = "Grenadine Syrup" - id = "grenadine" - result = "grenadine" - required_reagents = list("berryjuice" = 10) - catalysts = list("enzyme" = 5) + name = REAGENT_GRENADINE + id = REAGENT_ID_GRENADINE + result = REAGENT_ID_GRENADINE + required_reagents = list(REAGENT_ID_BERRYJUICE = 10) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/wine name = "Wine" id = "redwine" result = "redwine" - required_reagents = list("grapejuice" = 10) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_GRAPEJUICE = 10) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/pwine name = "Poison Wine" id = "pwine" result = "pwine" - required_reagents = list("poisonberryjuice" = 10) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_POISONBERRYJUICE = 10) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/melonliquor name = "Melon Liquor" id = "melonliquor" result = "melonliquor" - required_reagents = list("watermelonjuice" = 10) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_WATERMELONJUICE = 10) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/bluecuracao name = "Blue Curacao" id = "bluecuracao" result = "bluecuracao" - required_reagents = list("orangejuice" = 10) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_ORANGEJUICE = 10) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/spacebeer name = "Space Beer" id = "spacebeer" result = "beer" - required_reagents = list("cornoil" = 5, "flour" = 5) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_CORNOIL = 5, REAGENT_ID_FLOUR = 5) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/vodka name = "Vodka" id = "vodka" result = "vodka" - required_reagents = list("potatojuice" = 10) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_POTATOJUICE = 10) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/cider name = "Cider" id = "cider" result = "cider" - required_reagents = list("applejuice" = 10) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_APPLEJUICE = 10) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 @@ -250,37 +250,37 @@ name = "Sake" id = "sake" result = "sake" - required_reagents = list("rice" = 10) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_RICE = 10) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/kahlua name = "Kahlua" id = "kahlua" result = "kahlua" - required_reagents = list("coffee" = 5, REAGENT_ID_SUGAR = 5) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_COFFEE = 5, REAGENT_ID_SUGAR = 5) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 5 /decl/chemical_reaction/instant/drinks/gin_tonic name = "Gin and Tonic" id = "gintonic" result = "gintonic" - required_reagents = list("gin" = 2, "tonic" = 1) + required_reagents = list("gin" = 2, REAGENT_ID_TONIC = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/rum_and_cola name = "Rum and Cola" id = "rumandcola" result = "rumandcola" - required_reagents = list("rum" = 2, "cola" = 1) + required_reagents = list("rum" = 2, REAGENT_ID_COLA = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/cuba_libre name = "Cuba Libre" id = "cubalibre" result = "cubalibre" - required_reagents = list("rumandcola" = 3, "limejuice" = 1) + required_reagents = list("rumandcola" = 3, REAGENT_ID_LIMEJUICE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/martini @@ -302,35 +302,35 @@ name = "White Russian" id = "whiterussian" result = "whiterussian" - required_reagents = list("blackrussian" = 2, "cream" = 1) + required_reagents = list("blackrussian" = 2, REAGENT_ID_CREAM = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/whiskey_cola name = "Whiskey Cola" id = "whiskeycola" result = "whiskeycola" - required_reagents = list("whiskey" = 2, "cola" = 1) + required_reagents = list("whiskey" = 2, REAGENT_ID_COLA = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/screwdriver name = "Screwdriver" id = "screwdrivercocktail" result = "screwdrivercocktail" - required_reagents = list("vodka" = 2, "orangejuice" = 1) + required_reagents = list("vodka" = 2, REAGENT_ID_ORANGEJUICE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/bloody_mary name = "Bloody Mary" id = "bloodymary" result = "bloodymary" - required_reagents = list("vodka" = 2, "tomatojuice" = 3, "limejuice" = 1) + required_reagents = list("vodka" = 2, REAGENT_ID_TOMATOJUICE = 3, REAGENT_ID_LIMEJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/gargle_blaster name = "Pan-Galactic Gargle Blaster" id = "gargleblaster" result = "gargleblaster" - required_reagents = list("vodka" = 2, "gin" = 1, "whiskey" = 1, "cognac" = 1, "limejuice" = 1) + required_reagents = list("vodka" = 2, "gin" = 1, "whiskey" = 1, "cognac" = 1, REAGENT_ID_LIMEJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/brave_bull @@ -344,7 +344,7 @@ name = "Tequilla Sunrise" id = "tequillasunrise" result = "tequillasunrise" - required_reagents = list("tequilla" = 2, "orangejuice" = 1) + required_reagents = list("tequilla" = 2, REAGENT_ID_ORANGEJUICE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/phoron_special @@ -358,21 +358,21 @@ name = "Beepksy Smash" id = "beepksysmash" result = "beepskysmash" - required_reagents = list("limejuice" = 1, "whiskey" = 1, REAGENT_ID_IRON = 1) + required_reagents = list(REAGENT_ID_LIMEJUICE = 1, "whiskey" = 1, REAGENT_ID_IRON = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/doctor_delight - name = "The Doctor's Delight" + name = REAGENT_DOCTORSDELIGHT id = "doctordelight" - result = "doctorsdelight" - required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 2, REAGENT_ID_TRICORDRAZINE = 1) + result = REAGENT_ID_DOCTORSDELIGHT + required_reagents = list(REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_TOMATOJUICE = 1, REAGENT_ID_ORANGEJUICE = 1, REAGENT_ID_CREAM = 2, REAGENT_ID_TRICORDRAZINE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/irish_cream name = "Irish Cream" id = "irishcream" result = "irishcream" - required_reagents = list("whiskey" = 2, "cream" = 1) + required_reagents = list("whiskey" = 2, REAGENT_ID_CREAM = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/manly_dorf @@ -393,7 +393,7 @@ name = "Irish Coffee" id = "irishcoffee" result = "irishcoffee" - required_reagents = list("irishcream" = 1, "coffee" = 1) + required_reagents = list("irishcream" = 1, REAGENT_ID_COFFEE = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/b52 @@ -414,7 +414,7 @@ name = "Margarita" id = "margarita" result = "margarita" - required_reagents = list("tequilla" = 2, "limejuice" = 1) + required_reagents = list("tequilla" = 2, REAGENT_ID_LIMEJUICE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/longislandicedtea @@ -435,7 +435,7 @@ name = "Whiskey Soda" id = "whiskeysoda" result = "whiskeysoda" - required_reagents = list("whiskey" = 2, "sodawater" = 1) + required_reagents = list("whiskey" = 2, REAGENT_ID_SODAWATER = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/black_russian @@ -463,21 +463,21 @@ name = "Vodka and Tonic" id = "vodkatonic" result = "vodkatonic" - required_reagents = list("vodka" = 2, "tonic" = 1) + required_reagents = list("vodka" = 2, REAGENT_ID_TONIC = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/gin_fizz name = "Gin Fizz" id = "ginfizz" result = "ginfizz" - required_reagents = list("gin" = 1, "sodawater" = 1, "limejuice" = 1) + required_reagents = list("gin" = 1, REAGENT_ID_SODAWATER = 1, REAGENT_ID_LIMEJUICE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/bahama_mama name = "Bahama mama" id = "bahama_mama" result = "bahama_mama" - required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1) + required_reagents = list("rum" = 2, REAGENT_ID_ORANGEJUICE = 2, REAGENT_ID_LIMEJUICE = 1, "ice" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/singulo @@ -498,42 +498,42 @@ name = "Demons Blood" id = "demonsblood" result = "demonsblood" - required_reagents = list("rum" = 3, "spacemountainwind" = 1, REAGENT_ID_BLOOD = 1, "dr_gibb" = 1) + required_reagents = list("rum" = 3, REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_BLOOD = 1, REAGENT_ID_DRGIBB = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/booger name = "Booger" id = "booger" result = "booger" - required_reagents = list("cream" = 2, "banana" = 1, "rum" = 1, "watermelonjuice" = 1) + required_reagents = list(REAGENT_ID_CREAM = 2, REAGENT_ID_BANANA = 1, "rum" = 1, REAGENT_ID_WATERMELONJUICE = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/antifreeze name = "Anti-freeze" id = "antifreeze" result = "antifreeze" - required_reagents = list("vodka" = 1, "cream" = 1, "ice" = 1) + required_reagents = list("vodka" = 1, REAGENT_ID_CREAM = 1, "ice" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/barefoot name = "Barefoot" id = "barefoot" result = "barefoot" - required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1) + required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_CREAM = 1, "vermouth" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/grapesoda - name = "Grape Soda" - id = "grapesoda" - result = "grapesoda" - required_reagents = list("grapejuice" = 2, "cola" = 1) + name = REAGENT_GRAPESODA + id = REAGENT_ID_GRAPESODA + result = REAGENT_ID_GRAPESODA + required_reagents = list(REAGENT_ID_GRAPEJUICE = 2, REAGENT_ID_COLA = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/sbiten name = "Sbiten" id = "sbiten" result = "sbiten" - required_reagents = list("vodka" = 10, "capsaicin" = 1) + required_reagents = list("vodka" = 10, REAGENT_ID_CAPSAICIN = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/red_mead @@ -548,14 +548,14 @@ id = "mead" result = "mead" required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_WATER = 1) - catalysts = list("enzyme" = 5) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 2 /decl/chemical_reaction/instant/drinks/iced_beer name = "Iced Beer" id = "iced_beer" result = "iced_beer" - required_reagents = list("beer" = 10, "frostoil" = 1) + required_reagents = list("beer" = 10, REAGENT_ID_FROSTOIL = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/iced_beer2 @@ -573,17 +573,17 @@ result_amount = 2 /decl/chemical_reaction/instant/drinks/soy_latte - name = "Soy Latte" - id = "soy_latte" - result = "soy_latte" - required_reagents = list("coffee" = 1, "soymilk" = 1) + name = REAGENT_SOYLATTE + id = REAGENT_ID_SOYLATTE + result = REAGENT_ID_SOYLATTE + required_reagents = list(REAGENT_ID_COFFEE = 1, REAGENT_ID_SOYMILK = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/cafe_latte - name = "Cafe Latte" - id = "cafe_latte" - result = "cafe_latte" - required_reagents = list("flat_white" = 1, "milk" = 1) + name = REAGENT_CAFELATTE + id = REAGENT_ID_CAFELATTE + result = REAGENT_ID_CAFELATTE + required_reagents = list(REAGENT_ID_FLATWHITE = 1, REAGENT_ID_MILK = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/acidspit @@ -604,28 +604,28 @@ name = "Changeling Sting" id = "changelingsting" result = "changelingsting" - required_reagents = list("screwdrivercocktail" = 1, "limejuice" = 1, "lemonjuice" = 1) + required_reagents = list("screwdrivercocktail" = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_LEMONJUICE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/aloe name = "Aloe" id = "aloe" result = "aloe" - required_reagents = list("cream" = 1, "whiskey" = 1, "watermelonjuice" = 1) + required_reagents = list(REAGENT_ID_CREAM = 1, "whiskey" = 1, REAGENT_ID_WATERMELONJUICE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/andalusia name = "Andalusia" id = "andalusia" result = "andalusia" - required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1) + required_reagents = list("rum" = 1, "whiskey" = 1, REAGENT_ID_LEMONJUICE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/snowwhite name = "Snow White" id = "snowwhite" result = "snowwhite" - required_reagents = list("pineapplejuice" = 1, "rum" = 1, "lemon_lime" = 1, "egg" = 1, "kahlua" = 1, REAGENT_ID_SUGAR = 1) //VoreStation Edit + required_reagents = list(REAGENT_ID_PINEAPPLEJUICE = 1, "rum" = 1, REAGENT_ID_LEMONLIME = 1, REAGENT_ID_EGG = 1, "kahlua" = 1, REAGENT_ID_SUGAR = 1) //VoreStation Edit result_amount = 2 /decl/chemical_reaction/instant/drinks/irishcarbomb @@ -646,7 +646,7 @@ name = "Erika Surprise" id = "erikasurprise" result = "erikasurprise" - required_reagents = list("ale" = 2, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1) + required_reagents = list("ale" = 2, REAGENT_ID_LIMEJUICE = 1, "whiskey" = 1, REAGENT_ID_BANANA = 1, "ice" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/devilskiss @@ -667,14 +667,14 @@ name = "Banana Honk" id = "bananahonk" result = "bananahonk" - required_reagents = list("banana" = 1, "cream" = 1, REAGENT_ID_SUGAR = 1) + required_reagents = list(REAGENT_ID_BANANA = 1, REAGENT_ID_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, REAGENT_ID_SUGAR = 1) + required_reagents = list("nothing" = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_SUGAR = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/driestmartini @@ -685,60 +685,60 @@ result_amount = 2 /decl/chemical_reaction/instant/drinks/lemonade - name = "Lemonade" - id = "lemonade" - result = "lemonade" - required_reagents = list("lemonjuice" = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_WATER = 1) + name = REAGENT_LEMONADE + id = REAGENT_ID_LEMONADE + result = REAGENT_ID_LEMONADE + required_reagents = list(REAGENT_ID_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, REAGENT_ID_SUGAR = 1, "sodawater" = 1) + name = REAGENT_MELONADE + id = REAGENT_ID_MELONADE + result = REAGENT_ID_MELONADE + required_reagents = list(REAGENT_ID_WATERMELONJUICE = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/appleade - name = "Appleade" - id = "appleade" - result = "appleade" - required_reagents = list("applejuice" = 1, REAGENT_ID_SUGAR = 1, "sodawater" = 1) + name = REAGENT_APPLEADE + id = REAGENT_ID_APPLEADE + result = REAGENT_ID_APPLEADE + required_reagents = list(REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/pineappleade - name = "Pineappleade" - id = "pineappleade" - result = "pineappleade" - required_reagents = list("pineapplejuice" = 2, "limejuice" = 1, "sodawater" = 2, "honey" = 1) + name = REAGENT_PINEAPPLEADE + id = REAGENT_ID_PINEAPPLEADE + result = REAGENT_ID_PINEAPPLEADE + required_reagents = list(REAGENT_ID_PINEAPPLEJUICE = 2, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_SODAWATER = 2, REAGENT_ID_HONEY = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/driverspunch name = "Driver`s Punch" id = "driverspunch" result = "driverspunch" - required_reagents = list("appleade" = 2, "orangejuice" = 1, "mint" = 1, "sodawater" = 1) + required_reagents = list(REAGENT_ID_APPLEADE = 2, REAGENT_ID_ORANGEJUICE = 1, REAGENT_ID_MINT = 1, REAGENT_ID_SODAWATER = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/mintapplesparkle name = "Mint Apple Sparkle" id = "mintapplesparkle" result = "mintapplesparkle" - required_reagents = list("appleade" = 2, "mint" = 1) - inhibitors = list("sodawater" = 1) + required_reagents = list(REAGENT_ID_APPLEADE = 2, REAGENT_ID_MINT = 1) + inhibitors = list(REAGENT_ID_SODAWATER = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/berrycordial name = "Berry Cordial" id = "berrycordial" result = "berrycordial" - required_reagents = list("berryjuice" = 4, REAGENT_ID_SUGAR = 1, "lemonjuice" = 1) + required_reagents = list(REAGENT_ID_BERRYJUICE = 4, REAGENT_ID_SUGAR = 1, REAGENT_ID_LEMONJUICE = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/tropicalfizz name = "Tropical Fizz" id = "tropicalfizz" result = "tropicalfizz" - required_reagents = list("sodawater" = 6, "berryjuice" = 1, "mint" = 1, "limejuice" = 1, "lemonjuice" = 1, "pineapplejuice" = 1) + required_reagents = list(REAGENT_ID_SODAWATER = 6, REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_MINT = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_PINEAPPLEJUICE = 1) inhibitors = list(REAGENT_ID_SUGAR = 1) result_amount = 8 @@ -746,14 +746,14 @@ name = "Melon Spritzer" id = "melonspritzer" result = "melonspritzer" - required_reagents = list("watermelonjuice" = 2, "redwine" = 2, "applejuice" = 1, "limejuice" = 1) + required_reagents = list(REAGENT_ID_WATERMELONJUICE = 2, "redwine" = 2, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_LIMEJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/fauxfizz name = "Faux Fizz" id = "fauxfizz" result = "fauxfizz" - required_reagents = list("sodawater" = 2, "berryjuice" = 1, "applejuice" = 1, "limejuice" = 1, "honey" = 1) + required_reagents = list(REAGENT_ID_SODAWATER = 2, REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_HONEY = 1) inhibitors = list(REAGENT_ID_SUGAR = 1) result_amount = 6 @@ -765,150 +765,150 @@ result_amount = 3 /decl/chemical_reaction/instant/drinks/kiraspecial - name = "Kira Special" - id = "kiraspecial" - result = "kiraspecial" - required_reagents = list("orangejuice" = 1, "limejuice" = 1, "sodawater" = 1) + name = REAGENT_KIRASPECIAL + id = REAGENT_ID_KIRASPECIAL + result = REAGENT_ID_KIRASPECIAL + required_reagents = list(REAGENT_ID_ORANGEJUICE = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_SODAWATER = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/brownstar - name = "Brown Star" - id = "brownstar" - result = "brownstar" - required_reagents = list("orangejuice" = 2, "cola" = 1) + name = REAGENT_BROWNSTAR + id = REAGENT_ID_BROWNSTAR + result = REAGENT_ID_BROWNSTAR + required_reagents = list(REAGENT_ID_ORANGEJUICE = 2, REAGENT_ID_COLA = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/brownstar_decaf - name = "Decaf Brown Star" - id = "brownstar_decaf" - result = "brownstar_decaf" - required_reagents = list("orangejuice" = 2, "decafcola" = 1) + name = REAGENT_BROWNSTARDECAF + id = REAGENT_ID_BROWNSTARDECAF + result = REAGENT_ID_BROWNSTARDECAF + required_reagents = list(REAGENT_ID_ORANGEJUICE = 2, REAGENT_ID_DECAFCOLA = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/milkshake - name = "Milkshake" - id = "milkshake" - result = "milkshake" - required_reagents = list("cream" = 1, "ice" = 2, "milk" = 2) + name = REAGENT_MILKSHAKE + id = REAGENT_ID_MILKSHAKE + result = REAGENT_ID_MILKSHAKE + required_reagents = list(REAGENT_ID_CREAM = 1, "ice" = 2, REAGENT_ID_MILK = 2) result_amount = 5 /decl/chemical_reaction/instant/drinks/peanutmilkshake name = "Peanutbutter Milkshake" - id = "peanutmilkshake" - result = "peanutmilkshake" - required_reagents = list("cream" = 1, "ice" = 1, "peanutbutter" = 2, "milk" = 1) + id = REAGENT_ID_PEANUTMILKSHAKE + result = REAGENT_ID_PEANUTMILKSHAKE + required_reagents = list(REAGENT_ID_CREAM = 1, "ice" = 1, REAGENT_ID_PEANUTBUTTER = 2, REAGENT_ID_MILK = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/rewriter - name = "Rewriter" - id = "rewriter" - result = "rewriter" - required_reagents = list("spacemountainwind" = 1, "coffee" = 1) + name = REAGENT_REWRITER + id = REAGENT_ID_REWRITER + result = REAGENT_ID_REWRITER + required_reagents = list(REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_COFFEE = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/suidream name = "Sui Dream" id = "suidream" result = "suidream" - required_reagents = list("space_up" = 1, "bluecuracao" = 1, "melonliquor" = 1) + required_reagents = list(REAGENT_ID_SPACEUP = 1, "bluecuracao" = 1, "melonliquor" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/shirleytemple - name = "Shirley Temple" - id = "shirley_temple" - result = "shirley_temple" - required_reagents = list("gingerale" = 4, "grenadine" = 1) + name = REAGENT_SHIRLEYTEMPLE + id = REAGENT_ID_SHIRLEYTEMPLE + result = REAGENT_ID_SHIRLEYTEMPLE + required_reagents = list(REAGENT_ID_GINGERALE = 4, REAGENT_ID_GRENADINE = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/royrogers - name = "Roy Rogers" - id = "roy_rogers" - result = "roy_rogers" - required_reagents = list("shirley_temple" = 5, "lemon_lime" = 2) + name = REAGENT_ROYROGERS + id = REAGENT_ID_ROYROGERS + result = REAGENT_ID_ROYROGERS + required_reagents = list(REAGENT_ID_SHIRLEYTEMPLE = 5, REAGENT_ID_LEMONLIME = 2) result_amount = 7 /decl/chemical_reaction/instant/drinks/collinsmix - name = "Collins Mix" - id = "collins_mix" - result = "collins_mix" - required_reagents = list("lemon_lime" = 3, "sodawater" = 1) + name = REAGENT_COLLINSMIX + id = REAGENT_ID_COLLINSMIX + result = REAGENT_ID_COLLINSMIX + required_reagents = list(REAGENT_ID_LEMONLIME = 3, REAGENT_ID_SODAWATER = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/arnoldpalmer - name = "Arnold Palmer" - id = "arnold_palmer" - result = "arnold_palmer" - required_reagents = list("icetea" = 1, "lemonade" = 1) + name = REAGENT_ARNOLDPALMER + id = REAGENT_ID_ARNOLDPALMER + result = REAGENT_ID_ARNOLDPALMER + required_reagents = list(REAGENT_ID_ICETEA = 1, REAGENT_ID_LEMONADE = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/minttea - name = "Mint Tea" - id = "minttea" - result = "minttea" - required_reagents = list("tea" = 5, "mint" = 1) + name = REAGENT_MINTTEA + id = REAGENT_ID_MINTTEA + result = REAGENT_ID_MINTTEA + required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_MINT = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/minttea_decaf - name = "Decaf Mint Tea" + name = REAGENT_MINTTEADECAF id = "decafminttea" - result = "mintteadecaf" - required_reagents = list("teadecaf" = 5, "mint" = 1) + result = REAGENT_ID_MINTTEADECAF + required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_MINT = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/lemontea - name = "Lemon Tea" - id = "lemontea" - result = "lemontea" - required_reagents = list("tea" = 5, "lemonjuice" = 1) + name = REAGENT_LEMONTEA + id = REAGENT_ID_LEMONTEA + result = REAGENT_ID_LEMONTEA + required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_LEMONJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/lemontea_decaf - name = "Decaf Lemon Tea" + name = REAGENT_LEMONTEADECAF id = "decaflemontea" - result = "lemonteadecaf" - required_reagents = list("teadecaf" = 5, "lemonjuice" = 1) + result = REAGENT_ID_LEMONTEADECAF + required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_LEMONJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/limetea - name = "Lime Tea" - id = "limetea" - result = "limetea" - required_reagents = list("tea" = 5, "limejuice" = 1) + name = REAGENT_LIMETEA + id = REAGENT_ID_LIMETEA + result = REAGENT_ID_LIMETEA + required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_LIMEJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/limetea_decaf - name = "Decaf Lime Tea" + name = REAGENT_LIMETEADECAF id = "decaflimetea" - result = "limeteadecaf" - required_reagents = list("teadecaf" = 5, "limejuice" = 1) + result = REAGENT_ID_LIMETEADECAF + required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_LIMEJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/orangetea - name = "Orange Tea" - id = "orangetea" - result = "orangetea" - required_reagents = list("tea" = 5, "orangejuice" = 1) + name = REAGENT_ORANGETEA + id = REAGENT_ID_ORANGETEA + result = REAGENT_ID_ORANGETEA + required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_ORANGEJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/orangetea_decaf name = "Decaf Orange Tea" id = "decaforangetea" - result = "orangeteadecaf" - required_reagents = list("teadecaf" = 5, "orangejuice" = 1) + result = REAGENT_ID_ORANGETEADECAF + required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_ORANGEJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/berrytea - name = "Berry Tea" - id = "berrytea" - result = "berrytea" - required_reagents = list("tea" = 5, "berryjuice" = 1) + name = REAGENT_BERRYTEA + id = REAGENT_ID_BERRYTEA + result = REAGENT_ID_BERRYTEA + required_reagents = list(REAGENT_ID_TEA = 5, REAGENT_ID_BERRYJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/berrytea_decaf - name = "Decaf Berry Tea" + name = REAGENT_BERRYTEADECAF id = "decafberrytea" - result = "berryteadecaf" - required_reagents = list("teadecaf" = 5, "berryjuice" = 1) + result = REAGENT_ID_BERRYTEADECAF + required_reagents = list(REAGENT_ID_TEADECAF = 5, REAGENT_ID_BERRYJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/sakebomb @@ -922,21 +922,21 @@ name = "Tamagozake" id = "tamagozake" result = "tamagozake" - required_reagents = list("sake" = 10, REAGENT_ID_SUGAR = 5, "egg" = 3) + required_reagents = list("sake" = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3) result_amount = 15 /decl/chemical_reaction/instant/drinks/ginzamary name = "Ginza Mary" id = "ginzamary" result = "ginzamary" - required_reagents = list("sake" = 2, "vodka" = 2, "tomatojuice" = 1) + required_reagents = list("sake" = 2, "vodka" = 2, REAGENT_ID_TOMATOJUICE = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/tokyorose name = "Tokyo Rose" id = "tokyorose" result = "tokyorose" - required_reagents = list("sake" = 1, "berryjuice" = 1) + required_reagents = list("sake" = 1, REAGENT_ID_BERRYJUICE = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/saketini @@ -950,7 +950,7 @@ name = "Elysium Facepunch" id = "elysiumfacepunch" result = "elysiumfacepunch" - required_reagents = list("kahlua" = 1, "lemonjuice" = 1) + required_reagents = list("kahlua" = 1, REAGENT_ID_LEMONJUICE = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/erebusmoonrise @@ -964,14 +964,14 @@ name = "Balloon" id = "balloon" result = "balloon" - required_reagents = list("cream" = 1, "bluecuracao" = 1) + required_reagents = list(REAGENT_ID_CREAM = 1, "bluecuracao" = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/natunabrandy name = "Natuna Brandy" id = "natunabrandy" result = "natunabrandy" - required_reagents = list("beer" = 1, "sodawater" = 2) + required_reagents = list("beer" = 1, REAGENT_ID_SODAWATER = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/euphoria @@ -985,21 +985,21 @@ name = "Xanadu Cannon" id = "xanaducannon" result = "xanaducannon" - required_reagents = list("ale" = 1, "dr_gibb" = 1) + required_reagents = list("ale" = 1, REAGENT_ID_DRGIBB = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/debugger name = "Debugger" id = "debugger" result = "debugger" - required_reagents = list(REAGENT_ID_FUEL = 1, REAGENT_ID_SUGAR = 2, "cookingoil" = 2) + required_reagents = list(REAGENT_ID_FUEL = 1, REAGENT_ID_SUGAR = 2, REAGENT_ID_COOKINGOIL = 2) result_amount = 5 /decl/chemical_reaction/instant/drinks/spacersbrew name = "Spacer's Brew" id = "spacersbrew" result = "spacersbrew" - required_reagents = list("brownstar" = 4, REAGENT_ID_ETHANOL = 1) + required_reagents = list(REAGENT_ID_BROWNSTAR = 4, REAGENT_ID_ETHANOL = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/binmanbliss @@ -1027,15 +1027,15 @@ name = "Bitters" id = "bitters" result = "bitters" - required_reagents = list("mint" = 5) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_MINT = 5) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 5 /decl/chemical_reaction/instant/drinks/soemmerfire name = "Soemmer Fire" id = "soemmerfire" result = "soemmerfire" - required_reagents = list("manhattan" = 2, "condensedcapsaicin" = 1) + required_reagents = list("manhattan" = 2, REAGENT_ID_CONDENSEDCAPSAICIN = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/winebrandy @@ -1043,21 +1043,21 @@ id = "winebrandy" result = "winebrandy" required_reagents = list("redwine" = 10) - catalysts = list("enzyme" = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe + catalysts = list(REAGENT_ID_ENZYME = 10) //10u enzyme so it requires more than is usually added. Stops overlap with wine recipe result_amount = 5 /decl/chemical_reaction/instant/drinks/lovepotion name = "Love Potion" id = "lovepotion" result = "lovepotion" - required_reagents = list("cream" = 1, "berryjuice" = 1, REAGENT_ID_SUGAR = 1) + required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_SUGAR = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/morningafter name = "Morning After" id = "morningafter" result = "morningafter" - required_reagents = list("sbiten" = 1, "coffee" = 5) + required_reagents = list("sbiten" = 1, REAGENT_ID_COFFEE = 5) result_amount = 6 /decl/chemical_reaction/instant/drinks/vesper @@ -1071,14 +1071,14 @@ name = "Rotgut Fever Dream" id = "rotgut" result = "rotgut" - required_reagents = list("vodka" = 3, "rum" = 1, "whiskey" = 1, "cola" = 3) + required_reagents = list("vodka" = 3, "rum" = 1, "whiskey" = 1, REAGENT_ID_COLA = 3) result_amount = 8 /decl/chemical_reaction/instant/drinks/entdraught name = "Ent's Draught" id = "entdraught" result = "entdraught" - required_reagents = list("tonic" = 1, REAGENT_ID_HOLYWATER = 1, "honey" = 1) + required_reagents = list(REAGENT_ID_TONIC = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_HONEY = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/voxdelight @@ -1092,21 +1092,21 @@ name = "Screaming Viking" id = "screamingviking" result = "screamingviking" - required_reagents = list("martini" = 2, "vodkatonic" = 2, "limejuice" = 1, "rum" = 1) + required_reagents = list("martini" = 2, "vodkatonic" = 2, REAGENT_ID_LIMEJUICE = 1, "rum" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/vilelemon name = "Vile Lemon" id = "vilelemon" result = "vilelemon" - required_reagents = list("lemonade" = 5, "spacemountainwind" = 1) + required_reagents = list(REAGENT_ID_LEMONADE = 5, REAGENT_ID_SPACEMOUNTAINWIND = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/dreamcream name = "Dream Cream" id = "dreamcream" result = "dreamcream" - required_reagents = list("milk" = 2, "cream" = 1, "honey" = 1) + required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_CREAM = 1, REAGENT_ID_HONEY = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/robustin @@ -1124,31 +1124,31 @@ result_amount = 2 /decl/chemical_reaction/instant/drinks/chocoshake - name = "Chocolate Milkshake" - id = "chocoshake" - result = "chocoshake" - required_reagents = list("milkshake" = 1, "coco" = 1) + name = REAGENT_CHOCOSHAKE + id = REAGENT_ID_CHOCOSHAKE + result = REAGENT_ID_CHOCOSHAKE + required_reagents = list(REAGENT_ID_MILKSHAKE = 1, REAGENT_ID_COCO = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/berryshake - name = "Berry Milkshake" - id = "berryshake" - result = "berryshake" - required_reagents = list("milkshake" = 1, "berryjuice" = 1) + name = REAGENT_BERRYSHAKE + id = REAGENT_ID_BERRYSHAKE + result = REAGENT_ID_BERRYSHAKE + required_reagents = list(REAGENT_ID_MILKSHAKE = 1, REAGENT_ID_BERRYJUICE = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/coffeeshake - name = "Coffee Milkshake" - id = "coffeeshake" - result = "coffeeshake" - required_reagents = list("milkshake" = 1, "coffee" = 1) + name = REAGENT_COFFEESHAKE + id = REAGENT_ID_COFFEESHAKE + result = REAGENT_ID_COFFEESHAKE + required_reagents = list(REAGENT_ID_MILKSHAKE = 1, REAGENT_ID_COFFEE = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/jellyshot name = "Jelly Shot" id = "jellyshot" result = "jellyshot" - required_reagents = list("cherryjelly" = 4, "vodka" = 1) + required_reagents = list(REAGENT_ID_CHERRYJELLY = 4, "vodka" = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/slimeshot @@ -1169,7 +1169,7 @@ name = "Clover Club" id = "cloverclub" result = "cloverclub" - required_reagents = list("berryjuice" = 1, "lemonjuice" = 1, "gin" = 3) + required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_LEMONJUICE = 1, "gin" = 3) result_amount = 5 /decl/chemical_reaction/instant/drinks/oldfashioned @@ -1183,56 +1183,56 @@ name = "Whiskey Sour" id = "whiskeysour" result = "whiskeysour" - required_reagents = list("whiskey" = 2, "lemonjuice" = 1, REAGENT_ID_SUGAR = 1) + required_reagents = list("whiskey" = 2, REAGENT_ID_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, REAGENT_ID_SUGAR = 1) + required_reagents = list("rum" = 3, REAGENT_ID_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, REAGENT_ID_WATER = 1, "mint" = 1) + required_reagents = list("whiskey" = 2, REAGENT_ID_WATER = 1, REAGENT_ID_MINT = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/paloma name = "Paloma" id = "paloma" result = "paloma" - required_reagents = list("sodawater" = 1, "tequillasunrise" = 2) + required_reagents = list(REAGENT_ID_SODAWATER = 1, "tequillasunrise" = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/mojito name = "Mojito" id = "mojito" result = "mojito" - required_reagents = list("rum" = 3, "limejuice" = 1, "mint" = 1) + required_reagents = list("rum" = 3, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_MINT = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/virginmojito name = "Mojito" id = "virginmojito" result = "virginmojito" - required_reagents = list("sodawater" = 3, "limejuice" = 1, "mint" = 1, REAGENT_ID_SUGAR = 1) + required_reagents = list(REAGENT_ID_SODAWATER = 3, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_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, REAGENT_ID_SUGAR = 1) + required_reagents = list("winebrandy" = 1, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_SUGAR = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/coldfront name = "Cold Front" id = "coldfront" result = "coldfront" - required_reagents = list("icecoffee" = 1, "whiskey" = 1, "mint" = 1) + required_reagents = list(REAGENT_ID_ICECOFFEE = 1, "whiskey" = 1, REAGENT_ID_MINT = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/godsake @@ -1247,14 +1247,14 @@ id = "godka" result = "godka" required_reagents = list("vodka" = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_CARTHATOLINE = 1) - catalysts = list("enzyme" = 5, REAGENT_ID_HOLYWATER = 5) + catalysts = list(REAGENT_ID_ENZYME = 5, REAGENT_ID_HOLYWATER = 5) result_amount = 1 /decl/chemical_reaction/instant/drinks/holywine name = "Angel Ichor" id = "holywine" result = "holywine" - required_reagents = list("grapejuice" = 5, REAGENT_ID_GOLD = 5) + required_reagents = list(REAGENT_ID_GRAPEJUICE = 5, REAGENT_ID_GOLD = 5) catalysts = list(REAGENT_ID_HOLYWATER = 5) result_amount = 10 @@ -1262,7 +1262,7 @@ name = "Holy Mary" id = "holymary" result = "holymary" - required_reagents = list("vodka" = 2, "holywine" = 3, "limejuice" = 1) + required_reagents = list("vodka" = 2, "holywine" = 3, REAGENT_ID_LIMEJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/angelskiss @@ -1276,7 +1276,7 @@ name = "Angels Wrath" id = "angelswrath" result = "angelswrath" - required_reagents = list("rum" = 3, "spacemountainwind" = 1, "holywine" = 1, "dr_gibb" = 1) + required_reagents = list("rum" = 3, REAGENT_ID_SPACEMOUNTAINWIND = 1, "holywine" = 1, REAGENT_ID_DRGIBB = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/ichor_mead @@ -1290,21 +1290,21 @@ name = "Oil Slick" id = "oilslick" result = "oilslick" - required_reagents = list("cookingoil" = 2, "honey" = 1) + required_reagents = list(REAGENT_ID_COOKINGOIL = 2, REAGENT_ID_HONEY = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/slimeslam name = "Slick Slime Slammer" id = "slimeslammer" result = "slimeslammer" - required_reagents = list("cookingoil" = 2, "peanutbutter" = 1) + required_reagents = list(REAGENT_ID_COOKINGOIL = 2, REAGENT_ID_PEANUTBUTTER = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/virginsexonthebeach name = "Virgin Sex On The Beach" id = "virginsexonthebeach" result = "virginsexonthebeach" - required_reagents = list("orangejuice" = 3, "grenadine" = 2) + required_reagents = list(REAGENT_ID_ORANGEJUICE = 3, REAGENT_ID_GRENADINE = 2) result_amount = 5 /decl/chemical_reaction/instant/drinks/sexonthebeach @@ -1318,14 +1318,14 @@ name = "Eggnog" id = "eggnog" result = "eggnog" - required_reagents = list("milk" = 5, "cream" = 5, REAGENT_ID_SUGAR = 5, "egg" = 3) + required_reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_CREAM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3) result_amount = 15 /decl/chemical_reaction/instant/drinks/nuclearwaste_radium name = "Nuclear Waste" id = "nuclearwasterad" result = "nuclearwaste" - required_reagents = list("oilslick" = 1, REAGENT_ID_RADIUM = 1, "limejuice" = 1) + required_reagents = list("oilslick" = 1, REAGENT_ID_RADIUM = 1, REAGENT_ID_LIMEJUICE = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/nuclearwaste_uranium @@ -1339,12 +1339,12 @@ name = "Soda Oil" id = "sodaoil" result = "sodaoil" - required_reagents = list("cookingoil" = 4, "sodawater" = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_TRICORDRAZINE = 1) + required_reagents = list(REAGENT_ID_COOKINGOIL = 4, REAGENT_ID_SODAWATER = 1, REAGENT_ID_CARBON = 1, REAGENT_ID_TRICORDRAZINE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/fusionnaire name = "Fusionnaire" id = "fusionnaire" result = "fusionnaire" - required_reagents = list("lemonjuice" = 3, "vodka" = 2, "schnapps_pep" = 1, "schnapps_lem" = 1, "rum" = 1, "ice" = 1) + required_reagents = list(REAGENT_ID_LEMONJUICE = 3, "vodka" = 2, "schnapps_pep" = 1, "schnapps_lem" = 1, "rum" = 1, "ice" = 1) result_amount = 9 diff --git a/code/modules/reagents/reactions/instant/drinks_vr.dm b/code/modules/reagents/reactions/instant/drinks_vr.dm index 1bb52e585f2..8c86251edd1 100644 --- a/code/modules/reagents/reactions/instant/drinks_vr.dm +++ b/code/modules/reagents/reactions/instant/drinks_vr.dm @@ -25,7 +25,7 @@ name = REAGENT_MONSTERTAMER id = REAGENT_ID_MONSTERTAMER result = REAGENT_ID_MONSTERTAMER - required_reagents = list("whiskey" = 1, "protein" = 1) + required_reagents = list("whiskey" = 1, REAGENT_ID_PROTEIN = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/bigbeer @@ -39,7 +39,7 @@ name = "Sweetened Tea" id = REAGENT_ID_SWEETTEA result = REAGENT_ID_SWEETTEA - required_reagents = list("icetea" = 2, REAGENT_ID_SUGAR = 1,) + required_reagents = list(REAGENT_ID_ICETEA = 2, REAGENT_ID_SUGAR = 1,) result_amount = 3 /decl/chemical_reaction/instant/drinks/unsweettea @@ -60,14 +60,14 @@ name = REAGENT_BULLDOG id = REAGENT_ID_BULLDOG result = REAGENT_ID_BULLDOG - required_reagents = list("whiterussian" = 4, "cola" =1) + required_reagents = list("whiterussian" = 4, REAGENT_ID_COLA =1) result_amount = 4 /decl/chemical_reaction/instant/drinks/sbagliato name = REAGENT_SBAGLIATO id = REAGENT_ID_SBAGLIATO result = REAGENT_ID_SBAGLIATO - required_reagents = list("redwine" = 1, "vermouth" = 1, "sodawater" =1) + required_reagents = list("redwine" = 1, "vermouth" = 1, REAGENT_ID_SODAWATER =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/italiancrisis @@ -81,7 +81,7 @@ name = REAGENT_SUGARRUSH id = REAGENT_ID_SUGARRUSH result = REAGENT_ID_SUGARRUSH - required_reagents = list(REAGENT_ID_SUGAR = 1, "sodawater" = 1, "vodka" =1) + required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1, "vodka" =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/lotus @@ -95,7 +95,7 @@ name = REAGENT_SHROOMJUICE id = REAGENT_ID_SHROOMJUICE result = REAGENT_ID_SHROOMJUICE - required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, "applejuice" = 1, "limejuice" =1) + required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_LIMEJUICE =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/russianroulette @@ -109,21 +109,21 @@ name = REAGENT_LOVEMAKER id = REAGENT_ID_LOVEMAKER result = REAGENT_ID_LOVEMAKER - required_reagents = list("honey" = 1, "sexonthebeach" = 5) + required_reagents = list(REAGENT_ID_HONEY = 1, "sexonthebeach" = 5) result_amount = 6 /decl/chemical_reaction/instant/drinks/honeyshot name = REAGENT_HONEYSHOT id = REAGENT_ID_HONEYSHOT result = REAGENT_ID_HONEYSHOT - required_reagents = list("honey" = 1, "vodka" = 1, "grenadine" =1) + required_reagents = list(REAGENT_ID_HONEY = 1, "vodka" = 1, REAGENT_ID_GRENADINE =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/appletini name = REAGENT_APPLETINI id = REAGENT_ID_APPLETINIT result = REAGENT_ID_APPLETINIT - required_reagents = list("applejuice" = 2, "vodka" = 1) + required_reagents = list(REAGENT_ID_APPLEJUICE = 2, "vodka" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/glowingappletini @@ -144,8 +144,8 @@ name = REAGENT_CHOCCYMILK id = REAGENT_ID_CHOCCYMILK result = REAGENT_ID_CHOCCYMILK - inhibitors = list("enzyme" = 1) - required_reagents = list("milk" = 3, "coco" = 1) + inhibitors = list(REAGENT_ID_ENZYME = 1) + required_reagents = list(REAGENT_ID_MILK = 3, REAGENT_ID_COCO = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/redspaceflush @@ -159,7 +159,7 @@ name = REAGENT_GRAVEYARD id = REAGENT_ID_GRAVEYARD result = REAGENT_ID_GRAVEYARD - required_reagents = list("cola" = 1, "spacemountainwind" = 1, "dr_gibb" =1, "space_up" = 1) + required_reagents = list(REAGENT_ID_COLA = 1, REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_DRGIBB =1, REAGENT_ID_SPACEUP = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/hairoftherat @@ -173,7 +173,7 @@ name = REAGENT_PINKRUSSIAN id = REAGENT_ID_PINKRUSSIAN result = REAGENT_ID_PINKRUSSIAN - required_reagents = list("blackrussian" = 2, "berryshake" = 1) + required_reagents = list("blackrussian" = 2, REAGENT_ID_BERRYSHAKE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/originalsin @@ -181,21 +181,21 @@ id = REAGENT_ID_ORIGINALSIN result = REAGENT_ID_ORIGINALSIN required_reagents = list("holywine" = 1) - catalysts = list("applejuice" = 1) + catalysts = list(REAGENT_ID_APPLEJUICE = 1) result_amount = 1 /decl/chemical_reaction/instant/drinks/windgarita name = REAGENT_WINDGARITA id = REAGENT_ID_WINDGARITA result = REAGENT_ID_WINDGARITA - required_reagents = list("margarita" = 3, "spacemountainwind" = 2, "melonliquor" = 1) + required_reagents = list("margarita" = 3, REAGENT_ID_SPACEMOUNTAINWIND = 2, "melonliquor" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/newyorksour name = REAGENT_NEWYORKSOUR id = REAGENT_ID_NEWYORKSOUR result = REAGENT_ID_NEWYORKSOUR - required_reagents = list("whiskeysour" = 3, "redwine" = 2, "egg" = 1) + required_reagents = list("whiskeysour" = 3, "redwine" = 2, REAGENT_ID_EGG = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/mudslide diff --git a/code/modules/reagents/reactions/instant/food.dm b/code/modules/reagents/reactions/instant/food.dm index fd5d87f89b4..92fc398f91a 100644 --- a/code/modules/reagents/reactions/instant/food.dm +++ b/code/modules/reagents/reactions/instant/food.dm @@ -2,22 +2,22 @@ name = "Hot Ramen" id = "hot_ramen" result = "hot_ramen" - required_reagents = list(REAGENT_ID_WATER = 1, "dry_ramen" = 3) + required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_DRYRAMEN = 3) result_amount = 3 /decl/chemical_reaction/instant/food/hell_ramen name = "Hell Ramen" id = "hell_ramen" result = "hell_ramen" - required_reagents = list("capsaicin" = 1, "hot_ramen" = 6) + required_reagents = list(REAGENT_ID_CAPSAICIN = 1, "hot_ramen" = 6) result_amount = 6 /decl/chemical_reaction/instant/food/tofu name = "Tofu" - id = "tofu" + id = REAGENT_ID_TOFU result = null - required_reagents = list("soymilk" = 10) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_SOYMILK = 10) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 1 /decl/chemical_reaction/instant/food/tofu/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -30,8 +30,8 @@ name = "Chocolate Bar" id = "chocolate_bar" result = null - required_reagents = list("soymilk" = 2, "coco" = 2, REAGENT_ID_SUGAR = 2) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_SOYMILK = 2, REAGENT_ID_COCO = 2, REAGENT_ID_SUGAR = 2) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 1 /decl/chemical_reaction/instant/food/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -44,8 +44,8 @@ name = "Chocolate Bar" id = "chocolate_bar" result = null - required_reagents = list("milk" = 2, "coco" = 2, REAGENT_ID_SUGAR = 2) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_COCO = 2, REAGENT_ID_SUGAR = 2) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 1 /decl/chemical_reaction/instant/food/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -55,64 +55,64 @@ return /decl/chemical_reaction/instant/food/cookingoilcorn - name = "Cooking Oil" + name = REAGENT_COOKINGOIL id = "cookingoilcorn" - result = "cookingoil" - required_reagents = list("cornoil" = 10) - catalysts = list("enzyme" = 5) + result = REAGENT_ID_COOKINGOIL + required_reagents = list(REAGENT_ID_CORNOIL = 10) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 /decl/chemical_reaction/instant/food/cookingoilpeanut - name = "Cooking Oil" + name = REAGENT_COOKINGOIL id = "cookingoilpeanut" - result = "cookingoil" - required_reagents = list("peanutoil" = 10) + result = REAGENT_ID_COOKINGOIL + required_reagents = list(REAGENT_ID_PEANUTOIL = 10) inhibitors = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_SODIUMCHLORIDE = 1) - catalysts = list("enzyme" = 5) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 /decl/chemical_reaction/instant/food/soysauce - name = "Soy Sauce" - id = "soysauce" - result = "soysauce" - required_reagents = list("soymilk" = 4, REAGENT_ID_SACID = 1) + name = REAGENT_SOYSAUCE + id = REAGENT_ID_SOYSAUCE + result = REAGENT_ID_SOYSAUCE + required_reagents = list(REAGENT_ID_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, REAGENT_ID_WATER = 1, REAGENT_ID_SUGAR = 1) + name = REAGENT_KETCHUP + id = REAGENT_ID_KETCHUP + result = REAGENT_ID_KETCHUP + required_reagents = list(REAGENT_ID_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, REAGENT_ID_SUGAR = 1, "spacespice" = 1) + name = REAGENT_BARBECUE + id = REAGENT_ID_BARBECUE + result = REAGENT_ID_BARBECUE + required_reagents = list(REAGENT_ID_TOMATOJUICE = 2, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_SPACESPICE = 1) result_amount = 4 /decl/chemical_reaction/instant/food/peanutbutter - name = "Peanut Butter" - id = "peanutbutter" - result = "peanutbutter" - required_reagents = list("peanutoil" = 2, REAGENT_ID_SUGAR = 1, REAGENT_ID_SODIUMCHLORIDE = 1) - catalysts = list("enzyme" = 5) + name = REAGENT_PEANUTBUTTER + id = REAGENT_ID_PEANUTBUTTER + result = REAGENT_ID_PEANUTBUTTER + required_reagents = list(REAGENT_ID_PEANUTOIL = 2, REAGENT_ID_SUGAR = 1, REAGENT_ID_SODIUMCHLORIDE = 1) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 3 /decl/chemical_reaction/instant/food/mayonnaise - name = "mayonnaise" - id = "mayo" - result = "mayo" - required_reagents = list("egg" = 9, "cookingoil" = 5, "lemonjuice" = 5, REAGENT_ID_SODIUMCHLORIDE = 1) + name = REAGENT_MAYO + id = REAGENT_ID_MAYO + result = REAGENT_ID_MAYO + required_reagents = list(REAGENT_ID_EGG = 9, REAGENT_ID_COOKINGOIL = 5, REAGENT_ID_LEMONJUICE = 5, REAGENT_ID_SODIUMCHLORIDE = 1) result_amount = 15 /decl/chemical_reaction/instant/food/cheesewheel name = "Cheesewheel" id = "cheesewheel" result = null - required_reagents = list("milk" = 40) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_MILK = 40) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 1 /decl/chemical_reaction/instant/food/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -125,8 +125,8 @@ name = "Meatball" id = "meatball" result = null - required_reagents = list("protein" = 3, "flour" = 5) - catalysts = list("enzyme" = 5) + required_reagents = list(REAGENT_ID_PROTEIN = 3, REAGENT_ID_FLOUR = 5) + catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 3 /decl/chemical_reaction/instant/food/meatball/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -139,7 +139,7 @@ name = "Dough" id = "dough" result = null - required_reagents = list("egg" = 3, "flour" = 10) + required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10) inhibitors = list(REAGENT_ID_WATER = 1, "beer" = 1, REAGENT_ID_SUGAR = 1) //To prevent it messing with batter recipes result_amount = 1 @@ -170,37 +170,37 @@ /decl/chemical_reaction/instant/food/coating/batter name = "Batter" - id = "batter" - result = "batter" - required_reagents = list("egg" = 3, "flour" = 10, REAGENT_ID_WATER = 5, REAGENT_ID_SODIUMCHLORIDE = 2) + id = REAGENT_ID_BATTER + result = REAGENT_ID_BATTER + required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_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, REAGENT_ID_SODIUMCHLORIDE = 2) + id = REAGENT_ID_BEERBATTER + result = REAGENT_ID_BEERBATTER + required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_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, REAGENT_ID_SUGAR = 5) + name = REAGENT_BROWNIEMIX + id = REAGENT_ID_BROWNIEMIX + result = REAGENT_ID_BROWNIEMIX + required_reagents = list(REAGENT_ID_FLOUR = 5, REAGENT_ID_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, REAGENT_ID_SUGAR = 15, "egg" = 3) + name = REAGENT_CAKEBATTER + id = REAGENT_ID_CAKEBATTER + result = REAGENT_ID_CAKEBATTER + required_reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 15, REAGENT_ID_EGG = 3) result_amount = 60 /decl/chemical_reaction/instant/food/butter name = "Butter" id = "butter" result = null - required_reagents = list("cream" = 20, REAGENT_ID_SODIUMCHLORIDE = 1) + required_reagents = list(REAGENT_ID_CREAM = 20, REAGENT_ID_SODIUMCHLORIDE = 1) result_amount = 1 /decl/chemical_reaction/instant/food/butter/on_reaction(var/datum/reagents/holder, var/created_volume) diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm index 0fc3d46542c..e6b517b101b 100644 --- a/code/modules/reagents/reactions/instant/instant.dm +++ b/code/modules/reagents/reactions/instant/instant.dm @@ -193,10 +193,10 @@ result_amount = 2 /decl/chemical_reaction/instant/virus_food - name = "Virus Food" - id = "virusfood" - result = "virusfood" - required_reagents = list(REAGENT_ID_WATER = 1, "milk" = 1) + name = REAGENT_VIRUSFOOD + id = REAGENT_ID_VIRUSFOOD + result = REAGENT_ID_VIRUSFOOD + required_reagents = list(REAGENT_ID_WATER = 1, REAGENT_ID_MILK = 1) result_amount = 5 /decl/chemical_reaction/instant/leporazine @@ -408,9 +408,9 @@ result_amount = 3 /decl/chemical_reaction/instant/lipozine - name = "Lipozine" - id = "Lipozine" - result = "lipozine" + name = REAGENT_LIPOZINE + id = REAGENT_ID_LIPOZINE + result = REAGENT_ID_LIPOZINE required_reagents = list(REAGENT_ID_SODIUMCHLORIDE = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_RADIUM = 1) result_amount = 3 @@ -475,7 +475,7 @@ name = REAGENT_GLYCEROL id = REAGENT_ID_GLYCEROL result = REAGENT_ID_GLYCEROL - required_reagents = list("cornoil" = 3, REAGENT_ID_SACID = 1) + required_reagents = list(REAGENT_ID_CORNOIL = 3, REAGENT_ID_SACID = 1) result_amount = 1 /decl/chemical_reaction/instant/sodiumchloride @@ -486,10 +486,10 @@ result_amount = 2 /decl/chemical_reaction/instant/condensedcapsaicin - name = "Condensed Capsaicin" - id = "condensedcapsaicin" - result = "condensedcapsaicin" - required_reagents = list("capsaicin" = 2) + name = REAGENT_CONDENSEDCAPSAICIN + id = REAGENT_ID_CONDENSEDCAPSAICIN + result = REAGENT_ID_CONDENSEDCAPSAICIN + required_reagents = list(REAGENT_ID_CAPSAICIN = 2) catalysts = list(REAGENT_ID_PHORON = 5) result_amount = 1 @@ -556,7 +556,7 @@ name = "Solid Iron" id = "solidiron" result = null - required_reagents = list("frostoil" = 5, REAGENT_ID_IRON = REAGENTS_PER_SHEET) + required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_IRON = REAGENTS_PER_SHEET) result_amount = 1 var/sheet_to_give = /obj/item/stack/material/iron @@ -568,42 +568,42 @@ /decl/chemical_reaction/instant/solidification/phoron name = "Solid Phoron" id = "solidphoron" - required_reagents = list("frostoil" = 5, REAGENT_ID_PHORON = REAGENTS_PER_SHEET) + required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_PHORON = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/phoron /decl/chemical_reaction/instant/solidification/silver name = "Solid Silver" id = "solidsilver" - required_reagents = list("frostoil" = 5, REAGENT_ID_SILVER = REAGENTS_PER_SHEET) + required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_SILVER = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/silver /decl/chemical_reaction/instant/solidification/gold name = "Solid Gold" id = "solidgold" - required_reagents = list("frostoil" = 5, REAGENT_ID_GOLD = REAGENTS_PER_SHEET) + required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_GOLD = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/gold /decl/chemical_reaction/instant/solidification/platinum name = "Solid Platinum" id = "solidplatinum" - required_reagents = list("frostoil" = 5, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET) + required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_PLATINUM = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/platinum /decl/chemical_reaction/instant/solidification/uranium name = "Solid Uranium" id = "soliduranium" - required_reagents = list("frostoil" = 5, REAGENT_ID_URANIUM = REAGENTS_PER_SHEET) + required_reagents = list(REAGENT_ID_FROSTOIL = 5, REAGENT_ID_URANIUM = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/uranium /decl/chemical_reaction/instant/solidification/hydrogen name = "Solid Hydrogen" id = "solidhydrogen" - required_reagents = list("frostoil" = 100, REAGENT_ID_HYDROGEN = REAGENTS_PER_SHEET) + required_reagents = list(REAGENT_ID_FROSTOIL = 100, REAGENT_ID_HYDROGEN = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/mhydrogen @@ -611,14 +611,14 @@ /decl/chemical_reaction/instant/solidification/steel name = "Solid Steel" id = "solidsteel" - required_reagents = list("frostoil" = 5, "steel" = REAGENTS_PER_SHEET) + required_reagents = list(REAGENT_ID_FROSTOIL = 5, "steel" = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/steel /decl/chemical_reaction/instant/solidification/plasteel name = "Solid Plasteel" id = "solidplasteel" - required_reagents = list("frostoil" = 10, "plasteel" = REAGENTS_PER_SHEET) + required_reagents = list(REAGENT_ID_FROSTOIL = 10, "plasteel" = REAGENTS_PER_SHEET) sheet_to_give = /obj/item/stack/material/plasteel @@ -992,7 +992,7 @@ name = "Milk paint" id = "milk_paint" result = REAGENT_ID_PAINT - required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "milk" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_MILK = 5) result_amount = 5 /decl/chemical_reaction/instant/milk_paint/send_data() @@ -1002,7 +1002,7 @@ name = "Orange juice paint" id = "orange_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "orangejuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_ORANGEJUICE = 5) result_amount = 5 /decl/chemical_reaction/instant/orange_juice_paint/send_data() @@ -1012,7 +1012,7 @@ name = "Tomato juice paint" id = "tomato_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "tomatojuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_TOMATOJUICE = 5) result_amount = 5 /decl/chemical_reaction/instant/tomato_juice_paint/send_data() @@ -1022,7 +1022,7 @@ name = "Lime juice paint" id = "lime_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "limejuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_LIMEJUICE = 5) result_amount = 5 /decl/chemical_reaction/instant/lime_juice_paint/send_data() @@ -1032,7 +1032,7 @@ name = "Carrot juice paint" id = "carrot_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "carrotjuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_CARROTJUICE = 5) result_amount = 5 /decl/chemical_reaction/instant/carrot_juice_paint/send_data() @@ -1042,7 +1042,7 @@ name = "Berry juice paint" id = "berry_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "berryjuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BERRYJUICE = 5) result_amount = 5 /decl/chemical_reaction/instant/berry_juice_paint/send_data() @@ -1052,7 +1052,7 @@ name = "Grape juice paint" id = "grape_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "grapejuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_GRAPEJUICE = 5) result_amount = 5 /decl/chemical_reaction/instant/grape_juice_paint/send_data() @@ -1062,7 +1062,7 @@ name = "Poison berry juice paint" id = "poisonberry_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "poisonberryjuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_POISONBERRYJUICE = 5) result_amount = 5 /decl/chemical_reaction/instant/poisonberry_juice_paint/send_data() @@ -1072,7 +1072,7 @@ name = "Watermelon juice paint" id = "watermelon_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "watermelonjuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_WATERMELONJUICE = 5) result_amount = 5 /decl/chemical_reaction/instant/watermelon_juice_paint/send_data() @@ -1082,7 +1082,7 @@ name = "Lemon juice paint" id = "lemon_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "lemonjuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_LEMONJUICE = 5) result_amount = 5 /decl/chemical_reaction/instant/lemon_juice_paint/send_data() @@ -1092,7 +1092,7 @@ name = "Banana juice paint" id = "banana_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "banana" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_BANANA = 5) result_amount = 5 /decl/chemical_reaction/instant/banana_juice_paint/send_data() @@ -1102,7 +1102,7 @@ name = "Potato juice paint" id = "potato_juice_paint" result = REAGENT_ID_PAINT - required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, "potatojuice" = 5) + required_reagents = list(REAGENT_ID_PLASTICIDE = 1, REAGENT_ID_WATER = 3, REAGENT_ID_POTATOJUICE = 5) result_amount = 5 /decl/chemical_reaction/instant/potato_juice_paint/send_data() @@ -1140,7 +1140,7 @@ name = "Blue Carpet Dyeing" id = "carpetdyeblue" result = REAGENT_ID_LIQUIDCARPETBLU - required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "frostoil" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_FROSTOIL = 1) /decl/chemical_reaction/instant/carpetdye/tur name = "Turqouise Carpet Dyeing" @@ -1158,19 +1158,19 @@ name = "Clown Carpet Dyeing" id = "carpetdyeclown" result = REAGENT_ID_LIQUIDCARPETC - required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "banana" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_BANANA = 1) /decl/chemical_reaction/instant/carpetdye/purple name = "Purple Carpet Dyeing" id = "carpetdyepurple" result = REAGENT_ID_LIQUIDCARPETP - required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "berryjuice" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_BERRYJUICE = 1) /decl/chemical_reaction/instant/carpetdye/orange name = "Orange Carpet Dyeing" id = "carpetdyeorange" result = REAGENT_ID_LIQUIDCARPETO - required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "orangejuice" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_ORANGEJUICE = 1) //R-UST Port @@ -1217,7 +1217,7 @@ name = REAGENT_BIOMASS id = REAGENT_ID_BIOMASS result = REAGENT_ID_BIOMASS - required_reagents = list("protein" = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_PHORON = 1) + required_reagents = list(REAGENT_ID_PROTEIN = 1, REAGENT_ID_SUGAR = 1, REAGENT_ID_PHORON = 1) result_amount = 1 // Roughly 20u per phoron sheet // Neutralization. @@ -1225,20 +1225,20 @@ /decl/chemical_reaction/instant/neutralize_neurotoxic_protein name = "Neutralize Toxic Proteins" id = "neurotoxic_protein_neutral" - result = "protein" + result = REAGENT_ID_PROTEIN required_reagents = list(REAGENT_ID_ANTITOXIN = 1, REAGENT_ID_NEUROTOXIC_PROTEIN = 2) result_amount = 2 /decl/chemical_reaction/instant/neutralize_carpotoxin name = "Neutralize Carpotoxin" id = "carpotoxin_neutral" - result = "protein" - required_reagents = list("enzyme" = 1, REAGENT_ID_CARPOTOXIN = 1, REAGENT_ID_SIFSAP = 1) + result = REAGENT_ID_PROTEIN + required_reagents = list(REAGENT_ID_ENZYME = 1, REAGENT_ID_CARPOTOXIN = 1, REAGENT_ID_SIFSAP = 1) result_amount = 1 /decl/chemical_reaction/instant/neutralize_spidertoxin name = "Neutralize Spidertoxin" id = "spidertoxin_neutral" - result = "protein" - required_reagents = list("enzyme" = 1, REAGENT_ID_SPIDERTOXIN = 1, REAGENT_ID_SIFSAP = 1) + result = REAGENT_ID_PROTEIN + required_reagents = list(REAGENT_ID_ENZYME = 1, REAGENT_ID_SPIDERTOXIN = 1, REAGENT_ID_SIFSAP = 1) result_amount = 1 diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm index 8cad988a798..874270734b9 100644 --- a/code/modules/reagents/reactions/instant/instant_vr.dm +++ b/code/modules/reagents/reactions/instant/instant_vr.dm @@ -82,28 +82,28 @@ name = "Bootleg Androrovir" id = "androrovir_bootleg" result = REAGENT_ID_ANDROROVIR - required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "protein" = 10, "capsaicin" = 10) + required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_PROTEIN = 10, REAGENT_ID_CAPSAICIN = 10) result_amount = 1 /decl/chemical_reaction/instant/gynorovir_bootleg name = "Bootleg Gynorovir" id = "gynorovir_bootleg" result = REAGENT_ID_GYNOROVIR - required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "soymilk" = 10, REAGENT_ID_SUGAR = 10) + required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_SOYMILK = 10, REAGENT_ID_SUGAR = 10) result_amount = 1 /decl/chemical_reaction/instant/androgynorovir_bootleg name = "Bootleg Androgynorovir" id = "androgynorovir_bootleg" result = REAGENT_ID_ANDROGYNOROVIR - required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, "cola" = 10, "berryjuice" = 10) + required_reagents = list(REAGENT_ID_AMORPHOROVIR = 1, REAGENT_ID_COLA = 10, REAGENT_ID_BERRYJUICE = 10) result_amount = 1 /////////////////////////////////////////////////////////////////////////////////// /// Miscellaneous Reactions /decl/chemical_reaction/instant/foam/softdrink - required_reagents = list("cola" = 1, "mint" = 1) + required_reagents = list(REAGENT_ID_COLA = 1, REAGENT_ID_MINT = 1) /decl/chemical_reaction/instant/firefightingfoam //TODO: Make it so we can add this to the foam tanks to refill them name = REAGENT_FIREFOAM @@ -136,7 +136,7 @@ name = REAGENT_UNSORBITOL id = REAGENT_ID_UNSORBITOL result = REAGENT_ID_UNSORBITOL - required_reagents = list(REAGENT_ID_MUTAGEN = 3, "lipozine" = 2) + required_reagents = list(REAGENT_ID_MUTAGEN = 3, REAGENT_ID_LIPOZINE = 2) result_amount = 5 /////////////////////////////////////////////////////////////////////////////////// @@ -145,7 +145,7 @@ name = REAGENT_ADRANOL id = REAGENT_ID_ADRANOL result = REAGENT_ID_ADRANOL - required_reagents = list("milk" = 2, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_POTASSIUM = 1) + required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_HYDROGEN = 1, REAGENT_ID_POTASSIUM = 1) result_amount = 3 /decl/chemical_reaction/instant/vermicetol @@ -167,30 +167,30 @@ name = REAGENT_LIPOZILASE id = REAGENT_ID_LIPOZILASE result = REAGENT_ID_LIPOZILASE - required_reagents = list("lipozine" = 1, REAGENT_ID_DIETHYLAMINE = 1) + required_reagents = list(REAGENT_ID_LIPOZINE = 1, REAGENT_ID_DIETHYLAMINE = 1) result_amount = 2 /decl/chemical_reaction/instant/lipostipo name = REAGENT_LIPOSTIPO id = REAGENT_ID_LIPOSTIPO result = REAGENT_ID_LIPOSTIPO - required_reagents = list("lipozine" = 1, REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_FLUORINE = 1) + required_reagents = list(REAGENT_ID_LIPOZINE = 1, REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_FLUORINE = 1) result_amount = 3 /////////////////////////////////////////////////////////////////////////////////// /// Reagent colonies. /decl/chemical_reaction/instant/meatcolony - name = "protein" + name = REAGENT_ID_PROTEIN id = REAGENT_ID_MEATCOLONY - result = "protein" - required_reagents = list(REAGENT_ID_MEATCOLONY = 5, "virusfood" = 5) + result = REAGENT_ID_PROTEIN + required_reagents = list(REAGENT_ID_MEATCOLONY = 5, REAGENT_ID_VIRUSFOOD = 5) result_amount = 60 /decl/chemical_reaction/instant/plantcolony name = REAGENT_ID_NUTRIMENT id = REAGENT_ID_PLANTCOLONY result = REAGENT_ID_NUTRIMENT - required_reagents = list(REAGENT_ID_PLANTCOLONY = 5, "virusfood" = 5) + required_reagents = list(REAGENT_ID_PLANTCOLONY = 5, REAGENT_ID_VIRUSFOOD = 5) result_amount = 60 /////////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/reagents/reactions/instant/virology.dm b/code/modules/reagents/reactions/instant/virology.dm index c2ea1ec0c3a..c00f91bdc58 100644 --- a/code/modules/reagents/reactions/instant/virology.dm +++ b/code/modules/reagents/reactions/instant/virology.dm @@ -2,21 +2,21 @@ name = REAGENT_MUTAGENVIRUSFOOD id = REAGENT_ID_MUTAGENVIRUSFOOD result = REAGENT_ID_MUTAGENVIRUSFOOD - required_reagents = list(REAGENT_ID_MUTAGEN = 1, "virusfood" = 1) + required_reagents = list(REAGENT_ID_MUTAGEN = 1, REAGENT_ID_VIRUSFOOD = 1) result_amount = 1 /decl/chemical_reaction/instant/virus_food_adranol name = REAGENT_ADRANOLVIRUSFOOD id = REAGENT_ID_ADRANOLVIRUSFOOD result = REAGENT_ID_ADRANOLVIRUSFOOD - required_reagents = list(REAGENT_ID_ADRANOL = 1, "virusfood" = 1) + required_reagents = list(REAGENT_ID_ADRANOL = 1, REAGENT_ID_VIRUSFOOD = 1) result_amount = 1 /decl/chemical_reaction/instant/virus_food_phoron name = REAGENT_ADRANOLVIRUSFOOD id = REAGENT_ID_PHORONVIRUSFOOD result = REAGENT_ID_PHORONVIRUSFOOD - required_reagents = list(REAGENT_ID_PHORON = 1, "virusfood" = 1) + required_reagents = list(REAGENT_ID_PHORON = 1, REAGENT_ID_VIRUSFOOD = 1) result_amount = 1 /decl/chemical_reaction/instant/virus_food_phoron_adranol @@ -50,7 +50,7 @@ /decl/chemical_reaction/instant/mix_virus name = "Mix Virus" id = "mixvirus" - required_reagents = list("virusfood" = 1) + required_reagents = list(REAGENT_ID_VIRUSFOOD = 1) catalysts = list(REAGENT_ID_BLOOD = 1) var/level_min = 0 var/level_max = 2 diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm index 9beec35380e..bcc431ec4d0 100644 --- a/code/modules/reagents/reagent_containers/borghypo.dm +++ b/code/modules/reagents/reagent_containers/borghypo.dm @@ -134,46 +134,46 @@ possible_transfer_amounts = list(5, 10, 20, 30) reagent_ids = list("ale", "beer", - "berryjuice", + REAGENT_ID_BERRYJUICE, "bitters", "cider", - "coffee", + REAGENT_ID_COFFEE, "cognac", - "cola", - "cream", - "dr_gibb", - "egg", + REAGENT_ID_COLA, + REAGENT_ID_CREAM, + REAGENT_ID_DRGIBB, + REAGENT_ID_EGG, "gin", - "gingerale", - "hot_coco", + REAGENT_ID_GINGERALE, + REAGENT_ID_HOTCOCO, "ice", - "icetea", + REAGENT_ID_ICETEA, "kahlua", - "lemonjuice", - "lemon_lime", - "limejuice", + REAGENT_ID_LEMONJUICE, + REAGENT_ID_LEMONLIME, + REAGENT_ID_LIMEJUICE, "mead", - "milk", - "mint", - "orangejuice", + REAGENT_ID_MILK, + REAGENT_ID_MINT, + REAGENT_ID_ORANGEJUICE, "redwine", "rum", "sake", - "sodawater", - "soymilk", - "space_up", - "spacemountainwind", - "spacespice", + REAGENT_ID_SODAWATER, + REAGENT_ID_SOYMILK, + REAGENT_ID_SPACEUP, + REAGENT_ID_SPACEMOUNTAINWIND, + REAGENT_ID_SPACESPICE, "specialwhiskey", REAGENT_ID_SUGAR, - "tea", + REAGENT_ID_TEA, "tequilla", - "tomatojuice", - "tonic", + REAGENT_ID_TOMATOJUICE, + REAGENT_ID_TONIC, "vermouth", "vodka", REAGENT_ID_WATER, - "watermelonjuice", + REAGENT_ID_WATERMELONJUICE, "whiskey") /obj/item/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index f69d56feb8d..0881be3303b 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -276,7 +276,7 @@ /obj/item/reagent_containers/hypospray/autoinjector/biginjector/glucose name = "glucose hypo" desc = "A hypoinjector filled with glucose, used for critically malnourished patients and voidsuited workers." - filled_reagents = list("glucose" = 15) + filled_reagents = list(REAGENT_ID_GLUCOSE = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/stimm name = "stimm injector" @@ -376,7 +376,7 @@ desc = "A refined version of the standard autoinjector, allowing greater capacity. \ The hypospray contains a viral agent inside, as well as a liquid substance that encourages \ the growth of the virus inside." - filled_reagents = list("virusfood" = 15) + filled_reagents = list(REAGENT_ID_VIRUSFOOD = 15) /obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/do_injection(mob/living/carbon/human/H, mob/living/user) . = ..() diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index a52c847a65e..148c5b88f23 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -351,5 +351,5 @@ /obj/item/reagent_containers/pill/diet/Initialize() . = ..() - reagents.add_reagent("lipozine", 15) //VOREStation Edit + reagents.add_reagent(REAGENT_ID_LIPOZINE, 15) //VOREStation Edit color = reagents.get_color() diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm index 659792bf795..9c41dee7656 100644 --- a/code/modules/reagents/reagent_containers/pill_vr.dm +++ b/code/modules/reagents/reagent_containers/pill_vr.dm @@ -14,7 +14,7 @@ /obj/item/reagent_containers/pill/protein/Initialize() . = ..() - reagents.add_reagent("protein", 30) + reagents.add_reagent(REAGENT_ID_PROTEIN, 30) /obj/item/reagent_containers/pill/rezadone name = REAGENT_REZADONE + " (5u)" diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 078ee4d3905..1e4d441393c 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -129,7 +129,7 @@ /obj/item/reagent_containers/spray/pepper/Initialize() . = ..() - reagents.add_reagent("condensedcapsaicin", 40) + reagents.add_reagent(REAGENT_ID_CONDENSEDCAPSAICIN, 40) /obj/item/reagent_containers/spray/pepper/examine(mob/user) . = ..() diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index 2b2275e31a0..b49f125c6b4 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -74,8 +74,8 @@ Generally coatings are intended for deep frying foods */ /datum/reagent/nutriment/coating - name = "coating" - id = "coating" + name = REAGENT_COATING + id = REAGENT_ID_COATING nutriment_factor = 6 //Less dense than the food itself, but coatings still add extra calories var/messaged = 0 var/icon_raw @@ -121,9 +121,9 @@ data["cooked"] = newdata["cooked"] /datum/reagent/nutriment/coating/batter - name = "batter mix" - cooked_name = "batter" - id = "batter" + name = REAGENT_BATTER + cooked_name = REAGENT_ID_BATTER + id = REAGENT_ID_BATTER color = "#f5f4e9" reagent_state = LIQUID icon_raw = "batter_raw" @@ -132,9 +132,9 @@ allergen_type = ALLERGEN_GRAINS | ALLERGEN_EGGS //Made with flour(grain), and eggs(eggs) /datum/reagent/nutriment/coating/beerbatter - name = "beer batter mix" + name = REAGENT_BEERBATTER cooked_name = "beer batter" - id = "beerbatter" + id = REAGENT_ID_BEERBATTER color = "#f5f4e9" reagent_state = LIQUID icon_raw = "batter_raw" @@ -150,8 +150,8 @@ //Fats //========================= /datum/reagent/nutriment/triglyceride - name = "triglyceride" - id = "triglyceride" + name = REAGENT_TRIGLYCERIDE + id = REAGENT_ID_TRIGLYCERIDE description = "More commonly known as fat, the third macronutrient, with over double the energy content of carbs and protein" reagent_state = SOLID @@ -162,8 +162,8 @@ /datum/reagent/nutriment/triglyceride/oil //Having this base class incase we want to add more variants of oil - name = "Oil" - id = "oil" + name = REAGENT_OIL + id = REAGENT_ID_OIL description = "Oils are liquid fats." reagent_state = LIQUID taste_description = "oil" @@ -242,21 +242,21 @@ lastburnmessage = world.time /datum/reagent/nutriment/triglyceride/oil/cooking - name = "Cooking Oil" - id = "cookingoil" + name = REAGENT_COOKINGOIL + id = REAGENT_ID_COOKINGOIL description = "A general-purpose cooking oil." reagent_state = LIQUID /datum/reagent/nutriment/triglyceride/oil/corn - name = "Corn Oil" - id = "cornoil" + name = REAGENT_CORNOIL + id = REAGENT_ID_CORNOIL description = "An oil derived from various types of corn." reagent_state = LIQUID allergen_type = ALLERGEN_VEGETABLE //Corn is a vegetable /datum/reagent/nutriment/triglyceride/oil/peanut - name = "Peanut Oil" - id = "peanutoil" + name = REAGENT_PEANUTOIL + id = REAGENT_ID_PEANUTOIL description = "An oil derived from various types of nuts." taste_description = "nuts" taste_mult = 0.3 @@ -267,8 +267,8 @@ // Aurora Cooking Port Insertion End /datum/reagent/nutriment/glucose - name = "Glucose" - id = "glucose" + name = REAGENT_GLUCOSE + id = REAGENT_ID_GLUCOSE taste_description = "sweetness" color = "#FFFFFF" cup_prefix = "sweetened" @@ -276,8 +276,8 @@ injectable = 1 /datum/reagent/nutriment/protein // Bad for Skrell! - name = "animal protein" - id = "protein" + name = REAGENT_PROTEIN + id = REAGENT_ID_PROTEIN taste_description = "some sort of meat" color = "#440000" allergen_type = ALLERGEN_MEAT //"Animal protein" implies it comes from animals, therefore meat. @@ -296,57 +296,57 @@ ..() /datum/reagent/nutriment/protein/tofu - name = "tofu protein" - id = "tofu" + name = REAGENT_TOFU + id = REAGENT_ID_TOFU color = "#fdffa8" taste_description = "tofu" allergen_type = ALLERGEN_BEANS //Made from soy beans /datum/reagent/nutriment/protein/seafood - name = "seafood protein" - id = "seafood" + name = REAGENT_SEAFOOD + id = REAGENT_ID_SEAFOOD color = "#f5f4e9" taste_description = "fish" allergen_type = ALLERGEN_FISH //I suppose the fish allergy likely refers to seafood in general. /datum/reagent/nutriment/protein/cheese - name = "cheese" - id = "cheese" + name = REAGENT_CHEESE + id = REAGENT_ID_CHEESE color = "#EDB91F" taste_description = "cheese" allergen_type = ALLERGEN_DAIRY //Cheese is made from dairy cup_prefix = "cheesy" /datum/reagent/nutriment/protein/egg - name = "egg yolk" - id = "egg" + name = REAGENT_EGG + id = REAGENT_ID_EGG taste_description = "egg" color = "#FFFFAA" allergen_type = ALLERGEN_EGGS //Eggs contain egg cup_prefix = "eggy" /datum/reagent/nutriment/protein/murk - name = "murkfin protein" - id = "murk_protein" + name = REAGENT_MURK_PROTEIN + id = REAGENT_ID_MURK_PROTEIN taste_description = "mud" color = "#664330" allergen_type = ALLERGEN_FISH //Murkfin is fish /datum/reagent/nutriment/protein/bean - name = "beans" - id = "bean_protein" + name = REAGENT_BEANPROTEIN + id = REAGENT_ID_BEANPROTEIN taste_description = "beans" color = "#562e0b" allergen_type = ALLERGEN_BEANS //Made from soy beans /datum/reagent/nutriment/honey - name = "Honey" - id = "honey" + name = REAGENT_HONEY + id = REAGENT_ID_HONEY description = "A golden yellow syrup, loaded with sugary sweetness." taste_description = "sweetness" nutriment_factor = 10 color = "#FFFF00" - cup_prefix = "honey" + cup_prefix = REAGENT_ID_HONEY /datum/reagent/nutriment/honey/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -370,26 +370,26 @@ M.drowsyness = max(M.drowsyness, 60) /datum/reagent/nutriment/mayo - name = "mayonnaise" - id = "mayo" + name = REAGENT_MAYO + id = REAGENT_ID_MAYO description = "A thick, bitter sauce." taste_description = "unmistakably mayonnaise" nutriment_factor = 10 color = "#FFFFFF" allergen_type = ALLERGEN_EGGS //Mayo is made from eggs - cup_prefix = "mayo" + cup_prefix = REAGENT_ID_MAYO /datum/reagent/nutriment/yeast - name = "Yeast" - id = "yeast" + name = REAGENT_YEAST + id = REAGENT_ID_YEAST description = "For making bread rise!" taste_description = "yeast" nutriment_factor = 1 color = "#D3AF70" /datum/reagent/nutriment/flour - name = "Flour" - id = "flour" + name = REAGENT_FLOUR + id = REAGENT_ID_FLOUR description = "This is what you rub all over yourself to pretend to be a ghost." taste_description = "chalky wheat" reagent_state = SOLID @@ -403,8 +403,8 @@ new /obj/effect/decal/cleanable/flour(T) /datum/reagent/nutriment/coffee - name = "Coffee Powder" - id = "coffeepowder" + name = REAGENT_COFFEEPOWDER + id = REAGENT_ID_COFFEEPOWDER description = "A bitter powder made by grinding coffee beans." taste_description = "bitterness" taste_mult = 1.3 @@ -413,8 +413,8 @@ allergen_type = ALLERGEN_COFFEE | ALLERGEN_STIMULANT //Again, coffee contains coffee /datum/reagent/nutriment/tea - name = "Tea Powder" - id = "teapowder" + name = REAGENT_TEAPOWDER + id = REAGENT_ID_TEAPOWDER description = "A dark, tart powder made from black tea leaves." taste_description = "tartness" taste_mult = 1.3 @@ -423,8 +423,8 @@ allergen_type = ALLERGEN_STIMULANT //Strong enough to contain caffeine /datum/reagent/nutriment/decaf_tea - name = "Decaf Tea Powder" - id = "decafteapowder" + name = REAGENT_DECAFTEAPOWDER + id = REAGENT_ID_DECAFTEAPOWDER description = "A dark, tart powder made from black tea leaves, treated to remove caffeine content." taste_description = "tartness" taste_mult = 1.3 @@ -432,8 +432,8 @@ color = "#101000" /datum/reagent/nutriment/coco - name = "Coco Powder" - id = "coco" + name = REAGENT_COCO + id = REAGENT_ID_COCO description = "A fatty, bitter paste made from coco beans." taste_description = "bitterness" taste_mult = 1.3 @@ -441,62 +441,62 @@ nutriment_factor = 5 color = "#302000" allergen_type = ALLERGEN_CHOCOLATE - cup_prefix = "coco" + cup_prefix = REAGENT_ID_COCO /datum/reagent/nutriment/chocolate - name = "Chocolate" - id = "chocolate" + name = REAGENT_CHOCOLATE + id = REAGENT_ID_CHOCOLATE description = "Great for cooking or on its own!" taste_description = "chocolate" color = "#582815" nutriment_factor = 5 taste_mult = 1.3 allergen_type = ALLERGEN_CHOCOLATE - cup_prefix = "chocolate" + cup_prefix = REAGENT_ID_CHOCOLATE /datum/reagent/nutriment/instantjuice - name = "Juice Powder" - id = "instantjuice" + name = REAGENT_INSTANTJUICE + id = REAGENT_ID_INSTANTJUICE description = "Dehydrated, powdered juice of some kind." taste_mult = 1.3 nutriment_factor = 1 allergen_type = ALLERGEN_FRUIT //I suppose it's implied here that the juice is from dehydrated fruit. /datum/reagent/nutriment/instantjuice/grape - name = "Grape Juice Powder" - id = "instantgrape" + name = REAGENT_INSTANTGRAPE + id = REAGENT_ID_INSTANTGRAPE description = "Dehydrated, powdered grape juice." taste_description = "dry grapes" color = "#863333" cup_prefix = "grape" /datum/reagent/nutriment/instantjuice/orange - name = "Orange Juice Powder" - id = "instantorange" + name = REAGENT_INSTANTORANGE + id = REAGENT_ID_INSTANTORANGE description = "Dehydrated, powdered orange juice." taste_description = "dry oranges" color = "#e78108" cup_prefix = "orange" /datum/reagent/nutriment/instantjuice/watermelon - name = "Watermelon Juice Powder" - id = "instantwatermelon" + name = REAGENT_INSTANTWATERMELON + id = REAGENT_ID_INSTANTWATERMELON description = "Dehydrated, powdered watermelon juice." taste_description = "dry sweet watermelon" color = "#b83333" cup_prefix = "melon" /datum/reagent/nutriment/instantjuice/apple - name = "Apple Juice Powder" - id = "instantapple" + name = REAGENT_INSTANTAPPLE + id = REAGENT_ID_INSTANTAPPLE description = "Dehydrated, powdered apple juice." taste_description = "dry sweet apples" color = "#c07c40" cup_prefix = "apple" /datum/reagent/nutriment/soysauce - name = "Soy Sauce" - id = "soysauce" + name = REAGENT_SOYSAUCE + id = REAGENT_ID_SOYSAUCE description = "A salty sauce made from the soy plant." taste_description = "umami" taste_mult = 1.1 @@ -507,8 +507,8 @@ cup_prefix = "umami" /datum/reagent/nutriment/vinegar - name = "Vinegar" - id = "vinegar" + name = REAGENT_VINEGAR + id = REAGENT_ID_VINEGAR description = "vinegar, great for fish and pickles." taste_description = "vinegar" reagent_state = LIQUID @@ -517,8 +517,8 @@ cup_prefix = "acidic" /datum/reagent/nutriment/ketchup - name = "Ketchup" - id = "ketchup" + name = REAGENT_KETCHUP + id = REAGENT_ID_KETCHUP description = "Ketchup, catsup, whatever. It's tomato paste." taste_description = "ketchup" reagent_state = LIQUID @@ -528,28 +528,28 @@ cup_prefix = "tomato" /datum/reagent/nutriment/mustard - name = "Mustard" - id = "mustard" + name = REAGENT_MUSTARD + id = REAGENT_ID_MUSTARD description = "Delicious mustard. Good on Hot Dogs." taste_description = "mustard" reagent_state = LIQUID nutriment_factor = 5 color = "#E3BD00" - cup_prefix = "mustard" + cup_prefix = REAGENT_ID_MUSTARD /datum/reagent/nutriment/barbecue - name = "Barbeque Sauce" - id = "barbecue" + name = REAGENT_BARBECUE + id = REAGENT_ID_BARBECUE description = "Barbecue sauce for barbecues and long shifts." taste_description = "barbeque" reagent_state = LIQUID nutriment_factor = 5 color = "#4F330F" - cup_prefix = "barbecue" + cup_prefix = REAGENT_ID_BARBECUE /datum/reagent/nutriment/rice - name = "Rice" - id = "rice" + name = REAGENT_RICE + id = REAGENT_ID_RICE description = "Enjoy the great taste of nothing." taste_description = "rice" taste_mult = 0.4 @@ -558,8 +558,8 @@ color = "#FFFFFF" /datum/reagent/nutriment/cherryjelly - name = "Cherry Jelly" - id = "cherryjelly" + name = REAGENT_CHERRYJELLY + id = REAGENT_ID_CHERRYJELLY description = "Totally the best. Only to be spread on foods with excellent lateral symmetry." taste_description = "cherry" taste_mult = 1.3 @@ -569,8 +569,8 @@ allergen_type = ALLERGEN_FRUIT //Cherries are fruits /datum/reagent/nutriment/peanutbutter - name = "Peanut Butter" - id = "peanutbutter" + name = REAGENT_PEANUTBUTTER + id = REAGENT_ID_PEANUTBUTTER description = "A butter derived from various types of nuts." taste_description = "peanuts" taste_mult = 0.5 @@ -581,19 +581,19 @@ cup_prefix = "peanut butter" /datum/reagent/nutriment/vanilla - name = "Vanilla Extract" - id = "vanilla" + name = REAGENT_VANILLA + id = REAGENT_ID_VANILLA description = "Vanilla extract. Tastes suspiciously like boring ice-cream." taste_description = "vanilla" taste_mult = 5 reagent_state = LIQUID nutriment_factor = 2 color = "#0F0A00" - cup_prefix = "vanilla" + cup_prefix = REAGENT_ID_VANILLA /datum/reagent/nutriment/durian - name = "Durian Paste" - id = "durianpaste" + name = REAGENT_DURIANPASTE + id = REAGENT_ID_DURIANPASTE description = "A strangely sweet and savory paste." taste_description = "sweet and savory" color = "#757631" @@ -619,8 +619,8 @@ return ..() /datum/reagent/nutriment/virus_food - name = "Virus Food" - id = "virusfood" + name = REAGENT_VIRUSFOOD + id = REAGENT_ID_VIRUSFOOD description = "A mixture of water, milk, and oxygen. Virus cells can use this mixture to reproduce." taste_description = "vomit" taste_mult = 2 @@ -630,8 +630,8 @@ allergen_type = ALLERGEN_DAIRY //incase anyone is dumb enough to drink it - it does contain milk! /datum/reagent/nutriment/sprinkles - name = "Sprinkles" - id = "sprinkles" + name = REAGENT_SPRINKLES + id = REAGENT_ID_SPRINKLES description = "Multi-colored little bits of sugar, commonly found on donuts. Loved by cops." taste_description = "sugar" nutriment_factor = 1 @@ -639,8 +639,8 @@ cup_prefix = "sprinkled" /datum/reagent/nutriment/mint - name = "Mint" - id = "mint" + name = REAGENT_MINT + id = REAGENT_ID_MINT description = "Also known as Mentha." taste_description = "mint" reagent_state = LIQUID @@ -648,8 +648,8 @@ cup_prefix = "minty" /datum/reagent/lipozine // The anti-nutriment. - name = "Lipozine" - id = "lipozine" + name = REAGENT_LIPOZINE + id = REAGENT_ID_LIPOZINE description = "A chemical compound that causes a powerful fat-burning reaction." taste_description = "mothballs" reagent_state = LIQUID @@ -683,8 +683,8 @@ affect_blood(M, alien, passthrough) /datum/reagent/blackpepper - name = "Black Pepper" - id = "blackpepper" + name = REAGENT_BLACKPEPPER + id = REAGENT_ID_BLACKPEPPER description = "A powder ground from peppercorns. *AAAACHOOO*" taste_description = "pepper" reagent_state = SOLID @@ -693,8 +693,8 @@ cup_prefix = "peppery" /datum/reagent/enzyme - name = "Universal Enzyme" - id = "enzyme" + name = REAGENT_ENZYME + id = REAGENT_ID_ENZYME description = "A universal enzyme used in the preperation of certain chemicals and foods." taste_description = "sweetness" taste_mult = 0.7 @@ -703,31 +703,31 @@ overdose = REAGENTS_OVERDOSE /datum/reagent/spacespice - name = "Wurmwoad" - id = "spacespice" + name = REAGENT_SPACESPICE + id = REAGENT_ID_SPACESPICE description = "An exotic blend of spices for cooking. Definitely not worms." reagent_state = SOLID color = "#e08702" cup_prefix = "spicy" /datum/reagent/browniemix - name = "Brownie Mix" - id = "browniemix" + name = REAGENT_BROWNIEMIX + id = REAGENT_ID_BROWNIEMIX description = "A dry mix for making delicious brownies." reagent_state = SOLID color = "#441a03" allergen_type = ALLERGEN_CHOCOLATE /datum/reagent/cakebatter - name = "Cake Batter" - id = "cakebatter" + name = REAGENT_CAKEBATTER + id = REAGENT_ID_CAKEBATTER description = "A batter for making delicious cakes." reagent_state = LIQUID color = "#F0EDDA" /datum/reagent/frostoil - name = "Frost Oil" - id = "frostoil" + name = REAGENT_FROSTOIL + id = REAGENT_ID_FROSTOIL description = "A special oil that noticably chills the body. Extracted from Ice Peppers." taste_description = "mint" taste_mult = 1.5 @@ -741,7 +741,7 @@ M.bodytemperature = min(M.bodytemperature, max(M.bodytemperature - 10 * TEMPERATURE_DAMAGE_COEFFICIENT, 215)) if(prob(1)) M.emote("shiver") - holder.remove_reagent("capsaicin", 5) + holder.remove_reagent(REAGENT_ID_CAPSAICIN, 5) /datum/reagent/frostoil/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) // Eating frostoil now acts like capsaicin. Wee! if(alien == IS_DIONA) @@ -763,19 +763,19 @@ M.bodytemperature -= rand(1, 5) * M.species.spice_mod // Really fucks you up, cause it makes you cold. if(prob(5)) M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]"), pick(span_danger("You feel like your insides are freezing!"), span_danger("Your insides feel like they're turning to ice!"))) - // holder.remove_reagent("capsaicin", 5) // VOREStation Edit: Nop, we don't instadelete spices for free. + // holder.remove_reagent(REAGENT_ID_CAPSAICIN, 5) // VOREStation Edit: Nop, we don't instadelete spices for free. /datum/reagent/frostoil/cryotoxin //A longer lasting version of frost oil. - name = "Cryotoxin" - id = "cryotoxin" + name = REAGENT_CRYOTOXIN + id = REAGENT_ID_CRYOTOXIN description = "Lowers the body's internal temperature." reagent_state = LIQUID color = "#B31008" metabolism = REM * 0.5 /datum/reagent/capsaicin - name = "Capsaicin Oil" - id = "capsaicin" + name = REAGENT_CAPSAICIN + id = REAGENT_ID_CAPSAICIN description = "This is what makes chilis hot." taste_description = "hot peppers" taste_mult = 1.5 @@ -810,11 +810,11 @@ M.bodytemperature += rand(1, 5) * M.species.spice_mod // Really fucks you up, cause it makes you overheat, too. if(prob(5)) 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!"))) - // holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free. + // holder.remove_reagent(REAGENT_ID_FROSTOIL, 5) // VOREStation Edit: Nop, we don't instadelete spices for free. /datum/reagent/condensedcapsaicin - name = "Condensed Capsaicin" - id = "condensedcapsaicin" + name = REAGENT_CONDENSEDCAPSAICIN + id = REAGENT_ID_CONDENSEDCAPSAICIN description = "A chemical agent used for self-defense and in police work." taste_description = "fire" taste_mult = 10 @@ -955,13 +955,13 @@ M.apply_effect(4, AGONY, 0) if(prob(5)) M.visible_message(span_warning("[M] [pick("dry heaves!","coughs!","splutters!")]"), span_danger("You feel like your insides are burning!")) - // holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free. + // holder.remove_reagent(REAGENT_ID_FROSTOIL, 5) // VOREStation Edit: Nop, we don't instadelete spices for free. /* Drinks */ /datum/reagent/drink - name = "Drink" - id = "drink" + name = REAGENT_DRINK + id = REAGENT_ID_DRINK description = "Uh, some kind of drink." ingest_met = REM reagent_state = LIQUID @@ -1002,8 +1002,8 @@ // Juices /datum/reagent/drink/juice/banana - name = "Banana Juice" - id = "banana" + name = REAGENT_BANANA + id = REAGENT_ID_BANANA description = "The raw essence of a banana." taste_description = "banana" color = "#C3AF00" @@ -1011,11 +1011,11 @@ glass_name = "banana juice" glass_desc = "The raw essence of a banana. HONK!" allergen_type = ALLERGEN_FRUIT //Bananas are fruit - cup_prefix = "banana" + cup_prefix = REAGENT_ID_BANANA /datum/reagent/drink/juice/berry - name = "Berry Juice" - id = "berryjuice" + name = REAGENT_BERRYJUICE + id = REAGENT_ID_BERRYJUICE description = "A delicious blend of several different kinds of berries." taste_description = "berries" color = "#990066" @@ -1026,8 +1026,8 @@ cup_prefix = "berry" /datum/reagent/drink/juice/pineapple - name = "Pineapple Juice" - id = "pineapplejuice" + name = REAGENT_PINEAPPLEJUICE + id = REAGENT_ID_PINEAPPLEJUICE description = "A sour but refreshing juice from a pineapple." taste_description = "pineapple" color = "#C3AF00" @@ -1038,8 +1038,8 @@ cup_prefix = "pineapple" /datum/reagent/drink/juice/carrot - name = "Carrot juice" - id = "carrotjuice" + name = REAGENT_CARROTJUICE + id = REAGENT_ID_CARROTJUICE description = "It is just like a carrot but without crunching." taste_description = "carrots" color = "#FF8C00" // rgb: 255, 140, 0 @@ -1054,8 +1054,8 @@ M.reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, removed * 0.2) /datum/reagent/drink/juice/lettuce - name = "Lettuce Juice" - id = "lettucejuice" + name = REAGENT_LETTUCEJUICE + id = REAGENT_ID_LETTUCEJUICE description = "It's mostly water, just a bit more lettucy." taste_description = "fresh greens" color = "#29df4b" @@ -1065,8 +1065,8 @@ cup_prefix = "lettuce" /datum/reagent/drink/juice - name = "Grape Juice" - id = "grapejuice" + name = REAGENT_GRAPEJUICE + id = REAGENT_ID_GRAPEJUICE description = "It's grrrrrape!" taste_description = "grapes" color = "#863333" @@ -1100,8 +1100,8 @@ M.drowsyness = max(M.drowsyness, 60) /datum/reagent/drink/juice/lemon - name = "Lemon Juice" - id = "lemonjuice" + name = REAGENT_LEMONJUICE + id = REAGENT_ID_LEMONJUICE description = "This juice is VERY sour." taste_description = "sourness" taste_mult = 1.1 @@ -1114,8 +1114,8 @@ /datum/reagent/drink/juice/apple - name = "Apple Juice" - id = "applejuice" + name = REAGENT_APPLEJUICE + id = REAGENT_ID_APPLEJUICE description = "The most basic juice." taste_description = "crispness" taste_mult = 1.1 @@ -1127,8 +1127,8 @@ cup_prefix = "apple" /datum/reagent/drink/juice/lime - name = "Lime Juice" - id = "limejuice" + name = REAGENT_LIMEJUICE + id = REAGENT_ID_LIMEJUICE description = "The sweet-sour juice of limes." taste_description = "sourness" taste_mult = 1.8 @@ -1146,8 +1146,8 @@ M.adjustToxLoss(-0.5 * removed) /datum/reagent/drink/juice/orange - name = "Orange juice" - id = "orangejuice" + name = REAGENT_ORANGEJUICE + id = REAGENT_ID_ORANGEJUICE description = "Both delicious AND rich in Vitamin C, what more do you need?" taste_description = "oranges" color = "#E78108" @@ -1164,8 +1164,8 @@ M.adjustOxyLoss(-2 * removed) /datum/reagent/toxin/poisonberryjuice // It has more in common with toxins than drinks... but it's a juice - name = "Poison Berry Juice" - id = "poisonberryjuice" + name = REAGENT_POISONBERRYJUICE + id = REAGENT_ID_POISONBERRYJUICE description = "A tasty juice blended from various kinds of very deadly and toxic berries." taste_description = "berries" color = "#863353" @@ -1176,8 +1176,8 @@ cup_prefix = "poison" /datum/reagent/drink/juice/potato - name = "Potato Juice" - id = "potatojuice" + name = REAGENT_POTATOJUICE + id = REAGENT_ID_POTATOJUICE description = "Juice of the potato. Bleh." taste_description = "potatoes" nutrition = 2 @@ -1190,8 +1190,8 @@ cup_prefix = "potato" /datum/reagent/drink/juice/turnip - name = "Turnip Juice" - id = "turnipjuice" + name = REAGENT_TURNIPJUICE + id = REAGENT_ID_TURNIPJUICE description = "Juice of the turnip. A step below the potato." taste_description = "turnips" nutrition = 2 @@ -1204,8 +1204,8 @@ cup_prefix = "turnip" /datum/reagent/drink/juice/tomato - name = "Tomato Juice" - id = "tomatojuice" + name = REAGENT_TOMATOJUICE + id = REAGENT_ID_TOMATOJUICE description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?" taste_description = "tomatoes" color = "#731008" @@ -1223,8 +1223,8 @@ M.heal_organ_damage(0, 0.5 * removed) /datum/reagent/drink/juice/watermelon - name = "Watermelon Juice" - id = "watermelonjuice" + name = REAGENT_WATERMELONJUICE + id = REAGENT_ID_WATERMELONJUICE description = "Delicious juice made from watermelon." taste_description = "sweet watermelon" color = "#B83333" @@ -1237,23 +1237,23 @@ // Everything else /datum/reagent/drink/milk - name = "Milk" - id = "milk" + name = REAGENT_MILK + id = REAGENT_ID_MILK description = "An opaque white liquid produced by the mammary glands of mammals." taste_description = "milk" color = "#DFDFDF" - glass_name = "milk" + glass_name = REAGENT_ID_MILK glass_desc = "White and nutritious goodness!" cup_icon_state = "cup_cream" - cup_name = "milk" + cup_name = REAGENT_ID_MILK cup_desc = "White and nutritious goodness!" allergen_type = ALLERGEN_DAIRY //Milk is dairy /datum/reagent/drink/milk/chocolate - name = "Chocolate Milk" - id = "chocolate_milk" + name = REAGENT_CHOCOLATEMILK + id = REAGENT_ID_CHOCOLATEMILK description = "A delicious mixture of perfectly healthy mix and terrible chocolate." taste_description = "chocolate milk" color = "#74533b" @@ -1271,7 +1271,7 @@ if(alien == IS_DIONA) return M.heal_organ_damage(0.5 * removed, 0) - holder.remove_reagent("capsaicin", 10 * removed) + holder.remove_reagent(REAGENT_ID_CAPSAICIN, 10 * removed) //VOREStation Edit if(ishuman(M) && rand(1,10000) == 1) var/mob/living/carbon/human/H = M @@ -1284,23 +1284,23 @@ //VOREStation Edit End /datum/reagent/drink/milk/cream - name = "Cream" - id = "cream" + name = REAGENT_CREAM + id = REAGENT_ID_CREAM description = "The fatty, still liquid part of milk. Why don't you mix this with sum scotch, eh?" taste_description = "thick milk" color = "#DFD7AF" - glass_name = "cream" + glass_name = REAGENT_ID_CREAM glass_desc = "Ewwww..." cup_icon_state = "cup_cream" - cup_name = "cream" + cup_name = REAGENT_ID_CREAM cup_desc = "Ewwww..." allergen_type = ALLERGEN_DAIRY //Cream is dairy /datum/reagent/drink/milk/soymilk - name = "Soy Milk" - id = "soymilk" + name = REAGENT_SOYMILK + id = REAGENT_ID_SOYMILK description = "An opaque white liquid made from soybeans." taste_description = "soy milk" color = "#DFDFC7" @@ -1309,13 +1309,13 @@ glass_desc = "White and nutritious soy goodness!" cup_icon_state = "cup_cream" - cup_name = "milk" + cup_name = REAGENT_ID_MILK cup_desc = "White and nutritious goodness!" allergen_type = ALLERGEN_BEANS //Would be made from soy beans /datum/reagent/drink/milk/foam - name = "Milk Foam" - id = "milk_foam" + name = REAGENT_MILKFOAM + id = REAGENT_ID_MILKFOAM description = "Light and airy foamed milk." taste_description = "airy milk" color = "#eeebdf" @@ -1330,8 +1330,8 @@ /datum/reagent/drink/tea - name = "Tea" - id = "tea" + name = REAGENT_TEA + id = REAGENT_ID_TEA description = "Tasty black tea, it has antioxidants, it's good for you!" taste_description = "black tea" color = "#832700" @@ -1344,7 +1344,7 @@ glass_desc = "Tasty black tea, it has antioxidants, it's good for you!" cup_icon_state = "cup_tea" - cup_name = "tea" + cup_name = REAGENT_ID_TEA cup_desc = "Tasty black tea, it has antioxidants, it's good for you!" allergen_type = ALLERGEN_STIMULANT //Black tea strong enough to have significant caffeine content @@ -1355,8 +1355,8 @@ M.adjustToxLoss(-0.5 * removed) /datum/reagent/drink/tea/decaf - name = "Decaf Tea" - id = "teadecaf" + name = REAGENT_TEADECAF + id = REAGENT_ID_TEADECAF description = "Tasty black tea, it has antioxidants, it's good for you, and won't keep you up at night!" color = "#832700" adj_dizzy = 0 @@ -1372,8 +1372,8 @@ /datum/reagent/drink/tea/icetea - name = "Iced Tea" - id = "icetea" + name = REAGENT_ICETEA + id = REAGENT_ID_ICETEA description = "No relation to a certain rap artist/ actor." taste_description = "sweet tea" color = "#AC7F24" // rgb: 16, 64, 56 @@ -1406,18 +1406,18 @@ //M.adjustToxLoss(5 * removed) //VOREStation Removal /datum/reagent/drink/tea/icetea/decaf - name = "Decaf Iced Tea" + name = REAGENT_ICETEADECAF + id = REAGENT_ID_ICETEADECAF glass_name = "decaf iced tea" cup_name = "decaf iced tea" - id = "iceteadecaf" adj_dizzy = 0 adj_drowsy = 0 adj_sleepy = 0 allergen_type = null /datum/reagent/drink/tea/minttea - name = "Mint Tea" - id = "minttea" + name = REAGENT_MINTTEA + id = REAGENT_ID_MINTTEA description = "A tasty mixture of mint and tea. It's apparently good for you!" color = "#A8442C" taste_description = "black tea with tones of mint" @@ -1429,18 +1429,18 @@ cup_desc = "A tasty mixture of mint and tea. It's apparently good for you!" /datum/reagent/drink/tea/minttea/decaf - name = "Decaf Mint Tea" + name = REAGENT_MINTTEADECAF + id = REAGENT_ID_MINTTEADECAF glass_name = "decaf mint tea" cup_name = "decaf mint tea" - id = "mintteadecaf" adj_dizzy = 0 adj_drowsy = 0 adj_sleepy = 0 allergen_type = null /datum/reagent/drink/tea/lemontea - name = "Lemon Tea" - id = "lemontea" + name = REAGENT_LEMONTEA + id = REAGENT_ID_LEMONTEA description = "A tasty mixture of lemon and tea. It's apparently good for you!" color = "#FC6A00" taste_description = "black tea with tones of lemon" @@ -1453,18 +1453,18 @@ allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lemon juice, still tea /datum/reagent/drink/tea/lemontea/decaf - name = "Decaf Lemon Tea" + name = REAGENT_LEMONTEADECAF + id = REAGENT_ID_LEMONTEADECAF glass_name = "decaf lemon tea" cup_name = "decaf lemon tea" - id = "lemonteadecaf" adj_dizzy = 0 adj_drowsy = 0 adj_sleepy = 0 allergen_type = ALLERGEN_FRUIT //No caffine, still lemon. /datum/reagent/drink/tea/limetea - name = "Lime Tea" - id = "limetea" + name = REAGENT_LIMETEA + id = REAGENT_ID_LIMETEA description = "A tasty mixture of lime and tea. It's apparently good for you!" color = "#DE4300" taste_description = "black tea with tones of lime" @@ -1477,18 +1477,18 @@ allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lime juice, still tea /datum/reagent/drink/tea/limetea/decaf - name = "Decaf Lime Tea" + name = REAGENT_LIMETEADECAF + id = REAGENT_ID_LIMETEADECAF glass_name = "decaf lime tea" cup_name = "decaf lime tea" - id = "limeteadecaf" adj_dizzy = 0 adj_drowsy = 0 adj_sleepy = 0 allergen_type = ALLERGEN_FRUIT //No caffine, still lime. /datum/reagent/drink/tea/orangetea - name = "Orange Tea" - id = "orangetea" + name = REAGENT_ORANGETEA + id = REAGENT_ID_ORANGETEA description = "A tasty mixture of orange and tea. It's apparently good for you!" color = "#FB4F06" taste_description = "black tea with tones of orange" @@ -1501,18 +1501,18 @@ allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with orange juice, still tea /datum/reagent/drink/tea/orangetea/decaf - name = "Decaf orange Tea" + name = REAGENT_ORANGETEADECAF + id = REAGENT_ID_ORANGETEADECAF glass_name = "decaf orange tea" cup_name = "decaf orange tea" - id = "orangeteadecaf" adj_dizzy = 0 adj_drowsy = 0 adj_sleepy = 0 allergen_type = ALLERGEN_FRUIT //No caffine, still orange. /datum/reagent/drink/tea/berrytea - name = "Berry Tea" - id = "berrytea" + name = REAGENT_BERRYTEA + id = REAGENT_ID_BERRYTEA description = "A tasty mixture of berries and tea. It's apparently good for you!" color = "#A60735" taste_description = "black tea with tones of berries" @@ -1525,18 +1525,18 @@ allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with berry juice, still tea /datum/reagent/drink/tea/berrytea/decaf - name = "Decaf Berry Tea" + name = REAGENT_BERRYTEADECAF + id = REAGENT_ID_BERRYTEADECAF glass_name = "decaf berry tea" cup_name = "decaf berry tea" - id = "berryteadecaf" adj_dizzy = 0 adj_drowsy = 0 adj_sleepy = 0 allergen_type = ALLERGEN_FRUIT //No caffine, still berries. /datum/reagent/drink/greentea - name = "Green Tea" - id = "greentea" + name = REAGENT_GREENTEA + id = REAGENT_ID_GREENTEA description = "A subtle blend of green tea. It's apparently good for you!" color = "#A8442C" taste_description = "green tea" @@ -1548,8 +1548,8 @@ cup_desc = "A subtle blend of green tea. It's apparently good for you!" /datum/reagent/drink/tea/chaitea - name = "Chai Tea" - id = "chaitea" + name = REAGENT_CHAITEA + id = REAGENT_ID_CHAITEA description = "A milky tea spiced with cinnamon and cloves." color = "#A8442C" taste_description = "creamy cinnamon and spice" @@ -1562,18 +1562,18 @@ allergen_type = ALLERGEN_STIMULANT|ALLERGEN_DAIRY //Made with milk and tea. /datum/reagent/drink/tea/chaitea/decaf - name = "Decaf Chai Tea" + name = REAGENT_CHAITEADECAF + id = REAGENT_ID_CHAITEADECAF glass_name = "decaf chai tea" cup_name = "decaf chai tea" - id = "chaiteadecaf" adj_dizzy = 0 adj_drowsy = 0 adj_sleepy = 0 allergen_type = ALLERGEN_DAIRY //No caffeine, still milk. /datum/reagent/drink/coffee - name = "Coffee" - id = "coffee" + name = REAGENT_COFFEE + id = REAGENT_ID_COFFEE description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant." taste_description = "coffee" taste_mult = 1.3 @@ -1585,10 +1585,10 @@ overdose = 45 cup_icon_state = "cup_coffee" - cup_name = "coffee" + cup_name = REAGENT_ID_COFFEE cup_desc = "Don't drop it, or you'll send scalding liquid and ceramic shards everywhere." - glass_name = "coffee" + glass_name = REAGENT_ID_COFFEE glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere." allergen_type = ALLERGEN_COFFEE | ALLERGEN_STIMULANT //Apparently coffee contains coffee @@ -1601,7 +1601,7 @@ //M.adjustToxLoss(0.5 * removed) //M.make_jittery(4) //extra sensitive to caffine if(adj_temp > 0) - holder.remove_reagent("frostoil", 10 * removed) + holder.remove_reagent(REAGENT_ID_FROSTOIL, 10 * removed) /datum/reagent/drink/coffee/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) ..() @@ -1620,8 +1620,8 @@ M.make_jittery(5) /datum/reagent/drink/coffee/icecoffee - name = "Iced Coffee" - id = "icecoffee" + name = REAGENT_ICECOFFEE + id = REAGENT_ID_ICECOFFEE description = "Coffee and ice, refreshing and cool." color = "#102838" adj_temp = -5 @@ -1649,8 +1649,8 @@ //M.adjustToxLoss(5 * removed) //VOREStation Removal /datum/reagent/drink/coffee/soy_latte - name = "Soy Latte" - id = "soy_latte" + name = REAGENT_SOYLATTE + id = REAGENT_ID_SOYLATTE description = "A nice and tasty beverage while you are reading your hippie books." taste_description = "creamy coffee" color = "#C65905" @@ -1669,8 +1669,8 @@ M.heal_organ_damage(0.5 * removed, 0) /datum/reagent/drink/coffee/cafe_latte - name = "Cafe Latte" - id = "cafe_latte" + name = REAGENT_CAFELATTE + id = REAGENT_ID_CAFELATTE description = "A nice, strong and tasty beverage while you are reading." taste_description = "bitter cream" color = "#C65905" @@ -1689,8 +1689,8 @@ M.heal_organ_damage(0.5 * removed, 0) /datum/reagent/drink/decaf - name = "Decaf Coffee" - id = "decaf" + name = REAGENT_DECAF + id = REAGENT_ID_DECAF description = "Coffee with all the wake-up sucked out." taste_description = "bad coffee" taste_mult = 1.3 @@ -1698,7 +1698,7 @@ adj_temp = 25 cup_icon_state = "cup_coffee" - cup_name = "decaf" + cup_name = REAGENT_ID_DECAF cup_desc = "Basically just brown, bitter water." glass_name = "decaf coffee" @@ -1706,8 +1706,8 @@ allergen_type = ALLERGEN_COFFEE //Decaf coffee is still coffee, just less stimulating. /datum/reagent/drink/hot_coco - name = "Hot Chocolate" - id = "hot_coco" + name = REAGENT_HOTCOCO + id = REAGENT_ID_HOTCOCO description = "Made with love! And cocoa beans." taste_description = "creamy chocolate" reagent_state = LIQUID @@ -1724,8 +1724,8 @@ allergen_type = ALLERGEN_CHOCOLATE /datum/reagent/drink/coffee/blackeye - name = "Black Eye Coffee" - id = "black_eye" + name = REAGENT_BLACKEYE + id = REAGENT_ID_BLACKEYE description = "Coffee but with more coffee for that extra coffee kick." taste_description = "very concentrated coffee" color = "#241001" @@ -1740,8 +1740,8 @@ allergen_type = ALLERGEN_COFFEE /datum/reagent/drink/coffee/drip - name = "Drip Coffee" - id = "drip_coffee" + name = REAGENT_DRIPCOFFEE + id = REAGENT_ID_DRIPCOFFEE description = "Coffee made by soaking beans in hot water and allowing it seep through." taste_description = "very concentrated coffee" color = "#3d1a00" @@ -1756,31 +1756,31 @@ allergen_type = ALLERGEN_COFFEE /datum/reagent/drink/coffee/americano - name = "Americano" - id = "americano" + name = REAGENT_AMERICANO + id = REAGENT_ID_AMERICANO description = "A traditional coffee that is more dilute and perfect for a gentle start to the day." taste_description = "pleasant coffee" color = "#6d3205" adj_temp = 5 glass_desc = "A traditional coffee that is more dilute and perfect for a gentle start to the day." - glass_name = "americano" + glass_name = REAGENT_ID_AMERICANO cup_icon_state = "cup_coffee" - cup_name = "americano" + cup_name = REAGENT_ID_AMERICANO cup_desc = "A traditional coffee that is more dilute and perfect for a gentle start to the day." allergen_type = ALLERGEN_COFFEE /datum/reagent/drink/coffee/long_black - name = "Long Black Coffee" - id = "long_black" + name = REAGENT_LONGBLACK + id = REAGENT_ID_LONGBLACK description = "A traditional coffee with a little more kick." taste_description = "modestly bitter coffee" color = "#6d3205" adj_temp = 5 glass_desc = "A traditional coffee with a little more kick." - glass_name = "long_black" + glass_name = REAGENT_ID_LONGBLACK cup_icon_state = "cup_coffee" cup_name = "long black coffee" @@ -1788,79 +1788,79 @@ allergen_type = ALLERGEN_COFFEE /datum/reagent/drink/coffee/macchiato - name = "Macchiato" - id = "macchiato" + name = REAGENT_MACCHIATO + id = REAGENT_ID_MACCHIATO description = "A coffee mixed with steamed milk, it has swirling patterns on top." taste_description = "milky coffee" color = "#ad5817" adj_temp = 5 glass_desc = "A coffee mixed with steamed milk, it has swirling patterns on top." - glass_name = "macchiato" + glass_name = REAGENT_ID_MACCHIATO cup_icon_state = "cup_latte" - cup_name = "macchiato" + cup_name = REAGENT_ID_MACCHIATO cup_desc = "A coffee mixed with steamed milk, it has swirling patterns on top." allergen_type = ALLERGEN_COFFEE /datum/reagent/drink/coffee/cortado - name = "Cortado" - id = "cortado" + name = REAGENT_CORTADO + id = REAGENT_ID_CORTADO description = "Espresso mixed with equal parts milk and a layer of foam on top." taste_description = "milky coffee" color = "#ad5817" adj_temp = 5 glass_desc = "Espresso mixed with equal parts milk and a layer of foam on top." - glass_name = "macchiato" + glass_name = REAGENT_ID_CORTADO cup_icon_state = "cup_latte" - cup_name = "cortado" + cup_name = REAGENT_ID_CORTADO cup_desc = "Espresso mixed with equal parts milk and a layer of foam on top." allergen_type = ALLERGEN_COFFEE /datum/reagent/drink/coffee/breve - name = "Breve" - id = "breve" + name = REAGENT_BREVE + id = REAGENT_ID_BREVE description = "Espresso topped with half-and-half, with a layer of foam on top." taste_description = "creamy coffee" color = "#d1905e" adj_temp = 5 glass_desc = "Espresso topped with half-and-half, with a layer of foam on top." - glass_name = "breve" + glass_name = REAGENT_ID_BREVE cup_icon_state = "cup_cream" - cup_name = "breve" + cup_name = REAGENT_ID_BREVE cup_desc = "Espresso topped with half-and-half, with a layer of foam on top." allergen_type = ALLERGEN_COFFEE /datum/reagent/drink/coffee/cappuccino - name = "Cappuccino" - id = "cappuccino" + name = REAGENT_CAPPUCCINO + id = REAGENT_ID_CAPPUCCINO description = "Espresso with a large portion of milk and a hefty layer of foam." taste_description = "classic coffee" color = "#d1905e" adj_temp = 5 glass_desc = "Espresso with a large portion of milk and a hefty layer of foam." - glass_name = "cappuccino" + glass_name = REAGENT_ID_CAPPUCCINO cup_icon_state = "cup_cream" - cup_name = "cappuccino" + cup_name = REAGENT_ID_CAPPUCCINO cup_desc = "Espresso with a large portion of milk and a hefty layer of foam." allergen_type = ALLERGEN_COFFEE /datum/reagent/drink/coffee/flat_white - name = "Flat White Coffee" - id = "flat_white" + name = REAGENT_FLATWHITE + id = REAGENT_ID_FLATWHITE description = "A very milky coffee that is particularly light and airy." taste_description = "very milky coffee" color = "#ed9f64" adj_temp = 5 glass_desc = "A very milky coffee that is particularly light and airy." - glass_name = "flat_white" + glass_name = REAGENT_ID_FLATWHITE cup_icon_state = "cup_latte" cup_name = "flat white coffee" @@ -1868,40 +1868,40 @@ allergen_type = ALLERGEN_COFFEE /datum/reagent/drink/coffee/mocha - name = "Mocha" - id = "mocha" + name = REAGENT_MOCHA + id = REAGENT_ID_MOCHA description = "A chocolate and coffee mix topped with a lot of milk and foam." taste_description = "chocolatey coffee" color = "#984201" adj_temp = 5 glass_desc = "A chocolate and coffee mix topped with a lot of milk and foam." - glass_name = "mocha" + glass_name = REAGENT_ID_MOCHA cup_icon_state = "cup_cream" - cup_name = "mocha" + cup_name = REAGENT_ID_MOCHA cup_desc = "A chocolate and coffee mix topped with a lot of milk and foam." allergen_type = ALLERGEN_COFFEE /datum/reagent/drink/coffee/vienna - name = "Vienna" - id = "vienna" + name = REAGENT_VIENNA + id = REAGENT_ID_VIENNA description = "A very sweet espresso topped with a lot of whipped cream." taste_description = "super sweet and creamy coffee" color = "#8e7059" adj_temp = 5 glass_desc = "A very sweet espresso topped with a lot of whipped cream." - glass_name = "vienna" + glass_name = REAGENT_ID_VIENNA cup_icon_state = "cup_cream" - cup_name = "vienna" + cup_name = REAGENT_ID_VIENNA cup_desc = "A very sweet espresso topped with a lot of whipped cream." allergen_type = ALLERGEN_COFFEE /datum/reagent/drink/soda/sodawater - name = "Soda Water" - id = "sodawater" + name = REAGENT_SODAWATER + id = REAGENT_ID_SODAWATER description = "A can of club soda. Why not make a scotch and soda?" taste_description = "carbonated water" color = "#619494" @@ -1915,8 +1915,8 @@ glass_special = list(DRINK_FIZZ) /datum/reagent/drink/soda/grapesoda - name = "Grape Soda" - id = "grapesoda" + name = REAGENT_GRAPESODA + id = REAGENT_ID_GRAPESODA description = "Grapes made into a fine drank." taste_description = "grape soda" color = "#421C52" @@ -1929,12 +1929,12 @@ allergen_type = ALLERGEN_FRUIT //Made with grape juice /datum/reagent/drink/soda/tonic - name = "Tonic Water" - id = "tonic" + name = REAGENT_TONIC + id = REAGENT_ID_TONIC description = "It tastes strange but at least the quinine keeps the Space Malaria at bay." taste_description = "tart and fresh" color = "#619494" - cup_prefix = "tonic" + cup_prefix = REAGENT_ID_TONIC adj_dizzy = -5 adj_drowsy = -3 @@ -1945,106 +1945,106 @@ glass_desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." /datum/reagent/drink/soda/lemonade - name = "Lemonade" - id = "lemonade" + name = REAGENT_LEMONADE + id = REAGENT_ID_LEMONADE description = "Oh the nostalgia..." - taste_description = "lemonade" + taste_description = REAGENT_ID_LEMONADE color = "#FFFF00" adj_temp = -5 - cup_prefix = "lemonade" + cup_prefix = REAGENT_ID_LEMONADE - glass_name = "lemonade" + glass_name = REAGENT_ID_LEMONADE glass_desc = "Oh the nostalgia..." glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_FRUIT //Made with lemon juice /datum/reagent/drink/soda/melonade - name = "Melonade" - id = "melonade" + name = REAGENT_MELONADE + id = REAGENT_ID_MELONADE description = "Oh the.. nostalgia?" taste_description = "watermelon" color = "#FFB3BB" adj_temp = -5 - cup_prefix = "melonade" + cup_prefix = REAGENT_ID_MELONADE - glass_name = "melonade" + glass_name = REAGENT_ID_MELONADE glass_desc = "Oh the.. nostalgia?" glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_FRUIT //Made with watermelon juice /datum/reagent/drink/soda/appleade - name = "Appleade" - id = "appleade" + name = REAGENT_APPLEADE + id = REAGENT_ID_APPLEADE description = "Applejuice, improved." taste_description = "apples" color = "#FFD1B3" adj_temp = -5 - cup_prefix = "appleade" + cup_prefix = REAGENT_ID_APPLEADE - glass_name = "appleade" + glass_name = REAGENT_ID_APPLEADE glass_desc = "Applejuice, improved." glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_FRUIT //Made with apple juice /datum/reagent/drink/soda/pineappleade - name = "Pineappleade" - id = "pineappleade" + name = REAGENT_PINEAPPLEADE + id = REAGENT_ID_PINEAPPLEADE description = "Pineapple, juiced up." taste_description = "sweet`n`sour pineapples" color = "#FFFF00" adj_temp = -5 - cup_prefix = "pineappleade" + cup_prefix = REAGENT_ID_PINEAPPLEADE - glass_name = "pineappleade" + glass_name = REAGENT_ID_PINEAPPLEADE glass_desc = "Pineapple, juiced up." glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_FRUIT //Made with pineapple juice /datum/reagent/drink/soda/kiraspecial - name = "Kira Special" - id = "kiraspecial" + name = REAGENT_KIRASPECIAL + id = REAGENT_ID_KIRASPECIAL description = "Long live the guy who everyone had mistaken for a girl. Baka!" taste_description = "fruity sweetness" color = "#CCCC99" adj_temp = -5 - glass_name = "Kira Special" + glass_name = REAGENT_KIRASPECIAL glass_desc = "Long live the guy who everyone had mistaken for a girl. Baka!" glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_FRUIT //Made from orange and lime juice /datum/reagent/drink/soda/brownstar - name = "Brown Star" - id = "brownstar" + name = REAGENT_BROWNSTAR + id = REAGENT_ID_BROWNSTAR description = "It's not what it sounds like..." taste_description = "orange and cola soda" color = "#9F3400" adj_temp = -2 - glass_name = "Brown Star" + glass_name = REAGENT_BROWNSTAR glass_desc = "It's not what it sounds like..." allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with orangejuice and cola /datum/reagent/drink/soda/brownstar_decaf //For decaf starkist - name = "Decaf Brown Star" - id = "brownstar_decaf" + name = REAGENT_BROWNSTARDECAF + id = REAGENT_ID_BROWNSTARDECAF description = "It's not what it sounds like..." taste_description = "orange and cola soda" color = "#9F3400" adj_temp = -2 - glass_name = "Brown Star" + glass_name = REAGENT_BROWNSTAR glass_desc = "It's not what it sounds like..." /datum/reagent/drink/milkshake - name = "Milkshake" - id = "milkshake" + name = REAGENT_MILKSHAKE + id = REAGENT_ID_MILKSHAKE description = "Glorious brainfreezing mixture." taste_description = "vanilla milkshake" color = "#AEE5E4" adj_temp = -9 - glass_name = "milkshake" + glass_name = REAGENT_ID_MILKSHAKE glass_desc = "Glorious brainfreezing mixture." allergen_type = ALLERGEN_DAIRY //Made with dairy products @@ -2070,32 +2070,32 @@ M.drowsyness = max(M.drowsyness, 60) /datum/reagent/drink/milkshake/chocoshake - name = "Chocolate Milkshake" - id = "chocoshake" + name = REAGENT_CHOCOSHAKE + id = REAGENT_ID_CHOCOSHAKE description = "A refreshing chocolate milkshake." taste_description = "cold refreshing chocolate and cream" color = "#8e6f44" // rgb(142, 111, 68) adj_temp = -9 - glass_name = "Chocolate Milkshake" + glass_name = REAGENT_CHOCOSHAKE glass_desc = "A refreshing chocolate milkshake, just like mom used to make." allergen_type = ALLERGEN_DAIRY|ALLERGEN_CHOCOLATE //Made with dairy products /datum/reagent/drink/milkshake/berryshake - name = "Berry Milkshake" - id = "berryshake" + name = REAGENT_BERRYSHAKE + id = REAGENT_ID_BERRYSHAKE description = "A refreshing berry milkshake." taste_description = "cold refreshing berries and cream" color = "#ffb2b2" // rgb(255, 178, 178) adj_temp = -9 - glass_name = "Berry Milkshake" + glass_name = REAGENT_BERRYSHAKE glass_desc = "A refreshing berry milkshake, just like mom used to make." allergen_type = ALLERGEN_FRUIT|ALLERGEN_DAIRY //Made with berry juice and dairy products /datum/reagent/drink/milkshake/coffeeshake - name = "Coffee Milkshake" - id = "coffeeshake" + name = REAGENT_COFFEESHAKE + id = REAGENT_ID_COFFEESHAKE description = "A refreshing coffee milkshake." taste_description = "cold energizing coffee and cream" color = "#8e6f44" // rgb(142, 111, 68) @@ -2104,7 +2104,7 @@ adj_drowsy = -3 adj_sleepy = -2 - glass_name = "Coffee Milkshake" + glass_name = REAGENT_COFFEESHAKE glass_desc = "An energizing coffee milkshake, perfect for hot days at work.." allergen_type = ALLERGEN_DAIRY|ALLERGEN_COFFEE //Made with coffee and dairy products @@ -2112,25 +2112,25 @@ M.make_jittery(5) /datum/reagent/drink/milkshake/peanutshake - name = "Peanut Milkshake" - id = "peanutmilkshake" + name = REAGENT_PEANUTMILKSHAKE + id = REAGENT_ID_PEANUTMILKSHAKE description = "Savory cream in an ice-cold stature." taste_description = "cold peanuts and cream" color = "#8e6f44" - glass_name = "Peanut Milkshake" + glass_name = REAGENT_PEANUTMILKSHAKE glass_desc = "Savory cream in an ice-cold stature." allergen_type = ALLERGEN_SEEDS|ALLERGEN_DAIRY //Made with peanutbutter(seeds) and dairy products /datum/reagent/drink/rewriter - name = "Rewriter" - id = "rewriter" + name = REAGENT_REWRITER + id = REAGENT_ID_REWRITER description = "The secret of the sanctuary of the Libarian..." taste_description = "citrus and coffee" color = "#485000" adj_temp = -5 - glass_name = "Rewriter" + glass_name = REAGENT_REWRITER glass_desc = "The secret of the sanctuary of the Libarian..." allergen_type = ALLERGEN_FRUIT|ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made with space mountain wind (Fruit, caffeine) @@ -2139,8 +2139,8 @@ M.make_jittery(5) /datum/reagent/drink/soda/nuka_cola - name = "Nuka Cola" - id = "nuka_cola" + name = REAGENT_NUKACOLA + id = REAGENT_ID_NUKACOLA description = "Cola, cola never changes." taste_description = "cola" color = "#100800" @@ -2161,8 +2161,8 @@ M.drowsyness = 0 /datum/reagent/drink/grenadine //Description implies that the grenadine we would be working with does not contain fruit, so no allergens. - name = "Grenadine Syrup" - id = "grenadine" + name = REAGENT_GRENADINE + id = REAGENT_ID_GRENADINE description = "Made in the modern day with proper pomegranate substitute. Who uses real fruit, anyways?" taste_description = "100% pure pomegranate" color = "#FF004F" @@ -2172,8 +2172,8 @@ glass_desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks." /datum/reagent/drink/soda/space_cola - name = "Space Cola" - id = "cola" + name = REAGENT_COLA + id = REAGENT_ID_COLA description = "A refreshing beverage." taste_description = "cola" reagent_state = LIQUID @@ -2181,27 +2181,27 @@ adj_drowsy = -3 adj_temp = -5 - glass_name = "Space Cola" + glass_name = REAGENT_COLA glass_desc = "A glass of refreshing Space Cola" glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_STIMULANT //Cola is typically caffeinated. /datum/reagent/drink/soda/decaf_cola - name = "Space Cola Free" - id = "decafcola" + name = REAGENT_DECAFCOLA + id = REAGENT_ID_DECAFCOLA description = "A refreshing beverage with none of the jitters." taste_description = "cola" reagent_state = LIQUID color = "#100800" adj_temp = -5 - glass_name = "Space Cola Free" + glass_name = REAGENT_DECAFCOLA glass_desc = "A glass of refreshing Space Cola Free" glass_special = list(DRINK_FIZZ) /datum/reagent/drink/soda/lemon_soda - name = "Lemon Soda" - id = "lemonsoda" + name = REAGENT_LEMONSODA + id = REAGENT_ID_LEMONSODA description = "Soda made using lemon concentrate. Sour." taste_description = "strong sourness" reagent_state = LIQUID @@ -2215,8 +2215,8 @@ allergen_type = ALLERGEN_FRUIT /datum/reagent/drink/soda/apple_soda - name = "Apple Soda" - id = "applesoda" + name = REAGENT_APPLESODA + id = REAGENT_ID_APPLESODA description = "Soda made using fresh apples." taste_description = "crisp juiciness" reagent_state = LIQUID @@ -2224,15 +2224,15 @@ adj_drowsy = -3 adj_temp = -5 - glass_name = "Apple Soda" + glass_name = REAGENT_APPLESODA glass_desc = "A glass of refreshing Apple Soda. Crisp!" glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_FRUIT /datum/reagent/drink/soda/straw_soda - name = "Strawberry Soda" - id = "strawsoda" + name = REAGENT_STRAWSODA + id = REAGENT_ID_STRAWSODA description = "Soda made using sweet berries." taste_description = "oddly bland" reagent_state = LIQUID @@ -2240,14 +2240,14 @@ adj_drowsy = -3 adj_temp = -5 - glass_name = "Strawberry Soda" + glass_name = REAGENT_STRAWSODA glass_desc = "A glass of refreshing Strawberry Soda" glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_FRUIT /datum/reagent/drink/soda/orangesoda - name = "Orange Soda" - id = "orangesoda" + name = REAGENT_ORANGESODA + id = REAGENT_ID_ORANGESODA description = "Soda made using fresh picked oranges." taste_description = "sweet and citrusy" reagent_state = LIQUID @@ -2255,14 +2255,14 @@ adj_drowsy = -3 adj_temp = -5 - glass_name = "Orange Soda" + glass_name = REAGENT_ORANGESODA glass_desc = "A glass of refreshing Orange Soda. Delicious!" glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_FRUIT /datum/reagent/drink/soda/grapesoda - name = "Grape Soda" - id = "grapesoda" + name = REAGENT_GRAPESODA + id = REAGENT_ID_GRAPESODA description = "Soda made of carbonated grapejuice." taste_description = "tangy goodness" reagent_state = LIQUID @@ -2270,14 +2270,14 @@ adj_drowsy = -3 adj_temp = -5 - glass_name = "Grape Soda" + glass_name = REAGENT_GRAPESODA glass_desc = "A glass of refreshing Grape Soda. Tangy!" glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_FRUIT /datum/reagent/drink/soda/sarsaparilla - name = "Sarsaparilla" - id = "sarsaparilla" + name = REAGENT_SARSAPARILLA + id = REAGENT_ID_SARSAPARILLA description = "Soda made from genetically modified Mexican sarsaparilla plants." taste_description = "licorice and caramel" reagent_state = LIQUID @@ -2285,13 +2285,13 @@ adj_drowsy = -3 adj_temp = -5 - glass_name = "Sarsaparilla" + glass_name = REAGENT_SARSAPARILLA glass_desc = "A glass of refreshing Sarsaparilla. Delicious!" glass_special = list(DRINK_FIZZ) /datum/reagent/drink/soda/pork_soda - name = "Bacon Soda" - id = "porksoda" + name = REAGENT_PORKSODA + id = REAGENT_ID_PORKSODA description = "Soda made using pork like flavoring." taste_description = "sugar coated bacon" reagent_state = LIQUID @@ -2299,13 +2299,13 @@ adj_drowsy = -3 adj_temp = -5 - glass_name = "Bacon Soda" + glass_name = REAGENT_PORKSODA glass_desc = "A glass of Bacon Soda, very odd..." glass_special = list(DRINK_FIZZ) /datum/reagent/drink/soda/spacemountainwind - name = "Mountain Wind" - id = "spacemountainwind" + name = REAGENT_SPACEMOUNTAINWIND + id = REAGENT_ID_SPACEMOUNTAINWIND description = "Blows right through you like a space wind." taste_description = "sweet citrus soda" color = "#102000" @@ -2319,21 +2319,21 @@ allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Citrus, and caffeination /datum/reagent/drink/soda/dr_gibb - name = "Dr. Gibb" - id = "dr_gibb" + name = REAGENT_DRGIBB + id = REAGENT_ID_DRGIBB description = "A delicious blend of 42 different flavors." taste_description = "cherry soda" color = "#102000" adj_drowsy = -6 adj_temp = -5 - glass_name = "Dr. Gibb" + glass_name = REAGENT_DRGIBB glass_desc = "Dr. Gibb. Not as dangerous as the name might imply." allergen_type = ALLERGEN_STIMULANT /datum/reagent/drink/soda/space_up - name = "Space-Up" - id = "space_up" + name = REAGENT_SPACEUP + id = REAGENT_ID_SPACEUP description = "Tastes like a hull breach in your mouth." taste_description = "citrus soda" color = "#202800" @@ -2345,8 +2345,8 @@ allergen_type = ALLERGEN_FRUIT /datum/reagent/drink/soda/lemon_lime - name = "Lemon-Lime" - id = "lemon_lime" + name = REAGENT_LEMONLIME + id = REAGENT_ID_LEMONLIME description = "A tangy substance made of 0.5% natural citrus!" taste_description = "tangy lime and lemon soda" color = "#878F00" @@ -2358,8 +2358,8 @@ allergen_type = ALLERGEN_FRUIT //Made with lemon and lime juice /datum/reagent/drink/soda/gingerale - name = "Ginger Ale" - id = "gingerale" + name = REAGENT_GINGERALE + id = REAGENT_ID_GINGERALE description = "The original." taste_description = "somewhat tangy ginger ale" color = "#edcf8f" @@ -2370,8 +2370,8 @@ glass_special = list(DRINK_FIZZ) /datum/reagent/drink/root_beer - name = "R&D Root Beer" - id = "rootbeer" + name = REAGENT_ROOTBEER + id = REAGENT_ID_ROOTBEER color = "#211100" adj_drowsy = -6 taste_description = "sassafras and anise soda" @@ -2380,8 +2380,8 @@ glass_desc = "A glass of bubbly R&D Root Beer." /datum/reagent/drink/dr_gibb_diet - name = "Diet Dr. Gibb" - id = "diet_dr_gibb" + name = REAGENT_DIETDRGIBB + id = REAGENT_ID_DIETDRGIBB color = "#102000" taste_description = "chemically sweetened cherry soda" @@ -2390,8 +2390,8 @@ glass_special = list(DRINK_FIZZ) /datum/reagent/drink/shirley_temple - name = "Shirley Temple" - id = "shirley_temple" + name = REAGENT_SHIRLEYTEMPLE + id = REAGENT_ID_SHIRLEYTEMPLE description = "A sweet concotion hated even by its namesake." taste_description = "sweet ginger ale" color = "#EF304F" @@ -2402,8 +2402,8 @@ glass_special = list(DRINK_FIZZ) /datum/reagent/drink/roy_rogers - name = "Roy Rogers" - id = "roy_rogers" + name = REAGENT_ROYROGERS + id = REAGENT_ID_ROYROGERS description = "I'm a cowboy, on a steel horse I ride." taste_description = "cola and fruit" color = "#4F1811" @@ -2415,8 +2415,8 @@ allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lemon lime and cola /datum/reagent/drink/collins_mix - name = "Collins Mix" - id = "collins_mix" + name = REAGENT_COLLINSMIX + id = REAGENT_ID_COLLINSMIX description = "Best hope it isn't a hoax." taste_description = "gin and lemonade" color = "#D7D0B3" @@ -2428,8 +2428,8 @@ allergen_type = ALLERGEN_FRUIT //Made with lemon lime /datum/reagent/drink/arnold_palmer - name = "Arnold Palmer" - id = "arnold_palmer" + name = REAGENT_ARNOLDPALMER + id = REAGENT_ID_ARNOLDPALMER description = "Tastes just like the old man." taste_description = "lemon and sweet tea" color = "#AF5517" @@ -2441,15 +2441,15 @@ allergen_type = ALLERGEN_FRUIT | ALLERGEN_STIMULANT //Made with lemonade and tea /datum/reagent/drink/doctor_delight - name = "The Doctor's Delight" - id = "doctorsdelight" + name = REAGENT_DOCTORSDELIGHT + id = REAGENT_ID_DOCTORSDELIGHT description = "A gulp a day keeps the MediBot away. That's probably for the best." taste_description = "homely fruit smoothie" reagent_state = LIQUID color = "#FF8CFF" nutrition = 1 - glass_name = "The Doctor's Delight" + glass_name = REAGENT_DOCTORSDELIGHT glass_desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place." allergen_type = ALLERGEN_FRUIT|ALLERGEN_DAIRY //Made from several fruit juices, and cream. @@ -2466,8 +2466,8 @@ M.Confuse(-5) /datum/reagent/drink/dry_ramen - name = "Dry Ramen" - id = "dry_ramen" + name = REAGENT_DRYRAMEN + id = REAGENT_ID_DRYRAMEN description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water." taste_description = "dry cheap noodles" reagent_state = SOLID @@ -2863,7 +2863,7 @@ description = "A sugary syrup that tastes of vanilla." taste_description = "vanilla" color = "#eaebd1" - cup_prefix = "vanilla" + cup_prefix = REAGENT_ID_VANILLA /datum/reagent/drink/syrup/toffee name = "toffee syrup" @@ -2895,9 +2895,9 @@ name = "chocolate syrup" id = "syrup_chocolate" description = "A sugary syrup that tastes of chocolate." - taste_description = "chocolate" + taste_description = REAGENT_ID_CHOCOLATE color = "#873600" - cup_prefix = "chocolate" + cup_prefix = REAGENT_ID_CHOCOLATE allergen_type = ALLERGEN_SUGARS|ALLERGEN_CHOCOLATE diff --git a/code/modules/reagents/reagents/medicine.dm b/code/modules/reagents/reagents/medicine.dm index 5876a319f29..f2f187b0d0c 100644 --- a/code/modules/reagents/reagents/medicine.dm +++ b/code/modules/reagents/reagents/medicine.dm @@ -623,7 +623,7 @@ /datum/reagent/alkysine name = REAGENT_ALKYSINE id = REAGENT_ID_ALKYSINE - description = REAGENT_ALKYSINE " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." + description = REAGENT_ALKYSINE + " is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." taste_description = "bitterness" reagent_state = LIQUID color = "#FFFF66" diff --git a/code/modules/vore/fluffstuff/custom_implants_vr.dm b/code/modules/vore/fluffstuff/custom_implants_vr.dm index 608b326ca43..fcb225609c4 100644 --- a/code/modules/vore/fluffstuff/custom_implants_vr.dm +++ b/code/modules/vore/fluffstuff/custom_implants_vr.dm @@ -1,8 +1,8 @@ //WickedTempest: Chakat Tempest /obj/item/implant/reagent_generator/tempest - generated_reagents = list("milk" = 2) - reagent_name = "milk" + generated_reagents = list(REAGENT_ID_MILK = 2) + reagent_name = REAGENT_ID_MILK usable_volume = 1000 empty_message = list("Your breasts are almost completely drained!") @@ -19,8 +19,8 @@ //Hottokeeki: Belle Day /obj/item/implant/reagent_generator/belle - generated_reagents = list("milk" = 2) - reagent_name = "milk" + generated_reagents = list(REAGENT_ID_MILK = 2) + reagent_name = REAGENT_ID_MILK usable_volume = 5000 empty_message = list("Your breasts and or udder feel almost completely drained!", "You're feeling a liittle on the empty side...") @@ -39,8 +39,8 @@ /obj/item/implant/reagent_generator/eldi name = "lactation implant" desc = "This is an implant that allows the user to lactate." - generated_reagents = list("milk" = 2) - reagent_name = "milk" + generated_reagents = list(REAGENT_ID_MILK = 2) + reagent_name = REAGENT_ID_MILK usable_volume = 1000 empty_message = list("Your breasts feel unusually empty.", "Your chest feels lighter - your milk supply is empty!", "Your milk reserves have run dry.", "Your grateful nipples ache as the last of your milk leaves them.") @@ -56,7 +56,7 @@ //Vorrarkul: Theodora Lindt /obj/item/implant/reagent_generator/vorrarkul - generated_reagents = list("chocolate_milk" = 2) + generated_reagents = list(REAGENT_ID_CHOCOLATEMILK = 2) reagent_name = "chocalate milk" usable_volume = 1000 @@ -73,8 +73,8 @@ //Lycanthorph: Savannah Dixon /obj/item/implant/reagent_generator/savannah - generated_reagents = list("milk" = 2) - reagent_name = "milk" + generated_reagents = list(REAGENT_ID_MILK = 2) + reagent_name = REAGENT_ID_MILK usable_volume = 1000 empty_message = list("Your nipples are sore from being milked!", "Your breasts feel drained, milk is no longer leaking from your nipples!") @@ -95,7 +95,7 @@ /obj/item/implant/reagent_generator/roiz name = "egg laying implant" desc = "This is an implant that allows the user to lay eggs." - generated_reagents = list("egg" = 2) + generated_reagents = list(REAGENT_ID_EGG = 2) usable_volume = 500 transfer_amount = 50 @@ -164,7 +164,7 @@ /obj/item/implant/reagent_generator/jasmine name = "egg laying implant" desc = "This is an implant that allows the user to lay eggs." - generated_reagents = list("egg" = 2) + generated_reagents = list(REAGENT_ID_EGG = 2) usable_volume = 500 transfer_amount = 50 @@ -233,7 +233,7 @@ /obj/item/implant/reagent_generator/yonra name = "egg laying implant" desc = "This is an implant that allows the user to lay eggs." - generated_reagents = list("egg" = 2) + generated_reagents = list(REAGENT_ID_EGG = 2) usable_volume = 500 transfer_amount = 50 @@ -308,7 +308,7 @@ /obj/item/reagent_containers/food/snacks/egg/teshari/New() ..() - reagents.add_reagent("egg", 10) + reagents.add_reagent(REAGENT_ID_EGG, 10) bitesize = 2 /obj/item/reagent_containers/food/snacks/egg/teshari/tesh2 @@ -318,7 +318,7 @@ /obj/item/implant/reagent_generator/rischi name = "egg laying implant" desc = "This is an implant that allows the user to lay eggs." - generated_reagents = list("egg" = 2) + generated_reagents = list(REAGENT_ID_EGG = 2) usable_volume = 3000 //They requested 1 egg every ~30 minutes. transfer_amount = 3000 @@ -385,8 +385,8 @@ /* /obj/item/implant/reagent_generator/pumila_nectar //Bugged. Two implants at once messes things up. - generated_reagents = list("honey" = 2) - reagent_name = "honey" + generated_reagents = list(REAGENT_ID_HONEY = 2) + reagent_name = REAGENT_ID_HONEY usable_volume = 5000 empty_message = list("You appear to be all out of nectar", "You feel as though you are lacking a majority of your nectar.") @@ -411,7 +411,7 @@ /obj/item/reagent_containers/food/snacks/egg/roiz/New() ..() - reagents.add_reagent("egg", 9) + reagents.add_reagent(REAGENT_ID_EGG, 9) bitesize = 2 /obj/item/reagent_containers/food/snacks/egg/roiz/attackby(obj/item/W as obj, mob/user as mob) @@ -441,7 +441,7 @@ /obj/item/reagent_containers/food/snacks/friedegg/roiz/New() ..() - reagents.add_reagent("protein", 9) + reagents.add_reagent(REAGENT_ID_PROTEIN, 9) bitesize = 2 /obj/item/reagent_containers/food/snacks/boiledegg/roiz @@ -453,7 +453,7 @@ /obj/item/reagent_containers/food/snacks/boiledegg/roiz/New() ..() - reagents.add_reagent("protein", 6) + reagents.add_reagent(REAGENT_ID_PROTEIN, 6) bitesize = 2 /obj/item/reagent_containers/food/snacks/chocolateegg/roiz @@ -463,14 +463,14 @@ icon_state = "chocolateegg_roiz" filling_color = "#7D5F46" nutriment_amt = 3 - nutriment_desc = list("chocolate" = 5) + nutriment_desc = list(REAGENT_ID_CHOCOLATE = 5) volume = 18 /obj/item/reagent_containers/food/snacks/chocolateegg/roiz/New() ..() reagents.add_reagent(REAGENT_ID_SUGAR, 6) - reagents.add_reagent("coco", 6) - reagents.add_reagent("milk", 2) + reagents.add_reagent(REAGENT_ID_COCO, 6) + reagents.add_reagent(REAGENT_ID_MILK, 2) bitesize = 2 //SilverTalisman: Evian diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 2110834bbf7..c23a3d89da9 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1275,8 +1275,8 @@ /obj/item/reagent_containers/food/drinks/glass2/fluff/claraflask/Initialize() . = ..() - reagents.add_reagent("tea", 40) - reagents.add_reagent("milk", 20) + reagents.add_reagent(REAGENT_ID_TEA, 40) + reagents.add_reagent(REAGENT_ID_MILK, 20) /obj/item/reagent_containers/food/drinks/glass2/fluff/claraflask/update_icon() ..() diff --git a/code/modules/xenoarcheaology/tools/geosample_scanner.dm b/code/modules/xenoarcheaology/tools/geosample_scanner.dm index e08717ec615..47dff615207 100644 --- a/code/modules/xenoarcheaology/tools/geosample_scanner.dm +++ b/code/modules/xenoarcheaology/tools/geosample_scanner.dm @@ -47,9 +47,9 @@ ..() create_reagents(500) 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 + coolant_reagents_purity[REAGENT_ID_ICECOFFEE] = 0.6 + coolant_reagents_purity[REAGENT_ID_ICETEA] = 0.6 + coolant_reagents_purity[REAGENT_ID_MILKSHAKE] = 0.6 coolant_reagents_purity[REAGENT_ID_LEPORAZINE] = 0.7 coolant_reagents_purity[REAGENT_ID_KELOTANE] = 0.7 coolant_reagents_purity[REAGENT_ID_STERILIZINE] = 0.7 diff --git a/code/modules/xenobio/items/extracts.dm b/code/modules/xenobio/items/extracts.dm index b7e89a3c951..79982b7fd90 100644 --- a/code/modules/xenobio/items/extracts.dm +++ b/code/modules/xenobio/items/extracts.dm @@ -263,7 +263,7 @@ /decl/chemical_reaction/instant/slime/blue_frostoil name = "Slime Frost Oil" id = "m_frostoil" - result = "frostoil" + result = REAGENT_ID_FROSTOIL required_reagents = list(REAGENT_ID_PHORON = 5) result_amount = 20 required = /obj/item/slime_extract/blue diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm index 82082d5d302..1d007ff494a 100644 --- a/code/modules/xenobio/items/extracts_vr.dm +++ b/code/modules/xenobio/items/extracts_vr.dm @@ -193,7 +193,7 @@ /decl/chemical_reaction/instant/slime/blue_frostoil name = "Slime Frost Oil" id = "m_blue_frostoil" - result = "frostoil" + result = REAGENT_ID_FROSTOIL required_reagents = list(REAGENT_ID_PHORON = 5) result_amount = 30 required = /obj/item/slime_extract/blue @@ -247,7 +247,7 @@ /decl/chemical_reaction/instant/slime/blue_cryotoxin name = "Slime Cryotoxin" id = "m_blue_cryotoxin" - result = "cryotoxin" + result = REAGENT_ID_CRYOTOXIN required_reagents = list(REAGENT_ID_SLIMEJELLY = 5) result_amount = 30 required = /obj/item/slime_extract/blue @@ -881,7 +881,7 @@ /decl/chemical_reaction/instant/slime/red_hotsauce name = "Slime Hot Sauce" id = "m_red_hotsauce" - result = "capsaicin" + result = REAGENT_ID_CAPSAICIN required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 30 required = /obj/item/slime_extract/red @@ -1041,7 +1041,7 @@ /decl/chemical_reaction/instant/slime/oil_oil name = "Slime Oil" id = "m_oil_oil" - result = "cookingoil" + result = REAGENT_ID_COOKINGOIL required_reagents = list(REAGENT_ID_BLOOD = 5) result_amount = 30 required = /obj/item/slime_extract/oil diff --git a/code/modules/xenobio2/_xeno_setup_vr.dm b/code/modules/xenobio2/_xeno_setup_vr.dm index 89b4b9acc97..5390fb716e1 100644 --- a/code/modules/xenobio2/_xeno_setup_vr.dm +++ b/code/modules/xenobio2/_xeno_setup_vr.dm @@ -55,11 +55,11 @@ xenoChemList += REAGENT_ID_COOLANT xenoChemList += REAGENT_ID_LUMINOL xenoChemList += REAGENT_ID_NUTRIMENT - xenoChemList += "cornoil" - xenoChemList += "lipozine" + xenoChemList += REAGENT_ID_CORNOIL + xenoChemList += REAGENT_ID_LIPOZINE xenoChemList += REAGENT_ID_SODIUMCHLORIDE - xenoChemList += "frostoil" - xenoChemList += "capsaicin" - xenoChemList += "condensedcapsaicin" + xenoChemList += REAGENT_ID_FROSTOIL + xenoChemList += REAGENT_ID_CAPSAICIN + xenoChemList += REAGENT_ID_CONDENSEDCAPSAICIN xenoChemList += "neurotoxin" return 1 diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm index dde42678027..d0251b28ccb 100644 --- a/code/modules/xenobio2/mob/slime/slime.dm +++ b/code/modules/xenobio2/mob/slime/slime.dm @@ -50,12 +50,12 @@ Slime definitions, Life and New live here. REAGENT_ID_RADIUM = list(XENO_CHEM_TOXIC = 0.3, XENO_CHEM_MUT = 1), REAGENT_ID_MUTAGEN = list(XENO_CHEM_NUTRI = 0.4, XENO_CHEM_MUT = 2), REAGENT_ID_WATER = list(XENO_CHEM_NUTRI = -0.1), - "milk" = list(XENO_CHEM_NUTRI = 0.3), + REAGENT_ID_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), REAGENT_ID_AMMONIA = list(XENO_CHEM_TOXIC = 0.5), - "sodawater" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_NUTRI = -0.1), + REAGENT_ID_SODAWATER = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_NUTRI = -0.1), "beer" = list(XENO_CHEM_NUTRI = 0.6), REAGENT_ID_DIETHYLAMINE = list(XENO_CHEM_NUTRI = 0.9), REAGENT_ID_SUGAR = list(XENO_CHEM_TOXIC = 0.4, XENO_CHEM_NUTRI = 0.2), @@ -63,13 +63,13 @@ Slime definitions, Life and New live here. REAGENT_ID_CRYOXADONE = list(XENO_CHEM_TOXIC = 0.4), "flourine" = list(XENO_CHEM_TOXIC = 0.1), REAGENT_ID_ROBUSTHARVEST = list(XENO_CHEM_NUTRI = 1.5), - "glucose" = list(XENO_CHEM_NUTRI = 0.5), + REAGENT_ID_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), REAGENT_ID_TOXIN = list(XENO_CHEM_TOXIC = 0.5), REAGENT_ID_CARPOTOXIN = list(XENO_CHEM_TOXIC = 1, XENO_CHEM_MUT = 1.5), REAGENT_ID_PHORON = list(XENO_CHEM_TOXIC = 1.5, XENO_CHEM_MUT = 0.03), - "virusfood" = list(XENO_CHEM_NUTRI = 1.5, XENO_CHEM_MUT = 0.32), + REAGENT_ID_VIRUSFOOD = list(XENO_CHEM_NUTRI = 1.5, XENO_CHEM_MUT = 0.32), REAGENT_ID_CYANIDE = list(XENO_CHEM_TOXIC = 3.5), REAGENT_ID_SLIMEJELLY = list(XENO_CHEM_NUTRI = 0.5), "amutationtoxin" = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_HEAL = 1.5, XENO_CHEM_MUT = 3), diff --git a/vorestation.dme b/vorestation.dme index d7335f56c8e..0b3fd1d5fec 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -28,6 +28,7 @@ #include "code\__defines\_planes+layers.dm" #include "code\__defines\_planes+layers_vr.dm" #include "code\__defines\_protect.dm" +#include "code\__defines\_reagents.dm" #include "code\__defines\_tick.dm" #include "code\__defines\action.dm" #include "code\__defines\admin.dm" @@ -114,7 +115,6 @@ #include "code\__defines\projectiles.dm" #include "code\__defines\qdel.dm" #include "code\__defines\radio.dm" -#include "code\__defines\reagents.dm" #include "code\__defines\recipe.dm" #include "code\__defines\request_console.dm" #include "code\__defines\research.dm"