Code

Food Quality System (Goblin)#1159

Code

Closed

ErhardSteinhauer wants to merge 64 commits intonew-frontiers-14:masternew-frontiers-14/frontier-station-14:masterfrom ErhardSteinhauer:GoblinFoodSystemErhardSteinhauer/frontier-station-14:GoblinFoodSystemCopy head branch name to clipboard

+524-54

Commits

Commits on Mar 27, 2024

• draft

  ErhardSteinhauer

  committed
  3ced7d0

  Copy full SHA for 3ced7d0

• Food System

  dvir001

  committed
  a147065

  Copy full SHA for a147065

• Create fun.yml

  dvir001

  committed
  199e72b

  Copy full SHA for 199e72b

• food stuffs

  ErhardSteinhauer

  committed
  d9862db

  Copy full SHA for d9862db

• Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhauer/frontier-station-14 into GoblinFoodSystem

  ErhardSteinhauer

  committed
  79f80e2

  Copy full SHA for 79f80e2

• there_do_be_goblins.txt

  ErhardSteinhauer

  authored
  2fca643

  Copy full SHA for 2fca643

• revert changes to toxins.yml

  ErhardSteinhauer

  committed
  142b1a3

  Copy full SHA for 142b1a3

• Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhauer/frontier-station-14 into GoblinFoodSystem

  ErhardSteinhauer

  committed
  443322c

  Copy full SHA for 443322c

• Update pie.yml

  dvir001

  committed
  03ce1a6

  Copy full SHA for 03ce1a6

• Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhauer/frontier-station-14 into pr/1159

  dvir001

  committed
  d7f6d41

  Copy full SHA for d7f6d41

• mail things

  ErhardSteinhauer

  committed
  0c82113

  Copy full SHA for 0c82113

• Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhauer/frontier-station-14 into GoblinFoodSystem

  ErhardSteinhauer

  committed
  a93646a

  Copy full SHA for a93646a

Commits on Mar 31, 2024

• Update StomachComponent.cs

  dvir001

  authored
  06c29ad

  Copy full SHA for 06c29ad

• Update FoodComponent.cs

  dvir001

  authored
  85538a2

  Copy full SHA for 85538a2

• Update StomachComponent.cs

  dvir001

  authored
  c4e7c52

  Copy full SHA for c4e7c52

Commits on Apr 27, 2024

• Merge branch 'master' into GoblinFoodSystem

  dvir001

  authored
  730522f

  Copy full SHA for 730522f

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  38f3a33

  Copy full SHA for 38f3a33

Commits on Apr 29, 2024

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  075435b

  Copy full SHA for 075435b

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  611be4a

  Copy full SHA for 611be4a

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  ba68a1b

  Copy full SHA for ba68a1b

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  802d6f1

  Copy full SHA for 802d6f1

Commits on May 3, 2024

• Merge branch 'master' of https://github.com/dvir001/frontier-station-14 into pr/1159

  dvir001

  committed
  3fafed3

  Copy full SHA for 3fafed3

• Food System Multi types support

  dvir001

  committed
  a41995a

  Copy full SHA for a41995a

• trash eating gob stomach

  ErhardSteinhauer

  committed
  9693762

  Copy full SHA for 9693762

• Update FoodSystem.cs

  dvir001

  committed
  fe792f7

  Copy full SHA for fe792f7

• Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhauer/frontier-station-14 into pr/1159

  dvir001

  committed
  2ff271a

  Copy full SHA for 2ff271a

• Update FoodSystem.cs

  dvir001

  committed
  bd84268

  Copy full SHA for bd84268

• more trash food

  ErhardSteinhauer

  committed
  a3cf959

  Copy full SHA for a3cf959

• Food

  dvir001

  committed
  24c27e8

  Copy full SHA for 24c27e8

• Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhauer/frontier-station-14 into pr/1159

  dvir001

  committed
  d009322

  Copy full SHA for d009322

• Allow goblin to eat open mail only

  dvir001

  committed
  f890786

  Copy full SHA for f890786

Commits on May 4, 2024

• yml fixes

  ErhardSteinhauer

  committed
  94294be

  Copy full SHA for 94294be

• more yml fixes

  ErhardSteinhauer

  committed
  e9a96a6

  Copy full SHA for e9a96a6

• No More refill

  dvir001

  committed
  0b59814

  Copy full SHA for 0b59814

• less corn in cob

  ErhardSteinhauer

  authored
  39aefbd

  Copy full SHA for 39aefbd

• Pain

  dvir001

  committed
  0d099ee

  Copy full SHA for 0d099ee

• Fixing

  dvir001

  committed
  0d15fce

  Copy full SHA for 0d15fce

• Moff

  dvir001

  committed
  052d619

  Copy full SHA for 052d619

• Update paper.yml

  dvir001

  committed
  118699e

  Copy full SHA for 118699e

Commits on May 8, 2024

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  ac5ed9a

  Copy full SHA for ac5ed9a

Commits on May 15, 2024

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  b68dbc3

  Copy full SHA for b68dbc3

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  4986a68

  Copy full SHA for 4986a68

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  43c326c

  Copy full SHA for 43c326c

Commits on May 16, 2024

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  e170050

  Copy full SHA for e170050

Commits on May 17, 2024

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  69e9585

  Copy full SHA for 69e9585

Commits on May 20, 2024

• Merge branch 'master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  86e939a

  Copy full SHA for 86e939a

Commits on May 30, 2024

• Merge branch 'master' of https://github.com/dvir001/frontier-station-14 into pr/1159

  dvir001

  committed
  a411773

  Copy full SHA for a411773

• Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhauer/frontier-station-14 into pr/1159

  dvir001

  committed
  4874a83

  Copy full SHA for 4874a83

• Fixup

  dvir001

  committed
  eaee2bf

  Copy full SHA for eaee2bf

• Update burger.yml

  dvir001

  committed
  7298cf6

  Copy full SHA for 7298cf6

• Update FoodSystem.cs

  dvir001

  committed
  7a6338e

  Copy full SHA for 7a6338e

• Update FoodSystem.cs

  dvir001

  committed
  6c7010f

  Copy full SHA for 6c7010f

• Update Resources/Locale/en-US/_NF/nutrition/components/food-component.ftl

  Show description for 483d048
  

  dvir001

  and

  whatston3

  authored
  483d048

  Copy full SHA for 483d048

• Update FoodSystem.cs

  dvir001

  committed
  311260b

  Copy full SHA for 311260b

Commits on May 31, 2024

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

  Show description for 92dd46b
  

  dvir001

  and

  whatston3

  authored
  92dd46b

  Copy full SHA for 92dd46b

Commits on Jun 1, 2024

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  4130c94

  Copy full SHA for 4130c94

Commits on Jun 2, 2024

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  bf200cb

  Copy full SHA for bf200cb

Commits on Jun 6, 2024

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  9aebf22

  Copy full SHA for 9aebf22

Commits on Jun 14, 2024

• mail

  ErhardSteinhauer

  committed
  38f6b4e

  Copy full SHA for 38f6b4e

• Merge branch 'GoblinFoodSystem' of https://github.com/ErhardSteinhauer/frontier-station-14 into GoblinFoodSystem

  ErhardSteinhauer

  committed
  5773635

  Copy full SHA for 5773635

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  5b5852e

  Copy full SHA for 5b5852e

Commits on Jun 15, 2024

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  743d8f2

  Copy full SHA for 743d8f2

Commits on Jun 19, 2024

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  cbc57d7

  Copy full SHA for cbc57d7

Commits on Jun 23, 2024

• Merge branch 'new-frontiers-14:master' into GoblinFoodSystem

  ErhardSteinhauer

  authored
  27f449a

  Copy full SHA for 27f449a