Code

[Port] Chemmaster refactor#1644

Code

Merged

dwasint merged 19 commits intoMonkestation:masterMonkestation/Monkestation2.0:masterfrom AlbertNanotracen:chemmaster-refactorAlbertNanotracen/Monkestation2.0:chemmaster-refactorCopy head branch name to clipboardJun 24, 2024

+1,444-888

Commits

Commits on Apr 12, 2024

• ChemMaster and CondiMaster refactored, prints items over time (#75849)

  Show description for 33a4b99
  

  MTandi

  authored and

  AlbertNanotracen

  committed
  33a4b99

  Copy full SHA for 33a4b99

• Condiments resprited (#75715)

  Show description for c42d898
  

  MTandi

  authored and

  AlbertNanotracen

  committed
  c42d898

  Copy full SHA for c42d898

• Test tubes and racks (#75179)

  Show description for ac94572
  

  MTandi

  authored and

  AlbertNanotracen

  committed
  ac94572

  Copy full SHA for ac94572

• fix conflicts in chemical.dmi

  AlbertNanotracen

  committed
  959ef93

  Copy full SHA for 959ef93

• merging dmis is too hard

  AlbertNanotracen

  committed
  d30d9fa

  Copy full SHA for d30d9fa

Commits on Apr 13, 2024

• Merge remote-tracking branch 'origin/master' into chemmaster-refactor

  AlbertNanotracen

  committed
  ce60fea

  Copy full SHA for ce60fea

Commits on Apr 16, 2024

• Merge branch 'Monkestation:master' into chemmaster-refactor

  AlbertNanotracen

  authored
  d711a08

  Copy full SHA for d711a08

Commits on Apr 27, 2024

• vials

  AlbertNanotracen

  committed
  97af5de

  Copy full SHA for 97af5de

Commits on May 7, 2024

• removes a null reference error i made

  AlbertNanotracen

  committed
  b1106b1

  Copy full SHA for b1106b1

• gives test tubes a crafting recipe (must be researched)

  AlbertNanotracen

  committed
  e2c2040

  Copy full SHA for e2c2040

Commits on May 8, 2024

• Merge remote-tracking branch 'origin/master' into chemmaster-refactor

  AlbertNanotracen

  committed
  15e3d0e

  Copy full SHA for 15e3d0e

Commits on May 11, 2024

• factory ouput uses same pill/patch styles as chem master

  AlbertNanotracen

  committed
  6ae6e15

  Copy full SHA for 6ae6e15

• why were these sprites not added, i dont get dmi files

  AlbertNanotracen

  committed
  6842c0a

  Copy full SHA for 6842c0a

• remove extra newlines

  AlbertNanotracen

  committed
  d02e327

  Copy full SHA for d02e327

• Porting some of tg#79059

  AlbertNanotracen

  committed
  343a7db

  Copy full SHA for 343a7db

Commits on Jun 1, 2024

• Merge remote-tracking branch 'origin/master' into chemmaster-refactor

  AlbertNanotracen

  committed
  0e9dd8f

  Copy full SHA for 0e9dd8f

• fixed merge conflict correctly

  AlbertNanotracen

  committed
  1d2f566

  Copy full SHA for 1d2f566

Commits on Jun 22, 2024

• Merge branch 'Monkestation:master' into chemmaster-refactor

  AlbertNanotracen

  authored
  89a1bc5

  Copy full SHA for 89a1bc5

• context begone!

  AlbertNanotracen

  committed
  2356e46

  Copy full SHA for 2356e46