[PORT] Food and Drink Ports #1647
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
Splits our nearly 4000 and 1600 line long files. Mostly just moves the glass appearances into their own files.
Adds a selection of new foods and drinks based around Mars. More information on Mars can be found here: https://github.com/tgstation/common_core/blob/master/Interesting%20Planets/Human%20Space/The%20Sol%20System.md To summarise for the general audience, Mars is a vital colony of the Terran Federation, having been primarily settled (at least originally) by Cybersun Industries to harvest its lucrative supplies of plasma, the second largest in human space behind Lavaland. This has given Mars a diverse culture evolving from the mostly East Asian colonists, and their food reflects this. Thanks to Melbert for their work on the soup portion of this PR. The food: Martian cuisine draws upon the culinary traditions of East Asia, and adds in fusion cuisine from the later colonists. Expect classics such as ramen, curry, noodles and donburi, as well as new takes on the formula like the Croque-Martienne, Peanut Butter Ice Cream Mochi, and the Kitzushi- chilli cheese and rice inside a fried tofu casing. Oh, and lots of pineapple. The Martians love pineapple:  Also included are some foods for Ethereals, which may or may not be hinting at something I've got planned... The drinks: Four new base drinks make their way to the game, bringing with them a host of new cocktails: enjoy new ventures in bartending with Coconut Rum, Shochu/Soju, Yuyake (our favourite legally-distinct melon liqueur), and Mars' favourite alcoholic beverage, rice beer. Each is available in the dispenser, as well as bottles in the booze-o-mat:  The recipes: To make your (and the wiki editors) lives easier, please find below the recipes for both foods and drinks: Food: https://hackmd.io/@EOBGames/BkVFU0w9Y Drinks: https://hackmd.io/@EOBGames/rJ1OhnsJ2 Another lot of variety for the chef and bartender, as well as continuing the work started with lizard and moth food in getting Common Core into the game in a tangible and fun way. :cl: EOBGames, MrMelbert add: Mars celebrates the 250th anniversary of the Martian Concession this year, and this has brought Martian cuisine to new heights of popularity. Find a new selection of Martian foods and drinks available in your crafting menu today! /:cl: --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
…#77757) this is kind of a miscellaneous pile of fixes for soda.dmi, rolled up with a larger resprite of the new cans that were added with #75988. you can see everything visually changed (other than inhands) in the image below  and then the inhands here:  also changes wellcheers mood event text, and the mood switch to be based on sanity instead. apparently the mood test allowed for foolproof traitor testing, which is not ideal. this hopefully fixes that. the new martian drinks used the previous style of cans, which was updated in #77424. this makes them consistent with that style. everything else is minor things i missed or forgot to do in that PR. also things that enable traitor testing are not great, even if they're niche and require amputation to pull off. :cl: fix: wellcheers is now based on sanity rather than mood image: resprites martian cans image: adds inhands for martian cans and wellcheers image: minor tweaks to other cans spellcheck: updates wellcheers mood text /:cl:
## About The Pull Request Fixes a few issues with Martian food. Makes stuff that's cooked on the grill or oven not burn, and adds guide recipes for the non-crafting-menu stuff. ## Why It's Good For The Game Fixes some problems, removes some confusion ## Changelog :cl: fix: a few issues with Martian food /:cl:
## About The Pull Request Adds T, basically a boosted tea for mimes. Can be made by mixing Nothing with Tea, trading off the brute healing for toxin & drowsiness healing.  ## Why It's Good For The Game https://github.com/tgstation/tgstation/assets/66052067/9df3ee77-ff45-49ce-a56d-59004e4b308c ## Changelog :cl: Wallem add: T /:cl:
9f1bd25 to
3db10fa
Compare
Fixes #74866 The issue is misleading, it never deleted the disk. The disk remained in the pot's contents but was no longer tracked as an ingredient, leaving it stuck Foolishly I had a case for indestructible things when soup reactions finished, where it wouldn't delete stuff like the disk. But I never removed it from the pot. I just nulled the ingredients list. Oops. So pots will drop ingredients that fail to cook into anything when the reaction finishes. --- Semi-unrelated but stuff like stoves, ovens, and chem heater should probably `allowdrop() return FALSE`. I cannot think of many (any) situations where you would want to use `drop_location` from something in an oven, stove, or heater and actually want those returned rather than their own loc. Whoops :cl: Melbert fix: Ingredients which fail to react in soup reactions drop when the reaction finishes as intended /:cl:
Adds the Death Sandwich to the game, the ultimate form of bread-conveyed-meat-based consumables.  And remember; Eat it right, or you die! I'm genuinely surprised we don't already have a meatball sub in the game also I love humor food, and I doubt my edition of the Eggcellent Challenge would ever be merged if I tried to do so, so this is the next best thing. :cl: Wallem add: The ancient recipe for the Death Sandwich has been rediscovered buried in the deepest depths of an erupting volcano. /:cl:
This was referenced Jun 7, 2024
Closed
Closed
Closed
Closed
Closed
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
Ports:
Why It's Good For The Game
More food is always good
Changelog
🆑
add: T
fix: Ingredients which fail to react in soup reactions drop when the reaction finishes as intended
add: The ancient recipe for the Death Sandwich has been rediscovered buried in the deepest depths of an erupting volcano.
add: Blood Brothers can chose the death sandwich recipe book as their gear(requested by @KnighTheThrasher)
add: Added wedding cakes
add: Toast sandwich
fix: The peanut butter banana sandwich is no longer presented as grilled when it doesn't require a griddle to make.
/:cl: