Code

Upstream sync#1003

Code

Merged

Rxup merged 86 commits intomasterRxup/space-station-14:masterfrom upstream-syncRxup/space-station-14:upstream-syncCopy head branch name to clipboardJan 12, 2025

+24,203-16,491

Commits

Commits on Jan 4, 2025

• Add Elkridge Depot into Map Rotation (#34206)

  Show description for 53a9e09
  Deerstop

  authored
  53a9e09

  Copy full SHA for 53a9e09

• Automatic changelog update

  PJBot

  committed
  983cfa8

  Copy full SHA for 983cfa8

• Packed Update (#34208)

  Show description for 357d365
  spanky-spanky

  authored
  357d365

  Copy full SHA for 357d365

• Apply forensics when loading with an ammo box (#32280)

  themias

  authored
  b2b3b22

  Copy full SHA for b2b3b22

• Automatic changelog update

  PJBot

  committed
  41bcdd7

  Copy full SHA for 41bcdd7

Commits on Jan 5, 2025

• Update Credits (#34220)

  Show description for 9532b61
  

  github-actions[bot]

  and

  PJBot

  authored
  9532b61

  Copy full SHA for 9532b61

• Fix rainbow lizard plushie inhands (#34128)

  Show description for 0639a49
  ArtisticRoomba

  authored
  0639a49

  Copy full SHA for 0639a49

• wielding refactor/fixes (#32188)

  Show description for 0aebc76
  

  3 peopleauthored
  0aebc76

  Copy full SHA for 0aebc76

• Automatic changelog update

  PJBot

  committed
  6f16291

  Copy full SHA for 6f16291

• Lobby chat width and custom lobby titles (#33783)

  Show description for a55dc4d
  

  3 peopleauthored
  a55dc4d

  Copy full SHA for a55dc4d

• Automatic changelog update

  PJBot

  committed
  c536094

  Copy full SHA for c536094

• Adds bullet collision to station lights (#34070)

  Show description for 6b674e7
  SpaceRox1244

  authored
  6b674e7

  Copy full SHA for 6b674e7

• Automatic changelog update

  PJBot

  committed
  eecdd82

  Copy full SHA for eecdd82

Commits on Jan 6, 2025

• Oasis Update (#34245)

  Show description for 87d1ed9
  IProduceWidgets

  authored
  87d1ed9

  Copy full SHA for 87d1ed9

• Amber Station - Minor Fixes (#34246)

  Show description for 8083f88
  southbridge-fur

  authored
  8083f88

  Copy full SHA for 8083f88

• Make station anchor hitbox less insufferable (#34217)

  ArtisticRoomba

  authored
  ea99542

  Copy full SHA for ea99542

• Automatic changelog update

  PJBot

  committed
  4882ba2

  Copy full SHA for 4882ba2

Commits on Jan 7, 2025

• Remove kessler and zombeteors gamemodes from the secret pool (#34051)

  Show description for b6599d3
  ArtisticRoomba

  authored
  b6599d3

  Copy full SHA for b6599d3

• Automatic changelog update

  PJBot

  committed
  02d89d9

  Copy full SHA for 02d89d9

• Added distinct ad and bye chatter to Dr. Gibb vending (#34182)

  Show description for 43db40c
  Alpaccalypse

  authored
  43db40c

  Copy full SHA for 43db40c

• Implement approved rule changes (#34233)

  nikthechampiongr

  authored
  2d78b6c

  Copy full SHA for 2d78b6c

• Special reagents now appear in the guidebook (#34265)

  Show description for b4e2a36
  Alpaccalypse

  authored
  b4e2a36

  Copy full SHA for b4e2a36

• Automatic changelog update

  PJBot

  committed
  aa458a2

  Copy full SHA for aa458a2

• Implement approved rule changes (#34233)

  

  nikthechampiongr

  authored and

  VasilisThePikachu

  committed
  4a3d3ef

  Copy full SHA for 4a3d3ef

• Fix compilation errors in tests from update (#34272)

  Show description for af75c1a
  PJB3005

  authored
  af75c1a

  Copy full SHA for af75c1a

• Fix portable scrubber appearing powered on spawn (#34274)

  Tayrtahn

  authored
  483ac50

  Copy full SHA for 483ac50

• [HOTFIX] Fix chameleon PDAs renaming IDs (#34249)

  Show description for 3238c2e
  SlamBamActionman

  authored
  3238c2e

  Copy full SHA for 3238c2e

• [HOTFIX] Fix Meta station power (#34256)

  Show description for e0163fb
  ArtisticRoomba

  authored
  e0163fb

  Copy full SHA for e0163fb

• merge stable to master (#34279)

  slarticodefast

  authored
  45e0b9e

  Copy full SHA for 45e0b9e

Commits on Jan 8, 2025

• Update vessel_warning.ogg (#34263)

  Show description for 90b4669
  Pangogie

  authored
  90b4669

  Copy full SHA for 90b4669

• Add bleating accent to goats (#34273)

  Tayrtahn

  authored
  23f0b30

  Copy full SHA for 23f0b30

• Automatic changelog update

  PJBot

  committed
  4d26ea6

  Copy full SHA for 4d26ea6

• Happy New Year (#34288)

  Show description for 0109246
  Piras314

  authored
  0109246

  Copy full SHA for 0109246

• Amber Station - Balance Improvements (#34294)

  Show description for 8945ac3
  southbridge-fur

  authored
  8945ac3

  Copy full SHA for 8945ac3

• Fixed Loop Station's southern solar array unlinked airlocks (#34296)

  Show description for c1aaf64
  flymo5678

  authored
  c1aaf64

  Copy full SHA for c1aaf64

• Fix empty lines in adminwho with stealthmins. (#34122)

  Show description for 904d75c
  c4llv07e

  authored
  904d75c

  Copy full SHA for 904d75c

• Automatic changelog update

  PJBot

  committed
  60e1c6f

  Copy full SHA for 60e1c6f

• Added missing cameras to Loop Station (#34308)

  Show description for ba9eed7
  flymo5678

  authored
  ba9eed7

  Copy full SHA for ba9eed7

Commits on Jan 9, 2025

• Amber Station - Fixes and Warm Lights (#34324)

  Show description for e0b2d00
  southbridge-fur

  authored
  e0b2d00

  Copy full SHA for e0b2d00

• Automatic changelog update

  PJBot

  committed
  fdbb3c8

  Copy full SHA for fdbb3c8

• change locking to use ComplexInteraction (#34326)

  Show description for 0498498
  deltanedas

  authored
  0498498

  Copy full SHA for 0498498

• Automatic changelog update

  PJBot

  committed
  66810ef

  Copy full SHA for 66810ef

• Drink titles and soda vendor consistency (#34178)

  Show description for 36cbd07
  Alpaccalypse

  authored
  36cbd07

  Copy full SHA for 36cbd07

• Automatic changelog update

  PJBot

  committed
  abf7f62

  Copy full SHA for abf7f62

Commits on Jan 10, 2025

• Fix access configurator debug assert (#34330)

  Show description for dd28f17
  ScarKy0

  authored
  dd28f17

  Copy full SHA for dd28f17

• Renamed water melon juice to watermelon juice (#34341)

  Alpaccalypse

  authored
  b42a015

  Copy full SHA for b42a015

• Fix battery charging stopping just short of being full (#34028)

  Errant-4

  authored
  0b1ed3e

  Copy full SHA for 0b1ed3e

• Add copy threshold button to air alarms (#34346)

  southbridge-fur

  authored
  edbc861

  Copy full SHA for edbc861

• Automatic changelog update

  PJBot

  committed
  ac2eb88

  Copy full SHA for ac2eb88

• Oasis updoot the dimmining (#34347)

  Show description for 0bc1715
  IProduceWidgets

  authored
  0bc1715

  Copy full SHA for 0bc1715

• Fland Station - Dirt Fix (#34352)

  Show description for 869ecb2
  southbridge-fur

  authored
  869ecb2

  Copy full SHA for 869ecb2

• Omega Station - Dirt Fix (#34353)

  Show description for 4b1b4c0
  southbridge-fur

  authored
  4b1b4c0

  Copy full SHA for 4b1b4c0

• Marathon Station - Dirt Fix (#34354)

  Show description for ad59eea
  southbridge-fur

  authored
  ad59eea

  Copy full SHA for ad59eea

• Cog Station - Dirt Fix (#34355)

  Show description for 915234a
  southbridge-fur

  authored
  915234a

  Copy full SHA for 915234a

• Box Station - Dirt Fix (#34356)

  Show description for 65655e7
  southbridge-fur

  authored
  65655e7

  Copy full SHA for 65655e7

• Bagel Station - Dirt Fix (#34357)

  Show description for 1c2fcf0
  southbridge-fur

  authored
  1c2fcf0

  Copy full SHA for 1c2fcf0

• Packed Station - Dirt Fix (#34351)

  Show description for dff9abf
  southbridge-fur

  authored
  dff9abf

  Copy full SHA for dff9abf

• Replace some sound PlayEntity with PlayPvs (#34317)

  ElectroJr

  authored
  7ae7821

  Copy full SHA for 7ae7821

• Fixed Forensic Gloves to be Security Contraband (#34193)

  Show description for 87e18b9
  Coolsurf6

  authored
  87e18b9

  Copy full SHA for 87e18b9

• Automatic changelog update

  PJBot

  committed
  fa720a0

  Copy full SHA for fa720a0

• add large instruments to the cargo request computer (#34240)

  Show description for d1f6531
  

  TeenSarlacc

  and

  TeenSarlacc

  authored
  d1f6531

  Copy full SHA for d1f6531

• Automatic changelog update

  PJBot

  committed
  0cd2d82

  Copy full SHA for 0cd2d82

• Fix crayon losing durability on stamped paper (#34202)

  themias

  authored
  fbe6168

  Copy full SHA for fbe6168

• Automatic changelog update

  PJBot

  committed
  45d47da

  Copy full SHA for 45d47da

• Adds a border to Oppenhopper poster (#34219)

  Show description for f06ea5d
  

  Spessmann

  and

  slarticodefast

  authored
  f06ea5d

  Copy full SHA for f06ea5d

• Trim trailing newlines from examine messages (#33381)

  Show description for bbb551a
  SpaceManiac

  authored
  bbb551a

  Copy full SHA for bbb551a

• Add a popup message when ghost Boo action does nothing (#34369)

  Tayrtahn

  authored
  fdc0853

  Copy full SHA for fdc0853

Commits on Jan 11, 2025

• fix ghost_component.ftl locale grammar (#34372)

  Show description for 5deab7d
  ArtisticRoomba

  authored
  5deab7d

  Copy full SHA for 5deab7d

• Let ghosts sometimes make certain devices say creepy things (#34368)

  Show description for c6e4d19
  Tayrtahn

  authored
  c6e4d19

  Copy full SHA for c6e4d19

• Automatic changelog update

  PJBot

  committed
  10b778f

  Copy full SHA for 10b778f

• Add directional escape pod sign (#34367)

  minus1over12

  authored
  3439b77

  Copy full SHA for 3439b77

• Make indestructible tiles not breakable by explosions (#34339)

  Show description for cfb2317
  poklj

  authored
  cfb2317

  Copy full SHA for cfb2317

• Automatic changelog update

  PJBot

  committed
  458d3ff

  Copy full SHA for 458d3ff

• Arachnid stomach organ yaml fix (#34298)

  Show description for 2fcfc82
  0x6273

  authored
  2fcfc82

  Copy full SHA for 2fcfc82

• Automatic changelog update

  PJBot

  committed
  d5ce3e8

  Copy full SHA for d5ce3e8

• Bended radiator (#34251)

  justdie12

  authored
  afd5ce3

  Copy full SHA for afd5ce3

• Automatic changelog update

  PJBot

  committed
  6be4fba

  Copy full SHA for 6be4fba

• Remove Entity<T> data-fields (#34083)

  ElectroJr

  authored
  1c315ba

  Copy full SHA for 1c315ba

• Update submodule, .NET 9 (#34320)

  PJB3005

  authored
  3da3543

  Copy full SHA for 3da3543

• Role Types (#33420)

  Show description for 46d58bf
  

  Errant-4

  and

  slarticodefast

  authored
  46d58bf

  Copy full SHA for 46d58bf

• Automatic changelog update

  PJBot

  committed
  e271a5a

  Copy full SHA for e271a5a

Commits on Jan 12, 2025

• Update Credits (#34389)

  Show description for ea0b04a
  

  github-actions[bot]

  and

  PJBot

  authored
  ea0b04a

  Copy full SHA for ea0b04a

• Elkridge Depot Improvements (#34377)

  Show description for d9e4ed2
  Deerstop

  authored
  d9e4ed2

  Copy full SHA for d9e4ed2

• Fix force-feeding Loc strings not using target's gender (#34276)

  Tayrtahn

  authored
  924f64e

  Copy full SHA for 924f64e

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

  KayzelW

  committed
  b8362d7

  Copy full SHA for b8362d7

• Update SpookySpeakerSystem.cs

  KayzelW

  committed
  8c98985

  Copy full SHA for 8c98985