diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index 97bf237230e..cdde76a336b 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -60,6 +60,7 @@ /obj/item/reagent_containers/drinks/bottle/cream = 4, /obj/item/reagent_containers/drinks/cans/tonic = 8, /obj/item/reagent_containers/drinks/cans/cola = 8, + /obj/item/reagent_containers/drinks/cans/electrolytes = 4, /obj/item/reagent_containers/drinks/cans/sodawater = 15, /obj/item/reagent_containers/drinks/drinkingglass = 30, /obj/item/reagent_containers/drinks/drinkingglass/shotglass = 30, @@ -1048,6 +1049,7 @@ /obj/item/reagent_containers/drinks/cans/starkist = 10, /obj/item/reagent_containers/drinks/cans/space_up = 10, /obj/item/reagent_containers/drinks/cans/grape_juice = 10, + /obj/item/reagent_containers/drinks/cans/electrolytes = 10, /obj/item/reagent_containers/glass/beaker/waterbottle = 10) contraband = list(/obj/item/reagent_containers/drinks/cans/thirteenloko = 5) @@ -1058,6 +1060,7 @@ /obj/item/reagent_containers/drinks/cans/starkist = 50, /obj/item/reagent_containers/drinks/cans/space_up = 50, /obj/item/reagent_containers/drinks/cans/grape_juice = 50, + /obj/item/reagent_containers/drinks/cans/electrolytes = 40, /obj/item/reagent_containers/glass/beaker/waterbottle = 20) refill_canister = /obj/item/vending_refill/cola diff --git a/code/modules/food_and_drinks/drinks/drinks/cans.dm b/code/modules/food_and_drinks/drinks/drinks/cans.dm index fad8ee4aed2..312805cbde1 100644 --- a/code/modules/food_and_drinks/drinks/drinks/cans.dm +++ b/code/modules/food_and_drinks/drinks/drinks/cans.dm @@ -219,6 +219,12 @@ icon_state = "purple_can" list_reagents = list("grapejuice" = 30) +/obj/item/reagent_containers/drinks/cans/electrolytes + name = "Electrolytez" + desc = "The fastest way to rehydration. Now with a giant Z on the can. Or is it a lightning bolt?" + icon_state = "electrolytes_can" + list_reagents = list("electrolytes" = 30) + /obj/item/reagent_containers/drinks/cans/tonic name = "T-Borg's Tonic Water" desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 86f2a4f1a1c..20bfdaa88c5 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -351,7 +351,7 @@ dispensable_reagents = list("water", "ice", "milk", "soymilk", "coffee", "tea", "hot_coco", "cola", "spacemountainwind", "dr_gibb", "space_up", "tonic", "sodawater", "lemon_lime", "grapejuice", "sugar", "orangejuice", "lemonjuice", "limejuice", "tomatojuice", "banana", "watermelonjuice", "pineapplejuice", "cream", "berryjuice") - upgrade_reagents = list("bananahonk", "milkshake", "cafe_latte", "cafe_mocha", "triple_citrus", "icecoffe","icetea") + upgrade_reagents = list("electrolytes", "bananahonk", "milkshake", "cafe_latte", "cafe_mocha", "triple_citrus", "icecoffe","icetea") hacked_reagents = list("thirteenloko") hack_message = "You change the mode from 'McNano' to 'Pizza King'." unhack_message = "You change the mode from 'Pizza King' to 'McNano'." diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 92e55011a1a..fb1ebb4aa76 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -77,7 +77,10 @@ /obj/item/food/grown/apple = list("applejuice" = 0), /obj/item/food/grown/grapes = list("grapejuice" = 0), /obj/item/food/grown/pineapple = list("pineapplejuice" = 0), - /obj/item/food/grown/bungofruit = list("bungojuice" = 0) + /obj/item/food/grown/bungofruit = list("bungojuice" = 0), + /obj/item/food/grown/plum = list("plumjuice" = 0), + /obj/item/food/grown/redbeet = list("beetjuice" = 0), + /obj/item/food/grown/lettuce = list("lettucejuice" = 0) ) var/list/dried_items = list( diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm index 9742218150c..f6c92d150c8 100644 --- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm @@ -61,10 +61,40 @@ description = "Just like a carrot, but without the crunching." color = "#FFA500" drink_icon = "carrotjuice" - drink_name = "Glass of carrot juice" + drink_name = "Glass of carrot juice" drink_desc = "Just like a carrot, but without the crunching." taste_description = "carrot juice" +/datum/reagent/consumable/drink/beetjuice + name = "Beet juice" + id = "beetjuice" + description = "Sweet as a 'sugar beet' would imply." + color = "#7E0243" + drink_icon = "glass_magenta" + drink_name = "Glass of beet juice" + drink_desc = "Sweet as a 'sugar beet' would imply." + taste_description = "beet juice" + +/datum/reagent/consumable/drink/plumjuice + name = "Plum juice" + id = "plumjuice" + description = "A fan favorite of old people across the galaxy." + color = "#99305D" + drink_icon = "glass_magenta" + drink_name = "Glass of plum juice" + drink_desc = "A fan favorite of old people across the galaxy." + taste_description = "prune juice" + +/datum/reagent/consumable/drink/lettucejuice + name = "Lettuce juice" + id = "lettucejuice" + description = "They say you should eat your greens, but drinking them is just as good." + color = "#79B330" + drink_icon = "glass_green" + drink_name = "Glass of lettuce juice" + drink_desc = "They say you should eat your greens, but drinking them is just as good." + taste_description = "lettuce juice" + /datum/reagent/consumable/drink/carrotjuice/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE M.AdjustEyeBlurry(-2 SECONDS) @@ -95,7 +125,7 @@ description = "A refreshing mixed drink of orange, lemon and lime juice." color = "#B5FF00" drink_icon = "triplecitrus" - drink_name = "Glass of Triplecitrus Juice" + drink_name = "Glass of triple citrus Juice" drink_desc = "As colorful and healthy as it is delicious." taste_description = "citrus juice" @@ -776,3 +806,178 @@ if(M.satiety < 600) M.satiety += 5 return ..() + +/datum/reagent/consumable/drink/royrogers + name = "Roy Rogers" + description = "A cola classic from the days of Earth." + id = "royrogers" + color = "#8F1909" + drink_icon = "royrogers_glass" + drink_name = "Roy Rogers" + drink_desc = "The rootinest, tootinest drink you can get at the bar without any alcohol." + taste_description = "berries and cola" + +/datum/reagent/consumable/drink/shirleytemple + name = "Shirley Temple" + description = "A bubbly, fruity delight from the days of Earth." + id = "shirleytemple" + color = "#FF7970" + drink_icon = "shirleytemple_glass" + drink_name = "Shirley Temple" + drink_desc = "A soft drink classic with a cherry on top." + taste_description = "berries and carbonation" + +/datum/reagent/consumable/drink/partypunch + name = "Party Punch" + description = "A vibrant mix of fruit juices. A real punch of flavor." + id = "partypunch" + color = "#E8313f" + drink_icon = "partypunch_glass" + drink_name = "Glass of Party Punch" + drink_desc = "A vibrant mix of fruit juices. A real punch of flavor." + taste_description = "a punch of fruit" + +/datum/reagent/consumable/drink/coffee/eggcoffee + name = "Egg Coffee" + description = "Rich coffee with custard foam." + id = "eggcoffee" + color = "#824D27" + drink_icon = "eggcoffee_glass" + drink_name = "Glass Mug of Egg Coffee" + drink_desc = "Rich coffee with custard foam." + taste_description = "rich foam" + +/datum/reagent/consumable/drink/horchata + name = "Horchata" + description = "Sweetened rice milk topped with cinnamon." + id = "horchata" + color = "#E0DDD5" + drink_icon = "horchata_glass" + drink_name = "Glass of Horchata" + drink_desc = "Sweetened rice milk topped with cinnamon." + taste_description = "cinnamony rice milk" + +/datum/reagent/consumable/drink/monstermix + name = "Monster Mix" + description = "A mix of every soda in the dispenser. You monster." + id = "monstermix" + color = "#CBFF71" + drink_icon = "monstermix_glass" + drink_name = "Glass of Monster Mix" + drink_desc = "A mix of every soda in the dispenser. You monster." + taste_description = "an unholy amalgam" + +/datum/reagent/consumable/drink/spessamatosmash + name = "Spessamato Smash" + description = "Fruity yet salty." + id = "tomato_spaceup" + color = "#B72429" + drink_icon = "tomato_spaceup" + drink_name = "Glass of Spessamato Smash" + drink_desc = "Fruity yet salty." + taste_description = "sparkling tomato" + +/datum/reagent/consumable/drink/eggcream + name = "Egg Cream" + description = "Smells like custard." + id = "eggcream" + color = "#F5D4BB" + drink_icon = "eggcream_glass" + drink_name = "Glass of Egg Cream" + drink_desc = "You now have a glass of custard." + taste_description = "sweet egg" + +/datum/reagent/consumable/drink/beetshrub + name = "Beet Shrub" + description = "So, so sour." + id = "beetshrub" + color = "#99305D" + drink_icon = "beetshrub_glass" + drink_name = "Glass of Beet Shrub" + drink_desc = "The vinegar gives this far more bite than any ordinary person would drink straight." + taste_description = "vinegar" + +/datum/reagent/consumable/drink/berrybeetrefresher + name = "Berry Beet Refresher" + description = "Tangy, sweet, with just a bit of bite." + id = "berrybeetrefresher" + color = "#C7437C" + drink_icon = "berry_beet_refresher" + drink_name = "Glass of Berry Beet Refresher" + drink_desc = "Tangy, sweet, with just a bit of bite." + taste_description = "tangy, bubbly fruit" + +/datum/reagent/consumable/drink/smoothie + name = "Empty Smoothie" + description = ABSTRACT_TYPE_DESC + id = "smoothie" + color = "#9933FF" + nutriment_factor = 4 * REAGENTS_METABOLISM + drink_icon = "glass_magenta" + drink_name = "Glass of Empty Smoothie" + drink_desc = ABSTRACT_TYPE_DESC + +/datum/reagent/consumable/drink/smoothie/on_mob_life(mob/living/M) + if(M.satiety < 600) + M.satiety += 5 + return ..() + +/datum/reagent/consumable/drink/smoothie/pbnbanana + name = "Peanut Butter and Banana Smoothie" + description = "This is so smooth, it's definitely made with creamy peanut butter." + id = "smoothie_pbnbanana" + color = "#F3BC58" + drink_icon = "smoothie_pbnbanana" + drink_name = "Glass of PB Banana Smoothie" + drink_desc = "So smooth and fluffy." + taste_description = "nutty banana" + +/datum/reagent/consumable/drink/smoothie/veryberry + name = "Very Berry Smoothie" + description = "Berries give this creamy beverage its speckled appearance." + id = "smoothie_veryberry" + color = "#C7437C" + drink_icon = "smoothie_veryberry" + drink_name = "Glass of Very Berry Smoothie" + drink_desc = "Berries give this creamy beverage its speckled appearance." + taste_description = "berries and cream" + +/datum/reagent/consumable/drink/vegetablemix + name = "Vegetable Juice Mix" + description = "More vitamins than you can shake a stick at." + id = "vegjuice" + color = "#B36131" + drink_icon = "vegjuice_glass" + drink_name = "Glass of Vegetable Juice" + drink_desc = "Mellow and creamy vegetable juice." + taste_description = "so many vitamins" + +/datum/reagent/consumable/drink/vegetablemix/on_mob_life(mob/living/M) + var/update_flags = STATUS_UPDATE_NONE + if(M.satiety < 600) + M.satiety += 5 + if(prob(10)) + update_flags |= M.adjustToxLoss(-1, FALSE) + return ..() | update_flags + +/datum/reagent/consumable/drink/electrolytes + name = "Electrolytes" + description = "That's fancy talk for salted water." + id = "electrolytes" + color = "#67D6F0" + drink_icon = "electrolytes_glass" + drink_name = "Glass of Electrolytes" + drink_desc = "The fastest way to rehydration without an IV." + taste_description = "salt" + adj_dizzy = -5 SECONDS + process_flags = ORGANIC | SYNTHETIC + +/datum/reagent/consumable/drink/electrolytes/on_mob_life(mob/living/M) + M.AdjustConfused(-5 SECONDS) + M.AdjustEyeBlurry(-2 SECONDS) + if(ishuman(M) && prob(10)) + var/mob/living/carbon/human/H = M + if(!(NO_BLOOD in H.dna.species.species_traits))//do not restore blood on things with no blood by nature. + if(H.blood_volume < BLOOD_VOLUME_NORMAL) + H.blood_volume += 0.5 + return ..() diff --git a/code/modules/reagents/chemistry/recipes/drinks_reactions.dm b/code/modules/reagents/chemistry/recipes/drinks_reactions.dm index 01c19daf3a7..e53e0fe1064 100644 --- a/code/modules/reagents/chemistry/recipes/drinks_reactions.dm +++ b/code/modules/reagents/chemistry/recipes/drinks_reactions.dm @@ -1069,3 +1069,118 @@ required_reagents = list("watermelonjuice" = 2, "lemonade" = 2, "ice" = 1) result_amount = 5 mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/royrogers + name = "Roy Rogers" + id = "royrogers" + result = "royrogers" + required_reagents = list("berryjuice" = 1, "cola" = 1) + result_amount = 2 + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/shirleytemple + name = "Shirley Temple" + id = "shirleytemple" + result = "shirleytemple" + required_reagents = list("berryjuice" = 1, "space_up" = 1) + result_amount = 2 + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/partypunch + name = "Party Punch" + id = "partypunch" + result = "partypunch" + required_reagents = list("sodawater" = 2, "banana" = 1, "berryjuice" = 1, "triple_citrus" = 1, "pineapplejuice" = 1, "watermelonjuice" = 1, "grapejuice" = 1) + result_amount = 8 + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/eggcoffee + name = "Egg Coffee" + id = "eggcoffee" + result = "eggcoffee" + required_reagents = list("eggcream" = 2, "coffee" = 3) + result_amount = 5 + mix_message = "The egg cream forms a rich foam atop the coffee." + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/eggcream + name = "Whipped Egg Cream" + id = "eggcream" + result = "eggcream" + required_reagents = list("egg" = 5, "milk" = 5, "sugar" = 10) + max_temp = 290 + min_temp = 275 + result_amount = 20 + mix_message = "The egg and milk whip nicely together." + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/horchata + name = "Horchata" + id = "horchata" + result = "horchata" + required_reagents = list("rice" = 2, "water" = 4, "sugar" = 1, "vanilla" = 1) + result_amount = 8 + mix_message = "Blending rice with water forms a milky beverage." + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/monstermix + name = "Monster Mix" + id = "monstermix" + result = "monstermix" + required_reagents = list("sodawater" = 1, "dr_gibb" = 1, "spacemountainwind" = 1, "space_up" = 1, "cola" = 1, "ice" = 1) + result_amount = 6 + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/tomato_spaceup + name = "Spessamato Smash" + id = "tomato_spaceup" + result = "tomato_spaceup" + required_reagents = list("tomatojuice" = 1, "space_up" = 1) + result_amount = 2 + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/beetshrub + name = "Beet Shrub" + id = "beetshrub" + result = "beetshrub" + required_reagents = list("beetjuice" = 2, "vinegar" = 1, "corn_syrup" = 1) + min_temp = 373 + max_temp = 390 + result_amount = 3 + mix_message = "You get a strong whiff of vinegar as the boiling settles." + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/berrybeetrefresher + name = "Berry Beet Refresher" + id = "berrybeetrefresher" + result = "berrybeetrefresher" + required_reagents = list("beetshrub" = 1, "sodawater" = 4, "berryjuice" = 1, "limejuice" = 1, "ice" = 3) + result_amount = 10 + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/smoothie/pbnbanana + name = "Peanut Butter Banana Smoothie" + id = "smoothie_pbnbanana" + result = "smoothie_pbnbanana" + required_reagents = list("soymilk" = 1, "banana" = 1, "peanutbutter" = 1, "ice" = 1) + result_amount = 5 + mix_message = "The peanut butter streaks inside the glass as it mixes." + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/smoothie/veryberry + name = "Very Berry Smoothie" + id = "smoothie_veryberry" + result = "smoothie_veryberry" + required_reagents = list("cream" = 1, "berryjuice" = 1, "plumjuice" = 1, "ice" = 1) + result_amount = 5 + mix_message = "The ice and cream thicken to create a fluffy texture." + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' + +/datum/chemical_reaction/vegetablemix + name = "Vegetable Juice Mix" + id = "vegjuice" + result = "vegjuice" + required_reagents = list("tomatojuice" = 1, "carrotjuice" = 1, "beetjuice" = 1, "lettucejuice" = 1) + result_amount = 4 + mix_message = "The blended vegetables form a creamy mix." + mix_sound = 'sound/goonstation/misc/drinkfizz.ogg' diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 8476d79c936..4310b650f38 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ