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

Pumpkin Spice Latte #1558

Merged

Conversation

whatston3
Copy link
Contributor

@whatston3 whatston3 commented Jun 22, 2024

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

  1. Run locally.
  2. Make some pumpkin spice lattes.
  3. Observe the glass sprites as you drink the sickly sweet nectar.
  4. Appreciate the fine orange colour of the liquid in a jug.

Media

pumpkin-spice-slurp

pumpkin-spice-guidebook

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑 whatston3 and Stagnation

  • add: Spiced pumpkin lattes can now be mixed by bartenders.

Copy link
Contributor

github-actions bot commented Jun 22, 2024

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

Resources/Textures/_NF/Objects/Consumable/Drinks/pumpkinspicelatte.rsi

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

Edit: diff updated after c64e78b

@github-actions github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label Jun 24, 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 the S: Merge Conflict This PR has conflicts that prevent merging label Jun 24, 2024
@dvir001 dvir001 self-requested a review July 6, 2024 19:32
@github-actions github-actions bot added the S: Needs Review This PR is awaiting reviews label Jul 6, 2024
@Cheackraze Cheackraze merged commit b5c3dea into new-frontiers-14:master Jul 8, 2024
13 checks passed
FrontierATC added a commit that referenced this pull request Jul 8, 2024
@azigler
Copy link

azigler commented Jul 8, 2024

The pumpkin spice must flow!

@Iajret Iajret mentioned this pull request Jul 10, 2024
1 task
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.
@whatston3 whatston3 deleted the 2024-06-22-pumpkin-spice branch July 23, 2024 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants