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

fixes food not being seen in the microwave #11636

Merged
merged 2 commits into from
Oct 10, 2024

Conversation

ktlwjec0
Copy link
Contributor

@ktlwjec0 ktlwjec0 commented Oct 5, 2024

About The Pull Request

File path was changed in #11467 , which caused this to no longer work. This PR changes it back, and removes the microwave dmi as it is just a duplicate of the kitchenmachines dmi. by moving the microwave icons from kitchenmachines to the microwave dmi.

Why It's Good For The Game

Bug fix.

Testing Photographs and Procedure

Screenshots&Videos

image
image
image

🆑 ktlwjec
fix: You can see food placed in microwaves again.
/:cl:

@Tsar-Salat
Copy link
Contributor

Splitting microwaves into their own file was intentional, and I'd prefer if it was sustained.

A machine with 11 icon states to itself should not be in a generic file, its the same issue as having a food.dmi file; terrible to organize and it will merge conflict when it doesnt need to.

In this situation specifically, had microwave.dmi already been a separate file before newfood:ovens and the seeing food in microwave pr, there would be no merge conflict to fix.

@ktlwjec0
Copy link
Contributor Author

ktlwjec0 commented Oct 5, 2024

Splitting microwaves into their own file was intentional, and I'd prefer if it was sustained.

Sure, I can move it back. Will do that later today

@PowerfulBacon
Copy link
Member

That egg looks like it's in front of the microwave

@ktlwjec0
Copy link
Contributor Author

ktlwjec0 commented Oct 8, 2024

That egg looks like it's in front of the microwave

I can't tell if you're being serious but just in case, that is because the door is open with the egg out of it. Just showing it works as intended.

@PowerfulBacon
Copy link
Member

My Internet went down after I realised and couldn't edit the comment

@PowerfulBacon PowerfulBacon added this pull request to the merge queue Oct 10, 2024
Merged via the queue into BeeStation:master with commit c24d993 Oct 10, 2024
21 checks passed
@ktlwjec0 ktlwjec0 deleted the microwave branch October 11, 2024 12:37
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