Code

Upstream sync#1787

Code

Merged

Morb0 merged 107 commits intomasterspace-syndicate/space-station-14:masterfrom upstream-syncspace-syndicate/space-station-14:upstream-syncCopy head branch name to clipboardJan 21, 2024

+19,193-15,509

Commits

Commits on Jan 17, 2024

• Fix comp.Owner (#24206)

  Partmedia

  authored
  ad23306

  Copy full SHA for ad23306

• Repairable shuttles (#24193)

  Show description for 2c0e1fc
  TheShuEd

  authored
  2c0e1fc

  Copy full SHA for 2c0e1fc

• Automatic changelog update

  PJBot

  committed
  4536bad

  Copy full SHA for 4536bad

Commits on Jan 18, 2024

• Do not log missing components in OpenableSystem (#24208)

  Show description for 1e9eab0
  Partmedia

  authored
  1e9eab0

  Copy full SHA for 1e9eab0

• fix flippo not igniting plasma (#24207)

  Show description for a61e24a
  TheGoudaMan

  authored
  a61e24a

  Copy full SHA for a61e24a

• Automatic changelog update

  PJBot

  committed
  a32f0da

  Copy full SHA for a32f0da

• Use old reagent dispenser beaker slot ID (#24209)

  Show description for 7a7d001
  0x6273

  authored
  7a7d001

  Copy full SHA for 7a7d001

• reach update (#24211)

  Emisse

  authored
  eefec00

  Copy full SHA for eefec00

• Fix error when starting a DoAfter while handling one on the same entity (#24218)

  Show description for 9ad1ae5
  DrSmugleaf

  authored
  9ad1ae5

  Copy full SHA for 9ad1ae5

• Golden honker glow (#24230)

  Show description for 9968cc1
  UbaserB

  authored
  9968cc1

  Copy full SHA for 9968cc1

• Paramedic void suit is now a soft suit. (#24229)

  Show description for 08c2cac
  UbaserB

  authored
  08c2cac

  Copy full SHA for 08c2cac

• Carrots now properly contain Oculine (#24228)

  Show description for 882e277
  UbaserB

  authored
  882e277

  Copy full SHA for 882e277

• Automatic changelog update

  PJBot

  committed
  e3bcdcc

  Copy full SHA for e3bcdcc

• Automatic changelog update

  PJBot

  committed
  9882827

  Copy full SHA for 9882827

• Add pacifism description and clean up traits a little (#24216)

  Show description for da7ed4b
  UbaserB

  authored
  da7ed4b

  Copy full SHA for da7ed4b

• make terminator immune to rev and zombie (#24239)

  Show description for 4315531
  deltanedas

  authored
  4315531

  Copy full SHA for 4315531

• Fix solution corruption when grinding a stack of items (#24242)

  Show description for 20dadf4
  Tayrtahn

  authored
  20dadf4

  Copy full SHA for 20dadf4

• Add fill visuals and inhand sprites to water bottle (#24240)

  Show description for 6931848
  themias

  authored
  6931848

  Copy full SHA for 6931848

• Fix entity menu grouping and sorting (#24243)

  Show description for 9b97c7f
  koteq

  authored
  9b97c7f

  Copy full SHA for 9b97c7f

• Automatic changelog update

  PJBot

  committed
  d470528

  Copy full SHA for d470528

• Wrap objective briefing text (#24244)

  Partmedia

  authored
  0d53dad

  Copy full SHA for 0d53dad

• Fix drink examine text (#24241)

  Partmedia

  authored
  3506e67

  Copy full SHA for 3506e67

• More sprite movement states (#24237)

  Show description for 0c944ed
  themias

  authored
  0c944ed

  Copy full SHA for 0c944ed

Commits on Jan 19, 2024

• Finally fix cryostorage duping (#24251)

  EmoGarbage404

  authored
  ea299ca

  Copy full SHA for ea299ca

• Automatic changelog update

  PJBot

  committed
  38eaf9e

  Copy full SHA for 38eaf9e

• Spawn guidebooks on random bookshelves (#24036)

  lapatison

  authored
  21b7b11

  Copy full SHA for 21b7b11

• Automatic changelog update

  PJBot

  committed
  b543c05

  Copy full SHA for b543c05

• fix gas canister names (#24252)

  Show description for f69f3e0
  EmoGarbage404

  authored
  f69f3e0

  Copy full SHA for f69f3e0

• Add trade stations (#23863)

  Show description for a7388e5
  metalgearsloth

  authored
  a7388e5

  Copy full SHA for a7388e5

• Automatic changelog update

  PJBot

  committed
  c01b5a3

  Copy full SHA for c01b5a3

• Update submodule to 207.0.0 (#24255)

  metalgearsloth

  authored
  5887745

  Copy full SHA for 5887745

• Title2 (#24254)

  Show description for 61704f0
  Emisse

  authored
  61704f0

  Copy full SHA for 61704f0

• Automatic changelog update

  PJBot

  committed
  b94265a

  Copy full SHA for b94265a

• Botany guide chemicals (#24194)

  IlyaElDunaev

  authored
  09b3a44

  Copy full SHA for 09b3a44

• Adjust produce (#24220)

  UbaserB

  authored
  f0b21e2

  Copy full SHA for f0b21e2

• Fix salvage wreck names (#24256)

  Show description for 4b77d55
  UbaserB

  authored
  4b77d55

  Copy full SHA for 4b77d55

• Rework wheelchairbound (#24173)

  Show description for 243491d
  metalgearsloth

  authored
  243491d

  Copy full SHA for 243491d

• Make super bite burger easier to craft (#24231)

  Show description for 8cc24c9
  UbaserB

  authored
  8cc24c9

  Copy full SHA for 8cc24c9

• Change the station map dot color to cyan (#24082)

  Show description for c35b996
  

  iacore

  and

  iacore

  authored
  c35b996

  Copy full SHA for c35b996

• Restart votes check player count and ghost levels (#23453)

  Show description for 7bf62f1
  Titian3

  authored
  7bf62f1

  Copy full SHA for 7bf62f1

• Run fixgridatmos on trading outpost (#24264)

  metalgearsloth

  authored
  129892f

  Copy full SHA for 129892f

• Automatic changelog update

  PJBot

  committed
  217e865

  Copy full SHA for 217e865

• Add ability to put spesos into cargo console (#24263)

  Show description for ad23fac
  metalgearsloth

  authored
  ad23fac

  Copy full SHA for ad23fac

• Automatic changelog update

  PJBot

  committed
  8aeeacc

  Copy full SHA for 8aeeacc

• Added defib to Brigmed on Box (#24269)

  Krunklehorn

  authored
  170467c

  Copy full SHA for 170467c

• Moved Gemini's Brigmed defib to the inside (#24273)

  Krunklehorn

  authored
  fd9c654

  Copy full SHA for fd9c654

• Added defib to Brigmed on Origin (#24272)

  Krunklehorn

  authored
  27005d7

  Copy full SHA for 27005d7

• Added defib to Brigmed on Meta (#24271)

  Krunklehorn

  authored
  caed22b

  Copy full SHA for caed22b

• Clear cargo orders on approval (#24278)

  metalgearsloth

  authored
  f82fd23

  Copy full SHA for f82fd23

• Update Trading Outpost (#24281)

  Show description for 8364086
  UbaserB

  authored
  8364086

  Copy full SHA for 8364086

• Fix gun bolt crash (#24283)

  Show description for b535909
  metalgearsloth

  authored
  b535909

  Copy full SHA for b535909

• Automatic changelog update

  PJBot

  committed
  95815c7

  Copy full SHA for 95815c7

• Improve light tube sprites (#24270)

  Show description for e3d5dc4
  UbaserB

  authored
  e3d5dc4

  Copy full SHA for e3d5dc4

• Actually fix carrot oculine this time (#24290)

  Show description for bdb1399
  UbaserB

  authored
  bdb1399

  Copy full SHA for bdb1399

• Destruction & impact sound rework pass 1 (#24282)

  Show description for 818b07e
  mirrorcult

  authored
  818b07e

  Copy full SHA for 818b07e

• Automatic changelog update

  PJBot

  committed
  884c866

  Copy full SHA for 884c866

• Can emag artifact crusher (#23957)

  Show description for fd673cf
  SpeltIncorrectyl

  authored
  fd673cf

  Copy full SHA for fd673cf

• Automatic changelog update

  PJBot

  committed
  f44661c

  Copy full SHA for f44661c

• Adds more grindables (#24267)

  Show description for 16a1f2f
  Flareguy

  authored
  16a1f2f

  Copy full SHA for 16a1f2f

• Fix reagents obtained from grinding iron ore. (#24215)

  Show description for 08c7386
  UbaserB

  authored
  08c7386

  Copy full SHA for 08c7386

• Mustard, ketchup and mayonnaise now tastes distinct (#24297)

  Show description for a6e16d9
  UbaserB

  authored
  a6e16d9

  Copy full SHA for a6e16d9

• Update Trade Station (#24295)

  Show description for 00e770d
  UbaserB

  authored
  00e770d

  Copy full SHA for 00e770d

• Update Core (#24294)

  Show description for 0a71f8a
  UbaserB

  authored
  0a71f8a

  Copy full SHA for 0a71f8a

• Update Rod and Transit evacuation shuttles (#24296)

  Show description for 7583662
  UbaserB

  authored
  7583662

  Copy full SHA for 7583662

Commits on Jan 20, 2024

• Lathe Categories (#24247)

  Show description for 73e94df
  EmoGarbage404

  authored
  73e94df

  Copy full SHA for 73e94df

• Automatic changelog update

  PJBot

  committed
  ac809c4

  Copy full SHA for ac809c4

• Unrevivable trait (#24226)

  Show description for 7a2e500
  Scribbles0

  authored
  7a2e500

  Copy full SHA for 7a2e500

• Automatic changelog update

  PJBot

  committed
  f33a3f9

  Copy full SHA for f33a3f9

• Toolboxes (#24305)

  Show description for f71df97
  Drayff

  authored
  f71df97

  Copy full SHA for f71df97

• Automatic changelog update

  PJBot

  committed
  df768b2

  Copy full SHA for df768b2

• Revert "Adds more grindables (#24267)" (#24311)

  Show description for 3480640
  metalgearsloth

  authored
  3480640

  Copy full SHA for 3480640

• Rebalance of Lobbying bundle (#24303)

  Show description for 559ff13
  Agoichi

  authored
  559ff13

  Copy full SHA for 559ff13

• Automatic changelog update

  PJBot

  committed
  91e8234

  Copy full SHA for 91e8234

• Prevent EntityStorages from being opened while inside another container (#24253)

  Show description for e89be95
  

  Arendian

  and

  metalgearsloth

  authored
  e89be95

  Copy full SHA for e89be95

• Automatic changelog update

  PJBot

  committed
  a65e3ee

  Copy full SHA for a65e3ee

• Add netserializable to test doafter (#24313)

  Show description for ed2fa96
  metalgearsloth

  authored
  ed2fa96

  Copy full SHA for ed2fa96

• Fixes round restart audio clipping (#24044)

  Show description for 5af1d0e
  

  FairlySadPanda

  and

  metalgearsloth

  authored
  5af1d0e

  Copy full SHA for 5af1d0e

• Automatic changelog update

  PJBot

  committed
  0b37dbb

  Copy full SHA for 0b37dbb

• Fix cargo product groups (#24212)

  EmoGarbage404

  authored
  21e77df

  Copy full SHA for 21e77df

• Cargo fixes (#24318)

  Show description for 87f324b
  metalgearsloth

  authored
  87f324b

  Copy full SHA for 87f324b

• Change what items can be fultoned while stopping anchored items from fultoning (#20628)

  Show description for 1ff31f8
  

  casperr04

  and

  metalgearsloth

  authored
  1ff31f8

  Copy full SHA for 1ff31f8

• Automatic changelog update

  PJBot

  committed
  28f0387

  Copy full SHA for 28f0387

• Make crushers not craftable/researchable (#24319)

  Show description for 542aa11
  Blackern5000

  authored
  542aa11

  Copy full SHA for 542aa11

• Automatic changelog update

  PJBot

  committed
  f10ecf4

  Copy full SHA for f10ecf4

• Fix some test warnings (#24324)

  Show description for 4a13dbe
  metalgearsloth

  authored
  4a13dbe

  Copy full SHA for 4a13dbe

• Fix drag-drop buckle sound playing twice (#24321)

  Show description for bbbacf9
  metalgearsloth

  authored
  bbbacf9

  Copy full SHA for bbbacf9

• Automatic changelog update

  PJBot

  committed
  18a111b

  Copy full SHA for 18a111b

• Beacon localization (#24138)

  Show description for efdc6f8
  Errant-4

  authored
  efdc6f8

  Copy full SHA for efdc6f8

• fix scram implant uplink desc (#24336)

  Show description for bd4a0b9
  Ilya246

  authored
  bd4a0b9

  Copy full SHA for bd4a0b9

• Add admin log messages for gamerule addition and end (#24092)

  Show description for 25cde97
  

  tday93

  and

  Chief-Engineer

  authored
  25cde97

  Copy full SHA for 25cde97

• Automatic changelog update

  PJBot

  committed
  0312196

  Copy full SHA for 0312196

• Fix issue where round could reset all job priorities to high (#24340)

  Show description for 4f307a4
  koteq

  authored
  4f307a4

  Copy full SHA for 4f307a4

• Add snake kebab (#24341)

  Show description for 6a0c800
  Nimfar11

  authored
  6a0c800

  Copy full SHA for 6a0c800

• Cerberus Wideswing (#24328)

  Show description for 113ee78
  Alekshhh

  authored
  113ee78

  Copy full SHA for 113ee78

• Buff potassium availability from bananas (#24257)

  Show description for 949b07d
  UbaserB

  authored
  949b07d

  Copy full SHA for 949b07d

• Automatic changelog update

  PJBot

  committed
  9efa01d

  Copy full SHA for 9efa01d

• Remove ability to start pulling while inside a container (#24235)

  Show description for 1085dbe
  GreyMario

  authored
  1085dbe

  Copy full SHA for 1085dbe

Commits on Jan 21, 2024

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

  Show description for d8367b4
  Morb0

  committed
  d8367b4

  Copy full SHA for d8367b4

• Update locale

  Morb0

  committed
  5471137

  Copy full SHA for 5471137

• Fix locale

  Morb0

  committed
  f451c79

  Copy full SHA for f451c79

• Update Credits (#24352)

  Show description for ecc21d8
  

  github-actions[bot]

  and

  PJBot

  authored
  ecc21d8

  Copy full SHA for ecc21d8

• Allow chemical-fueled generators to use multiple reagents (#24258)

  Show description for 691c3d5
  EmoGarbage404

  authored
  691c3d5

  Copy full SHA for 691c3d5

• Use MetalBreak collection

  Morb0

  committed
  adbbfe9

  Copy full SHA for adbbfe9

• The glowing forest anomaly (#24351)

  Show description for b3b64e6
  

  TheShuEd

  and

  mirrorcult

  authored
  b3b64e6

  Copy full SHA for b3b64e6

• Automatic changelog update

  PJBot

  committed
  8f1d670

  Copy full SHA for 8f1d670

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

  Morb0

  committed
  b12f127

  Copy full SHA for b12f127

• Update locale

  Morb0

  committed
  eeb399f

  Copy full SHA for eeb399f