Code

Upstream sync#496

Code

Merged

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

+65,040-53,483

Commits

Commits on Feb 27, 2024

• APC sprite tweaks (#1896)

  SonicHDC

  authored
  08121bc

• Jug label name translation (#1895)

  lapatison

  authored
  a3b7e46

• Translate #1893 (#1894)

  lapatison

  authored
  c521d54

• Translate close-master-pr message workflow

  Morb0

  committed
  61a35a8

Commits on Feb 28, 2024

• NPC steering blending (#25666)

  Show description for f819404
  metalgearsloth

  authored
  f819404

• Automatic changelog update

  PJBot

  committed
  7341a3a

• Fix cuff interruption messages (#25677)

  nikthechampiongr

  authored
  221719c

• Add space heaters (#25250)

  Menshin

  authored
  9884351

• Syndicate Decoy Bundle + Snap Pops (#25333)

  Show description for 93d820f
  musicmanvr

  authored
  93d820f

• change laughin pea values (#25672)

  Show description for 013d125
  potato1234x

  authored
  013d125

• Automatic changelog update

  PJBot

  committed
  22ae277

• Fix iron/copper being overtuned (infinite blood exploit!) (#25678)

  Show description for b720871
  QuietlyWhisper

  authored
  b720871

• Automatic changelog update

  PJBot

  committed
  a91b445

• Makes the e-sword light plasma fires, as intended. (#25665)

  Show description for dddec4d
  Cojoke-dot

  authored
  dddec4d

• Add anchorable flags (#25667)

  Show description for 5425742
  metalgearsloth

  authored
  5425742

• Automatic changelog update

  PJBot

  committed
  e3f568e

• Remake cargo orders to contains flatpacks (#25647)

  Show description for ec28e77
  lzk228

  authored
  ec28e77

• Automatic changelog update

  PJBot

  committed
  e930583

• fix stray pixels on over ear headsets (#25675)

  Show description for b1ce9e9
  MACMAN2003

  authored
  b1ce9e9

• Fix cryostorage removing minds of players who have entered ghost role (#24991)

  Show description for ee614de
  c4llv07e

  authored
  ee614de

• Automatic changelog update

  PJBot

  committed
  3914e59

Commits on Feb 29, 2024

• Weld To Remove Rust On Reinforced Walls (#25690)

  Nairodian

  authored
  4446fd2

• Automatic changelog update

  PJBot

  committed
  ba4188a

• Remove Eris UI theme (#25673)

  Show description for ad72567
  UbaserB

  authored
  ad72567

• Automatic changelog update

  PJBot

  committed
  3966a65

• Refactor antag rule code (#23445)

  Show description for 4e6c59c
  

  3 peopleauthored
  4e6c59c

• Automatic changelog update

  PJBot

  committed
  a281efd

• train update (#25707)

  Emisse

  authored
  3d92e2b

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

  Show description for f135b32
  Morb0

  committed
  f135b32

• Update locale

  Morb0

  committed
  88e3459

• Generate locale

  Morb0

  committed
  2f1f6f4

• Fix tests

  Morb0

  committed
  a3c95a0

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

  Show description for 64510e0
  Morb0

  authored
  64510e0

• Fix locale (#1906)

  lzk228

  authored
  cdbeebe

• Update secret_weights.yml with survival (#1905)

  Deserty0

  authored
  973b00a

• Fix some skirts sprite (#1874)

  lzk228

  authored
  02c1d67

• Resprite uniforms and winter coat mime (#1898)

  DreamlyJack

  authored
  299d37b

• Resprite pumpkin head (#1901)

  GamaYouNow

  authored
  e5c96d6

• Fix typo (#25712)

  lzk228

  authored
  4bb5b23

• Buff Bulk Lizard Plushie Crate (#25122)

  Show description for e17acdc
  

  SpaceLizardSky

  and

  TheShuEd

  authored
  e17acdc

• Automatic changelog update

  PJBot

  committed
  af71f1e

• Fix admin queue bypass

  Morb0

  committed
  3f33c06

• Fix PDA home icon (#25721)

  Show description for 8c6c19c
  LordCarve

  authored
  8c6c19c

• survival nutribricks, lizzers can eat nutribricks, moffs can eat the leftovers (#25659)

  Show description for e4d98f1
  Aexxie

  authored
  e4d98f1

• Removes all big O2 tanks from non-emergency & fire lockers + removes counterpart N2 tanks (#25660)

  Show description for b0e811b
  Flareguy

  authored
  b0e811b

• Add fill levels to bowls (#25639)

  Show description for e274149
  potato1234x

  authored
  e274149

• Fix: Dragging items over atmos pipes is slow. (#25629)

  Show description for e3b0610
  

  Plykiya

  and

  Plykiya

  authored
  e3b0610

• Automatic changelog update

  PJBot

  committed
  7aa0bad

• Refactor AME to use ItemSlot for Fuel (#25558)

  Show description for c473910
  LordCarve

  authored
  c473910

• Update Patrons.yml (#25727)

  DrSmugleaf

  authored
  4301dbb

• Colourful curtains (#25684)

  Show description for 66cf642
  TheShuEd

  authored
  66cf642

• Automatic changelog update

  PJBot

  committed
  3caf580

• Under Toned Tail (#25685)

  Show description for ba8e92d
  Nairodian

  authored
  ba8e92d

• Decal Beautification + Palette Update (#25689)

  Show description for 0001c23
  Hanzdegloker

  authored
  0001c23

• Remove Grandpa from name list (#25725)

  Show description for 1037bfc
  Skarletto

  authored
  1037bfc

• Automatic changelog update

  PJBot

  committed
  b2902ff

• Minor .yaml cleanup (#25717)

  Show description for d479c85
  lapatison

  authored
  d479c85

• New Space Ruin: Syndicate Dropship (from /tg/) (also adds plastitanium windows) (#25723)

  Show description for 7b9346d
  Flareguy

  authored
  7b9346d

• Add handheld map to autolathe (#25719)

  lzk228

  authored
  df271f5

• Automatic changelog update

  PJBot

  committed
  650c04b

• Add detective to saltern (#25714)

  Show description for d0f943c
  SpaceLizardSky

  authored
  d0f943c

• Add alternative crafting recipes for reinforced plasma/uranium glass (#22804)

  Show description for db15efc
  MACMAN2003

  authored
  db15efc

• Automatic changelog update

  PJBot

  committed
  36d505b

• Add curtain spawner (#25729)

  Show description for 70307f9
  

  IamVelcroboy

  and

  BurningRash

  authored
  70307f9

Commits on Mar 1, 2024

• remove doorslam sound (#25737)

  EmoGarbage404

  authored
  2852483

• Cargo request console search now includes crate descriptions (#25708)

  Show description for c83ad11
  PolterTzi

  authored
  c83ad11

• make suicide actions require confirming (#24609)

  Show description for ad3f3a5
  deltanedas

  authored
  ad3f3a5

• Automatic changelog update

  PJBot

  committed
  0ba9df2

• Make the round end sound collection a cvar (#25741)

  Show description for 30ccde0
  DrSmugleaf

  authored
  30ccde0

• feat(chameleon): Chameleon verb only shows to the wearer (#25746)

  exincore

  authored
  1abd1f6

• Automatic changelog update

  PJBot

  committed
  a0d159b

• Translate Upstream #1907 (#1908)

  lapatison

  authored
  507a5b9

• Signs and posters tweaks (#1912)

  lapatison

  authored
  2ee56fa

• Resprite decoys + box sprite fixes (#1913)

  lzk228

  authored
  6a15081

• CryoSleep Access Fix (#25752)

  Show description for 5d94192
  Nairodian

  authored
  5d94192

• Automatic changelog update

  PJBot

  committed
  a4804db

• New item: Expensive coat (#25724)

  Show description for 8dedbf2
  Tunguso4ka

  authored
  8dedbf2

• Detective's rubber stamp (#25676)

  Show description for 81b0164
  IlyaElDunaev

  authored
  81b0164

• Automatic changelog update

  PJBot

  committed
  7a7e0e8

• Security Belts for Cadets (#25753)

  Nairodian

  authored
  c38b44e

• Localize hands interface (#1914)

  lzk228

  authored
  b2069ae

Commits on Mar 2, 2024

• Add test to check that there are no pending database model changes (#25762)

  DrSmugleaf

  authored
  2904ff4

• Additional Signage (#25766)

  Show description for 55b0cb1
  rosieposieeee

  authored
  55b0cb1

• Origin Station Update 01.03.2024 (CMO bedsheet) (#25756)

  brainfood1183

  authored
  2135fdf

• Automatic changelog update

  PJBot

  committed
  0fde3b0

• move space heaters into cargo (#25735)

  Show description for 9cdffb7
  EmoGarbage404

  authored
  9cdffb7

• Automatic changelog update

  PJBot

  committed
  1c628b2

• removes the free syndicate headset from the syndicate footsoldier (#25764)

  Flareguy

  authored
  a5200cc

• [Maps] Maus update (#1916)

  Show description for bbf8f70
  

  poeMota

  and

  KonChenY1

  authored
  bbf8f70

• [Maps] Silly update (#1915)

  Show description for c76c847
  

  poeMota

  and

  KonChenY1

  authored
  c76c847

• Fix ResearchSystem.Client UpdateClientInterface preconditions. (#25743)

  Show description for aaf5d0d
  

  exincore

  and

  EmoGarbage404

  authored
  aaf5d0d

• [Maps] Delta update (#1917)

  Show description for 8bce86d
  

  poeMota

  and

  KonChenY1

  authored
  8bce86d

• Weight based AreaInsert and Dumpable delay, a janitor qol tweak (#24899)

  Show description for c775410
  Krunklehorn

  authored
  c775410

• Automatic changelog update

  PJBot

  committed
  e7a806a

• Alerts for breathing plasma/tritium (#24484)

  Show description for ecd2d5a
  Errant-4

  authored
  ecd2d5a

• Automatic changelog update

  PJBot

  committed
  6476b62

• Remove 07 from emote chatsan (#25767)

  Show description for 3253499
  lzk228

  authored
  3253499

• Make the MRE wrapper count as trash (#25760)

  Show description for 2e60d33
  waylon531

  authored
  2e60d33

• Automatic changelog update

  PJBot

  committed
  709881f

• make thief a subgamemode (#25740)

  Show description for 7f060eb
  deltanedas

  authored
  7f060eb

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

  Rxup

  committed
  a4debfc

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

  Rxup

  committed
  f97454a

• upd

  Rxup

  committed
  5610405

• upd

  Rxup

  committed
  3e8ac18

• cleanup

  Rxup

  committed
  65b3673

• fix

  Rxup

  committed
  be1f6a1