Removes the nonfunctioning coffee machines #3015
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FalloutFalcon
approved these changes
May 24, 2024
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…to ihateyoucoffeeman
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. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: Sun-Soaked <[email protected]>
shiptest-server
pushed a commit
that referenced
this pull request
Jun 2, 2024
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Oct 6, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> Undoes most of the changes from shiptest-ss13#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. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Bad untested PR's go to Weewish. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> :cl: del: Removed nonfunctioning coffee machines and their cargo packs /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: Sun-Soaked <[email protected]> Co-authored-by: Sun-Soaked <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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: