resprites all soda cans, adds wellcheers juice (#77424)
## About The Pull Request 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:  (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!  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?  ## Why It's Good For The Game 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. ## Changelog 🆑 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 /🆑
@@ -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
|
||||
|
||||
@@ -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!"
|
||||
|
||||
@@ -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."
|
||||
|
||||
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |