Code

Upstream sync#463

Code

Merged

Rxup merged 10 commits intomasterRxup/space-station-14:masterfrom upstream-syncRxup/space-station-14:upstream-syncCopy head branch name to clipboardFeb 13, 2024

+1,436-937

Commits

Commits on Feb 11, 2024

• Update Credits (#25115)

  Show description for 0add870
  

  github-actions[bot]

  and

  PJBot

  authored
  0add870

  Copy full SHA for 0add870

• Replace fixed drink glasses with metamorphic versions (#25134)

  Show description for 752515c
  Tayrtahn

  authored
  752515c

  Copy full SHA for 752515c

• ambuzol beef (#25119)

  Emisse

  authored
  0aa35af

  Copy full SHA for 0aa35af

• Automatic changelog update

  PJBot

  committed
  6873907

  Copy full SHA for 6873907

• Shuttle floor resprite (#25127)

  Show description for a93466a
  Flareguy

  authored
  a93466a

  Copy full SHA for a93466a

Commits on Feb 12, 2024

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

  Show description for 70e6317
  Morb0

  committed
  70e6317

  Copy full SHA for 70e6317

• Update locale

  Morb0

  committed
  a90d100

  Copy full SHA for a90d100

• Largo puller no need hands

  Morb0

  committed
  2b78f5b

  Copy full SHA for 2b78f5b

• Merge pull request #1869 from space-syndicate/upstream-sync

  Show description for baa1216
  Morb0

  authored
  baa1216

  Copy full SHA for baa1216

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

  Rxup

  committed
  98f7fc8

  Copy full SHA for 98f7fc8