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

Service Borger Upri- Kitchen Upgrades #74938

Merged
merged 39 commits into from May 3, 2023

Commits on Apr 23, 2023

  1. Borger uprising

    Yeah okay next time I am going to make a commit for every change instead of making one big change this is hard to organize
    Dawnseer committed Apr 23, 2023
    Copy the full SHA
    b7d6498 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    617b66d View commit details
    Browse the repository at this point in the history
  3. empty space n fix

    Dawnseer committed Apr 23, 2023
    Copy the full SHA
    8fd6d5f View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    498cbc6 View commit details
    Browse the repository at this point in the history
  5. Whoops

    Dawnseer committed Apr 23, 2023
    Copy the full SHA
    1be2dfa View commit details
    Browse the repository at this point in the history
  6. Come on now

    Dawnseer committed Apr 23, 2023
    Copy the full SHA
    d7ad8fa View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. Copy the full SHA
    bc810b1 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    56436c6 View commit details
    Browse the repository at this point in the history
  3. Knifepin, service apparatus

    Added the suggested knife/rolling pin power tool, but made some alterations such as it not being faster, and still keeping the whole 'no stabby' part, while also making the rolling pin sound blunt
    Dawnseer committed Apr 24, 2023
    Copy the full SHA
    c838f91 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    4468051 View commit details
    Browse the repository at this point in the history
  5. service apparatus sprite, oven interaction

    Gave the service apparatus it's own sprite, allowed borgs to open and close the oven. Still can't pick trays up from the oven. But you can place food in it, and cook it, and open the oven when it's done. Just not retrieve it yourself.
    Dawnseer committed Apr 24, 2023
    Copy the full SHA
    e7b0760 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    3751061 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    a1935aa View commit details
    Browse the repository at this point in the history
  8. LINT

    Dawnseer committed Apr 24, 2023
    Copy the full SHA
    3360303 View commit details
    Browse the repository at this point in the history
  9. Added papercups to the RSF

    ... Sillycup? Really?
    Dawnseer committed Apr 24, 2023
    Copy the full SHA
    7efd4a9 View commit details
    Browse the repository at this point in the history
  10. Whoops

    Dawnseer committed Apr 24, 2023
    Copy the full SHA
    c06b9d2 View commit details
    Browse the repository at this point in the history
  11. Copy the full SHA
    c9400aa View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2023

  1. Update hypo.dm

    Added vinegar to the shaker, exchanged corn syrup for corn oil and corn starch in the condiment synthesizer
    Dawnseer committed Apr 25, 2023
    Copy the full SHA
    7f80157 View commit details
    Browse the repository at this point in the history
  2. LINT

    Dawnseer committed Apr 25, 2023
    Copy the full SHA
    62dad86 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    e08ca87 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. Update kitchen.dmi

    Got the brand spankin new grinder sprites to avoid the merge conflict
    Dawnseer committed Apr 28, 2023
    Copy the full SHA
    6cc9521 View commit details
    Browse the repository at this point in the history
  2. Update hypo.dm

    C'mon check out already
    Dawnseer committed Apr 28, 2023
    Copy the full SHA
    6af47c3 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    d2328cb View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2023

  1. Copy the full SHA
    09bd53f View commit details
    Browse the repository at this point in the history
  2. AAAAAAAAAAAAA

    Dawnseer committed Apr 30, 2023
    Copy the full SHA
    482106d View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    3846fd2 View commit details
    Browse the repository at this point in the history
  4. LINT

    Dawnseer committed Apr 30, 2023
    Copy the full SHA
    4aac79d View commit details
    Browse the repository at this point in the history
  5. MORE LINT

    Dawnseer committed Apr 30, 2023
    Copy the full SHA
    76ea2d0 View commit details
    Browse the repository at this point in the history
  6. Update kitchen.dm

    Removing the drill use sound, it's silly to hear a drill when you're using a knife.
    Dawnseer committed Apr 30, 2023
    Copy the full SHA
    5ad47ca View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. Multi-line?

    Dawnseer committed May 1, 2023
    Copy the full SHA
    2f27b42 View commit details
    Browse the repository at this point in the history
  2. comment

    Just explaining above the code why it's not alphabetical, but rather sorted by category due to how it shows in player facing ui
    Dawnseer committed May 1, 2023
    Copy the full SHA
    66cfa9c View commit details
    Browse the repository at this point in the history
  3. Last minute changes

    Enabled the borgshaker and condiment synthesizer to be able to pour 1 unit at a time, and made the service apparatus able to also hold plates, bowls, and soup pots.
    Dawnseer committed May 1, 2023
    Copy the full SHA
    d8828e5 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    7f2e736 View commit details
    Browse the repository at this point in the history
  5. More last minute changes

    Adjusted so the first page of the RSF is the cups, bowl, plate and cutlery, while the second page is the misc stuff. Also added seaweed sheets to it.
    Dawnseer committed May 1, 2023
    Copy the full SHA
    8eed643 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    cdf160a View commit details
    Browse the repository at this point in the history
  7. Even more last minute changes.

    How many minutes are you gonna give me? Anyway, adds blood and carpotoxin to the emagged borgshaker.
    Dawnseer committed May 1, 2023
    Copy the full SHA
    8e12807 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Anything for you

    Dawnseer committed May 2, 2023
    Copy the full SHA
    43f03b3 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    a655b5a View commit details
    Browse the repository at this point in the history
  3. Just making it check again

    Dawnseer committed May 2, 2023
    Copy the full SHA
    b600a80 View commit details
    Browse the repository at this point in the history