[MIRROR] resprites all soda cans, adds wellcheers juice [MDB IGNORE] (#22955)

* resprites all soda cans, adds wellcheers juice

* Update code/datums/mood_events/drink_events.dm

---------

Co-authored-by: Lamb <110322848+CoiledLamb@users.noreply.github.com>
Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-08-08 23:22:24 -04:00
committed by GitHub
co-authored by Lamb Pinta
parent 6d87a46f31
commit b2a6889563
11 changed files with 36 additions and 0 deletions
+5
View File
@@ -53,4 +53,9 @@
description = "<span class='nicegreen'>That drink was made for me!</span>\n"
mood_change = 12
timeout = 9 MINUTES
//SKYRAT ADD END
/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
@@ -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)
@@ -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."
@@ -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!"
+2
View File
@@ -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."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB