Code

Upstream sync#367

Code

Merged

Rxup merged 36 commits intomasterRxup/space-station-14:masterfrom upstream-syncRxup/space-station-14:upstream-syncCopy head branch name to clipboardDec 5, 2023

+3,440-1,115

Commits

Commits on Dec 4, 2023

• fix humanoid fire visuals missing (#22136)

  Show description for 4221ed2
  qwerltaz

  authored
  4221ed2

  Copy full SHA for 4221ed2

• Grid Inventory (#21931)

  Show description for cc8984d
  EmoGarbage404

  authored
  cc8984d

  Copy full SHA for cc8984d

• Origin Station Update 04.12.2023 (parallax gas ginat sprite) (#22135)

  brainfood1183

  authored
  1109920

  Copy full SHA for 1109920

• Automatic changelog update

  PJBot

  committed
  9d6475a

  Copy full SHA for 9d6475a

• fix ghost command damage when in crit (#22134)

  Show description for 1492957
  qwerltaz

  authored
  1492957

  Copy full SHA for 1492957

• fancy light tubes (#22129)

  MACMAN2003

  authored
  11ae6b0

  Copy full SHA for 11ae6b0

• utility belt jaws of life (#22128)

  MACMAN2003

  authored
  17a5236

  Copy full SHA for 17a5236

• Fix conveyors to allow doors to close over top (#22117)

  Titian3

  authored
  f280ff6

  Copy full SHA for f280ff6

• Automatic changelog update

  PJBot

  committed
  5e6400b

  Copy full SHA for 5e6400b

• Automatic changelog update

  PJBot

  committed
  5394e61

  Copy full SHA for 5394e61

• flash pun (#22115)

  Dutch-VanDerLinde

  authored
  bc3c71f

  Copy full SHA for bc3c71f

• Automatic changelog update

  PJBot

  committed
  0b63ec0

  Copy full SHA for 0b63ec0

• Fancy speech bubbles - Names over speech bubbles, and 1:1 chat parity for emotes and LOOC! (#21999)

  deathride58

  authored
  e32ede5

  Copy full SHA for e32ede5

• Makes a whole bunch of raw materials grindable (#22113)

  Show description for c01be82
  Flareguy

  authored
  c01be82

  Copy full SHA for c01be82

• Automatic changelog update

  PJBot

  committed
  50113da

  Copy full SHA for 50113da

• Banana Clown Outfit (#22068)

  Show description for 63bc4bf
  brainfood1183

  authored
  63bc4bf

  Copy full SHA for 63bc4bf

• Automatic changelog update

  PJBot

  committed
  e1c8419

  Copy full SHA for e1c8419

• global radio toggle for observers (#22137)

  EmoGarbage404

  authored
  f99b29f

  Copy full SHA for f99b29f

• Change Biometrics after using Dna Scrambler Implant (#22098)

  tomasalves8

  authored
  9d9cfbd

  Copy full SHA for 9d9cfbd

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

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

  Rxup

  committed
  00ea01a

  Copy full SHA for 00ea01a

• fix part 1

  Rxup

  committed
  9602a45

  Copy full SHA for 9602a45

• fix for new Storage format

  KayzelW

  committed
  9c3eb24

  Copy full SHA for 9c3eb24

• cringe fix

  KayzelW

  committed
  e3a25d1

  Copy full SHA for e3a25d1