Code

Upstream sync#1629

Code

Merged

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

+1,516-1,068

Commits

Commits on Dec 11, 2023

• Document why tile ripping was disabled upstream (#22315)

  Flareguy

  authored
  a69c5e3

  Copy full SHA for a69c5e3

• Remove tasers from arsenal tech (#22361)

  EmoGarbage404

  authored
  627bf30

  Copy full SHA for 627bf30

• Sell plasma canister at cargo (#22357)

  Show description for 27acbe4
  Partmedia

  authored
  27acbe4

  Copy full SHA for 27acbe4

• Automatic changelog update

  PJBot

  committed
  9de9613

  Copy full SHA for 9de9613

• Gemeanie hotfixes (#22355)

  TsjipTsjip

  authored
  df28abb

  Copy full SHA for df28abb

• Don't apply toggleclothing in state handling (#22347)

  Show description for 0433d3b
  metalgearsloth

  authored
  0433d3b

  Copy full SHA for 0433d3b

• artifact crusher (#22301)

  EmoGarbage404

  authored
  6e91346

  Copy full SHA for 6e91346

• Automatic changelog update

  PJBot

  committed
  123d49a

  Copy full SHA for 123d49a

• Remove plasma miners from maps (#22358)

  Show description for d430157
  Partmedia

  authored
  d430157

  Copy full SHA for d430157

• Automatic changelog update

  PJBot

  committed
  5143030

  Copy full SHA for 5143030

• Prevent pacified players from throwing dangerous stuff (#22268)

  nok-ko

  authored
  d0085f9

  Copy full SHA for d0085f9

• Automatic changelog update

  PJBot

  committed
  5d8d668

  Copy full SHA for 5d8d668

• Add atmos time compression (#21954)

  Show description for a2ed25a
  Partmedia

  authored
  a2ed25a

  Copy full SHA for a2ed25a

Commits on Dec 12, 2023

• Automatic changelog update

  PJBot

  committed
  472f864

  Copy full SHA for 472f864

• Temporarily disable round-end PVS overrides (#22365)

  ElectroJr

  authored
  53bd668

  Copy full SHA for 53bd668

• Fix pvs override error (#22366)

  ElectroJr

  authored
  70d663c

  Copy full SHA for 70d663c

• Remove senior roles (#22303)

  EmoGarbage404

  authored
  66a1bb7

  Copy full SHA for 66a1bb7

• Automatic changelog update

  PJBot

  committed
  41d8a56

  Copy full SHA for 41d8a56

• Update cluster.yml (#22370)

  OliverOtter

  authored
  7404137

  Copy full SHA for 7404137

• Mothroach Cargo Crates (#21565)

  Show description for bca2d07
  

  BYONDFuckery

  and

  MouseHatsForAll

  authored
  bca2d07

  Copy full SHA for bca2d07

• Automatic changelog update

  PJBot

  committed
  89448d4

  Copy full SHA for 89448d4

• Fix history about gas prices (#22373)

  Partmedia

  authored
  048d6c0

  Copy full SHA for 048d6c0

• Fix crucial game breaking bug. (#22376)

  IProduceWidgets

  authored
  223a258

  Copy full SHA for 223a258

• Split up atmos speedup from heat scaling (#22372)

  Partmedia

  authored
  405e569

  Copy full SHA for 405e569

• Miscellaneous inventory tweaks (#22371)

  Show description for 9de4c40
  EmoGarbage404

  authored
  9de4c40

  Copy full SHA for 9de4c40

• fix a box probably (#22377)

  IProduceWidgets

  authored
  2712e4d

  Copy full SHA for 2712e4d

• Automatic changelog update

  PJBot

  committed
  0849127

  Copy full SHA for 0849127

• Makes pill canisters Tiny and puts 9 in the box chem gets. (#22378)

  Show description for 5e8a691
  IProduceWidgets

  authored
  5e8a691

  Copy full SHA for 5e8a691

• belt bigger (#22379)

  IProduceWidgets

  authored
  af62bd0

  Copy full SHA for af62bd0

• guns and ammo (#22380)

  IProduceWidgets

  authored
  cdccdea

  Copy full SHA for cdccdea

• make square so it works. (#22381)

  IProduceWidgets

  authored
  e03875d

  Copy full SHA for e03875d

• Cans (#22383)

  IProduceWidgets

  authored
  8922303

  Copy full SHA for 8922303

• Automatic changelog update

  PJBot

  committed
  9406007

  Copy full SHA for 9406007

• Jar now fills (#22384)

  Show description for b279f5c
  IProduceWidgets

  authored
  b279f5c

  Copy full SHA for b279f5c

• Donuts (#22385)

  IProduceWidgets

  authored
  7773cbb

  Copy full SHA for 7773cbb

• Nuggets (#22386)

  IProduceWidgets

  authored
  467f980

  Copy full SHA for 467f980

• Take the L (#22387)

  IProduceWidgets

  authored
  cb223ad

  Copy full SHA for cb223ad

• Automatic changelog update

  PJBot

  committed
  321a869

  Copy full SHA for 321a869

• Adjust cig carton contents and size (#22388)

  Show description for 5be3e32
  IProduceWidgets

  authored
  5be3e32

  Copy full SHA for 5be3e32

• Cigar case spin and shape (#22389)

  IProduceWidgets

  authored
  5a864e0

  Copy full SHA for 5a864e0

• Pipe bigger (#22390)

  IProduceWidgets

  authored
  0981535

  Copy full SHA for 0981535

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

  Show description for f22b645
  Morb0

  committed
  f22b645

  Copy full SHA for f22b645

• Update locale

  Morb0

  committed
  f4f2d8b

  Copy full SHA for f4f2d8b

• Fix upstream

  Morb0

  committed
  9cc7771

  Copy full SHA for 9cc7771