Skip to content

Commit

Permalink
resprites all soda cans, adds wellcheers juice (tgstation#77424)
Browse files Browse the repository at this point in the history
this one was a labor of love. all the existing soda cans have been
resprited, with the help of @retlaw34 (new top palettes), @Imaginos16
(new top shapes, can palettes), and some original sprites done by
@Krysonism (monkey energy, the 13 loko).
you can see the before and afters here:

![image](https://github.com/tgstation/tgstation/assets/110322848/f23f0b06-d3b3-40dd-b0f9-353fb5864b92)
(now includes crushed cans, and inhands!)
let me know if there's any promotional stuff i should also include in
this PR, like if sol dry has a poster somewhere, and i'll go update that
with any changes made.

also adds a new drink, idea courtesy of @YesterdaysPromise:
wellcheers juice!

![image](https://github.com/tgstation/tgstation/assets/110322848/96c6d57a-79c3-4b70-8bd5-c8f3d1bbec41)
it will make you drowsy, and has a variable affect on your mood
if you are unhappy, it will deal stamina damage
if you are neutral, it will give you a mood boost
if you are happy, it will heal some brute damage

also, six packs of cans have been resprited. can i interest anyone in an
alamo? or just a space beer?

![image](https://github.com/tgstation/tgstation/assets/110322848/567d677b-d89b-4c52-b576-b15293aabf49)

old can sprites were _crusty_. it was nearly impossible to tell what
some of the logos were, and the palettes were dated as well. this tries
to keep the logo similar where possible, giving them new life where i
can, and sometimes reimagining them. the result is still internally
consistent, but much more polished.

:cl:
add: Added wellcheers, a contraband soda with various side effects.
image: resprites all cans in the drinks icon file
image: resprites the canholder sprite in storage.dmi
/:cl:
  • Loading branch information
CoiledLamb authored and AlbertNanotracen committed Jan 23, 2024
1 parent 88d7322 commit 11fce83
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 0 deletions.
5 changes: 5 additions & 0 deletions code/datums/mood_events/drink_events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,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
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
18 changes: 18 additions & 0 deletions code/modules/reagents/chemistry/reagents/drink_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,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."
Expand Down
15 changes: 15 additions & 0 deletions code/modules/reagents/reagent_containers/cups/soda.dm
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,21 @@
list_reagents = list(/datum/reagent/consumable/shamblers = 30)
drink_type = SUGAR | JUNKFOOD

/obj/item/reagent_containers/cup/soda_cans/shamblers/eldritch
name = "Shambler's juice Eldritch Energy!"
desc = "~J'I'CE!~"
icon_state = "shamblerseldritch"
volume = 40
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!"
Expand Down
2 changes: 2 additions & 0 deletions code/modules/vending/cola.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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."
Expand Down
Binary file modified icons/mob/inhands/items/drinks_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/items/drinks_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/drinks/drink_effects.dmi
Binary file not shown.
Binary file modified icons/obj/drinks/soda.dmi
Binary file not shown.
Binary file modified icons/obj/janitor.dmi
Binary file not shown.
Binary file modified icons/obj/storage/storage.dmi
Binary file not shown.

0 comments on commit 11fce83

Please sign in to comment.