Skip to content

Commit

Permalink
Updates milkshake sprites, adds two milkshake recipes. (#70850)
Browse files Browse the repository at this point in the history
## About The Pull Request
• Updates all milkshake sprites, specifically moving the weird glass lid
looking part.
• Attempts to preserve #70804 by keeping the same color scheme for the
straws.
• Adds in banana milkshakes, obtained by juicing bananas.
• Adds in strawberry milkshakes, obtained by juicing berries.

## Why It's Good For The Game
Additional milkshake flavors to complete the menu. Strawberry and banana
are almost as iconic as chocolate!
### Reasoning behind changing the sprites
New sprites remove the weird glass partition between shake and cream,
and removes the dome lid.

The chocolate milkshake was unusually dark beforehand. It looked like
coffee, almost. I've made real milkshakes before, using ice cream, milk,
ice and cocoa powder. Even with a _lot_ of cocoa powder, it isn't
getting dark as the old sprite. The new sprite is roughly what my
milkshakes looked like.

The straws have been changed to be angled instead of piercing straight
through the cream. I think it looks better angled too.

The vanilla shake previously looked far too yellow. Vanilla isn't _that_
yellow and it'd have confused players into thinking it might've been the
new banana milkshake.

## Sprites

![image](https://user-images.githubusercontent.com/53862927/198489748-78bbf87f-b11e-4f5e-a161-74b5bfcf4eb3.png)

![image](https://user-images.githubusercontent.com/53862927/198495882-b632883c-88a8-43d7-82e4-6f9f91af41c5.png)

## Changelog

:cl:
add: Banana and strawberry milkshakes! Made by juicing berries and
bananas respectively, with ice and cream.
/:cl:

Thanks for your time y'all, Happy Halloween.
  • Loading branch information
KathrinBailey committed Nov 16, 2022
1 parent fb14018 commit e45b038
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@
results = list(/datum/reagent/consumable/choccyshake = 3)
required_reagents = list(/datum/reagent/consumable/coco = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1)

/datum/chemical_reaction/drink/strawberryshake
results = list(/datum/reagent/consumable/strawberryshake = 3)
required_reagents = list(/datum/reagent/consumable/berryjuice = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1)

/datum/chemical_reaction/drink/bananashake
results = list(/datum/reagent/consumable/bananashake = 3)
required_reagents = list(/datum/reagent/consumable/banana = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1)

/datum/chemical_reaction/drink/pumpkin_latte
results = list(/datum/reagent/consumable/pumpkin_latte = 15)
required_reagents = list(/datum/reagent/consumable/pumpkinjuice = 5, /datum/reagent/consumable/coffee = 5, /datum/reagent/consumable/cream = 5)
Expand Down
26 changes: 26 additions & 0 deletions code/modules/reagents/chemistry/reagents/drink_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,32 @@
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
glass_price = DRINK_PRICE_MEDIUM

/datum/reagent/consumable/strawberryshake
name = "Strawberry Shake"
description = "A strawberry milkshake."
color = "#ff7b7b"
quality = DRINK_VERYGOOD
nutriment_factor = 8 * REAGENTS_METABOLISM
taste_description = "sweet strawberries and milk"
glass_icon_state = "strawberryshake"
glass_name = "strawberry shake"
glass_desc = "A strawberry flavored milkshake."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
glass_price = DRINK_PRICE_MEDIUM

/datum/reagent/consumable/bananashake
name = "Banana Shake"
description = "A banana milkshake. Stuff that clowns drink at their honkday parties."
color = "#f2d554"
quality = DRINK_VERYGOOD
nutriment_factor = 8 * REAGENTS_METABOLISM
taste_description = "thick banana"
glass_icon_state = "bananashake"
glass_name = "banana shake"
glass_desc = "A banana flavored milkshake."
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
glass_price = DRINK_PRICE_MEDIUM

/datum/reagent/consumable/pumpkin_latte
name = "Pumpkin Latte"
description = "A mix of pumpkin juice and coffee."
Expand Down
Binary file modified icons/obj/drinks.dmi
Binary file not shown.

0 comments on commit e45b038

Please sign in to comment.