Code

Food Expansion 2 [DO NOT MERGE]#2461

Code

Closed

FalloutFalcon wants to merge 75 commits intoshiptest-ss13:mastershiptest-ss13/Shiptest:masterfrom FalloutFalcon:racial-foods-2FalloutFalcon/ShiptestF:racial-foods-2Copy head branch name to clipboard

+5,055-1,132

Commits

Commits on Mar 5, 2023

• Lizard foods and some moffic (not all)

  MrSamu99

  committed
  2d759b4

  Copy full SHA for 2d759b4

• Remained foods

  MrSamu99

  committed
  6bb8156

  Copy full SHA for 6bb8156

• Hello, I like money

  MrSamu99

  committed
  aa49755

  Copy full SHA for aa49755

• MORE FOOD

  MrSamu99

  committed
  b3cd696

  Copy full SHA for b3cd696

• Not enough Shroom Grey tea

  MrSamu99

  committed
  02eff47

  Copy full SHA for 02eff47

Commits on Mar 8, 2023

• Merge branch 'shiptest-ss13:master' into racial-foods

  MrSamu99

  authored
  e83dcfc

  Copy full SHA for e83dcfc

Commits on Mar 11, 2023

• Merge branch 'shiptest-ss13:master' into racial-foods

  MrSamu99

  authored
  ed1cdbe

  Copy full SHA for ed1cdbe

Commits on Jun 13, 2023

• Merge remote-tracking branch 'upstream/master' into racial-foods

  MrSamu99

  committed
  4302854

  Copy full SHA for 4302854

• Icon merge

  MrSamu99

  committed
  b873f33

  Copy full SHA for b873f33

• Planet cracker can't explode as it doesn't exist

  MrSamu99

  committed
  222704c

  Copy full SHA for 222704c

Commits on Aug 31, 2023

• Merge remote-tracking branch 'upstream/master' into racial-foods

  MrSamu99

  committed
  85dbbec

  Copy full SHA for 85dbbec

Commits on Sep 30, 2023

• some updates

  MrSamu99

  committed
  3f69a8a

  Copy full SHA for 3f69a8a

Commits on Nov 8, 2023

• Merge branch 'master' of

  Show description for 43facd5
  FalloutFalcon

  committed
  43facd5

  Copy full SHA for 43facd5

• Removes the random refrence to tg guy

  Show description for 532e15d
  FalloutFalcon

  committed
  532e15d

  Copy full SHA for 532e15d

• Update food.dm and recipes_lizard.dm, remove

  Show description for b6ead5c
  FalloutFalcon

  committed
  b6ead5c

  Copy full SHA for b6ead5c

• cuts out alot that should be in a dif pr

  FalloutFalcon

  committed
  318f1e5

  Copy full SHA for 318f1e5

• ok engine fodder needs cnd and penuts

  FalloutFalcon

  committed
  7f8700a

  Copy full SHA for 7f8700a

• i get it now

  FalloutFalcon

  committed
  175acfc

  Copy full SHA for 175acfc

• ports tg sprites for some foods, reorginizes

  Show description for b54d860
  FalloutFalcon

  committed
  b54d860

  Copy full SHA for b54d860

• Temp Coagulant

  FalloutFalcon

  committed
  4d92e5f

  Copy full SHA for 4d92e5f

Commits on Nov 13, 2023

• ditching the seraka extract for now...

  FalloutFalcon

  committed
  94f0363

  Copy full SHA for 94f0363

• gutting moth rations (we have our own rations)

  FalloutFalcon

  committed
  034c181

  Copy full SHA for 034c181

Commits on Nov 15, 2023

• lightly sorts your pizza

  FalloutFalcon

  committed
  00afcb2

  Copy full SHA for 00afcb2

• rasict creamsicle....

  FalloutFalcon

  committed
  42527dc

  Copy full SHA for 42527dc

• tiny orginizing

  FalloutFalcon

  committed
  9beb9ef

  Copy full SHA for 9beb9ef

Commits on Nov 18, 2023

• thought i fixed this already

  FalloutFalcon

  committed
  1129dd0

  Copy full SHA for 1129dd0

• ugh . sandwich

  FalloutFalcon

  committed
  e82033c

  Copy full SHA for e82033c

• we aint ever gonna see abductors

  FalloutFalcon

  committed
  55040c3

  Copy full SHA for 55040c3

• bottle...

  FalloutFalcon

  committed
  5f4d444

  Copy full SHA for 5f4d444

• val is hurting me

  FalloutFalcon

  committed
  ef6ad7a

  Copy full SHA for ef6ad7a

• ugh

  FalloutFalcon

  committed
  5b79960

  Copy full SHA for 5b79960

• egg and missing fooddmi sprites

  FalloutFalcon

  committed
  351719f

  Copy full SHA for 351719f

• meat.dm and removes old donut boxs

  FalloutFalcon

  committed
  c94b104

  Copy full SHA for c94b104

• acctually remove the donut boxes

  FalloutFalcon

  committed
  de7c113

  Copy full SHA for de7c113

• splits burgerbread into burger & bread

  FalloutFalcon

  committed
  56a31ae

  Copy full SHA for 56a31ae

• burger and bread

  FalloutFalcon

  committed
  d26eb05

  Copy full SHA for d26eb05

• pie & cake split

  FalloutFalcon

  committed
  c41a60d

  Copy full SHA for c41a60d

Commits on Nov 19, 2023

• thought i did this....

  FalloutFalcon

  committed
  6e3ba0d

  Copy full SHA for 6e3ba0d

• ughg

  FalloutFalcon

  committed
  5ecb6fb

  Copy full SHA for 5ecb6fb

• control f all lizard

  FalloutFalcon

  committed
  0001bf7

  Copy full SHA for 0001bf7

• fixing conflicts

  FalloutFalcon

  committed
  c3e14bb

  Copy full SHA for c3e14bb

• Merge branch 'master' into racial-foods-2

  Show description for ac94087
  FalloutFalcon

  authored
  ac94087

  Copy full SHA for ac94087

• Need to orginize drink dmi soon

  FalloutFalcon

  committed
  66a7773

  Copy full SHA for 66a7773

• Merge branch 'racial-foods-2' of https://github.com/FalloutFalcon/Shiptest into racial-foods-2

  FalloutFalcon

  committed
  6f5d481

  Copy full SHA for 6f5d481

• tiny fix

  FalloutFalcon

  committed
  6773646

  Copy full SHA for 6773646

• auhgj

  FalloutFalcon

  committed
  b17bbbc

  Copy full SHA for b17bbbc

• was that it?

  FalloutFalcon

  committed
  a73eb9e

  Copy full SHA for a73eb9e

Commits on Nov 20, 2023

• Dunno how that got there

  FalloutFalcon

  committed
  a9ecb70

  Copy full SHA for a9ecb70

Commits on Nov 25, 2023

• ough that took a while...

  FalloutFalcon

  committed
  8673c43

  Copy full SHA for 8673c43

• ahhhhh

  FalloutFalcon

  committed
  ce89a48

  Copy full SHA for ce89a48

Commits on Nov 26, 2023

• ough

  FalloutFalcon

  committed
  fc50b55

  Copy full SHA for fc50b55

• uhhhggg

  FalloutFalcon

  committed
  d1c2276

  Copy full SHA for d1c2276

• idk im falling asleep

  FalloutFalcon

  committed
  27f1bd0

  Copy full SHA for 27f1bd0

• i had condiment code

  FalloutFalcon

  committed
  9e57664

  Copy full SHA for 9e57664

Commits on Nov 27, 2023

• unit test because i cant wait

  FalloutFalcon

  committed
  a326522

  Copy full SHA for a326522

• Merge remote-tracking branch 'upstream/master' into racial-foods-2

  FalloutFalcon

  committed
  4e086ee

  Copy full SHA for 4e086ee

• speeding up the unit tests. I will remeber to remo

  FalloutFalcon

  committed
  649386b

  Copy full SHA for 649386b

• the test was a good idea. Found a bunch of missing

  FalloutFalcon

  committed
  3c95660

  Copy full SHA for 3c95660

• orginzing and fixing sprites

  FalloutFalcon

  committed
  d7fae61

  Copy full SHA for d7fae61

• I think this is all the food related sprites?

  FalloutFalcon

  committed
  22d6432

  Copy full SHA for 22d6432

• im blind

  FalloutFalcon

  committed
  12fe9c9

  Copy full SHA for 12fe9c9

• woo

  FalloutFalcon

  committed
  b389acc

  Copy full SHA for b389acc

• catagorys

  FalloutFalcon

  committed
  12c9aa1

  Copy full SHA for 12c9aa1

• pizza and bread

  FalloutFalcon

  committed
  45336ae

  Copy full SHA for 45336ae

• soup and salads

  FalloutFalcon

  committed
  a79b155

  Copy full SHA for a79b155

• bread and spaghetti

  FalloutFalcon

  committed
  6a7a813

  Copy full SHA for 6a7a813

• now just the other.dm ughhhh

  FalloutFalcon

  committed
  d00e6f9

  Copy full SHA for d00e6f9

• I love this unit test

  FalloutFalcon

  committed
  a5dfce4

  Copy full SHA for a5dfce4

• dumping shit into other

  FalloutFalcon

  committed
  09ce8a5

  Copy full SHA for 09ce8a5

• oop

  FalloutFalcon

  committed
  c6f82be

  Copy full SHA for c6f82be

• restores unit tests

  FalloutFalcon

  committed
  690d32d

  Copy full SHA for 690d32d

Commits on Dec 15, 2023

• Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest into racial-foods-2

  FalloutFalcon

  committed
  4cee75d

  Copy full SHA for 4cee75d

• real?

  FalloutFalcon

  committed
  adb0217

  Copy full SHA for adb0217

Commits on Dec 24, 2023

• Merge branch 'master' into racial-foods-2

  FalloutFalcon

  authored
  aec463f

  Copy full SHA for aec463f

Commits on Jan 22, 2024

• Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest into racial-foods-2

  FalloutFalcon

  committed
  ebb7501

  Copy full SHA for ebb7501