diff --git a/code/modules/food/drinkingglass/metaglass_vr.dm b/code/modules/food/drinkingglass/metaglass_vr.dm new file mode 100644 index 00000000000..5381153dd70 --- /dev/null +++ b/code/modules/food/drinkingglass/metaglass_vr.dm @@ -0,0 +1,206 @@ +/datum/reagent/ethanol/ginzamary + glass_icon_state = "ginzamaryglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/deathbell + glass_icon_state = "deathbellglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/brownstar + glass_icon_state = "brownstarglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/spacersbrew + glass_icon_state = "spacersbrewglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/galacticpanic + glass_icon_state = "galacticpanicglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/bulldog + glass_icon_state = "bulldogglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/sbagliato + glass_icon_state = "sbagliatoglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/italiancrisis + glass_icon_state = "italiancrisisglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/bigbeer + glass_icon_state = "bigbeerglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/sugarrush + glass_icon_state = "sugarrushglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/lotus + glass_icon_state = "lotusglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/shroomjuice + glass_icon_state = "shroomjuiceglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/russianroulette + glass_icon_state = "russianrouletteglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/lovepotion + glass_icon_state = "lovepotionglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/honeyshot + glass_icon_state = "honeyshotglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/appletini + glass_icon_state = "appletiniglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/glowingappletini + glass_icon_state = "glowingappletiniglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/scsatw + glass_icon_state = "slowcomfortablescrewagainstthewallglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/choccymilk + glass_icon_state = "choccymilkglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/sweettea + glass_icon_state = "sweetteaglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/redspaceflush + glass_icon_state = "redspaceflushglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/graveyard + glass_icon_state = "graveyardglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/unsweettea + glass_icon_state = "unsweetteaglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/hairoftherat + glass_icon_state = "hairoftheratglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/soda/kiraspecial + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/soda/brownstar + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/doctor_delight + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/acid_spit + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/antifreeze + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/coffee/b52 + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/bananahonk + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/bloody_mary + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/booger + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/devilskiss + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/driestmartini + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/ginfizz + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/gargle_blaster + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/goldschlager + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/hippies_delight + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/irishcarbomb + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/irish_cream + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/longislandicedtea + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/manhattan_proj + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/neurotoxin + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/screwdrivercocktail + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/silencer + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/snowwhite + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/tequilla_sunrise + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/white_russian + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/whiskey_cola + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/holywine + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/holy_mary + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/angelskiss + glass_icon_file = 'icons/obj/drinks_vr.dmi' diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm index d57b8405848..fee195bbac9 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm @@ -106,4 +106,301 @@ ..() playsound(M, 'sound/items/hooh.ogg', 50, 1, -1) if(prob(5)) - to_chat(M, "You feel like you've been gnomed...") \ No newline at end of file + to_chat(M, "You feel like you've been gnomed...") + + + +/datum/reagent/ethanol/galacticpanic + name = "Galactic Panic Attack" + id = "galacticpanic" + description = "The absolute worst thing you could ever put in your body." + taste_description = "an entire galaxy collasping in on itself." + strength = 10 + druggy = 50 + halluci = 30 + var/adj_dizzy = 10 + color = "#d3785d" + + glass_name = "Galactic Panic Attack" + glass_desc = "Looking into this is like staring at the stars." + +/datum/reagent/ethanol/galacticpanic/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + M.Stun(2) + +/datum/reagent/ethanol/galacticpanic/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + + if(dose * strength >= strength) // Early warning + M.make_dizzy(24) // Intentionally higher than normal to compensate for it's previous effects. + if(dose * strength >= strength * 2.5) // Slurring takes longer. Again, intentional. + M.slurring = max(M.slurring, 30) + +/datum/reagent/ethanol/bulldog + name = "Space Bulldog" + id = "bulldog" + description = "An inventive kahlua recipe." + taste_description = "fizzy, creamy, soda and coffee hell." + strength = 30 + color = "#d3785d" + + glass_name = "Space Bulldog" + glass_desc = "It looks like someone poured cola in a cup of coffee." + + +/datum/reagent/ethanol/sbagliato + name = "Negroni Sbagliato" + id = "sbagliato" + description = "A drink invented because a bartender was too drunk." + taste_description = "sweet bubbly wine and vermouth." + strength = 30 + color = "#d3785d" + + glass_name = "Negroni Sbagliato" + glass_desc = "Bubbles constantly pop up to the surface with a quiet fizz." + + +/datum/reagent/ethanol/italiancrisis + name = "Italian Crisis" + id = "italiancrisis" + description = "This drink was concocted by a madwoman, causing the Italian Crisis of 2123." + taste_description = "cola, fruit, fizz, coffee, and cream swirled together in an old boot." + strength = 20 + druggy = 0 + halluci = 0 + var/adj_dizzy = 0 + color = "#d3785d" + + glass_name = "Italian Crisis" + glass_desc = "This drink looks like it was a mistake." + +/datum/reagent/ethanol/sugarrush + name = "Sweet Rush" + id = "sugarrush" + description = "A favorite drink amongst poor bartenders living in Neo Detroit." + taste_description = "sweet bubblegum vodka." + strength = 30 + color = "#d3785d" + + glass_name = "Sweet Rush" + glass_desc = "This looks like it might rot your teeth out." + +/datum/reagent/ethanol/lotus + name = "Lotus" + id = "lotus" + description = "The result of making one mistake after another and trying to cover it up with sugar." + taste_description = "rich, sweet fruit and even more sugar." + strength = 25 + color = "#d3785d" + + glass_name = "Lotus" + glass_desc = "A promotional drink for a movie that only ever played in Neo Detroit theatres." + +/datum/reagent/ethanol/shroomjuice + name = "Dumb Shroom Juice" + id = "shroomjuice" + description = "The mushroom farmer didn't sort through their stock very well." + taste_description = "sweet and sour citrus with a savory kick." + strength = 100 + druggy = 30 + halluci = 30 + var/adj_dizzy = 30 + color = "#d3785d" + + glass_name = "Dumb Shroom Juice" + glass_desc = "Touch fuzzy, get dizzy." + +/datum/reagent/ethanol/russianroulette + name = "Russian Roulette" + id = "russianroulette" + description = "The perfect drink for wagering your liver on a game of cards." + taste_description = "coffee, vodka, cream, and a hot metal slug." + strength = 30 + var/adj_dizzy = 30 + color = "#d3785d" + + glass_name = "Russian Roulette" + glass_desc = "A favorite drink amongst the Pan-Slavic speaking community." + +/datum/reagent/ethanol/russianroulette/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + M.Stun(2) + +/datum/reagent/ethanol/lovepotion + name = "Love Potion" + id = "lovepotion" + description = "A drink said to help one find true love." + taste_description = "sweet fruit and honey." + strength = 30 + druggy = 0 + halluci = 0 + var/adj_dizzy = 30 + adj_temp = 10 + targ_temp = 360 + color = "#d3785d" + + glass_name = "Love Potion" + glass_desc = "A drink said to help one find the perfect fuck." + +/datum/reagent/ethanol/honeyshot + name = "Honey Shot" + id = "honeyshot" + description = "The perfect drink for bees." + taste_description = "sweet tart grenadine flavored with honey." + strength = 40 + var/adj_dizzy = 10 + color = "#d3785d" + + glass_name = "Honey shot" + glass_desc = "A glass of golden liquid." + +/datum/reagent/ethanol/appletini + name = "Appletini" + id = "appletini" + description = "A classic cocktail using every grandma's favorite fruit." + taste_description = "green sour apple with a hint of alcohol." + strength = 45 + color = "#d3785d" + + glass_name = "Appletini" + glass_desc = "The perfect fruit cocktail for a fancy night at the bar." + +/datum/reagent/ethanol/glowingappletini + name = "Glowing Appletini" + id = "glowingappletini" + description = "A new nuclear take on a pre-modern classic!" + taste_description = "overwhelmingly sour apples powered by a nuclear fission reactor." + strength = 30 + druggy = 20 + var/adj_dizzy = 20 + color = "#d3785d" + + glass_name = "Glowing Appletini" + glass_desc = "The atomic option to fruity cocktails." + +/datum/reagent/ethanol/scsatw + name = "Slow Comfortable Screw Against the Wall" + id = "scsatw" + description = "The screwdriver's bigger cousin." + taste_description = "smooth, savory booze and tangy orange juice." + strength = 0 + druggy = 0 + halluci = 0 + var/adj_dizzy = 0 + color = "#d3785d" + + glass_name = "Slow Comfortable Screw Against the Wall" + glass_desc = "The best accessory to daydrinking." + +/datum/reagent/drink/choccymilk + name = "Choccy Milk" + id = "choccymilk" + description = "Coco and milk, a timeless classic." + taste_description = "sophisticated bittersweet chocolate mixed with silky, creamy, whole milk." + color = "#d3785d" + + glass_name = "Choccy Milk" + glass_desc = "The most iconic duo in the galaxy, chocolate, and milk." + +/datum/reagent/ethanol/redspaceflush + name = "Red Space Flush" + id = "redspaceflush" + description = "A drink made by imbueing the essence of redspace into the spirits." + taste_description = "whiskey and rum strung out through a hellish dimensional rift." + strength = 30 + druggy = 10 + var/adj_dizzy = 10 + color = "#d3785d" + + glass_name = "Redspace Flush" + glass_desc = "A drink imbued with the very essence of Redspace." + +/datum/reagent/drink/graveyard + name = "Graveyard" + id = "graveyard" + description = "The result of taking a cup and filling it with all the drinks at the fountain." + taste_description = "sugar and fizz." + color = "#d3785d" + + glass_name = "Graveyard" + glass_desc = "Hahaha softdrink machine go pshshhhhh..." + +/datum/reagent/ethanol/bigbeer + name = "Giant Beer" + id = "bigbeer" + description = "Bars in Neo Detroit started to sell this drink when the city put mandatory drink limits in 2289." + taste_description = "beer, but bigger." + strength = 40 + color = "#d3785d" + + glass_name = "Giant Beer" + glass_desc = "The Neo Detroit beer and ale cocktail, perfect for your average drunk." + +/datum/reagent/drink/sweettea + name = "Sweet Tea" + id = "sweettea" + description = "Tea that is sweetened with some form of sweetener." + taste_description = "tea that is sweet." + color = "#d3785d" + + glass_name = "Sweet Tea" + glass_desc = "A southern classic. Southern what? You know, southern." + +/datum/reagent/ethanol/unsweettea + name = "Unsweetened Tea" + id = "unsweettea" + description = "A sick experiment to take the sweetness out of tea after sugar has been added resulted in this." + taste_description = "bland, slightly bitter, discount black tea." + strength = 80 + druggy = 10 + color = "#d3785d" + + glass_name = "Unsweetened Tea" + glass_desc = "A drink with all the calories of sweet tea, but with none of the satisfaction. Slightly psychoactive." + +/datum/reagent/ethanol/hairoftherat + name = "Hair of the Rat" + id = "hairoftherat" + description = "A meatier version of the monster tamer, complete with extra meat." + taste_description = "meat, whiskey, ground meat, and more meat." + strength = 45 + color = "#d3785d" + metabolism = REM * 3.5 // about right for mixing nutriment and ethanol. + var/alt_nutriment_factor = 5 //half as much as protein since it's half protein. + //using a new variable instead of nutriment_factor so we can call ..() without that adding nutrition for us without taking factors for protein into account + + glass_name = "Hair of the Rat" + glass_desc = "The alcohol equivelant of saying your burger isn't cooked rare enough." + +/datum/reagent/ethanol/hairoftherat/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + + if(M.species.gets_food_nutrition) //it's still food! + switch(alien) + if(IS_DIONA) //Diona don't get any nutrition from nutriment or protein. + if(IS_SKRELL) + M.adjustToxLoss(0.25 * removed) //Equivalent to half as much protein, since it's half protein. + if(IS_TESHARI) + M.nutrition += (alt_nutriment_factor * 1.2 * removed) //Give them the same nutrition they would get from protein. + if(IS_UNATHI) + M.nutrition += (alt_nutriment_factor * 1.125 * removed) //Give them the same nutrition they would get from protein. + //Takes into account the 0.5 factor for all nutriment which is applied on top of the 2.25 factor for protein. + //Chimera don't need their own case here since their factors for nutriment and protein cancel out. + else + M.nutrition += (alt_nutriment_factor * removed) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.feral > 0 && H.nutrition > 100 && H.traumatic_shock < min(60, H.nutrition/10) && H.jitteriness < 100) // same check as feral triggers to stop them immediately re-feralling + H.feral -= removed * 3 // should calm them down quick, provided they're actually in a state to STAY calm. + if (H.feral <=0) //check if they're unferalled + H.feral = 0 + to_chat(H, "Your mind starts to clear, soothed into a state of clarity as your senses return.") + log_and_message_admins("is no longer feral.", H) + +/datum/reagent/ethanol/hairoftherat/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + ..() + if(alien == IS_SKRELL) + M.adjustToxLoss(removed) //Equivalent to half as much protein, since it's half protein. + if(M.species.gets_food_nutrition) + if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein + M.nutrition += (alt_nutriment_factor * removed) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index d76b731ee71..b2591d992f7 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1861,7 +1861,7 @@ name = "Snow White" id = "snowwhite" result = "snowwhite" - required_reagents = list("beer" = 1, "lemon_lime" = 1) + required_reagents = list("pineapplejuice" = 1, "rum" = 1, "lemon_lime" = 1, "egg" = 1, "kahlua" = 1, "sugar" = 1) //VoreStation Edit result_amount = 2 /datum/chemical_reaction/drinks/irishcarbomb diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm index 7ab2aaecc43..f2783b67928 100644 --- a/code/modules/reagents/Chemistry-Recipes_vr.dm +++ b/code/modules/reagents/Chemistry-Recipes_vr.dm @@ -129,6 +129,146 @@ required_reagents = list("whiskey" = 1, "protein" = 1) result_amount = 2 +/datum/chemical_reaction/drinks/bigbeer + name = "Giant Beer" + id = "bigbeer" + result = "bigbeer" + required_reagents = list("syndicatebomb" = 1, "manlydorf" = 1, "grog" =1) + result_amount = 3 + +/datum/chemical_reaction/drinks/sweettea + name = "Sweetened Tea" + id = "sweettea" + result = "sweettea" + required_reagents = list("icetea" = 2, "sugar" = 1,) + result_amount = 3 + +/datum/chemical_reaction/drinks/unsweettea + name = "Unsweetened Tea" + id = "unsweettea" + result = "unsweettea" + required_reagents = list("sweettea" = 3, "phoron" = 1) + result_amount = 2 + +/datum/chemical_reaction/drinks/galacticpanic + name = "Galactic Panic Attack" + id = "galacticpanic" + result = "galacticpanic" + required_reagents = list("gargleblaster" = 1, "singulo" = 1, "phoronspecial" =1, "neurotoxin" = 1, "atomicbomb" = 1, "hippiesdelight" = 1) + result_amount = 6 + +/datum/chemical_reaction/drinks/bulldog + name = "Space Bulldog" + id = "bulldog" + result = "bulldog" + required_reagents = list("kahlua" = 1, "vodka" = 1, "cola" =1, "cream" =1) + result_amount = 4 + +/datum/chemical_reaction/drinks/sbagliato + name = "Negroni Sbagliato" + id = "sbagliato" + result = "sbagliato" + required_reagents = list("champagne" = 1, "vermouth" = 1, "sodawater" =1) + result_amount = 3 + +/datum/chemical_reaction/drinks/italiancrisis + name = "Italian Crisis" + id = "italiancrisis" + result = "italiancrisis" + required_reagents = list("bulldog" = 1, "sbagliato" = 1) + result_amount = 2 + +/datum/chemical_reaction/drinks/sugarrush + name = "Sweet Rush" + id = "sugarrush" + result = "sugarrush" + required_reagents = list("sugar" = 1, "sodawater" = 1, "vodka" =1) + result_amount = 3 + +/datum/chemical_reaction/drinks/lotus + name = "Lotus" + id = "lotus" + result = "lotus" + required_reagents = list("sbagliato" = 1, "sugarrush" = 1) + result_amount = 2 + +/datum/chemical_reaction/drinks/shroomjuice + name = "Dumb Shroom Juice" + id = "shroomjuice" + result = "shroomjuice" + required_reagents = list("psilocybin" = 1, "applejuice" = 1, "limejuice" =1) + result_amount = 3 + +/datum/chemical_reaction/drinks/russianroulette + name = "Russian Roulette" + id = "russianroulette" + result = "russianroulette" + required_reagents = list("whiterussian" = 5, "iron" = 1) + result_amount = 6 + +/datum/chemical_reaction/drinks/lovepotion + name = "Love Potion" + id = "lovepotion" + result = "lovepotion" + required_reagents = list("honey" = 1, "sexonthebeach" = 5) + result_amount = 6 + +/datum/chemical_reaction/drinks/honeyshot + name = "Honey Shot" + id = "honeyshot" + result = "honeyshot" + required_reagents = list("honey" = 1, "vodka" = 1, "grenadine" =1) + result_amount = 3 + +/datum/chemical_reaction/drinks/appletini + name = "Appletini" + id = "appletini" + result = "appletini" + required_reagents = list("applejuice" = 2, "vodka" = 1) + result_amount = 3 + +/datum/chemical_reaction/drinks/glowingappletini + name = "Glowing Appletini" + id = "glowingappletini" + result = "glowingappletini" + required_reagents = list("appletini" = 5, "uranium" = 1) + result_amount = 6 + +/datum/chemical_reaction/drinks/scsatw + name = "Slow Comfortable Screw Against the Wall" + id = "scsatw" + result = "scsatw" + required_reagents = list("vodka" = 1, "orangejuice" = 1, "rum" =1, "whiskey" =1, "gin" =1) + result_amount = 5 + +/datum/chemical_reaction/drinks/choccymilk + name = "Choccy Milk" + id = "choccymilk" + result = "choccymilk" + required_reagents = list("milk" = 3, "coco" = 1) + result_amount = 4 + +/datum/chemical_reaction/drinks/redspaceflush + name = "Redspace Flush" + id = "redspaceflush" + result = "redspaceflush" + required_reagents = list("rum" = 2, "whiskey" = 2, "blood" =1, "phoron" =1) + result_amount = 6 + +/datum/chemical_reaction/drinks/graveyard + name = "Graveyard" + id = "graveyard" + result = "graveyard" + required_reagents = list("cola" = 1, "spacemountainwind" = 1, "dr_gibb" =1, "space_up" = 1) + result_amount = 4 + +/datum/chemical_reaction/drinks/hairoftherat + name = "Hair of the Rat" + id = "hairoftherat" + result = "hairoftherat" + required_reagents = list("protein" = 3, "nutriment" = 2, "whiskey" =1) + result_amount = 6 + /////////////////////////////////////////////////////////////////////////////////// /// Reagent colonies. /datum/chemical_reaction/meatcolony diff --git a/icons/obj/drinks_vr.dmi b/icons/obj/drinks_vr.dmi index a8d69aa3276..a7eaa3bdd57 100644 Binary files a/icons/obj/drinks_vr.dmi and b/icons/obj/drinks_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 1a49eec745f..ff339a5fb21 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1643,9 +1643,9 @@ #include "code\modules\ai\ai_holder_targeting_vr.dm" #include "code\modules\ai\interfaces.dm" #include "code\modules\ai\say_list.dm" -#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm" -#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm" -#include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm" +#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm" +#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai_vr.dm" +#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm" #include "code\modules\alarm\alarm.dm" #include "code\modules\alarm\alarm_handler.dm" #include "code\modules\alarm\atmosphere_alarm.dm" @@ -2056,6 +2056,7 @@ #include "code\modules\food\drinkingglass\glass_boxes.dm" #include "code\modules\food\drinkingglass\glass_types.dm" #include "code\modules\food\drinkingglass\metaglass.dm" +#include "code\modules\food\drinkingglass\metaglass_vr.dm" #include "code\modules\food\drinkingglass\serving_glasses.dm" #include "code\modules\food\drinkingglass\shaker.dm" #include "code\modules\food\drinkingglass\shaker_vr.dm"