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

Ports Pears & Coffee from Frontier #2232

Merged
merged 18 commits into from
Dec 31, 2024
Merged

Conversation

Lyndomen
Copy link
Contributor

About the PR

Title, ports pears and pear recipes from frontier, as well as coffee, coffee roasting, and brewing.

new-frontiers-14/frontier-station-14#2047
new-frontiers-14/frontier-station-14#1546
new-frontiers-14/frontier-station-14#1558

Thank you to dustylens, whatston3, Iocanthos, and I couldn't find out who made pears- so thank you to that person too.

Why / Balance

Botany content on request. Coffee roasting is actually kinda baller and could lead to barista gaming

Technical details

YAML warrior

Media

image
image
image
image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog
🆑

  • add: Ports pears from Frontier, and pear related recipes
  • add: Ports coffee from Frontier, as well as bean roasting and brewing

@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels Nov 18, 2024
Copy link
Contributor

github-actions bot commented Nov 18, 2024

RSI Diff Bot; head commit 608df6b merging into 100b575
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

Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi

State Old New Status
inhand-left Added
inhand-right Added
pearmuffin Added

Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi

State Old New Status
inhand-left Added
inhand-right Added
pearandcheese Added
tin Added

Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi

State Old New Status
bellepear Added
bowl Added
poachedpear Added

Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi

State Old New Status
dead Added
harvest Added
produce-beans-dark Added
produce-beans-light Added
produce-beans-medium Added
produce-beans Added
produce Added
seed Added
stage-1 Added
stage-2 Added
stage-3 Added
stage-4 Added
stage-5 Added

Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi

State Old New Status
dead Added
harvest Added
produce Added
seed Added
stage-1 Added
stage-2 Added
stage-3 Added
stage-4 Added
stage-5 Added
stage-6 Added

Edit: diff updated after 608df6b

@github-actions github-actions bot added the size/L 256-1023 lines label Nov 25, 2024
@deltanedas deltanedas requested review from a team as code owners December 17, 2024 04:52
@Lyndomen
Copy link
Contributor Author

Direction approved :trollface:

@deltanedas deltanedas merged commit 73ddca8 into DeltaV-Station:master Dec 31, 2024
19 of 20 checks passed
@Lyndomen Lyndomen deleted the pearops branch January 5, 2025 02:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/L 256-1023 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants