Code

Upstream sync#1616

Code

Merged

Morb0 merged 88 commits intomasterspace-syndicate/space-station-14:masterfrom upstream-syncspace-syndicate/space-station-14:upstream-syncCopy head branch name to clipboardDec 8, 2023

+127,784-122,421

Commits

Commits on Dec 5, 2023

• Fix Christmas tree bounding box (#22139)

  enumerate0

  authored
  8a10aa4

  Copy full SHA for 8a10aa4

• Automatic changelog update

  PJBot

  committed
  3efa81b

  Copy full SHA for 3efa81b

• boom (#22150)

  JoeHammad1844

  authored
  c091926

  Copy full SHA for c091926

• Automatic changelog update

  PJBot

  committed
  1c1ee22

  Copy full SHA for 1c1ee22

• paramedic on marathon (#22151)

  JoeHammad1844

  authored
  172bd79

  Copy full SHA for 172bd79

• Automatic changelog update

  PJBot

  committed
  04cacf3

  Copy full SHA for 04cacf3

• lower chloral hydrate effect minimum to 10u (requires 11u to sleep) (#22148)

  QuietlyWhisper

  authored
  50201e4

  Copy full SHA for 50201e4

• Automatic changelog update

  PJBot

  committed
  704b60a

  Copy full SHA for 704b60a

• Adds Emergency Nitrogen Tanks (#22142)

  Show description for 3ad5bbe
  DangerRevolution

  authored
  3ad5bbe

  Copy full SHA for 3ad5bbe

• Automatic changelog update

  PJBot

  committed
  1f6b76a

  Copy full SHA for 1f6b76a

• Added thresholds and new stomatch for mice (#22143)

  Show description for bef7272
  

  Lazzi0706

  and

  Lazzi0706

  authored
  bef7272

  Copy full SHA for bef7272

• Removes paramedic suit from medidrobe (#22146)

  Show description for f412504
  JoeHammad1844

  authored
  f412504

  Copy full SHA for f412504

• Automatic changelog update

  PJBot

  committed
  858474d

  Copy full SHA for 858474d

• Action Cooldowns Reset on Rejuvenate (#22149)

  Show description for 685cb9c
  

  3 peopleauthored
  685cb9c

  Copy full SHA for 685cb9c

• Automatic changelog update

  PJBot

  committed
  74781f8

  Copy full SHA for 74781f8

• gas tanks ops (#22154)

  lzk228

  authored
  18f40c1

  Copy full SHA for 18f40c1

• Set cocoa to trash on empty (#22155)

  themias

  authored
  5937d0c

  Copy full SHA for 5937d0c

• fixes ghosts completely lacking speech (#22157)

  deathride58

  authored
  f0c7634

  Copy full SHA for f0c7634

• Automatic changelog update

  PJBot

  committed
  09a78ef

  Copy full SHA for 09a78ef

• Add water cups to water coolers (#22073)

  Show description for f11d94e
  tgrkzus

  authored
  f11d94e

  Copy full SHA for f11d94e

• Automatic changelog update

  PJBot

  committed
  2ea8207

  Copy full SHA for 2ea8207

• Fixed projectile spells not counting user (#22158)

  DexlerXD

  authored
  6479d4d

  Copy full SHA for 6479d4d

• Cyborg assembly no longer need a power cell (#22144)

  Show description for fb4a507
  M3739

  authored
  fb4a507

  Copy full SHA for fb4a507

• Change points per node to 6500 (#22163)

  DogZeroX

  authored
  000ac6f

  Copy full SHA for 000ac6f

• Grid inventory fixes (#22161)

  Show description for 9ca84ac
  EmoGarbage404

  authored
  9ca84ac

  Copy full SHA for 9ca84ac

• Automatic changelog update

  PJBot

  committed
  453eb1a

  Copy full SHA for 453eb1a

Commits on Dec 6, 2023

• Change combat boots to a 2x1 grid (#22167)

  EmoGarbage404

  authored
  922d516

  Copy full SHA for 922d516

• Adds scarfs to Secdrobe and hydrobe. (#21927)

  Show description for 55c8ad0
  Adrian16199

  authored
  55c8ad0

  Copy full SHA for 55c8ad0

• Fix wallmount board dropping at random side of the wall (#21920)

  Show description for daa70fc
  qwerltaz

  authored
  daa70fc

  Copy full SHA for daa70fc

• Update submodule to 187.1.2 (#22171)

  metalgearsloth

  authored
  2fa8517

  Copy full SHA for 2fa8517

• gridinv shape adjustments (#22162)

  EmoGarbage404

  authored
  7f5cbf2

  Copy full SHA for 7f5cbf2

• Automatic changelog update

  PJBot

  committed
  7cd5bf3

  Copy full SHA for 7cd5bf3

• Predict helmet toggles (#22089)

  metalgearsloth

  authored
  8583f0d

  Copy full SHA for 8583f0d

• Automatic changelog update

  PJBot

  committed
  5ecd4aa

  Copy full SHA for 5ecd4aa

• research console radio messages on unlock (#22166)

  EmoGarbage404

  authored
  89295d9

  Copy full SHA for 89295d9

• Add public methods to relay inventory events (#22165)

  DrSmugleaf

  authored
  abfea8d

  Copy full SHA for abfea8d

• Pool NPC entitylookup fields (#21806)

  metalgearsloth

  authored
  7eaa5a8

  Copy full SHA for 7eaa5a8

• Gemini hotfixes (#22177)

  TsjipTsjip

  authored
  81b3f95

  Copy full SHA for 81b3f95

• Disposals chute make it go splat (#20848)

  Show description for 80a1aad
  

  Henry12116

  and

  metalgearsloth

  authored
  80a1aad

  Copy full SHA for 80a1aad

• Update submodule to 187.2.0 (#22178)

  metalgearsloth

  authored
  c3ba35f

  Copy full SHA for c3ba35f

• EMT belt (#22173)

  JoeHammad1844

  authored
  8fcc7d0

  Copy full SHA for 8fcc7d0

• Options are statements, not questions (#22185)

  Errant-4

  authored
  f31b015

  Copy full SHA for f31b015

• medibot fixes and refactoring (#21852)

  Show description for 47359cf
  deltanedas

  authored
  47359cf

  Copy full SHA for 47359cf

• Automatic changelog update

  PJBot

  committed
  abce2dd

  Copy full SHA for abce2dd

• Fix toggleable helmets (#22195)

  metalgearsloth

  authored
  3252a2b

  Copy full SHA for 3252a2b

• Automatic changelog update

  PJBot

  committed
  ee897f1

  Copy full SHA for ee897f1

• Make boots with storage use itemslot (#22186)

  Show description for 4b76c4b
  deltanedas

  authored
  4b76c4b

  Copy full SHA for 4b76c4b

• Fixes speech bubbles now lacking names for the living (#22191)

  deathride58

  authored
  a4027a3

  Copy full SHA for a4027a3

• trim bibles.yml (#22184)

  lzk228

  authored
  fc921ce

  Copy full SHA for fc921ce

• Automatic changelog update

  PJBot

  committed
  e639006

  Copy full SHA for e639006

• Log server ID in connection logs table (#21911)

  PJB3005

  authored
  b4f8393

  Copy full SHA for b4f8393

• saltern dispenser update (#22189)

  Show description for 281e808
  deltanedas

  authored
  281e808

  Copy full SHA for 281e808

• atlas dispenser update (#22190)

  Show description for 6ccce8b
  deltanedas

  authored
  6ccce8b

  Copy full SHA for 6ccce8b

Commits on Dec 7, 2023

• T shaped pickaxe and grid UI fix (#22197)

  TemporalOroboros

  authored
  f98322a

  Copy full SHA for f98322a

• Automatic changelog update

  PJBot

  committed
  629fa48

  Copy full SHA for 629fa48

• Inventory sprite rotation (#22201)

  EmoGarbage404

  authored
  c047f19

  Copy full SHA for c047f19

• tweak crowbar storage sprites (#22202)

  Show description for 8000428
  EmoGarbage404

  authored
  8000428

  Copy full SHA for 8000428

• Lizard Underbelly Marking (#22200)

  Show description for a5d1640
  Nairodian

  authored
  a5d1640

  Copy full SHA for a5d1640

• Automatic changelog update

  PJBot

  committed
  17e0143

  Copy full SHA for 17e0143

• Make test EntitySpecifiers ignore entities with null prototypes (#22174)

  TemporalOroboros

  authored
  0c63f2e

  Copy full SHA for 0c63f2e

• nar'sie fake (#20299)

  Show description for 88119c6
  deltanedas

  authored
  88119c6

  Copy full SHA for 88119c6

• Space cobra 1.1 (#20298)

  Show description for 460bfdc
  Nimfar11

  authored
  460bfdc

  Copy full SHA for 460bfdc

• Automatic changelog update

  PJBot

  committed
  d652e64

  Copy full SHA for d652e64

• 3 New Brute Chemicals (And Razorium) (#22103)

  Show description for fe41e20
  CrigCrag

  authored
  fe41e20

  Copy full SHA for fe41e20

• Automatic changelog update

  PJBot

  committed
  6509681

  Copy full SHA for 6509681

• Mirror speed penalty for worn duffels and hardsuits when in-hand (#22168)

  Show description for fb10dff
  EmoGarbage404

  authored
  fb10dff

  Copy full SHA for fb10dff

• Automatic changelog update

  PJBot

  committed
  b5f931b

  Copy full SHA for b5f931b

• Narsie test bandaid (#22206)

  EmoGarbage404

  authored
  2553bad

  Copy full SHA for 2553bad

• fix explosion resistance (#22224)

  Show description for 50e8707
  deltanedas

  authored
  50e8707

  Copy full SHA for 50e8707

• Automatic changelog update

  PJBot

  committed
  445c474

  Copy full SHA for 445c474

• Inventory slot enumerator rejig (#21788)

  ElectroJr

  authored
  287d22c

  Copy full SHA for 287d22c

• Fix inventory enumerator resolve error (#22227)

  ElectroJr

  authored
  5f2a4f9

  Copy full SHA for 5f2a4f9

• added classic cornrows 2 (#22210)

  liltenhead

  authored
  039e5d4

  Copy full SHA for 039e5d4

• Implements greyscale (white) chairs (#22209)

  Show description for 7a109a3
  Flareguy

  authored
  7a109a3

  Copy full SHA for 7a109a3

• fixes the descriptions of the ert hardsuit helmets + some other misc shit (#22207)

  Flareguy

  authored
  fcad478

  Copy full SHA for fcad478

• Paramedic loses external access (#22228)

  Show description for beb8c26
  Aexxie

  authored
  beb8c26

  Copy full SHA for beb8c26

• Automatic changelog update

  PJBot

  committed
  8fe3f3f

  Copy full SHA for 8fe3f3f

Commits on Dec 8, 2023

• add tooltip with entity name on inventory hover (#22203)

  EmoGarbage404

  authored
  b01f0b5

  Copy full SHA for b01f0b5

• Automatic changelog update

  PJBot

  committed
  828b787

  Copy full SHA for 828b787

• psychologist bed (#22223)

  Nimfar11

  authored
  d1241c5

  Copy full SHA for d1241c5

• Automatic changelog update

  PJBot

  committed
  dc59a36

  Copy full SHA for dc59a36

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

  Show description for caf8ac8
  Morb0

  committed
  caf8ac8

  Copy full SHA for caf8ac8

• hellfire (#22243)

  Emisse

  authored
  b83e3e0

  Copy full SHA for b83e3e0

• Automatic changelog update

  PJBot

  committed
  dbdb9bc

  Copy full SHA for dbdb9bc

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

  Morb0

  committed
  0003e1e

  Copy full SHA for 0003e1e

• Remove ClothingShoesBootsJackSecFilled

  Morb0

  committed
  5e9e55d

  Copy full SHA for 5e9e55d

• Update locale

  Morb0

  committed
  81f07a9

  Copy full SHA for 81f07a9

• Fix locale

  Morb0

  committed
  8e82b67

  Copy full SHA for 8e82b67