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

Deep fryer from Nyanotrasen #38

Closed
wants to merge 14 commits into from

Conversation

Adrian16199
Copy link
Contributor

@Adrian16199 Adrian16199 commented Sep 21, 2023

Adds a Deep fryer.

About the PR

A deep Fryer

TO-DO: Alot.

Why / Balance

Because deep fried food is good.

Technical details

Adds alot and changes few, changes were summarized with Start of Nyano code and End of Nyano code.

Media

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

Breaking changes

Changelog

-add: Deep fryer.

Adds a Deep fryer.
@github-actions
Copy link
Contributor

github-actions bot commented Sep 21, 2023

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

Resources/Textures/Nyanotrasen/Consumables/Drinks/oil_jar.rsi

State Old New Status
butter Added
corn Added
icon Added
icon_open Added
olives Added

Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi

State Old New Status
off-0 Added
off-1 Added
off-2 Added
off-3 Added
off-4 Added
off-5 Added
off-6 Added
off-7 Added
off-8 Added
on-1 Added
on-2 Added
on-3 Added
on-4 Added
on-5 Added
on-6 Added
on-7 Added
on-8 Added

Edit: diff updated after 2cf5626

@Adrian16199 Adrian16199 marked this pull request as ready for review September 29, 2023 13:47
@github-actions github-actions bot added the Status: Merge Conflict Fix your PR! label Sep 29, 2023
@github-actions
Copy link
Contributor

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

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label Sep 29, 2023
@Colin-Tel
Copy link
Contributor

Ah fixed eet! 🔧👴

@github-actions github-actions bot added the Status: Merge Conflict Fix your PR! label Oct 3, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 3, 2023

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

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label Oct 3, 2023
@DebugOk DebugOk marked this pull request as draft October 5, 2023 20:43
Unknown if correct

Fixed fatal errors, not aware if fixes it ingame correctly
@DebugOk
Copy link
Contributor

DebugOk commented Oct 18, 2023

Superseded by #163

@DebugOk DebugOk closed this Oct 18, 2023
@Adrian16199 Adrian16199 deleted the Deep_frier branch February 10, 2024 18:54
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.

3 participants