-
Notifications
You must be signed in to change notification settings - Fork 599
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
Pumpkin Spice Latte #1558
Merged
Cheackraze
merged 6 commits into
new-frontiers-14:master
from
whatston3:2024-06-22-pumpkin-spice
Jul 8, 2024
Merged
Pumpkin Spice Latte #1558
Cheackraze
merged 6 commits into
new-frontiers-14:master
from
whatston3:2024-06-22-pumpkin-spice
Jul 8, 2024
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
RSI Diff Bot; head commit c64e78b merging into e3ef523 Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi
|
github-actions
bot
added
the
S: Merge Conflict
This PR has conflicts that prevent merging
label
Jun 24, 2024
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
removed
the
S: Merge Conflict
This PR has conflicts that prevent merging
label
Jun 24, 2024
Cheackraze
approved these changes
Jul 8, 2024
FrontierATC
added a commit
that referenced
this pull request
Jul 8, 2024
The pumpkin spice must flow! |
Actualcatmoment
added a commit
to Actualcatmoment/frontier-station-14
that referenced
this pull request
Jul 11, 2024
Revert mysterysludge flavor change, and move "basic" flavor to original flavor file to prevent duplicate file error.
2 tasks
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.
About the PR
Even in space, autumn is coming. Adds a craftable pumpkin spice latte, along with metamorphic glass sprites by Stagnation (many thanks).
Why / Balance
Enhancing barista roleplay (combine with #1546 for maximum effect), gives ships more incentive to grow pumpkins. Adds _NF files for flavours/drinks that can help springboard newer devs into making more food recipes (#1159).
How to test
Media
Breaking changes
Changelog
🆑 whatston3 and Stagnation