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

DrinkWave4 #185

Closed
wants to merge 0 commits into from
Closed

Conversation

SleepyScarecrow
Copy link
Contributor

Description

This adds even more drinks. This also contains the edits I made to upstream's ethanol system, which has been merged, but I just needed it here quicker to go along with the drinkwave. Each drink is now calculated, with the base spirits having their real life values of ethanol, and then a quick equation for the cocktails to get it right.


TODO

  • Task
  • Completed Task

Media

Example Media Embed


Changelog

🆑

  • add: Added more community drinks
  • tweak: Tweaked Ethanol
  • fix: Fixed Drinks

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Sep 12, 2024
Copy link
Contributor

RSI Diff Bot; head commit 28a1a54 merging into 91d46c4
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Floof/Objects/Consumable/Drinks/technicalproblem.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon Added
icon_empty Added

@SleepyScarecrow SleepyScarecrow marked this pull request as draft September 12, 2024 01:39
@SleepyScarecrow
Copy link
Contributor Author

still need to do sprites and more fixes

@Fansana
Copy link
Owner

Fansana commented Sep 13, 2024

I know this is still wip, but the change log needs a bit of work. Fixed Drinks doesn't tell me anything. Tweaked Ethanol how was it tweaked. Added more community drinks maybe list some of the more notable ones so people get a general idea on what they can now make.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Sep 17, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed Changes: Localization Changes any ftl files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Sep 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Merge Conflict FIX YOUR PR AAAGH Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants