diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 3141a9340a..3592f5a437 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -633,6 +633,13 @@ required_catalysts = list("enzyme" = 5) mix_message = "The rice grains ferment into a clear, sweet-smelling liquid." +/datum/chemical_reaction/peppermint_patty + name = "Peppermint Patty" + id = "peppermint_patty" + results = list("peppermint_patty" = 10) + required_reagents = list("hot_coco" = 6, "creme_de_cacao" = 1, "creme_de_menthe" = 1, "vodka" = 1, "menthol" = 1) + mix_message = "The coco turns mint green just as the strong scent hits your nose." + /datum/chemical_reaction/alexander name = "Alexander" id = "alexander" diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 94c05db36e..b8711e13f3 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -60,7 +60,7 @@ /datum/emote/living/cough/can_run_emote(mob/user, status_check = TRUE) . = ..() - if(user.reagents.get_reagent("menthol")) + if(user.reagents.get_reagent("menthol") || user.reagents.get_reagent("peppermint_patty")) return FALSE /datum/emote/living/dance diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index f9c707570a..cc1b75559f 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1559,6 +1559,21 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_name = "cup of sake" glass_desc = "A traditional cup of sake." +/datum/reagent/consumable/ethanol/peppermint_patty + name = "Peppermint Patty" + id = "peppermint_patty" + description = "This lightly alcoholic drink combines the benefits of menthol and cocoa." + color = "#45ca7a" + taste_description = "mint and chocolate" + boozepwr = 25 + glass_icon_state = "peppermint_patty" + glass_name = "Peppermint Patty" + glass_desc = "A boozy minty hot cocoa that warms your belly on a cold night." + +/datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/M) + M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL) + ..() + /datum/reagent/consumable/ethanol/alexander name = "Alexander" id = "alexander" @@ -1591,7 +1606,6 @@ All effects don't start immediately, but rather get worse over time; the rate is to_chat(L,"You notice [mighty_shield] looks worn again. Weird.") ..() - /datum/reagent/consumable/ethanol/sidecar name = "Sidecar" id = "sidecar" @@ -1648,7 +1662,7 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "mojito" glass_name = "Mojito" glass_desc = "A drink that looks as refreshing as it tastes." - + /datum/reagent/consumable/ethanol/fernet name = "Fernet" id = "fernet" @@ -1697,9 +1711,9 @@ All effects don't start immediately, but rather get worse over time; the rate is glass_icon_state = "fanciulli" glass_name = "glass of fanciulli" glass_desc = "A glass of Fanciulli. It's just Manhattan with Fernet." - + /datum/reagent/consumable/ethanol/fanciulli/on_mob_life(mob/living/M) - + M.nutrition = max(M.nutrition - 5, 0) M.overeatduration = 0 return ..() diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index a845a4294c..e6e8ff9eb7 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ