-
-
Notifications
You must be signed in to change notification settings - Fork 538
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[PORT] - Adds Coffee Machines from TG (#2584)
Full credit for sprites and original code go to: tgstation/tgstation#70991 and tgstation/tgstation#68178 ## About The Pull Request Ports over the base coffee machine & the bean version from TG along with several coffee making accessories The Impress coffee machine: a bean based coffee maker, similar to the original except you must procure coffee beans and dry them to be able to make your coffee, currently comes in two flavours: classic and robusta! The coffee machine: a cartridge based coffee making machine, you pop in your desired cartridge flavour (there's 4 of them) and your pot and cook it then pour, no hassle needed. This sprite has soul. New sprites for the coffee cups, for all you posh people out there, along with coffee pots to drink directly out of, you psychopaths. Syrup bottles to add that special splash of, uh, specialness to your coffee? And creamer. Additionally adds boxes of these that you can buy at whatever you guys call "cargo" so that you can just buy a whole lot of them ## Why It's Good For The Game ![image](https://github.com/shiptest-ss13/Shiptest/assets/75333826/46ff3fa5-4a9b-469d-a38e-27a5fa8f27e7) Coffee making adds a bit of flavour to life, and there's always a good conversation to be had about who drank directly from the coffee pot. ## Changelog :cl: add: Ports TG's Coffee Makers soundadd: Adds coffee making sound imageadd: Adds a new type of coffee cup and pot code: this changes code yes /:cl: --------- Signed-off-by: cowbot92 <[email protected]> Co-authored-by: Mark Suckerberg <[email protected]>
- Loading branch information
1 parent
7483d31
commit b6879de
Showing
12 changed files
with
851 additions
and
0 deletions.
There are no files selected for viewing
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
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
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
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
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
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
Oops, something went wrong.