-
Notifications
You must be signed in to change notification settings - Fork 274
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
[PORT] Martian Food: A Taste of the Red Planet #1511
Merged
dwasint
merged 23 commits into
Monkestation:master
from
AlbertNanotracen:Atomized-TG-Drink-Ports
Apr 13, 2024
Merged
[PORT] Martian Food: A Taste of the Red Planet #1511
dwasint
merged 23 commits into
Monkestation:master
from
AlbertNanotracen:Atomized-TG-Drink-Ports
Apr 13, 2024
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: ![image](https://github.com/tgstation/tgstation/assets/58124831/c9ae33a1-e03a-4f94-8ce0-8ad124e88e8d) 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: ![image](https://github.com/tgstation/tgstation/assets/58124831/914a6e2a-7ef5-4791-ae31-d08fa9211083) 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 <[email protected]>
…#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 ![image](https://github.com/tgstation/tgstation/assets/110322848/4c28f0c7-3975-4510-9958-9eef7f913051) and then the inhands here: ![image](https://github.com/tgstation/tgstation/assets/110322848/03967e6e-6551-40d5-b2ec-7f27fabbc175) 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:
wraith-54321
reviewed
Apr 7, 2024
This was referenced Apr 8, 2024
Closed
This was referenced Apr 8, 2024
Closed
Closed
Closed
Open
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
Port #75988
Port #77757
Port #77562
Why It's Good For The Game
Port #75988
Port #77757
Port #77562
Changelog
🆑
Port #75988 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!
Port #77757
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
Port #77562
fix: a few issues with Martian food
/:cl: