diff --git a/code/__defines/_reagents.dm b/code/__defines/_reagents.dm index 62db7c2493..820fb303f3 100644 --- a/code/__defines/_reagents.dm +++ b/code/__defines/_reagents.dm @@ -864,35 +864,376 @@ #define REAGENT_ID_DOCTORSDELIGHT "doctorsdelight" #define REAGENT_DRYRAMEN "Dry Ramen" #define REAGENT_ID_DRYRAMEN "dry_ramen" +#define REAGENT_HOTRAMEN "Hot Ramen" +#define REAGENT_ID_HOTRAMEN "hot_ramen" +#define REAGENT_HELLRAMEN "Hell Ramen" +#define REAGENT_ID_HELLRAMEN "hell_ramen" +#define REAGENT_DESSERTRAMEN "Dessert Ramen" +#define REAGENT_ID_DESSERTRAMEN "dessertramen" +#define REAGENT_ICE "Ice" +#define REAGENT_ID_ICE "ice" +#define REAGENT_NOTHING "Nothing" +#define REAGENT_ID_NOTHING "nothing" +#define REAGENT_DREAMCREAM "Dream Cream" +#define REAGENT_ID_DREAMCREAM "dreamcream" +#define REAGENT_VILELEMON "Vile Lemon" +#define REAGENT_ID_VILELEMON "vilelemon" +#define REAGENT_ENTDRAUGHT "Ent's Draught" +#define REAGENT_ID_ENTDRAUGHT "entdraught" +#define REAGENT_LOVEPOTION "Love Potion" +#define REAGENT_ID_LOVEPOTION "lovepotion" +#define REAGENT_OILSLICK "Oil Slick" +#define REAGENT_ID_OILSLICK "oilslick" +#define REAGENT_SLIMESLAMMER "Slick Slimes Slammer" +#define REAGENT_ID_SLIMESLAMMER "slimeslammer" +#define REAGENT_EGGNOG "Eggnog" +#define REAGENT_ID_EGGNOG "eggnog" +#define REAGENT_NUCLEARWASTE "Nuclear Waste" +#define REAGENT_ID_NUCLEARWASTE "nuclearwaste" +#define REAGENT_SODAOIL "Soda Oil" +#define REAGENT_ID_SODAOIL "sodaoil" +#define REAGENT_VIRGINMOJITO "Mojito" +#define REAGENT_ID_VIRGINMOJITO "virginmojito" +#define REAGENT_VIRGINSEXONTHEBEACH "Virgin Sex On The Beach" +#define REAGENT_ID_VIRGINSEXONTHEBEACH "virginsexonthebeach" +#define REAGENT_DRIVERSPUNCH "Driver's Punch" +#define REAGENT_ID_DRIVERSPUNCH "driverspunch" +#define REAGENT_MINTAPPLESPARKLE "Mint Apple Sparkle" +#define REAGENT_ID_MINTAPPLESPARKLE "mintapplesparkle" +#define REAGENT_BERRYCORDIAL "Berry Cordial" +#define REAGENT_ID_BERRYCORDIAL "berrycordial" +#define REAGENT_TROPICALFIZZ "Tropical Fizz" +#define REAGENT_ID_TROPICALFIZZ "tropicalfizz" +#define REAGENT_FAUXFIZZ "Faux Fizz" +#define REAGENT_ID_FAUXFIZZ "fauxfizz" +#define REAGENT_SYRUP "syrup" +#define REAGENT_ID_SYRUP "syrup" +#define REAGENT_SYRUPPUMPKIN "pumpkin spice syrup" +#define REAGENT_ID_SYRUPPUMPKIN "syrup_pumpkin" +#define REAGENT_SYRUPCARAMEL "caramel syrup" +#define REAGENT_ID_SYRUPCARAMEL "syrup_caramel" +#define REAGENT_SYRUPSALTEDCARAMEL "salted caramel syrup" +#define REAGENT_ID_SYRUPSALTEDCARAMEL "syrup_salted_caramel" +#define REAGENT_SYRUPIRISH "irish cream syrup" +#define REAGENT_ID_SYRUPIRISH "syrup_irish" +#define REAGENT_SYRUPALMOND "almond syrup" +#define REAGENT_ID_SYRUPALMOND "syrup_almond" +#define REAGENT_SYRUPCINNAMON "cinnamon syrup" +#define REAGENT_ID_SYRUPCINNAMON "syrup_cinnamon" +#define REAGENT_SYRUPPISTACHIO "pistachio syrup" +#define REAGENT_ID_SYRUPPISTACHIO "syrup_pistachio" +#define REAGENT_SYRUPVANILLA "vanilla syrup" +#define REAGENT_ID_SYRUPVANILLA "syrup_vanilla" +#define REAGENT_SYRUPTOFFEE "toffee syrup" +#define REAGENT_ID_SYRUPTOFFEE "syrup_toffee" +#define REAGENT_SYRUPCHERRY "cherry syrup" +#define REAGENT_ID_SYRUPCHERRY "syrup_cherry" +#define REAGENT_SYRUPBUTTERSCOTCH "butterscotch syrup" +#define REAGENT_ID_SYRUPBUTTERSCOTCH "syrup_butterscotch" +#define REAGENT_SYRUPCHOCOLATE "chocolate syrup" +#define REAGENT_ID_SYRUPCHOCOLATE "syrup_chocolate" +#define REAGENT_SYRUPWHITECHOCOLATE "white chocolate syrup" +#define REAGENT_ID_SYRUPWHITECHOCOLATE "syrup_white_chocolate" +#define REAGENT_SYRUPSTRAWBERRY "strawberry syrup" +#define REAGENT_ID_SYRUPSTRAWBERRY "syrup_strawberry" +#define REAGENT_SYRUPCOCONUT "coconut syrup" +#define REAGENT_ID_SYRUPCOCONUT "syrup_coconut" +#define REAGENT_SYRUPGINGER "ginger syrup" +#define REAGENT_ID_SYRUPGINGER "syrup_ginger" +#define REAGENT_SYRUPGINGERBREAD "gingerbread syrup" +#define REAGENT_ID_SYRUPGINGERBREAD "syrup_gingerbread" +#define REAGENT_SYRUPPEPPERMINT "peppermint syrup" +#define REAGENT_ID_SYRUPPEPPERMINT "syrup_peppermint" +#define REAGENT_SYRUPBIRTHDAY "birthday cake syrup" +#define REAGENT_ID_SYRUPBIRTHDAY "syrup_birthday" +// Alcohol +#define REAGENT_ABSINTHE "Absinthe" +#define REAGENT_ID_ABSINTHE "absinthe" +#define REAGENT_ALE "Ale" +#define REAGENT_ID_ALE "ale" +#define REAGENT_BEER "Beer" +#define REAGENT_ID_BEER "beer" +#define REAGENT_LITEBEER "Lite Beer" +#define REAGENT_ID_LITEBEER "litebeer" +#define REAGENT_BLUECURACAO "Blue Curacao" +#define REAGENT_ID_BLUECURACAO "bluecuracao" +#define REAGENT_COGNAC "Cognac" +#define REAGENT_ID_COGNAC "cognac" +#define REAGENT_DEADRUM "Deadrum" +#define REAGENT_ID_DEADRUM "deadrum" +#define REAGENT_FIREPUNCH "Fire Punch" +#define REAGENT_ID_FIREPUNCH "firepunch" +#define REAGENT_GIN "Gin" +#define REAGENT_ID_GIN "gin" +#define REAGENT_KAHLUA "Kahlua" +#define REAGENT_ID_KAHLUA "kahlua" +#define REAGENT_MELONLIQUOR "Melon Liquor" +#define REAGENT_ID_MELONLIQUOR "melonliquor" +#define REAGENT_MELONSPRITZER "Melon Spritzer" +#define REAGENT_ID_MELONSPRITZER "melonspritzer" +#define REAGENT_RUM "Rum" +#define REAGENT_ID_RUM "rum" +#define REAGENT_SAKE "Sake" +#define REAGENT_ID_SAKE "sake" +#define REAGENT_SEXONTHEBEACH "Sex On The Beach" +#define REAGENT_ID_SEXONTHEBEACH "sexonthebeach" +#define REAGENT_TEQUILLA "Tequila" +#define REAGENT_ID_TEQUILLA "tequilla" +#define REAGENT_THIRTEENLOKO "Thirteen Loko" +#define REAGENT_ID_THIRTEENLOKO "thirteenloko" +#define REAGENT_VERMOUTH "Vermouth" +#define REAGENT_ID_VERMOUTH "vermouth" +#define REAGENT_VODKA "Vodka" +#define REAGENT_ID_VODKA "vodka" +#define REAGENT_WHISKEY "Whiskey" +#define REAGENT_ID_WHISKEY "whiskey" +#define REAGENT_REDWINE "Red Wine" +#define REAGENT_ID_REDWINE "redwine" +#define REAGENT_WHITEWINE "White Wine" +#define REAGENT_ID_WHITEWINE "whitewine" +#define REAGENT_CARNOTH "Carnoth" +#define REAGENT_ID_CARNOTH "carnoth" +#define REAGENT_PWINE "Poison Wine" +#define REAGENT_ID_PWINE "pwine" +#define REAGENT_CHAMPAGNE "Champagne" +#define REAGENT_ID_CHAMPAGNE "champagne" +#define REAGENT_CIDER "Cider" +#define REAGENT_ID_CIDER "cider" - - -#define REAGENT_ -#define REAGENT_ID_ -#define REAGENT_ -#define REAGENT_ID_ -#define REAGENT_ -#define REAGENT_ID_ -#define REAGENT_ -#define REAGENT_ID_ -#define REAGENT_ -#define REAGENT_ID_ -#define REAGENT_ -#define REAGENT_ID_ -#define REAGENT_ -#define REAGENT_ID_ -#define REAGENT_ -#define REAGENT_ID_ -#define REAGENT_ -#define REAGENT_ID_ -#define REAGENT_ -#define REAGENT_ID_ - - - - - +// Cocktails +#define REAGENT_ACIDSPIT "Acid Spit" +#define REAGENT_ID_ACIDSPIT "acidspit" +#define REAGENT_ALLIESCOCKTAIL "Allies Cocktail" +#define REAGENT_ID_ALLIESCOCKTAIL "alliescocktail" +#define REAGENT_ALOE "Aloe" +#define REAGENT_ID_ALOE "aloe" +#define REAGENT_AMASEC "Amasec" +#define REAGENT_ID_AMASEC "amasec" +#define REAGENT_ANDALUSIA "Andalusia" +#define REAGENT_ID_ANDALUSIA "andalusia" +#define REAGENT_ANTIFREEZE "Anti-freeze" +#define REAGENT_ID_ANTIFREEZE "antifreeze" +#define REAGENT_ATOMICBOMB "Atomic Bomb" +#define REAGENT_ID_ATOMICBOMB "atomicbomb" +#define REAGENT_B52 "B-52" +#define REAGENT_ID_B52 "b52" +#define REAGENT_BAHAMAMAMA "Bahama mama" +#define REAGENT_ID_BAHAMAMAMA "bahama_mama" +#define REAGENT_BANANAHONK "Banana Mama" +#define REAGENT_ID_BANANAHONK "bananahonk" +#define REAGENT_BAREFOOT "Barefoot" +#define REAGENT_ID_BAREFOOT "barefoot" +#define REAGENT_BEEPSKYSMASH "Beepsky Smash" +#define REAGENT_ID_BEEPSKYSMASH "beepskysmash" +#define REAGENT_BILK "Bilk" +#define REAGENT_ID_BILK "bilk" +#define REAGENT_BLACKRUSSIAN "Black Russian" +#define REAGENT_ID_BLACKRUSSIAN "blackrussian" +#define REAGENT_BLOODYMARY "Bloody Mary" +#define REAGENT_ID_BLOODYMARY "bloodymary" +#define REAGENT_BOOGER "Booger" +#define REAGENT_ID_BOOGER "booger" +#define REAGENT_BRAVEBULL "Brave Bull" +#define REAGENT_ID_BRAVEBULL "bravebull" +#define REAGENT_CHANGELINGSTING "Changeling Sting" +#define REAGENT_ID_CHANGELINGSTING "changelingsting" +#define REAGENT_MARTINI "Classic Martini" +#define REAGENT_ID_MARTINI "martini" +#define REAGENT_CUBALIBRE "Cuba Libre" +#define REAGENT_ID_CUBALIBRE "cubalibre" +#define REAGENT_RUMANDCOLA "Rum and Cola" +#define REAGENT_ID_RUMANDCOLA "rumandcola" +#define REAGENT_DEMONSBLOOD "Demons Blood" +#define REAGENT_ID_DEMONSBLOOD "demonsblood" +#define REAGENT_DEVILSKISS "Devils Kiss" +#define REAGENT_ID_DEVILSKISS "devilskiss" +#define REAGENT_DRIESTMARTINI "Driest Martini" +#define REAGENT_ID_DRIESTMARTINI "driestmartini" +#define REAGENT_GINFIZZ "Gin Fizz" +#define REAGENT_ID_GINFIZZ "ginfizz" +#define REAGENT_GROG "Grog" +#define REAGENT_ID_GROG "grog" +#define REAGENT_ERIKASURPRISE "Erika Surprise" +#define REAGENT_ID_ERIKASURPRISE "erikasurprise" +#define REAGENT_GARGLEBLASTER "Pan-Galactic Gargle Blaster" +#define REAGENT_ID_GARGLEBLASTER "gargleblaster" +#define REAGENT_GINTONIC "Gin and Tonic" +#define REAGENT_ID_GINTONIC "gintonic" +#define REAGENT_GOLDSCHLAGER "Goldschlager" +#define REAGENT_ID_GOLDSCHLAGER "goldschlager" +#define REAGENT_HIPPIESDELIGHT "Hippies' Delight" +#define REAGENT_ID_HIPPIESDELIGHT "hippiesdelight" +#define REAGENT_HOOCH "Hooch" +#define REAGENT_ID_HOOCH "hooch" +#define REAGENT_ICEDBEER "Iced Beer" +#define REAGENT_ID_ICEDBEER "iced_beer" +#define REAGENT_IRISHCARBOMB "Irish Car Bomb" +#define REAGENT_ID_IRISHCARBOMB "irishcarbomb" +#define REAGENT_IRISHCOFFEE "Irish Coffee" +#define REAGENT_ID_IRISHCOFFEE "irishcoffee" +#define REAGENT_IRISHCREAM "Irish Cream" +#define REAGENT_ID_IRISHCREAM "irishcream" +#define REAGENT_LONGISLANDICEDTEA "Long Island Iced Tea" +#define REAGENT_ID_LONGISLANDICEDTEA "longislandicedtea" +#define REAGENT_MANHATTAN "Manhattan" +#define REAGENT_ID_MANHATTAN "manhattan" +#define REAGENT_MANHATTANPROJ "Manhattan Project" +#define REAGENT_ID_MANHATTANPROJ "manhattan_proj" +#define REAGENT_MANLYDORF "The Manly Dorf" +#define REAGENT_ID_MANLYDORF "manlydorf" +#define REAGENT_MARGARITA "Margarita" +#define REAGENT_ID_MARGARITA "margarita" +#define REAGENT_MEAD "Mead" +#define REAGENT_ID_MEAD "mead" +#define REAGENT_MOONSHINE "Moonshine" +#define REAGENT_ID_MOONSHINE "moonshine" +#define REAGENT_NEUROTOXIN "Neurotoxin" +#define REAGENT_ID_NEUROTOXIN "neurotoxin" +#define REAGENT_PATRON "Patron" +#define REAGENT_ID_PATRON "patron" +#define REAGENT_REDMEAD "Red Mead" +#define REAGENT_ID_REDMEAD "red_mead" +#define REAGENT_SBITEN "Sbiten" +#define REAGENT_ID_SBITEN "sbiten" +#define REAGENT_SCREWDRIVERCOCKTAIL "Screwdriver" +#define REAGENT_ID_SCREWDRIVERCOCKTAIL "screwdrivercocktail" +#define REAGENT_SILENCER "Silencer" +#define REAGENT_ID_SILENCER "silencer" +#define REAGENT_SINGULO "Singulo" +#define REAGENT_ID_SINGULO "singulo" +#define REAGENT_SNOWWHITE "Snow White" +#define REAGENT_ID_SNOWWHITE "snowwhite" +#define REAGENT_SUIDREAM "Sui Dream" +#define REAGENT_ID_SUIDREAM "suidream" +#define REAGENT_SYNDICATEBOMB "Syndicate Bomb" +#define REAGENT_ID_SYNDICATEBOMB "syndicatebomb" +#define REAGENT_TEQUILLASUNRISE "Tequila Sunrise" +#define REAGENT_ID_TEQUILLASUNRISE "tequillasunrise" +#define REAGENT_THREEMILEISLAND "Three Mile Island Iced Tea" +#define REAGENT_ID_THREEMILEISLAND "threemileisland" +#define REAGENT_PHORONSPECIAL "Toxins Special" +#define REAGENT_ID_PHORONSPECIAL "phoronspecial" +#define REAGENT_VODKAMARTINI "Vodka Martini" +#define REAGENT_ID_VODKAMARTINI "vodkamartini" +#define REAGENT_VODKATONIC "Vodka and Tonic" +#define REAGENT_ID_VODKATONIC "vodkatonic" +#define REAGENT_WHITERUSSIAN "White Russian" +#define REAGENT_ID_WHITERUSSIAN "whiterussian" +#define REAGENT_WHISKEYCOLA "Whiskey Cola" +#define REAGENT_ID_WHISKEYCOLA "whiskeycola" +#define REAGENT_WHISKEYSODA "Whiskey Soda" +#define REAGENT_ID_WHISKEYSODA "whiskeysoda" +#define REAGENT_SPECIALWHISKEY "Special Blend Whiskey" +#define REAGENT_ID_SPECIALWHISKEY "specialwhiskey" +#define REAGENT_UNATHILIQUOR "Redeemer's Brew" +#define REAGENT_ID_UNATHILIQUOR "unathiliquor" +#define REAGENT_SAKEBOMB "Sake Bomb" +#define REAGENT_ID_SAKEBOMB "sakebomb" +#define REAGENT_TAMAGOZAKE "Tamagozake" +#define REAGENT_ID_TAMAGOZAKE "tamagozake" +#define REAGENT_GINZAMARY "Ginza Mary" +#define REAGENT_ID_GINZAMARY "ginzamary" +#define REAGENT_TOKYOROSE "Tokyo Rose" +#define REAGENT_ID_TOKYOROSE "tokyorose" +#define REAGENT_SAKETINI "Saketini" +#define REAGENT_ID_SAKETINI "saketini" +#define REAGENT_ELYSIUMFACEPUNCH "Elysium Facepunch" +#define REAGENT_ID_ELYSIUMFACEPUNCH "elysiumfacepunch" +#define REAGENT_EREBUSMOONRISE "Erebus Moonrise" +#define REAGENT_ID_EREBUSMOONRISE "erebusmoonrise" +#define REAGENT_BALLOON "Balloon" +#define REAGENT_ID_BALLOON "balloon" +#define REAGENT_NATUNABRANDY "Natuna Brandy" +#define REAGENT_ID_NATUNABRANDY "natunabrandy" +#define REAGENT_EUPHORIA "Euphoria" +#define REAGENT_ID_EUPHORIA "euphoria" +#define REAGENT_XANADUCANNON "Xanadu Cannon" +#define REAGENT_ID_XANADUCANNON "xanaducannon" +#define REAGENT_DEBUGGER "Debugger" +#define REAGENT_ID_DEBUGGER "debugger" +#define REAGENT_SPACERSBREW "Spacer's Brew" +#define REAGENT_ID_SPACERSBREW "spacersbrew" +#define REAGENT_BINMANBLISS "Binman Bliss" +#define REAGENT_ID_BINMANBLISS "binmanbliss" +#define REAGENT_CHRYSANTHEMUM "Chrysanthemum" +#define REAGENT_ID_CHRYSANTHEMUM "chrysanthemum" +#define REAGENT_BITTERS "Bitters" +#define REAGENT_ID_BITTERS "bitters" +#define REAGENT_SOEMMERFIRE "Soemmer Fire" +#define REAGENT_ID_SOEMMERFIRE "soemmerfire" +#define REAGENT_WINEBRANDY "Wine Brandy" +#define REAGENT_ID_WINEBRANDY "winebrandy" +#define REAGENT_MORNINGAFTER "Morning After" +#define REAGENT_ID_MORNINGAFTER "morningafter" +#define REAGENT_VESPER "Vesper" +#define REAGENT_ID_VESPER "vesper" +#define REAGENT_ROTGUT "Rotgut Fever Dream" +#define REAGENT_ID_ROTGUT "rotgut" +#define REAGENT_VOXDELIGHT "Vox's Delight" +#define REAGENT_ID_VOXDELIGHT "voxdelight" +#define REAGENT_SCREAMINGVIKING "Screaming Viking" +#define REAGENT_ID_SCREAMINGVIKING "screamingviking" +#define REAGENT_ROBUSTIN "Robustin" +#define REAGENT_ID_ROBUSTIN "robustin" +#define REAGENT_VIRGINSIP "Virgin Sip" +#define REAGENT_ID_VIRGINSIP "virginsip" +#define REAGENT_JELLYSHOT "Jelly Shot" +#define REAGENT_ID_JELLYSHOT "jellyshot" +#define REAGENT_SLIMESHOT "Named Bullet" +#define REAGENT_ID_SLIMESHOT "slimeshot" +#define REAGENT_CLOVERCLUB "Clover Club" +#define REAGENT_ID_CLOVERCLUB "cloverclub" +#define REAGENT_NEGRONI "Negroni" +#define REAGENT_ID_NEGRONI "negroni" +#define REAGENT_WHISKEYSOUR "Whiskey Sour" +#define REAGENT_ID_WHISKEYSOUR "whiskeysour" +#define REAGENT_OLDFASHIONED "Old Fashioned" +#define REAGENT_ID_OLDFASHIONED "oldfashioned" +#define REAGENT_DAIQUIRI "Daiquiri" +#define REAGENT_ID_DAIQUIRI "daiquiri" +#define REAGENT_MOJITO "Mojito" +#define REAGENT_ID_MOJITO "mojito" +#define REAGENT_PALOMA "Paloma" +#define REAGENT_ID_PALOMA "paloma" +#define REAGENT_PISCOSOUR "Pisco Sour" +#define REAGENT_ID_PISCOSOUR "piscosour" +#define REAGENT_COLDFRONT "Cold Front" +#define REAGENT_ID_COLDFRONT "coldfront" +#define REAGENT_MINTJULEP "Mint Julep" +#define REAGENT_ID_MINTJULEP "mintjulep" +#define REAGENT_GODSAKE "Gods Sake" +#define REAGENT_ID_GODSAKE "godsake" +#define REAGENT_GODKA "Godka" +#define REAGENT_ID_GODKA "godka" +#define REAGENT_HOLYWINE "Angel Ichor" +#define REAGENT_ID_HOLYWINE "holywine" +#define REAGENT_HOLYMARY "Holy Mary" +#define REAGENT_ID_HOLYMARY "holymary" +#define REAGENT_ANGELSWRATH "Angels Wrath" +#define REAGENT_ID_ANGELSWRATH "angelswrath" +#define REAGENT_ANGELSKISS "Angels Kiss" +#define REAGENT_ID_ANGELSKISS "angelskiss" +#define REAGENT_ICHORMEAD "Ichor Mead" +#define REAGENT_ID_ICHORMEAD "ichor_mead" +#define REAGENT_SCHNAPPSPEP "Peppermint Schnapps" +#define REAGENT_ID_SCHNAPPSPEP "schnapps_pep" +#define REAGENT_SCHNAPPSPEA "Peach Schnapps" +#define REAGENT_ID_SCHNAPPSPEA "schnapps_pea" +#define REAGENT_SCHNAPPSLEM "Lemonade Schnapps" +#define REAGENT_ID_SCHNAPPSLEM "schnapps_lem" +#define REAGENT_JAGER "Schuss Konig" +#define REAGENT_ID_JAGER "jager" +#define REAGENT_FUSIONNAIRE "Fusionnaire" +#define REAGENT_ID_FUSIONNAIRE "fusionnaire" +#define REAGENT_DEATHBELL "Deathbell" +#define REAGENT_ID_DEATHBELL "deathbell" +#define REAGENT_MAGICDUST "Magic Dust" +#define REAGENT_ID_MAGICDUST "magicdust" +#define REAGENT_KOMPOT "Kompot" +#define REAGENT_ID_KOMPOT "kompot" +#define REAGENT_KVASS "Kvass" +#define REAGENT_ID_KVASS "kvass" // Toxins @@ -986,15 +1327,3 @@ #define REAGENT_ID_NEUROPHAGENANITES "neurophage_nanites" #define REAGENT_SALMONELLA "Salmonella" #define REAGENT_ID_SALMONELLA "salmonella" - - - - - - - -Files left: food_drinks.dm, -includes: .dm -excludes: reagents.dm,ores.dm,materials.dm,mre.dm - - id = "lemon_juice_paint" diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm index af2301e265..8073d6a8ca 100644 --- a/code/__defines/chemistry.dm +++ b/code/__defines/chemistry.dm @@ -49,8 +49,8 @@ #define ANTIBIO_SUPER 3 // Chemistry lists. -var/list/tachycardics = list(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/tachycardics = list(REAGENT_ID_COFFEE, REAGENT_ID_INAPROVALINE, REAGENT_ID_HYPERZINE, REAGENT_ID_NITROGLYCERIN,REAGENT_ID_THIRTEENLOKO, REAGENT_ID_NICOTINE) // Increase heart rate. +var/list/bradycardics = list(REAGENT_ID_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/modules/casino/casino_prize_vendor.dm b/code/modules/casino/casino_prize_vendor.dm index bf4acaa1f0..a526ef697c 100644 --- a/code/modules/casino/casino_prize_vendor.dm +++ b/code/modules/casino/casino_prize_vendor.dm @@ -157,10 +157,10 @@ item_list["Drinks"] = list( CASINO_PRIZE("Redeemer's brew", /obj/item/reagent_containers/food/drinks/bottle/redeemersbrew, 1, 150, "drinks"), CASINO_PRIZE("Poison wine", /obj/item/reagent_containers/food/drinks/bottle/pwine, 1, 150, "drinks"), - CASINO_PRIZE("Patron", /obj/item/reagent_containers/food/drinks/bottle/patron, 1, 150, "drinks"), + CASINO_PRIZE(REAGENT_PATRON, /obj/item/reagent_containers/food/drinks/bottle/patron, 1, 150, "drinks"), CASINO_PRIZE("Holy water", /obj/item/reagent_containers/food/drinks/bottle/holywater, 1, 150, "drinks"), - CASINO_PRIZE("Goldschlager", /obj/item/reagent_containers/food/drinks/bottle/goldschlager, 1, 150, "drinks"), - CASINO_PRIZE("Champagne", /obj/item/reagent_containers/food/drinks/bottle/champagne, 1, 150, "drinks"), + CASINO_PRIZE(REAGENT_GOLDSCHLAGER, /obj/item/reagent_containers/food/drinks/bottle/goldschlager, 1, 150, "drinks"), + CASINO_PRIZE(REAGENT_CHAMPAGNE, /obj/item/reagent_containers/food/drinks/bottle/champagne, 1, 150, "drinks"), CASINO_PRIZE("Bottle of Nothing", /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, 1, 150, "drinks"), CASINO_PRIZE("Whiskey bliss", /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, 1, 150, "drinks"), ) diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/drinkingglass.dm index 2e5b5035dd..cb9f4ffb8b 100644 --- a/code/modules/food/drinkingglass/drinkingglass.dm +++ b/code/modules/food/drinkingglass/drinkingglass.dm @@ -45,8 +45,8 @@ /obj/item/reagent_containers/food/drinks/glass2/proc/has_ice() if(reagents.reagent_list.len > 0) var/datum/reagent/R = reagents.get_master_reagent() - if(!((R.id == "ice") || ("ice" in R.glass_special))) // if it's not a cup of ice, and it's not already supposed to have ice in, see if the bartender's put ice in it - if(reagents.has_reagent("ice", reagents.total_volume / 10)) // 10% ice by volume + if(!((R.id == REAGENT_ID_ICE) || (REAGENT_ID_ICE in R.glass_special))) // if it's not a cup of ice, and it's not already supposed to have ice in, see if the bartender's put ice in it + if(reagents.has_reagent(REAGENT_ID_ICE, reagents.total_volume / 10)) // 10% ice by volume return 1 return 0 diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm index f88e09cf79..3220666e32 100644 --- a/code/modules/food/food/cans.dm +++ b/code/modules/food/food/cans.dm @@ -206,7 +206,7 @@ /obj/item/reagent_containers/food/drinks/cans/kvass/Initialize() . = ..() - reagents.add_reagent("kvass", 30) + reagents.add_reagent(REAGENT_ID_KVASS, 30) /obj/item/reagent_containers/food/drinks/cans/kompot name = "\improper Kompot" @@ -217,7 +217,7 @@ /obj/item/reagent_containers/food/drinks/cans/kompot/Initialize() . = ..() - reagents.add_reagent("kompot", 30) + reagents.add_reagent(REAGENT_ID_KOMPOT, 30) /obj/item/reagent_containers/food/drinks/cans/boda name = "\improper Boda" @@ -437,7 +437,7 @@ /obj/item/reagent_containers/food/drinks/cans/beercan/Initialize() . = ..() - reagents.add_reagent("beer", 30) + reagents.add_reagent(REAGENT_ID_BEER, 30) /obj/item/reagent_containers/food/drinks/cans/alecan name = "\improper Spacecastle Pale Ale" @@ -447,7 +447,7 @@ /obj/item/reagent_containers/food/drinks/cans/alecan/Initialize() . = ..() - reagents.add_reagent("ale", 30) + reagents.add_reagent(REAGENT_ID_ALE, 30) /////////////////////////ENERGY DRINKS///////////////////////// diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 49cdf76562..700659cab9 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -349,7 +349,7 @@ center_of_mass = list("x"=15, "y"=10) /obj/item/reagent_containers/food/drinks/ice/Initialize() . = ..() - reagents.add_reagent("ice", 30) + reagents.add_reagent(REAGENT_ID_ICE, 30) /obj/item/reagent_containers/food/drinks/h_chocolate name = "cup of Counselor's Choice hot cocoa" diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index ae3c7ebae3..2eebe2f38d 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -228,7 +228,7 @@ /obj/item/reagent_containers/food/drinks/bottle/gin/Initialize() . = ..() - reagents.add_reagent("gin", 100) + reagents.add_reagent(REAGENT_ID_GIN, 100) /obj/item/reagent_containers/food/drinks/bottle/whiskey name = "Uncle Git's Special Reserve" @@ -238,17 +238,17 @@ /obj/item/reagent_containers/food/drinks/bottle/whiskey/Initialize() . = ..() - reagents.add_reagent("whiskey", 100) + reagents.add_reagent(REAGENT_ID_WHISKEY, 100) /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey - name = "Special Blend Whiskey" + name = REAGENT_SPECIALWHISKEY desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." icon_state = "whiskeybottle2" center_of_mass = list("x"=16, "y"=3) /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey/Initialize() . = ..() - reagents.add_reagent("specialwhiskey", 100) + reagents.add_reagent(REAGENT_ID_SPECIALWHISKEY, 100) /obj/item/reagent_containers/food/drinks/bottle/vodka name = "Tunguska Triple Distilled" @@ -258,7 +258,7 @@ /obj/item/reagent_containers/food/drinks/bottle/vodka/Initialize() . = ..() - reagents.add_reagent("vodka", 100) + reagents.add_reagent(REAGENT_ID_VODKA, 100) /obj/item/reagent_containers/food/drinks/bottle/tequilla name = "Caccavo Guaranteed Quality Tequilla" @@ -268,7 +268,7 @@ /obj/item/reagent_containers/food/drinks/bottle/tequilla/Initialize() . = ..() - reagents.add_reagent("tequilla", 100) + reagents.add_reagent(REAGENT_ID_TEQUILLA, 100) /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing name = "Bottle of Nothing" @@ -278,7 +278,7 @@ /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing/Initialize() . = ..() - reagents.add_reagent("nothing", 100) + reagents.add_reagent(REAGENT_ID_NOTHING, 100) /obj/item/reagent_containers/food/drinks/bottle/patron name = "Wrapp Artiste Patron" @@ -288,7 +288,7 @@ /obj/item/reagent_containers/food/drinks/bottle/patron/Initialize() . = ..() - reagents.add_reagent("patron", 100) + reagents.add_reagent(REAGENT_ID_PATRON, 100) /obj/item/reagent_containers/food/drinks/bottle/rum name = "Captain Pete's Cuban Spiced Rum" @@ -298,7 +298,7 @@ /obj/item/reagent_containers/food/drinks/bottle/rum/Initialize() . = ..() - reagents.add_reagent("rum", 100) + reagents.add_reagent(REAGENT_ID_RUM, 100) /obj/item/reagent_containers/food/drinks/bottle/holywater name = "Flask of Holy Water" @@ -318,7 +318,7 @@ /obj/item/reagent_containers/food/drinks/bottle/vermouth/Initialize() . = ..() - reagents.add_reagent("vermouth", 100) + reagents.add_reagent(REAGENT_ID_VERMOUTH, 100) /obj/item/reagent_containers/food/drinks/bottle/kahlua name = "Robert Robust's Coffee Liqueur" @@ -328,7 +328,7 @@ /obj/item/reagent_containers/food/drinks/bottle/kahlua/Initialize() . = ..() - reagents.add_reagent("kahlua", 100) + reagents.add_reagent(REAGENT_ID_KAHLUA, 100) /obj/item/reagent_containers/food/drinks/bottle/goldschlager name = "College Girl Goldschlager" @@ -338,7 +338,7 @@ /obj/item/reagent_containers/food/drinks/bottle/goldschlager/Initialize() . = ..() - reagents.add_reagent("goldschlager", 100) + reagents.add_reagent(REAGENT_ID_GOLDSCHLAGER, 100) /obj/item/reagent_containers/food/drinks/bottle/cognac name = "Chateau De Baton Premium Cognac" @@ -348,7 +348,7 @@ /obj/item/reagent_containers/food/drinks/bottle/cognac/Initialize() . = ..() - reagents.add_reagent("cognac", 100) + reagents.add_reagent(REAGENT_ID_COGNAC, 100) /obj/item/reagent_containers/food/drinks/bottle/absinthe name = "Jailbreaker Verte" @@ -358,7 +358,7 @@ /obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize() . = ..() - reagents.add_reagent("absinthe", 100) + reagents.add_reagent(REAGENT_ID_ABSINTHE, 100) /obj/item/reagent_containers/food/drinks/bottle/melonliquor //MODIFIED ON 04/21/2021 name = "Emeraldine Melon Liqueur" @@ -368,7 +368,7 @@ /obj/item/reagent_containers/food/drinks/bottle/melonliquor/Initialize() . = ..() - reagents.add_reagent("melonliquor", 100) + reagents.add_reagent(REAGENT_ID_MELONLIQUOR, 100) /obj/item/reagent_containers/food/drinks/bottle/bluecuracao //MODIFIED ON 04/21/2021 name = "Miss Blue Curacao" @@ -378,17 +378,17 @@ /obj/item/reagent_containers/food/drinks/bottle/bluecuracao/Initialize() . = ..() - reagents.add_reagent("bluecuracao", 100) + reagents.add_reagent(REAGENT_ID_BLUECURACAO, 100) /obj/item/reagent_containers/food/drinks/bottle/redeemersbrew - name = "Redeemer's Brew" + name = REAGENT_UNATHILIQUOR desc = "Just opening the top of this bottle makes you feel a bit tipsy. Not for the faint of heart." icon_state = "redeemersbrew" center_of_mass = list("x"=16, "y"=3) /obj/item/reagent_containers/food/drinks/bottle/redeemersbrew/Initialize() . = ..() - reagents.add_reagent("unathiliquor", 100) + reagents.add_reagent(REAGENT_ID_UNATHILIQUOR, 100) /obj/item/reagent_containers/food/drinks/bottle/peppermintschnapps name = "Dr. Bone's Peppermint Schnapps" @@ -398,7 +398,7 @@ /obj/item/reagent_containers/food/drinks/bottle/peppermintschnapps/Initialize() . = ..() - reagents.add_reagent("schnapps_pep", 100) + reagents.add_reagent(REAGENT_ID_SCHNAPPSPEP, 100) /obj/item/reagent_containers/food/drinks/bottle/peachschnapps name = "Dr. Bone's Peach Schnapps" @@ -408,7 +408,7 @@ /obj/item/reagent_containers/food/drinks/bottle/peachschnapps/Initialize() . = ..() - reagents.add_reagent("schnapps_pea", 100) + reagents.add_reagent(REAGENT_ID_SCHNAPPSPEA, 100) /obj/item/reagent_containers/food/drinks/bottle/lemonadeschnapps name = "Dr. Bone's Lemonade Schnapps" @@ -418,7 +418,7 @@ /obj/item/reagent_containers/food/drinks/bottle/lemonadeschnapps/Initialize() . = ..() - reagents.add_reagent("schnapps_lem", 100) + reagents.add_reagent(REAGENT_ID_SCHNAPPSLEM, 100) /obj/item/reagent_containers/food/drinks/bottle/jager name = "Schusskonig" @@ -428,7 +428,7 @@ /obj/item/reagent_containers/food/drinks/bottle/jager/Initialize() . = ..() - reagents.add_reagent("jager", 100) + reagents.add_reagent(REAGENT_ID_JAGER, 100) /////////////////////////WINES///////////////////////// @@ -440,7 +440,7 @@ /obj/item/reagent_containers/food/drinks/bottle/wine/Initialize() . = ..() - reagents.add_reagent("redwine", 100) + reagents.add_reagent(REAGENT_ID_REDWINE, 100) /obj/item/reagent_containers/food/drinks/bottle/whitewine name = "Doublebeard Bearded Special White" @@ -450,7 +450,7 @@ /obj/item/reagent_containers/food/drinks/bottle/whitewine/Initialize() . = ..() - reagents.add_reagent("whitewine", 100) + reagents.add_reagent(REAGENT_ID_WHITEWINE, 100) /obj/item/reagent_containers/food/drinks/bottle/carnoth //anagram of 'ntcahors' where the bottle sprite originated from name = "NanoTrasen Carnoth Red" @@ -460,7 +460,7 @@ /obj/item/reagent_containers/food/drinks/bottle/carnoth/Initialize() . = ..() - reagents.add_reagent("carnoth", 100) + reagents.add_reagent(REAGENT_ID_CARNOTH, 100) /obj/item/reagent_containers/food/drinks/bottle/pwine name = "Warlock's Velvet" @@ -470,7 +470,7 @@ /obj/item/reagent_containers/food/drinks/bottle/pwine/Initialize() . = ..() - reagents.add_reagent("pwine", 100) + reagents.add_reagent(REAGENT_ID_PWINE, 100) /obj/item/reagent_containers/food/drinks/bottle/champagne name = "Gilthari Luxury Champagne" @@ -480,7 +480,7 @@ /obj/item/reagent_containers/food/drinks/bottle/champagne/Initialize() . = ..() - reagents.add_reagent("champagne", 100) + reagents.add_reagent(REAGENT_ID_CHAMPAGNE, 100) /obj/item/reagent_containers/food/drinks/bottle/sake name = "Mono-No-Aware Luxury Sake" @@ -490,7 +490,7 @@ /obj/item/reagent_containers/food/drinks/bottle/sake/Initialize() . = ..() - reagents.add_reagent("sake", 100) + reagents.add_reagent(REAGENT_ID_SAKE, 100) //////////////////////////JUICES AND STUFF/////////////////////// @@ -665,7 +665,7 @@ /obj/item/reagent_containers/food/drinks/bottle/small/beer/Initialize() . = ..() - reagents.add_reagent("beer", 50) + reagents.add_reagent(REAGENT_ID_BEER, 50) /obj/item/reagent_containers/food/drinks/bottle/small/beer/silverdragon name = "Silver Dragon pilsner" @@ -687,7 +687,7 @@ /obj/item/reagent_containers/food/drinks/bottle/small/litebeer/Initialize() . = ..() - reagents.add_reagent("litebeer", 50) + reagents.add_reagent(REAGENT_ID_LITEBEER, 50) /obj/item/reagent_containers/food/drinks/bottle/small/cider name = "Crisp's Cider" @@ -697,7 +697,7 @@ /obj/item/reagent_containers/food/drinks/bottle/small/cider/Initialize() . = ..() - reagents.add_reagent("cider", 50) + reagents.add_reagent(REAGENT_ID_CIDER, 50) /obj/item/reagent_containers/food/drinks/bottle/small/ale name = "\improper Magm-Ale" @@ -708,7 +708,7 @@ /obj/item/reagent_containers/food/drinks/bottle/small/ale/Initialize() . = ..() - reagents.add_reagent("ale", 50) + reagents.add_reagent(REAGENT_ID_ALE, 50) /obj/item/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper name = "Hushed Whisper IPA" @@ -718,7 +718,7 @@ /obj/item/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper/Initialize() . = ..() - reagents.add_reagent("ale", 50) + reagents.add_reagent(REAGENT_ID_ALE, 50) //////////////////////////SMALL BOTTLED SODA/////////////////////// diff --git a/code/modules/food/food/superfoods.dm b/code/modules/food/food/superfoods.dm index 42a789a30b..696a13581a 100644 --- a/code/modules/food/food/superfoods.dm +++ b/code/modules/food/food/superfoods.dm @@ -23,7 +23,7 @@ result = /obj/item/chaoscake_layer /datum/recipe/chaoscake_layerthree - reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, "deathbell" = 10) + reagents = list(REAGENT_ID_FLOUR = 25, REAGENT_ID_MILK = 15, REAGENT_ID_SUGAR = 10, REAGENT_ID_EGG = 6, REAGENT_ID_DEATHBELL = 10) fruit = list("grapes" = 3) 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(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, "devilskiss" = 20) + reagents = list(REAGENT_ID_FLOUR = 15, REAGENT_ID_MILK = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3, REAGENT_ID_DEVILSKISS = 20) fruit = list("potato" = 1) items = list( /obj/item/reagent_containers/food/snacks/dough, diff --git a/code/modules/food/kitchen/icecream.dm b/code/modules/food/kitchen/icecream.dm index d38bbdc653..e764fff2ec 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(REAGENT_ID_MILK, "ice", REAGENT_ID_COCO) + return list(REAGENT_ID_MILK, REAGENT_ID_ICE, REAGENT_ID_COCO) if(ICECREAM_STRAWBERRY) - return list(REAGENT_ID_MILK, "ice", REAGENT_ID_BERRYJUICE) + return list(REAGENT_ID_MILK, REAGENT_ID_ICE, REAGENT_ID_BERRYJUICE) if(ICECREAM_BLUE) - return list(REAGENT_ID_MILK, "ice", "singulo") + return list(REAGENT_ID_MILK, REAGENT_ID_ICE, REAGENT_ID_SINGULO) if(CONE_WAFFLE) return list(REAGENT_ID_FLOUR, REAGENT_ID_SUGAR) if(CONE_CHOC) return list(REAGENT_ID_FLOUR, REAGENT_ID_SUGAR, REAGENT_ID_COCO) else - return list(REAGENT_ID_MILK, "ice") + return list(REAGENT_ID_MILK, REAGENT_ID_ICE) /obj/machinery/icecream_vat/proc/get_flavour_name(var/flavour_type) switch(flavour_type) @@ -59,7 +59,7 @@ 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) + reagents.add_reagent(REAGENT_ID_ICE, 5) /obj/machinery/icecream_vat/attack_hand(mob/user as mob) user.set_machine(src) diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index afcae6ebe3..635745047d 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -170,11 +170,11 @@ I said no! result = /obj/item/reagent_containers/food/snacks/meatsteak /datum/recipe/spacylibertyduff - reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, REAGENT_ID_PSILOCYBIN = 5) + reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_VODKA = 5, REAGENT_ID_PSILOCYBIN = 5) result = /obj/item/reagent_containers/food/snacks/spacylibertyduff /datum/recipe/amanitajelly - reagents = list(REAGENT_ID_WATER = 5, "vodka" = 5, REAGENT_ID_AMATOXIN = 5) + reagents = list(REAGENT_ID_WATER = 5, REAGENT_ID_VODKA = 5, REAGENT_ID_AMATOXIN = 5) result = /obj/item/reagent_containers/food/snacks/amanitajelly /datum/recipe/amanitajelly/make_food(var/obj/container as obj) @@ -352,7 +352,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/caramelapple /datum/recipe/twobread - reagents = list("redwine" = 5) + reagents = list(REAGENT_ID_REDWINE = 5) items = list( /obj/item/reagent_containers/food/snacks/slice/bread, /obj/item/reagent_containers/food/snacks/slice/bread, @@ -502,7 +502,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/mashedpotato /datum/recipe/icecreamsandwich - reagents = list(REAGENT_ID_MILK = 5, "ice" = 5) + reagents = list(REAGENT_ID_MILK = 5, REAGENT_ID_ICE = 5) items = list( /obj/item/reagent_containers/food/snacks/icecream ) @@ -833,7 +833,7 @@ I said no! result = /obj/item/reagent_containers/food/snacks/chilicheesefries /datum/recipe/risotto - reagents = list("redwine" = 5, REAGENT_ID_RICE = 10, REAGENT_ID_SPACESPICE = 1) + reagents = list(REAGENT_ID_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 diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 321a32386a..11f55f8f83 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -467,7 +467,7 @@ REAGENT_ID_MACROCILLIN, REAGENT_ID_MICROCILLIN, REAGENT_ID_NORMALCILLIN, - "magicdust" + REAGENT_ID_MAGICDUST ) // VOREStation Edit End: Modified exclusion list diff --git a/code/modules/hydroponics/seedtypes/gnomes.dm b/code/modules/hydroponics/seedtypes/gnomes.dm index 2ee0901926..0b6170f72e 100644 --- a/code/modules/hydroponics/seedtypes/gnomes.dm +++ b/code/modules/hydroponics/seedtypes/gnomes.dm @@ -4,7 +4,7 @@ seed_name = "gnomes" display_name = "gnomes" force_layer = 3 - chems = list("magicdust" = list(5,20)) + chems = list(REAGENT_ID_MAGICDUST = list(5,20)) /datum/seed/gnomes/New() ..() diff --git a/code/modules/hydroponics/seedtypes/telriis.dm b/code/modules/hydroponics/seedtypes/telriis.dm index 49b573453a..127f496f26 100644 --- a/code/modules/hydroponics/seedtypes/telriis.dm +++ b/code/modules/hydroponics/seedtypes/telriis.dm @@ -3,7 +3,7 @@ seed_name = "telriis" display_name = "telriis grass" kitchen_tag = "telriis" - chems = list("pwine" = list(1,5), REAGENT_ID_NUTRIMENT = list(1,6)) + chems = list(REAGENT_ID_PWINE = list(1,5), REAGENT_ID_NUTRIMENT = list(1,6)) /datum/seed/telriis/New() ..() diff --git a/code/modules/hydroponics/seedtypes/tomatoes.dm b/code/modules/hydroponics/seedtypes/tomatoes.dm index ce45ff774c..26a712677c 100644 --- a/code/modules/hydroponics/seedtypes/tomatoes.dm +++ b/code/modules/hydroponics/seedtypes/tomatoes.dm @@ -65,7 +65,7 @@ seed_name = "bluespace tomato" display_name = "bluespace tomato plant" mutants = null - chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "singulo" = list(10,5)) + chems = list(REAGENT_ID_NUTRIMENT = list(1,20), REAGENT_ID_SINGULO = list(10,5)) /datum/seed/tomato/blue/teleport/New() ..() diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index f0defd9f45..c2da430b5f 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -67,7 +67,7 @@ ) var/static/list/nutrient_reagents = list( REAGENT_ID_MILK = 0.1, - "beer" = 0.25, + REAGENT_ID_BEER = 0.25, REAGENT_ID_PHOSPHORUS = 0.1, REAGENT_ID_SUGAR = 0.1, REAGENT_ID_SODAWATER = 0.1, @@ -98,7 +98,7 @@ REAGENT_ID_WATER = 1, REAGENT_ID_ADMINORDRAZINE = 1, REAGENT_ID_MILK = 0.9, - "beer" = 0.7, + REAGENT_ID_BEER = 0.7, REAGENT_ID_FLUORINE = -0.5, REAGENT_ID_CHLORINE = -0.5, REAGENT_ID_PHOSPHORUS = -0.5, @@ -108,7 +108,7 @@ // Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order). var/static/list/beneficial_reagents = list( - "beer" = list( -0.05, 0, 0 ), + REAGENT_ID_BEER = list( -0.05, 0, 0 ), REAGENT_ID_FLUORINE = list( -2, 0, 0 ), REAGENT_ID_CHLORINE = list( -1, 0, 0 ), REAGENT_ID_PHOSPHORUS = list( -0.75, 0, 0 ), diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index 798c8eea57..a31d6ba190 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -19,8 +19,8 @@ new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10), new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100), new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300), - new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125), - new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125), + new /datum/data/mining_equipment(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125), + new /datum/data/mining_equipment(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125), new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150), new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200), new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 900), @@ -153,7 +153,7 @@ EQUIPMENT("Hardsuit - Proto-Kinetic Gauntlets", /obj/item/rig_module/gauntlets, 2000), ) prize_list["Miscellaneous"] = list( - EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125), + EQUIPMENT(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125), EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150), EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500), EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000), @@ -165,7 +165,7 @@ EQUIPMENT("Thalers - 100", /obj/item/spacecash/c100, 1000), EQUIPMENT("Thalers - 1000", /obj/item/spacecash/c1000, 10000), EQUIPMENT("Umbrella", /obj/item/melee/umbrella/random, 200), - EQUIPMENT("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125), + EQUIPMENT(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125), EQUIPMENT("Mining PSG Upgrade Disk", /obj/item/borg/upgrade/shield_upgrade, 2500), ) prize_list["Extra"] = list() // Used in child vendors diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 8dc21454b4..54f708f7a3 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -12,8 +12,8 @@ new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 1), new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 10), new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 30), - new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 120), - new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 120), + new /datum/data/mining_equipment(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 120), + new /datum/data/mining_equipment(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 120), new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15), new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 20), new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 90), @@ -96,8 +96,8 @@ EQUIPMENT("Survey Tools - Binoculars", /obj/item/binoculars,40), ) prize_list["Miscellaneous"] = list( - EQUIPMENT("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 10), - EQUIPMENT("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 10), + EQUIPMENT(REAGENT_ABSINTHE, /obj/item/reagent_containers/food/drinks/bottle/absinthe, 10), + EQUIPMENT(REAGENT_WHISKEY, /obj/item/reagent_containers/food/drinks/bottle/whiskey, 10), EQUIPMENT("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 15), EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 50), EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 100), diff --git a/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/code/modules/mob/living/silicon/robot/sprites/civilian.dm index 0f3f6ed639..2c4923e00d 100644 --- a/code/modules/mob/living/silicon/robot/sprites/civilian.dm +++ b/code/modules/mob/living/silicon/robot/sprites/civilian.dm @@ -206,12 +206,12 @@ rest_sprite_options = list("Default") has_extra_customization = TRUE - var/list/booze_options = list("Beer" = "booze", + var/list/booze_options = list(REAGENT_BEER = "booze", "Space Mountain Wind" = "boozegreen", "Curacao" = "boozeblue", REAGENT_GRAPESODA = "boozepurple", "Demon's Blood" = "boozered", - "Whiskey Soda" = "boozeorange", + REAGENT_WHISKEYSODA = "boozeorange", REAGENT_COFFEE = "boozebrown") /datum/robot_sprite/dogborg/service/booze/handle_extra_icon_updates(var/mob/living/silicon/robot/ourborg) diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm index 30072ff930..d2cbfa6d9a 100644 --- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm @@ -56,39 +56,39 @@ // Bar, alcoholic /obj/item/reagent_containers/chem_disp_cartridge/beer - spawn_reagent = "beer" + spawn_reagent = REAGENT_ID_BEER /obj/item/reagent_containers/chem_disp_cartridge/kahlua - spawn_reagent = "kahlua" + spawn_reagent = REAGENT_ID_KAHLUA /obj/item/reagent_containers/chem_disp_cartridge/whiskey - spawn_reagent = "whiskey" + spawn_reagent = REAGENT_ID_WHISKEY /obj/item/reagent_containers/chem_disp_cartridge/redwine - spawn_reagent = "redwine" + spawn_reagent = REAGENT_ID_REDWINE /obj/item/reagent_containers/chem_disp_cartridge/whitewine - spawn_reagent = "whitewine" + spawn_reagent = REAGENT_ID_WHITEWINE /obj/item/reagent_containers/chem_disp_cartridge/vodka - spawn_reagent = "vodka" + spawn_reagent = REAGENT_ID_VODKA /obj/item/reagent_containers/chem_disp_cartridge/gin - spawn_reagent = "gin" + spawn_reagent = REAGENT_ID_GIN /obj/item/reagent_containers/chem_disp_cartridge/rum - spawn_reagent = "rum" + spawn_reagent = REAGENT_ID_RUM /obj/item/reagent_containers/chem_disp_cartridge/tequila - spawn_reagent = "tequilla" + spawn_reagent = REAGENT_ID_TEQUILLA /obj/item/reagent_containers/chem_disp_cartridge/vermouth - spawn_reagent = "vermouth" + spawn_reagent = REAGENT_ID_VERMOUTH /obj/item/reagent_containers/chem_disp_cartridge/cognac - spawn_reagent = "cognac" + spawn_reagent = REAGENT_ID_COGNAC /obj/item/reagent_containers/chem_disp_cartridge/ale - spawn_reagent = "ale" + spawn_reagent = REAGENT_ID_ALE /obj/item/reagent_containers/chem_disp_cartridge/mead - spawn_reagent = "mead" + spawn_reagent = REAGENT_ID_MEAD /obj/item/reagent_containers/chem_disp_cartridge/bitters - spawn_reagent = "bitters" + spawn_reagent = REAGENT_ID_BITTERS /obj/item/reagent_containers/chem_disp_cartridge/cider - spawn_reagent = "cider" + spawn_reagent = REAGENT_ID_CIDER // Bar, soft /obj/item/reagent_containers/chem_disp_cartridge/ice - spawn_reagent = "ice" + spawn_reagent = REAGENT_ID_ICE /obj/item/reagent_containers/chem_disp_cartridge/tea spawn_reagent = REAGENT_ID_TEA /obj/item/reagent_containers/chem_disp_cartridge/icetea @@ -152,45 +152,45 @@ // syrups /obj/item/reagent_containers/chem_disp_cartridge/syrup_pumpkin - spawn_reagent = "syrup_pumpkin" + spawn_reagent = REAGENT_ID_SYRUPPUMPKIN /obj/item/reagent_containers/chem_disp_cartridge/syrup_caramel - spawn_reagent = "syrup_caramel" + spawn_reagent = REAGENT_ID_SYRUPCARAMEL /obj/item/reagent_containers/chem_disp_cartridge/syrup_scaramel - spawn_reagent = "syrup_salted_caramel" + spawn_reagent = REAGENT_ID_SYRUPSALTEDCARAMEL /obj/item/reagent_containers/chem_disp_cartridge/syrup_irish - spawn_reagent = "syrup_irish" + spawn_reagent = REAGENT_ID_SYRUPIRISH /obj/item/reagent_containers/chem_disp_cartridge/syrup_almond - spawn_reagent = "syrup_almond" + spawn_reagent = REAGENT_ID_SYRUPALMOND /obj/item/reagent_containers/chem_disp_cartridge/syrup_cinnamon - spawn_reagent = "syrup_cinnamon" + spawn_reagent = REAGENT_ID_SYRUPCINNAMON /obj/item/reagent_containers/chem_disp_cartridge/syrup_pistachio - spawn_reagent = "syrup_pistachio" + spawn_reagent = REAGENT_ID_SYRUPPISTACHIO /obj/item/reagent_containers/chem_disp_cartridge/syrup_vanilla - spawn_reagent = "syrup_vanilla" + spawn_reagent = REAGENT_ID_SYRUPVANILLA /obj/item/reagent_containers/chem_disp_cartridge/syrup_toffee - spawn_reagent = "syrup_toffee" + spawn_reagent = REAGENT_ID_SYRUPTOFFEE /obj/item/reagent_containers/chem_disp_cartridge/syrup_cherry - spawn_reagent = "syrup_cherry" + spawn_reagent = REAGENT_ID_SYRUPCHERRY /obj/item/reagent_containers/chem_disp_cartridge/grenadine spawn_reagent = REAGENT_ID_GRENADINE /obj/item/reagent_containers/chem_disp_cartridge/syrup_butterscotch - spawn_reagent = "syrup_butterscotch" + spawn_reagent = REAGENT_ID_SYRUPBUTTERSCOTCH /obj/item/reagent_containers/chem_disp_cartridge/syrup_chocolate - spawn_reagent = "syrup_chocolate" + spawn_reagent = REAGENT_ID_SYRUPCHOCOLATE /obj/item/reagent_containers/chem_disp_cartridge/syrup_wchocolate - spawn_reagent = "syrup_white_chocolate" + spawn_reagent = REAGENT_ID_SYRUPWHITECHOCOLATE /obj/item/reagent_containers/chem_disp_cartridge/syrup_strawberry - spawn_reagent = "syrup_strawberry" + spawn_reagent = REAGENT_ID_SYRUPSTRAWBERRY /obj/item/reagent_containers/chem_disp_cartridge/syrup_coconut - spawn_reagent = "syrup_coconut" + spawn_reagent = REAGENT_ID_SYRUPCOCONUT /obj/item/reagent_containers/chem_disp_cartridge/syrup_ginger - spawn_reagent = "syrup_ginger" + spawn_reagent = REAGENT_ID_SYRUPGINGER /obj/item/reagent_containers/chem_disp_cartridge/syrup_gingerbread - spawn_reagent = "syrup_gingerbread" + spawn_reagent = REAGENT_ID_SYRUPGINGERBREAD /obj/item/reagent_containers/chem_disp_cartridge/syrup_peppermint - spawn_reagent = "syrup_peppermint" + spawn_reagent = REAGENT_ID_SYRUPPEPPERMINT /obj/item/reagent_containers/chem_disp_cartridge/syrup_birthday - spawn_reagent = "syrup_birthday" + spawn_reagent = REAGENT_ID_SYRUPBIRTHDAY // ERT /obj/item/reagent_containers/chem_disp_cartridge/inaprov diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm index 675d8e3243..21a164d4eb 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", 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 + REAGENT_ID_WATER, REAGENT_ID_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,REAGENT_ID_THIRTEENLOKO, REAGENT_ID_GRAPESODA, REAGENT_ID_PINEAPPLEJUICE ) /obj/machinery/chemical_dispenser/bar_alc dispense_reagents = list( - 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" + REAGENT_ID_LEMONLIME, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE, REAGENT_ID_LIMEJUICE, REAGENT_ID_SODAWATER, REAGENT_ID_TONIC, REAGENT_ID_BEER, REAGENT_ID_KAHLUA, + REAGENT_ID_WHISKEY, REAGENT_ID_REDWINE, REAGENT_ID_WHITEWINE, REAGENT_ID_VODKA, REAGENT_ID_CIDER, REAGENT_ID_GIN, REAGENT_ID_RUM, REAGENT_ID_TEQUILLA, REAGENT_ID_VERMOUTH, REAGENT_ID_COGNAC, REAGENT_ID_ALE, REAGENT_ID_MEAD, REAGENT_ID_BITTERS ) /obj/machinery/chemical_dispenser/bar_coffee dispense_reagents = list( - 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_COFFEE, REAGENT_ID_CAFELATTE, REAGENT_ID_SOYLATTE, REAGENT_ID_HOTCOCO, REAGENT_ID_MILK, REAGENT_ID_CREAM, REAGENT_ID_TEA, REAGENT_ID_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", REAGENT_ID_GRENADINE, "syrup_cherry", "syrup_butterscotch", "syrup_chocolate", "syrup_white_chocolate", "syrup_strawberry", - "syrup_coconut", "syrup_ginger", "syrup_gingerbread", "syrup_peppermint", "syrup_birthday" + REAGENT_ID_SYRUPPUMPKIN, REAGENT_ID_SYRUPCARAMEL, REAGENT_ID_SYRUPSALTEDCARAMEL, REAGENT_ID_SYRUPIRISH, REAGENT_ID_SYRUPALMOND, REAGENT_ID_SYRUPCINNAMON, REAGENT_ID_SYRUPPISTACHIO, + REAGENT_ID_SYRUPVANILLA, REAGENT_ID_SYRUPTOFFEE, REAGENT_ID_GRENADINE, REAGENT_ID_SYRUPCHERRY, REAGENT_ID_SYRUPBUTTERSCOTCH, REAGENT_ID_SYRUPCHOCOLATE, REAGENT_ID_SYRUPWHITECHOCOLATE, REAGENT_ID_SYRUPSTRAWBERRY, + REAGENT_ID_SYRUPCOCONUT, REAGENT_ID_SYRUPGINGER, REAGENT_ID_SYRUPGINGERBREAD, REAGENT_ID_SYRUPPEPPERMINT, REAGENT_ID_SYRUPBIRTHDAY ) diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index 27ceeee2d0..a729f57922 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -495,7 +495,7 @@ /obj/structure/reagent_dispensers/beerkeg/Initialize() . = ..() - reagents.add_reagent("beer",1000) + reagents.add_reagent(REAGENT_ID_BEER,1000) /obj/structure/reagent_dispensers/beerkeg/wood name = "beer keg" @@ -509,7 +509,7 @@ /obj/structure/reagent_dispensers/beerkeg/wine/Initialize() . = ..() - reagents.add_reagent("redwine",1000) + reagents.add_reagent(REAGENT_ID_REDWINE,1000) /obj/structure/reagent_dispensers/beerkeg/fakenuke name = "nuclear beer keg" diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm index b9dc010aec..d47e053486 100644 --- a/code/modules/reagents/machinery/pump.dm +++ b/code/modules/reagents/machinery/pump.dm @@ -194,7 +194,7 @@ var/datum/gas_mixture/air = return_air() // v if(air.temperature <= T0C) // Uses the current air temp, instead of the turf starting temp - R.add_reagent("ice", round(volume / 2, 0.1)) + R.add_reagent(REAGENT_ID_ICE, round(volume / 2, 0.1)) for(var/turf/simulated/mineral/M in orange(5,src)) // Uses the turf as center instead of an unset usr if(M.mineral && prob(40)) // v diff --git a/code/modules/reagents/reactions/distilling/distilling.dm b/code/modules/reagents/reactions/distilling/distilling.dm index ef5f5e46dc..69525eb940 100644 --- a/code/modules/reagents/reactions/distilling/distilling.dm +++ b/code/modules/reagents/reactions/distilling/distilling.dm @@ -130,7 +130,7 @@ /decl/chemical_reaction/distilling/beer name = "Distilling Beer" id = "distill_beer" - result = "beer" + result = REAGENT_ID_BEER required_reagents = list(REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_WATER = 1, REAGENT_ID_SUGAR = 1) result_amount = 2 @@ -141,8 +141,8 @@ /decl/chemical_reaction/distilling/ale name = "Distilling Ale" id = "distill_ale" - result = "ale" - required_reagents = list(REAGENT_ID_NUTRIMENT = 1, "beer" = 1) + result = REAGENT_ID_ALE + required_reagents = list(REAGENT_ID_NUTRIMENT = 1, REAGENT_ID_BEER = 1) inhibitors = list(REAGENT_ID_WATER = 1) result_amount = 2 diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm index 174431ef25..9621712283 100644 --- a/code/modules/reagents/reactions/instant/drinks.dm +++ b/code/modules/reagents/reactions/instant/drinks.dm @@ -48,45 +48,45 @@ result_amount = 3 /decl/chemical_reaction/instant/drinks/goldschlager - name = "Goldschlager" - id = "goldschlager" - result = "goldschlager" - required_reagents = list("vodka" = 10, REAGENT_ID_GOLD = 1) + name = REAGENT_GOLDSCHLAGER + id = REAGENT_ID_GOLDSCHLAGER + result = REAGENT_ID_GOLDSCHLAGER + required_reagents = list(REAGENT_ID_VODKA = 10, REAGENT_ID_GOLD = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/patron - name = "Patron" - id = "patron" - result = "patron" - required_reagents = list("tequilla" = 10, REAGENT_ID_SILVER = 1) + name = REAGENT_PATRON + id = REAGENT_ID_PATRON + result = REAGENT_ID_PATRON + required_reagents = list(REAGENT_ID_TEQUILLA = 10, REAGENT_ID_SILVER = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/bilk - name = "Bilk" - id = "bilk" - result = "bilk" - required_reagents = list(REAGENT_ID_MILK = 1, "beer" = 1) + name = REAGENT_BILK + id = REAGENT_ID_BILK + result = REAGENT_ID_BILK + required_reagents = list(REAGENT_ID_MILK = 1, REAGENT_ID_BEER = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/icetea name = REAGENT_ICETEA id = REAGENT_ID_ICETEA result = REAGENT_ID_ICETEA - required_reagents = list("ice" = 1, REAGENT_ID_TEA = 2) + required_reagents = list(REAGENT_ID_ICE = 1, REAGENT_ID_TEA = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/icecoffee name = REAGENT_ICECOFFEE id = REAGENT_ID_ICECOFFEE result = REAGENT_ID_ICECOFFEE - required_reagents = list("ice" = 1, REAGENT_ID_COFFEE = 2) + required_reagents = list(REAGENT_ID_ICE = 1, REAGENT_ID_COFFEE = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/icecoffee/alt name = "Iced Drip Coffee" id = REAGENT_ID_ICECOFFEE result = REAGENT_ID_ICECOFFEE - required_reagents = list("ice" = 1, REAGENT_ID_DRIPCOFFEE = 2) + required_reagents = list(REAGENT_ID_ICE = 1, REAGENT_ID_DRIPCOFFEE = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/blackeye @@ -174,9 +174,9 @@ result_amount = 5 /decl/chemical_reaction/instant/drinks/moonshine - name = "Moonshine" - id = "moonshine" - result = "moonshine" + name = REAGENT_MOONSHINE + id = REAGENT_ID_MOONSHINE + result = REAGENT_ID_MOONSHINE required_reagents = list(REAGENT_ID_NUTRIMENT = 10) catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 @@ -191,32 +191,32 @@ /decl/chemical_reaction/instant/drinks/wine name = "Wine" - id = "redwine" - result = "redwine" + id = REAGENT_ID_REDWINE + result = REAGENT_ID_REDWINE 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" + name = REAGENT_PWINE + id = REAGENT_ID_PWINE + result = REAGENT_ID_PWINE 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" + name = REAGENT_MELONLIQUOR + id = REAGENT_ID_MELONLIQUOR + result = REAGENT_ID_MELONLIQUOR 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" + name = REAGENT_BLUECURACAO + id = REAGENT_ID_BLUECURACAO + result = REAGENT_ID_BLUECURACAO required_reagents = list(REAGENT_ID_ORANGEJUICE = 10) catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 @@ -224,141 +224,141 @@ /decl/chemical_reaction/instant/drinks/spacebeer name = "Space Beer" id = "spacebeer" - result = "beer" + result = REAGENT_ID_BEER 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" + name = REAGENT_VODKA + id = REAGENT_ID_VODKA + result = REAGENT_ID_VODKA 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" + name = REAGENT_CIDER + id = REAGENT_ID_CIDER + result = REAGENT_ID_CIDER required_reagents = list(REAGENT_ID_APPLEJUICE = 10) catalysts = list(REAGENT_ID_ENZYME = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/sake - name = "Sake" - id = "sake" - result = "sake" + name = REAGENT_SAKE + id = REAGENT_ID_SAKE + result = REAGENT_ID_SAKE 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" + name = REAGENT_KAHLUA + id = REAGENT_ID_KAHLUA + result = REAGENT_ID_KAHLUA 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, REAGENT_ID_TONIC = 1) + name = REAGENT_GINTONIC + id = REAGENT_ID_GINTONIC + result = REAGENT_ID_GINTONIC + required_reagents = list(REAGENT_ID_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, REAGENT_ID_COLA = 1) + name = REAGENT_RUMANDCOLA + id = REAGENT_ID_RUMANDCOLA + result = REAGENT_ID_RUMANDCOLA + required_reagents = list(REAGENT_ID_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, REAGENT_ID_LIMEJUICE = 1) + name = REAGENT_CUBALIBRE + id = REAGENT_ID_CUBALIBRE + result = REAGENT_ID_CUBALIBRE + required_reagents = list(REAGENT_ID_RUMANDCOLA = 3, REAGENT_ID_LIMEJUICE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/martini - name = "Classic Martini" - id = "martini" - result = "martini" - inhibitors = list("bitters" = 1) - required_reagents = list("gin" = 2, "vermouth" = 1) + name = REAGENT_MARTINI + id = REAGENT_ID_MARTINI + result = REAGENT_ID_MARTINI + inhibitors = list(REAGENT_ID_BITTERS = 1) + required_reagents = list(REAGENT_ID_GIN = 2, REAGENT_ID_VERMOUTH = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/vodkamartini - name = "Vodka Martini" - id = "vodkamartini" - result = "vodkamartini" - required_reagents = list("vodka" = 2, "vermouth" = 1) + name = REAGENT_VODKAMARTINI + id = REAGENT_ID_VODKAMARTINI + result = REAGENT_ID_VODKAMARTINI + required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_VERMOUTH = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/white_russian - name = "White Russian" - id = "whiterussian" - result = "whiterussian" - required_reagents = list("blackrussian" = 2, REAGENT_ID_CREAM = 1) + name = REAGENT_WHITERUSSIAN + id = REAGENT_ID_WHITERUSSIAN + result = REAGENT_ID_WHITERUSSIAN + required_reagents = list(REAGENT_ID_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, REAGENT_ID_COLA = 1) + name = REAGENT_WHISKEYCOLA + id = REAGENT_ID_WHISKEYCOLA + result = REAGENT_ID_WHISKEYCOLA + required_reagents = list(REAGENT_ID_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, REAGENT_ID_ORANGEJUICE = 1) + name = REAGENT_SCREWDRIVERCOCKTAIL + id = REAGENT_ID_SCREWDRIVERCOCKTAIL + result = REAGENT_ID_SCREWDRIVERCOCKTAIL + required_reagents = list(REAGENT_ID_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, REAGENT_ID_TOMATOJUICE = 3, REAGENT_ID_LIMEJUICE = 1) + name = REAGENT_BLOODYMARY + id = REAGENT_ID_BLOODYMARY + result = REAGENT_ID_BLOODYMARY + required_reagents = list(REAGENT_ID_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, REAGENT_ID_LIMEJUICE = 1) + name = REAGENT_GARGLEBLASTER + id = REAGENT_ID_GARGLEBLASTER + result = REAGENT_ID_GARGLEBLASTER + required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_GIN = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_COGNAC = 1, REAGENT_ID_LIMEJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/brave_bull - name = "Brave Bull" - id = "bravebull" - result = "bravebull" - required_reagents = list("tequilla" = 2, "kahlua" = 1) + name = REAGENT_BRAVEBULL + id = REAGENT_ID_BRAVEBULL + result = REAGENT_ID_BRAVEBULL + required_reagents = list(REAGENT_ID_TEQUILLA = 2, REAGENT_ID_KAHLUA = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/tequilla_sunrise name = "Tequilla Sunrise" - id = "tequillasunrise" - result = "tequillasunrise" - required_reagents = list("tequilla" = 2, REAGENT_ID_ORANGEJUICE = 1) + id = REAGENT_ID_TEQUILLASUNRISE + result = REAGENT_ID_TEQUILLASUNRISE + required_reagents = list(REAGENT_ID_TEQUILLA = 2, REAGENT_ID_ORANGEJUICE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/phoron_special - name = "Toxins Special" - id = "phoronspecial" - result = "phoronspecial" - required_reagents = list("rum" = 2, "vermouth" = 2, REAGENT_ID_PHORON = 2) + name = REAGENT_PHORONSPECIAL + id = REAGENT_ID_PHORONSPECIAL + result = REAGENT_ID_PHORONSPECIAL + required_reagents = list(REAGENT_ID_RUM = 2, REAGENT_ID_VERMOUTH = 2, REAGENT_ID_PHORON = 2) result_amount = 6 /decl/chemical_reaction/instant/drinks/beepsky_smash name = "Beepksy Smash" id = "beepksysmash" - result = "beepskysmash" - required_reagents = list(REAGENT_ID_LIMEJUICE = 1, "whiskey" = 1, REAGENT_ID_IRON = 1) + result = REAGENT_ID_BEEPSKYSMASH + required_reagents = list(REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_IRON = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/doctor_delight @@ -369,157 +369,157 @@ result_amount = 6 /decl/chemical_reaction/instant/drinks/irish_cream - name = "Irish Cream" - id = "irishcream" - result = "irishcream" - required_reagents = list("whiskey" = 2, REAGENT_ID_CREAM = 1) + name = REAGENT_IRISHCREAM + id = REAGENT_ID_IRISHCREAM + result = REAGENT_ID_IRISHCREAM + required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_CREAM = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/manly_dorf - name = "The Manly Dorf" - id = "manlydorf" - result = "manlydorf" - required_reagents = list ("beer" = 1, "ale" = 2) + name = REAGENT_MANLYDORF + id = REAGENT_ID_MANLYDORF + result = REAGENT_ID_MANLYDORF + required_reagents = list (REAGENT_ID_BEER = 1, REAGENT_ID_ALE = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/hooch - name = "Hooch" - id = "hooch" - result = "hooch" + name = REAGENT_HOOCH + id = REAGENT_ID_HOOCH + result = REAGENT_ID_HOOCH required_reagents = list (REAGENT_ID_SUGAR = 1, REAGENT_ID_ETHANOL = 2, REAGENT_ID_FUEL = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/irish_coffee - name = "Irish Coffee" - id = "irishcoffee" - result = "irishcoffee" - required_reagents = list("irishcream" = 1, REAGENT_ID_COFFEE = 1) + name = REAGENT_IRISHCOFFEE + id = REAGENT_ID_IRISHCOFFEE + result = REAGENT_ID_IRISHCOFFEE + required_reagents = list(REAGENT_ID_IRISHCREAM = 1, REAGENT_ID_COFFEE = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/b52 - name = "B-52" - id = "b52" - result = "b52" - required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1) + name = REAGENT_B52 + id = REAGENT_ID_B52 + result = REAGENT_ID_B52 + required_reagents = list(REAGENT_ID_IRISHCREAM = 1, REAGENT_ID_KAHLUA = 1, REAGENT_ID_COGNAC = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/atomicbomb - name = "Atomic Bomb" - id = "atomicbomb" - result = "atomicbomb" - required_reagents = list("b52" = 10, REAGENT_ID_URANIUM = 1) + name = REAGENT_ATOMICBOMB + id = REAGENT_ID_ATOMICBOMB + result = REAGENT_ID_ATOMICBOMB + required_reagents = list(REAGENT_ID_B52 = 10, REAGENT_ID_URANIUM = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/margarita - name = "Margarita" - id = "margarita" - result = "margarita" - required_reagents = list("tequilla" = 2, REAGENT_ID_LIMEJUICE = 1) + name = REAGENT_MARGARITA + id = REAGENT_ID_MARGARITA + result = REAGENT_ID_MARGARITA + required_reagents = list(REAGENT_ID_TEQUILLA = 2, REAGENT_ID_LIMEJUICE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/longislandicedtea - name = "Long Island Iced Tea" - id = "longislandicedtea" - result = "longislandicedtea" - required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "rumandcola" = 3) + name = REAGENT_LONGISLANDICEDTEA + id = REAGENT_ID_LONGISLANDICEDTEA + result = REAGENT_ID_LONGISLANDICEDTEA + required_reagents = list(REAGENT_ID_VODKA = 1, REAGENT_ID_GIN = 1, REAGENT_ID_TEQUILLA = 1, REAGENT_ID_RUMANDCOLA = 3) result_amount = 6 /decl/chemical_reaction/instant/drinks/threemileisland - name = "Three Mile Island Iced Tea" - id = "threemileisland" - result = "threemileisland" - required_reagents = list("longislandicedtea" = 10, REAGENT_ID_URANIUM = 1) + name = REAGENT_THREEMILEISLAND + id = REAGENT_ID_THREEMILEISLAND + result = REAGENT_ID_THREEMILEISLAND + required_reagents = list(REAGENT_ID_LONGISLANDICEDTEA = 10, REAGENT_ID_URANIUM = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/whiskeysoda - name = "Whiskey Soda" - id = "whiskeysoda" - result = "whiskeysoda" - required_reagents = list("whiskey" = 2, REAGENT_ID_SODAWATER = 1) + name = REAGENT_WHISKEYSODA + id = REAGENT_ID_WHISKEYSODA + result = REAGENT_ID_WHISKEYSODA + required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_SODAWATER = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/black_russian - name = "Black Russian" - id = "blackrussian" - result = "blackrussian" - required_reagents = list("vodka" = 2, "kahlua" = 1) + name = REAGENT_BLACKRUSSIAN + id = REAGENT_ID_BLACKRUSSIAN + result = REAGENT_ID_BLACKRUSSIAN + required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_KAHLUA = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/manhattan - name = "Manhattan" - id = "manhattan" - result = "manhattan" - required_reagents = list("whiskey" = 2, "vermouth" = 1) + name = REAGENT_MANHATTAN + id = REAGENT_ID_MANHATTAN + result = REAGENT_ID_MANHATTAN + required_reagents = list(REAGENT_ID_WHISKEY = 2, REAGENT_ID_VERMOUTH = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/manhattan_proj - name = "Manhattan Project" - id = "manhattan_proj" - result = "manhattan_proj" - required_reagents = list("manhattan" = 10, REAGENT_ID_URANIUM = 1) + name = REAGENT_MANHATTANPROJ + id = REAGENT_ID_MANHATTANPROJ + result = REAGENT_ID_MANHATTANPROJ + required_reagents = list(REAGENT_ID_MANHATTAN = 10, REAGENT_ID_URANIUM = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/vodka_tonic - name = "Vodka and Tonic" - id = "vodkatonic" - result = "vodkatonic" - required_reagents = list("vodka" = 2, REAGENT_ID_TONIC = 1) + name = REAGENT_VODKATONIC + id = REAGENT_ID_VODKATONIC + result = REAGENT_ID_VODKATONIC + required_reagents = list(REAGENT_ID_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, REAGENT_ID_SODAWATER = 1, REAGENT_ID_LIMEJUICE = 1) + name = REAGENT_GINFIZZ + id = REAGENT_ID_GINFIZZ + result = REAGENT_ID_GINFIZZ + required_reagents = list(REAGENT_ID_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, REAGENT_ID_ORANGEJUICE = 2, REAGENT_ID_LIMEJUICE = 1, "ice" = 1) + name = REAGENT_BAHAMAMAMA + id = REAGENT_ID_BAHAMAMAMA + result = REAGENT_ID_BAHAMAMAMA + required_reagents = list(REAGENT_ID_RUM = 2, REAGENT_ID_ORANGEJUICE = 2, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_ICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/singulo - name = "Singulo" - id = "singulo" - result = "singulo" - required_reagents = list("vodka" = 5, REAGENT_ID_RADIUM = 1, "redwine" = 5) + name = REAGENT_SINGULO + id = REAGENT_ID_SINGULO + result = REAGENT_ID_SINGULO + required_reagents = list(REAGENT_ID_VODKA = 5, REAGENT_ID_RADIUM = 1, REAGENT_ID_REDWINE = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/alliescocktail - name = "Allies Cocktail" - id = "alliescocktail" - result = "alliescocktail" - required_reagents = list("martini" = 1, "vodka" = 1) + name = REAGENT_ALLIESCOCKTAIL + id = REAGENT_ID_ALLIESCOCKTAIL + result = REAGENT_ID_ALLIESCOCKTAIL + required_reagents = list(REAGENT_ID_MARTINI = 1, REAGENT_ID_VODKA = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/demonsblood - name = "Demons Blood" - id = "demonsblood" - result = "demonsblood" - required_reagents = list("rum" = 3, REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_BLOOD = 1, REAGENT_ID_DRGIBB = 1) + name = REAGENT_DEMONSBLOOD + id = REAGENT_ID_DEMONSBLOOD + result = REAGENT_ID_DEMONSBLOOD + required_reagents = list(REAGENT_ID_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(REAGENT_ID_CREAM = 2, REAGENT_ID_BANANA = 1, "rum" = 1, REAGENT_ID_WATERMELONJUICE = 1) + name = REAGENT_BOOGER + id = REAGENT_ID_BOOGER + result = REAGENT_ID_BOOGER + required_reagents = list(REAGENT_ID_CREAM = 2, REAGENT_ID_BANANA = 1, REAGENT_ID_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, REAGENT_ID_CREAM = 1, "ice" = 1) + name = REAGENT_ANTIFREEZE + id = REAGENT_ID_ANTIFREEZE + result = REAGENT_ID_ANTIFREEZE + required_reagents = list(REAGENT_ID_VODKA = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_ICE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/barefoot - name = "Barefoot" - id = "barefoot" - result = "barefoot" - required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_CREAM = 1, "vermouth" = 1) + name = REAGENT_BAREFOOT + id = REAGENT_ID_BAREFOOT + result = REAGENT_ID_BAREFOOT + required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_VERMOUTH = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/grapesoda @@ -530,46 +530,46 @@ result_amount = 3 /decl/chemical_reaction/instant/drinks/sbiten - name = "Sbiten" - id = "sbiten" - result = "sbiten" - required_reagents = list("vodka" = 10, REAGENT_ID_CAPSAICIN = 1) + name = REAGENT_SBITEN + id = REAGENT_ID_SBITEN + result = REAGENT_ID_SBITEN + required_reagents = list(REAGENT_ID_VODKA = 10, REAGENT_ID_CAPSAICIN = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/red_mead - name = "Red Mead" - id = "red_mead" - result = "red_mead" - required_reagents = list(REAGENT_ID_BLOOD = 1, "mead" = 1) + name = REAGENT_REDMEAD + id = REAGENT_ID_REDMEAD + result = REAGENT_ID_REDMEAD + required_reagents = list(REAGENT_ID_BLOOD = 1, REAGENT_ID_MEAD = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/mead - name = "Mead" - id = "mead" - result = "mead" + name = REAGENT_MEAD + id = REAGENT_ID_MEAD + result = REAGENT_ID_MEAD required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_WATER = 1) 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, REAGENT_ID_FROSTOIL = 1) + name = REAGENT_ICEDBEER + id = REAGENT_ID_ICEDBEER + result = REAGENT_ID_ICEDBEER + required_reagents = list(REAGENT_ID_BEER = 10, REAGENT_ID_FROSTOIL = 1) result_amount = 10 /decl/chemical_reaction/instant/drinks/iced_beer2 - name = "Iced Beer" - id = "iced_beer" - result = "iced_beer" - required_reagents = list("beer" = 5, "ice" = 1) + name = REAGENT_ICEDBEER + id = REAGENT_ID_ICEDBEER + result = REAGENT_ID_ICEDBEER + required_reagents = list(REAGENT_ID_BEER = 5, REAGENT_ID_ICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/grog - name = "Grog" - id = "grog" - result = "grog" - required_reagents = list("rum" = 1, REAGENT_ID_WATER = 1) + name = REAGENT_GROG + id = REAGENT_ID_GROG + result = REAGENT_ID_GROG + required_reagents = list(REAGENT_ID_RUM = 1, REAGENT_ID_WATER = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/soy_latte @@ -587,101 +587,101 @@ result_amount = 2 /decl/chemical_reaction/instant/drinks/acidspit - name = "Acid Spit" - id = "acidspit" - result = "acidspit" - required_reagents = list(REAGENT_ID_SACID = 1, "redwine" = 5) + name = REAGENT_ACIDSPIT + id = REAGENT_ID_ACIDSPIT + result = REAGENT_ID_ACIDSPIT + required_reagents = list(REAGENT_ID_SACID = 1, REAGENT_ID_REDWINE = 5) result_amount = 6 /decl/chemical_reaction/instant/drinks/amasec - name = "Amasec" - id = "amasec" - result = "amasec" - required_reagents = list(REAGENT_ID_IRON = 1, "redwine" = 5, "vodka" = 5) + name = REAGENT_AMASEC + id = REAGENT_ID_AMASEC + result = REAGENT_ID_AMASEC + required_reagents = list(REAGENT_ID_IRON = 1, REAGENT_ID_REDWINE = 5, REAGENT_ID_VODKA = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/changelingsting - name = "Changeling Sting" - id = "changelingsting" - result = "changelingsting" - required_reagents = list("screwdrivercocktail" = 1, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_LEMONJUICE = 1) + name = REAGENT_CHANGELINGSTING + id = REAGENT_ID_CHANGELINGSTING + result = REAGENT_ID_CHANGELINGSTING + required_reagents = list(REAGENT_ID_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(REAGENT_ID_CREAM = 1, "whiskey" = 1, REAGENT_ID_WATERMELONJUICE = 1) + name = REAGENT_ALOE + id = REAGENT_ID_ALOE + result = REAGENT_ID_ALOE + required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_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, REAGENT_ID_LEMONJUICE = 1) + name = REAGENT_ANDALUSIA + id = REAGENT_ID_ANDALUSIA + result = REAGENT_ID_ANDALUSIA + required_reagents = list(REAGENT_ID_RUM = 1, REAGENT_ID_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(REAGENT_ID_PINEAPPLEJUICE = 1, "rum" = 1, REAGENT_ID_LEMONLIME = 1, REAGENT_ID_EGG = 1, "kahlua" = 1, REAGENT_ID_SUGAR = 1) //VoreStation Edit + name = REAGENT_SNOWWHITE + id = REAGENT_ID_SNOWWHITE + result = REAGENT_ID_SNOWWHITE + required_reagents = list(REAGENT_ID_PINEAPPLEJUICE = 1, REAGENT_ID_RUM = 1, REAGENT_ID_LEMONLIME = 1, REAGENT_ID_EGG = 1, REAGENT_ID_KAHLUA = 1, REAGENT_ID_SUGAR = 1) //VoreStation Edit result_amount = 2 /decl/chemical_reaction/instant/drinks/irishcarbomb - name = "Irish Car Bomb" - id = "irishcarbomb" - result = "irishcarbomb" - required_reagents = list("ale" = 1, "irishcream" = 1) + name = REAGENT_IRISHCARBOMB + id = REAGENT_ID_IRISHCARBOMB + result = REAGENT_ID_IRISHCARBOMB + required_reagents = list(REAGENT_ID_ALE = 1, REAGENT_ID_IRISHCREAM = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/syndicatebomb - name = "Syndicate Bomb" - id = "syndicatebomb" - result = "syndicatebomb" - required_reagents = list("beer" = 1, "whiskeycola" = 1) + name = REAGENT_SYNDICATEBOMB + id = REAGENT_ID_SYNDICATEBOMB + result = REAGENT_ID_SYNDICATEBOMB + required_reagents = list(REAGENT_ID_BEER = 1, REAGENT_ID_WHISKEYCOLA = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/erikasurprise - name = "Erika Surprise" - id = "erikasurprise" - result = "erikasurprise" - required_reagents = list("ale" = 2, REAGENT_ID_LIMEJUICE = 1, "whiskey" = 1, REAGENT_ID_BANANA = 1, "ice" = 1) + name = REAGENT_ERIKASURPRISE + id = REAGENT_ID_ERIKASURPRISE + result = REAGENT_ID_ERIKASURPRISE + required_reagents = list(REAGENT_ID_ALE = 2, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_BANANA = 1, REAGENT_ID_ICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/devilskiss - name = "Devils Kiss" - id = "devilskiss" - result = "devilskiss" - required_reagents = list(REAGENT_ID_BLOOD = 1, "kahlua" = 1, "rum" = 1) + name = REAGENT_DEVILSKISS + id = REAGENT_ID_DEVILSKISS + result = REAGENT_ID_DEVILSKISS + required_reagents = list(REAGENT_ID_BLOOD = 1, REAGENT_ID_KAHLUA = 1, REAGENT_ID_RUM = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/hippiesdelight name = "Hippies Delight" - id = "hippiesdelight" - result = "hippiesdelight" - required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, "gargleblaster" = 1) + id = REAGENT_ID_HIPPIESDELIGHT + result = REAGENT_ID_HIPPIESDELIGHT + required_reagents = list(REAGENT_ID_PSILOCYBIN = 1, REAGENT_ID_GARGLEBLASTER = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/bananahonk name = "Banana Honk" - id = "bananahonk" - result = "bananahonk" + id = REAGENT_ID_BANANAHONK + result = REAGENT_ID_BANANAHONK 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, REAGENT_ID_CREAM = 1, REAGENT_ID_SUGAR = 1) + name = REAGENT_SILENCER + id = REAGENT_ID_SILENCER + result = REAGENT_ID_SILENCER + required_reagents = list(REAGENT_ID_NOTHING = 1, REAGENT_ID_CREAM = 1, REAGENT_ID_SUGAR = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/driestmartini - name = "Driest Martini" - id = "driestmartini" - result = "driestmartini" - required_reagents = list("nothing" = 1, "gin" = 1) + name = REAGENT_DRIESTMARTINI + id = REAGENT_ID_DRIESTMARTINI + result = REAGENT_ID_DRIESTMARTINI + required_reagents = list(REAGENT_ID_NOTHING = 1, REAGENT_ID_GIN = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/lemonade @@ -714,54 +714,54 @@ /decl/chemical_reaction/instant/drinks/driverspunch name = "Driver`s Punch" - id = "driverspunch" - result = "driverspunch" + id = REAGENT_ID_DRIVERSPUNCH + result = REAGENT_ID_DRIVERSPUNCH 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" + name = REAGENT_MINTAPPLESPARKLE + id = REAGENT_ID_MINTAPPLESPARKLE + result = REAGENT_ID_MINTAPPLESPARKLE 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" + name = REAGENT_BERRYCORDIAL + id = REAGENT_ID_BERRYCORDIAL + result = REAGENT_ID_BERRYCORDIAL 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" + name = REAGENT_TROPICALFIZZ + id = REAGENT_ID_TROPICALFIZZ + result = REAGENT_ID_TROPICALFIZZ 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 /decl/chemical_reaction/instant/drinks/melonspritzer - name = "Melon Spritzer" - id = "melonspritzer" - result = "melonspritzer" - required_reagents = list(REAGENT_ID_WATERMELONJUICE = 2, "redwine" = 2, REAGENT_ID_APPLEJUICE = 1, REAGENT_ID_LIMEJUICE = 1) + name = REAGENT_MELONSPRITZER + id = REAGENT_ID_MELONSPRITZER + result = REAGENT_ID_MELONSPRITZER + required_reagents = list(REAGENT_ID_WATERMELONJUICE = 2, REAGENT_ID_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" + name = REAGENT_FAUXFIZZ + id = REAGENT_ID_FAUXFIZZ + result = REAGENT_ID_FAUXFIZZ 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 /decl/chemical_reaction/instant/drinks/firepunch - name = "Fire Punch" - id = "firepunch" - result = "firepunch" - required_reagents = list(REAGENT_ID_SUGAR = 1, "rum" = 2) + name = REAGENT_FIREPUNCH + id = REAGENT_ID_FIREPUNCH + result = REAGENT_ID_FIREPUNCH + required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_RUM = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/kiraspecial @@ -789,14 +789,14 @@ name = REAGENT_MILKSHAKE id = REAGENT_ID_MILKSHAKE result = REAGENT_ID_MILKSHAKE - required_reagents = list(REAGENT_ID_CREAM = 1, "ice" = 2, REAGENT_ID_MILK = 2) + required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_ICE = 2, REAGENT_ID_MILK = 2) result_amount = 5 /decl/chemical_reaction/instant/drinks/peanutmilkshake name = "Peanutbutter Milkshake" 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) + required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_ICE = 1, REAGENT_ID_PEANUTBUTTER = 2, REAGENT_ID_MILK = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/rewriter @@ -807,10 +807,10 @@ result_amount = 2 /decl/chemical_reaction/instant/drinks/suidream - name = "Sui Dream" - id = "suidream" - result = "suidream" - required_reagents = list(REAGENT_ID_SPACEUP = 1, "bluecuracao" = 1, "melonliquor" = 1) + name = REAGENT_SUIDREAM + id = REAGENT_ID_SUIDREAM + result = REAGENT_ID_SUIDREAM + required_reagents = list(REAGENT_ID_SPACEUP = 1, REAGENT_ID_BLUECURACAO = 1, REAGENT_ID_MELONLIQUOR = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/shirleytemple @@ -912,215 +912,215 @@ result_amount = 6 /decl/chemical_reaction/instant/drinks/sakebomb - name = "Sake Bomb" - id = "sakebomb" - result = "sakebomb" - required_reagents = list("beer" = 2, "sake" = 1) + name = REAGENT_SAKEBOMB + id = REAGENT_ID_SAKEBOMB + result = REAGENT_ID_SAKEBOMB + required_reagents = list(REAGENT_ID_BEER = 2, REAGENT_ID_SAKE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/tamagozake - name = "Tamagozake" - id = "tamagozake" - result = "tamagozake" - required_reagents = list("sake" = 10, REAGENT_ID_SUGAR = 5, REAGENT_ID_EGG = 3) + name = REAGENT_TAMAGOZAKE + id = REAGENT_ID_TAMAGOZAKE + result = REAGENT_ID_TAMAGOZAKE + required_reagents = list(REAGENT_ID_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, REAGENT_ID_TOMATOJUICE = 1) + name = REAGENT_GINZAMARY + id = REAGENT_ID_GINZAMARY + result = REAGENT_ID_GINZAMARY + required_reagents = list(REAGENT_ID_SAKE = 2, REAGENT_ID_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, REAGENT_ID_BERRYJUICE = 1) + name = REAGENT_TOKYOROSE + id = REAGENT_ID_TOKYOROSE + result = REAGENT_ID_TOKYOROSE + required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_BERRYJUICE = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/saketini - name = "Saketini" - id = "saketini" - result = "saketini" - required_reagents = list("sake" = 1, "gin" = 1) + name = REAGENT_SAKETINI + id = REAGENT_ID_SAKETINI + result = REAGENT_ID_SAKETINI + required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_GIN = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/elysiumfacepunch - name = "Elysium Facepunch" - id = "elysiumfacepunch" - result = "elysiumfacepunch" - required_reagents = list("kahlua" = 1, REAGENT_ID_LEMONJUICE = 1) + name = REAGENT_ELYSIUMFACEPUNCH + id = REAGENT_ID_ELYSIUMFACEPUNCH + result = REAGENT_ID_ELYSIUMFACEPUNCH + required_reagents = list(REAGENT_ID_KAHLUA = 1, REAGENT_ID_LEMONJUICE = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/erebusmoonrise - name = "Erebus Moonrise" - id = "erebusmoonrise" - result = "erebusmoonrise" - required_reagents = list("whiskey" = 1, "vodka" = 1, "tequilla" = 1) + name = REAGENT_EREBUSMOONRISE + id = REAGENT_ID_EREBUSMOONRISE + result = REAGENT_ID_EREBUSMOONRISE + required_reagents = list(REAGENT_ID_WHISKEY = 1, REAGENT_ID_VODKA = 1, REAGENT_ID_TEQUILLA = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/balloon - name = "Balloon" - id = "balloon" - result = "balloon" - required_reagents = list(REAGENT_ID_CREAM = 1, "bluecuracao" = 1) + name = REAGENT_BALLOON + id = REAGENT_ID_BALLOON + result = REAGENT_ID_BALLOON + required_reagents = list(REAGENT_ID_CREAM = 1, REAGENT_ID_BLUECURACAO = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/natunabrandy - name = "Natuna Brandy" - id = "natunabrandy" - result = "natunabrandy" - required_reagents = list("beer" = 1, REAGENT_ID_SODAWATER = 2) + name = REAGENT_NATUNABRANDY + id = REAGENT_ID_NATUNABRANDY + result = REAGENT_ID_NATUNABRANDY + required_reagents = list(REAGENT_ID_BEER = 1, REAGENT_ID_SODAWATER = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/euphoria - name = "Euphoria" - id = "euphoria" - result = "euphoria" - required_reagents = list("specialwhiskey" = 1, "cognac" = 2) + name = REAGENT_EUPHORIA + id = REAGENT_ID_EUPHORIA + result = REAGENT_ID_EUPHORIA + required_reagents = list(REAGENT_ID_SPECIALWHISKEY = 1, REAGENT_ID_COGNAC = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/xanaducannon - name = "Xanadu Cannon" - id = "xanaducannon" - result = "xanaducannon" - required_reagents = list("ale" = 1, REAGENT_ID_DRGIBB = 1) + name = REAGENT_XANADUCANNON + id = REAGENT_ID_XANADUCANNON + result = REAGENT_ID_XANADUCANNON + required_reagents = list(REAGENT_ID_ALE = 1, REAGENT_ID_DRGIBB = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/debugger - name = "Debugger" - id = "debugger" - result = "debugger" + name = REAGENT_DEBUGGER + id = REAGENT_ID_DEBUGGER + result = REAGENT_ID_DEBUGGER 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" + name = REAGENT_SPACERSBREW + id = REAGENT_ID_SPACERSBREW + result = REAGENT_ID_SPACERSBREW required_reagents = list(REAGENT_ID_BROWNSTAR = 4, REAGENT_ID_ETHANOL = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/binmanbliss - name = "Binman Bliss" - id = "binmanbliss" - result = "binmanbliss" - required_reagents = list("sake" = 1, "tequilla" = 1) + name = REAGENT_BINMANBLISS + id = REAGENT_ID_BINMANBLISS + result = REAGENT_ID_BINMANBLISS + required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_TEQUILLA = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/chrysanthemum - name = "Chrysanthemum" - id = "chrysanthemum" - result = "chrysanthemum" - required_reagents = list("sake" = 1, "melonliquor" = 1) + name = REAGENT_CHRYSANTHEMUM + id = REAGENT_ID_CHRYSANTHEMUM + result = REAGENT_ID_CHRYSANTHEMUM + required_reagents = list(REAGENT_ID_SAKE = 1, REAGENT_ID_MELONLIQUOR = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/deathbell - name = "Deathbell" - id = "deathbell" - result = "deathbell" - required_reagents = list("antifreeze" = 1, "gargleblaster" = 1, "syndicatebomb" =1) + name = REAGENT_DEATHBELL + id = REAGENT_ID_DEATHBELL + result = REAGENT_ID_DEATHBELL + required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_SYNDICATEBOMB =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/bitters - name = "Bitters" - id = "bitters" - result = "bitters" + name = REAGENT_BITTERS + id = REAGENT_ID_BITTERS + result = REAGENT_ID_BITTERS 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, REAGENT_ID_CONDENSEDCAPSAICIN = 1) + name = REAGENT_SOEMMERFIRE + id = REAGENT_ID_SOEMMERFIRE + result = REAGENT_ID_SOEMMERFIRE + required_reagents = list(REAGENT_ID_MANHATTAN = 2, REAGENT_ID_CONDENSEDCAPSAICIN = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/winebrandy name = "Wine brandy" - id = "winebrandy" - result = "winebrandy" - required_reagents = list("redwine" = 10) + id = REAGENT_ID_WINEBRANDY + result = REAGENT_ID_WINEBRANDY + required_reagents = list(REAGENT_ID_REDWINE = 10) 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" + name = REAGENT_LOVEPOTION + id = REAGENT_ID_LOVEPOTION + result = REAGENT_ID_LOVEPOTION 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, REAGENT_ID_COFFEE = 5) + name = REAGENT_MORNINGAFTER + id = REAGENT_ID_MORNINGAFTER + result = REAGENT_ID_MORNINGAFTER + required_reagents = list(REAGENT_ID_SBITEN = 1, REAGENT_ID_COFFEE = 5) result_amount = 6 /decl/chemical_reaction/instant/drinks/vesper - name = "Vesper" - id = "vesper" - result = "vesper" - required_reagents = list("gin" = 3, "vodka" = 1, "redwine" = 1) + name = REAGENT_VESPER + id = REAGENT_ID_VESPER + result = REAGENT_ID_VESPER + required_reagents = list(REAGENT_ID_GIN = 3, REAGENT_ID_VODKA = 1, REAGENT_ID_REDWINE = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/rotgut - name = "Rotgut Fever Dream" - id = "rotgut" - result = "rotgut" - required_reagents = list("vodka" = 3, "rum" = 1, "whiskey" = 1, REAGENT_ID_COLA = 3) + name = REAGENT_ROTGUT + id = REAGENT_ID_ROTGUT + result = REAGENT_ID_ROTGUT + required_reagents = list(REAGENT_ID_VODKA = 3, REAGENT_ID_RUM = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_COLA = 3) result_amount = 8 /decl/chemical_reaction/instant/drinks/entdraught - name = "Ent's Draught" - id = "entdraught" - result = "entdraught" + name = REAGENT_ENTDRAUGHT + id = REAGENT_ID_ENTDRAUGHT + result = REAGENT_ID_ENTDRAUGHT required_reagents = list(REAGENT_ID_TONIC = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_HONEY = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/voxdelight - name = "Vox's Delight" - id = "voxdelight" - result = "voxdelight" + name = REAGENT_VOXDELIGHT + id = REAGENT_ID_VOXDELIGHT + result = REAGENT_ID_VOXDELIGHT required_reagents = list(REAGENT_ID_PHORON = 3, REAGENT_ID_FUEL = 1, REAGENT_ID_WATER = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/screamingviking - name = "Screaming Viking" - id = "screamingviking" - result = "screamingviking" - required_reagents = list("martini" = 2, "vodkatonic" = 2, REAGENT_ID_LIMEJUICE = 1, "rum" = 1) + name =REAGENT_SCREAMINGVIKING + id = REAGENT_ID_SCREAMINGVIKING + result = REAGENT_ID_SCREAMINGVIKING + required_reagents = list(REAGENT_ID_MARTINI = 2, REAGENT_ID_VODKATONIC = 2, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_RUM = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/vilelemon - name = "Vile Lemon" - id = "vilelemon" - result = "vilelemon" + name = REAGENT_VILELEMON + id = REAGENT_ID_VILELEMON + result = REAGENT_ID_VILELEMON 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" + name = REAGENT_DREAMCREAM + id = REAGENT_ID_DREAMCREAM + result = REAGENT_ID_DREAMCREAM required_reagents = list(REAGENT_ID_MILK = 2, REAGENT_ID_CREAM = 1, REAGENT_ID_HONEY = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/robustin - name = "Robustin" - id = "robustin" - result = "robustin" - required_reagents = list("antifreeze" = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_FUEL = 1, "vodka" = 1) + name = REAGENT_ROBUSTIN + id = REAGENT_ID_ROBUSTIN + result = REAGENT_ID_ROBUSTIN + required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_PHORON = 1, REAGENT_ID_FUEL = 1, REAGENT_ID_VODKA = 1) result_amount = 4 /decl/chemical_reaction/instant/drinks/virginsip - name = "Virgin Sip" - id = "virginsip" - result = "virginsip" - required_reagents = list("driestmartini" = 1, REAGENT_ID_WATER = 1) + name = REAGENT_VIRGINSIP + id = REAGENT_ID_VIRGINSIP + result = REAGENT_ID_VIRGINSIP + required_reagents = list(REAGENT_ID_DRIESTMARTINI = 1, REAGENT_ID_WATER = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/chocoshake @@ -1145,206 +1145,206 @@ result_amount = 2 /decl/chemical_reaction/instant/drinks/jellyshot - name = "Jelly Shot" - id = "jellyshot" - result = "jellyshot" - required_reagents = list(REAGENT_ID_CHERRYJELLY = 4, "vodka" = 1) + name = REAGENT_JELLYSHOT + id = REAGENT_ID_JELLYSHOT + result = REAGENT_ID_JELLYSHOT + required_reagents = list(REAGENT_ID_CHERRYJELLY = 4, REAGENT_ID_VODKA = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/slimeshot - name = "Named Bullet" - id = "slimeshot" - result = "slimeshot" - required_reagents = list(REAGENT_ID_SLIMEJELLY = 4, "vodka" = 1) + name = REAGENT_SLIMESHOT + id = REAGENT_ID_SLIMESHOT + result = REAGENT_ID_SLIMESHOT + required_reagents = list(REAGENT_ID_SLIMEJELLY = 4, REAGENT_ID_VODKA = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/negroni - name = "Negroni" - id = "negroni" - result = "negroni" - required_reagents = list("gin" = 1, "bitters" = 1, "vermouth" = 1) + name = REAGENT_NEGRONI + id = REAGENT_ID_NEGRONI + result = REAGENT_ID_NEGRONI + required_reagents = list(REAGENT_ID_GIN = 1, REAGENT_ID_BITTERS = 1, REAGENT_ID_VERMOUTH = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/cloverclub - name = "Clover Club" - id = "cloverclub" - result = "cloverclub" - required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_LEMONJUICE = 1, "gin" = 3) + name = REAGENT_CLOVERCLUB + id = REAGENT_ID_CLOVERCLUB + result = REAGENT_ID_CLOVERCLUB + required_reagents = list(REAGENT_ID_BERRYJUICE = 1, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_GIN = 3) result_amount = 5 /decl/chemical_reaction/instant/drinks/oldfashioned - name = "Old Fashioned" - id = "oldfashioned" - result = "oldfashioned" - required_reagents = list("whiskey" = 3, "bitters" = 1, REAGENT_ID_SUGAR = 1) + name = REAGENT_OLDFASHIONED + id = REAGENT_ID_OLDFASHIONED + result = REAGENT_ID_OLDFASHIONED + required_reagents = list(REAGENT_ID_WHISKEY = 3, REAGENT_ID_BITTERS = 1, REAGENT_ID_SUGAR = 1) result_amount = 5 /decl/chemical_reaction/instant/drinks/whiskeysour - name = "Whiskey Sour" - id = "whiskeysour" - result = "whiskeysour" - required_reagents = list("whiskey" = 2, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_SUGAR = 1) + name = REAGENT_WHISKEYSOUR + id = REAGENT_ID_WHISKEYSOUR + result = REAGENT_ID_WHISKEYSOUR + required_reagents = list(REAGENT_ID_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, REAGENT_ID_LIMEJUICE = 2, REAGENT_ID_SUGAR = 1) + name = REAGENT_DAIQUIRI + id = REAGENT_ID_DAIQUIRI + result = REAGENT_ID_DAIQUIRI + required_reagents = list(REAGENT_ID_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, REAGENT_ID_MINT = 1) + name = REAGENT_MINTJULEP + id = REAGENT_ID_MINTJULEP + result = REAGENT_ID_MINTJULEP + required_reagents = list(REAGENT_ID_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(REAGENT_ID_SODAWATER = 1, "tequillasunrise" = 2) + name = REAGENT_PALOMA + id = REAGENT_ID_PALOMA + result = REAGENT_ID_PALOMA + required_reagents = list(REAGENT_ID_SODAWATER = 1, REAGENT_ID_TEQUILLASUNRISE = 2) result_amount = 3 /decl/chemical_reaction/instant/drinks/mojito - name = "Mojito" - id = "mojito" - result = "mojito" - required_reagents = list("rum" = 3, REAGENT_ID_LIMEJUICE = 1, REAGENT_ID_MINT = 1) + name = REAGENT_MOJITO + id = REAGENT_ID_MOJITO + result = REAGENT_ID_MOJITO + required_reagents = list(REAGENT_ID_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" + name = REAGENT_VIRGINMOJITO + id = REAGENT_ID_VIRGINMOJITO + result = REAGENT_ID_VIRGINMOJITO 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, REAGENT_ID_LEMONJUICE = 1, REAGENT_ID_SUGAR = 1) + name = REAGENT_PISCOSOUR + id = REAGENT_ID_PISCOSOUR + result = REAGENT_ID_PISCOSOUR + required_reagents = list(REAGENT_ID_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(REAGENT_ID_ICECOFFEE = 1, "whiskey" = 1, REAGENT_ID_MINT = 1) + name = REAGENT_COLDFRONT + id = REAGENT_ID_COLDFRONT + result = REAGENT_ID_COLDFRONT + required_reagents = list(REAGENT_ID_ICECOFFEE = 1, REAGENT_ID_WHISKEY = 1, REAGENT_ID_MINT = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/godsake - name = "Gods Sake" - id = "godsake" - result = "godsake" - required_reagents = list("sake" = 2, REAGENT_ID_HOLYWATER = 1) + name = REAGENT_GODSAKE + id = REAGENT_ID_GODSAKE + result = REAGENT_ID_GODSAKE + required_reagents = list(REAGENT_ID_SAKE = 2, REAGENT_ID_HOLYWATER = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/godka //Why you would put this in your body, I don't know. - name = "Godka" - id = "godka" - result = "godka" - required_reagents = list("vodka" = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_CARTHATOLINE = 1) + name = REAGENT_GODKA + id = REAGENT_ID_GODKA + result = REAGENT_ID_GODKA + required_reagents = list(REAGENT_ID_VODKA = 1, REAGENT_ID_HOLYWATER = 1, REAGENT_ID_ETHANOL = 1, REAGENT_ID_CARTHATOLINE = 1) 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" + name = REAGENT_HOLYWINE + id = REAGENT_ID_HOLYWINE + result = REAGENT_ID_HOLYWINE required_reagents = list(REAGENT_ID_GRAPEJUICE = 5, REAGENT_ID_GOLD = 5) catalysts = list(REAGENT_ID_HOLYWATER = 5) result_amount = 10 /decl/chemical_reaction/instant/drinks/holy_mary - name = "Holy Mary" - id = "holymary" - result = "holymary" - required_reagents = list("vodka" = 2, "holywine" = 3, REAGENT_ID_LIMEJUICE = 1) + name = REAGENT_HOLYMARY + id = REAGENT_ID_HOLYMARY + result = REAGENT_ID_HOLYMARY + required_reagents = list(REAGENT_ID_VODKA = 2, REAGENT_ID_HOLYWINE = 3, REAGENT_ID_LIMEJUICE = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/angelskiss - name = "Angels Kiss" - id = "angelskiss" - result = "angelskiss" - required_reagents = list("holywine" = 1, "kahlua" = 1, "rum" = 1) + name = REAGENT_ANGELSKISS + id = REAGENT_ID_ANGELSKISS + result = REAGENT_ID_ANGELSKISS + required_reagents = list(REAGENT_ID_HOLYWINE = 1, REAGENT_ID_KAHLUA = 1, REAGENT_ID_RUM = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/angelswrath - name = "Angels Wrath" - id = "angelswrath" - result = "angelswrath" - required_reagents = list("rum" = 3, REAGENT_ID_SPACEMOUNTAINWIND = 1, "holywine" = 1, REAGENT_ID_DRGIBB = 1) + name = REAGENT_ANGELSWRATH + id = REAGENT_ID_ANGELSWRATH + result = REAGENT_ID_ANGELSWRATH + required_reagents = list(REAGENT_ID_RUM = 3, REAGENT_ID_SPACEMOUNTAINWIND = 1, REAGENT_ID_HOLYWINE = 1, REAGENT_ID_DRGIBB = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/ichor_mead - name = "Ichor Mead" - id = "ichor_mead" - result = "ichor_mead" - required_reagents = list("holywine" = 1, "mead" = 1) + name = REAGENT_ICHORMEAD + id = REAGENT_ID_ICHORMEAD + result = REAGENT_ID_ICHORMEAD + required_reagents = list(REAGENT_ID_HOLYWINE = 1, REAGENT_ID_MEAD = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/oilslick - name = "Oil Slick" - id = "oilslick" - result = "oilslick" + name = REAGENT_OILSLICK + id = REAGENT_ID_OILSLICK + result = REAGENT_ID_OILSLICK 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" + id = REAGENT_ID_SLIMESLAMMER + result = REAGENT_ID_SLIMESLAMMER 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" + name = REAGENT_VIRGINSEXONTHEBEACH + id = REAGENT_ID_VIRGINSEXONTHEBEACH + result = REAGENT_ID_VIRGINSEXONTHEBEACH required_reagents = list(REAGENT_ID_ORANGEJUICE = 3, REAGENT_ID_GRENADINE = 2) result_amount = 5 /decl/chemical_reaction/instant/drinks/sexonthebeach - name = "Sex On The Beach" - id = "sexonthebeach" - result = "sexonthebeach" - required_reagents = list("virginsexonthebeach" = 5, "vodka" = 1) + name = REAGENT_SEXONTHEBEACH + id = REAGENT_ID_SEXONTHEBEACH + result = REAGENT_ID_SEXONTHEBEACH + required_reagents = list(REAGENT_ID_VIRGINSEXONTHEBEACH = 5, REAGENT_ID_VODKA = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/eggnog - name = "Eggnog" - id = "eggnog" - result = "eggnog" + name = REAGENT_EGGNOG + id = REAGENT_ID_EGGNOG + result = REAGENT_ID_EGGNOG 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" + name = REAGENT_NUCLEARWASTE id = "nuclearwasterad" - result = "nuclearwaste" - required_reagents = list("oilslick" = 1, REAGENT_ID_RADIUM = 1, REAGENT_ID_LIMEJUICE = 1) + result = REAGENT_ID_NUCLEARWASTE + required_reagents = list(REAGENT_ID_OILSLICK = 1, REAGENT_ID_RADIUM = 1, REAGENT_ID_LIMEJUICE = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/nuclearwaste_uranium - name = "Nuclear Waste" + name = REAGENT_NUCLEARWASTE id = "nuclearwasteuran" - result = "nuclearwaste" - required_reagents = list("oilslick" = 2, REAGENT_ID_URANIUM = 1) + result = REAGENT_ID_NUCLEARWASTE + required_reagents = list(REAGENT_ID_OILSLICK = 2, REAGENT_ID_URANIUM = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/sodaoil - name = "Soda Oil" - id = "sodaoil" - result = "sodaoil" + name = REAGENT_SODAOIL + id = REAGENT_ID_SODAOIL + result = REAGENT_ID_SODAOIL 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(REAGENT_ID_LEMONJUICE = 3, "vodka" = 2, "schnapps_pep" = 1, "schnapps_lem" = 1, "rum" = 1, "ice" = 1) + name = REAGENT_FUSIONNAIRE + id = REAGENT_ID_FUSIONNAIRE + result = REAGENT_ID_FUSIONNAIRE + required_reagents = list(REAGENT_ID_LEMONJUICE = 3, REAGENT_ID_VODKA = 2, REAGENT_ID_SCHNAPPSPEP = 1, REAGENT_ID_SCHNAPPSLEM = 1, REAGENT_ID_RUM = 1, REAGENT_ID_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 8c86251edd..6653e8bea5 100644 --- a/code/modules/reagents/reactions/instant/drinks_vr.dm +++ b/code/modules/reagents/reactions/instant/drinks_vr.dm @@ -8,31 +8,31 @@ result_amount = 30 /decl/chemical_reaction/instant/drinks/deathbell - name = "Deathbell" - id = "deathbell" - result = "deathbell" - required_reagents = list("antifreeze" = 1, "gargleblaster" = 1, "syndicatebomb" =1) + name = REAGENT_DEATHBELL + id = REAGENT_ID_DEATHBELL + result = REAGENT_ID_DEATHBELL + required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_SYNDICATEBOMB =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/burnout name = REAGENT_BURNOUT id = REAGENT_ID_BURNOUT result = REAGENT_ID_BURNOUT - required_reagents = list("antifreeze" = 1, "deathbell" = 1, REAGENT_ID_LOVEMAKER =1) + required_reagents = list(REAGENT_ID_ANTIFREEZE = 1, REAGENT_ID_DEATHBELL = 1, REAGENT_ID_LOVEMAKER =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/monstertamer name = REAGENT_MONSTERTAMER id = REAGENT_ID_MONSTERTAMER result = REAGENT_ID_MONSTERTAMER - required_reagents = list("whiskey" = 1, REAGENT_ID_PROTEIN = 1) + required_reagents = list(REAGENT_ID_WHISKEY = 1, REAGENT_ID_PROTEIN = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/bigbeer name = REAGENT_BIGBEER id = REAGENT_ID_BIGBEER result = REAGENT_ID_BIGBEER - required_reagents = list("syndicatebomb" = 1, "manlydorf" = 1, "grog" =1) + required_reagents = list(REAGENT_ID_SYNDICATEBOMB = 1, REAGENT_ID_MANLYDORF = 1, REAGENT_ID_GROG =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/sweettea @@ -53,21 +53,21 @@ name = REAGENT_GALACTICPANIC id = REAGENT_ID_GALACTICPANIC result = REAGENT_ID_GALACTICPANIC - required_reagents = list("gargleblaster" = 1, "singulo" = 1, "phoronspecial" =1, "neurotoxin" = 1, "atomicbomb" = 1, "hippiesdelight" = 1) + required_reagents = list(REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_SINGULO = 1, REAGENT_ID_PHORONSPECIAL =1, REAGENT_ID_NEUROTOXIN = 1, REAGENT_ID_ATOMICBOMB = 1, REAGENT_ID_HIPPIESDELIGHT = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/bulldog name = REAGENT_BULLDOG id = REAGENT_ID_BULLDOG result = REAGENT_ID_BULLDOG - required_reagents = list("whiterussian" = 4, REAGENT_ID_COLA =1) + required_reagents = list(REAGENT_ID_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, REAGENT_ID_SODAWATER =1) + required_reagents = list(REAGENT_ID_REDWINE = 1, REAGENT_ID_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, REAGENT_ID_SODAWATER = 1, "vodka" =1) + required_reagents = list(REAGENT_ID_SUGAR = 1, REAGENT_ID_SODAWATER = 1, REAGENT_ID_VODKA =1) result_amount = 3 /decl/chemical_reaction/instant/drinks/lotus @@ -102,28 +102,28 @@ name = REAGENT_RUSSIANROULETTE id =REAGENT_ID_RUSSIANROULETTE result =REAGENT_ID_RUSSIANROULETTE - required_reagents = list("whiterussian" = 5, REAGENT_ID_IRON = 1) + required_reagents = list(REAGENT_ID_WHITERUSSIAN = 5, REAGENT_ID_IRON = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/lovemaker name = REAGENT_LOVEMAKER id = REAGENT_ID_LOVEMAKER result = REAGENT_ID_LOVEMAKER - required_reagents = list(REAGENT_ID_HONEY = 1, "sexonthebeach" = 5) + required_reagents = list(REAGENT_ID_HONEY = 1, REAGENT_ID_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(REAGENT_ID_HONEY = 1, "vodka" = 1, REAGENT_ID_GRENADINE =1) + required_reagents = list(REAGENT_ID_HONEY = 1, REAGENT_ID_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(REAGENT_ID_APPLEJUICE = 2, "vodka" = 1) + required_reagents = list(REAGENT_ID_APPLEJUICE = 2, REAGENT_ID_VODKA = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/glowingappletini @@ -137,7 +137,7 @@ name = REAGENT_SCSATW id = REAGENT_ID_SCSATW result = REAGENT_ID_SCSATW - required_reagents = list("screwdrivercocktail" = 3, "rum" =1, "whiskey" =1, "gin" =1) + required_reagents = list(REAGENT_ID_SCREWDRIVERCOCKTAIL = 3, REAGENT_ID_RUM =1, REAGENT_ID_WHISKEY =1, REAGENT_ID_GIN =1) result_amount = 6 /decl/chemical_reaction/instant/drinks/choccymilk @@ -152,7 +152,7 @@ name = "Redspace Flush" id = REAGENT_ID_REDSPACEFLUSH result = REAGENT_ID_REDSPACEFLUSH - required_reagents = list("rum" = 2, "whiskey" = 2, REAGENT_ID_BLOOD =1, REAGENT_ID_PHORON =1) + required_reagents = list(REAGENT_ID_RUM = 2, REAGENT_ID_WHISKEY = 2, REAGENT_ID_BLOOD =1, REAGENT_ID_PHORON =1) result_amount = 6 /decl/chemical_reaction/instant/drinks/graveyard @@ -173,14 +173,14 @@ name = REAGENT_PINKRUSSIAN id = REAGENT_ID_PINKRUSSIAN result = REAGENT_ID_PINKRUSSIAN - required_reagents = list("blackrussian" = 2, REAGENT_ID_BERRYSHAKE = 1) + required_reagents = list(REAGENT_ID_BLACKRUSSIAN = 2, REAGENT_ID_BERRYSHAKE = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/originalsin name = REAGENT_ORIGINALSIN id = REAGENT_ID_ORIGINALSIN result = REAGENT_ID_ORIGINALSIN - required_reagents = list("holywine" = 1) + required_reagents = list(REAGENT_ID_HOLYWINE = 1) catalysts = list(REAGENT_ID_APPLEJUICE = 1) result_amount = 1 @@ -188,21 +188,21 @@ name = REAGENT_WINDGARITA id = REAGENT_ID_WINDGARITA result = REAGENT_ID_WINDGARITA - required_reagents = list("margarita" = 3, REAGENT_ID_SPACEMOUNTAINWIND = 2, "melonliquor" = 1) + required_reagents = list(REAGENT_ID_MARGARITA = 3, REAGENT_ID_SPACEMOUNTAINWIND = 2, REAGENT_ID_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, REAGENT_ID_EGG = 1) + required_reagents = list(REAGENT_ID_WHISKEYSOUR = 3, REAGENT_ID_REDWINE = 2, REAGENT_ID_EGG = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/mudslide name = REAGENT_MUDSLIDE id = REAGENT_ID_MUDSLIDE result = REAGENT_ID_MUDSLIDE - required_reagents = list("blackrussian" = 1, "irishcream" = 1) + required_reagents = list(REAGENT_ID_BLACKRUSSIAN = 1, REAGENT_ID_IRISHCREAM = 1) result_amount = 2 /decl/chemical_reaction/instant/drinks/protein_shake @@ -244,5 +244,5 @@ name = REAGENT_MANAGERSUMMONER id = REAGENT_ID_MANAGERSUMMONER result = REAGENT_ID_MANAGERSUMMONER - required_reagents = list("margarita" = 1, "redwine" = 1, REAGENT_ID_ESSENTIALOIL = 1) + required_reagents = list(REAGENT_ID_MARGARITA = 1, REAGENT_ID_REDWINE = 1, REAGENT_ID_ESSENTIALOIL = 1) result_amount = 3 diff --git a/code/modules/reagents/reactions/instant/food.dm b/code/modules/reagents/reactions/instant/food.dm index 92fc398f91..c6d9773008 100644 --- a/code/modules/reagents/reactions/instant/food.dm +++ b/code/modules/reagents/reactions/instant/food.dm @@ -1,15 +1,15 @@ /decl/chemical_reaction/instant/food/hot_ramen - name = "Hot Ramen" - id = "hot_ramen" - result = "hot_ramen" + name = REAGENT_HOTRAMEN + id = REAGENT_ID_HOTRAMEN + result = REAGENT_ID_HOTRAMEN 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(REAGENT_ID_CAPSAICIN = 1, "hot_ramen" = 6) + name = REAGENT_HELLRAMEN + id = REAGENT_ID_HELLRAMEN + result = REAGENT_ID_HELLRAMEN + required_reagents = list(REAGENT_ID_CAPSAICIN = 1, REAGENT_ID_HOTRAMEN = 6) result_amount = 6 /decl/chemical_reaction/instant/food/tofu @@ -140,7 +140,7 @@ id = "dough" result = null 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 + inhibitors = list(REAGENT_ID_WATER = 1, REAGENT_ID_BEER = 1, REAGENT_ID_SUGAR = 1) //To prevent it messing with batter recipes result_amount = 1 /decl/chemical_reaction/instant/food/dough/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -179,7 +179,7 @@ name = "Beer Batter" 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) + required_reagents = list(REAGENT_ID_EGG = 3, REAGENT_ID_FLOUR = 10, REAGENT_ID_BEER = 5, REAGENT_ID_SODIUMCHLORIDE = 2) result_amount = 20 /decl/chemical_reaction/instant/food/browniemix diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm index e6b517b101..19af8aeb6f 100644 --- a/code/modules/reagents/reactions/instant/instant.dm +++ b/code/modules/reagents/reactions/instant/instant.dm @@ -537,10 +537,10 @@ result_amount = 3 /decl/chemical_reaction/instant/neurotoxin - name = "Neurotoxin" - id = "neurotoxin" - result = "neurotoxin" - required_reagents = list("gargleblaster" = 1, REAGENT_ID_STOXIN = 1) + name = REAGENT_NEUROTOXIN + id = REAGENT_ID_NEUROTOXIN + result = REAGENT_ID_NEUROTOXIN + required_reagents = list(REAGENT_ID_GARGLEBLASTER = 1, REAGENT_ID_STOXIN = 1) result_amount = 2 /decl/chemical_reaction/instant/luminol @@ -1152,7 +1152,7 @@ name = "Silver Blue Carpet Dyeing" id = "carpetdyesblu" result = REAGENT_ID_LIQUIDCARPETSBLU - required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, "ice" = 1) + required_reagents = list(REAGENT_ID_LIQUIDCARPET = 5, REAGENT_ID_ICE = 1) /decl/chemical_reaction/instant/carpetdye/clown name = "Clown Carpet Dyeing" diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm index bcc431ec4d..822ec33a5f 100644 --- a/code/modules/reagents/reagent_containers/borghypo.dm +++ b/code/modules/reagents/reagent_containers/borghypo.dm @@ -132,49 +132,49 @@ recharge_time = 3 volume = 60 possible_transfer_amounts = list(5, 10, 20, 30) - reagent_ids = list("ale", - "beer", + reagent_ids = list(REAGENT_ID_ALE, + REAGENT_ID_BEER, REAGENT_ID_BERRYJUICE, - "bitters", - "cider", + REAGENT_ID_BITTERS, + REAGENT_ID_CIDER, REAGENT_ID_COFFEE, - "cognac", + REAGENT_ID_COGNAC, REAGENT_ID_COLA, REAGENT_ID_CREAM, REAGENT_ID_DRGIBB, REAGENT_ID_EGG, - "gin", + REAGENT_ID_GIN, REAGENT_ID_GINGERALE, REAGENT_ID_HOTCOCO, - "ice", + REAGENT_ID_ICE, REAGENT_ID_ICETEA, - "kahlua", + REAGENT_ID_KAHLUA, REAGENT_ID_LEMONJUICE, REAGENT_ID_LEMONLIME, REAGENT_ID_LIMEJUICE, - "mead", + REAGENT_ID_MEAD, REAGENT_ID_MILK, REAGENT_ID_MINT, REAGENT_ID_ORANGEJUICE, - "redwine", - "rum", - "sake", + REAGENT_ID_REDWINE, + REAGENT_ID_RUM, + REAGENT_ID_SAKE, REAGENT_ID_SODAWATER, REAGENT_ID_SOYMILK, REAGENT_ID_SPACEUP, REAGENT_ID_SPACEMOUNTAINWIND, REAGENT_ID_SPACESPICE, - "specialwhiskey", + REAGENT_ID_SPECIALWHISKEY, REAGENT_ID_SUGAR, REAGENT_ID_TEA, - "tequilla", + REAGENT_ID_TEQUILLA, REAGENT_ID_TOMATOJUICE, REAGENT_ID_TONIC, - "vermouth", - "vodka", + REAGENT_ID_VERMOUTH, + REAGENT_ID_VODKA, REAGENT_ID_WATER, REAGENT_ID_WATERMELONJUICE, - "whiskey") + REAGENT_ID_WHISKEY) /obj/item/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user) return diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm index 246cd5eec0..1e368776a1 100644 --- a/code/modules/reagents/reagent_containers/glass_vr.dm +++ b/code/modules/reagents/reagent_containers/glass_vr.dm @@ -1,5 +1,5 @@ /obj/item/reagent_containers/glass/beaker/neurotoxin - prefill = list("neurotoxin" = 50) + prefill = list(REAGENT_ID_NEUROTOXIN = 50) /obj/item/reagent_containers/glass/beaker/vial/bicaridine name = "vial (" + REAGENT_ID_BICARIDINE + ")" diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index b49f125c6b..419b7f4656 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -2475,8 +2475,8 @@ color = "#302000" /datum/reagent/drink/hot_ramen - name = "Hot Ramen" - id = "hot_ramen" + name = REAGENT_HOTRAMEN + id = REAGENT_ID_HOTRAMEN description = "The noodles are boiled, the flavors are artificial, just like being back in school." taste_description = "noodles and salt" reagent_state = LIQUID @@ -2485,8 +2485,8 @@ adj_temp = 5 /datum/reagent/drink/hell_ramen - name = "Hell Ramen" - id = "hell_ramen" + name = REAGENT_HELLRAMEN + id = REAGENT_ID_HELLRAMEN description = "The noodles are boiled, the flavors are artificial, just like being back in school." taste_description = "noodles and spice" taste_mult = 1.7 @@ -2501,8 +2501,8 @@ M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT /datum/reagent/drink/sweetsundaeramen - name = "Dessert Ramen" - id = "dessertramen" + name = REAGENT_DESSERTRAMEN + id = REAGENT_ID_DESSERTRAMEN description = "How many things can you add to a cup of ramen before it begins to question its existance?" taste_description = "unbearable sweetness" color = "#4444FF" @@ -2512,15 +2512,15 @@ glass_desc = "How many things can you add to a cup of ramen before it begins to question its existance?" /datum/reagent/drink/ice - name = "Ice" - id = "ice" + name = REAGENT_ICE + id = REAGENT_ID_ICE description = "Frozen water, your dentist wouldn't like you chewing this." taste_description = "ice" reagent_state = SOLID color = "#619494" adj_temp = -5 - glass_name = "ice" + glass_name = REAGENT_ID_ICE glass_desc = "Generally, you're supposed to put something else in there too..." glass_icon = DRINK_ICON_NOISY @@ -2543,75 +2543,75 @@ //M.adjustToxLoss(5 * removed) //VOREStation Removal /datum/reagent/drink/nothing - name = "Nothing" - id = "nothing" + name = REAGENT_NOTHING + id = REAGENT_ID_NOTHING description = "Absolutely nothing." - taste_description = "nothing" + taste_description = REAGENT_ID_NOTHING - glass_name = "nothing" + glass_name = REAGENT_ID_NOTHING glass_desc = "Absolutely nothing." /datum/reagent/drink/dreamcream - name = "Dream Cream" - id = "dreamcream" + name = REAGENT_DREAMCREAM + id = REAGENT_ID_DREAMCREAM description = "A smoothy, silky mix of honey and dairy." taste_description = "sweet, soothing dairy" color = "#fcfcc9" // rgb(252, 252, 201) - glass_name = "Dream Cream" + glass_name = REAGENT_DREAMCREAM glass_desc = "A smoothy, silky mix of honey and dairy." allergen_type = ALLERGEN_DAIRY //Made using dairy /datum/reagent/drink/soda/vilelemon - name = "Vile Lemon" - id = "vilelemon" + name = REAGENT_VILELEMON + id = REAGENT_ID_VILELEMON description = "A fizzy, sour lemonade mix." taste_description = "fizzy, sour lemon" color = "#c6c603" // rgb(198, 198, 3) - glass_name = "Vile Lemon" + glass_name = REAGENT_VILELEMON glass_desc = "A sour, fizzy drink with lemonade and lemonlime." glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from lemonade and mtn wind(caffeine) /datum/reagent/drink/entdraught - name = "Ent's Draught" - id = "entdraught" + name = REAGENT_ENTDRAUGHT + id = REAGENT_ID_ENTDRAUGHT description = "A natural, earthy combination of all things peaceful." taste_description = "fresh rain and sweet memories" color = "#3a6617" // rgb(58, 102, 23) - glass_name = "Ent's Draught" + glass_name = REAGENT_ENTDRAUGHT glass_desc = "You can almost smell the tranquility emanating from this." //allergen_type = ALLERGEN_FRUIT Sorry to break the news, chief. Honey is not a fruit. /datum/reagent/drink/lovepotion - name = "Love Potion" - id = "lovepotion" + name = REAGENT_LOVEPOTION + id = REAGENT_ID_LOVEPOTION description = "Creamy strawberries and sugar, simple and sweet." taste_description = "strawberries and cream" color = "#fc8a8a" // rgb(252, 138, 138) - glass_name = "Love Potion" + glass_name = REAGENT_LOVEPOTION glass_desc = "Love me tender, love me sweet." allergen_type = ALLERGEN_FRUIT|ALLERGEN_DAIRY //Made from cream(dairy) and berryjuice(fruit) /datum/reagent/drink/oilslick - name = "Oil Slick" - id = "oilslick" + name = REAGENT_OILSLICK + id = REAGENT_ID_OILSLICK description = "A viscous, but sweet, ooze." taste_description = "honey" color = "#FDF5E6" // rgb(253,245,230) water_based = FALSE - glass_name = "Oil Slick" + glass_name = REAGENT_OILSLICK glass_desc = "A concoction that should probably be in an engine, rather than your stomach." glass_icon = DRINK_ICON_NOISY allergen_type = ALLERGEN_VEGETABLE //Made from corn oil /datum/reagent/drink/slimeslammer - name = "Slick Slimes Slammer" - id = "slimeslammer" + name = REAGENT_SLIMESLAMMER + id = REAGENT_ID_SLIMESLAMMER description = "A viscous, but savory, ooze." taste_description = "peanuts`n`slime" color = "#93604D" @@ -2623,25 +2623,25 @@ allergen_type = ALLERGEN_VEGETABLE|ALLERGEN_SEEDS //Made from corn oil and peanutbutter /datum/reagent/drink/eggnog - name = "Eggnog" - id = "eggnog" + name = REAGENT_EGGNOG + id = REAGENT_ID_EGGNOG description = "A creamy, rich beverage made out of whisked eggs, milk and sugar, for when you feel like celebrating the winter holidays." taste_description = "thick cream and vanilla" color = "#fff3c1" // rgb(255, 243, 193) - glass_name = "Eggnog" + glass_name = REAGENT_EGGNOG glass_desc = "You can't egg-nore the holiday cheer all around you" allergen_type = ALLERGEN_DAIRY|ALLERGEN_EGGS //Eggnog is made with dairy and eggs. /datum/reagent/drink/nuclearwaste - name = "Nuclear Waste" - id = "nuclearwaste" + name = REAGENT_NUCLEARWASTE + id = REAGENT_ID_NUCLEARWASTE description = "A viscous, glowing slurry." taste_description = "sour honey drops" color = "#7FFF00" // rgb(127,255,0) water_based = FALSE - glass_name = "Nuclear Waste" + glass_name = REAGENT_NUCLEARWASTE glass_desc = "Sadly, no super powers." glass_icon = DRINK_ICON_NOISY glass_special = list(DRINK_FIZZ) @@ -2660,14 +2660,14 @@ M.ingested.add_reagent(REAGENT_ID_RADIUM, 0.25) /datum/reagent/drink/sodaoil //Mixed with normal drinks to make a 'potable' version for Prometheans if mixed 1-1. Dilution is key. - name = "Soda Oil" - id = "sodaoil" + name = REAGENT_SODAOIL + id = REAGENT_ID_SODAOIL description = "A thick, bubbling soda." taste_description = "chewy water" color = "#F0FFF0" // rgb(245,255,250) water_based = FALSE - glass_name = "Soda Oil" + glass_name = REAGENT_SODAOIL glass_desc = "A pitiful sludge that looks vaguely like a soda.. if you look at it a certain way." glass_icon = DRINK_ICON_NOISY glass_special = list(DRINK_FIZZ) @@ -2692,20 +2692,20 @@ M.adjustToxLoss(removed * -2) /datum/reagent/drink/mojito - name = "Mojito" - id = "virginmojito" + name = REAGENT_VIRGINMOJITO + id = REAGENT_ID_VIRGINMOJITO description = "Mint, bubbly water, and citrus, made for sailing." taste_description = "mint and lime" color = "#FFF7B3" - glass_name = "mojito" + glass_name = REAGENT_ID_MOJITO glass_desc = "Mint, bubbly water, and citrus, made for sailing." glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_FRUIT //Made with lime juice /datum/reagent/drink/sexonthebeach - name = "Virgin Sex On The Beach" - id = "virginsexonthebeach" + name = REAGENT_VIRGINSEXONTHEBEACH + id = REAGENT_ID_VIRGINSEXONTHEBEACH description = "A secret combination of orange juice and pomegranate." taste_description = "60% orange juice, 40% pomegranate" color = "#7051E3" @@ -2715,8 +2715,8 @@ allergen_type = ALLERGEN_FRUIT //Made with orange juice /datum/reagent/drink/driverspunch - name = "Driver's Punch" - id = "driverspunch" + name = REAGENT_DRIVERSPUNCH + id = REAGENT_ID_DRIVERSPUNCH description = "A fruity punch!" taste_description = "sharp, sour apples" color = "#D2BA6E" @@ -2727,8 +2727,8 @@ allergen_type = ALLERGEN_FRUIT //Made with appleade and orange juice /datum/reagent/drink/mintapplesparkle - name = "Mint Apple Sparkle" - id = "mintapplesparkle" + name = REAGENT_MINTAPPLESPARKLE + id = REAGENT_ID_MINTAPPLESPARKLE description = "Delicious appleade with a touch of mint." taste_description = "minty apples" color = "#FDDA98" @@ -2739,8 +2739,8 @@ allergen_type = ALLERGEN_FRUIT //Made with appleade /datum/reagent/drink/berrycordial - name = "Berry Cordial" - id = "berrycordial" + name = REAGENT_BERRYCORDIAL + id = REAGENT_ID_BERRYCORDIAL description = "How berry cordial of you." taste_description = "sweet chivalry" color = "#D26EB8" @@ -2751,8 +2751,8 @@ allergen_type = ALLERGEN_FRUIT //Made with berry and lemonjuice /datum/reagent/drink/tropicalfizz - name = "Tropical Fizz" - id = "tropicalfizz" + name = REAGENT_TROPICALFIZZ + id = REAGENT_ID_TROPICALFIZZ description = "One sip and you're in the bahamas." taste_description = "tropical" color = "#69375C" @@ -2764,8 +2764,8 @@ allergen_type = ALLERGEN_FRUIT //Made with several fruit juices /datum/reagent/drink/fauxfizz - name = "Faux Fizz" - id = "fauxfizz" + name = REAGENT_FAUXFIZZ + id = REAGENT_ID_FAUXFIZZ description = "One sip and you're in the bahamas... maybe." taste_description = "slightly tropical" color = "#69375C" @@ -2777,14 +2777,14 @@ allergen_type = ALLERGEN_FRUIT //made with several fruit juices /datum/reagent/drink/syrup - name = "syrup" - id = "syrup" + name = REAGENT_SYRUP + id = REAGENT_ID_SYRUP description = "A generic, sugary syrup." taste_description = "sweetness" color = "#fffbe8" cup_prefix = "extra sweet" - glass_name = "syrup" + glass_name = REAGENT_ID_SYRUP glass_desc = "That is just way too much syrup to drink on its own." allergen_type = ALLERGEN_SUGARS @@ -2796,8 +2796,8 @@ M.make_dizzy(1) /datum/reagent/drink/syrup/pumpkin - name = "pumpkin spice syrup" - id = "syrup_pumpkin" + name = REAGENT_SYRUPPUMPKIN + id = REAGENT_ID_SYRUPPUMPKIN description = "A sugary syrup that tastes of pumpkin spice." taste_description = "pumpkin spice" color = "#e0b439" @@ -2806,32 +2806,32 @@ allergen_type = ALLERGEN_SUGARS|ALLERGEN_FRUIT /datum/reagent/drink/syrup/caramel - name = "caramel syrup" - id = "syrup_caramel" + name = REAGENT_SYRUPCARAMEL + id = REAGENT_ID_SYRUPCARAMEL description = "A sugary syrup that tastes of caramel." taste_description = "caramel" color = "#b47921" cup_prefix = "caramel" /datum/reagent/drink/syrup/scaramel - name = "salted caramel syrup" - id = "syrup_salted_caramel" + name = REAGENT_SYRUPSALTEDCARAMEL + id = REAGENT_ID_SYRUPSALTEDCARAMEL description = "A sugary syrup that tastes of salted caramel." taste_description = "salty caramel" color = "#9f6714" cup_prefix = "salted caramel" /datum/reagent/drink/syrup/irish - name = "irish cream syrup" - id = "syrup_irish" + name = REAGENT_SYRUPIRISH + id = REAGENT_ID_SYRUPIRISH description = "A sugary syrup that tastes of a light, sweet cream." taste_description = "creaminess" color = "#ead3b0" cup_prefix = "irish" /datum/reagent/drink/syrup/almond - name = "almond syrup" - id = "syrup_almond" + name = REAGENT_SYRUPALMOND + id = REAGENT_ID_SYRUPALMOND description = "A sugary syrup that tastes of almonds." taste_description = "almonds" color = "#ffb64a" @@ -2840,16 +2840,16 @@ allergen_type = ALLERGEN_SUGARS|ALLERGEN_SEEDS /datum/reagent/drink/syrup/cinnamon - name = "cinnamon syrup" - id = "syrup_cinnamon" + name = REAGENT_SYRUPCINNAMON + id = REAGENT_ID_SYRUPCINNAMON description = "A sugary syrup that tastes of cinnamon." taste_description = "cinnamon" color = "#ec612a" cup_prefix = "cinnamon" /datum/reagent/drink/syrup/pistachio - name = "pistachio syrup" - id = "syrup_pistachio" + name = REAGENT_SYRUPPISTACHIO + id = REAGENT_ID_SYRUPPISTACHIO description = "A sugary syrup that tastes of pistachio." taste_description = "pistachio" color = "#c9eb59" @@ -2858,24 +2858,24 @@ allergen_type = ALLERGEN_SUGARS|ALLERGEN_SEEDS /datum/reagent/drink/syrup/vanilla - name = "vanilla syrup" - id = "syrup_vanilla" + name = REAGENT_SYRUPVANILLA + id = REAGENT_ID_SYRUPVANILLA description = "A sugary syrup that tastes of vanilla." taste_description = "vanilla" color = "#eaebd1" cup_prefix = REAGENT_ID_VANILLA /datum/reagent/drink/syrup/toffee - name = "toffee syrup" - id = "syrup_toffee" + name = REAGENT_SYRUPTOFFEE + id = REAGENT_ID_SYRUPTOFFEE description = "A sugary syrup that tastes of toffee." taste_description = "toffee" color = "#aa7143" cup_prefix = "toffee" /datum/reagent/drink/syrup/cherry - name = "cherry syrup" - id = "syrup_cherry" + name = REAGENT_SYRUPCHERRY + id = REAGENT_ID_SYRUPCHERRY description = "A sugary syrup that tastes of cherries." taste_description = "cherries" color = "#ff0000" @@ -2884,16 +2884,16 @@ allergen_type = ALLERGEN_SUGARS|ALLERGEN_FRUIT /datum/reagent/drink/syrup/butterscotch - name = "butterscotch syrup" - id = "syrup_butterscotch" + name = REAGENT_SYRUPBUTTERSCOTCH + id = REAGENT_ID_SYRUPBUTTERSCOTCH description = "A sugary syrup that tastes of butterscotch." taste_description = "butterscotch" color = "#e6924e" cup_prefix = "butterscotch" /datum/reagent/drink/syrup/chocolate - name = "chocolate syrup" - id = "syrup_chocolate" + name = REAGENT_SYRUPCHOCOLATE + id = REAGENT_ID_SYRUPCHOCOLATE description = "A sugary syrup that tastes of chocolate." taste_description = REAGENT_ID_CHOCOLATE color = "#873600" @@ -2902,8 +2902,8 @@ allergen_type = ALLERGEN_SUGARS|ALLERGEN_CHOCOLATE /datum/reagent/drink/syrup/wchocolate - name = "white chocolate syrup" - id = "syrup_white_chocolate" + name = REAGENT_SYRUPWHITECHOCOLATE + id = REAGENT_ID_SYRUPWHITECHOCOLATE description = "A sugary syrup that tastes of white chocolate." taste_description = "white chocolate" color = "#c4c6a5" @@ -2912,8 +2912,8 @@ allergen_type = ALLERGEN_SUGARS|ALLERGEN_CHOCOLATE /datum/reagent/drink/syrup/strawberry - name = "strawberry syrup" - id = "syrup_strawberry" + name = REAGENT_SYRUPSTRAWBERRY + id = REAGENT_ID_SYRUPSTRAWBERRY description = "A sugary syrup that tastes of strawberries." taste_description = "strawberries" color = "#ff2244" @@ -2922,8 +2922,8 @@ allergen_type = ALLERGEN_SUGARS|ALLERGEN_FRUIT /datum/reagent/drink/syrup/coconut - name = "coconut syrup" - id = "syrup_coconut" + name = REAGENT_SYRUPCOCONUT + id = REAGENT_ID_SYRUPCOCONUT description = "A sugary syrup that tastes of coconut." taste_description = "coconut" color = "#ffffff" @@ -2932,32 +2932,32 @@ allergen_type = ALLERGEN_SUGARS|ALLERGEN_FRUIT /datum/reagent/drink/syrup/ginger - name = "ginger syrup" - id = "syrup_ginger" + name = REAGENT_SYRUPGINGER + id = REAGENT_ID_SYRUPGINGER description = "A sugary syrup that tastes of ginger." taste_description = "ginger" color = "#d09740" cup_prefix = "ginger" /datum/reagent/drink/syrup/gingerbread - name = "gingerbread syrup" - id = "syrup_gingerbread" + name = REAGENT_SYRUPGINGERBREAD + id = REAGENT_ID_SYRUPGINGERBREAD description = "A sugary syrup that tastes of gingerbread." taste_description = "gingerbread" color = "#b6790f" cup_prefix = "gingerbread" /datum/reagent/drink/syrup/peppermint - name = "peppermint syrup" - id = "syrup_peppermint" + name = REAGENT_SYRUPPEPPERMINT + id = REAGENT_ID_SYRUPPEPPERMINT description = "A sugary syrup that tastes of peppermint." taste_description = "peppermint" color = "#9ce06e" cup_prefix = "peppermint" /datum/reagent/drink/syrup/birthday_cake - name = "birthday cake syrup" - id = "syrup_birthday" + name = REAGENT_SYRUPBIRTHDAY + id = REAGENT_ID_SYRUPBIRTHDAY description = "A sugary syrup that tastes of an overload of sweetness." taste_description = "far too much sugar" color = "#ff00e6" @@ -2968,40 +2968,40 @@ // Basic /datum/reagent/ethanol/absinthe - name = "Absinthe" - id = "absinthe" + name = REAGENT_ABSINTHE + id = REAGENT_ID_ABSINTHE description = "Watch out that the Green Fairy doesn't come for you!" taste_description = "licorice" taste_mult = 1.5 color = "#33EE00" strength = 12 - glass_name = "absinthe" + glass_name = REAGENT_ID_ABSINTHE glass_desc = "Wormwood, anise, oh my." /datum/reagent/ethanol/ale - name = "Ale" - id = "ale" + name = REAGENT_ALE + id = REAGENT_ID_ALE description = "A dark alcoholic beverage made by malted barley and yeast." taste_description = "hearty barley ale" color = "#4C3100" strength = 50 - glass_name = "ale" + glass_name = REAGENT_ID_ALE glass_desc = "A freezing pint of delicious ale" allergen_type = ALLERGEN_GRAINS //Barley is grain /datum/reagent/ethanol/beer - name = "Beer" - id = "beer" + name = REAGENT_BEER + id = REAGENT_ID_BEER description = "An alcoholic beverage made from malted grains, hops, yeast, and water." taste_description = "beer" color = "#FFD300" strength = 50 nutriment_factor = 1 - glass_name = "beer" + glass_name = REAGENT_ID_BEER glass_desc = "A freezing pint of beer" allergen_type = ALLERGEN_GRAINS //Made from grains @@ -3015,8 +3015,8 @@ M.jitteriness = max(M.jitteriness - 3, 0) /datum/reagent/ethanol/beer/lite - name = "Lite Beer" - id = "litebeer" + name = REAGENT_LITEBEER + id = REAGENT_ID_LITEBEER description = "An alcoholic beverage made from malted grains, hops, yeast, water, and water." taste_description = "bad beer" color = "#FFD300" @@ -3029,8 +3029,8 @@ allergen_type = ALLERGEN_GRAINS //Made from grains /datum/reagent/ethanol/bluecuracao - name = "Blue Curacao" - id = "bluecuracao" + name = REAGENT_BLUECURACAO + id = REAGENT_ID_BLUECURACAO description = "Exotically blue, fruity drink, distilled from oranges." taste_description = "oranges" taste_mult = 1.1 @@ -3043,22 +3043,22 @@ allergen_type = ALLERGEN_FRUIT //Made from oranges(fruit) /datum/reagent/ethanol/cognac - name = "Cognac" - id = "cognac" + name = REAGENT_COGNAC + id = REAGENT_ID_COGNAC description = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. Classy as fornication." taste_description = "rich and smooth alcohol" taste_mult = 1.1 color = "#AB3C05" strength = 15 - glass_name = "cognac" + glass_name = REAGENT_ID_COGNAC glass_desc = "Damn, you feel like some kind of French aristocrat just by holding this." allergen_type = ALLERGEN_FRUIT //Cognac is made from wine which is made from grapes. /datum/reagent/ethanol/deadrum - name = "Deadrum" - id = "deadrum" + name = REAGENT_DEADRUM + id = REAGENT_ID_DEADRUM description = "Popular with the sailors. Not very popular with everyone else." taste_description = "butterscotch and salt" taste_mult = 1.1 @@ -3076,8 +3076,8 @@ M.dizziness +=5 /datum/reagent/ethanol/firepunch - name = "Fire Punch" - id = "firepunch" + name = REAGENT_FIREPUNCH + id = REAGENT_ID_FIREPUNCH description = "Yo ho ho and a jar of honey." taste_description = "sharp butterscotch" color = "#ECB633" @@ -3087,14 +3087,14 @@ glass_desc = "Yo ho ho and a jar of honey." /datum/reagent/ethanol/gin - name = "Gin" - id = "gin" + name = REAGENT_GIN + id = REAGENT_ID_GIN description = "It's gin. In space. I say, good sir." taste_description = "an alcoholic christmas tree" color = "#0064C6" strength = 50 - glass_name = "gin" + glass_name = REAGENT_ID_GIN glass_desc = "A crystal clear glass of Griffeater gin." allergen_type = ALLERGEN_FRUIT //Made from juniper berries @@ -3135,8 +3135,8 @@ M.make_jittery(5) /datum/reagent/ethanol/coffee/kahlua - name = "Kahlua" - id = "kahlua" + name = REAGENT_KAHLUA + id = REAGENT_ID_KAHLUA description = "A widely known, Mexican coffee-flavored liqueur. In production since 1936!" taste_description = "spiked latte" taste_mult = 1.1 @@ -3148,8 +3148,8 @@ // glass_desc = "DAMN, THIS THING LOOKS ROBUST" //If this isn't what our players should talk like, it isn't what our game should say to them. /datum/reagent/ethanol/melonliquor - name = "Melon Liquor" - id = "melonliquor" + name = REAGENT_MELONLIQUOR + id = REAGENT_ID_MELONLIQUOR description = "A relatively sweet and fruity 46 proof liquor." taste_description = "fruity alcohol" color = "#138808" // rgb: 19, 136, 8 @@ -3161,8 +3161,8 @@ allergen_type = ALLERGEN_FRUIT //Made from watermelons /datum/reagent/ethanol/melonspritzer - name = "Melon Spritzer" - id = "melonspritzer" + name = REAGENT_MELONSPRITZER + id = REAGENT_ID_MELONSPRITZER description = "Melons: Citrus style." taste_description = "sour melon" color = "#934D5D" @@ -3175,31 +3175,31 @@ allergen_type = ALLERGEN_FRUIT //Made from watermelon juice, apple juice, and lime juice /datum/reagent/ethanol/rum - name = "Rum" - id = "rum" + name = REAGENT_RUM + id = REAGENT_ID_RUM description = "Yo-ho-ho and all that." taste_description = "spiked butterscotch" taste_mult = 1.1 color = "#ECB633" strength = 15 - glass_name = "rum" + glass_name = REAGENT_ID_RUM glass_desc = "Makes you want to buy a ship and just go pillaging." /datum/reagent/ethanol/sake //Made from rice, yes. Rice is technically a grain, but also kinda a psuedo-grain, so I don't count it for grain allergies. - name = "Sake" - id = "sake" + name = REAGENT_SAKE + id = REAGENT_ID_SAKE description = "Anime's favorite drink." taste_description = "dry alcohol" color = "#DDDDDD" strength = 25 - glass_name = "sake" + glass_name = REAGENT_ID_SAKE glass_desc = "A glass of sake." /datum/reagent/ethanol/sexonthebeach - name = "Sex On The Beach" - id = "sexonthebeach" + name = REAGENT_SEXONTHEBEACH + id = REAGENT_ID_SEXONTHEBEACH description = "A concoction of vodka and a secret combination of orange juice and pomegranate." taste_description = "60% orange juice, 40% pomegranate, 100% alcohol" color = "#7051E3" @@ -3211,8 +3211,8 @@ allergen_type = ALLERGEN_FRUIT //Made from orange juice /datum/reagent/ethanol/tequila - name = "Tequila" - id = "tequilla" + name = REAGENT_TEQUILLA + id = REAGENT_ID_TEQUILLA description = "A strong and mildly flavored, Mexican produced spirit. Feeling thirsty hombre?" taste_description = "paint thinner" color = "#FFFF91" @@ -3222,15 +3222,15 @@ glass_desc = "Now all that's missing is the weird colored shades!" /datum/reagent/ethanol/thirteenloko - name = "Thirteen Loko" - id = "thirteenloko" + name = REAGENT_THIRTEENLOKO + id =REAGENT_ID_THIRTEENLOKO description = "A potent mixture of caffeine and alcohol." taste_description = "battery acid" color = "#102000" strength = 25 nutriment_factor = 1 - glass_name = "Thirteen Loko" + glass_name = REAGENT_THIRTEENLOKO glass_desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass." allergen_type = ALLERGEN_STIMULANT //Holy shit dude. @@ -3246,27 +3246,27 @@ M.make_jittery(5) /datum/reagent/ethanol/vermouth - name = "Vermouth" - id = "vermouth" + name = REAGENT_VERMOUTH + id = REAGENT_ID_VERMOUTH description = "You suddenly feel a craving for a martini..." taste_description = "dry alcohol" taste_mult = 1.3 color = "#91FF91" // rgb: 145, 255, 145 strength = 15 - glass_name = "vermouth" + glass_name = REAGENT_ID_VERMOUTH glass_desc = "You wonder why you're even drinking this straight." allergen_type = ALLERGEN_FRUIT //Vermouth is made from wine which is made from grapes(fruit) /datum/reagent/ethanol/vodka - name = "Vodka" - id = "vodka" + name = REAGENT_VODKA + id = REAGENT_ID_VODKA description = "Number one drink AND fueling choice for Russians worldwide." taste_description = "grain alcohol" color = "#0064C8" // rgb: 0, 100, 200 strength = 15 - glass_name = "vodka" + glass_name = REAGENT_ID_VODKA glass_desc = "The glass contain wodka. Xynta." allergen_type = ALLERGEN_GRAINS //Vodka is made from grains @@ -3277,21 +3277,21 @@ M.apply_effect(max(M.radiation - 1 * removed, 0), IRRADIATE, check_protection = 0) /datum/reagent/ethanol/whiskey - name = "Whiskey" - id = "whiskey" + name = REAGENT_WHISKEY + id = REAGENT_ID_WHISKEY description = "A superb and well-aged single-malt whiskey. Damn." taste_description = "molasses" color = "#4C3100" strength = 25 - glass_name = "whiskey" + glass_name = REAGENT_ID_WHISKEY glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy." allergen_type = ALLERGEN_GRAINS //Whiskey is also made from grain. /datum/reagent/ethanol/redwine - name = "Red Wine" - id = "redwine" + name = REAGENT_REDWINE + id = REAGENT_ID_REDWINE description = "An premium alchoholic beverage made from distilled grape juice." taste_description = "bitter sweetness" color = "#7E4043" // rgb: 126, 64, 67 @@ -3303,8 +3303,8 @@ allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit) /datum/reagent/ethanol/whitewine - name = "White Wine" - id = "whitewine" + name = REAGENT_WHITEWINE + id = REAGENT_ID_WHITEWINE description = "An premium alchoholic beverage made from fermenting of the non-coloured pulp of grapes." taste_description = "light fruity flavor" color = "#F4EFB0" // rgb: 244, 239, 176 @@ -3316,21 +3316,21 @@ allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit) /datum/reagent/ethanol/carnoth - name = "Carnoth" - id = "carnoth" + name = REAGENT_CARNOTH + id = REAGENT_ID_CARNOTH description = "An premium alchoholic beverage made with multiple hybridized species of grapes that give it a dark maroon coloration." taste_description = "alcoholic sweet flavor" color = "#5B0000" // rgb: 0, 100, 35 strength = 20 - glass_name = "carnoth" + glass_name = REAGENT_ID_CARNOTH glass_desc = "A very classy looking drink." allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit) /datum/reagent/ethanol/pwine - name = "Poison Wine" - id = "pwine" + name = REAGENT_PWINE + id = REAGENT_ID_PWINE description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!" color = "#000000" strength = 10 @@ -3357,26 +3357,26 @@ L.take_damage(100, 0) /datum/reagent/ethanol/wine/champagne - name = "Champagne" - id = "champagne" + name = REAGENT_CHAMPAGNE + id = REAGENT_ID_CHAMPAGNE description = "A sparkling wine made with Pinot Noir, Pinot Meunier, and Chardonnay." taste_description = "fizzy bitter sweetness" color = "#D1B166" - glass_name = "champagne" + glass_name = REAGENT_ID_CHAMPAGNE glass_desc = "An even classier looking drink." allergen_type = ALLERGEN_FRUIT //Still wine, and still made from grapes (fruit) /datum/reagent/ethanol/cider - name = "Cider" - id = "cider" + name = REAGENT_CIDER + id = REAGENT_ID_CIDER description = "Hard? Soft? No-one knows but it'll get you drunk." taste_description = "tartness" color = "#CE9C00" // rgb: 206, 156, 0 strength = 10 - glass_name = "cider" + glass_name = REAGENT_ID_CIDER glass_desc = "The second most Irish drink." glass_special = list(DRINK_FIZZ) @@ -3386,22 +3386,22 @@ /datum/reagent/ethanol/acid_spit - name = "Acid Spit" - id = "acidspit" + name = REAGENT_ACIDSPIT + id = REAGENT_ID_ACIDSPIT description = "A drink for the daring, can be deadly if incorrectly prepared!" taste_description = "bitter tang" reagent_state = LIQUID color = "#365000" strength = 30 - glass_name = "Acid Spit" + glass_name = REAGENT_ACIDSPIT glass_desc = "A drink from the company archives. Made from live aliens." allergen_type = ALLERGEN_FRUIT //Made from wine (fruit) /datum/reagent/ethanol/alliescocktail - name = "Allies Cocktail" - id = "alliescocktail" + name = REAGENT_ALLIESCOCKTAIL + id = REAGENT_ID_ALLIESCOCKTAIL description = "A drink made from your allies, not as sweet as when made from your enemies." taste_description = "bitter sweetness" color = "#D8AC45" @@ -3413,48 +3413,48 @@ allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from vodka(grain) as well as martini(vermouth(fruit) and gin(fruit)) /datum/reagent/ethanol/aloe - name = "Aloe" - id = "aloe" + name = REAGENT_ALOE + id = REAGENT_ID_ALOE description = "So very, very, very good." taste_description = "sweet and creamy" color = "#B7EA75" strength = 15 - glass_name = "Aloe" + glass_name = REAGENT_ALOE glass_desc = "Very, very, very good." allergen_type = ALLERGEN_FRUIT|ALLERGEN_DAIRY|ALLERGEN_GRAINS //Made from cream(dairy), whiskey(grains), and watermelon juice(fruit) /datum/reagent/ethanol/amasec - name = "Amasec" - id = "amasec" + name = REAGENT_AMASEC + id = REAGENT_ID_AMASEC description = "Official drink of the Gun Club!" taste_description = "dark and metallic" reagent_state = LIQUID color = "#FF975D" strength = 25 - glass_name = "Amasec" + glass_name = REAGENT_AMASEC glass_desc = "Always handy before combat!" allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from wine(fruit) and vodka(grains) /datum/reagent/ethanol/andalusia - name = "Andalusia" - id = "andalusia" + name = REAGENT_ANDALUSIA + id = REAGENT_ID_ANDALUSIA description = "A nice, strangely named drink." taste_description = "lemons" color = "#F4EA4A" strength = 15 - glass_name = "Andalusia" + glass_name = REAGENT_ANDALUSIA glass_desc = "A nice, strange named drink." allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from whiskey(grains) and lemonjuice (fruit) /datum/reagent/ethanol/antifreeze - name = "Anti-freeze" - id = "antifreeze" + name = REAGENT_ANTIFREEZE + id = REAGENT_ID_ANTIFREEZE description = "Ultimate refreshment." taste_description = "ice cold vodka" color = "#56DEEA" @@ -3462,14 +3462,14 @@ adj_temp = 20 targ_temp = 330 - glass_name = "Anti-freeze" + glass_name = REAGENT_ANTIFREEZE glass_desc = "The ultimate refreshment." allergen_type = ALLERGEN_GRAINS|ALLERGEN_DAIRY //Made from vodka(grains) and cream(dairy) /datum/reagent/ethanol/atomicbomb - name = "Atomic Bomb" - id = "atomicbomb" + name = REAGENT_ATOMICBOMB + id = REAGENT_ID_ATOMICBOMB description = "Nuclear proliferation never tasted so good." taste_description = "coffee, almonds, and whiskey, with a kick" reagent_state = LIQUID @@ -3477,28 +3477,28 @@ strength = 10 druggy = 50 - glass_name = "Atomic Bomb" + glass_name = REAGENT_ATOMICBOMB glass_desc = "We cannot take legal responsibility for your actions after imbibing." allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY|ALLERGEN_FRUIT|ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from b52 which contains kahlua(coffee/caffeine), cognac(fruit), and irish cream(Whiskey(grains),cream(dairy)) /datum/reagent/ethanol/coffee/b52 - name = "B-52" - id = "b52" + name = REAGENT_B52 + id = REAGENT_ID_B52 description = "Kahlua, Irish cream, and cognac. You will get bombed." taste_description = "coffee, almonds, and whiskey" taste_mult = 1.3 color = "#997650" strength = 12 - glass_name = "B-52" + glass_name = REAGENT_B52 glass_desc = "Kahlua, Irish cream, and cognac. You will get bombed." allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY|ALLERGEN_FRUIT|ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from kahlua(coffee/caffeine), cognac(fruit), and irish cream(Whiskey(grains),cream(dairy)) /datum/reagent/ethanol/bahama_mama - name = "Bahama mama" - id = "bahama_mama" + name = REAGENT_BAHAMAMAMA + id = REAGENT_ID_BAHAMAMAMA description = "Tropical cocktail." taste_description = "lime and orange" color = "#FF7F3B" @@ -3510,8 +3510,8 @@ allergen_type = ALLERGEN_FRUIT //Made from orange juice and lime juice /datum/reagent/ethanol/bananahonk - name = "Banana Mama" - id = "bananahonk" + name = REAGENT_BANANAHONK + id = REAGENT_ID_BANANAHONK description = "A drink from " + JOB_CLOWN + " Heaven." taste_description = "bananas and sugar" nutriment_factor = 1 @@ -3524,21 +3524,21 @@ allergen_type = ALLERGEN_FRUIT|ALLERGEN_DAIRY //Made from banana juice(fruit) and cream(dairy) /datum/reagent/ethanol/barefoot - name = "Barefoot" - id = "barefoot" + name = REAGENT_BAREFOOT + id = REAGENT_ID_BAREFOOT description = "Barefoot and pregnant." taste_description = "creamy berries" color = "#FFCDEA" strength = 30 - glass_name = "Barefoot" + glass_name = REAGENT_BAREFOOT glass_desc = "Barefoot and pregnant." allergen_type = ALLERGEN_DAIRY|ALLERGEN_FRUIT //Made from berry juice (fruit), cream(dairy), and vermouth(fruit) /datum/reagent/ethanol/beepsky_smash - name = "Beepsky Smash" - id = "beepskysmash" + name = REAGENT_BEEPSKYSMASH + id = REAGENT_ID_BEEPSKYSMASH description = "Deny drinking this and prepare for THE LAW." taste_description = "whiskey and citrus" taste_mult = 2 @@ -3546,7 +3546,7 @@ color = "#404040" strength = 12 - glass_name = "Beepsky Smash" + glass_name = REAGENT_BEEPSKYSMASH glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from whiskey(grains), and limejuice(fruit) @@ -3558,86 +3558,86 @@ M.Stun(2) /datum/reagent/ethanol/bilk - name = "Bilk" - id = "bilk" + name = REAGENT_BILK + id = REAGENT_ID_BILK description = "This appears to be beer mixed with milk. Disgusting." taste_description = "sour milk" color = "#895C4C" strength = 50 nutriment_factor = 2 - glass_name = "bilk" + glass_name = REAGENT_ID_BILK glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." allergen_type = ALLERGEN_GRAINS|ALLERGEN_DAIRY //Made from milk(dairy) and beer(grains) /datum/reagent/ethanol/black_russian - name = "Black Russian" - id = "blackrussian" + name = REAGENT_BLACKRUSSIAN + id = REAGENT_ID_BLACKRUSSIAN description = "For the lactose-intolerant. Still as classy as a White Russian." taste_description = "coffee" color = "#360000" strength = 15 - glass_name = "Black Russian" + glass_name = REAGENT_BLACKRUSSIAN glass_desc = "For the lactose-intolerant. Still as classy as a White Russian." allergen_type = ALLERGEN_COFFEE|ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from vodka(grains) and kahlua(coffee/caffeine) /datum/reagent/ethanol/bloody_mary - name = "Bloody Mary" - id = "bloodymary" + name = REAGENT_BLOODYMARY + id = REAGENT_ID_BLOODYMARY description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." taste_description = "tomatoes with a hint of lime" color = "#B40000" strength = 15 - glass_name = "Bloody Mary" + glass_name = REAGENT_BLOODYMARY glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder." allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from vodka (grains), tomato juice(fruit), and lime juice(fruit) /datum/reagent/ethanol/booger - name = "Booger" - id = "booger" + name = REAGENT_BOOGER + id = REAGENT_ID_BOOGER description = "Ewww..." taste_description = "sweet 'n creamy" color = "#8CFF8C" strength = 30 - glass_name = "Booger" + glass_name = REAGENT_BOOGER glass_desc = "Ewww..." allergen_type = ALLERGEN_DAIRY|ALLERGEN_FRUIT //Made from cream(dairy), banana juice(fruit), and watermelon juice(fruit) /datum/reagent/ethanol/coffee/brave_bull //Since it's under the /coffee subtype, it already has coffee and caffeine allergens. - name = "Brave Bull" - id = "bravebull" + name = REAGENT_BRAVEBULL + id = REAGENT_ID_BRAVEBULL description = "It's just as effective as Dutch-Courage!" taste_description = "coffee and paint thinner" taste_mult = 1.1 color = "#4C3100" strength = 15 - glass_name = "Brave Bull" + glass_name = REAGENT_BRAVEBULL glass_desc = "Tequilla and coffee liquor, brought together in a mouthwatering mixture. Drink up." /datum/reagent/ethanol/changelingsting - name = "Changeling Sting" - id = "changelingsting" + name = REAGENT_CHANGELINGSTING + id = REAGENT_ID_CHANGELINGSTING description = "You take a tiny sip and feel a burning sensation..." taste_description = "constantly changing flavors" color = "#2E6671" strength = 10 - glass_name = "Changeling Sting" + glass_name = REAGENT_CHANGELINGSTING glass_desc = "A stingy drink." allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from screwdriver(vodka(grains), orange juice(fruit)), lime juice(fruit), and lemon juice(fruit) /datum/reagent/ethanol/martini - name = "Classic Martini" - id = "martini" + name = REAGENT_MARTINI + id = REAGENT_ID_MARTINI description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." taste_description = "dry class" color = "#0064C8" @@ -3649,31 +3649,20 @@ allergen_type = ALLERGEN_FRUIT //Made from gin(fruit) and vermouth(fruit) /datum/reagent/ethanol/cuba_libre - name = "Cuba Libre" - id = "cubalibre" + name = REAGENT_CUBALIBRE + id = REAGENT_ID_CUBALIBRE description = "Rum, mixed with cola and a splash of lime. Viva la revolucion." taste_description = "cola with lime" color = "#3E1B00" strength = 30 - glass_name = "Cuba Libre" + glass_name = REAGENT_CUBALIBRE glass_desc = "A classic mix of rum, cola, and lime." allergen_type = ALLERGEN_STIMULANT //Cola /datum/reagent/ethanol/rum_and_cola - name = "Rum and Cola" - id = "rumandcola" - description = "A classic mix of sugar with more sugar." - taste_description = "cola" - color = "#3E1B00" - strength = 30 - - glass_name = "Cuba Libre" - glass_desc = "A classic mix of rum, cola, and lime." - -/datum/reagent/ethanol/rum_and_cola - name = "Rum and Cola" - id = "rumandcola" + name = REAGENT_RUMANDCOLA + id = REAGENT_ID_RUMANDCOLA description = "A classic mix of sugar with more sugar." taste_description = "cola" color = "#3E1B00" @@ -3684,8 +3673,8 @@ allergen_type = ALLERGEN_STIMULANT // Cola /datum/reagent/ethanol/demonsblood - name = "Demons Blood" - id = "demonsblood" + name = REAGENT_DEMONSBLOOD + id = REAGENT_ID_DEMONSBLOOD description = "This thing makes the hair on the back of your neck stand up." taste_description = "sweet tasting iron" taste_mult = 1.5 @@ -3697,8 +3686,8 @@ allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from space mountain wind(fruit) and dr.gibb(caffeine) /datum/reagent/ethanol/devilskiss - name = "Devils Kiss" - id = "devilskiss" + name = REAGENT_DEVILSKISS + id = REAGENT_ID_DEVILSKISS description = "Creepy time!" taste_description = "bitter iron" color = "#A68310" @@ -3709,21 +3698,21 @@ allergen_type = ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made from kahlua (Coffee) /datum/reagent/ethanol/driestmartini - name = "Driest Martini" - id = "driestmartini" + name = REAGENT_DRIESTMARTINI + id = REAGENT_ID_DRIESTMARTINI description = "Only for the experienced. You think you see sand floating in the glass." taste_description = "a beach" nutriment_factor = 1 color = "#2E6671" strength = 12 - glass_name = "Driest Martini" + glass_name = REAGENT_DRIESTMARTINI glass_desc = "Only for the experienced. You think you see sand floating in the glass." allergen_type = ALLERGEN_FRUIT //Made from gin(fruit) /datum/reagent/ethanol/ginfizz - name = "Gin Fizz" - id = "ginfizz" + name = REAGENT_GINFIZZ + id = REAGENT_ID_GINFIZZ description = "Refreshingly lemony, deliciously dry." taste_description = "dry, tart lemons" color = "#FFFFAE" @@ -3735,33 +3724,33 @@ allergen_type = ALLERGEN_FRUIT //Made from gin(fruit) and lime juice(fruit) /datum/reagent/ethanol/grog - name = "Grog" - id = "grog" + name = REAGENT_GROG + id = REAGENT_ID_GROG description = "Watered-down rum, pirate approved!" taste_description = "a poor excuse for alcohol" reagent_state = LIQUID color = "#FFBB00" strength = 100 - glass_name = "grog" + glass_name = REAGENT_ID_GROG glass_desc = "A fine and cepa drink for Space." /datum/reagent/ethanol/erikasurprise - name = "Erika Surprise" - id = "erikasurprise" + name = REAGENT_ERIKASURPRISE + id = REAGENT_ID_ERIKASURPRISE description = "The surprise is, it's green!" taste_description = "tartness and bananas" color = "#2E6671" strength = 15 - glass_name = "Erika Surprise" + glass_name = REAGENT_ERIKASURPRISE glass_desc = "The surprise is, it's green!" allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from ale (grains), lime juice (fruit), whiskey(grains), banana juice(fruit) /datum/reagent/ethanol/gargle_blaster - name = "Pan-Galactic Gargle Blaster" - id = "gargleblaster" + name = REAGENT_GARGLEBLASTER + id = REAGENT_ID_GARGLEBLASTER description = "Whoah, this stuff looks volatile!" taste_description = "your brains smashed out by a lemon wrapped around a gold brick" taste_mult = 5 @@ -3770,14 +3759,14 @@ strength = 10 druggy = 15 - glass_name = "Pan-Galactic Gargle Blaster" + glass_name = REAGENT_GARGLEBLASTER glass_desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy." allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from vodka(grains), gin(fruit), whiskey(grains), cognac(fruit), and lime juice(fruit) /datum/reagent/ethanol/gintonic - name = "Gin and Tonic" - id = "gintonic" + name = REAGENT_GINTONIC + id = REAGENT_ID_GINTONIC description = "An all time classic, mild cocktail." taste_description = "mild and tart" color = "#0064C8" @@ -3789,22 +3778,22 @@ allergen_type = ALLERGEN_FRUIT //Made from gin(fruit) /datum/reagent/ethanol/goldschlager - name = "Goldschlager" - id = "goldschlager" + name = REAGENT_GOLDSCHLAGER + id = REAGENT_ID_GOLDSCHLAGER description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break." taste_description = "burning cinnamon" taste_mult = 1.3 color = "#F4E46D" strength = 15 - glass_name = "Goldschlager" + glass_name = REAGENT_GOLDSCHLAGER glass_desc = "100 proof that teen girls will drink anything with gold in it." allergen_type = ALLERGEN_GRAINS //Made from vodka(grains) /datum/reagent/ethanol/hippies_delight - name = "Hippies' Delight" - id = "hippiesdelight" + name = REAGENT_HIPPIESDELIGHT + id = REAGENT_ID_HIPPIESDELIGHT description = "You just don't get it maaaan." taste_description = "giving peace a chance" reagent_state = LIQUID @@ -3819,20 +3808,20 @@ //Also, yes. Mushrooms produce psilocybin; however, it's also still just a chemical compound, and not necessarily going to trigger a fungi allergy. /datum/reagent/ethanol/hooch - name = "Hooch" - id = "hooch" + name = REAGENT_HOOCH + id = REAGENT_ID_HOOCH description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?" taste_description = "pure alcohol" color = "#4C3100" strength = 25 toxicity = 2 - glass_name = "Hooch" + glass_name = REAGENT_HOOCH glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." /datum/reagent/ethanol/iced_beer - name = "Iced Beer" - id = "iced_beer" + name = REAGENT_ICEDBEER + id = REAGENT_ID_ICEDBEER description = "A beer which is so cold the air around it freezes." taste_description = "refreshingly cold" color = "#FFD300" @@ -3846,21 +3835,21 @@ allergen_type = ALLERGEN_GRAINS //Made from beer(grains) /datum/reagent/ethanol/irishcarbomb - name = "Irish Car Bomb" - id = "irishcarbomb" + name = REAGENT_IRISHCARBOMB + id = REAGENT_ID_IRISHCARBOMB description = "Mmm, tastes like chocolate cake..." taste_description = "delicious anger" color = "#2E6671" strength = 15 - glass_name = "Irish Car Bomb" + glass_name = REAGENT_IRISHCARBOMB glass_desc = "An irish car bomb." allergen_type = ALLERGEN_DAIRY|ALLERGEN_GRAINS //Made from ale(grains) and irish cream(whiskey(grains), cream(dairy)) /datum/reagent/ethanol/coffee/irishcoffee - name = "Irish Coffee" - id = "irishcoffee" + name = REAGENT_IRISHCOFFEE + id = REAGENT_ID_IRISHCOFFEE description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." taste_description = "giving up on the day" color = "#4C3100" @@ -3872,8 +3861,8 @@ allergen_type = ALLERGEN_COFFEE|ALLERGEN_DAIRY|ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from Coffee(coffee/caffeine) and irish cream(whiskey(grains), cream(dairy)) /datum/reagent/ethanol/irish_cream - name = "Irish Cream" - id = "irishcream" + name = REAGENT_IRISHCREAM + id = REAGENT_ID_IRISHCREAM description = "Whiskey-imbued cream, what else would you expect from the Irish." taste_description = "creamy alcohol" color = "#DDD9A3" @@ -3885,8 +3874,8 @@ allergen_type = ALLERGEN_DAIRY|ALLERGEN_GRAINS //Made from cream(dairy) and whiskey(grains) /datum/reagent/ethanol/longislandicedtea - name = "Long Island Iced Tea" - id = "longislandicedtea" + name = REAGENT_LONGISLANDICEDTEA + id = REAGENT_ID_LONGISLANDICEDTEA description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." taste_description = "sweet tea, with a kick" color = "#895B1F" @@ -3898,60 +3887,60 @@ allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from vodka(grains), cola(caffeine) and gin(fruit) /datum/reagent/ethanol/manhattan - name = "Manhattan" - id = "manhattan" + name = REAGENT_MANHATTAN + id = REAGENT_ID_MANHATTAN description = "The Detective's undercover drink of choice. He never could stomach gin..." taste_description = "mild dryness" color = "#C13600" strength = 15 - glass_name = "Manhattan" + glass_name = REAGENT_MANHATTAN glass_desc = "The Detective's undercover drink of choice. He never could stomach gin..." allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from whiskey(grains), and vermouth(fruit) /datum/reagent/ethanol/manhattan_proj - name = "Manhattan Project" - id = "manhattan_proj" + name = REAGENT_MANHATTANPROJ + id = REAGENT_ID_MANHATTANPROJ description = "A scientist's drink of choice, for pondering ways to blow up the station." taste_description = "death, the destroyer of worlds" color = "#C15D00" strength = 10 druggy = 30 - glass_name = "Manhattan Project" + glass_name = REAGENT_MANHATTANPROJ glass_desc = "A scientist's drink of choice, for thinking how to blow up the station." allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from manhattan which is made from whiskey(grains), and vermouth(fruit) /datum/reagent/ethanol/manly_dorf - name = "The Manly Dorf" - id = "manlydorf" + name = REAGENT_MANLYDORF + id = REAGENT_ID_MANLYDORF description = "Beer and Ale, brought together in a delicious mix. Intended for true men only." taste_description = "hair on your chest and your chin" color = "#4C3100" strength = 25 - glass_name = "The Manly Dorf" + glass_name = REAGENT_MANLYDORF glass_desc = "A manly concotion made from Ale and Beer. Intended for true men only." allergen_type = ALLERGEN_GRAINS //Made from beer(grains) and ale(grains) /datum/reagent/ethanol/margarita - name = "Margarita" - id = "margarita" + name = REAGENT_MARGARITA + id = REAGENT_ID_MARGARITA description = "On the rocks with salt on the rim. Arriba~!" taste_description = "dry and salty" color = "#8CFF8C" strength = 15 - glass_name = "margarita" + glass_name = REAGENT_ID_MARGARITA glass_desc = "On the rocks with salt on the rim. Arriba~!" allergen_type = ALLERGEN_FRUIT //Made from lime juice(fruit) /datum/reagent/ethanol/mead - name = "Mead" - id = "mead" + name = REAGENT_MEAD + id = REAGENT_ID_MEAD description = "A Viking's drink, though a cheap one." taste_description = "sweet yet alcoholic" reagent_state = LIQUID @@ -3959,31 +3948,31 @@ strength = 30 nutriment_factor = 1 - glass_name = "mead" + glass_name = REAGENT_ID_MEAD glass_desc = "A Viking's beverage, though a cheap one." /datum/reagent/ethanol/moonshine - name = "Moonshine" - id = "moonshine" + name = REAGENT_MOONSHINE + id = REAGENT_ID_MOONSHINE description = "You've really hit rock bottom now... your liver packed its bags and left last night." taste_description = "bitterness" taste_mult = 2.5 color = "#0064C8" strength = 12 - glass_name = "moonshine" + glass_name = REAGENT_ID_MOONSHINE glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." /datum/reagent/ethanol/neurotoxin - name = "Neurotoxin" - id = "neurotoxin" + name = REAGENT_NEUROTOXIN + id = REAGENT_ID_NEUROTOXIN description = "A strong neurotoxin that puts the subject into a death-like state." taste_description = "a numbing sensation" reagent_state = LIQUID color = "#2E2E61" strength = 10 - glass_name = "Neurotoxin" + glass_name = REAGENT_NEUROTOXIN glass_desc = "A drink that is guaranteed to knock you silly." glass_icon = DRINK_ICON_NOISY glass_special = list("neuroright") @@ -3997,19 +3986,19 @@ M.Weaken(3) /datum/reagent/ethanol/patron - name = "Patron" - id = "patron" + name = REAGENT_PATRON + id = REAGENT_ID_PATRON description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." taste_description = "metallic paint thinner" color = "#585840" strength = 30 - glass_name = "Patron" + glass_name = REAGENT_PATRON glass_desc = "Drinking patron in the bar, with all the subpar ladies." /datum/reagent/ethanol/red_mead - name = "Red Mead" - id = "red_mead" + name = REAGENT_REDMEAD + id = REAGENT_ID_REDMEAD description = "The true Viking's drink! Even though it has a strange red color." taste_description = "sweet and salty alcohol" color = "#C73C00" @@ -4019,8 +4008,8 @@ glass_desc = "A true Viking's beverage, though its color is strange." /datum/reagent/ethanol/sbiten - name = "Sbiten" - id = "sbiten" + name = REAGENT_SBITEN + id = REAGENT_ID_SBITEN description = "A spicy Vodka! Might be a bit hot for the little guys!" taste_description = "hot and spice" color = "#FFA371" @@ -4028,27 +4017,27 @@ adj_temp = 50 targ_temp = 360 - glass_name = "Sbiten" + glass_name = REAGENT_SBITEN glass_desc = "A spicy mix of Vodka and Spice. Very hot." allergen_type = ALLERGEN_GRAINS //Made from vodka(grains) /datum/reagent/ethanol/screwdrivercocktail - name = "Screwdriver" - id = "screwdrivercocktail" + name = REAGENT_SCREWDRIVERCOCKTAIL + id = REAGENT_ID_SCREWDRIVERCOCKTAIL description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." taste_description = "oranges" color = "#A68310" strength = 15 - glass_name = "Screwdriver" + glass_name = REAGENT_SCREWDRIVERCOCKTAIL glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from vodka(grains) and orange juice(fruit) /datum/reagent/ethanol/silencer - name = "Silencer" - id = "silencer" + name = REAGENT_SILENCER + id = REAGENT_ID_SILENCER description = "A drink from " + JOB_MIME + " Heaven." taste_description = "a pencil eraser" taste_mult = 1.2 @@ -4056,65 +4045,65 @@ color = "#FFFFFF" strength = 12 - glass_name = "Silencer" + glass_name = REAGENT_SILENCER glass_desc = "A drink from mime Heaven." allergen_type = ALLERGEN_DAIRY //Made from cream (dairy) /datum/reagent/ethanol/singulo - name = "Singulo" - id = "singulo" + name = REAGENT_SINGULO + id = REAGENT_ID_SINGULO description = "A blue-space beverage!" taste_description = "concentrated matter" color = "#2E6671" strength = 10 - glass_name = "Singulo" + glass_name = REAGENT_SINGULO glass_desc = "A blue-space beverage." allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from vodka(grains) and wine(fruit) /datum/reagent/ethanol/snowwhite - name = "Snow White" - id = "snowwhite" + name = REAGENT_SNOWWHITE + id = REAGENT_ID_SNOWWHITE description = "A cold refreshment" taste_description = "refreshing cold" color = "#FFFFFF" strength = 30 - glass_name = "Snow White" + glass_name = REAGENT_SNOWWHITE glass_desc = "A cold refreshment." allergen_type = ALLERGEN_COFFEE|ALLERGEN_FRUIT|ALLERGEN_STIMULANT //made from Pineapple juice(fruit), lemon_lime(fruit), and kahlua(coffee/caffine) /datum/reagent/ethanol/suidream - name = "Sui Dream" - id = "suidream" + name = REAGENT_SUIDREAM + id = REAGENT_ID_SUIDREAM description = "Comprised of: White soda, blue curacao, melon liquor." taste_description = "fruit" color = "#00A86B" strength = 100 - glass_name = "Sui Dream" + glass_name = REAGENT_SUIDREAM glass_desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame." allergen_type = ALLERGEN_FRUIT //Made from blue curacao(fruit) and melon liquor(fruit) /datum/reagent/ethanol/syndicatebomb - name = "Syndicate Bomb" - id = "syndicatebomb" + name = REAGENT_SYNDICATEBOMB + id = REAGENT_ID_SYNDICATEBOMB description = "Tastes like terrorism!" taste_description = "strong alcohol" color = "#2E6671" strength = 10 - glass_name = "Syndicate Bomb" + glass_name = REAGENT_SYNDICATEBOMB glass_desc = "Tastes like terrorism!" allergen_type = ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from beer(grain) and whiskeycola(whiskey(grain) and cola(caffeine)) /datum/reagent/ethanol/tequilla_sunrise - name = "Tequila Sunrise" - id = "tequillasunrise" + name = REAGENT_TEQUILLASUNRISE + id = REAGENT_ID_TEQUILLASUNRISE description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~." taste_description = "oranges" color = "#FFE48C" @@ -4124,8 +4113,8 @@ glass_desc = "Oh great, now you feel nostalgic about sunrises back on Earth..." /datum/reagent/ethanol/threemileisland - name = "Three Mile Island Iced Tea" - id = "threemileisland" + name = REAGENT_THREEMILEISLAND + id = REAGENT_ID_THREEMILEISLAND description = "Made for a woman, strong enough for a man." taste_description = "dry" color = "#666340" @@ -4138,8 +4127,8 @@ allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from long island iced tea(vodka(grains) and gin(fruit)) /datum/reagent/ethanol/toxins_special - name = "Toxins Special" - id = "phoronspecial" + name = REAGENT_PHORONSPECIAL + id = REAGENT_ID_PHORONSPECIAL description = "This thing is literally on fire!" taste_description = "spicy toxins" reagent_state = LIQUID @@ -4148,14 +4137,14 @@ adj_temp = 15 targ_temp = 330 - glass_name = "Toxins Special" + glass_name = REAGENT_PHORONSPECIAL glass_desc = "Whoah, this thing is on fire!" allergen_type = ALLERGEN_FRUIT //Made from vermouth(fruit) /datum/reagent/ethanol/vodkamartini - name = "Vodka Martini" - id = "vodkamartini" + name = REAGENT_VODKAMARTINI + id = REAGENT_ID_VODKAMARTINI description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." taste_description = "shaken, not stirred" color = "#0064C8" @@ -4167,8 +4156,8 @@ allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //made from vodka(grains) and vermouth(fruit) /datum/reagent/ethanol/vodkatonic - name = "Vodka and Tonic" - id = "vodkatonic" + name = REAGENT_VODKATONIC + id = REAGENT_ID_VODKATONIC description = "For when a gin and tonic isn't Russian enough." taste_description = "tart bitterness" color = "#0064C8" // rgb: 0, 100, 200 @@ -4180,21 +4169,21 @@ allergen_type = ALLERGEN_GRAINS //Made from vodka(grains) /datum/reagent/ethanol/white_russian - name = "White Russian" - id = "whiterussian" + name = REAGENT_WHITERUSSIAN + id = REAGENT_ID_WHITERUSSIAN description = "That's just, like, your opinion, man..." taste_description = "coffee icecream" color = "#A68340" strength = 15 - glass_name = "White Russian" + glass_name = REAGENT_WHITERUSSIAN glass_desc = "A very nice looking drink. But that's just, like, your opinion, man." allergen_type = ALLERGEN_COFFEE|ALLERGEN_GRAINS|ALLERGEN_DAIRY|ALLERGEN_STIMULANT //Made from black russian(vodka(grains), kahlua(coffee/caffeine)) and cream(dairy) /datum/reagent/ethanol/whiskey_cola - name = "Whiskey Cola" - id = "whiskeycola" + name = REAGENT_WHISKEYCOLA + id = REAGENT_ID_WHISKEYCOLA description = "Whiskey, mixed with cola. Surprisingly refreshing." taste_description = "cola with an alcoholic undertone" color = "#3E1B00" @@ -4206,8 +4195,8 @@ allergen_type = ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from whiskey(grains) and cola(caffeine) /datum/reagent/ethanol/whiskeysoda - name = "Whiskey Soda" - id = "whiskeysoda" + name = REAGENT_WHISKEYSODA + id = REAGENT_ID_WHISKEYSODA description = "Ultimate refreshment." taste_description = "carbonated whiskey" color = "#EAB300" @@ -4219,8 +4208,8 @@ allergen_type = ALLERGEN_GRAINS //Made from whiskey(grains) /datum/reagent/ethanol/specialwhiskey // I have no idea what this is and where it comes from - name = "Special Blend Whiskey" - id = "specialwhiskey" + name = REAGENT_SPECIALWHISKEY + id = REAGENT_ID_SPECIALWHISKEY description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything. The smell of it singes your nostrils." taste_description = "unspeakable whiskey bliss" color = "#523600" @@ -4232,8 +4221,8 @@ allergen_type = ALLERGEN_GRAINS //Whiskey(grains) /datum/reagent/ethanol/unathiliquor - name = "Redeemer's Brew" - id = "unathiliquor" + name = REAGENT_UNATHILIQUOR + id = REAGENT_ID_UNATHILIQUOR description = "This barely qualifies as a drink, and could give jet fuel a run for its money. Also known to cause feelings of euphoria and numbness." taste_description = "spiced numbness" color = "#242424" @@ -4258,219 +4247,219 @@ step(M, pick(cardinal)) /datum/reagent/ethanol/sakebomb - name = "Sake Bomb" - id = "sakebomb" + name = REAGENT_SAKEBOMB + id = REAGENT_ID_SAKEBOMB description = "Alcohol in more alcohol." taste_description = "thick, dry alcohol" color = "#FFFF7F" strength = 12 nutriment_factor = 1 - glass_name = "Sake Bomb" + glass_name = REAGENT_SAKEBOMB glass_desc = "Some sake mixed into a pint of beer." allergen_type = ALLERGEN_GRAINS //Made from beer(grains) /datum/reagent/ethanol/tamagozake - name = "Tamagozake" - id = "tamagozake" + name = REAGENT_TAMAGOZAKE + id = REAGENT_ID_TAMAGOZAKE description = "Sake, egg, and sugar. A disgusting folk cure." taste_description = "eggy booze" color = "#E8C477" strength = 30 nutriment_factor = 3 - glass_name = "Tamagozake" + glass_name = REAGENT_TAMAGOZAKE glass_desc = "An egg cracked into sake and sugar." allergen_type = ALLERGEN_EGGS //Made with eggs /datum/reagent/ethanol/ginzamary - name = "Ginza Mary" - id = "ginzamary" + name = REAGENT_GINZAMARY + id = REAGENT_ID_GINZAMARY description = "An alcoholic drink made with vodka, sake, and juices." taste_description = "spicy tomato sake" color = "#FF3232" strength = 25 - glass_name = "Ginza Mary" + glass_name = REAGENT_GINZAMARY glass_desc = "Tomato juice, vodka, and sake make something not quite completely unlike a Bloody Mary." allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from vodka(grains) and tomatojuice(fruit) /datum/reagent/ethanol/tokyorose - name = "Tokyo Rose" - id = "tokyorose" + name = REAGENT_TOKYOROSE + id = REAGENT_ID_TOKYOROSE description = "A pale pink cocktail made with sake and berry juice." taste_description = "fruity booze" color = "#FA8072" strength = 35 - glass_name = "Tokyo Rose" + glass_name = REAGENT_TOKYOROSE glass_desc = "It's kinda pretty!" allergen_type = ALLERGEN_FRUIT //Made from berryjuice /datum/reagent/ethanol/saketini - name = "Saketini" - id = "saketini" + name = REAGENT_SAKETINI + id = REAGENT_ID_SAKETINI description = "For when you're too weeb for a real martini." taste_description = "dry alcohol" color = "#0064C8" strength = 15 - glass_name = "Saketini" + glass_name = REAGENT_SAKETINI glass_desc = "What are you doing drinking this outside of New Kyoto?" allergen_type = ALLERGEN_FRUIT //Made from gin(fruit) /datum/reagent/ethanol/coffee/elysiumfacepunch - name = "Elysium Facepunch" - id = "elysiumfacepunch" + name = REAGENT_ELYSIUMFACEPUNCH + id = REAGENT_ID_ELYSIUMFACEPUNCH description = "A loathesome cocktail favored by Heaven's skeleton shift workers." taste_description = "sour coffee" color = "#8f7729" strength = 20 - glass_name = "Elysium Facepunch" + glass_name = REAGENT_ELYSIUMFACEPUNCH glass_desc = "A loathesome cocktail favored by Heaven's skeleton shift workers." allergen_type = ALLERGEN_COFFEE|ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from kahlua(Coffee/caffeine) and lemonjuice(fruit) /datum/reagent/ethanol/erebusmoonrise - name = "Erebus Moonrise" - id = "erebusmoonrise" + name = REAGENT_EREBUSMOONRISE + id = REAGENT_ID_EREBUSMOONRISE description = "A deeply alcoholic mix, popular in Nyx." taste_description = "hard alcohol" color = "#947459" strength = 10 - glass_name = "Erebus Moonrise" + glass_name = REAGENT_EREBUSMOONRISE glass_desc = "A deeply alcoholic mix, popular in Nyx." allergen_type = ALLERGEN_GRAINS //Made from whiskey(grains) and Vodka(grains) /datum/reagent/ethanol/balloon - name = "Balloon" - id = "balloon" + name = REAGENT_BALLOON + id = REAGENT_ID_BALLOON description = "A strange drink invented in the aerostats of Venus." taste_description = "strange alcohol" color = "#FAEBD7" strength = 66 - glass_name = "Balloon" + glass_name = REAGENT_BALLOON glass_desc = "A strange drink invented in the aerostats of Venus." allergen_type = ALLERGEN_DAIRY|ALLERGEN_FRUIT //Made from blue curacao(fruit) and cream(dairy) /datum/reagent/ethanol/natunabrandy - name = "Natuna Brandy" - id = "natunabrandy" + name = REAGENT_NATUNABRANDY + id = REAGENT_ID_NATUNABRANDY description = "On Natuna, they do the best with what they have." taste_description = "watered-down beer" color = "#FFFFCC" strength = 80 - glass_name = "Natuna Brandy" + glass_name = REAGENT_NATUNABRANDY glass_desc = "On Natuna, they do the best with what they have." glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_GRAINS //Made from beer(grains) /datum/reagent/ethanol/euphoria - name = "Euphoria" - id = "euphoria" + name = REAGENT_EUPHORIA + id = REAGENT_ID_EUPHORIA description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence." taste_description = "impossibly rich alcohol" color = "#614126" strength = 9 - glass_name = "Euphoria" + glass_name = REAGENT_EUPHORIA glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence." allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from specialwhiskey(grain) and cognac(fruit) /datum/reagent/ethanol/xanaducannon - name = "Xanadu Cannon" - id = "xanaducannon" + name = REAGENT_XANADUCANNON + id = REAGENT_ID_XANADUCANNON description = "Common in the entertainment districts of Titan." taste_description = "sweet alcohol" color = "#614126" strength = 50 - glass_name = "Xanadu Cannon" + glass_name = REAGENT_XANADUCANNON glass_desc = "Common in the entertainment districts of Titan." allergen_type = ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from ale(grain) and dr.gibb(caffeine) /datum/reagent/ethanol/debugger - name = "Debugger" - id = "debugger" + name = REAGENT_DEBUGGER + id = REAGENT_ID_DEBUGGER description = "From Shelf. Not for human consumption." taste_description = "oily bitterness" color = "#d3d3d3" strength = 32 - glass_name = "Debugger" + glass_name = REAGENT_DEBUGGER glass_desc = "From Shelf. Not for human consumption." allergen_type = ALLERGEN_VEGETABLE //Made from corn oil(vegetable) /datum/reagent/ethanol/spacersbrew - name = "Spacer's Brew" - id = "spacersbrew" + name = REAGENT_SPACERSBREW + id = REAGENT_ID_SPACERSBREW description = "Ethanol and orange soda. A common emergency drink on frontier colonies." taste_description = "bitter oranges" color = "#ffc04c" strength = 43 - glass_name = "Spacer's Brew" + glass_name = REAGENT_SPACERSBREW glass_desc = "Ethanol and orange soda. A common emergency drink on frontier colonies." allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from brownstar(orange juice(fruit) + cola(caffeine) /datum/reagent/ethanol/binmanbliss - name = "Binman Bliss" - id = "binmanbliss" + name = REAGENT_BINMANBLISS + id = REAGENT_ID_BINMANBLISS description = "A dry cocktail popular on Binma." taste_description = "very dry alcohol" color = "#c3c3c3" strength = 24 - glass_name = "Binman Bliss" + glass_name = REAGENT_BINMANBLISS glass_desc = "A dry cocktail popular on Binma." /datum/reagent/ethanol/chrysanthemum - name = "Chrysanthemum" - id = "chrysanthemum" + name = REAGENT_CHRYSANTHEMUM + id = REAGENT_ID_CHRYSANTHEMUM description = "An exotic cocktail from New Kyoto." taste_description = "fruity liquor" color = "#9999FF" strength = 35 - glass_name = "Chrysanthemum" + glass_name = REAGENT_CHRYSANTHEMUM glass_desc = "An exotic cocktail from New Kyoto." allergen_type = ALLERGEN_FRUIT //Made from melon liquor(fruit) /datum/reagent/ethanol/bitters - name = "Bitters" - id = "bitters" + name = REAGENT_BITTERS + id = REAGENT_ID_BITTERS description = "An aromatic, typically alcohol-based infusions of bittering botanticals and flavoring agents like fruit peels, spices, dried flowers, and herbs." taste_description = "sharp bitterness" color = "#9b6241" // rgb(155, 98, 65) strength = 50 - glass_name = "Bitters" + glass_name = REAGENT_BITTERS glass_desc = "An aromatic, typically alcohol-based infusions of bittering botanticals and flavoring agents like fruit peels, spices, dried flowers, and herbs." /datum/reagent/ethanol/soemmerfire - name = "Soemmer Fire" - id = "soemmerfire" + name = REAGENT_SOEMMERFIRE + id = REAGENT_ID_SOEMMERFIRE description = "A painfully hot mixed drink, for when you absolutely need to hurt right now." taste_description = "pure fire" color = "#d13b21" // rgb(209, 59, 33) strength = 25 - glass_name = "Soemmer Fire" + glass_name = REAGENT_SOEMMERFIRE glass_desc = "A painfully hot mixed drink, for when you absolutely need to hurt right now." allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from manhattan(whiskey(grains), vermouth(fruit)) @@ -4482,66 +4471,66 @@ M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT /datum/reagent/ethanol/winebrandy - name = "Wine Brandy" - id = "winebrandy" + name = REAGENT_WINEBRANDY + id = REAGENT_ID_WINEBRANDY description = "A premium spirit made from distilled wine." taste_description = "very sweet dried fruit with many elegant notes" color = "#4C130B" // rgb(76,19,11) strength = 20 - glass_name = "Wine Brandy" + glass_name = REAGENT_WINEBRANDY glass_desc = "A very classy looking after-dinner drink." allergen_type = ALLERGEN_FRUIT //Made from wine, which is made from fruit /datum/reagent/ethanol/morningafter - name = "Morning After" - id = "morningafter" + name = REAGENT_MORNINGAFTER + id = REAGENT_ID_MORNINGAFTER description = "The finest hair of the dog, coming up!" taste_description = "bitter regrets" color = "#482000" // rgb(72, 32, 0) strength = 60 - glass_name = "Morning After" + glass_name = REAGENT_MORNINGAFTER glass_desc = "The finest hair of the dog, coming up!" allergen_type = ALLERGEN_GRAINS|ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made from sbiten(vodka(grain)) and coffee(coffee/caffine) /datum/reagent/ethanol/vesper - name = "Vesper" - id = "vesper" + name = REAGENT_VESPER + id = REAGENT_ID_VESPER description = "A dry martini, ice cold and well shaken." taste_description = "lemony class" color = "#cca01c" // rgb(204, 160, 28) strength = 20 - glass_name = "Vesper" + glass_name = REAGENT_VESPER glass_desc = "A dry martini, ice cold and well shaken." allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from wine(fruit), vodka(grain), and gin(fruit) /datum/reagent/ethanol/rotgut - name = "Rotgut Fever Dream" - id = "rotgut" + name = REAGENT_ROTGUT + id = REAGENT_ID_ROTGUT description = "A heinous combination of clashing flavors." taste_description = "plague and coldsweats" color = "#3a6617" // rgb(58, 102, 23) strength = 10 - glass_name = "Rotgut Fever Dream" + glass_name = REAGENT_ROTGUT glass_desc = "Why are you doing this to yourself?" allergen_type = ALLERGEN_GRAINS|ALLERGEN_STIMULANT //Made from whiskey(grains), cola (caffeine) and vodka(grains) /datum/reagent/ethanol/voxdelight - name = "Vox's Delight" - id = "voxdelight" + name = REAGENT_VOXDELIGHT + id = REAGENT_ID_VOXDELIGHT description = "A dangerous combination of all things flammable. Why would you drink this?" taste_description = "corrosive death" color = "#7c003a" // rgb(124, 0, 58) strength = 10 - glass_name = "Vox's Delight" + glass_name = REAGENT_VOXDELIGHT glass_desc = "Not recommended if you enjoy having organs." /datum/reagent/ethanol/voxdelight/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -4554,66 +4543,66 @@ M.adjustToxLoss(3 * removed) /datum/reagent/ethanol/screamingviking - name = "Screaming Viking" - id = "screamingviking" + name =REAGENT_SCREAMINGVIKING + id = REAGENT_ID_SCREAMINGVIKING description = "A boozy, citrus-packed brew." taste_description = "the bartender's frustration" color = "#c6c603" // rgb(198, 198, 3) strength = 9 - glass_name = "Screaming Viking" + glass_name =REAGENT_SCREAMINGVIKING glass_desc = "A boozy, citrus-packed brew." allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from martini(gin(fruit), vermouth(fruit)), vodka tonic(vodka(grain)), and lime juice(fruit) /datum/reagent/ethanol/robustin - name = "Robustin" - id = "robustin" + name = REAGENT_ROBUSTIN + id = REAGENT_ID_ROBUSTIN description = "A bootleg brew of all the worst things on station." taste_description = "cough syrup and fire" color = "#6b0145" // rgb(107, 1, 69) strength = 10 - glass_name = "Robustin" + glass_name = REAGENT_ROBUSTIN glass_desc = "A bootleg brew of all the worst things on station." allergen_type = ALLERGEN_GRAINS|ALLERGEN_DAIRY //Made from antifreeze(vodka(grains),cream(dairy)) and vodka(grains) /datum/reagent/ethanol/virginsip - name = "Virgin Sip" - id = "virginsip" + name = REAGENT_VIRGINSIP + id = REAGENT_ID_VIRGINSIP description = "A perfect martini, watered down and ruined." taste_description = "emasculation and failure" color = "#2E6671" // rgb(46, 102, 113) strength = 60 - glass_name = "Virgin Sip" + glass_name = REAGENT_VIRGINSIP glass_desc = "A perfect martini, watered down and ruined." allergen_type = ALLERGEN_FRUIT //Made from driest martini(gin(fruit)) /datum/reagent/ethanol/jellyshot - name = "Jelly Shot" - id = "jellyshot" + name = REAGENT_JELLYSHOT + id = REAGENT_ID_JELLYSHOT description = "A thick and vibrant alcoholic gel, perfect for the night life." taste_description = "thick, alcoholic cherry gel" color = "#e00b0b" // rgb(224, 11, 11) strength = 10 - glass_name = "Jelly Shot" + glass_name = REAGENT_JELLYSHOT glass_desc = "A thick and vibrant alcoholic gel, perfect for the night life." allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from cherry jelly(fruit), and vodka(grains) /datum/reagent/ethanol/slimeshot - name = "Named Bullet" - id = "slimeshot" + name = REAGENT_SLIMESHOT + id = REAGENT_ID_SLIMESHOT description = "A thick and toxic slime jelly shot." taste_description = "liquified organs" color = "#6fa300" // rgb(111, 163, 0) strength = 10 - glass_name = "Named Bullet" + glass_name = REAGENT_SLIMESHOT glass_desc = "A thick slime jelly shot. You can feel your death approaching." allergen_type = ALLERGEN_GRAINS //Made from vodka(grains) @@ -4625,114 +4614,114 @@ M.reagents.add_reagent(REAGENT_ID_SLIMEJELLY, 0.25) /datum/reagent/ethanol/cloverclub - name = "Clover Club" - id = "cloverclub" + name = REAGENT_CLOVERCLUB + id = REAGENT_ID_CLOVERCLUB description = "A light and refreshing raspberry cocktail." taste_description = "sweet raspberry" color = "#dd00a6" // rgb(221, 0, 166) strength = 30 - glass_name = "Clover Club" + glass_name = REAGENT_CLOVERCLUB glass_desc = "A light and refreshing raspberry cocktail." allergen_type = ALLERGEN_FRUIT //Made from berry juice(fruit), lemon juice(fruit), and gin(fruit) /datum/reagent/ethanol/negroni - name = "Negroni" - id = "negroni" + name = REAGENT_NEGRONI + id = REAGENT_ID_NEGRONI description = "A dark, complicated mix of gin and campari... classy." taste_description = "summer nights and wood smoke" color = "#77000d" // rgb(119, 0, 13) strength = 25 - glass_name = "Negroni" + glass_name = REAGENT_NEGRONI glass_desc = "A dark, complicated blend, perfect for relaxing nights by the fire." allergen_type = ALLERGEN_FRUIT //Made from gin(fruit) and vermouth(fruit) /datum/reagent/ethanol/whiskeysour - name = "Whiskey Sour" - id = "whiskeysour" + name = REAGENT_WHISKEYSOUR + id = REAGENT_ID_WHISKEYSOUR description = "A smokey, refreshing lemoned whiskey." taste_description = "smoke and citrus" color = "#a0692e" // rgb(160, 105, 46) strength = 20 - glass_name = "Whiskey Sour" + glass_name = REAGENT_WHISKEYSOUR glass_desc = "A smokey, refreshing lemoned whiskey." allergen_type = ALLERGEN_GRAINS|ALLERGEN_FRUIT //Made from whiskey(grains) and lemon juice(fruit) /datum/reagent/ethanol/oldfashioned - name = "Old Fashioned" - id = "oldfashioned" + name = REAGENT_OLDFASHIONED + id = REAGENT_ID_OLDFASHIONED description = "A classic mix of whiskey and sugar... simple and direct." taste_description = "smokey, divine whiskey" color = "#774410" // rgb(119, 68, 16) strength = 15 - glass_name = "Old Fashioned" + glass_name = REAGENT_OLDFASHIONED glass_desc = "A classic mix of whiskey and sugar... simple and direct." allergen_type = ALLERGEN_GRAINS //Made from whiskey(grains) /datum/reagent/ethanol/daiquiri - name = "Daiquiri" - id = "daiquiri" + name = REAGENT_DAIQUIRI + id = REAGENT_ID_DAIQUIRI description = "Refeshing rum and citrus. Time for a tropical get away." taste_description = "refreshing citrus and rum" color = "#d1ff49" // rgb(209, 255, 73 strength = 25 - glass_name = "Daiquiri" + glass_name = REAGENT_DAIQUIRI glass_desc = "Refeshing rum and citrus. Time for a tropical get away." allergen_type = ALLERGEN_FRUIT //Made from lime juice(fruit) /datum/reagent/ethanol/mojito - name = "Mojito" - id = "mojito" + name = REAGENT_MOJITO + id = REAGENT_ID_MOJITO description = "Minty rum and citrus, made for sailing." taste_description = "minty rum and lime" color = "#d1ff49" // rgb(209, 255, 73 strength = 30 - glass_name = "Mojito" + glass_name = REAGENT_MOJITO glass_desc = "Minty rum and citrus, made for sailing." glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_FRUIT //Made from lime juice(fruit) /datum/reagent/ethanol/paloma - name = "Paloma" - id = "paloma" + name = REAGENT_PALOMA + id = REAGENT_ID_PALOMA description = "Tequila and citrus, iced just right..." taste_description = "grapefruit and cold fire" color = "#ffb070" // rgb(255, 176, 112) strength = 20 - glass_name = "Paloma" + glass_name = REAGENT_PALOMA glass_desc = "Tequila and citrus, iced just right..." glass_special = list(DRINK_FIZZ) allergen_type = ALLERGEN_FRUIT //Made from orange juice(fruit) /datum/reagent/ethanol/piscosour - name = "Pisco Sour" - id = "piscosour" + name = REAGENT_PISCOSOUR + id = REAGENT_ID_PISCOSOUR description = "Wine Brandy, Lemon, and a dream. A South American classic" taste_description = "light sweetness" color = "#f9f96b" // rgb(249, 249, 107) strength = 30 - glass_name = "Pisco Sour" + glass_name = REAGENT_PISCOSOUR glass_desc = "South American bliss, served ice cold." allergen_type = ALLERGEN_FRUIT //Made from wine brandy(fruit), and lemon juice(fruit) /datum/reagent/ethanol/coldfront - name = "Cold Front" - id = "coldfront" + name = REAGENT_COLDFRONT + id = REAGENT_ID_COLDFRONT description = "Minty, rich, and painfully cold. It's a blizzard in a cup." taste_description = "biting cold" color = "#ffe8c4" // rgb(255, 232, 196) @@ -4740,26 +4729,26 @@ adj_temp = -20 targ_temp = 220 //Dangerous to certain races. Drink in moderation. - glass_name = "Cold Front" + glass_name = REAGENT_COLDFRONT glass_desc = "Minty, rich, and painfully cold. It's a blizzard in a cup." allergen_type = ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made from iced coffee(coffee) /datum/reagent/ethanol/mintjulep - name = "Mint Julep" - id = "mintjulep" + name = REAGENT_MINTJULEP + id = REAGENT_ID_MINTJULEP description = "Minty and refreshing, perfect for a hot day." taste_description = "refreshing mint" color = "#bbfc8a" // rgb(187, 252, 138) strength = 25 adj_temp = -5 - glass_name = "Mint Julep" + glass_name = REAGENT_MINTJULEP glass_desc = "Minty and refreshing, perfect for a hot day." /datum/reagent/ethanol/godsake - name = "Gods Sake" - id = "godsake" + name = REAGENT_GODSAKE + id = REAGENT_ID_GODSAKE description = "Anime's favorite drink." taste_description = "the power of god and anime" color = "#DDDDDD" @@ -4769,14 +4758,14 @@ glass_desc = "A glass of sake." /datum/reagent/ethanol/godka - name = "Godka" - id = "godka" + name = REAGENT_GODKA + id = REAGENT_ID_GODKA description = "Number one drink AND fueling choice for Russians multiverse-wide." taste_description = "russian steel and a hint of grain" color = "#0064C8" strength = 50 - glass_name = "Godka" + glass_name = REAGENT_GODKA glass_desc = "The glass is barely able to contain the wodka. Xynta." glass_special = list(DRINK_FIZZ) @@ -4801,35 +4790,35 @@ M.adjustToxLoss(adjust_tox * removed) /datum/reagent/ethanol/holywine - name = "Angel Ichor" - id = "holywine" + name = REAGENT_HOLYWINE + id = REAGENT_ID_HOLYWINE description = "A premium alcoholic beverage made from distilled angel blood." taste_description = "wings in a glass, and a hint of grape" color = "#C4921E" strength = 20 - glass_name = "Angel Ichor" + glass_name = REAGENT_HOLYWINE glass_desc = "A very pious looking drink." glass_icon = DRINK_ICON_NOISY allergen_type = ALLERGEN_FRUIT //Made from grapes(fruit) /datum/reagent/ethanol/holy_mary - name = "Holy Mary" - id = "holymary" + name = REAGENT_HOLYMARY + id = REAGENT_ID_HOLYMARY description = "A strange yet pleasurable mixture made of vodka, angel's ichor and lime juice. Or at least you THINK the yellow stuff is angel's ichor." taste_description = "grapes with a hint of lime" color = "#DCAE12" strength = 20 - glass_name = "Holy Mary" + glass_name = REAGENT_HOLYMARY glass_desc = "Angel's Ichor, mixed with Vodka and a lil' bit of lime. Tastes like liquid ascension." allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from vodka(grain), holy wine(fruit), and lime juice(fruit) /datum/reagent/ethanol/angelswrath - name = "Angels Wrath" - id = "angelswrath" + name = REAGENT_ANGELSWRATH + id = REAGENT_ID_ANGELSWRATH description = "This thing makes the hair on the back of your neck stand up." taste_description = "sweet victory and sour iron" taste_mult = 1.5 @@ -4844,8 +4833,8 @@ allergen_type = ALLERGEN_FRUIT|ALLERGEN_STIMULANT //Made from space mountain wind(fruit), dr.gibb(caffine) and holy wine(fruit) /datum/reagent/ethanol/angelskiss - name = "Angels Kiss" - id = "angelskiss" + name = REAGENT_ANGELSKISS + id = REAGENT_ID_ANGELSKISS description = "Miracle time!" taste_description = "sweet forgiveness and bitter iron" color = "#AD772B" @@ -4857,21 +4846,21 @@ allergen_type = ALLERGEN_FRUIT|ALLERGEN_COFFEE|ALLERGEN_STIMULANT //Made from holy wine(fruit), and kahlua(coffee) /datum/reagent/ethanol/ichor_mead - name = "Ichor Mead" - id = "ichor_mead" + name = REAGENT_ICHORMEAD + id = REAGENT_ID_ICHORMEAD description = "A trip to Valhalla." taste_description = "valhalla" color = "#955B37" strength = 30 - glass_name = "Ichor Mead" + glass_name = REAGENT_ICHORMEAD glass_desc = "A trip to Valhalla." allergen_type = ALLERGEN_FRUIT //Made from holy wine(fruit) /datum/reagent/ethanol/schnapps_pep - name = "Peppermint Schnapps" - id = "schnapps_pep" + name = REAGENT_SCHNAPPSPEP + id = REAGENT_ID_SCHNAPPSPEP description = "Achtung, pfefferminze." taste_description = "minty alcohol" color = "#8FC468" @@ -4881,8 +4870,8 @@ glass_desc = "A glass of peppermint schnapps. It seems like it'd be better, mixed." /datum/reagent/ethanol/schnapps_pea - name = "Peach Schnapps" - id = "schnapps_pea" + name = REAGENT_SCHNAPPSPEA + id = REAGENT_ID_SCHNAPPSPEA description = "Achtung, fruchtig." taste_description = "peaches" color = "#d67d4d" @@ -4894,8 +4883,8 @@ allergen_type = ALLERGEN_FRUIT //Made from peach(fruit) /datum/reagent/ethanol/schnapps_lem - name = "Lemonade Schnapps" - id = "schnapps_lem" + name = REAGENT_SCHNAPPSLEM + id = REAGENT_ID_SCHNAPPSLEM description = "Childhood memories are not included." taste_description = "sweet, lemon-y alcohol" color = "#FFFF00" @@ -4907,8 +4896,8 @@ allergen_type = ALLERGEN_FRUIT //Made from lemons(fruit) /datum/reagent/ethanol/jager - name = "Schuss Konig" - id = "jager" + name = REAGENT_JAGER + id = REAGENT_ID_JAGER description = "A complex alcohol that leaves you feeling all warm inside." taste_description = "complex, rich alcohol" color = "#7f6906" @@ -4918,21 +4907,21 @@ glass_desc = "A glass of schusskonig digestif. Good for shooting or mixing." /datum/reagent/ethanol/fusionnaire - name = "Fusionnaire" - id = "fusionnaire" + name = REAGENT_FUSIONNAIRE + id = REAGENT_ID_FUSIONNAIRE description = "A drink for the brave." taste_description = "a painfully alcoholic lemon soda with an undertone of mint" color = "#6BB486" strength = 9 - glass_name = "fusionnaire" + glass_name = REAGENT_ID_FUSIONNAIRE glass_desc = "A relatively new cocktail, mostly served in the bars of NanoTrasen owned stations." allergen_type = ALLERGEN_FRUIT|ALLERGEN_GRAINS //Made from lemon juice(fruit), vodka(grains), and lemon schnapps(fruit) /datum/reagent/ethanol/deathbell - name = "Deathbell" - id = "deathbell" + name = REAGENT_DEATHBELL + id = REAGENT_ID_DEATHBELL description = "A successful experiment to make the most alcoholic thing possible." taste_description = "your brains smashed out by a smooth brick of hard, ice cold alcohol" color = "#9f6aff" @@ -4941,7 +4930,7 @@ adj_temp = 10 targ_temp = 330 - glass_name = "Deathbell" + glass_name = REAGENT_DEATHBELL glass_desc = "The perfect blend of the most alcoholic things a bartender can get their hands on." allergen_type = ALLERGEN_GRAINS|ALLERGEN_DAIRY|ALLERGEN_FRUIT //Made from antifreeze(vodka(grains),cream(dairy)), gargleblaster(vodka(grains),gin(fruit),whiskey(grains),cognac(fruit),lime juice(fruit)), and syndicate bomb(beer(grain),whiskeycola(whiskey(grain))) @@ -4956,8 +4945,8 @@ M.slurring = max(M.slurring, 30) /datum/reagent/nutriment/magicdust - name = "Magic Dust" - id = "magicdust" + name = REAGENT_MAGICDUST + id = REAGENT_ID_MAGICDUST description = "A dust harvested from gnomes, aptly named by pre-industrial civilizations." taste_description = "something tingly" taste_mult = 2 @@ -4972,24 +4961,24 @@ to_chat(M, span_warning("You feel like you've been gnomed...")) /datum/reagent/drink/soda/kompot - name = "Kompot" - id = "kompot" + name = REAGENT_KOMPOT + id = REAGENT_ID_KOMPOT description = "A traditional Eastern European beverage once used to preserve fruit in the 1980s" taste_description = "refreshingly sweet and fruity" color = "#ed9415" // rgb: 237, 148, 21 adj_drowsy = -1 adj_temp = -6 - glass_name = "kompot" + glass_name = REAGENT_ID_KOMPOT glass_desc = "A glass of refreshing kompot." glass_special = list(DRINK_FIZZ) /datum/reagent/ethanol/kvass - name = "Kvass" - id = "kvass" + name = REAGENT_KVASS + id = REAGENT_ID_KVASS description = "A traditional fermented Slavic and Baltic beverage commonly made from rye bread." taste_description = "a warm summer day at babushka's cabin" color = "#b78315" // rgb: 183, 131, 21 strength = 95 //It's just soda to Russians nutriment_factor = 2 - glass_name = "kvass" + glass_name = REAGENT_ID_KVASS glass_desc = "A hearty glass of Slavic brew." diff --git a/code/modules/reagents/reagents/toxins.dm b/code/modules/reagents/reagents/toxins.dm index 444e1b7a28..9f7cae2c7f 100644 --- a/code/modules/reagents/reagents/toxins.dm +++ b/code/modules/reagents/reagents/toxins.dm @@ -757,7 +757,7 @@ reagent_state = LIQUID color = "#FFD300" - glass_name = "beer" + glass_name = REAGENT_ID_BEER glass_desc = "A freezing pint of beer" /* Drugs */ diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index c23a3d89da..8b485cfc77 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1160,7 +1160,7 @@ /obj/item/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor/Initialize() . = ..() - reagents.add_reagent("pwine", 60) + reagents.add_reagent(REAGENT_ID_PWINE, 60) //RadiantAurora: Tiemli Kroto /obj/item/clothing/glasses/welding/tiemgogs diff --git a/code/modules/xenoarcheaology/effect_master.dm b/code/modules/xenoarcheaology/effect_master.dm index 00455f05e5..f6954f4090 100644 --- a/code/modules/xenoarcheaology/effect_master.dm +++ b/code/modules/xenoarcheaology/effect_master.dm @@ -305,7 +305,7 @@ else if(W.reagents.has_reagent(REAGENT_ID_PHORON, 1) || W.reagents.has_reagent(REAGENT_ID_THERMITE, 1)) if(my_effect.trigger == TRIGGER_VOLATILE) my_effect.ToggleActivate() - else if(W.reagents.has_reagent(REAGENT_ID_TOXIN, 1) || W.reagents.has_reagent(REAGENT_ID_CYANIDE, 1) || W.reagents.has_reagent(REAGENT_ID_AMATOXIN, 1) || W.reagents.has_reagent("neurotoxin", 1)) + else if(W.reagents.has_reagent(REAGENT_ID_TOXIN, 1) || W.reagents.has_reagent(REAGENT_ID_CYANIDE, 1) || W.reagents.has_reagent(REAGENT_ID_AMATOXIN, 1) || W.reagents.has_reagent(REAGENT_ID_NEUROTOXIN, 1)) if(my_effect.trigger == TRIGGER_TOXIN) my_effect.ToggleActivate() else if(istype(W,/obj/item/melee/baton) && W:status ||\ @@ -330,7 +330,7 @@ var/list/water = list(REAGENT_ID_HYDROGEN, REAGENT_ID_WATER) var/list/acid = list(REAGENT_ID_SACID, REAGENT_ID_PACID, REAGENT_ID_DIETHYLAMINE) var/list/volatile = list(REAGENT_ID_PHORON,REAGENT_ID_THERMITE) - var/list/toxic = list(REAGENT_ID_TOXIN,REAGENT_ID_CYANIDE,REAGENT_ID_AMATOXIN,"neurotoxin") + var/list/toxic = list(REAGENT_ID_TOXIN,REAGENT_ID_CYANIDE,REAGENT_ID_AMATOXIN,REAGENT_ID_NEUROTOXIN) for(var/datum/artifact_effect/my_effect in my_effects) if(Touching.id in water) diff --git a/code/modules/xenoarcheaology/finds/special.dm b/code/modules/xenoarcheaology/finds/special.dm index e6b476c7bd..0892dd4ebc 100644 --- a/code/modules/xenoarcheaology/finds/special.dm +++ b/code/modules/xenoarcheaology/finds/special.dm @@ -8,7 +8,7 @@ /obj/item/reagent_containers/glass/replenishing/Initialize() . = ..() START_PROCESSING(SSobj, src) - spawning_id = pick(REAGENT_ID_BLOOD,REAGENT_ID_HOLYWATER,REAGENT_ID_LUBE,REAGENT_ID_STOXIN,REAGENT_ID_ETHANOL,"ice",REAGENT_ID_GLYCEROL,REAGENT_ID_FUEL,REAGENT_ID_CLEANER) + spawning_id = pick(REAGENT_ID_BLOOD,REAGENT_ID_HOLYWATER,REAGENT_ID_LUBE,REAGENT_ID_STOXIN,REAGENT_ID_ETHANOL,REAGENT_ID_ICE,REAGENT_ID_GLYCEROL,REAGENT_ID_FUEL,REAGENT_ID_CLEANER) /obj/item/reagent_containers/glass/replenishing/process() reagents.add_reagent(spawning_id, 0.3) diff --git a/code/modules/xenobio/items/extracts_vr.dm b/code/modules/xenobio/items/extracts_vr.dm index 1d007ff494..722d21ce3c 100644 --- a/code/modules/xenobio/items/extracts_vr.dm +++ b/code/modules/xenobio/items/extracts_vr.dm @@ -801,7 +801,7 @@ /decl/chemical_reaction/instant/slime/dark_blue_ice name = "Slime Ice" id = "m_darkblue_ice" - result = "ice" + result = REAGENT_ID_ICE required_reagents = list(REAGENT_ID_WATER = 5) result_amount = 5 required = /obj/item/slime_extract/dark_blue diff --git a/code/modules/xenobio2/_xeno_setup_vr.dm b/code/modules/xenobio2/_xeno_setup_vr.dm index 5390fb716e..b7d0e67f90 100644 --- a/code/modules/xenobio2/_xeno_setup_vr.dm +++ b/code/modules/xenobio2/_xeno_setup_vr.dm @@ -61,5 +61,5 @@ xenoChemList += REAGENT_ID_FROSTOIL xenoChemList += REAGENT_ID_CAPSAICIN xenoChemList += REAGENT_ID_CONDENSEDCAPSAICIN - xenoChemList += "neurotoxin" + xenoChemList += REAGENT_ID_NEUROTOXIN return 1 diff --git a/code/modules/xenobio2/mob/slime/slime.dm b/code/modules/xenobio2/mob/slime/slime.dm index d0251b28cc..2d56f2800b 100644 --- a/code/modules/xenobio2/mob/slime/slime.dm +++ b/code/modules/xenobio2/mob/slime/slime.dm @@ -56,7 +56,7 @@ Slime definitions, Life and New live here. REAGENT_ID_CHLORINE = list(XENO_CHEM_TOXIC = 0.5), REAGENT_ID_AMMONIA = list(XENO_CHEM_TOXIC = 0.5), REAGENT_ID_SODAWATER = list(XENO_CHEM_TOXIC = 0.1, XENO_CHEM_NUTRI = -0.1), - "beer" = list(XENO_CHEM_NUTRI = 0.6), + REAGENT_ID_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), REAGENT_ID_EZNUTRIENT = list(XENO_CHEM_NUTRI = 0.8),