Code

Upstream sync#1066

Code

Merged

Rxup merged 36 commits intomasterRxup/space-station-14:masterfrom upstream-syncRxup/space-station-14:upstream-syncCopy head branch name to clipboardFeb 21, 2025

+1,280-412

Commits

Commits on Feb 19, 2025

• Make CharacterPickerButton the same height for dwarves as for non-dwarves (#35297)

  Show description for 2beac02
  Absotively

  authored
  2beac02

  Copy full SHA for 2beac02

• Returns Explosive Technology recipes to Protolathes (#35303)

  Show description for 5f41726
  K-Dynamic

  authored
  5f41726

  Copy full SHA for 5f41726

• Automatic changelog update

  PJBot

  committed
  5148e2f

  Copy full SHA for 5148e2f

• Make OuterClothing hide PDA and belt sprites under it. (#33448)

  Show description for 9b7339e
  Winkarst-cpu

  authored
  9b7339e

  Copy full SHA for 9b7339e

• Automatic changelog update

  PJBot

  committed
  353e988

  Copy full SHA for 353e988

• Fixing intercom encryption key dropping (#34582)

  Show description for 9bde78a
  Booblesnoot42

  authored
  9bde78a

  Copy full SHA for 9bde78a

• Automatic changelog update

  PJBot

  committed
  bc1c82a

  Copy full SHA for bc1c82a

• Fix ExaminableHunger spelling (#35309)

  Show description for cc18ba7
  MilenVolf

  authored
  cc18ba7

  Copy full SHA for cc18ba7

• ports two barsigns from frontier (#35296)

  Show description for 22254a1
  robinthedragon

  authored
  22254a1

  Copy full SHA for 22254a1

• Automatic changelog update

  PJBot

  committed
  201ec61

  Copy full SHA for 201ec61

• Space Lizard Plushie In-hands (#35295)

  Show description for 33b9149
  SeamLesss

  authored
  33b9149

  Copy full SHA for 33b9149

Commits on Feb 20, 2025

• Removed Contraband Status from Flares (#34705)

  Show description for f189bdc
  FungiFellow

  authored
  f189bdc

  Copy full SHA for f189bdc

• Automatic changelog update

  PJBot

  committed
  8b50ac7

  Copy full SHA for 8b50ac7

• Fix: Toys sounds (#33449)

  Show description for 3e449f7
  

  3 peopleauthored
  3e449f7

  Copy full SHA for 3e449f7

• Automatic changelog update

  PJBot

  committed
  112d7c3

  Copy full SHA for 112d7c3

• Update engine to v247.1.0 (#35324)

  ElectroJr

  authored
  1079da4

  Copy full SHA for 1079da4

• Added a component that lets ranged weapons make melee attacks. (#29484)

  Siigiil

  authored
  3ce81d3

  Copy full SHA for 3ce81d3

• General storage fixes (#34845)

  Show description for 7e6e237
  

  metalgearsloth

  authored and

  Errant-4

  committed
  7e6e237

  Copy full SHA for 7e6e237

• Fix missing errorOnMissing arg being passed thru (#35328)

  metalgearsloth

  authored
  5e0a1d8

  Copy full SHA for 5e0a1d8

• Replace obsolete FromMap calls with ToCoordinates (#35304)

  VerinSenpai

  authored
  c8dce26

  Copy full SHA for c8dce26

• Purge uses of TransformComponent.Anchored.set. Also adds parentheses. (#34938)

  TemporalOroboros

  authored
  a4001fb

  Copy full SHA for a4001fb

• Revert "Purge uses of TransformComponent.Anchored.set. Also adds parentheses." (#35332)

  metalgearsloth

  authored
  fa35c96

  Copy full SHA for fa35c96

• Fix to make all corpses butcher able and better disposable (#33727)

  Show description for 580f908
  Zokkie

  authored
  580f908

  Copy full SHA for 580f908

• Automatic changelog update

  PJBot

  committed
  5e9e151

  Copy full SHA for 5e9e151

• Remove storage hotbar GUI bandaid (#35054)

  Show description for abb20c0
  metalgearsloth

  authored
  abb20c0

  Copy full SHA for abb20c0

• Automatic changelog update

  PJBot

  committed
  93021c4

  Copy full SHA for 93021c4

• HOTFIX General storage fixes (#34845) (#35329)

  Errant-4

  authored
  7f8f1bf

  Copy full SHA for 7f8f1bf

• Require hwid (#35331)

  Show description for 09f7539
  nikthechampiongr

  authored
  09f7539

  Copy full SHA for 09f7539

• 2 lines yaml cleanup (#35338)

  lzk228

  authored
  53c82eb

  Copy full SHA for 53c82eb

• fix migration.yml (#35339)

  Show description for ddeda2e
  lzk228

  authored
  ddeda2e

  Copy full SHA for ddeda2e

• Merge branch 'stable' into master-merge

  Errant-4

  committed
  cb822fd

  Copy full SHA for cb822fd

• Merge stable into master (#35340)

  Errant-4

  authored
  f3c6811

  Copy full SHA for f3c6811

• Mjollnir and Singularity Hammer for Wizard (#34446)

  keronshb

  authored
  a9054c5

  Copy full SHA for a9054c5

Commits on Feb 21, 2025

• Fixed Veggie pizza slice having 40u of reagent space (#35343)

  Show description for d6cc167
  spderman3333

  authored
  d6cc167

  Copy full SHA for d6cc167

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

  Rxup

  committed
  3e09ecf

  Copy full SHA for 3e09ecf

• fix upstream

  Rxup

  committed
  4299ed3

  Copy full SHA for 4299ed3