Skip to content
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] Food and Drink Ports #1647

Merged
merged 43 commits into from
Jun 13, 2024

Commits on Feb 27, 2024

  1. 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.
    dragomagol authored and AlbertNanotracen committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    0735578 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5cd7987 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. Configuration menu
    Copy the full SHA
    8ec8875 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f1b613c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f225c9b View commit details
    Browse the repository at this point in the history
  4. sigh

    AlbertNanotracen committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    faf4fa6 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2024

  1. Configuration menu
    Copy the full SHA
    a778f40 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    22ff035 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d49db17 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Configuration menu
    Copy the full SHA
    ea0cf92 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9601f72 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3044a71 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Configuration menu
    Copy the full SHA
    2dc9342 View commit details
    Browse the repository at this point in the history
  2. 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:
    
    ![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 <51863163+MrMelbert@users.noreply.github.com>
    2 people authored and AlbertNanotracen committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    43a50c3 View commit details
    Browse the repository at this point in the history
  3. updates martian can sprites, fixes misc text and bugs in wellcheers (t…

    …gstation#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
    
    ![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 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:
    CoiledLamb authored and AlbertNanotracen committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    833e773 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    75c223b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5dc59fe View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. look, icons are hard

    AlbertNanotracen committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    c6a53c0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4890c80 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. 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:
    EOBGames authored and AlbertNanotracen committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    9c23a68 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4b0455f View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2024

  1. Configuration menu
    Copy the full SHA
    e538807 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

  1. Configuration menu
    Copy the full SHA
    2afca7a View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2024

  1. T (tgstation#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.
    
    
    ![dinky-export2](https://github.com/tgstation/tgstation/assets/66052067/8a81f719-8fd8-4dd2-be74-58ff2442ce94)
    ## 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:
    Wallemations authored and AlbertNanotracen committed Apr 13, 2024
    Configuration menu
    Copy the full SHA
    3db10fa View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. Fixes silliness involving soup pots clearing ingredients list (tgstat…

    …ion#74882)
    
    Fixes tgstation#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:
    MrMelbert authored and AlbertNanotracen committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    a18e97e View commit details
    Browse the repository at this point in the history
  2. Adds the Death Sandwich to the game (tgstation#75013)

    Adds the Death Sandwich to the game, the ultimate form of
    bread-conveyed-meat-based consumables.
    
    ![deathsandwich](https://user-images.githubusercontent.com/66052067/235041733-287be1fd-1eed-4d6d-840b-96f95494f093.png)
    
    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:
    Wallemations authored and AlbertNanotracen committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    2c84b29 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6626695 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    95b9c56 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. Wedding Cakes (tgstation#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>
    2 people authored and AlbertNanotracen committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    3b949d8 View commit details
    Browse the repository at this point in the history
  2. Adds a var to chemical reactions that allows them to take place in su…

    …btypes of their required container (tgstation#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:
    Paxilmaniac authored and AlbertNanotracen committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    ebe83b1 View commit details
    Browse the repository at this point in the history
  3. adds toast sandwich (tgstation#75545)

    ## About The Pull Request
    
    Adds toast sandwich to the game.
    
    ![image](https://github.com/tgstation/tgstation/assets/32695675/6860aff1-7dde-4e0b-9ed8-a4343cf3f115)
    
    ## 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>
    3 people authored and AlbertNanotracen committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    9618d98 View commit details
    Browse the repository at this point in the history
  4. Fixes a little inconsistency with the peanut butter banana sandwich a…

    …nd makes sandwiches subtypes of the generic sandwhich. (tgstation#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 tgstation#74585.
    
    :cl:
    fix: The peanut butter banana sandwich is no longer presented as grilled
    when it doesn't require a griddle to make.
    /:cl:
    Ghommie authored and AlbertNanotracen committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    04a0867 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    79161ca View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b4c0273 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Configuration menu
    Copy the full SHA
    a182550 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Configuration menu
    Copy the full SHA
    424b2ac View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4320f6a View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Configuration menu
    Copy the full SHA
    2066d25 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. Configuration menu
    Copy the full SHA
    5d4aad8 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Configuration menu
    Copy the full SHA
    6a55ea2 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Configuration menu
    Copy the full SHA
    00e5dc0 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Configuration menu
    Copy the full SHA
    ff17254 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Configuration menu
    Copy the full SHA
    1942a15 View commit details
    Browse the repository at this point in the history