Code

Upstream sync#512

Code

Merged

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

+3,137-2,137

Commits

Commits on Mar 12, 2024

• Update Core (#25927)

  Show description for dc0e4ad
  UbaserB

  authored
  dc0e4ad

  Copy full SHA for dc0e4ad

• Add logs to recycler gibbing and broadcasting. (#26008)

  Show description for 2b8415b
  

  nikthechampiongr

  and

  ShadowCommander

  authored
  2b8415b

  Copy full SHA for 2b8415b

• Automatic changelog update

  PJBot

  committed
  c8fce85

  Copy full SHA for c8fce85

• Enable multiple Solution Editor windows (#26005)

  Show description for 0da09db
  

  SlamBamActionman

  and

  ShadowCommander

  authored
  0da09db

  Copy full SHA for 0da09db

• Fix arrivals not docking on spinning stations (#26033)

  Show description for 9e2e514
  ShadowCommander

  authored
  9e2e514

  Copy full SHA for 9e2e514

• Automatic changelog update

  PJBot

  committed
  afc04a4

  Copy full SHA for afc04a4

• Remove random Cyrillic characters from locale files (#26043)

  arimah

  authored
  ffd52b2

  Copy full SHA for ffd52b2

• kobolds no longer die at 40 hp (#25984)

  Show description for ad99564
  Dutch-VanDerLinde

  authored
  ad99564

  Copy full SHA for ad99564

• Buff Zombie Infection (#25954)

  Show description for 56ac86a
  liltenhead

  authored
  56ac86a

  Copy full SHA for 56ac86a

• Automatic changelog update

  PJBot

  committed
  44224a3

  Copy full SHA for 44224a3

• new haircut alternative (brought back old one) (#25935)

  Show description for 76db710
  UnicornOnLSD

  authored
  76db710

  Copy full SHA for 76db710

• Automatic changelog update

  PJBot

  committed
  b0c65a0

  Copy full SHA for b0c65a0

• Nuke Music start adjusted for duration (#25946)

  Show description for 680cf5f
  Errant-4

  authored
  680cf5f

  Copy full SHA for 680cf5f

• Fix rounds restarting in the next round (#25856)

  Show description for 02cc9c0
  metalgearsloth

  authored
  02cc9c0

  Copy full SHA for 02cc9c0

• Improvised shell crafting recipe (#25545)

  Show description for 6260e4b
  

  FungiFellow

  and

  metalgearsloth

  authored
  6260e4b

  Copy full SHA for 6260e4b

• Automatic changelog update

  PJBot

  committed
  10b7da2

  Copy full SHA for 10b7da2

Commits on Mar 13, 2024

• skeleton minplayers restriction (#26050)

  NakataRin

  authored
  b49f77f

  Copy full SHA for b49f77f

• Automatic changelog update

  PJBot

  committed
  ed461f5

  Copy full SHA for ed461f5

• Remove recycling for Syndicate implanters (#26047)

  Show description for a8e1489
  SlamBamActionman

  authored
  a8e1489

  Copy full SHA for a8e1489

• Fix Sky Blue carpet making red tables (#26049)

  Show description for 559d7ac
  Gyrandola

  authored
  559d7ac

  Copy full SHA for 559d7ac

• Automatic changelog update

  PJBot

  committed
  9e15526

  Copy full SHA for 9e15526

• Remove butchering popup when clicking own sprite with a knife (#26051)

  Show description for 4e57f19
  Gyrandola

  authored
  4e57f19

  Copy full SHA for 4e57f19

• Automatic changelog update

  PJBot

  committed
  44819d6

  Copy full SHA for 44819d6

• Add fancy table spawner (#26044)

  Show description for f5f5eeb
  

  IamVelcroboy

  and

  BurningRash

  authored
  f5f5eeb

  Copy full SHA for f5f5eeb

• Attempt at a more noticably whispered bubble (#25602)

  Show description for 4f698a6
  maylokana

  authored
  4f698a6

  Copy full SHA for 4f698a6

• Automatic changelog update

  PJBot

  committed
  855def1

  Copy full SHA for 855def1

• Fix cream pie bomb when eaten or sliced (#25928)

  Show description for 0d0edbb
  Slava0135

  authored
  0d0edbb

  Copy full SHA for 0d0edbb

• Automatic changelog update

  PJBot

  committed
  15a4243

  Copy full SHA for 15a4243

• Adds Senior role drip to the Uniform Printer. (#25668)

  Show description for af57006
  Cojoke-dot

  authored
  af57006

  Copy full SHA for af57006

• Automatic changelog update

  PJBot

  committed
  dc53c23

  Copy full SHA for dc53c23

• More fax logging (#25911)

  Show description for c27c708
  

  3 peopleauthored
  c27c708

  Copy full SHA for c27c708

• Grey Matter Addition and Slime Organ Tweak (#25464)

  Show description for 471dfed
  FungiFellow

  authored
  471dfed

  Copy full SHA for 471dfed

• Syringe doafter based on Syringe contents (#25890)

  Show description for 37cd125
  

  Plykiya

  and

  Plykiya

  authored
  37cd125

  Copy full SHA for 37cd125

• Automatic changelog update

  PJBot

  committed
  e624a79

  Copy full SHA for e624a79

• Changed names of uplink categories and swapped around items (#25079)

  Show description for aabf030
  SlamBamActionman

  authored
  aabf030

  Copy full SHA for aabf030

• Automatic changelog update

  PJBot

  committed
  a773182

  Copy full SHA for a773182

• Cycle injector transfer amount on alt. use (#25566)

  Show description for ad6ac73
  veprolet

  authored
  ad6ac73

  Copy full SHA for ad6ac73

• Automatic changelog update

  PJBot

  committed
  67d4fee

  Copy full SHA for 67d4fee

• Zombie wideswing and misc fix (#26064)

  Show description for 3981173
  

  Dutch-VanDerLinde

  and

  metalgearsloth

  authored
  3981173

  Copy full SHA for 3981173

• Fix Butcherable handling, ItemSlots for clown shoes (#25661)

  Show description for 674b42b
  Krunklehorn

  authored
  674b42b

  Copy full SHA for 674b42b

• Automatic changelog update

  PJBot

  committed
  3e04ed4

  Copy full SHA for 3e04ed4

• Automatic changelog update

  PJBot

  committed
  4691620

  Copy full SHA for 4691620

• Contraband Storage Crate (#25974)

  Show description for 49c8193
  

  PursuitInAshes

  and

  metalgearsloth

  authored
  49c8193

  Copy full SHA for 49c8193

• Fixed bug with appearance of ammo battery magazine guns (#26009)

  Show description for 6323238
  778b

  authored
  6323238

  Copy full SHA for 6323238

• Automatic changelog update

  PJBot

  committed
  5b72f3f

  Copy full SHA for 5b72f3f

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

  Morb0

  committed
  837a7f9

  Copy full SHA for 837a7f9

• Update locale

  Morb0

  committed
  d0528cb

  Copy full SHA for d0528cb

• Fix placement mode on chairs (#26041)

  Show description for bcc1476
  

  IamVelcroboy

  and

  BurningRash

  authored
  bcc1476

  Copy full SHA for bcc1476

• foxes are now neutral🦊 (#25992)

  Show description for 86ab7a1
  icekot8

  authored
  86ab7a1

  Copy full SHA for 86ab7a1

• The lawyer finally gets a stamp (#26012)

  Show description for 61b3eb4
  Mangohydra

  authored
  61b3eb4

  Copy full SHA for 61b3eb4

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

  Show description for 04a7b72
  Morb0

  authored
  04a7b72

  Copy full SHA for 04a7b72

• Fix vox custom sprites (#25989)

  Show description for 8a77722
  Errant-4

  authored
  8a77722

  Copy full SHA for 8a77722

• Make fireaxe & shotgun cabinets destructible (#25962)

  Show description for 6574681
  Gyrandola

  authored
  6574681

  Copy full SHA for 6574681

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

  Rxup

  committed
  8b9c0a7

  Copy full SHA for 8b9c0a7

• upd

  Rxup

  committed
  e5be692

  Copy full SHA for e5be692

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

  Rxup

  committed
  f6c1601

  Copy full SHA for f6c1601