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

Removes the nonfunctioning coffee machines #3015

Merged
merged 7 commits into from
Jun 2, 2024

Conversation

Zevotech
Copy link
Contributor

About The Pull Request

Undoes most of the changes from #2584 pertaining to coffee machines. The coffee machines didn't work, the coffee pot had missing sprites, and every sprite was shoved into the same dmi instead of being put into the proper files.

Why It's Good For The Game

Bad untested PR's go to Weewish.

Changelog

🆑
del: Removed nonfunctioning coffee machines and their cargo packs
/:cl:

@github-actions github-actions bot added DME Edit Code change Watch something violently break. labels May 22, 2024
@Zevotech Zevotech requested a review from a team as a code owner May 22, 2024 01:32
@github-actions github-actions bot added the Sprites A bikeshed full of soulless bikes. label May 22, 2024
Copy link
Contributor

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

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

If you wanted you could just remove the coffee machine but keep the syrup bottles, creamer, modify the coffee crate. I'm fine we removing them however.

@FalloutFalcon FalloutFalcon added the Removal We hate fun. label May 24, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label May 27, 2024
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label May 27, 2024
@github-actions github-actions bot added the Sound USSR Anthem 2.66 MB file. label May 27, 2024
@Zevotech
Copy link
Contributor Author

If you wanted you could just remove the coffee machine but keep the syrup bottles, creamer, modify the coffee crate. I'm fine we removing them however.

Forgot to mention in the PR that the syrup bottles are missing their base types. There is no empty syrup bottle object. I'd rather remove all of this to make room for someone to make a better port later on that actually functions.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label May 31, 2024
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jun 2, 2024
@FalloutFalcon FalloutFalcon added this pull request to the merge queue Jun 2, 2024
Merged via the queue into shiptest-ss13:master with commit 3d79ed4 Jun 2, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Removal We hate fun. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants