Code

Cog power setup fix#34188

Code

Merged

Emisse merged 56 commits intospace-wizards:masterspace-wizards/space-station-14:masterfrom TytosB:coggerTytosB/space-station-14-loop:coggerCopy head branch name to clipboardJan 19, 2025

+1,346-330

Commits

Commits on Dec 3, 2024

• many changes

  TytosB

  committed
  914e6d4

  Copy full SHA for 914e6d4

• contentingregrationtests

  TytosB

  committed
  4d9b760

  Copy full SHA for 4d9b760

• serialized invalid removed

  TytosB

  committed
  7930067

  Copy full SHA for 7930067

• blank

  TytosB

  committed
  18ff974

  Copy full SHA for 18ff974

Commits on Dec 4, 2024

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  392037f

  Copy full SHA for 392037f

Commits on Dec 7, 2024

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  871cae7

  Copy full SHA for 871cae7

• "Changes and fixes as suggested"

  TytosB

  committed
  84a3be9

  Copy full SHA for 84a3be9

• Merge branch 'looper2' of https://github.com/TytosB/space-station-14-loop into looper2

  TytosB

  committed
  d6cb258

  Copy full SHA for d6cb258

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  cd4fef2

  Copy full SHA for cd4fef2

• blank

  TytosB

  committed
  99f0704

  Copy full SHA for 99f0704

• Merge branch 'looper2' of https://github.com/TytosB/space-station-14-loop into looper2

  TytosB

  committed
  dd31772

  Copy full SHA for dd31772

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  0edefbe

  Copy full SHA for 0edefbe

• blank

  TytosB

  committed
  157dc3c

  Copy full SHA for 157dc3c

Commits on Dec 10, 2024

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  7b44c05

  Copy full SHA for 7b44c05

• added desk bells

  TytosB

  committed
  5ba1076

  Copy full SHA for 5ba1076

• Merge branch 'looper2' of https://github.com/TytosB/space-station-14-loop into looper2

  TytosB

  committed
  4c77192

  Copy full SHA for 4c77192

Commits on Dec 15, 2024

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  98f1bc6

  Copy full SHA for 98f1bc6

Commits on Dec 16, 2024

• engi rework rework rework

  TytosB

  committed
  311f967

  Copy full SHA for 311f967

• pusMerge branch 'looper2' of https://github.com/TytosB/space-station-14-loop into looper2

  TytosB

  committed
  df2666e

  Copy full SHA for df2666e

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  aa48321

  Copy full SHA for aa48321

Commits on Dec 17, 2024

• added gate to content integration

  TytosB

  committed
  c61acbd

  Copy full SHA for c61acbd

• Merge branch 'master' into looper2

  TytosB

  authored
  b42d302

  Copy full SHA for b42d302

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  09f9861

  Copy full SHA for 09f9861

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  76d06d4

  Copy full SHA for 76d06d4

• tweaks

  TytosB

  committed
  9c86abb

  Copy full SHA for 9c86abb

Commits on Dec 18, 2024

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  b800a86

  Copy full SHA for b800a86

• aaa

  TytosB

  committed
  3d49cc5

  Copy full SHA for 3d49cc5

• bbb

  TytosB

  committed
  c8cf1e1

  Copy full SHA for c8cf1e1

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  392ac21

  Copy full SHA for 392ac21

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  7e0cc6c

  Copy full SHA for 7e0cc6c

• added holopads

  TytosB

  committed
  7e99986

  Copy full SHA for 7e99986

Commits on Dec 19, 2024

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  089c412

  Copy full SHA for 089c412

• ccc

  TytosB

  committed
  12c6890

  Copy full SHA for 12c6890

• Update default.yml

  Emisse

  authored
  d8f82f9

  Copy full SHA for d8f82f9

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  d83b6f1

  Copy full SHA for d83b6f1

• hotfix

  TytosB

  committed
  4ee4de7

  Copy full SHA for 4ee4de7

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  6e2879e

  Copy full SHA for 6e2879e

• aaa

  TytosB

  committed
  e86d47d

  Copy full SHA for e86d47d

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  9b1965c

  Copy full SHA for 9b1965c

• bbb

  TytosB

  committed
  dcfc99b

  Copy full SHA for dcfc99b

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  6ff97e5

  Copy full SHA for 6ff97e5

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  0517bff

  Copy full SHA for 0517bff

Commits on Dec 25, 2024

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  6a45eae

  Copy full SHA for 6a45eae

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  a437902

  Copy full SHA for a437902

• many many tweaks and fixes

  TytosB

  committed
  bf1fe39

  Copy full SHA for bf1fe39

• aaa

  TytosB

  committed
  db13312

  Copy full SHA for db13312

Commits on Dec 28, 2024

• Merge branch 'space-wizards:master' into looper2

  TytosB

  authored
  d606961

  Copy full SHA for d606961

• decals and maints

  TytosB

  committed
  2b76e15

  Copy full SHA for 2b76e15

Commits on Dec 29, 2024

• aaa

  TytosB

  committed
  c2da137

  Copy full SHA for c2da137

Commits on Dec 30, 2024

• bbb

  TytosB

  committed
  71b7ccf

  Copy full SHA for 71b7ccf

• ccc

  TytosB

  committed
  4360b3e

  Copy full SHA for 4360b3e

Commits on Jan 2, 2025

• cog power setup was bad

  TytosB

  committed
  bd605ec

  Copy full SHA for bd605ec

Commits on Jan 3, 2025

• cog power fix

  TytosB

  committed
  18573c3

  Copy full SHA for 18573c3

Commits on Jan 5, 2025

• Merge branch 'space-wizards:master' into cogger

  TytosB

  authored
  1882ee3

  Copy full SHA for 1882ee3

• made it artsy

  TytosB

  committed
  819a338

  Copy full SHA for 819a338

Commits on Jan 9, 2025

• Merge branch 'space-wizards:master' into cogger

  TytosB

  authored
  1616b2d

  Copy full SHA for 1616b2d