Code

Raleigh-Class Mercenary Corvette#3458

Code

Merged

Gristlebee merged 37 commits intoshiptest-ss13:mastershiptest-ss13/Shiptest:masterfrom Erikafox:mercsErikafox/Shiptest:mercsCopy head branch name to clipboardOct 24, 2024

+6,428-2

Commits

Commits on Sep 23, 2024

• Create independent_mercs.dmm

  Erikafox

  committed
  fb2f6de

  Copy full SHA for fb2f6de

Commits on Sep 24, 2024

• Update independent_mercs.dmm

  Erikafox

  committed
  23fa183

  Copy full SHA for 23fa183

Commits on Sep 25, 2024

• Update independent_mercs.dmm

  Erikafox

  committed
  11df3a9

  Copy full SHA for 11df3a9

• slammin

  Erikafox

  committed
  d5da2aa

  Copy full SHA for d5da2aa

Commits on Sep 26, 2024

• wa

  Erikafox

  committed
  9fe23c6

  Copy full SHA for 9fe23c6

• Update independent_mercs.dmm

  Erikafox

  committed
  d1c918b

  Copy full SHA for d1c918b

Commits on Sep 27, 2024

• Update independent_mercs.dmm

  Erikafox

  committed
  d61b97c

  Copy full SHA for d61b97c

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

  Erikafox

  committed
  bb77c88

  Copy full SHA for bb77c88

Commits on Sep 28, 2024

• Update independent_mercs.dmm

  Erikafox

  committed
  5789277

  Copy full SHA for 5789277

• Update independent_mercs.dmm

  Erikafox

  committed
  779ceb2

  Copy full SHA for 779ceb2

Commits on Sep 29, 2024

• Update independent_mercs.dmm

  Erikafox

  committed
  ed23b23

  Copy full SHA for ed23b23

• finishes ship. adds config. adds jobs.

  Erikafox

  committed
  1fce9d1

  Copy full SHA for 1fce9d1

• lintfix

  Erikafox

  committed
  8fe24e4

  Copy full SHA for 8fe24e4

• Update independent_raleigh.dmm

  Erikafox

  committed
  e4af354

  Copy full SHA for e4af354

• Update independent_raleigh.json

  Erikafox

  committed
  0b82908

  Copy full SHA for 0b82908

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

  Erikafox

  committed
  839e407

  Copy full SHA for 839e407

• title change

  Erikafox

  committed
  f5d901f

  Copy full SHA for f5d901f

• Update independent_raleigh.dmm

  Erikafox

  committed
  c6b22fc

  Copy full SHA for c6b22fc

• file + title change again

  Erikafox

  committed
  39b4803

  Copy full SHA for 39b4803

• some notices

  Erikafox

  committed
  c633529

  Copy full SHA for c633529

• Update independent.dm

  Erikafox

  committed
  308a95f

  Copy full SHA for 308a95f

Commits on Oct 1, 2024

• review changes

  Erikafox

  committed
  c96a83b

  Copy full SHA for c96a83b

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

  Erikafox

  committed
  ef3987e

  Copy full SHA for ef3987e

• cabinet

  Erikafox

  committed
  bfeb6a7

  Copy full SHA for bfeb6a7

• funding

  Erikafox

  committed
  61879b8

  Copy full SHA for 61879b8

• pistolcase + goggles for officers

  Erikafox

  committed
  4514a96

  Copy full SHA for 4514a96

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

  Erikafox

  committed
  7eb6668

  Copy full SHA for 7eb6668

• map fixes + rpg cabinet

  Erikafox

  committed
  b324856

  Copy full SHA for b324856

• namelist change

  Erikafox

  committed
  76fca44

  Copy full SHA for 76fca44

Commits on Oct 5, 2024

• Update independent_raleigh.dmm

  Erikafox

  committed
  6341cb6

  Copy full SHA for 6341cb6

Commits on Oct 6, 2024

• review stuff

  Erikafox

  committed
  ff97672

  Copy full SHA for ff97672

Commits on Oct 12, 2024

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

  Erikafox

  committed
  a75ecf5

  Copy full SHA for a75ecf5

• Update independent_raleigh.dmm

  Erikafox

  committed
  ec7d903

  Copy full SHA for ec7d903

Commits on Oct 23, 2024

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

  Erikafox

  committed
  0483d73

  Copy full SHA for 0483d73

• Update independent_raleigh.dmm

  Erikafox

  committed
  7d6eee0

  Copy full SHA for 7d6eee0

• Update independent_raleigh.dmm

  Erikafox

  committed
  23ec428

  Copy full SHA for 23ec428

• Update independent_raleigh.dmm

  Erikafox

  committed
  db4e213

  Copy full SHA for db4e213