Code

Upstream sync#489

Code

Merged

Rxup merged 100 commits intomasterRxup/space-station-14:masterfrom upstream-syncRxup/space-station-14:upstream-syncCopy head branch name to clipboardFeb 25, 2024

+275,795-120,982

Commits

Commits on Feb 17, 2024

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

  Show description for db07fb5
  Morb0

  committed
  db07fb5

  Copy full SHA for db07fb5

• Update locale

  Morb0

  committed
  7a96cfa

  Copy full SHA for 7a96cfa

• Fix locale

  Morb0

  committed
  92aae19

  Copy full SHA for 92aae19

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

  Show description for f7a6c76
  Morb0

  authored
  f7a6c76

  Copy full SHA for f7a6c76

Commits on Feb 18, 2024

• Resprite overlays and fix some steel tiles (#1868)

  Ko4ergaPunk

  authored
  f44a52c

  Copy full SHA for f44a52c

• [Maps] Spectrume update (#1878)

  Show description for 7435de3
  

  poeMota

  and

  KonChenY1

  authored
  7435de3

  Copy full SHA for 7435de3

• Translate Upstream #1875 #1877 (#1879)

  lapatison

  authored
  93ebaa8

  Copy full SHA for 93ebaa8

Commits on Feb 19, 2024

• Corvax drinks added (#1736)

  Ko4ergaPunk

  authored
  db23332

  Copy full SHA for db23332

Commits on Feb 21, 2024

• [Resprite] Electric grill (#1882)

  xKREKSx

  authored
  75a2ade

  Copy full SHA for 75a2ade

• Microwave sprite offset (#1883)

  SonicHDC

  authored
  079e941

  Copy full SHA for 079e941

• Adds random pill canister (#25316)

  Show description for 128f5e8
  

  IamVelcroboy

  and

  BurningRash

  authored
  128f5e8

  Copy full SHA for 128f5e8

• Moves muted to shared (#25374)

  Show description for 046c874
  keronshb

  authored
  046c874

  Copy full SHA for 046c874

• Fix bwoink sounds (#25441)

  Show description for 79c6385
  metalgearsloth

  authored
  79c6385

  Copy full SHA for 79c6385

• Dispenser jug fix (#25450)

  Show description for 499aa71
  MjrLandWhale

  authored
  499aa71

  Copy full SHA for 499aa71

• Automatic changelog update

  PJBot

  committed
  abedce4

  Copy full SHA for abedce4

• Fix EVA helmets quickequip (#25448)

  Show description for ae11068
  Killerqu00

  authored
  ae11068

  Copy full SHA for ae11068

• Automatic changelog update

  PJBot

  committed
  2cc484c

  Copy full SHA for 2cc484c

Commits on Feb 22, 2024

• Crop harvest int cast fix (#25453)

  Show description for 1360d57
  genderGeometries

  authored
  1360d57

  Copy full SHA for 1360d57

• Automatic changelog update

  PJBot

  committed
  fda1242

  Copy full SHA for fda1242

• Little rework of existing yaml flatpacks (#24814)

  Show description for 326b890
  lzk228

  authored
  326b890

  Copy full SHA for 326b890

• Fix xeno and dragon blood levels (#25442)

  QuietlyWhisper

  authored
  26417b7

  Copy full SHA for 26417b7

• Automatic changelog update

  PJBot

  committed
  7734b09

  Copy full SHA for 7734b09

• Changed radio jammer wattage from 6 -> 2 (#25432)

  Show description for 48213eb
  beck-thompson

  authored
  48213eb

  Copy full SHA for 48213eb

• Automatic changelog update

  PJBot

  committed
  423b75f

  Copy full SHA for 423b75f

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

  Show description for 4ee0df9
  Morb0

  committed
  4ee0df9

  Copy full SHA for 4ee0df9

• Update locale

  Morb0

  committed
  0f7f420

  Copy full SHA for 0f7f420

• Remove obs kit (#24768)

  Show description for 7c7bca1
  metalgearsloth

  authored
  7c7bca1

  Copy full SHA for 7c7bca1

• Revert "Remove handheld crew monitor (#24761)" (#25439)

  Show description for d0df5ed
  metalgearsloth

  authored
  d0df5ed

  Copy full SHA for d0df5ed

• Automatic changelog update

  PJBot

  committed
  c27d0c1

  Copy full SHA for c27d0c1

• Fix #22933 - Job-specific Uplink items leaking to non-job minds (#23179)

  Show description for b26e9a9
  DrMelon

  authored
  b26e9a9

  Copy full SHA for b26e9a9

• Automatic changelog update

  PJBot

  committed
  3c25e63

  Copy full SHA for 3c25e63

• Apply IAA on Train station

  Morb0

  committed
  5ce36b2

  Copy full SHA for 5ce36b2

• Red flashlight color for assault borg (#25465)

  Show description for 85ae40e
  liltenhead

  authored
  85ae40e

  Copy full SHA for 85ae40e

• Automatic changelog update

  PJBot

  committed
  22c76bb

  Copy full SHA for 22c76bb

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

  Morb0

  committed
  a0307f2

  Copy full SHA for a0307f2

• Add RequiresGrid component (#23394)

  Show description for 487dd11
  HoofedEar

  authored
  487dd11

  Copy full SHA for 487dd11

• Update locale

  Morb0

  committed
  4744fe6

  Copy full SHA for 4744fe6

• Make even more items good looking in inventory + size changing (#25461)

  Show description for 35723ad
  lzk228

  authored
  35723ad

  Copy full SHA for 35723ad

• Automatic changelog update

  PJBot

  committed
  7ac3a2a

  Copy full SHA for 7ac3a2a

• Add Large Wood Floors (#25462)

  Show description for 83cd108
  ps3moira

  authored
  83cd108

  Copy full SHA for 83cd108

• Automatic changelog update

  PJBot

  committed
  2b34970

  Copy full SHA for 2b34970

• fix reagent slime role description being friendly (#25466)

  QuietlyWhisper

  authored
  f38a961

  Copy full SHA for f38a961

• Automatic changelog update

  PJBot

  committed
  e6605a7

  Copy full SHA for e6605a7

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

  Show description for 7c3a7ad
  Morb0

  authored
  7c3a7ad

  Copy full SHA for 7c3a7ad

• Give "DO NOT MAP" suffix to handheld crew monitor (#25473)

  Show description for b774759
  notquitehadouken

  authored
  b774759

  Copy full SHA for b774759

• Predict doors and airlocks (#25419)

  Show description for ce0a51f
  EmoGarbage404

  authored
  ce0a51f

  Copy full SHA for ce0a51f

• [Mps] Astra update (#1886)

  Show description for bbb7acd
  

  poeMota

  and

  KonChenY1

  authored
  bbb7acd

  Copy full SHA for bbb7acd

• Update Maus (#1884)

  Zna1kin

  authored
  506e63e

  Copy full SHA for 506e63e

• Translate Upstream #1885 (#1887)

  Show description for caf8d29
  

  lapatison

  and

  lzk228

  authored
  caf8d29

  Copy full SHA for caf8d29

• New Paper Station (#1880)

  mofkkol1

  authored
  fb14b84

  Copy full SHA for fb14b84

Commits on Feb 23, 2024

• Fix examine text bug for Openable Drinkables (#25478)

  Show description for 146c7b2
  Tayrtahn

  authored
  146c7b2

  Copy full SHA for 146c7b2

• Make galoshes obtainable and slowing you (#25484)

  Show description for 6568737
  lzk228

  authored
  6568737

  Copy full SHA for 6568737

• Automatic changelog update

  PJBot

  committed
  84d9f7a

  Copy full SHA for 84d9f7a

• Add prediction to Openable (#25477)

  Show description for 381bb90
  Tayrtahn

  authored
  381bb90

  Copy full SHA for 381bb90

• Add Ratvar (#24958)

  Show description for 2458c87
  MACMAN2003

  authored
  2458c87

  Copy full SHA for 2458c87

• Switch project files to C# 12. (#25487)

  Show description for b1de6dd
  PJB3005

  authored
  b1de6dd

  Copy full SHA for b1de6dd

• Make department / job list sorting consistent. (#25486)

  Show description for 715794d
  PJB3005

  authored
  715794d

  Copy full SHA for 715794d

• Automatic changelog update

  PJBot

  committed
  945c8db

  Copy full SHA for 945c8db

• Buff emergency welder (#25483)

  Show description for 4ea1d21
  liltenhead

  authored
  4ea1d21

  Copy full SHA for 4ea1d21

• Automatic changelog update

  PJBot

  committed
  b75ff77

  Copy full SHA for b75ff77

• Update submodule to 211.0.0 (#25489)

  metalgearsloth

  authored
  033f232

  Copy full SHA for 033f232

• Optimise DecalOverlay (#25266)

  Show description for d8e5f5c
  metalgearsloth

  authored
  d8e5f5c

  Copy full SHA for d8e5f5c

• Fix attribution (#25495)

  Show description for af7e802
  TheShuEd

  authored
  af7e802

  Copy full SHA for af7e802

• Fix centcom and other jobs with setPreference set to false showing up anyway (#25496)

  Show description for 237d89c
  VasilisThePikachu

  authored
  237d89c

  Copy full SHA for 237d89c

• Automatic changelog update

  PJBot

  committed
  2ad3243

  Copy full SHA for 2ad3243

• Make cargo order unanchored thruster and gyroscope (#25497)

  lzk228

  authored
  7a37d4a

  Copy full SHA for 7a37d4a

• Minor cookie fortune fix (#25503)

  Show description for 2a5eb86
  lapatison

  authored
  2a5eb86

  Copy full SHA for 2a5eb86

• Locale fix (#1888)

  lapatison

  authored
  f081ca4

  Copy full SHA for f081ca4

Commits on Feb 24, 2024

• Fix a single grammar error (#25512)

  Show description for 39a2ff5
  Erisfiregamer1

  authored
  39a2ff5

  Copy full SHA for 39a2ff5

• Automatic changelog update

  PJBot

  committed
  786ecd9

  Copy full SHA for 786ecd9

Commits on Feb 25, 2024

• Update Credits (#25532)

  Show description for 431f0bd
  

  github-actions[bot]

  and

  PJBot

  authored
  431f0bd

  Copy full SHA for 431f0bd

• Fixed Fire Extinguisher safety range (#25534)

  beck-thompson

  authored
  84fff93

  Copy full SHA for 84fff93

• Automatic changelog update

  PJBot

  committed
  51caf3b

  Copy full SHA for 51caf3b

• Remove the ability for command or any antag-safe role from being initial infected in zombie mode (#25529)

  Show description for 5806401
  ArchPigeon

  authored
  5806401

  Copy full SHA for 5806401

• Automatic changelog update

  PJBot

  committed
  c52820a

  Copy full SHA for c52820a

• Prevent clients from setting their species to whatever they want (#25535)

  Show description for e1cce9d
  DebugOk

  authored
  e1cce9d

  Copy full SHA for e1cce9d

• Update submodule to 211.0.2 (#25536)

  metalgearsloth

  authored
  34a6f12

  Copy full SHA for 34a6f12

• Increase contrast with hand select for Ashen UI theme (#25517)

  Show description for 531d722
  UbaserB

  authored
  531d722

  Copy full SHA for 531d722

• pAI map button sprite change (#25384)

  Show description for 9a4c10c
  UbaserB

  authored
  9a4c10c

  Copy full SHA for 9a4c10c

• Made ordering multiple crates at cargo order multiple crates (#25518)

  Show description for aa4e7c0
  PolterTzi

  authored
  aa4e7c0

  Copy full SHA for aa4e7c0

• Automatic changelog update

  PJBot

  committed
  e52ebe0

  Copy full SHA for e52ebe0

• Selectively revert gun penetration (#25551)

  Show description for ec5edc3
  metalgearsloth

  authored
  ec5edc3

  Copy full SHA for ec5edc3

• Cleanup ExecutionSystem (#24382)

  Show description for bcbe2ec
  

  nikthechampiongr

  and

  metalgearsloth

  authored
  bcbe2ec

  Copy full SHA for bcbe2ec

• Revert "Cleanup ExecutionSystem (#24382)" (#25555)

  Show description for bb0776c
  metalgearsloth

  authored
  bb0776c

  Copy full SHA for bb0776c

• Automatic changelog update

  PJBot

  committed
  51acebd

  Copy full SHA for 51acebd

• Fix candy bowls (#25514)

  Show description for 902198d
  Krunklehorn

  authored
  902198d

  Copy full SHA for 902198d

• Automatic changelog update

  PJBot

  committed
  6f3893a

  Copy full SHA for 6f3893a

• Fix cuffs popup prediction (#25553)

  metalgearsloth

  authored
  a440ccf

  Copy full SHA for a440ccf

• Toggleable items shape change on toggle state (#25392)

  Show description for 1a5f7c3
  

  MilenVolf

  and

  metalgearsloth

  authored
  1a5f7c3

  Copy full SHA for 1a5f7c3

• Juice that makes you Weh! (but real!) (#25132)

  Show description for 1de102d
  QuietlyWhisper

  authored
  1de102d

  Copy full SHA for 1de102d

• Added ContainerSpawnPoint check for integration test (#25446)

  Show description for 87def40
  

  778b

  and

  metalgearsloth

  authored
  87def40

  Copy full SHA for 87def40

• Automatic changelog update

  PJBot

  committed
  4613c9d

  Copy full SHA for 4613c9d

• Fix ItemSlots prediction (#25552)

  Show description for ad29dbe
  metalgearsloth

  authored
  ad29dbe

  Copy full SHA for ad29dbe

• fix solar computer sprite (#25548)

  Show description for 7ba6765
  potato1234x

  authored
  7ba6765

  Copy full SHA for 7ba6765

• Added Survival to the secret rotation (#25568)

  wafehling

  authored
  b30cda8

  Copy full SHA for b30cda8

• Automatic changelog update

  PJBot

  committed
  4e16034

  Copy full SHA for 4e16034

• Don't double-dip survival intensity scaling (#25570)

  mirrorcult

  authored
  de36ebe

  Copy full SHA for de36ebe

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

  Rxup

  committed
  559a9af

  Copy full SHA for 559a9af

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

  Rxup

  committed
  d553de6

  Copy full SHA for d553de6

• upd

  Rxup

  committed
  d4dabb0

  Copy full SHA for d4dabb0