Code

Upstream6#240

Code

Merged

Vonsant merged 73 commits intospace-syndicate:masterspace-syndicate/space-station-14-next:masterfrom FireNameFN:Upstream6FireNameFN/space-station-14-next:Upstream6Copy head branch name to clipboardJan 16, 2025

+153,645-108,661

Commits

Commits on Jan 12, 2025

• Fland Reporters Room (#34408)

  Show description for 72ddc50
  SlimmSlamm

  authored
  72ddc50

  Copy full SHA for 72ddc50

• Automatic changelog update

  PJBot

  committed
  8bc4c35

  Copy full SHA for 8bc4c35

• Add a high-capacity water tank to the janitor's closet of Oasis (#34366)

  Show description for 606e452
  Booblesnoot42

  authored
  606e452

  Copy full SHA for 606e452

Commits on Jan 13, 2025

• Darkened Service job interface icons for better contrast (#34270)

  Show description for 91bc1f8
  

  frobnic8

  and

  Erskin Cherry

  authored
  91bc1f8

  Copy full SHA for 91bc1f8

• Amber Station - Moved Vents Around (#34410)

  Show description for 5fff6bb
  southbridge-fur

  authored
  5fff6bb

  Copy full SHA for 5fff6bb

• Insuls Spawner (#34407)

  Show description for b00bf40
  

  southbridge-fur

  and

  slarticodefast

  authored
  b00bf40

  Copy full SHA for b00bf40

• Manual Valves Resprite (#34378)

  Show description for ac0a8d1
  

  Deerstop

  and

  Errant-4

  authored
  ac0a8d1

  Copy full SHA for ac0a8d1

• Automatic changelog update

  PJBot

  committed
  f2cd615

  Copy full SHA for f2cd615

• loop station door access fixes and air sink (#34414)

  Show description for 9cf4cba
  TytosB

  authored
  9cf4cba

  Copy full SHA for 9cf4cba

• Raise syndicate kobold reinforcement HP crit threshold from 75 to 100 to match monkey. (#34409)

  Show description for 182f0c0
  hyperDelegate

  authored
  182f0c0

  Copy full SHA for 182f0c0

• Anomaly dragging exploit fix and QOL changes (#34280)

  Show description for 423e48a
  JustinWinningham

  authored
  423e48a

  Copy full SHA for 423e48a

• Fixed doors being blocked with mousetraps, and other Collidable items (#34045)

  Show description for 25a01b0
  

  zHonys

  and

  Centronias

  authored
  25a01b0

  Copy full SHA for 25a01b0

• Fixed Jazz Instrument for Electric Guitars (#33363)

  Show description for de78bed
  Coolsurf6

  authored
  de78bed

  Copy full SHA for de78bed

• Automatic changelog update

  PJBot

  committed
  b308589

  Copy full SHA for b308589

• Porting Pride-O-Mat to Upstream (#34412)

  Show description for 6c41d96
  

  southbridge-fur

  and

  Dorragon

  authored
  6c41d96

  Copy full SHA for 6c41d96

• Automatic changelog update

  PJBot

  committed
  2bebaa7

  Copy full SHA for 2bebaa7

Commits on Jan 14, 2025

• Oasis Power Rebalance + Misc fixes (#34425)

  Show description for 8e7f440
  ArtisticRoomba

  authored
  8e7f440

  Copy full SHA for 8e7f440

• Update locale (space-syndicate#2928)

  Morb0

  authored
  8ad91b8

  Copy full SHA for 8ad91b8

• add server lobby names (space-syndicate#2932)

  lzk228

  authored
  2e6c149

  Copy full SHA for 2e6c149

• Fix IPIntel causing frequent errors with the cleanup job. (#34428)

  Show description for 13edd30
  

  VasilisThePikachu

  and

  PJB3005

  authored
  13edd30

  Copy full SHA for 13edd30

• craftable pet carrier (#34431)

  Show description for 786d4d5
  

  Killerqu00

  and

  slarticodefast

  authored
  786d4d5

  Copy full SHA for 786d4d5

• Automatic changelog update

  PJBot

  committed
  198dd82

  Copy full SHA for 198dd82

• Adds omnisexual pin (#34439)

  Show description for a967fc7
  

  juliangiebel

  and

  nikthechampiongr

  authored
  a967fc7

  Copy full SHA for a967fc7

• Fix bad Rider analysis error in AccessOverriderWindow.xaml.cs (#34213)

  PJB3005

  authored
  ca96aeb

  Copy full SHA for ca96aeb

• Disable meta-atlas for big rare RSIs (#33643)

  PJB3005

  authored
  47042cc

  Copy full SHA for 47042cc

• Persist deadmin to database, add admin suspension system (#34048)

  PJB3005

  authored
  c2e050c

  Copy full SHA for c2e050c

• Automatic changelog update

  PJBot

  committed
  99580e0

  Copy full SHA for 99580e0

Commits on Jan 15, 2025

• STAThread client content start (#34212)

  PJB3005

  authored
  2dead48

  Copy full SHA for 2dead48

• Minor client packaging changes (#33787)

  PJB3005

  authored
  e885a8f

  Copy full SHA for e885a8f

• Fix muzzle accent (#34419)

  themias

  authored
  771278d

  Copy full SHA for 771278d

• Automatic changelog update

  PJBot

  committed
  bb1a3c4

  Copy full SHA for bb1a3c4

• Add Discord webhook on watchlist connection (#33483)

  Palladinium

  authored
  8777925

  Copy full SHA for 8777925

• Automatic changelog update

  PJBot

  committed
  9d5ef57

  Copy full SHA for 9d5ef57

• Fixed Thief starting gear failing on specific bag inventories. (#34430)

  Show description for 332fc18
  Alpha-Two

  authored
  332fc18

  Copy full SHA for 332fc18

• Pearl Fix-Update (space-syndicate#2933)

  RinidOps

  authored
  6e205ad

  Copy full SHA for 6e205ad

• [Maps] Rename maps (space-syndicate#2935)

  Ko4ergaPunk

  authored
  77c1d27

  Copy full SHA for 77c1d27

• Added missing details from worn capes to head of department beadsheets (#34396)

  Show description for e446889
  Alpaccalypse

  authored
  e446889

  Copy full SHA for e446889

• Replace ERT Medic's Advanced Medkits with 2 Combat Medkits (#34380)

  Show description for d83b5ac
  Alpha-Two

  authored
  d83b5ac

  Copy full SHA for d83b5ac

• Fix nonsensical RegEx for name restriction (#34375)

  Show description for e752561
  HyperB1

  authored
  e752561

  Copy full SHA for e752561

• Remove the ability to print the station anchor circuit board (#34358)

  Show description for 922251a
  ArtisticRoomba

  authored
  922251a

  Copy full SHA for 922251a

• Automatic changelog update

  PJBot

  committed
  4d1581d

  Copy full SHA for 4d1581d

• Meta hotfix (#34306)

  Show description for d86bf06
  

  Nox38

  and

  ArtisticRoomba

  authored
  d86bf06

  Copy full SHA for d86bf06

• Merge Meta hotfix (#34306) into master (#34451)

  ScarKy0

  authored
  33c421b

  Copy full SHA for 33c421b

• Make Mime PDA interactions silent (#34426)

  Show description for d6e55ed
  ArtisticRoomba

  authored
  d6e55ed

  Copy full SHA for d6e55ed

• Automatic changelog update

  PJBot

  committed
  c4c00cd

  Copy full SHA for c4c00cd

• Smite vending machine (#34420)

  Show description for 3cac75f
  Alpaccalypse

  authored
  3cac75f

  Copy full SHA for 3cac75f

• Automatic changelog update

  PJBot

  committed
  2691071

  Copy full SHA for 2691071

• Printable bedsheets (#34034)

  Show description for 3dd9307
  kosticia

  authored
  3dd9307

  Copy full SHA for 3dd9307

• Automatic changelog update

  PJBot

  committed
  9ede1f3

  Copy full SHA for 9ede1f3

• Update RT to v239.0.1 (#34454)

  PJB3005

  authored
  fdb2f16

  Copy full SHA for fdb2f16

• Remove christmas anomaly spawn (#34053)

  Show description for 484af25
  TheShuEd

  authored
  484af25

  Copy full SHA for 484af25

• Automatic changelog update

  PJBot

  committed
  c6dbdc9

  Copy full SHA for c6dbdc9

• Remove baby jail (#34443)

  Show description for 6041c82
  VasilisThePikachu

  authored
  6041c82

  Copy full SHA for 6041c82

• Add a CCVar to allow from hiding admins in the reported player count. (#34406)

  Show description for 40fc499
  VasilisThePikachu

  authored
  40fc499

  Copy full SHA for 40fc499

• Automatic changelog update

  PJBot

  committed
  a7d5c8f

  Copy full SHA for a7d5c8f

• Fix Mixed puddles not updating slips when evap (#34303)

  Show description for c92c52f
  

  poklj

  and

  Centronias

  authored
  c92c52f

  Copy full SHA for c92c52f

• Automatic changelog update

  PJBot

  committed
  f01db3f

  Copy full SHA for f01db3f

• WizDen config update for IPIntel (#34457)

  PJB3005

  authored
  59a14b5

  Copy full SHA for 59a14b5

• Fix DNA scrambler updating station record (#34091)

  Show description for 6d218f2
  

  themias

  and

  slarticodefast

  authored
  6d218f2

  Copy full SHA for 6d218f2

• Automatic changelog update

  PJBot

  committed
  e094b79

  Copy full SHA for e094b79

Commits on Jan 16, 2025

• New and Modified Map Spawners (#34424)

  Show description for 87ff3a2
  southbridge-fur

  authored
  87ff3a2

  Copy full SHA for 87ff3a2

• Elkridge Depot Fixes Again (#34461)

  Show description for d0a2d7b
  Deerstop

  authored
  d0a2d7b

  Copy full SHA for d0a2d7b

• Space Ruins Variant (#34445)

  Show description for 0c1608d
  SlimmSlamm

  authored
  0c1608d

  Copy full SHA for 0c1608d

• Plasma Station (#33991)

  Show description for d0b2e46
  

  Compilatron144

  and

  Emisse

  authored
  d0b2e46

  Copy full SHA for d0b2e46

• Automatic changelog update

  PJBot

  committed
  37bde33

  Copy full SHA for 37bde33

• Plasma station population tweak (#34462)

  Show description for 83eb5dc
  

  Compilatron144

  and

  Emisse

  authored
  83eb5dc

  Copy full SHA for 83eb5dc

• Automatic changelog update

  PJBot

  committed
  85b9f91

  Copy full SHA for 85b9f91

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

  Show description for 996b761
  Morb0

  committed
  996b761

  Copy full SHA for 996b761

• Update locale

  Morb0

  committed
  1dffb09

  Copy full SHA for 1dffb09

• Update locale

  Morb0

  committed
  d29ea9b

  Copy full SHA for d29ea9b

• Disable lawyer on Plasma map

  Morb0

  committed
  671c52d

  Copy full SHA for 671c52d

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

  Show description for feaa11e
  Morb0

  authored
  feaa11e

  Copy full SHA for feaa11e

• Merge remote-tracking branch 'corvax/master' into Upstream6

  FireNameFN

  committed
  34ef573

  Copy full SHA for 34ef573