Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[PORT] Martian Food: A Taste of the Red Planet (#1511)
* Split drinks into different files (tgstation#75898) Splits our nearly 4000 and 1600 line long files. Mostly just moves the glass appearances into their own files. * undoes removals of some bypass restrictions & metabolized_traits related things * removed changes to on_hydroponics_apply() * we had more arguments, missed that * sigh * Martian Food: A Taste of the Red Planet (tgstation#75988) 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> * updates martian can sprites, fixes misc text and bugs in wellcheers (tgstation#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 tgstation#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 tgstation#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: * Removing enriched liquid electricity references * look, icons are hard * boiled rice now needs to be boiled and recipe guide for boiled spaghetti/rice * martian hotfix (tgstation#77562) ## 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: * removed references to butter slices for now * Change from improvised medicine * better block comment formating --------- Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com> Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com> Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Lamb <110322848+CoiledLamb@users.noreply.github.com>
- Loading branch information
5 people
committed
Apr 13, 2024
1 parent
e4e4df9
commit 5e882f8