Code

Upstream sync#561

Code

Merged

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

+1,112-242,760

Commits

Commits on Apr 11, 2024

• [Maps] Gate remove (#2033)

  Show description for b2db804
  

  poeMota

  and

  KonChenY1

  authored
  b2db804

  Copy full SHA for b2db804

• Fix centcomm (#2032)

  lzk228

  authored
  5e3583e

  Copy full SHA for 5e3583e

• New lobby music (#2030)

  Litogin

  authored
  e291448

  Copy full SHA for e291448

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

  Show description for 782d82c
  Morb0

  committed
  782d82c

  Copy full SHA for 782d82c

• Update locale

  Morb0

  committed
  61649b7

  Copy full SHA for 61649b7

Commits on Apr 12, 2024

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

  Show description for 6ddba63
  Morb0

  authored
  6ddba63

  Copy full SHA for 6ddba63

• Fix potted plant popup/sfx spam (#26901)

  Show description for 8e9d274
  Tayrtahn

  authored
  8e9d274

  Copy full SHA for 8e9d274

• Allow advertisement timers to prewarm (#26900)

  Show description for 264bf71
  Tayrtahn

  authored
  264bf71

  Copy full SHA for 264bf71

• Fix shaker sprites (#26899)

  Show description for b895e55
  Vermidia

  authored
  b895e55

  Copy full SHA for b895e55

• Automatic changelog update

  PJBot

  committed
  4627c7c

  Copy full SHA for 4627c7c

• Update .editorconfig to correspond Code Conventions (#26824)

  Show description for 882aeb0
  TokenStyle

  authored
  882aeb0

  Copy full SHA for 882aeb0

• Remove reagent slimes from ghost role pool (#26840)

  Show description for e12223c
  liltenhead

  authored
  e12223c

  Copy full SHA for e12223c

• Automatic changelog update

  PJBot

  committed
  8f17bf1

  Copy full SHA for 8f17bf1

• Fix grammar in changelog (#26894)

  Show description for 261e535
  

  Brandon-Huu

  and

  metalgearsloth

  authored
  261e535

  Copy full SHA for 261e535

• NoticeBoard is craftable now (#26847)

  Show description for e88b246
  

  TokenStyle

  and

  metalgearsloth

  authored
  e88b246

  Copy full SHA for e88b246

• Automatic changelog update

  PJBot

  committed
  85aef16

  Copy full SHA for 85aef16

• Add drink container suffixes (#26835)

  Show description for 7d480ac
  

  IamVelcroboy

  and

  BurningRash

  authored
  7d480ac

  Copy full SHA for 7d480ac

• uplink and store freshening (#26444)

  Show description for 9d5a399
  EmoGarbage404

  authored
  9d5a399

  Copy full SHA for 9d5a399

• Sterile swab dispenser instead of box (#24986)

  Show description for 3a00e8c
  deltanedas

  authored
  3a00e8c

  Copy full SHA for 3a00e8c

• Automatic changelog update

  PJBot

  committed
  2a5d23f

  Copy full SHA for 2a5d23f

• Strobes added (#26083)

  Show description for 279e01c
  Ko4ergaPunk

  authored
  279e01c

  Copy full SHA for 279e01c

• Automatic changelog update

  PJBot

  committed
  c8f75d9

  Copy full SHA for c8f75d9

• Translate Upstream #2036 (#2037)

  lapatison

  authored
  0181aa1

  Copy full SHA for 0181aa1

• Health analyzer UI unit correction (#26903)

  Show description for 998bf45
  TsjipTsjip

  authored
  998bf45

  Copy full SHA for 998bf45

• Fix the stripping menu being openable without StrippingComponent (#26908)

  DrSmugleaf

  authored
  24b6456

  Copy full SHA for 24b6456

Commits on Apr 13, 2024

• Fixed magboot activation distance (#26912)

  osjarw

  authored
  0a1ce9d

  Copy full SHA for 0a1ce9d

• Automatic changelog update

  PJBot

  committed
  2360376

  Copy full SHA for 2360376

• Uncooked animal proteins is safe for animal stomachs only (#26906)

  Show description for a49a576
  VasilisThePikachu

  authored
  a49a576

  Copy full SHA for a49a576

• Automatic changelog update

  PJBot

  committed
  5d00305

  Copy full SHA for 5d00305

• Fix incorrect "Cycled" and "Bolted" popups when (un)wielding a gun (#26924)

  DrSmugleaf

  authored
  b51482f

  Copy full SHA for b51482f

• Fix guns that spawn without a magazine looking like they have one (#26922)

  DrSmugleaf

  authored
  2d53cfe

  Copy full SHA for 2d53cfe

• Fixes polymorph cooldowns (#26914)

  Show description for d4b7bc5
  keronshb

  authored
  d4b7bc5

  Copy full SHA for d4b7bc5

• Automatic changelog update

  PJBot

  committed
  b086779

  Copy full SHA for b086779

• Removed Salv Borg Crusher Dagger (#26865)

  FungiFellow

  authored
  eeb460f

  Copy full SHA for eeb460f

• Fix pulling a new entity when already pulling an entity (#26499)

  Show description for 037a7d7
  ShadowCommander

  authored
  037a7d7

  Copy full SHA for 037a7d7

• Replace SetDamage call with TryChangeDamage in ImmovableRodSystem.cs (#26902)

  TsjipTsjip

  authored
  4833074

  Copy full SHA for 4833074

• Automatic changelog update

  PJBot

  committed
  154b860

  Copy full SHA for 154b860

• Fix for the salvage ice labs map. (#26928)

  Show description for 1bf97c9
  Boaz1111

  authored
  1bf97c9

  Copy full SHA for 1bf97c9

• Automatic changelog update

  PJBot

  committed
  ed065e8

  Copy full SHA for ed065e8

Commits on Apr 14, 2024

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

  Rxup

  committed
  7b4c54e

  Copy full SHA for 7b4c54e

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

  Rxup

  committed
  6b5f9bb

  Copy full SHA for 6b5f9bb

• upd

  Rxup

  committed
  72d0b78

  Copy full SHA for 72d0b78

• fix

  Rxup

  committed
  d4efd74

  Copy full SHA for d4efd74