diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index d62c4d606b..95b9f92873 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -440,6 +440,17 @@ list_reagents = list(/datum/reagent/consumable/pineapplejuice = 100) foodtype = FRUIT | PINEAPPLE +/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice + name = "strawberry juice" + desc = "Slushy, reddish juice." + icon_state = "strawberryjuice" + item_state = "carton" + lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi' + isGlass = FALSE + list_reagents = list(/datum/reagent/consumable/strawberryjuice = 100) + foodtype = FRUIT + /obj/item/reagent_containers/food/drinks/bottle/menthol name = "menthol" desc = "Tastes naturally minty, and imparts a very mild numbing sensation." diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index ddea024ed7..748f10138d 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -846,6 +846,57 @@ results = list(/datum/reagent/consumable/red_queen = 10) required_reagents = list(/datum/reagent/consumable/tea = 6, /datum/reagent/mercury = 2, /datum/reagent/consumable/blackpepper = 1, /datum/reagent/growthserum = 1) +/datum/chemical_reaction/gunfire + name = "Gunfire" + id = /datum/reagent/consumable/ethanol/gunfire + results = list(/datum/reagent/consumable/ethanol/gunfire = 4) + required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/tea = 3) + mix_message = "A loud popping begins to fill the air as the drink is mixed." + +/datum/chemical_reaction/hellfire + name = "Hellfire" + id = /datum/reagent/consumable/ethanol/hellfire + results = list(/datum/reagent/consumable/ethanol/hellfire = 4) + required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/ethanol/crevice_spike = 1) + mix_message = "The liquid begins to churn as it changes to an amber orange and catches on fire." + +/datum/chemical_reaction/sins_delight + name = "Sins Delight" + id = /datum/reagent/consumable/ethanol/sins_delight + results = list(/datum/reagent/consumable/ethanol/sins_delight = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/demonsblood = 2, /datum/reagent/consumable/ethanol/triple_sec = 1, /datum/reagent/consumable/ethanol/martini = 1, /datum/reagent/consumable/ethanol/changelingsting = 1) + mix_message = "The liquid starts swirling, before forming a pink cloud that dissipates in the air." + +/datum/chemical_reaction/strawberry_daiquiri + name = "Strawberry Daiquiri" + id = /datum/reagent/consumable/ethanol/strawberry_daiquiri + results = list(/datum/reagent/consumable/ethanol/strawberry_daiquiri = 7) + required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/strawberryjuice = 2, /datum/reagent/consumable/ice = 1) + +/datum/chemical_reaction/miami_vice + name = "Miami Vice" + id = /datum/reagent/consumable/ethanol/miami_vice + results = list(/datum/reagent/consumable/ethanol/miami_vice = 2) + required_reagents = list(/datum/reagent/consumable/ethanol/pina_colada = 1, /datum/reagent/consumable/ethanol/strawberry_daiquiri = 1) + +/datum/chemical_reaction/malibu_sunset + name = "Malibu Sunset" + id = /datum/reagent/consumable/ethanol/malibu_sunset + results = list(/datum/reagent/consumable/ethanol/malibu_sunset = 5) + required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 1, /datum/reagent/consumable/pineapplejuice = 1, /datum/reagent/consumable/grenadine = 1, /datum/reagent/consumable/orangejuice = 1, /datum/reagent/consumable/ice = 1) + +/datum/chemical_reaction/liz_fizz + name = "Liz Fizz" + id = /datum/reagent/consumable/ethanol/liz_fizz + results = list(/datum/reagent/consumable/ethanol/liz_fizz = 5) + required_reagents = list(/datum/reagent/consumable/triple_citrus = 3, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1) + +/datum/chemical_reaction/hotlime_miami + name = "Hotlime Miami" + id = /datum/reagent/consumable/ethanol/hotlime_miami + results = list(/datum/reagent/consumable/ethanol/hotlime_miami = 2) + required_reagents = list(/datum/reagent/medicine/ephedrine = 1, /datum/reagent/consumable/ethanol/pina_colada = 1) + /datum/chemical_reaction/mauna_loa name = "Mauna Loa" id = /datum/reagent/consumable/ethanol/mauna_loa diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index 6ebfd3254f..a2278f0f12 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -266,6 +266,7 @@ throwforce = 5 hitsound = 'sound/weapons/klonk.ogg' attack_verb = list("klonked", "donked", "bonked") + distill_reagent = "creme_de_coconut" var/opened = FALSE var/carved = FALSE var/chopped = FALSE diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 32fe8af2e3..b7f32421aa 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2255,6 +2255,107 @@ All effects don't start immediately, but rather get worse over time; the rate is . = 1 return ..() +/datum/reagent/consumable/ethanol/gunfire + name = "Gunfire" + description = "A drink that tastes like tiny explosions." + color = "#e4830d" + boozepwr = 40 + quality = DRINK_GOOD + taste_description = "tiny explosions" + glass_icon_state = "gunfire" + glass_name = "Gunfire" + glass_desc = "It pops constantly as you look at it, giving off tiny sparks." + +/datum/reagent/consumable/ethanol/gunfire/on_mob_life(mob/living/carbon/M) + if (prob(3)) + to_chat(M,"You feel the gunfire pop in your mouth.") + return ..() + +/datum/reagent/consumable/ethanol/hellfire + name = "Hellfire" + description = "A nice drink that isn't quite as hot as it looks." + color = "#fb2203" + boozepwr = 60 + quality = DRINK_VERYGOOD + taste_description = "cold flames that lick at the top of your mouth" + glass_icon_state = "hellfire" + glass_name = "Hellfire" + glass_desc = "An amber colored drink that isn't quite as hot as it looks." + +/datum/reagent/consumable/ethanol/hellfire/on_mob_life(mob/living/carbon/M) + M.adjust_bodytemperature(30 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL + 30) + return ..() + +/datum/reagent/consumable/ethanol/sins_delight + name = "Sin's Delight" + description = "The drink smells like the seven sins." + color = "#330000" + boozepwr = 66 + quality = DRINK_FANTASTIC + taste_description = "sin" + glass_icon_state = "sins_delight" + glass_name = "Sin's Delight" + glass_desc = "You can smell the seven sins rolling off the top of the glass." + +/datum/reagent/consumable/ethanol/strawberry_daiquiri + name = "Strawberry Daiquiri" + description = "Pink looking alcoholic drink." + boozepwr = 20 + color = "#FF4A74" + quality = DRINK_NICE + taste_description = "sweet strawberry, lime and the ocean breeze" + glass_icon_state = "strawberry_daiquiri" + glass_name = "Strawberry Daiquiri" + glass_desc = "Pink looking drink with flowers and a big straw to sip it. Looks sweet and refreshing, perfect for warm days." + +/datum/reagent/consumable/ethanol/liz_fizz + name = "Liz Fizz" + description = "Triple citrus layered with some ice and cream." + boozepwr = 0 + color = "#D8FF59" + taste_description = "brain freezing sourness" + glass_icon_state = "liz_fizz" + glass_name = "Liz Fizz" + glass_desc = "Looks like a citrus sherbet seperated in layers? Why would anyone want that is beyond you." + +/datum/reagent/consumable/ethanol/miami_vice + name = "Miami Vice" + description = "A drink layering Pina Colada and Strawberry Daiquiri" + boozepwr = 30 + color = "#D8FF59" + quality = DRINK_FANTASTIC + taste_description = "sweet and refreshing flavor, complemented with strawberries and coconut, and hints of citrus" + glass_icon_state = "miami_vice" + glass_name = "Miami Vice" + glass_desc = "Strawberries and coconut, like yin and yang." + +/datum/reagent/consumable/ethanol/malibu_sunset + name = "Malibu Sunset" + description = "A drink consisting of creme de coconut and tropical juices" + boozepwr = 20 + color = "#FF9473" + quality = DRINK_NICE + taste_description = "coconut, with orange and grenadine accents" + glass_icon_state = "malibu_sunset" + glass_name = "Malibu Sunset" + glass_desc = "Tropical looking drinks, with ice cubes hovering on the surface and grenadine coloring the bottom." + +/datum/reagent/consumable/ethanol/hotlime_miami + name = "Hotlime Miami" + description = "The essence of the 90's, if they were a bloody mess that is." + boozepwr = 40 + color = "#A7FAE8" + quality = DRINK_FANTASTIC + taste_description = "coconut and aesthetic violence" + glass_icon_state = "hotlime_miami" + glass_name = "Hotlime Miami" + glass_desc = "This looks very aesthetically pleasing." + +/datum/reagent/consumable/ethanol/hotlime_miami/on_mob_life(mob/living/carbon/M) + M.set_drugginess(50) + M.adjustStaminaLoss(-2) + return ..() + /datum/reagent/consumable/ethanol/fruit_wine name = "Fruit Wine" description = "A wine made from grown plants." diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index 8a33f37c44..482dfde1d6 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -138,9 +138,11 @@ /datum/reagent/consumable/strawberryjuice name = "Strawberry Juice" - description = "No, you're not getting dosed." + description = "Refreshing seasonal summer drink." color = "#E50D31" taste_description = "strawberry" + glass_name = "glass of strawberry juice" + glass_desc = "Refreshing seasonal summer drink." /datum/reagent/consumable/nothing name = "Nothing" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 551ec42717..07e7bf1da8 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ