diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index c97b8107f66..3042f834c88 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -370,6 +370,18 @@ results = list(/datum/reagent/consumable/bluecherryshake = 3) required_reagents = list(/datum/reagent/consumable/bluecherryjelly = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1) +/datum/chemical_reaction/drink/vanillashake + results = list(/datum/reagent/consumable/vanillashake = 3) + required_reagents = list(/datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1) + +/datum/chemical_reaction/drink/caramelshake + results = list(/datum/reagent/consumable/caramelshake = 3) + required_reagents = list(/datum/reagent/consumable/caramel = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1) + +/datum/chemical_reaction/drink/choccyshake + results = list(/datum/reagent/consumable/choccyshake = 3) + required_reagents = list(/datum/reagent/consumable/coco = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1) + /datum/chemical_reaction/drink/drunkenblumpkin results = list(/datum/reagent/consumable/ethanol/drunkenblumpkin = 4) required_reagents = list(/datum/reagent/consumable/blumpkinjuice = 1, /datum/reagent/consumable/ethanol/irish_cream = 2, /datum/reagent/consumable/ice = 1) @@ -728,6 +740,26 @@ results = list(/datum/reagent/consumable/toechtauese_syrup = 10) required_reagents = list(/datum/reagent/consumable/toechtauese_juice = 6, /datum/reagent/consumable/sugar = 4) +/datum/chemical_reaction/drink/roy_rogers + results = list(/datum/reagent/consumable/roy_rogers = 3) + required_reagents = list(/datum/reagent/consumable/space_cola = 2, /datum/reagent/consumable/grenadine = 1) + +/datum/chemical_reaction/drink/shirley_temple + results = list(/datum/reagent/consumable/shirley_temple = 3) + required_reagents = list(/datum/reagent/consumable/sol_dry = 2, /datum/reagent/consumable/grenadine = 1) + +/datum/chemical_reaction/drink/agua_fresca + results = list(/datum/reagent/consumable/agua_fresca = 3) + required_reagents = list(/datum/reagent/consumable/watermelonjuice = 4, /datum/reagent/consumable/ice = 1, /datum/reagent/water = 2, /datum/reagent/consumable/limejuice = 2, /datum/reagent/consumable/menthol = 1) + +/datum/chemical_reaction/drink/cinderella + results = list(/datum/reagent/consumable/cinderella = 50) + required_reagents = list(/datum/reagent/consumable/pineapplejuice = 10, /datum/reagent/consumable/orangejuice = 10, /datum/reagent/consumable/lemonjuice = 5, /datum/reagent/consumable/ice = 5, /datum/reagent/consumable/sol_dry = 20, /datum/reagent/consumable/ethanol/bitters = 2) + +/datum/chemical_reaction/drink/italian_coco + results = list(/datum/reagent/consumable/italian_coco = 10) + required_reagents = list(/datum/reagent/consumable/hot_coco = 5, /datum/reagent/consumable/corn_starch = 1, /datum/reagent/consumable/whipped_cream = 4) + /datum/chemical_reaction/drink/helianthus results = list(/datum/reagent/consumable/ethanol/helianthus = 5) required_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/toxin/mindbreaker = 1) diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index e7df970d67c..ad377282472 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -428,6 +428,23 @@ M.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, M.get_body_temp_normal()) ..() +/datum/reagent/consumable/roy_rogers + name = "Roy Rogers" + description = "A sweet fizzy drink." + color = "#53090B" + quality = DRINK_GOOD + taste_description = "fruity overlysweet cola" + glass_icon_state = "royrogers" + glass_name = "Roy Rogers" + glass_desc = "90% sugar in a glass." + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/roy_roger/on_mob_life(mob/living/carbon/M, delta_time, times_fired) + M.Jitter(6 * REM * delta_time) //not as strong as coffe, still this is a lot of sugar + M.adjust_drowsyness(-5 * REM * delta_time) + M.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, M.get_body_temp_normal()) + return ..() + /datum/reagent/consumable/nuka_cola name = "Nuka Cola" description = "Cola, cola never changes." @@ -785,13 +802,28 @@ ..() . = TRUE +/datum/reagent/consumable/cinderella + name = "Cinderella" + description = "Most definitely a fruity alcohol cocktail to have while partying with your friends." + color = "#FF6A50" + quality = DRINK_VERYGOOD + taste_description = "sweet tangy fruit" + glass_icon_state = "cinderella" + glass_name = "Cinderlla" + glass_desc = "There is not a single drop of alcohol in this thing." + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/cinderella/on_mob_life(mob/living/carbon/M, delta_time, times_fired) + M.adjust_disgust(-5 * REM * delta_time) + return ..() + /datum/reagent/consumable/cherryshake name = "Cherry Shake" description = "A cherry flavored milkshake." color = "#FFB6C1" quality = DRINK_VERYGOOD - nutriment_factor = 4 * REAGENTS_METABOLISM - taste_description = "creamy cherry" + nutriment_factor = 8 * REAGENTS_METABOLISM + taste_description = "creamy tart cherry" glass_icon_state = "cherryshake" glass_name = "cherry shake" glass_desc = "A cherry flavored milkshake." @@ -803,13 +835,52 @@ description = "An exotic milkshake." color = "#00F1FF" quality = DRINK_VERYGOOD - nutriment_factor = 4 * REAGENTS_METABOLISM + nutriment_factor = 8 * REAGENTS_METABOLISM taste_description = "creamy blue cherry" glass_icon_state = "bluecherryshake" glass_name = "blue cherry shake" glass_desc = "An exotic blue milkshake." chemical_flags = REAGENT_CAN_BE_SYNTHESIZED +/datum/reagent/consumable/vanillashake + name = "Vanilla Shake" + description = "A vanilla flavored milkshake. The basics are still good." + color = "#E9D2B2" + quality = DRINK_VERYGOOD + nutriment_factor = 8 * REAGENTS_METABOLISM + taste_description = "sweet creamy vanilla" + glass_icon_state = "vanillashake" + glass_name = "vanilla shake" + glass_desc = "A vanilla flavored milkshake." + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + glass_price = DRINK_PRICE_MEDIUM + +/datum/reagent/consumable/caramelshake + name = "Caramel Shake" + description = "A aramel flavored milkshake. Your teeth hurt looking at it." + color = "#E17C00" + quality = DRINK_GOOD + nutriment_factor = 10 * REAGENTS_METABOLISM + taste_description = "sweet rich creamy caramel" + glass_icon_state = "caramelshake" + glass_name = "caramel shake" + glass_desc = "A caramel flavored milkshake." + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + glass_price = DRINK_PRICE_MEDIUM + +/datum/reagent/consumable/choccyshake + name = "Chocolate Shake" + description = "A frosty chocolate milkshake." + color = "#541B00" + quality = DRINK_VERYGOOD + nutriment_factor = 8 * REAGENTS_METABOLISM + taste_description = "sweet creamy chocolate" + glass_icon_state = "choccyshake" + glass_name = "chocolate shake" + glass_desc = "A chocolate flavored milkshake." + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + glass_price = DRINK_PRICE_MEDIUM + /datum/reagent/consumable/pumpkin_latte name = "Pumpkin Latte" description = "A mix of pumpkin juice and coffee." @@ -883,7 +954,7 @@ /datum/reagent/consumable/hot_coco name = "Hot Coco" description = "Made with love! And coco beans." - nutriment_factor = 3 * REAGENTS_METABOLISM + nutriment_factor = 4 * REAGENTS_METABOLISM color = "#403010" // rgb: 64, 48, 16 taste_description = "creamy chocolate" glass_icon_state = "chocolateglass" @@ -900,6 +971,22 @@ holder.remove_reagent(/datum/reagent/consumable/capsaicin, 2 * REM * delta_time) ..() +/datum/reagent/consumable/italian_coco + name = "Italian Hot Chocolate" + description = "Made with love! You can just imagine a happy Nonna from the smell." + nutriment_factor = 8 * REAGENTS_METABOLISM + color = "#57372A" + quality = DRINK_VERYGOOD + taste_description = "thick creamy chocolate" + glass_icon_state = "italiancoco" + glass_name = "glass of italian coco" + glass_desc = "A spin on a winter favourite, made to please." + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/italian_coco/on_mob_life(mob/living/carbon/M, delta_time, times_fired) + M.adjust_bodytemperature(5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, 0, M.get_body_temp_normal()) + return ..() + /datum/reagent/consumable/menthol name = "Menthol" description = "Alleviates coughing symptoms one might have." @@ -978,6 +1065,21 @@ M.adjust_disgust(-5 * REM * delta_time) ..() +/datum/reagent/consumable/shirley_temple + name = "Shirley Temple" + description = "Here you go little girl, now you can drink like the adults." + color = "#F43724" + quality = DRINK_GOOD + taste_description = "sweet cherry syrup and ginger spice" + glass_icon_state = "shirleytemple" + glass_name = "Shirley Temple" + glass_desc = "Ginger ale with processed grenadine. " + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/shirley_temple/on_mob_life(mob/living/carbon/M, delta_time, times_fired) + M.adjust_disgust(-3 * REM * delta_time) + return ..() + /datum/reagent/consumable/red_queen name = "Red Queen" description = "DRINK ME." @@ -1066,6 +1168,23 @@ M.adjust_drowsyness(1 * REM * delta_time) return ..() +/datum/reagent/consumable/agua_fresca + name = "Agua Fresca" + description = "A refreshing watermelon agua fresca. Perfect on a day at the holodeck." + color = "#D25B66" + quality = DRINK_VERYGOOD + taste_description = "cool refreshing watermelon" + glass_icon_state = "aguafresca" + glass_name = "Agua Fresca" + glass_desc = "90% water, but still refreshing." + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/agua_fresca/on_mob_life(mob/living/carbon/M, delta_time, times_fired) + M.adjust_bodytemperature(-8 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * delta_time, M.get_body_temp_normal()) + if(M.getToxLoss() && DT_PROB(10, delta_time)) + M.adjustToxLoss(-0.5, 0) + return ..() + /datum/reagent/consumable/mushroom_tea name = "Mushroom Tea" description = "A savoury glass of tea made from polypore mushroom shavings, originally native to Tizira." diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index af431d9af3e..9be762165f0 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ