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

Honey #2282

Merged
merged 21 commits into from
Oct 27, 2024
Merged

Honey #2282

merged 21 commits into from
Oct 27, 2024

Conversation

RichardRahl123
Copy link
Contributor

@RichardRahl123 RichardRahl123 commented Oct 19, 2024

<!
honeyPRStuff
honeyPRStuff2
-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline -->

About the PR

I added Honey, Bees in the hydroponics and a few recipes with honey. I also created honey iced tea which is a combo of honey and iced tea.
TO DO:

  • Replace seed packet sprite with jar of bees sprite
  • Get a better Honey Iced Tea metamorphic sprite

Why / Balance

Add more food and variety to cooking system

How to test

Cook each recipe, grow some bees and turn honeycomb into honey. Make sure honey container is making honey and comb juices into honey.

Media

Requirements

Breaking changes

Changelog

🆑
-add: Honey, Honey recipes, and Bees

Copy link
Contributor

github-actions bot commented Oct 19, 2024

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

Resources/Textures/_NF/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/_NF/Objects/Consumable/Drinks/honeyicedtea.rsi

State Old New Status
icon Added

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

State Old New Status
apple_strudel_1 Added
apple_strudel_2 Added
apple_strudel_3 Added
challah Added
challahslice Added

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

State Old New Status
alpha-slice-filling Added
applecrisp-slice Added
applecrisp Added

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

State Old New Status
honeybottle Added

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

State Old New Status
honeyglazedham Added
honeyglazedhamslice Added
normalhamslice Added

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

Edit: diff updated after 939ac78

@GreaseMonk
Copy link
Contributor

Love it!
Would personally like to be able to put honey in everything, (including a honey container) and the honey container should be able to contain other liquids as well but it's basically craftable fashion to go with it.

@github-actions github-actions bot added the S: Needs Review This PR is awaiting reviews label Oct 19, 2024
@whatston3 whatston3 self-assigned this Oct 22, 2024
@dvir001 dvir001 added the S: Awaiting Changes This PR has changes that need to be made before merging label Oct 23, 2024
@github-actions github-actions bot added the C# label Oct 26, 2024
Copy link
Contributor

@whatston3 whatston3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added that a jar of bees can be thrown and breaks into an angry bee (that does barely any damage and dies after 15 seconds - with any swingable weapon this isn't an issue).

Cleaned up a good few of the food entities into their proper folders, including pear muffins into Baked/misc. Changed the name of the honey apple pie, added some oats (we now have TWO oat recipes), rewrote a good few of the descriptions, and pushed the string used for seed packet generation into the SeedPrototype.

Looks good to me, thanks for the feature.

@whatston3 whatston3 removed the S: Awaiting Changes This PR has changes that need to be made before merging label Oct 26, 2024
Copy link
Contributor

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

@github-actions github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label Oct 27, 2024
@github-actions github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label Oct 27, 2024
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works alright

@ErhardSteinhauer ErhardSteinhauer merged commit 0eee6c2 into new-frontiers-14:master Oct 27, 2024
16 checks passed
FrontierATC added a commit that referenced this pull request Oct 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants