Code

[Tweak] Upstream sync#985

Code

Merged

Rxup merged 127 commits intoRxup:masterRxup/space-station-14:masterfrom Roudenn:upstream-syncRoudenn/space-station-14:upstream-syncCopy head branch name to clipboardDec 23, 2024

+363,109-31,148

Commits

Commits on Dec 14, 2024

• Cherry-pick to stable: Amber Station - Playtest Fixes (#33773) (#33811)

  Show description for a3fc690
  

  Errant-4

  and

  southbridge-fur

  authored
  a3fc690

Commits on Dec 15, 2024

• [Maps] Pilgrim hotfix Rxup#2 (#2860)

  Ko4ergaPunk

  authored
  366baae

• Resprite botany food (#2858)

  SonicHDC

  authored
  5e736bd

• Separate RGlass recipe for autolathe and ore processor (#33876)

  Tayrtahn

  authored
  5958801

Commits on Dec 16, 2024

• Fix spacelaw loadout (#2861)

  lzk228

  authored
  4745cdd

• Rename Dungeon Master Laws to not run into copyright problems (#33678)

  Show description for 46d288c
  

  Litraxx

  and

  Litrax

  authored
  46d288c

• Zombies can see Initial Infected (#33665)

  Show description for 5e8db16
  psykana

  authored
  5e8db16

• Automatic changelog update

  PJBot

  committed
  e0a1db6

• Automatic changelog update

  PJBot

  committed
  51a45ae

• Bug fixes for Store UIs with multiple currencies (#33565)

  Show description for 1266b05
  TGRCdev

  authored
  1266b05

• Cluster grenade refactor and contra markings (#31108)

  Show description for a4d6f09
  Plykiya

  authored
  a4d6f09

• Automatic changelog update

  PJBot

  committed
  612f8be

• Wizard Mind Swap Spell (#33416)

  Show description for cd23805
  

  3 peopleauthored
  cd23805

• add SpawnTableOnUse (#32620)

  Show description for 2635888
  deltanedas

  authored
  2635888

• LightOnCollide entityquery (#33886)

  metalgearsloth

  authored
  386e431

• Add generator scrap (Plasma / uranium scrap) (#32198)

  Show description for 1967827
  beck-thompson

  authored
  1967827

• Add a test to check that lathe recipes are possible (#33868)

  Show description for cf73885
  Tayrtahn

  authored
  cf73885

• Automatic changelog update

  PJBot

  committed
  d532333

• Make Jolene TTS voice female (#2834)

  Morb0

  authored
  06ed3db

• Update configs (#2855)

  lzk228

  authored
  712e5fa

• New Year Music (#2829)

  AwareFoxy

  authored
  8a798d2

• Revert "Удаление лимита времени для доступа к стартовым ролям." (#2652)

  lzk228

  authored
  ac0bae5

• Automatic changelog update

  IanComradeBot

  committed
  389c461

• Automatic changelog update

  IanComradeBot

  committed
  3448634

• Fix udder wooly reagent creation V2 (#32905)

  Show description for 1f42413
  

  3 peopleauthored
  1f42413

• Automatic changelog update

  PJBot

  committed
  852b3e9

• [Maps] Glacier new year update (#2864)

  NotSoDana

  authored
  4b7be5d

• Prevent pulling when teleporting (#33252)

  Show description for 01c1d8f
  

  thetolbean

  and

  slarticodefast

  authored
  01c1d8f

• Automatic changelog update

  PJBot

  committed
  2a6800f

• Add an in-hand sprite for the lizard plushie (#32583)

  Show description for 881e4d3
  KieueCaprie

  authored
  881e4d3

• Automatic changelog update

  PJBot

  committed
  1368092

• Makes admins not count towards the playercount cap (#33424)

  Show description for d8afcdc
  

  deathride58

  and

  Aeshus

  authored
  d8afcdc

• Automatic changelog update

  PJBot

  committed
  782a297

• Add the Zombie, a new cocktail (#32802)

  dragonryan06

  authored
  1e80dd2

• Automatic changelog update

  PJBot

  committed
  046dde7

• Add Holy damage (#32755)

  Show description for 95328da
  SlamBamActionman

  authored
  95328da

• Automatic changelog update

  PJBot

  committed
  c35505c

• Add Explosion Resistance to SecBelts (#33253)

  Show description for 17e3ef3
  Vexerot

  authored
  17e3ef3

• Automatic changelog update

  PJBot

  committed
  74f873a

• Chem master UI (#33328)

  Show description for 2ccd471
  

  Intoxicating-Innocence

  and

  SaphireLattice

  authored
  2ccd471

• Spaceshroom grilling (#31872)

  Show description for db69ae6
  goet

  authored
  db69ae6

• Automatic changelog update

  PJBot

  committed
  001b0ed

• Figures can now be activated remotely (#32769)

  Show description for 74e9576
  beck-thompson

  authored
  74e9576

• Automatic changelog update

  PJBot

  committed
  9eda08c

• Flora clean up (#33839)

  Show description for af7e552
  TheShuEd

  authored
  af7e552

• Christmas anomaly (#33889)

  Show description for 36c6767
  

  3 peopleauthored
  36c6767

• Automatic changelog update

  PJBot

  committed
  f476526

Commits on Dec 17, 2024

• Atmospheric network monitor (#32294)

  Show description for 27e59d3
  chromiumboy

  authored
  27e59d3

• Automatic changelog update

  PJBot

  committed
  038ba39

• Amber station updates (#33899)

  Show description for d90f6ce
  southbridge-fur

  authored
  d90f6ce

• Gate map (#32032)

  Show description for a77fcde
  TheShuEd

  authored
  a77fcde

• Automatic changelog update

  PJBot

  committed
  67e5cc2

• Zombies keep their anomalies on zombification (#33867)

  Show description for 8f2d16a
  pcaessayrs

  authored
  8f2d16a

• Automatic changelog update

  PJBot

  committed
  0d31b8c

• Anomaly Scanner In-hand Sprites (#33427)

  Show description for 32164c2
  

  TiniestShark

  and

  Aeshus

  authored
  32164c2

• Automatic changelog update

  PJBot

  committed
  ab84479

• HOTFIX: Add [MRP] tag to the hostname for Salamander (#33909)

  slarticodefast

  authored
  0fc2cca

• [Maps] Outpost fix (#2866)

  Show description for 97e9564
  

  kvant8

  and

  kvak-8

  authored
  97e9564

• [Maps] Outpost hot fix (#2869)

  Show description for 476c7c5
  

  kvant8

  and

  kvak-8

  authored
  476c7c5

• Oasis - remove vox box (#33912)

  Show description for 332f870
  Errant-4

  authored
  332f870

• Core - remove vox box (#33911)

  Show description for bbf5369
  Errant-4

  authored
  bbf5369

• Holopads (#32711)

  Show description for 7780b86
  chromiumboy

  authored
  7780b86

• Automatic changelog update

  PJBot

  committed
  616ddc1

• Test can now run on stable prs (#33914)

  Show description for fb6e85e
  VasilisThePikachu

  authored
  fb6e85e

• Merge main and stable back together

  SaphireLattice

  committed
  3fe576b

• Fix horrible lag in Zombies mode (#33818)

  psykana

  authored
  59e955a

• Master merge: Fix horrible lag in Zombies mode (#33818) (#33917)

  VasilisThePikachu

  authored
  77a4cda

• Gate map: Holopads added (#33918)

  Show description for 8fbaffe
  TheShuEd

  authored
  8fbaffe

• Holopads + Atmos Network Console for Bagel (#33921)

  Show description for a55d26e
  ScarKy0

  authored
  a55d26e

• [MAPS] Avrite ERT fix (#2868)

  CaptainMaru

  authored
  d0cba0d

• Update PR size labeler line counts (#33915)

  Show description for 984b290
  slarticodefast

  authored
  984b290

• Fix AME power generation (#32825)

  Show description for a9cf54a
  Golinth

  authored
  a9cf54a

• Automatic changelog update

  PJBot

  committed
  27cb17f

• Adds Advanced SMES, an SMES with higher capacity for mapping (#33757)

  Show description for e7330ec
  

  ArtisticRoomba

  and

  ScarKy0

  authored
  e7330ec

Commits on Dec 18, 2024

• Automatic changelog update

  PJBot

  committed
  5863cfc

• Ground Light Post Crafting Description Fix (#33920)

  Show description for aaec1e6
  TiniestShark

  authored
  aaec1e6

• Fix admins not being able to health scan slimes (#33884)

  slarticodefast

  authored
  908e476

• Automatic changelog update

  PJBot

  committed
  ecc2ede

• Amber Station - Added Holopads, Atmos Monitoring, and Advanced SMESes (#33923)

  Show description for 122e307
  southbridge-fur

  authored
  122e307

• Bagel Power Rebalance + Gas Pipe Sensors (#33925)

  Show description for 91b85be
  ArtisticRoomba

  authored
  91b85be

• Omega Update (Holopads & Engi Stuff) (#33926)

  Show description for 8b0b822
  spanky-spanky

  authored
  8b0b822

• Box Power Rebalance + Holopads, Gas Pipe Sensors (#33929)

  Show description for 42f7279
  ArtisticRoomba

  authored
  42f7279

• Cargo Shuttle/ATS Update (#33927)

  Show description for 50fddd0
  spanky-spanky

  authored
  50fddd0

• Cog Power Rebalance + Holopads, Gas Pipe Sensors (#33930)

  Show description for 9f0a8aa
  ArtisticRoomba

  authored
  9f0a8aa

• Fland Power Rebalance + Gas Pipe Sensors (#33933)

  Show description for 1c0db47
  ArtisticRoomba

  authored
  1c0db47

• Make safes craftable (#32694)

  Show description for 6c925d2
  

  lzk228

  and

  TyAshley

  authored
  6c925d2

• Automatic changelog update

  PJBot

  committed
  94594de

• Holopad prototypes for mapping (#33931)

  Show description for 87f39af
  ScarKy0

  authored
  87f39af

• Reduce network burden of the hunger system (#32986)

  Show description for 6b99493
  Centronias

  authored
  6b99493

• Only disable panicbunker for admins with AdminFlags.Admin (#33879)

  Show description for e7294bd
  slarticodefast

  authored
  e7294bd

• Automatic changelog update

  PJBot

  committed
  337ef6c

• Fix hugging buckled mobs instead of unbuckling (#33635)

  Show description for 8359541
  MilenVolf

  authored
  8359541

• Automatic changelog update

  PJBot

  committed
  d01839a

• Replace Cellular Slime mob damage with Caustic (#33104)

  Show description for 659bc8f
  SlamBamActionman

  authored
  659bc8f

• Automatic changelog update

  PJBot

  committed
  97a2e0d

• Mercenary gear contraband tweaks. (#33647)

  Show description for c1558f6
  

  3 peopleauthored
  c1558f6

• Automatic changelog update

  PJBot

  committed
  b649517

• Sprite Movement working with AI movement (#33494)

  Show description for 18fe8b9
  TheShuEd

  authored
  18fe8b9

• New Drazil plushie (inverse lizard plushie) (#33776)

  Show description for 345adcd
  ArtisticRoomba

  authored
  345adcd

• Automatic changelog update

  PJBot

  committed
  4fe69f2

• Localized holopads for Cog (#33937)

  Show description for 8a0edad
  ScarKy0

  authored
  8a0edad

• Marathon Power Rebalance + Gas Pipe Sensors, Holopads (#33938)

  Show description for 52117fd
  ArtisticRoomba

  authored
  52117fd

• Localized holopads for Bagel (#33934)

  Show description for 18de5ea
  ScarKy0

  authored
  18de5ea

• Packed Update (Holopads & Engi Stuff) (#33940)

  Show description for 6f42ebf
  spanky-spanky

  authored
  6f42ebf

• Localized holopads + atmos network for Oasis (#33941)

  Show description for fa6de41
  ScarKy0

  authored
  fa6de41

• Reach/Cargo Update (Holopads & Atmos) (#33943)

  Show description for 8f36d7d
  spanky-spanky

  authored
  8f36d7d

Commits on Dec 19, 2024

• [Christmas] Y'all want a Smite Cranberry? (#33922)

  Show description for c33d335
  FairlySadPanda

  authored
  c33d335

• Automatic changelog update

  PJBot

  committed
  383ecdd

• Comment LogTypes (#33497)

  Show description for f7bf694
  

  Winkarst-cpu

  and

  Winkarst

  authored
  f7bf694

• Show battery level for selected devices in Power Monitoring Console (#33854)

  Show description for 9de569d
  

  ArtisticRoomba

  and

  Crotalus

  authored
  9de569d

• Automatic changelog update

  PJBot

  committed
  e70a3b8

• Omega Update (Localized Holopads) (#33946)

  Show description for e7d5ab6
  spanky-spanky

  authored
  e7d5ab6

• Amber Statio - Localized Holopads and Balance Updates (#33948)

  Show description for 943be3e
  southbridge-fur

  authored
  943be3e

• Meta Power Rebalance + Gas Pipe Sensors, Holopads (#33949)

  Show description for 28fa7ce
  ArtisticRoomba

  authored
  28fa7ce

• Packed Power Rebalance + Gas Sensors Adjustments (#33955)

  Show description for c1b229a
  ArtisticRoomba

  authored
  c1b229a

• Omega Power Rebalance (#33956)

  Show description for 66ea113
  ArtisticRoomba

  authored
  66ea113

• New mid pop station: Loop (#33697)

  Show description for 043510f
  

  TytosB

  and

  Emisse

  authored
  043510f

• Automatic changelog update

  PJBot

  committed
  2581c24

• [MAPS] Paper tweak (#2871)

  XsenonDash

  authored
  4d401dd

• [Maps] Astra Hotfix (#2870)

  lastPechkin

  authored
  3ff4447

• Food Container Size Increase (#33842)

  Show description for ef45c16
  SpaceLizard24

  authored
  ef45c16

• Logic Gate Compatibility with Non-Logic Signals bugfix (#33792)

  Show description for 128721e
  Centronias

  authored
  128721e

• Automatic changelog update

  PJBot

  committed
  efa76be

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

  Roudenn

  committed
  3488775

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

  Roudenn

  committed
  bb38e9e

• fix upstream

  Show description for 1be2c8c
  Roudenn

  committed
  1be2c8c

Commits on Dec 23, 2024

• fix upstream

  Show description for a579559
  Rxup

  committed
  a579559