Code

[Tweak] Upstream sync#976

Code

Merged

Rxup merged 92 commits intoRxup:masterRxup/space-station-14:masterfrom Roudenn:upstream-syncRoudenn/space-station-14:upstream-syncCopy head branch name to clipboardDec 8, 2024

+363,949-159,793

Commits

Commits on Nov 30, 2024

• [Maps] Silly Winter Update (#2809)

  Doctorjakes

  authored
  ecdba1c

  Copy full SHA for ecdba1c

• [Maps] Pilgrim update Rxup#7 — Winter (#2821)

  Ko4ergaPunk

  authored
  a793bc4

  Copy full SHA for a793bc4

• Fix for handcuffing someone more than once (#33646)

  Show description for 021c983
  Plykiya

  authored
  021c983

  Copy full SHA for 021c983

• Automatic changelog update

  PJBot

  committed
  973f42b

  Copy full SHA for 973f42b

• Fix for inspecting entities in hand (#33642)

  Show description for 450bf81
  Plykiya

  authored
  450bf81

  Copy full SHA for 450bf81

• Automatic changelog update

  PJBot

  committed
  3d98460

  Copy full SHA for 3d98460

• Fix for inspecting entities in the stripping window (#33644)

  Show description for fb76cd9
  Plykiya

  authored
  fb76cd9

  Copy full SHA for fb76cd9

• Automatic changelog update

  PJBot

  committed
  766389a

  Copy full SHA for 766389a

• Fix borgs not getting names on roundstart (#33578)

  Show description for ab36b15
  

  Winkarst-cpu

  and

  Winkarst

  authored
  ab36b15

  Copy full SHA for ab36b15

• Automatic changelog update

  PJBot

  committed
  720fccf

  Copy full SHA for 720fccf

• Require Wield To Activate Double-bladed ESword (#32869)

  Show description for efb35d7
  thetolbean

  authored
  efb35d7

  Copy full SHA for efb35d7

• Automatic changelog update

  PJBot

  committed
  44ef60a

  Copy full SHA for 44ef60a

• Fix makeghostroleraffle command where 4 arguments (#31836)

  Show description for 061b1b8
  TokenStyle

  authored
  061b1b8

  Copy full SHA for 061b1b8

• Automatic changelog update

  PJBot

  committed
  a46323d

  Copy full SHA for a46323d

Commits on Dec 1, 2024

• Update Credits (#33670)

  Show description for 3984f0a
  

  github-actions[bot]

  and

  PJBot

  authored
  3984f0a

  Copy full SHA for 3984f0a

• Fix formatting IDE0055 warnings in VS Code (#33669)

  CrafterKolyan

  authored
  2d405c9

  Copy full SHA for 2d405c9

• Replace obsolete GetTilesIntersecting methods (#32455)

  Show description for 5fdf03c
  MilenVolf

  authored
  5fdf03c

  Copy full SHA for 5fdf03c

• delta winter (#2824)

  Bloodcanis

  authored
  feb2e21

  Copy full SHA for feb2e21

• Update Snowasis (#33364)

  Show description for bf312f2
  IProduceWidgets

  authored
  bf312f2

  Copy full SHA for bf312f2

• Automatic changelog update

  PJBot

  committed
  237324e

  Copy full SHA for 237324e

• [MAPS] Paper Cristmass update (#2822)

  XsenonDash

  authored
  05d4513

  Copy full SHA for 05d4513

• Fix wrong system usage (#33679)

  Show description for d4067bc
  MilenVolf

  authored
  d4067bc

  Copy full SHA for d4067bc

• resprite new year nuke (#2825)

  SonicHDC

  authored
  fba997e

  Copy full SHA for fba997e

• Fix BuckleSystem always marking InteractHandEvent as Handled (#33602)

  Show description for b3841e8
  

  MilenVolf

  and

  slarticodefast

  authored
  b3841e8

  Copy full SHA for b3841e8

• Automatic changelog update

  PJBot

  committed
  560fd8d

  Copy full SHA for 560fd8d

Commits on Dec 2, 2024

• Touching up Bagel Security Brig (#33680)

  Show description for 7f966ab
  

  dylanstrategie

  and

  dylanstrategie

  authored
  7f966ab

  Copy full SHA for 7f966ab

• [Maps] Tushkan update Rxup#3 — Winter (#2826)

  Ko4ergaPunk

  authored
  768d2ba

  Copy full SHA for 768d2ba

• Map pool tweak (#2827)

  Ko4ergaPunk

  authored
  eada6f3

  Copy full SHA for eada6f3

• Fixed ghost role rules for some syndicate familiars (#32457)

  Show description for 638a1dc
  

  3 peopleauthored
  638a1dc

  Copy full SHA for 638a1dc

• Automatic changelog update

  PJBot

  committed
  cc804bf

  Copy full SHA for cc804bf

• Fix lobby countdown not showing hours (#33685)

  SpaceManiac

  authored
  b800d98

  Copy full SHA for b800d98

Commits on Dec 3, 2024

• New Low-Mid Pop Station - Amber Station (#33441)

  Show description for e4e84ae
  

  southbridge-fur

  and

  Emisse

  authored
  e4e84ae

  Copy full SHA for e4e84ae

• Automatic changelog update

  PJBot

  committed
  f0829a6

  Copy full SHA for f0829a6

• Makes kukri not use combat knife's storage sprite (#33661)

  SpaceRox1244

  authored
  2e31eb3

  Copy full SHA for 2e31eb3

• Adds a morgue locked maints airlock (#33693)

  Show description for c1491e9
  

  IamVelcroboy

  and

  BurningRash

  authored
  c1491e9

  Copy full SHA for c1491e9

• Juiceable slimeballs (#33660)

  Show description for 029b037
  luizwritescode

  authored
  029b037

  Copy full SHA for 029b037

• Add missing nacho recipes (#33637)

  Show description for e50c98c
  CheddaCheez

  authored
  e50c98c

  Copy full SHA for e50c98c

• Automatic changelog update

  PJBot

  committed
  bfd005a

  Copy full SHA for bfd005a

• Amber Station Seasonal Update (#33698)

  Show description for 2c2a435
  southbridge-fur

  authored
  2c2a435

  Copy full SHA for 2c2a435

• [Maps] Pilgrim update Rxup#8 & Silly tweak (#2828)

  Ko4ergaPunk

  authored
  8902943

  Copy full SHA for 8902943

• Amber Improvements (#33707)

  Show description for 8718263
  southbridge-fur

  authored
  8718263

  Copy full SHA for 8718263

Commits on Dec 4, 2024

• Fix sinks and toilets not draining (#33691)

  Show description for cf202e8
  Partmedia

  authored
  cf202e8

  Copy full SHA for cf202e8

• Automatic changelog update

  PJBot

  committed
  7ffd801

  Copy full SHA for 7ffd801

• Fix layout on wires UI (#33714)

  Show description for c10a72b
  PJB3005

  authored
  c10a72b

  Copy full SHA for c10a72b

• Automatic changelog update

  PJBot

  committed
  fc8f7fb

  Copy full SHA for fc8f7fb

• Fix for towels not having a cooldown for cleaning (#33700)

  Show description for 2e26ca7
  tapiocaphobe

  authored
  2e26ca7

  Copy full SHA for 2e26ca7

• Add cooldown to buttons in borg's laws UI (#31490)

  Hreno

  authored
  152cf33

  Copy full SHA for 152cf33

• Adds Store on Collide and Wand of the Locker (#33710)

  Show description for 82528dc
  keronshb

  authored
  82528dc

  Copy full SHA for 82528dc

• Automatic changelog update

  PJBot

  committed
  fbfcccb

  Copy full SHA for fbfcccb

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

  Show description for e76bb1f
  Morb0

  committed
  e76bb1f

  Copy full SHA for e76bb1f

• Update locale

  Morb0

  committed
  214b315

  Copy full SHA for 214b315

Commits on Dec 5, 2024

• Amber Station - Removed Vox Box (#33725)

  Show description for da68ae9
  southbridge-fur

  authored
  da68ae9

  Copy full SHA for da68ae9

• Fix upstream

  Morb0

  committed
  e5ea431

  Copy full SHA for e5ea431

• Merge pull request #2830 from space-syndicate/upstream-sync

  Show description for f02ba8b
  Morb0

  authored
  f02ba8b

  Copy full SHA for f02ba8b

• bagel update (#33726)

  Show description for 90c8776
  Emisse

  authored
  90c8776

  Copy full SHA for 90c8776

• Box Station - Removed Vox Box (#33729)

  Show description for bcf2b9a
  southbridge-fur

  authored
  bcf2b9a

  Copy full SHA for bcf2b9a

• Cog vox box removal (#33730)

  Show description for 59bce41
  Spessmann

  authored
  59bce41

  Copy full SHA for 59bce41

• More device configurator serialization fixes (#33664)

  Show description for 6f51aa4
  ElectroJr

  authored
  6f51aa4

  Copy full SHA for 6f51aa4

• Fix meteor's ArithmeticException (#33556)

  Show description for ce672ac
  

  Winkarst-cpu

  and

  Winkarst

  authored
  ce672ac

  Copy full SHA for ce672ac

• update server configs (#2799)

  lzk228

  authored
  8986c27

  Copy full SHA for 8986c27

• Give vox health regen for poison below 20 damage (#33722)

  PJB3005

  authored
  dc8b859

  Copy full SHA for dc8b859

• Automatic changelog update

  PJBot

  committed
  97ece02

  Copy full SHA for 97ece02

• set n2 survival box sprite layers (#33733)

  IProduceWidgets

  authored
  8f3973b

  Copy full SHA for 8f3973b

• Automatic changelog update

  PJBot

  committed
  0e6ec2e

  Copy full SHA for 0e6ec2e

• Fix displacements map for female vulp and reptilian (#2832)

  Show description for cf698b2
  

  Litogin

  and

  lzk228

  authored
  cf698b2

  Copy full SHA for cf698b2

Commits on Dec 6, 2024

• fix a station event weighting bug (#33584)

  Show description for 3e0b93d
  IProduceWidgets

  authored
  3e0b93d

  Copy full SHA for 3e0b93d

• Automatic changelog update

  PJBot

  committed
  cd1177d

  Copy full SHA for cd1177d

• Adds Station Anchor Beacon (#33711)

  Show description for 207c849
  

  IamVelcroboy

  and

  BurningRash

  authored
  207c849

  Copy full SHA for 207c849

• Fix name duplications (#33740)

  Show description for d6ba759
  MilenVolf

  authored
  d6ba759

  Copy full SHA for d6ba759

• Add a maintenance panel to bar signs (#33467)

  Show description for 52a8869
  

  3 peopleauthored
  52a8869

  Copy full SHA for 52a8869

• Automatic changelog update

  PJBot

  committed
  38c8ffb

  Copy full SHA for 38c8ffb

• Derelict Borg Revival (#33433)

  Show description for 274c3ab
  ScarKy0

  authored
  274c3ab

  Copy full SHA for 274c3ab

• Automatic changelog update

  PJBot

  committed
  94090f7

  Copy full SHA for 94090f7

• Amber Station - Added Evac Shuttle (#33743)

  Show description for 623a35b
  southbridge-fur

  authored
  623a35b

  Copy full SHA for 623a35b

• vox guidebook update poison regen (#33739)

  Show description for 2d6e52b
  Errant-4

  authored
  2d6e52b

  Copy full SHA for 2d6e52b

• Fix debris chunks loot spawning (#33747)

  Show description for 7d410d6
  TheShuEd

  authored
  7d410d6

  Copy full SHA for 7d410d6

• Automatic changelog update

  PJBot

  committed
  d6d95f1

  Copy full SHA for d6d95f1

• Added several variables to make ClumsyComponent more modular for developers. (#33715)

  Show description for 6add781
  

  widgetbeck

  and

  slarticodefast

  authored
  6add781

  Copy full SHA for 6add781

• Add Sprite changes to Logic Gates to show the input/output state (#33277)

  0tito

  authored
  de19418

  Copy full SHA for de19418

• Samurai dogi is now major contraband (#33699)

  K-Dynamic

  authored
  e244472

  Copy full SHA for e244472

• Localize ai dataset names (#33608)

  Show description for b66fd98
  

  MilenVolf

  and

  slarticodefast

  authored
  b66fd98

  Copy full SHA for b66fd98

• clean up random lathe recipes (#31525)

  Show description for 3300ff2
  

  deltanedas

  and

  slarticodefast

  authored
  3300ff2

  Copy full SHA for 3300ff2

• Make unknown shuttle events trigger an announcement (#33450)

  Show description for 4beb101
  

  Winkarst-cpu

  and

  Winkarst

  authored
  4beb101

  Copy full SHA for 4beb101

Commits on Dec 7, 2024

• Predicted gas pumps (#33717)

  Show description for 9365e3a
  metalgearsloth

  authored
  9365e3a

  Copy full SHA for 9365e3a

• Automatic changelog update

  PJBot

  committed
  44daf85

  Copy full SHA for 44daf85

• Christmas Nuke Song (#33752)

  Show description for 0d45dfa
  

  Piras314

  and

  slarticodefast

  authored
  0d45dfa

  Copy full SHA for 0d45dfa

• Automatic changelog update

  PJBot

  committed
  1a96a2b

  Copy full SHA for 1a96a2b

• Box Station - Now more festive! (#33751)

  Show description for cf73cd5
  southbridge-fur

  authored
  cf73cd5

  Copy full SHA for cf73cd5

• infiltrator update (#33759)

  Emisse

  authored
  7f5c3cf

  Copy full SHA for 7f5c3cf

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

  Roudenn

  committed
  2a18da0

  Copy full SHA for 2a18da0

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

  Roudenn

  committed
  eb5def3

  Copy full SHA for eb5def3

• fix

  Roudenn

  committed
  60b5161

  Copy full SHA for 60b5161