Code

Upstream sync#1672

Code

Merged

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

+175,129-165,802

Commits

Commits on Dec 23, 2023

• Update WizDen's borg definition of crew (#22873)

  Show description for e559c08
  Chief-Engineer

  authored
  e559c08

  Copy full SHA for e559c08

• Check for divide by near zero (#22876)

  Partmedia

  authored
  99d6aff

  Copy full SHA for 99d6aff

• Doggy Ears (#22832)

  Show description for def4e0f
  TheShuEd

  authored
  def4e0f

  Copy full SHA for def4e0f

• jaws cant pry bolted doors (#22860)

  Show description for ffe4569
  deltanedas

  authored
  ffe4569

  Copy full SHA for ffe4569

• add saturation to TC inhand sprites (#22870)

  Show description for 8604efc
  lzk228

  authored
  8604efc

  Copy full SHA for 8604efc

• Anomaly synchronizer buff (#22771)

  Show description for 3f8ad3a
  TheShuEd

  authored
  3f8ad3a

  Copy full SHA for 3f8ad3a

• New sprites for books on bookshelves in order to look less sad. (#22874)

  Show description for c64c98e
  Moomoobeef

  authored
  c64c98e

  Copy full SHA for c64c98e

• Drug overlay shader rework - a little more motion-sickness friendly, a little less shonky (#22872)

  Show description for e61b7d1
  deathride58

  authored
  e61b7d1

  Copy full SHA for e61b7d1

• Cargo request plasma canister locale (#22858)

  Show description for 6baf564
  lapatison

  authored
  6baf564

  Copy full SHA for 6baf564

• Vial Drinking (#22886)

  Show description for 33399db
  liltenhead

  authored
  33399db

  Copy full SHA for 33399db

• Corner Clothing UI (#22883)

  Show description for 9b18357
  EmoGarbage404

  authored
  9b18357

  Copy full SHA for 9b18357

• Move HUD options to general options tab (#22884)

  EmoGarbage404

  authored
  06a663d

  Copy full SHA for 06a663d

• Add a bottle of water to the survival box (#22881)

  Show description for a09efd4
  Blackern5000

  authored
  a09efd4

  Copy full SHA for a09efd4

• Add Chef's Belt (#22868)

  Show description for dfa71af
  

  IamVelcroboy

  and

  BurningRash

  authored
  dfa71af

  Copy full SHA for dfa71af

• temporarily override WizDen admin names (#22878)

  Show description for 0f6d062
  Chief-Engineer

  authored
  0f6d062

  Copy full SHA for 0f6d062

• Correct spelling mistakes for daily tips (#22893)

  Show description for 9103061
  SpaceyLady

  authored
  9103061

  Copy full SHA for 9103061

• Fixes GLES2 crashing when compiling the drug shader (#22899)

  Show description for 9870c7f
  deathride58

  authored
  9870c7f

  Copy full SHA for 9870c7f

• Fix accidental plasma burn nerf (#22894)

  BasedUser

  authored
  f2cb05b

  Copy full SHA for f2cb05b

• fixes drug shader in compatibility mode FOR REAL THIS TIME (#22903)

  Show description for 3addd3e
  deathride58

  authored
  3addd3e

  Copy full SHA for 3addd3e

Commits on Dec 24, 2023

• Update Credits (#22906)

  Show description for 1db2230
  

  github-actions[bot]

  and

  PJBot

  authored
  1db2230

  Copy full SHA for 1db2230

• fix cargo backpack inhand sprite (#22888)

  Show description for 5d0624b
  lzk228

  authored
  5d0624b

  Copy full SHA for 5d0624b

• Adds a vscode launch option for starting the client in the compatibility renderer (#22904)

  Show description for 30ff5fd
  deathride58

  authored
  30ff5fd

  Copy full SHA for 30ff5fd

• Clamp after AdjustMoles() (#22907)

  Show description for ecf65fb
  Partmedia

  authored
  ecf65fb

  Copy full SHA for ecf65fb

• Fix missing pipe on barratry (#22889)

  Show description for 54a2f84
  lzk228

  authored
  54a2f84

  Copy full SHA for 54a2f84

• Added Santa's hardsuit and helmet. (#22898)

  Show description for 734da59
  StanTheCarpenter

  authored
  734da59

  Copy full SHA for 734da59

• Fix nettle seeds inhand sprite (#22891)

  Show description for e6b52cc
  lzk228

  authored
  e6b52cc

  Copy full SHA for e6b52cc

• Power monitoring console overhaul (#20927)

  Show description for 1de682e
  chromiumboy

  authored
  1de682e

  Copy full SHA for 1de682e

• ItemToggle system expansion (#22369)

  Show description for a3fbab8
  

  Darkenson

  and

  metalgearsloth

  authored
  a3fbab8

  Copy full SHA for a3fbab8

• Core update (#22909)

  Show description for ba4b03f
  UbaserB

  authored
  ba4b03f

  Copy full SHA for ba4b03f

• Ion law visuals (#22908)

  EmoGarbage404

  authored
  681f9a2

  Copy full SHA for 681f9a2

• Fixed PaperSystem bugs (#22896)

  LordCarve

  authored
  044f5e7

  Copy full SHA for 044f5e7

• bagel update (#22910)

  Emisse

  authored
  82349d4

  Copy full SHA for 82349d4

• New Thief minor antagonist (#21520)

  Show description for 144af23
  

  3 peopleauthored
  144af23

  Copy full SHA for 144af23

• New boxstation emergency shuttle (#22912)

  Show description for 06fea3e
  Flareguy

  authored
  06fea3e

  Copy full SHA for 06fea3e

• add ninja borg laws (#22778)

  Show description for df2b4c1
  deltanedas

  authored
  df2b4c1

  Copy full SHA for df2b4c1

• Add maximum atmos temperature limit (#22882)

  Show description for 2c3f3e5
  Partmedia

  authored
  2c3f3e5

  Copy full SHA for 2c3f3e5

• Adds sound to Smoke Grenades (#22866)

  Show description for bd398a6
  Hmeister-fake

  authored
  bd398a6

  Copy full SHA for bd398a6

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

  Show description for c333fc2
  Morb0

  committed
  c333fc2

  Copy full SHA for c333fc2

• Update locale

  Morb0

  committed
  1efc71f

  Copy full SHA for 1efc71f