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.

Sign up for GitHub

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

Jump to bottom

Food Rework Update #1839

Draft
wants to merge 83 commits into
base: master
Choose a base branch
from
Draft

Food Rework Update #1839

wants to merge 83 commits into from
+816 −97

Commits on Mar 27, 2024

  1. draft

    @ErhardSteinhauer
    ErhardSteinhauer committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    3ced7d0 View commit details
    Browse the repository at this point in the history

  2. Food System

    @dvir001
    dvir001 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    a147065 View commit details
    Browse the repository at this point in the history

  3. Create fun.yml

    @dvir001
    dvir001 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    199e72b View commit details
    Browse the repository at this point in the history

  4. food stuffs

    @ErhardSteinhauer
    ErhardSteinhauer committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    d9862db View commit details
    Browse the repository at this point in the history

  5. Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhaue… 

    …r/frontier-station-14 into GoblinFoodSystem
    @ErhardSteinhauer
    ErhardSteinhauer committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    79f80e2 View commit details
    Browse the repository at this point in the history

  6. there_do_be_goblins.txt

    @ErhardSteinhauer
    ErhardSteinhauer authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    2fca643 View commit details
    Browse the repository at this point in the history

  7. revert changes to toxins.yml

    @ErhardSteinhauer
    ErhardSteinhauer committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    142b1a3 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhaue… 

    …r/frontier-station-14 into GoblinFoodSystem
    @ErhardSteinhauer
    ErhardSteinhauer committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    443322c View commit details
    Browse the repository at this point in the history

  9. Update pie.yml

    @dvir001
    dvir001 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    03ce1a6 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhaue… 

    …r/frontier-station-14 into pr/1159
    @dvir001
    dvir001 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    d7f6d41 View commit details
    Browse the repository at this point in the history

  11. mail things

    @ErhardSteinhauer
    ErhardSteinhauer committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    0c82113 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhaue… 

    …r/frontier-station-14 into GoblinFoodSystem
    @ErhardSteinhauer
    ErhardSteinhauer committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    a93646a View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2024

  1. Update StomachComponent.cs

    @dvir001
    dvir001 authored Mar 31, 2024
    Configuration menu
    Copy the full SHA
    06c29ad View commit details
    Browse the repository at this point in the history

  2. Update FoodComponent.cs

    @dvir001
    dvir001 authored Mar 31, 2024
    Configuration menu
    Copy the full SHA
    85538a2 View commit details
    Browse the repository at this point in the history

  3. Update StomachComponent.cs

    @dvir001
    dvir001 authored Mar 31, 2024
    Configuration menu
    Copy the full SHA
    c4e7c52 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2024

  1. Merge branch 'master' into GoblinFoodSystem

    @dvir001
    dvir001 authored Apr 27, 2024
    Configuration menu
    Copy the full SHA
    730522f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored Apr 27, 2024
    Configuration menu
    Copy the full SHA
    38f3a33 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    075435b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    611be4a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    ba68a1b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored Apr 29, 2024
    Configuration menu
    Copy the full SHA
    802d6f1 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Merge branch 'master' of https://github.com/dvir001/frontier-station-14… 

    … into pr/1159
    @dvir001
    dvir001 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    3fafed3 View commit details
    Browse the repository at this point in the history

  2. Food System Multi types support

    @dvir001
    dvir001 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    a41995a View commit details
    Browse the repository at this point in the history

  3. trash eating gob stomach

    @ErhardSteinhauer
    ErhardSteinhauer committed May 3, 2024
    Configuration menu
    Copy the full SHA
    9693762 View commit details
    Browse the repository at this point in the history

  4. Update FoodSystem.cs

    @dvir001
    dvir001 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    fe792f7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhaue… 

    …r/frontier-station-14 into pr/1159
    @dvir001
    dvir001 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    2ff271a View commit details
    Browse the repository at this point in the history

  6. Update FoodSystem.cs

    @dvir001
    dvir001 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    bd84268 View commit details
    Browse the repository at this point in the history

  7. more trash food

    @ErhardSteinhauer
    ErhardSteinhauer committed May 3, 2024
    Configuration menu
    Copy the full SHA
    a3cf959 View commit details
    Browse the repository at this point in the history

  8. Food

    @dvir001
    dvir001 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    24c27e8 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhaue… 

    …r/frontier-station-14 into pr/1159
    @dvir001
    dvir001 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    d009322 View commit details
    Browse the repository at this point in the history

  10. Allow goblin to eat open mail only

    @dvir001
    dvir001 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    f890786 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. yml fixes

    @ErhardSteinhauer
    ErhardSteinhauer committed May 4, 2024
    Configuration menu
    Copy the full SHA
    94294be View commit details
    Browse the repository at this point in the history

  2. more yml fixes

    @ErhardSteinhauer
    ErhardSteinhauer committed May 4, 2024
    Configuration menu
    Copy the full SHA
    e9a96a6 View commit details
    Browse the repository at this point in the history

  3. No More refill

    @dvir001
    dvir001 committed May 4, 2024
    Configuration menu
    Copy the full SHA
    0b59814 View commit details
    Browse the repository at this point in the history

  4. less corn in cob

    @ErhardSteinhauer
    ErhardSteinhauer authored May 4, 2024
    Configuration menu
    Copy the full SHA
    39aefbd View commit details
    Browse the repository at this point in the history

  5. Pain

    @dvir001
    dvir001 committed May 4, 2024
    Configuration menu
    Copy the full SHA
    0d099ee View commit details
    Browse the repository at this point in the history

  6. Fixing

    @dvir001
    dvir001 committed May 4, 2024
    Configuration menu
    Copy the full SHA
    0d15fce View commit details
    Browse the repository at this point in the history

  7. Moff

    @dvir001
    dvir001 committed May 4, 2024
    Configuration menu
    Copy the full SHA
    052d619 View commit details
    Browse the repository at this point in the history

  8. Update paper.yml

    @dvir001
    dvir001 committed May 4, 2024
    Configuration menu
    Copy the full SHA
    118699e View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored May 8, 2024
    Configuration menu
    Copy the full SHA
    ac5ed9a View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored May 15, 2024
    Configuration menu
    Copy the full SHA
    b68dbc3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored May 15, 2024
    Configuration menu
    Copy the full SHA
    4986a68 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored May 15, 2024
    Configuration menu
    Copy the full SHA
    43c326c View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored May 16, 2024
    Configuration menu
    Copy the full SHA
    e170050 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored May 17, 2024
    Configuration menu
    Copy the full SHA
    69e9585 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. Merge branch 'master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored May 20, 2024
    Configuration menu
    Copy the full SHA
    86e939a View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Merge branch 'master' of https://github.com/dvir001/frontier-station-14… 

    … into pr/1159
    @dvir001
    dvir001 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    a411773 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhaue… 

    …r/frontier-station-14 into pr/1159
    @dvir001
    dvir001 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    4874a83 View commit details
    Browse the repository at this point in the history

  3. Fixup

    @dvir001
    dvir001 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    eaee2bf View commit details
    Browse the repository at this point in the history

  4. Update burger.yml

    @dvir001
    dvir001 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    7298cf6 View commit details
    Browse the repository at this point in the history

  5. Update FoodSystem.cs

    @dvir001
    dvir001 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    7a6338e View commit details
    Browse the repository at this point in the history

  6. Update FoodSystem.cs

    @dvir001
    dvir001 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    6c7010f View commit details
    Browse the repository at this point in the history

  7. Update Resources/Locale/en-US/_NF/nutrition/components/food-component… 

    ….ftl

Co-authored-by: whatston3 <166147148+whatston3@users.noreply.github.com>
    @dvir001 @whatston3
    dvir001 and whatston3 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    483d048 View commit details
    Browse the repository at this point in the history

  8. Update FoodSystem.cs

    @dvir001
    dvir001 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    311260b View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Update Resources/Locale/en-US/_NF/reagents/foods.ftl 

    Co-authored-by: whatston3 <166147148+whatston3@users.noreply.github.com>
    @dvir001 @whatston3
    dvir001 and whatston3 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    92dd46b View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    4130c94 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    bf200cb View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    9aebf22 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. mail

    @ErhardSteinhauer
    ErhardSteinhauer committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    38f6b4e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhaue… 

    …r/frontier-station-14 into GoblinFoodSystem
    @ErhardSteinhauer
    ErhardSteinhauer committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    5773635 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    5b5852e View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored Jun 15, 2024
    Configuration menu
    Copy the full SHA
    743d8f2 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    cbc57d7 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2024

  1. Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

    @ErhardSteinhauer
    ErhardSteinhauer authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    27f449a View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Merge branch 'master' of https://github.com/new-frontiers-14/frontier… 

    …-station-14 into 2024-07-09-GoblinFoodSystem-cleanup
    @whatston3
    whatston3 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    ad7958c View commit details
    Browse the repository at this point in the history

  2. Stomach: Digestion types & function enums

    @whatston3
    whatston3 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    1dda7a0 View commit details
    Browse the repository at this point in the history

  3. FoodSystem: digestion rework

    @whatston3
    whatston3 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    af99523 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. digestion check proof of concept

    @whatston3
    whatston3 committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    20d78a5 View commit details
    Browse the repository at this point in the history

  2. Quality to enum, restore special digestion for now

    @whatston3
    whatston3 committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    c7065b4 View commit details
    Browse the repository at this point in the history

  3. Missing food qualities, restore special digestion

    @whatston3
    whatston3 committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    e354ede View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2024

  1. Merge branch 'master' of https://github.com/new-frontiers-14/frontier… 

    …-station-14 into 2024-07-09-GoblinFoodSystem-cleanup
    @whatston3
    whatston3 committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    1633fe7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/new-frontiers-14/frontier… 

    …-station-14 into 2024-07-09-GoblinFoodSystem-cleanup
    @whatston3
    whatston3 committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    a822ac3 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Merge branch 'master' of https://github.com/new-frontiers-14/frontier… 

    …-station-14 into 2024-07-09-GoblinFoodSystem-cleanup
    @whatston3
    whatston3 committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    61939fd View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Merge branch 'master' of https://github.com/new-frontiers-14/frontier… 

    …-station-14 into 2024-07-09-GoblinFoodSystem-cleanup
    @whatston3
    whatston3 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    0e84795 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. Merge branch 'master' into 2024-07-09-GoblinFoodSystem-cleanup

    @ErhardSteinhauer
    ErhardSteinhauer authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    ab50cd9 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Merge branch 'master' of https://github.com/new-frontiers-14/frontier… 

    …-station-14 into 2024-07-09-GoblinFoodSystem-cleanup
    @whatston3
    whatston3 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    07c2abf View commit details
    Browse the repository at this point in the history

  2. Species-specific digestion progress with prototype

    @whatston3
    whatston3 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    08cd56e View commit details
    Browse the repository at this point in the history

  3. Compilation fix (bad merge)

    @whatston3
    whatston3 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    02d0806 View commit details
    Browse the repository at this point in the history

  4. Bugfixes, initial bloatamine pass

    @whatston3
    whatston3 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    f719d0a View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. more stuff

    @whatston3
    whatston3 committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    e972738 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/new-frontiers-14/frontier… 

    …-station-14 into 2024-07-09-GoblinFoodSystem-cleanup
    @whatston3
    whatston3 committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    488d9f8 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. Merge branch 'master' of https://github.com/new-frontiers-14/frontier… 

    …-station-14 into 2024-07-09-GoblinFoodSystem-cleanup
    @whatston3
    whatston3 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    0b34d57 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. Merge branch 'master' into 2024-07-09-GoblinFoodSystem-cleanup

    @dvir001
    dvir001 authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    32c3372 View commit details
    Browse the repository at this point in the history