Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Split drinks into different files (#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 (#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 (#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: * 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 (#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 * T (#77442) ## 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: * Fixes silliness involving soup pots clearing ingredients list (#74882) 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 (#75013) 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: * Wedding Cakes (#75076) ## About The Pull Request Added wedding cakes, which are sliceable into wedding cake slices. Mechanically, they are just worse pound cakes - they require more ingredients and provide less nutrients - but they are here for the flavor. Sometimes a pound cake just doesn't suffice when you want to roleplay a wedding. Fair warning, I've not done a pull request here before, any advice welcome. <img src='https://user-images.githubusercontent.com/102194057/235379312-2eaecffa-c48f-45b6-a3c6-09bf4bbff14a.png'> ## Why It's Good For The Game Roleplayers like weddings, and what is a wedding without a cake? (This PR was originally made for Skyrat but they recommended I take it upstream). ## Changelog :cl: add: Added wedding cakes /:cl: --------- Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com> * Adds a var to chemical reactions that allows them to take place in subtypes of their required container (#75527) ## About The Pull Request As the title may imply, a variable has been added to chemical reactions that'll make them check istype on the required container, rather than looking for the exact type path. ## Why It's Good For The Game In my specific example, lets say I want to have sybtypes of soup pots. The current behavior doesn't allow for these subtypes of soup pots to actually make soup, which is sub-optimal. ## Changelog :cl: code: A var has been added to chemical reactions (defaulted to FALSE to keep current behavior) that allows subtypes of that reactions required container to be used as well, rather than the exact type. /:cl: * adds toast sandwich (#75545) ## About The Pull Request Adds toast sandwich to the game.  ## Why It's Good For The Game Gives our UK players a little taste of home :) Also it's funny ## Changelog :cl: Epoc add: Toast sandwich /:cl: --------- Co-authored-by: alec-b-williams <alec.b.williams@wsu.edu> Co-authored-by: alec-b-williams <78933704+alec-b-williams@users.noreply.github.com> * Fixes a little inconsistency with the peanut butter banana sandwich and makes sandwiches subtypes of the generic sandwhich. (#75750) The peanut butter banana sandwich is presented ingame as grilled when it doesn't require a griddle to make. Also, I'm taking the opportunity to repath the sandwich types, since they all share the same weight class, food flags and icons file. This will fix #74585. :cl: fix: The peanut butter banana sandwich is no longer presented as grilled when it doesn't require a griddle to make. /:cl: * Map changes needed for sandwich refactor * i really need to find a better way to do this * Modify death sandwich disease to work with pathology * Blood brothers can now chose the death sandwich recipe as their gear * the cure should be shown somewhere in game, that was dumb of me * changed our boiling recipes that output items to match 24-volt fist * wedding cake can feed a small wedding party --------- 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> Co-authored-by: Wallem <66052067+Wallemations@users.noreply.github.com> Co-authored-by: Thlumyn <102194057+Thlumyn@users.noreply.github.com> Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com> Co-authored-by: Epoc <32695675+epochayur@users.noreply.github.com> Co-authored-by: alec-b-williams <alec.b.williams@wsu.edu> Co-authored-by: alec-b-williams <78933704+alec-b-williams@users.noreply.github.com> Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: dwasint <82520990+dwasint@users.noreply.github.com>
- Loading branch information
13 people
authored
Jun 13, 2024
1 parent
be26efd
commit b9bce7b