Code

somewhat improved cooking system #6895

Code

Open

lolman360 wants to merge 155 commits intoCitadel-Station-13:masterCitadel-Station-13/Citadel-Station-13-RP:masterfrom lolman360:cooking_141lolman360/Citadel-Station-13-RP:cooking_141Copy head branch name to clipboard

+11,012-4,401

Commits

Commits on Apr 30, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  9a27d93

Commits on May 1, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  09d6ebf

Commits on May 2, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  8599e74

Commits on May 3, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  efa93d9

Commits on May 4, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  f41b30a

Commits on May 5, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  9d4a867

Commits on May 6, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  e666109

Commits on May 7, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  4956afc

Commits on May 8, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  9a8c398

Commits on May 9, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  1fbc7b1

Commits on May 10, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  cd61f8b

Commits on May 13, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  3c44e11

Commits on May 14, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  ad52dba

Commits on May 15, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  a72c3f7

Commits on May 17, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  ddd289b

Commits on May 18, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  35263bb

Commits on May 20, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  b0db1ca

Commits on May 25, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  84afb5d

Commits on May 27, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  3c0b8cd

Commits on May 30, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  e42ffdb

Commits on Jun 3, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  938bf86

Commits on Jun 4, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  0429a23

Commits on Jun 8, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  6a0fc16

Commits on Jun 13, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  bc7eaf6

Commits on Jun 15, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  4c94a5d

Commits on Jun 16, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  ac5216d

Commits on Jun 17, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  01b787d

Commits on Jun 19, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  7ea4091

Commits on Jun 23, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  109f893

Commits on Jun 27, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  b739a7a

Commits on Jun 28, 2021

• Automatic changelog compile [ci skip]

  actions-user

  committed
  7302819

Commits on Oct 9, 2021

• Merge remote-tracking branch 'upstream/master'

  lolman360

  committed
  0f72a13

Commits on Mar 22, 2022

• Merge remote-tracking branch 'upstream/master'

  lolman360

  committed
  5bd60e5

• ree

  lolman360

  committed
  ddb01ff

Commits on Mar 23, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  de027ed

Commits on Mar 24, 2022

• Merge branch 'master' into master

  lolman360

  authored
  0a4b895

Commits on Mar 25, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  128b181

Commits on Mar 28, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  8b70440

Commits on Mar 30, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  0577da5

Commits on Mar 31, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  53c6d01

Commits on Apr 2, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  4891e7f

Commits on Apr 3, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  bb65500

Commits on Apr 10, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  1a4303d

Commits on Apr 14, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  be0c5a5

Commits on Apr 17, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  688369f

Commits on Apr 18, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  397d0a7

Commits on Apr 20, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  c9caf15

Commits on Apr 21, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  573c242

Commits on Apr 22, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  6f1f9b4

Commits on Apr 23, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  9fc66ad

Commits on Apr 24, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  0f0384e

Commits on Apr 27, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  3a7728a

Commits on Apr 29, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  624227e

Commits on Apr 30, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  45e29ce

Commits on May 1, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  787f350

Commits on May 2, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  2fbabcf

Commits on May 3, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  f0221a2

Commits on May 6, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  17dc465

Commits on May 9, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  125acf8

Commits on May 11, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  2b0932f

Commits on May 13, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  b45df96

Commits on May 15, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  7db77de

Commits on May 16, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  f9bc0a2

Commits on May 17, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  95d5a1a

Commits on May 19, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  14c96d7

Commits on May 20, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  c60d571

Commits on May 21, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  f76a41d

Commits on May 23, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  9384823

Commits on May 25, 2022

• Automatic changelog compile [ci skip]

  actions-user

  committed
  47a39e5

Commits on Apr 30, 2023

• Merge branch 'master' of https://github.com/lolman360/Citadel-Station-13-RP

  lolman360

  committed
  eed9147

Commits on Dec 22, 2023

• ingredient alpha

  lolman360

  committed
  bc355f9

Commits on Dec 24, 2023

• new stuff

  lolman360

  committed
  87dc4d2

Commits on Dec 25, 2023

• processing changes

  lolman360

  committed
  95e35c1

Commits on Dec 29, 2023

• framework part 1

  Show description for 421889e
  lolman360

  committed
  421889e

• Merge branch 'master' into cooking_141

  lolman360

  authored
  b52ad89

Commits on Dec 30, 2023

• merging step 1

  lolman360

  committed
  3bfb01e

• Merge branch 'cooking_141' of https://github.com/lolman360/Citadel-Station-13-RP into cooking_141

  lolman360

  committed
  24870e2

• merging seperation complete

  lolman360

  committed
  f2c18b6

Commits on Jan 1, 2024

• recipes part1

  lolman360

  committed
  76374af

• recipes

  lolman360

  committed
  2dc47da

Commits on Jan 2, 2024

• recipes done, starting seed conversion

  lolman360

  committed
  6c771b0

• replacement

  lolman360

  committed
  1f783a1

Commits on Jan 3, 2024

• debug message removal

  lolman360

  committed
  0aa5977

• recipes mk2

  lolman360

  committed
  97a525b

Commits on Jan 6, 2024

• bread pt1

  lolman360

  committed
  9a9fe83

Commits on Jan 7, 2024

• super trooper

  Show description for 8cd6a90
  lolman360

  committed
  8cd6a90

• grill

  lolman360

  committed
  22b1fa3

Commits on Jan 12, 2024

• start work on overlays

  lolman360

  committed
  558310c

Commits on Jan 14, 2024

• Merge remote-tracking branch 'upstream/master' into cooking_141

  lolman360

  committed
  564fe1c

• invisible sun

  Show description for 245f49d
  lolman360

  committed
  245f49d

• stove sprites done

  lolman360

  committed
  f7323e5

• potgeometry

  lolman360

  committed
  365384e

Commits on Jan 15, 2024

• colors

  lolman360

  committed
  8ed3503

Commits on Jan 17, 2024

• Merge branch 'master' into cooking_141

  lolman360

  authored
  cba9d9a

• reminders so i dont forget

  Show description for 7393685
  lolman360

  committed
  7393685

• chaaaanger

  Show description for 0205eec
  lolman360

  committed
  0205eec

Commits on Jan 20, 2024

• the Cull

  lolman360

  committed
  e49ab2d

• uhhh

  lolman360

  committed
  b0abea1

Commits on Jan 22, 2024

• recipe handling

  lolman360

  committed
  1edd7c6

• recipes fixing final

  lolman360

  committed
  5dee203

Commits on Jan 31, 2024

• Merge remote-tracking branch 'upstream/master' into cooking_141

  lolman360

  committed
  216319d

• fryer recipes fixes

  Show description for 3cd81a9
  lolman360

  committed
  3cd81a9

Commits on Feb 2, 2024

• Merge branch 'master' into cooking_141

  lolman360

  authored
  1e4fd06

Commits on Feb 3, 2024

• fryer, etc

  lolman360

  committed
  be20371

Commits on Feb 4, 2024

• plant summary

  lolman360

  committed
  f957356

• oven finalization

  lolman360

  committed
  187b959

Commits on Feb 7, 2024

• meats part 1

  lolman360

  committed
  094c5b2

Commits on Feb 11, 2024

• meat pt2

  lolman360

  committed
  18f25e3

Commits on Feb 17, 2024

• todo: grill

  Show description for 0f5df59
  lolman360

  committed
  0f5df59

Commits on Mar 4, 2024

• Merge branch 'master' into cooking_141

  lolman360

  authored
  f59af37

Commits on Mar 9, 2024

• Merge branch 'master' into cooking_141

  lolman360

  authored
  ba345d1

• good apple

  lolman360

  committed
  81e2c19

• Merge branch 'cooking_141' of https://github.com/lolman360/Citadel-Station-13-RP into cooking_141

  lolman360

  committed
  235780d

Commits on Mar 10, 2024

• slow and low

  lolman360

  committed
  ff352fc

• no more getflaticon

  Show description for 9ae98ca
  lolman360

  committed
  9ae98ca

Commits on Mar 11, 2024

• airlines hold a short asset position

  lolman360

  committed
  4a208ae

• meaticons1

  lolman360

  committed
  990910f

• rift kitchen update pt1

  lolman360

  committed
  0b8a93e

Commits on Mar 12, 2024

• microwave recipes changes

  lolman360

  committed
  78bbf51

• microwave changes pt2

  lolman360

  committed
  e94bd3a

Commits on Mar 13, 2024

• fugue coding

  Show description for b5ca8a7
  lolman360

  committed
  b5ca8a7

• she's homeless

  Show description for b947530
  lolman360

  committed
  b947530

• corn flowering

  lolman360

  committed
  15bd119

Commits on Mar 14, 2024

• lol

  lolman360

  committed
  53a7a3a

• woo

  lolman360

  committed
  0b7e77c

• single ws change

  lolman360

  committed
  44f2381

• latchkey neighbor

  lolman360

  committed
  180e2d2

Commits on Mar 15, 2024

• egg changes

  lolman360

  committed
  65d7f50

• snack in food?

  lolman360

  committed
  7afd1ae

• dedup compule

  lolman360

  committed
  d9f8dee

Commits on Mar 19, 2024

• cooking recipe

  lolman360

  committed
  bff3b62

Commits on Mar 20, 2024

• CHEESE WOO

  lolman360

  committed
  ad5c6b4

Commits on Mar 21, 2024

• Merge branch 'cooking_141' of https://github.com/lolman360/Citadel-Station-13-RP into cooking_141

  lolman360

  committed
  487a5f1

• temp for merge

  lolman360

  committed
  60f679d

• Merge remote-tracking branch 'upstream/master' into cooking_141

  lolman360

  committed
  432091b

• woo yeah

  lolman360

  committed
  b0e3d59

• Merge branch 'master' into cooking_141

  lolman360

  committed
  a9cd34e

• rar

  lolman360

  committed
  ff93286

• merge fix 2

  lolman360

  committed
  0e2b8a7

• Merge branch 'master' into cooking_141

  lolman360

  authored
  9f3fc12

• WHOOPS

  lolman360

  committed
  257dd12

• whoops.

  lolman360

  committed
  e38a179

• local man does 5 morbillion fixes in 1 millisecond

  lolman360

  committed
  1588b14

Commits on Nov 17, 2024

• egg fixes, reagent viz fixes, transformable food fixes

  lolman360

  committed
  30c8b0e

Commits on Nov 23, 2024

• misc lang changes

  lolman360

  committed
  dbe8a19

Commits on Nov 24, 2024

• servings to weight

  lolman360

  committed
  69d1e46

Commits on Nov 27, 2024

• recipe ports to new system and fixes

  Show description for e188c06
  lolman360

  committed
  e188c06

Commits on Dec 1, 2024

• recipe changes, moving most microwave to stove oven fryer

  lolman360

  committed
  e18f6c8

Commits on Dec 4, 2024

• food weight system fully implemented, recipes fixed and adapted to new system

  Show description for e067572
  lolman360

  committed
  e067572

Commits on Dec 8, 2024

• recipe viz

  lolman360

  committed
  ca73010

Commits on Dec 11, 2024

• minor visualize fixes, major transformable fix

  lolman360

  committed
  d296a3f

Commits on Dec 14, 2024

• recipe fixes

  lolman360

  committed
  8636015

Commits on Dec 15, 2024

• recipe guidebook

  lolman360

  committed
  9d74e77

• tick recipes

  lolman360

  committed
  d0a3ad9

• tgui now opens, but crashes

  lolman360

  committed
  10547c7