DrinkWave3 #121
Merged
DrinkWave3 #121
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Changes: Localization
|
RSI Diff Bot; head commit 08169bc merging into a626437 Resources/Textures/Floof/Objects/Consumable/Drinks/koboldkooler.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/koboldkorkscrew.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/lamplight.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/salvagersdelight.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/voltage.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/7deadlysins.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/appleberryfizz.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/bande.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/bethanyscumlust.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/bethanyssluttycumlust.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/cafedecacao.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/calicosunrise.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/cremedecacao.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/darkoasis.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/deadmansdraught.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/dirtywastelander.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/heartbreakmountain.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/holyvice.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/numberone.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/pomonade.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/prisonwine.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/quadruplecreamchalice.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/slimesdelight.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/snowball.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/specialsundae.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/thewaterslide.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/triplecitrus.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/wakeupjuice.rsi
|
|
Test fails are legit, issues are as follows:
|
|
Ah lools like you handled em |
|
You seem to know what you are doing, I'll leave you to it o7 |
|
ignore that commit name i fucked up cherry picking lol |
|
That error looks valid but I honestly couldn't tell you what's wrong with it |
|
I can't figure it out either |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
idk if the build fail is valid or not |
|
like I've seen this before but it doesn't actually seem to fuck up anything? |
|
There is a possibility that one of these newly added drinks overwrites another recipe. Worth taking a look at. |
|
There is also a possibility that one of the vanilla recipes overwrites one of these drinks before they can be made. |
|
i think the issue was the prisonwine recipe, it directly overwrote the grapesoda recipe |
|
works now :3 |
Memeji
approved these changes
Aug 21, 2024
FoxxoTrystan
approved these changes
Aug 21, 2024
Floof-Station-Bot
added a commit
that referenced
this pull request
Aug 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adding in 24 more community-suggested drinks.
TODO
Changelog
🆑 Tilkku