Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates milkshake sprites, adds two milkshake recipes. #70850

Merged
merged 5 commits into from
Nov 16, 2022

Conversation

KathrinBailey
Copy link
Contributor

@KathrinBailey KathrinBailey commented Oct 28, 2022

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
image

Changelog

🆑
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.

@tgstation-server tgstation-server added the Sprites A bikeshed full of soulless bikes. label Oct 28, 2022
@KathrinBailey
Copy link
Contributor Author

We need to make actual STRAWBERRIES one day instead of just using generic berry juice.

I agree, I think some other codebases have done a good job at it.

@Shadowflame909
Copy link
Contributor

We need to make actual STRAWBERRIES one day instead of just using generic berry juice.

strawberries are a myth promoted by syndicate spies. There was no nanotransen induced strawberry disaster of 20xx. (Which can be found in the secret files in the vault) Any talk otherwise is treason and should be reported to the security department for re-education.

@Mothblocks
Copy link
Member

are you actually playing with the default arial font? download the font that doesnt come with windows anymore https://file.house/q8Ld.fon

@KathrinBailey
Copy link
Contributor Author

are you actually playing with the default arial font? download the font that doesnt come with windows anymore https://file.house/q8Ld.fon

Well gee, thank you for fixing Runechat on every server that has it for me.
My highlight text was so big it was unreadable, and the character speech text was very difficult to read too.
It happened ever since I reinstalled Windows a few months back.

@Mothblocks
Copy link
Member

Yeah it is something we need to fix, we can't legally ship that font

Anyway please merge from master so the failed tests go away

@github-actions github-actions bot added the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Nov 5, 2022
@tgstation-server tgstation-server removed the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Nov 6, 2022
@github-actions github-actions bot added the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Nov 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants