diff --git a/modular_nova/master_files/icons/obj/drinks.dmi b/modular_nova/master_files/icons/obj/drinks.dmi index 9ccaa586ac7..e7d31ba7275 100644 Binary files a/modular_nova/master_files/icons/obj/drinks.dmi and b/modular_nova/master_files/icons/obj/drinks.dmi differ diff --git a/modular_nova/modules/customization/modules/food_and_drinks/recipes/drinks_recipes.dm b/modular_nova/modules/customization/modules/food_and_drinks/recipes/drinks_recipes.dm index 0a649b4f4f2..f8e22948abf 100644 --- a/modular_nova/modules/customization/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/modular_nova/modules/customization/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -109,6 +109,12 @@ results = list(/datum/reagent/consumable/ethanol/quadruple_sec/cityofsin = 4) required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 2, /datum/reagent/consumable/ethanol/champagne = 1, /datum/reagent/consumable/berryjuice = 1) +/datum/chemical_reaction/drink/cringe_weaver + results = list(/datum/reagent/consumable/ethanol/cringe_weaver = 10) + required_reagents = list(/datum/reagent/toxin/formaldehyde = 6, /datum/reagent/consumable/ethanol/fringe_weaver = 3, /datum/reagent/consumable/ice = 1) //9 'form'adelhyde, ice + mix_message = "The mix swells and turns a sickeningly pungent green, filling the air with a tangible miasma of cringe." + mix_sound = 'sound/effects/wounds/sizzle2.ogg' + /datum/chemical_reaction/drink/blizzard_brew results = list(/datum/reagent/consumable/ethanol/blizzard_brew = 3) required_reagents = list(/datum/reagent/consumable/ethanol/iced_beer = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/inverse/cryostylane = 1) diff --git a/modular_nova/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/modular_nova/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 4a922baf446..c399b5a529c 100644 --- a/modular_nova/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/modular_nova/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -832,6 +832,30 @@ name = "glass of city of sin" desc = "Looking at it makes you recall every mistake you've made." +/datum/reagent/consumable/ethanol/cringe_weaver + name = "Cringe Weaver" + description = "An infrangibly awful-tasting drink that 'smart' people inexplicably covet. For when they ask for a Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." + color = "#2BFE3C" + boozepwr = -20 //spicy. sobering. burning. cringe. + taste_description = "cringe and latin" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/ethanol/cringe_weaver/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired) + . = ..() + var/obj/item/organ/internal/liver/liver = drinker.get_organ_slot(ORGAN_SLOT_LIVER) + if(liver && HAS_TRAIT(liver, TRAIT_CORONER_METABOLISM)) + if(drinker.heal_bodypart_damage(1 * REM * seconds_per_tick, 1 * REM * seconds_per_tick)) //coroners love drinking formaldehyde + return UPDATE_MOB_HEALTH + else + drinker.adjust_disgust(1 * REM * seconds_per_tick) + +/datum/glass_style/drinking_glass/cringe_weaver + required_drink_type = /datum/reagent/consumable/ethanol/cringe_weaver + name = "Cringe Weaver" + desc = "Spicy, sobering, burning, and of course - irrefutably cringe. Enjoyed by patrons who ask for a plum in a man's hat." + icon = 'modular_nova/master_files/icons/obj/drinks.dmi' + icon_state = "cringe_weaver" + /datum/reagent/consumable/ethanol/shakiri name = "Shakiri" description = "A sweet, fragrant red drink made from fermented kiri fruits. It seems to gently sparkle when exposed to light."