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

Pretty Burgers! #2715

Open
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

SketchiiArtist
Copy link

@SketchiiArtist SketchiiArtist commented Jan 17, 2025

About the PR

Added 7 new colorful variants of the plain burgers, crafted by including the chosen color of crayon in the plain burger recipe.

Why / Balance

The change is purely for cosmetic and roleplay purposes, adding another fun food option for people to play around with. The contents of the burgers are no different than a plain one.

How to test

Put 1 raw meat, 1 bun, and 1 crayon of any color below into an oven and cook for 10 seconds.
Red crayon -> red pretty burger
Orange crayon -> orange pretty burger
Yellow crayon -> yellow pretty burger
Green crayon -> green pretty burger
Blue crayon -> blue pretty burger
Purple crayon -> purple pretty burger
Black crayon -> black and white pretty burger
White crayon -> black and white pretty burger

Media

Screenshot 2025-01-17 174628

Requirements

Breaking changes

None.
Changelog
🆑

  • add: Added 7 new burger recipes using a crayon as a unique ingredient.

Copy link
Contributor

github-actions bot commented Jan 17, 2025

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

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

State Old New Status
plainblack Added
plainblue Added
plaingreen Added
plainorange Added
plainpurple Added
plainred Added
plainwhite Added
plainyellow Added

Edit: diff updated after 30ae920

@dvir001
Copy link
Contributor

dvir001 commented Jan 17, 2025

No Flavorol
Match to burger at
#1839

@SketchiiArtist
Copy link
Author

Flavorol removed and containers adjusted to keep the same sauce cap.

@dvir001
Copy link
Contributor

dvir001 commented Jan 27, 2025

Dont click merge master unless you are doing more edits as its forcing us to run manual tests everytime.

@dvir001 dvir001 self-requested a review January 27, 2025 15:25
@github-actions github-actions bot added the S: Needs Review This PR is awaiting reviews label Jan 27, 2025
@dvir001 dvir001 added S: Awaiting Changes This PR has changes that need to be made before merging and removed S: Needs Review This PR is awaiting reviews labels Jan 27, 2025
@dvir001
Copy link
Contributor

dvir001 commented Jan 27, 2025

@whatston3 said he might redo one of the sprite, waiting for him.

@SketchiiArtist
Copy link
Author

Got it, thank you for the heads up on that

@whatston3
Copy link
Contributor

Distinct black and white burgers?
black
white

Added Black Burger
Added White Burger
Removed unnecessary code in all pretty Burgers
    All pretty burgers now parent off burger plain
    All pretty burgers no longer have unique container managers, allowing them to adopt Plain burger's
    All pretty burgers no longer have unique flavor profiles, allowing them to adopt Plain burger's
Modified both BnW recipes to make their respective black and white counterparts instead.
@whatston3 whatston3 added S: Needs Review This PR is awaiting reviews and removed S: Awaiting Changes This PR has changes that need to be made before merging labels Feb 9, 2025
@whatston3
Copy link
Contributor

whatston3 commented Feb 9, 2025

Touched up the burger [descriptions], added a copyright line with original sprite attributions. Seems silly to me, but featurewise it's fine.

@dvir001
Copy link
Contributor

dvir001 commented Feb 9, 2025

Touched up the burger definitions, added a copyright line with original sprite attributions. Seems silly to me, but featurewise it's fine.

Burger ™️

@dustylens
Copy link
Contributor

Do not merge until the magic crayon rgb burger is in thank

@whatston3 whatston3 added S: Approved and removed S: Needs Review This PR is awaiting reviews labels Feb 9, 2025
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.

4 participants