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.

Sign up for GitHub

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

Jump to bottom

Cherry-Picking Food, Drinks, Seeds. #1166

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Cherry-Picking Food, Drinks, Seeds. #1166

wants to merge 1 commit into from
+3,290 −32

Conversation

SpaceCowboyServer
Copy link

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Oct 30, 2024
@SimpleStation14 SimpleStation14 changed the title Cherry-pinking food, drinks, seeds. Cherry-Pinking Food, Drinks, Seeds. Oct 30, 2024
@SpaceCowboyServer SpaceCowboyServer changed the title Cherry-Pinking Food, Drinks, Seeds. Cherry-picking food, drinks, seeds. Oct 30, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

Resources/Textures/Objects/Consumable/Drinks/cucumberwater.rsi

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

Resources/Textures/Objects/Consumable/Drinks/honey.rsi

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

Resources/Textures/Objects/Consumable/Drinks/honeyicedtea.rsi

State Old New Status
icon Added

Resources/Textures/Objects/Consumable/Food/Baked/bagel.rsi

State Old New Status
bagel-poppy Added
bagel Added

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

State Old New Status
apple_strudel_1 Added
apple_strudel_2 Added
apple_strudel_3 Added
avocadotoast Added
breakfastbagel Added
breakfastbagelpoppy Added
challah Added
challahslice Added
cotton-slice Added
cotton Added
cucumbersandwich Added
inhand-left Added
inhand-right Added
pearmuffin Added

Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi

State Old New Status
croissant Added

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

State Old New Status
applecrisp-slice Added
applecrisp Added
pearandcheese Added

Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi

State Old New Status
cotton-pizza Added
cotton-slice Added
uranium-pizza Added
uranium-slice Added

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

State Old New Status
avocado Added
bellepear Added
greek Added
poachedpear Added

Resources/Textures/Objects/Consumable/Food/ingredients.rsi

State Old New Status
cotton-dough-flat Added
cotton-dough Added
croissant-raw Added
dough-rope Added
honeybottle Added

Resources/Textures/Objects/Consumable/Food/meat.rsi

State Old New Status
honeyglazedham Added
honeyglazedhamslice Added
normalhamslice Added

Resources/Textures/Objects/Consumable/Food/sushi.rsi

State Old New Status
avocadosushi Added
avocadosushislice Added
carpsushi Added
carpsushislice Added
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Specific/Hydroponics/avocado.rsi

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

Resources/Textures/Objects/Specific/Hydroponics/bees.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

Resources/Textures/Objects/Specific/Hydroponics/blue_pumpkin.rsi

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

Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi

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

Resources/Textures/Objects/Specific/Hydroponics/cucumber.rsi

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

Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi

State Old New Status
dead Added
harvest Added
produce-inhand-left Added
produce-inhand-right Added
produce Added
seed Added
stage-1 Added
stage-2 Added
stage-3 Added

Resources/Textures/Objects/Specific/Hydroponics/golden_apple.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

Resources/Textures/Objects/Specific/Hydroponics/moneytree.rsi

State Old New Status
dead Added
harvest Added
seed Added
stage-1 Added
stage-2 Added

Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi

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

Resources/Textures/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

Resources/Textures/Objects/Specific/Hydroponics/tea_plant.rsi

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

@SimpleStation14 SimpleStation14 changed the title Cherry-picking food, drinks, seeds. Cherry-Picking Food, Drinks, Seeds. Oct 30, 2024
@FoxxoTrystan FoxxoTrystan requested review from a team, VMSolidus, Aidenkrz, FoxxoTrystan, Remuchi, DEATHB4DEFEAT, Peptide90 and Pspritechologist and removed request for a team October 30, 2024 16:43
@github-actions github-actions bot added Status: Needs Review Someone please review this labels Oct 30, 2024
@FoxxoTrystan FoxxoTrystan added Priority: 3-Medium Needs to be resolved at some point Size: 2-Large For large issues/PRs Type: Port Brings something to here from another codebase labels Oct 30, 2024
@bruhmogus
Copy link

money trees? that sounds funny as fuck

@VMSolidus
Copy link
Member

Well, FIRST those YML Linter errors must be fixed before this can be merged!

@SpaceCowboyServer SpaceCowboyServer marked this pull request as draft November 8, 2024 13:02
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 2, 2025

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

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Peptide90 Peptide90 Peptide90 approved these changes

@VMSolidus VMSolidus VMSolidus approved these changes

@Aidenkrz Aidenkrz Awaiting requested review from Aidenkrz Aidenkrz was automatically assigned from Simple-Station/ee-writers

@FoxxoTrystan FoxxoTrystan Awaiting requested review from FoxxoTrystan FoxxoTrystan was automatically assigned from Simple-Station/ee-writers

@Remuchi Remuchi Awaiting requested review from Remuchi Remuchi was automatically assigned from Simple-Station/ee-writers

@DEATHB4DEFEAT DEATHB4DEFEAT Awaiting requested review from DEATHB4DEFEAT DEATHB4DEFEAT was automatically assigned from Simple-Station/ee-writers

@Pspritechologist Pspritechologist Awaiting requested review from Pspritechologist Pspritechologist was automatically assigned from Simple-Station/ee-writers

@sleepyyapril sleepyyapril Awaiting requested review from sleepyyapril sleepyyapril will be requested when the pull request is marked ready for review sleepyyapril is a code owner

Assignees

@SpaceCowboyServer SpaceCowboyServer

Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 3-Medium Needs to be resolved at some point Size: 2-Large For large issues/PRs Status: Merge Conflict FIX YOUR PR AAAGH Status: Needs Review Someone please review this Type: Port Brings something to here from another codebase
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@SpaceCowboyServer @bruhmogus @VMSolidus @Peptide90 @FoxxoTrystan