diff --git a/code/datums/mood_events/drink_events.dm b/code/datums/mood_events/drink_events.dm index 1a035073a3aea6..e64b00553a365b 100644 --- a/code/datums/mood_events/drink_events.dm +++ b/code/datums/mood_events/drink_events.dm @@ -47,3 +47,8 @@ description = "Amazing taste!" mood_change = 50 timeout = 10 MINUTES + +/datum/mood_event/wellcheers + description = "What a tasty can of Wellcheers! The salty grape taste is a great pick-me-up." + mood_change = 3 + timeout = 7 MINUTES diff --git a/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm b/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm index 076587b0cd9c12..561a4275620be6 100644 --- a/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm +++ b/code/modules/food_and_drinks/recipes/drinks/drinks_alcoholic.dm @@ -168,6 +168,10 @@ results = list(/datum/reagent/consumable/ethanol/whiskeysoda = 3) required_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/consumable/sodawater = 1) +/datum/chemical_reaction/drink/wellcheers + results = list(/datum/reagent/consumable/wellcheers = 5) + required_reagents = list(/datum/reagent/consumable/berryjuice = 1, /datum/reagent/consumable/watermelonjuice = 1, /datum/reagent/consumable/sodawater = 1, /datum/reagent/consumable/salt = 1, /datum/reagent/consumable/ethanol/absinthe = 1) + /datum/chemical_reaction/drink/black_russian results = list(/datum/reagent/consumable/ethanol/black_russian = 5) required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 3, /datum/reagent/consumable/ethanol/kahlua = 2) diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm index 3f6d4cbe7bd6d3..13a121bd247ff2 100644 --- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm @@ -606,6 +606,24 @@ ..() . = TRUE +/datum/reagent/consumable/wellcheers + name = "Wellcheers" + description = "A strange purple drink, smelling of saltwater. Somewhere in the distance, you hear seagulls." + color = "#762399" // rgb: 118, 35, 153 + taste_description = "grapes and the fresh open sea" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/wellcheers/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + affected_mob.adjust_drowsiness(3 SECONDS * REM * seconds_per_tick) + switch(affected_mob.mob_mood.mood_level) + if (MOOD_LEVEL_SAD4 to MOOD_LEVEL_SAD2) + affected_mob.adjustStaminaLoss(3 * REM * seconds_per_tick, 0) + if (MOOD_LEVEL_SAD2 to MOOD_LEVEL_HAPPY2) + affected_mob.add_mood_event("wellcheers", /datum/mood_event/wellcheers) + if (MOOD_LEVEL_HAPPY2 to MOOD_LEVEL_HAPPY4) + affected_mob.adjustBruteLoss(-1.5 * REM * seconds_per_tick, 0) + return ..() + /datum/reagent/consumable/monkey_energy name = "Monkey Energy" description = "The only drink that will make you unleash the ape." diff --git a/code/modules/reagents/reagent_containers/cups/soda.dm b/code/modules/reagents/reagent_containers/cups/soda.dm index d46ffd37692d20..bf751d075d702a 100644 --- a/code/modules/reagents/reagent_containers/cups/soda.dm +++ b/code/modules/reagents/reagent_containers/cups/soda.dm @@ -260,6 +260,13 @@ list_reagents = list(/datum/reagent/consumable/shamblers = 30, /datum/reagent/eldritch = 5) drink_type = SUGAR | JUNKFOOD +/obj/item/reagent_containers/cup/soda_cans/wellcheers + name = "Wellcheers Juice" + desc = "A strange purple drink, smelling of saltwater. Somewhere in the distance, you hear seagulls." + icon_state = "wellcheers" + list_reagents = list(/datum/reagent/consumable/wellcheers = 30) + drink_type = SUGAR | JUNKFOOD + /obj/item/reagent_containers/cup/soda_cans/grey_bull name = "Grey Bull" desc = "Grey Bull, it gives you gloves!" diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index e446c1d29382a2..4aa932e4b10cb3 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -21,6 +21,7 @@ contraband = list( /obj/item/reagent_containers/cup/soda_cans/thirteenloko = 6, /obj/item/reagent_containers/cup/soda_cans/shamblers = 6, + /obj/item/reagent_containers/cup/soda_cans/wellcheers = 6, ) premium = list( /obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola = 1, @@ -101,6 +102,7 @@ /obj/item/reagent_containers/cup/soda_cans/lemon_lime = 10, /obj/item/reagent_containers/cup/soda_cans/sol_dry = 10, /obj/item/reagent_containers/cup/soda_cans/shamblers = 10, + /obj/item/reagent_containers/cup/soda_cans/wellcheers = 5, ) product_slogans = "~Shake me up some of that Shambler's Juice!~" product_ads = "Refreshing!;Thirsty for DNA? Satiate your craving!;Over 1 trillion souls drank!;Made with real DNA!;The hivemind demands your thirst!;Drink up!;Absorb your thirst." diff --git a/icons/mob/inhands/items/drinks_lefthand.dmi b/icons/mob/inhands/items/drinks_lefthand.dmi index 6d7cc042f77234..b1aa5e67822baa 100644 Binary files a/icons/mob/inhands/items/drinks_lefthand.dmi and b/icons/mob/inhands/items/drinks_lefthand.dmi differ diff --git a/icons/mob/inhands/items/drinks_righthand.dmi b/icons/mob/inhands/items/drinks_righthand.dmi index 02756cb6448327..3d1110960443ff 100644 Binary files a/icons/mob/inhands/items/drinks_righthand.dmi and b/icons/mob/inhands/items/drinks_righthand.dmi differ diff --git a/icons/obj/drinks/drink_effects.dmi b/icons/obj/drinks/drink_effects.dmi index 63bc699c9f5c79..b0441f73f3462a 100644 Binary files a/icons/obj/drinks/drink_effects.dmi and b/icons/obj/drinks/drink_effects.dmi differ diff --git a/icons/obj/drinks/soda.dmi b/icons/obj/drinks/soda.dmi index 20bdeed8032801..95b195789d13ef 100644 Binary files a/icons/obj/drinks/soda.dmi and b/icons/obj/drinks/soda.dmi differ diff --git a/icons/obj/service/janitor.dmi b/icons/obj/service/janitor.dmi index 0054e7f96e3d8c..18a574c7cff088 100644 Binary files a/icons/obj/service/janitor.dmi and b/icons/obj/service/janitor.dmi differ diff --git a/icons/obj/storage/storage.dmi b/icons/obj/storage/storage.dmi index 1aabd198b128d0..cdaf8cae339f71 100644 Binary files a/icons/obj/storage/storage.dmi and b/icons/obj/storage/storage.dmi differ