Code

Upstream update#1

Code

Merged

Truoizys merged 29 commits intoPrison-Station-14:masterPrison-Station-14/prison-station-14:masterfrom Truoizys:upstream-updateTruoizys/prison-station-14:upstream-updateCopy head branch name to clipboardJul 8, 2024

+936-1,428

Commits

Commits on Jul 5, 2024

• Fire Axe resprite 45 degrees v3 (#28866)

  Show description for 24c47c8
  AndreyCamper

  authored
  24c47c8

• nuke biochem (#29751)

  Show description for 84ff5e3
  laok233

  authored
  84ff5e3

Commits on Jul 6, 2024

• Shuttle map button tweaks (#29757)

  Show description for 4c5c6a8
  metalgearsloth

  authored
  4c5c6a8

• Automatic changelog update

  PJBot

  committed
  12edad8

• Don't allow toggling internals while asleep (#29753)

  themias

  authored
  7b99d1f

• You no longer get deleted when cuffed and buckled (#29718)

  Show description for 7ae3e35
  Killerqu00

  authored
  7ae3e35

• Fixes a minor typo for the base gingerbread body part (#29717)

  Show description for 34f3666
  MFMessage

  authored
  34f3666

• Phoronman 1984 (#29747)

  Show description for b418338
  Errant-4

  authored
  b418338

• Added cryosleep UnitSpawner and UnitSpawnerLate to the map Origin (#29761)

  Show description for 5cd7cf1
  

  JIPDawg

  and

  JIP

  authored
  5cd7cf1

• Automatic changelog update

  PJBot

  committed
  fa6d680

Commits on Jul 7, 2024

• Fix wielding while pulling (#29781)

  themias

  authored
  60ef784

• Update Credits (#29784)

  Show description for 0098d71
  

  github-actions[bot]

  and

  PJBot

  authored
  0098d71

• Spilling reagents on mutliple entities at once fix (#29763)

  Show description for 18df27d
  beck-thompson

  authored
  18df27d

• Automatic changelog update

  PJBot

  committed
  d9be666

• Improve buckling's interactions with standing state (#29741)

  Tayrtahn

  authored
  23887d5

• Automatic changelog update

  PJBot

  committed
  336f264

• Add supplybot moving states (#29795)

  Show description for c9c721b
  lzk228

  authored
  c9c721b

• Raise ratking migration minimum players to 30 from 15 (#29737)

  Simyon264

  authored
  f50488d

• Automatic changelog update

  PJBot

  committed
  063c5de

• Intercom buffs and fixes (#29580)

  Show description for 0e9ed36
  EmoGarbage404

  authored
  0e9ed36

• Automatic changelog update

  PJBot

  committed
  71b7ddd

• Bartending+: Shaking and Stirring (#29243)

  Show description for 13b8487
  Vermidia

  authored
  13b8487

• Slicing food with Swords (#29005)

  Show description for 437f6f4
  NotSoDana

  authored
  437f6f4

• fix(hardsuits): Give the carp suit and hardsuit a suit storage slot (#29322)

  Show description for 70b5613
  Brandon-Huu

  authored
  70b5613

• Automatic changelog update

  PJBot

  committed
  ff93070

• metal foam grenades (#29428)

  Show description for 21d0f85
  EmoGarbage404

  authored
  21d0f85

• The real AME nerf (#29587)

  Show description for ed7f006
  EmoGarbage404

  authored
  ed7f006

• Removes max damage threshold on healing for hyperzine (#29712)

  Show description for 04249e8
  

  Plykiya

  and

  plykiya

  authored
  04249e8

• Automatic changelog update

  PJBot

  committed
  eab93cb