Code

Upstream sync#1809

Code

Merged

Morb0 merged 40 commits intomasterspace-syndicate/space-station-14:masterfrom upstream-syncspace-syndicate/space-station-14:upstream-syncCopy head branch name to clipboardJan 27, 2024

+6,252-653

Commits

Commits on Jan 26, 2024

• Mime hardsuit (#24198)

  Show description for dedb77f
  

  ERORR404V1

  and

  lzk228

  authored
  dedb77f

  Copy full SHA for dedb77f

• Automatic changelog update

  PJBot

  committed
  669e449

  Copy full SHA for 669e449

• Reset LastProduce after plant removal (#24590)

  deltanedas

  authored
  9a7b8be

  Copy full SHA for 9a7b8be

• Grammar fix (#24599)

  Psychpsyo

  authored
  abcdfbe

  Copy full SHA for abcdfbe

Commits on Jan 27, 2024

• Remove EShield from Traitor uplink, Nerf EShield price in Nukie uplink. (#24571)

  LordEclipse

  authored
  e3b47a9

  Copy full SHA for e3b47a9

• Add an inhand sprite to the syndicate jaws of life (#24583)

  Show description for 15edca2
  icekot8

  authored
  15edca2

  Copy full SHA for 15edca2

• Automatic changelog update

  PJBot

  committed
  bd042d4

  Copy full SHA for bd042d4

• Holoprojectors are cool for officers and Dec (#24582)

  Show description for d02aa51
  Agoichi

  authored
  d02aa51

  Copy full SHA for d02aa51

• Automatic changelog update

  PJBot

  committed
  1560655

  Copy full SHA for 1560655

• Fix color tags in admin logs (#24606)

  Tayrtahn

  authored
  149654b

  Copy full SHA for 149654b

• Rock and Meat anom rework (try 2) (#24449)

  Show description for de9d7ae
  TheShuEd

  authored
  de9d7ae

  Copy full SHA for de9d7ae

• Automatic changelog update

  PJBot

  committed
  41c0efe

  Copy full SHA for 41c0efe

• Make PACMANs a little better (#24604)

  Show description for f855cb2
  PJB3005

  authored
  f855cb2

  Copy full SHA for f855cb2

• Automatic changelog update

  PJBot

  committed
  76a76eb

  Copy full SHA for 76a76eb

• ERT, DeathSquad and Central Command Officer Inital Infected immunity (#23601)

  Show description for bb828af
  Simyon264

  authored
  bb828af

  Copy full SHA for bb828af

• Make shotgun slug ammo not useless (#24196)

  Show description for 2611536
  Blackern5000

  authored
  2611536

  Copy full SHA for 2611536

• Automatic changelog update

  PJBot

  committed
  eabe1f6

  Copy full SHA for eabe1f6

• fix singulo combining debug assert (#24602)

  Show description for 4f186fc
  deltanedas

  authored
  4f186fc

  Copy full SHA for 4f186fc

• Add the minimumPlayers parameter to the ZombieOutbreak event (#24577)

  I-JustUser-I

  authored
  6ee4935

  Copy full SHA for 6ee4935

• Automatic changelog update

  PJBot

  committed
  93dd183

  Copy full SHA for 93dd183

• Add more advertising messages (#24219)

  UbaserB

  authored
  6b5788e

  Copy full SHA for 6b5788e

• Biodome satellite ruin (#24608)

  Show description for eca3d0b
  UbaserB

  authored
  eca3d0b

  Copy full SHA for eca3d0b

• Keep reagent dispenser inventory ordered (#24304)

  Show description for 4ee7349
  quatre

  authored
  4ee7349

  Copy full SHA for 4ee7349

• Default navmap to show departments (#24613)

  mirrorcult

  authored
  34eb691

  Copy full SHA for 34eb691

• Automatic changelog update

  PJBot

  committed
  639a453

  Copy full SHA for 639a453

• Repairable vending machines (#24603)

  Show description for be09538
  Tayrtahn

  authored
  be09538

  Copy full SHA for be09538

• Automatic changelog update

  PJBot

  committed
  23999b3

  Copy full SHA for 23999b3

• Gravity anomaly rework (#24452)

  Show description for a923beb
  TheShuEd

  authored
  a923beb

  Copy full SHA for a923beb

• Hallway textscreens (#24189)

  Show description for 7e16ee0
  graevy

  authored
  7e16ee0

  Copy full SHA for 7e16ee0

• Automatic changelog update

  PJBot

  committed
  70a6345

  Copy full SHA for 70a6345

• Admin Observers get a hat slot and a pda (#20183)

  VasilisThePikachu

  authored
  69d9d9f

  Copy full SHA for 69d9d9f

• Powered light sprite glows with color of their pointlight (#24612)

  mirrorcult

  authored
  4ab6970

  Copy full SHA for 4ab6970

• Automatic changelog update

  PJBot

  committed
  ddf1ec0

  Copy full SHA for ddf1ec0

• Pka shuttle projectiles now actually break rocks in one hit (#24627)

  Show description for b5e010f
  Boaz1111

  authored
  b5e010f

  Copy full SHA for b5e010f

• Automatic changelog update

  PJBot

  committed
  82fa771

  Copy full SHA for 82fa771

• Bartender limited reagents fixup (#24598)

  Show description for 8fc9650
  Hanzdegloker

  authored
  8fc9650

  Copy full SHA for 8fc9650

• Align sprite rear view (#24584)

  Show description for a8989c0
  africalimedrop

  authored
  a8989c0

  Copy full SHA for a8989c0

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

  Show description for 06e45fb
  Morb0

  committed
  06e45fb

  Copy full SHA for 06e45fb

• Fix Astra map

  Morb0

  committed
  0726764

  Copy full SHA for 0726764

• Update locale

  Morb0

  committed
  d9aac14

  Copy full SHA for d9aac14