Code

Upstream sync#1021

Code

Merged

Rxup merged 135 commits intomasterRxup/space-station-14:masterfrom upstream-syncRxup/space-station-14:upstream-syncCopy head branch name to clipboardFeb 4, 2025

+288,873-27,180

Commits

Commits on Jan 25, 2025

• delete radstorm locale (#34630)

  lzk228

  authored
  d410728

  Copy full SHA for d410728

• display the current version in the changelog window (#34556)

  Show description for ff27555
  MilonPL

  authored
  ff27555

  Copy full SHA for ff27555

Commits on Jan 26, 2025

• Update Credits (#34644)

  Show description for 2214857
  

  github-actions[bot]

  and

  PJBot

  authored
  2214857

  Copy full SHA for 2214857

• New solar sprites, new solar panel upgrades, and some solar panel fixes. (#29224)

  Show description for 2a632b2
  CaasGit

  authored
  2a632b2

  Copy full SHA for 2a632b2

• Automatic changelog update

  PJBot

  committed
  f0652d8

  Copy full SHA for f0652d8

• Added Unused HoS's Flask to HoS locker (#34658)

  Show description for 6240b9d
  Coolsurf6

  authored
  6240b9d

  Copy full SHA for 6240b9d

• Automatic changelog update

  PJBot

  committed
  7d0b135

  Copy full SHA for 7d0b135

Commits on Jan 27, 2025

• Fland Fix (#34670)

  Show description for e464736
  SlimmSlamm

  authored
  e464736

  Copy full SHA for e464736

• Reroute Meta station power, engineering cosmetic changes, minor fixes (#34669)

  Show description for 65fb71e
  ArtisticRoomba

  authored
  65fb71e

  Copy full SHA for 65fb71e

• Amber Station Changes (#34656)

  Show description for cc4f9dd
  southbridge-fur

  authored
  cc4f9dd

  Copy full SHA for cc4f9dd

• Box Station Changes (#34655)

  Show description for 61cd1f6
  southbridge-fur

  authored
  61cd1f6

  Copy full SHA for 61cd1f6

• Fix mv cable crate typo (#34673)

  Show description for 06a2dca
  DinnerCalzone

  authored
  06a2dca

  Copy full SHA for 06a2dca

• Plasma station patch 1 (#34602)

  Show description for 8ba4193
  

  Compilatron144

  and

  Emisse

  authored
  8ba4193

  Copy full SHA for 8ba4193

• Automatic changelog update

  PJBot

  committed
  5b6ef12

  Copy full SHA for 5b6ef12

• add a chem dispenser to the nukie planet (#34674)

  Show description for c1456e0
  ArtisticRoomba

  authored
  c1456e0

  Copy full SHA for c1456e0

• Adds better description to pneumatic valve and build menu description (#32655)

  Show description for 3e34601
  ArtisticRoomba

  authored
  3e34601

  Copy full SHA for 3e34601

• Automatic changelog update

  PJBot

  committed
  f9c74f3

  Copy full SHA for f9c74f3

• fixrotations - Modified Targetted Entities (#34638)

  southbridge-fur

  authored
  bbad147

  Copy full SHA for bbad147

• Fix match box (#34632)

  Show description for 88456a4
  Helm4142

  authored
  88456a4

  Copy full SHA for 88456a4

• Automatic changelog update

  PJBot

  committed
  5388414

  Copy full SHA for 5388414

• Hi-viz vest now actually hi-viz (#34087)

  Show description for 276ec74
  kosticia

  authored
  276ec74

  Copy full SHA for 276ec74

• Storage UI V2 (#33045)

  metalgearsloth

  authored
  fd25dac

  Copy full SHA for fd25dac

• Automatic changelog update

  PJBot

  committed
  1b9d84a

  Copy full SHA for 1b9d84a

• Added Pain Numbness Trait (#34538)

  Show description for 012c835
  Coolsurf6

  authored
  012c835

  Copy full SHA for 012c835

• Automatic changelog update

  PJBot

  committed
  66d9794

  Copy full SHA for 66d9794

• Update submodule to 241.0.0 (#34678)

  metalgearsloth

  authored
  79f8ea0

  Copy full SHA for 79f8ea0

• Add puddle drawdepth (#32369)

  Show description for 5733b47
  

  metalgearsloth

  and

  slarticodefast

  authored
  5733b47

  Copy full SHA for 5733b47

• Automatic changelog update

  PJBot

  committed
  cf40804

  Copy full SHA for cf40804

• Revert "Fix match box" (#34681)

  Show description for 25fba30
  TheShuEd

  authored
  25fba30

  Copy full SHA for 25fba30

• update .editorconfig (#34677)

  MilonPL

  authored
  d1b2884

  Copy full SHA for d1b2884

• Make crew monitor update blips at consistent rates (#32555)

  eoineoineoin

  authored
  b1f83fb

  Copy full SHA for b1f83fb

• Added the ability for pAIs and station maps to be stored in engineering belts (#33048)

  Show description for be5b20e
  

  august-sun

  and

  august-sun

  authored
  be5b20e

  Copy full SHA for be5b20e

• Automatic changelog update

  PJBot

  committed
  24486da

  Copy full SHA for 24486da

• Engineering guidebook megaupdate v2 (#33062)

  Show description for 98c606d
  ArtisticRoomba

  authored
  98c606d

  Copy full SHA for 98c606d

• Automatic changelog update

  PJBot

  committed
  0b78e17

  Copy full SHA for 0b78e17

• Omega: fix cryo pipe (#34663)

  Show description for cab9871
  NakataRin

  authored
  cab9871

  Copy full SHA for cab9871

• Add more escape pods on Packed (#34628)

  Show description for 69eccc4
  CheesePlated

  authored
  69eccc4

  Copy full SHA for 69eccc4

• Storage sidebar fix (#34680)

  metalgearsloth

  authored
  3e091c4

  Copy full SHA for 3e091c4

• Add conditional camera offset based on cursor - Hristov Rework, Part 1 (#31626)

  SlamBamActionman

  authored
  5c782d3

  Copy full SHA for 5c782d3

• Automatic changelog update

  PJBot

  committed
  18cc84a

  Copy full SHA for 18cc84a

Commits on Jan 28, 2025

• Amber Station Stuff (#34686)

  Show description for c212273
  southbridge-fur

  authored
  c212273

  Copy full SHA for c212273

• Fake mindshield componentry and Implanter (#34079)

  Show description for c504588
  poklj

  authored
  c504588

  Copy full SHA for c504588

• Automatic changelog update

  PJBot

  committed
  f42ed32

  Copy full SHA for f42ed32

• reworking the chunked telecomms salv ruin (#34529)

  Show description for 3d3b95a
  

  TytosB

  and

  TytosB

  authored
  3d3b95a

  Copy full SHA for 3d3b95a

• loop update (#34688)

  Show description for 7594ed5
  Emisse

  authored
  7594ed5

  Copy full SHA for 7594ed5

• bagel update (#34690)

  Show description for 6287cd8
  Emisse

  authored
  6287cd8

  Copy full SHA for 6287cd8

• Fix airsensors not having a nitrogen threshold (#34689)

  ArtisticRoomba

  authored
  bd34568

  Copy full SHA for bd34568

• Buff frezon to acceptable values, pending a frezon rework (#34049)

  Show description for 2e03ef1
  ArtisticRoomba

  authored
  2e03ef1

  Copy full SHA for 2e03ef1

• Automatic changelog update

  PJBot

  committed
  f69f5c1

  Copy full SHA for f69f5c1

• Stun baton precise attack thrust animation (#34693)

  Show description for c71a995
  K-Dynamic

  authored
  c71a995

  Copy full SHA for c71a995

• Automatic changelog update

  PJBot

  committed
  b422d08

  Copy full SHA for b422d08

• Add disposal units to marathon chapelroid (#34709)

  Show description for afb884b
  CheesePlated

  authored
  afb884b

  Copy full SHA for afb884b

• Oasis: add some emergency O2/N2 lockers (#34715)

  Show description for d1c98b0
  

  Orange-Winds

  and

  spelka

  authored
  d1c98b0

  Copy full SHA for d1c98b0

Commits on Jan 29, 2025

• Removes radioactive suppermatter from Plasma Station (#34726)

  Show description for 67812ce
  Compilatron144

  authored
  67812ce

  Copy full SHA for 67812ce

• New salvage ruin: the ruined prison ship (#34651)

  Show description for 565ba4a
  

  TytosB

  and

  TytosB

  authored
  565ba4a

  Copy full SHA for 565ba4a

• Buff savlage vault-medium-1's loot (#34732)

  Show description for bb99ff2
  

  TytosB

  and

  TytosB

  authored
  bb99ff2

  Copy full SHA for bb99ff2

• drozd visual update (#34574)

  Show description for bde4e32
  Emisse

  authored
  bde4e32

  Copy full SHA for bde4e32

• Automatic changelog update

  PJBot

  committed
  1f57f05

  Copy full SHA for 1f57f05

• Nuke Timer MinimumTime (#34734)

  Show description for 55bffa8
  southbridge-fur

  authored
  55bffa8

  Copy full SHA for 55bffa8

• Automatic changelog update

  PJBot

  committed
  f743ec1

  Copy full SHA for f743ec1

• Fix thrust animation rotation (#34713)

  Show description for 8a12017
  themias

  authored
  8a12017

  Copy full SHA for 8a12017

• Automatic changelog update

  PJBot

  committed
  ebf045e

  Copy full SHA for ebf045e

• Fix vulture spawning additional salvage debris (#34593)

  Show description for 55ee0a4
  slarticodefast

  authored
  55ee0a4

  Copy full SHA for 55ee0a4

• Nukie briefing fix (#34737)

  Show description for a480c22
  Errant-4

  authored
  a480c22

  Copy full SHA for a480c22

• Sentient medibot now can inject (#32110)

  Show description for aea4e3c
  

  godisdeadLOL

  and

  YourUsername

  authored
  aea4e3c

  Copy full SHA for aea4e3c

• Criminal Records Computer Better UX + Filtering (#32352)

  Show description for b942438
  

  jamessimo

  and

  chromiumboy

  authored
  b942438

  Copy full SHA for b942438

• Added some more borg names (#32502)

  Show description for c3f1f71
  Starbuckss14

  authored
  c3f1f71

  Copy full SHA for c3f1f71

• Automatic changelog update

  PJBot

  committed
  786d3be

  Copy full SHA for 786d3be

• Update ScalingViewport for Engine PR (#28786)

  ElectroJr

  authored
  3ad8337

  Copy full SHA for 3ad8337

• Update submodule to 242.0.0 (#34739)

  metalgearsloth

  authored
  5fe94f8

  Copy full SHA for 5fe94f8

• fix stop bleeding popup (#34729)

  Show description for 467b686
  lzk228

  authored
  467b686

  Copy full SHA for 467b686

• Fix RoleTimeRequirement localization (#34735)

  Show description for da75258
  

  TheShuEd

  and

  slarticodefast

  authored
  da75258

  Copy full SHA for da75258

• reworking chem and adding psychology to loop (#34749)

  Show description for 9319e09
  

  TytosB

  and

  TytosB

  authored
  9319e09

  Copy full SHA for 9319e09

• Fix shuttle console angular velocity (#34748)

  slarticodefast

  authored
  e938512

  Copy full SHA for e938512

Commits on Jan 30, 2025

• Syndicate and CentComm Radio Implanters (#33533)

  Show description for 84328ee
  

  thetolbean

  and

  slarticodefast

  authored
  84328ee

  Copy full SHA for 84328ee

• Automatic changelog update

  PJBot

  committed
  54ce3d7

  Copy full SHA for 54ce3d7

• New Highpop map: Convex recreational complex (#33346)

  Show description for a07df05
  Spessmann

  authored
  a07df05

  Copy full SHA for a07df05

• Automatic changelog update

  PJBot

  committed
  e286baa

  Copy full SHA for e286baa

• Update cigarette.yml (#34756)

  Show description for 60e8337
  DR-DOCTOR-EVIL-EVIL

  authored
  60e8337

  Copy full SHA for 60e8337

• Seperate EMAG into EMAG and Authentication Disruptor (#34337)

  ScarKy0

  authored
  253a9fb

  Copy full SHA for 253a9fb

• Automatic changelog update

  PJBot

  committed
  a13eaa3

  Copy full SHA for a13eaa3

• Astro Asteroid Sand (#34463)

  Show description for 1af53b1
  

  southbridge-fur

  and

  Aeshus

  authored
  1af53b1

  Copy full SHA for 1af53b1

• Automatic changelog update

  PJBot

  committed
  163a55c

  Copy full SHA for 163a55c

• The Goliath Hardsuit (#34721)

  Show description for 4085fe7
  

  august-sun

  and

  august-sun

  authored
  4085fe7

  Copy full SHA for 4085fe7

• Automatic changelog update

  PJBot

  committed
  f4c648f

  Copy full SHA for f4c648f

• make RefreshOverlay default to the player session (#32354)

  MilonPL

  authored
  3a51f11

  Copy full SHA for 3a51f11

• Loop station minor tweaks (#34758)

  Show description for 036bf9e
  TytosB

  authored
  036bf9e

  Copy full SHA for 036bf9e

• Juice that makes you go boom (#34730)

  Show description for c360a97
  Velken

  authored
  c360a97

  Copy full SHA for c360a97

• Automatic changelog update

  PJBot

  committed
  21ed0da

  Copy full SHA for 21ed0da

• Adjust inventory size of ginormous scrap (#33454)

  Show description for cccdd88
  SpaceRox1244

  authored
  cccdd88

  Copy full SHA for cccdd88

• Automatic changelog update

  PJBot

  committed
  cd46a39

  Copy full SHA for cd46a39

• After getting banned, you now have to re-read the rules! (#33270)

  Show description for bc1d642
  beck-thompson

  authored
  bc1d642

  Copy full SHA for bc1d642

• More robust Particle Accelerator menu (retry) (#34037)

  Show description for dbbfab1
  

  c4llv07e

  and

  SpyDev14

  authored
  dbbfab1

  Copy full SHA for dbbfab1

• Serializable emag flags (#34766)

  Show description for ca297f5
  ScarKy0

  authored
  ca297f5

  Copy full SHA for ca297f5

• Fix Double Muzzle Flash (#33981)

  Show description for 5af13ae
  

  sleepyyapril

  and

  ElectroJr

  authored
  5af13ae

  Copy full SHA for 5af13ae

• Automatic changelog update

  PJBot

  committed
  d7d91eb

  Copy full SHA for d7d91eb

• fix BankClientComponent never updating (#33123)

  Show description for 5be5ee9
  MilonPL

  authored
  5be5ee9

  Copy full SHA for 5be5ee9

• Add history tab to bounty console (#33932)

  Show description for 1859214
  BarryNorfolk

  authored
  1859214

  Copy full SHA for 1859214

• Automatic changelog update

  PJBot

  committed
  5fbda2a

  Copy full SHA for 5fbda2a

• Minor shotgun changes and comments for future changes (#33512)

  Show description for 1cbfc7d
  K-Dynamic

  authored
  1cbfc7d

  Copy full SHA for 1cbfc7d

• Automatic changelog update

  PJBot

  committed
  992d695

  Copy full SHA for 992d695

• Fixed: Ore now correctly drops the right amount of ore (#34557)

  Show description for dd252e6
  beck-thompson

  authored
  dd252e6

  Copy full SHA for dd252e6

• Automatic changelog update

  PJBot

  committed
  6b62257

  Copy full SHA for 6b62257

• Implement mrp rule changes pursuant to community votes (#34772)

  nikthechampiongr

  authored
  aa83689

  Copy full SHA for aa83689

• Fake Mindshield Implant cleans itself up on draw (#34718)

  Show description for abcd682
  poklj

  authored
  abcd682

  Copy full SHA for abcd682

Commits on Jan 31, 2025

• Void's Applause (#34591)

  Show description for 6565ba5
  

  keronshb

  and

  slarticodefast

  authored
  6565ba5

  Copy full SHA for 6565ba5

• Automatic changelog update

  PJBot

  committed
  b7d3c08

  Copy full SHA for b7d3c08

• Meta Station - Armory restock + fixes (#34717)

  Show description for aa71ace
  Nox38

  authored
  aa71ace

  Copy full SHA for aa71ace

• Box Armory Restock (#34750)

  Show description for ef23820
  Nox38

  authored
  ef23820

  Copy full SHA for ef23820

• Automatic changelog update

  PJBot

  committed
  1110397

  Copy full SHA for 1110397

• Removed MoMMI from AI name list (#34785)

  Show description for 60c3c8f
  FungiFellow

  authored
  60c3c8f

  Copy full SHA for 60c3c8f

• Tweak pill eat delays (#34764)

  Show description for b07327c
  SlamBamActionman

  authored
  b07327c

  Copy full SHA for b07327c

• Automatic changelog update

  PJBot

  committed
  9edfaa6

  Copy full SHA for 9edfaa6

• #34771 Fix door system assuming all door layer states are in single RSIs (#34775)

  Show description for 60f531b
  

  FairlySadPanda

  and

  slarticodefast

  authored
  60f531b

  Copy full SHA for 60f531b

• Merge staging into master (#34788)

  slarticodefast

  authored
  d45b713

  Copy full SHA for d45b713

• Fix stunbaton component namespace (#34790)

  Show description for c8c0821
  LMSNoise

  authored
  c8c0821

  Copy full SHA for c8c0821

• Criminal records bugfix (#34747)

  Show description for 6a5a5c7
  iaada

  authored
  6a5a5c7

  Copy full SHA for 6a5a5c7

• Update shutter sounds (#34774)

  themias

  authored
  b2299bf

  Copy full SHA for b2299bf

• Automatic changelog update

  PJBot

  committed
  b33590c

  Copy full SHA for b33590c

• Rename shields (#34794)

  Nox38

  authored
  3622518

  Copy full SHA for 3622518

• Automatic changelog update

  PJBot

  committed
  b61b24d

  Copy full SHA for b61b24d

Commits on Feb 1, 2025

• Marathon Armory Restock (#34798)

  Show description for 9e9c9b9
  Nox38

  authored
  9e9c9b9

  Copy full SHA for 9e9c9b9

• Automatic changelog update

  PJBot

  committed
  efa77f4

  Copy full SHA for efa77f4

• Box Chemistry change (#34803)

  ToxicSonicFan04

  authored
  59e53dc

  Copy full SHA for 59e53dc

• Automatic changelog update

  PJBot

  committed
  79ef8a5

  Copy full SHA for 79ef8a5

• Replacing protein with razorium in flesh kudzu (#32821)

  Show description for 207aa5f
  

  NazrinNya

  and

  slarticodefast

  authored
  207aa5f

  Copy full SHA for 207aa5f

• Automatic changelog update

  PJBot

  committed
  c139701

  Copy full SHA for c139701

• Separates frost oil into coldsauce and frost oil (#34458)

  Boaz1111

  authored
  db1b0a9

  Copy full SHA for db1b0a9

• Automatic changelog update

  PJBot

  committed
  ce10a1b

  Copy full SHA for ce10a1b

• Randomized maints rooms (#33619)

  Show description for 6beb8e4
  Spessmann

  authored
  6beb8e4

  Copy full SHA for 6beb8e4

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

  KayzelW

  committed
  ecbe0d3

  Copy full SHA for ecbe0d3

• Update CODEOWNERS

  KayzelW

  committed
  838ad3c

  Copy full SHA for 838ad3c

Commits on Feb 2, 2025

• Update DrawDepth.cs

  KayzelW

  committed
  a9f0ab6

  Copy full SHA for a9f0ab6

• fix

  KayzelW

  committed
  80bbd61

  Copy full SHA for 80bbd61

• Update holoprojectors.yml

  KayzelW

  committed
  9909772

  Copy full SHA for 9909772