Code

Factional Cargo, done in a day#3758

Code

Merged

MarkSuckerberg merged 26 commits intoshiptest-ss13:mastershiptest-ss13/Shiptest:masterfrom rye-rice:om5_cargorye-rice/Shiptest:om5_cargoCopy head branch name to clipboardNov 29, 2024

+865-333

Commits

Commits on Nov 14, 2024

• accidentally code in factional cargo

  rye-rice

  committed
  e0ed03b

  Copy full SHA for e0ed03b

• fixes

  rye-rice

  committed
  19225ee

  Copy full SHA for 19225ee

• link

  rye-rice

  committed
  fc07e89

  Copy full SHA for fc07e89

• cloudbreak changes

  rye-rice

  committed
  a2a916d

  Copy full SHA for a2a916d

• more firebungy changes

  rye-rice

  committed
  712d7e0

  Copy full SHA for 712d7e0

• woops

  rye-rice

  committed
  46f7740

  Copy full SHA for 46f7740

• prettier lint

  rye-rice

  committed
  51bfc19

  Copy full SHA for 51bfc19

• hoow did i fuck up that

  rye-rice

  committed
  b96c454

  Copy full SHA for b96c454

Commits on Nov 15, 2024

• more cloudbread stuff

  rye-rice

  committed
  92bff27

  Copy full SHA for 92bff27

Commits on Nov 16, 2024

• cloudbreak adds vector to cargo: new

  rye-rice

  committed
  837fae6

  Copy full SHA for 837fae6

• more cloudstuff

  rye-rice

  committed
  2d03b6c

  Copy full SHA for 2d03b6c

• foxes conflict

  rye-rice

  committed
  36ee1b5

  Copy full SHA for 36ee1b5

• avoid conflicts?

  rye-rice

  committed
  573eda7

  Copy full SHA for 573eda7

• maybe?

  rye-rice

  committed
  4d291ba

  Copy full SHA for 4d291ba

• MAYBE

  rye-rice

  committed
  7841d11

  Copy full SHA for 7841d11

Commits on Nov 23, 2024

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

  rye-rice

  committed
  b60b2e8

  Copy full SHA for b60b2e8

Commits on Nov 25, 2024

• Update code/modules/cargo/packs/magazines.dm

  Show description for c602ecb
  rye-rice

  authored
  c602ecb

  Copy full SHA for c602ecb

Commits on Nov 27, 2024

• Apply suggestions from code review

  Show description for 2d39804
  

  rye-rice

  and

  MarkSuckerberg

  authored
  2d39804

  Copy full SHA for 2d39804

• Update code/modules/cargo/console.dm

  Show description for b374ab5
  MarkSuckerberg

  authored
  b374ab5

  Copy full SHA for b374ab5

• reviews

  rye-rice

  committed
  988e0cb

  Copy full SHA for 988e0cb

• reviews

  rye-rice

  committed
  7501ac3

  Copy full SHA for 7501ac3

• Merge remote-tracking branch 'origin/om5_cargo' into om5_cargo

  rye-rice

  committed
  464503d

  Copy full SHA for 464503d

• outpost datum tweaks

  rye-rice

  committed
  1eaffca

  Copy full SHA for 1eaffca

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

  rye-rice

  committed
  2390cb3

  Copy full SHA for 2390cb3

Commits on Nov 28, 2024

• FIX

  rye-rice

  committed
  cca9334

  Copy full SHA for cca9334

• Update code/modules/cargo/console.dm

  Show description for c96f49f
  

  rye-rice

  and

  MarkSuckerberg

  authored
  c96f49f

  Copy full SHA for c96f49f