Code

[Tweak] Upstream sync#990

Code

Merged

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

+287,031-130,552

Commits

Commits on Dec 19, 2024

• Remove plushie_lizard_mirrored.png (#33855)

  Show description for 25980d8
  LevitatingTree

  authored
  25980d8

  Copy full SHA for 25980d8

• Tweaks for the holopad (#33928)

  Show description for 209c176
  

  chromiumboy

  and

  slarticodefast

  authored
  209c176

  Copy full SHA for 209c176

• Fix: Update armor crate description (#33414)

  Show description for 7f6d55a
  Plykiya

  authored
  7f6d55a

  Copy full SHA for 7f6d55a

• Automatic changelog update

  PJBot

  committed
  ae5c1f5

  Copy full SHA for ae5c1f5

• Loopstation hotfix (#33958)

  Show description for fe69ef6
  

  TytosB

  and

  Emisse

  authored
  fe69ef6

  Copy full SHA for fe69ef6

• Update Fland for holopads (#33962)

  Show description for ee72cda
  ArtisticRoomba

  authored
  ee72cda

  Copy full SHA for ee72cda

• Fixes/removes borg spawnpoint from Oasis Engineering, added one to Robotics (#33960)

  Show description for 0462993
  

  august-sun

  and

  august-sun

  authored
  0462993

  Copy full SHA for 0462993

• Update Credits (#33865)

  Show description for 7f2907a
  

  github-actions[bot]

  and

  PJBot

  authored
  7f2907a

  Copy full SHA for 7f2907a

• Winter stuff tweak (#2873)

  Ko4ergaPunk

  authored
  d8a745e

  Copy full SHA for d8a745e

Commits on Dec 20, 2024

• Minor fixes for the holopad (#33969)

  Show description for 39600f9
  chromiumboy

  authored
  39600f9

  Copy full SHA for 39600f9

• add man-o-war shuttle (#32105)

  Show description for 864c225
  IProduceWidgets

  authored
  864c225

  Copy full SHA for 864c225

• Add MovementSound (#31313)

  Show description for a2912e3
  metalgearsloth

  authored
  a2912e3

  Copy full SHA for a2912e3

• Remove Clearly Nuclear on Author's Request (#33971)

  Show description for 34b9066
  Piras314

  authored
  34b9066

  Copy full SHA for 34b9066

• Automatic changelog update

  PJBot

  committed
  f4fd647

  Copy full SHA for f4fd647

• Fix communication console menu (#33655)

  Show description for 4c0a134
  SpyDev14

  authored
  4c0a134

  Copy full SHA for 4c0a134

• Automatic changelog update

  PJBot

  committed
  f19377d

  Copy full SHA for f19377d

• [Maps] Mappool update (#2865)

  NotSoDana

  authored
  a822ee5

  Copy full SHA for a822ee5

• combine licence files for StationEvents audio (#33972)

  Show description for 1419b88
  Errant-4

  authored
  1419b88

  Copy full SHA for 1419b88

• All hostile turret (#33970)

  Show description for 5a07413
  CaptainMaru

  authored
  5a07413

  Copy full SHA for 5a07413

• Automatic changelog update

  PJBot

  committed
  0e850ab

  Copy full SHA for 0e850ab

• Add clearer defib cooldowns! (#31251)

  Show description for a0a4057
  

  beck-thompson

  and

  slarticodefast

  authored
  a0a4057

  Copy full SHA for a0a4057

• Automatic changelog update

  PJBot

  committed
  a89d254

  Copy full SHA for a89d254

• Nanotrasen, Syndicate factions are now hostile to Dragons and Carps (#32515)

  Show description for e4974cb
  AverageNotDoingAnythingEnjoyer

  authored
  e4974cb

  Copy full SHA for e4974cb

• Automatic changelog update

  PJBot

  committed
  bbceffa

  Copy full SHA for bbceffa

• Add description of tool qualities to entity (#32436)

  Show description for 919fdc0
  

  lzk228

  and

  slarticodefast

  authored
  919fdc0

  Copy full SHA for 919fdc0

• Automatic changelog update

  PJBot

  committed
  50cc90f

  Copy full SHA for 50cc90f

• Diona chirping & Nymph vocals (#32511)

  Show description for 3a917bc
  Pinkbat5

  authored
  3a917bc

  Copy full SHA for 3a917bc

• Automatic changelog update

  PJBot

  committed
  9a4f956

  Copy full SHA for 9a4f956

Commits on Dec 21, 2024

• Increase syndicate uplink discount amount to 6. (#33950)

  Show description for 03a54e9
  ScarKy0

  authored
  03a54e9

  Copy full SHA for 03a54e9

• Automatic changelog update

  PJBot

  committed
  00f12e0

  Copy full SHA for 00f12e0

• Wood walls from barricades (#33902)

  Show description for 12c5c7e
  

  3 peopleauthored
  12c5c7e

  Copy full SHA for 12c5c7e

• Automatic changelog update

  PJBot

  committed
  1f85916

  Copy full SHA for 1f85916

• Implement some field-level deltas (#28242)

  Show description for 9f4aa1e
  

  metalgearsloth

  and

  ElectroJr

  authored
  9f4aa1e

  Copy full SHA for 9f4aa1e

• Update submodule to 237.4.0 (#33976)

  metalgearsloth

  authored
  b011dbb

  Copy full SHA for b011dbb

• Lamps sprite update (#2876)

  SonicHDC

  authored
  b10ef58

  Copy full SHA for b10ef58

• Toolshed refactor (#33598)

  Show description for 06e2bba
  ElectroJr

  authored
  06e2bba

  Copy full SHA for 06e2bba

• Automatic changelog update

  PJBot

  committed
  b3551fb

  Copy full SHA for b3551fb

• Update engine to v238.0.0 (#33980)

  ElectroJr

  authored
  7baa1ae

  Copy full SHA for 7baa1ae

• Automatic changelog update

  PJBot

  committed
  1abe9db

  Copy full SHA for 1abe9db

Commits on Dec 22, 2024

• adjust eshotgun recharge delay (#33996)

  Errant-4

  authored
  58181c3

  Copy full SHA for 58181c3

• 2024-12-20 Release "HoLoopad Holiday" (#34007)

  Errant-4

  authored
  3358801

  Copy full SHA for 3358801

• Merge stable into master (#34008)

  slarticodefast

  authored
  2ff8238

  Copy full SHA for 2ff8238

• Specify privacy policy for Wizard's Den (#34013)

  PJB3005

  authored
  1450c4c

  Copy full SHA for 1450c4c

• Localized holopads for Box (#34011)

  Show description for f28c812
  ScarKy0

  authored
  f28c812

  Copy full SHA for f28c812

• Train: fix problematic atmos setup (#34018)

  Show description for c873f90
  slarticodefast

  authored
  c873f90

  Copy full SHA for c873f90

Commits on Dec 23, 2024

• Update corvax_delta.yml (#2878)

  Bloodcanis

  authored
  d286029

  Copy full SHA for d286029

• silent footsteps for ninja (#33280)

  Show description for 4ddd7d3
  

  3 peopleauthored
  4ddd7d3

  Copy full SHA for 4ddd7d3

• Automatic changelog update

  PJBot

  committed
  38bd2e5

  Copy full SHA for 38bd2e5

• minor fix to "silent footsteps for ninja" (#34040)

  Show description for dfc0e01
  slarticodefast

  authored
  dfc0e01

  Copy full SHA for dfc0e01

• Fix the sensor monitoring console (#34035)

  Show description for f98192d
  PJB3005

  authored
  f98192d

  Copy full SHA for f98192d

• Fix borgs being able to drink from buckets and spray bottles. (#32964)

  Show description for b82605b
  

  amatwiedle

  and

  dankeaj

  authored
  b82605b

  Copy full SHA for b82605b

• Automatic changelog update

  PJBot

  committed
  030f97b

  Copy full SHA for 030f97b

• [Maps] Silly Hot-Fix! (#2879)

  Doctorjakes

  authored
  7d48e16

  Copy full SHA for 7d48e16

• [Maps] Glacier update (#2875)

  NotSoDana

  authored
  3122825

  Copy full SHA for 3122825

• Remove cog cargo protolathe (#34026)

  Show description for 5d8e916
  Booblesnoot42

  authored
  5d8e916

  Copy full SHA for 5d8e916

• Removed protolathe from cargo on Amber (#34027)

  Booblesnoot42

  authored
  2dd99b5

  Copy full SHA for 2dd99b5

• Automatic changelog update

  PJBot

  committed
  843a5de

  Copy full SHA for 843a5de

• Increases Marathon cryosleep size, added meteor shielding to Marathon chapelroid (#34044)

  Show description for 2c4be6b
  

  august-sun

  and

  august-sun

  authored
  2c4be6b

  Copy full SHA for 2c4be6b

Commits on Dec 24, 2024

• Fix race condition causing disconnected admins to appear in adminwho (#34033)

  PJB3005

  authored
  285e934

  Copy full SHA for 285e934

• Adds more air alarms and sensors throughout Oasis, linked unlinked air devices (#34046)

  Show description for 39b2ce8
  

  august-sun

  and

  august-sun

  authored
  39b2ce8

  Copy full SHA for 39b2ce8

• Multiple items in loadouts (#33193)

  Show description for 1c33073
  

  TheShuEd

  and

  slarticodefast

  authored
  1c33073

  Copy full SHA for 1c33073

• Automatic changelog update

  PJBot

  committed
  8fcfca6

  Copy full SHA for 8fcfca6

• Add crazybrain23 to CODEOWNERS (#34038)

  Show description for 4e9862d
  crazybrain23

  authored
  4e9862d

  Copy full SHA for 4e9862d

• Update Credits (#33998)

  Show description for 31aec73
  

  github-actions[bot]

  and

  PJBot

  authored
  31aec73

  Copy full SHA for 31aec73

• Allow to paint multiple airlocks (#34001)

  Show description for 1cbc8c1
  lzk228

  authored
  1cbc8c1

  Copy full SHA for 1cbc8c1

• Automatic changelog update

  PJBot

  committed
  c83532e

  Copy full SHA for c83532e

Commits on Dec 25, 2024

• Link Core cargo shuttle atmos devices (#34061)

  Show description for 4064d55
  minus1over12

  authored
  4064d55

  Copy full SHA for 4064d55

• bagel update (#34062)

  Show description for 7803254
  Emisse

  authored
  7803254

  Copy full SHA for 7803254

• [Maps] New Year CentCom (#2883)

  lastPechkin

  authored
  457a70b

  Copy full SHA for 457a70b

• Loop Station update and fixes (#34067)

  Show description for 392046f
  

  TytosB

  and

  Emisse

  authored
  392046f

  Copy full SHA for 392046f

• [Maps] Astra NoERP Update (#2884)

  lastPechkin

  authored
  208948c

  Copy full SHA for 208948c

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

  Show description for 6106783
  Morb0

  committed
  6106783

  Copy full SHA for 6106783

• Apply typing state to holopad

  Morb0

  committed
  78143b1

  Copy full SHA for 78143b1

• Fix upstream

  Morb0

  committed
  96d19e9

  Copy full SHA for 96d19e9

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

  Show description for d9ec458
  Morb0

  authored
  d9ec458

  Copy full SHA for d9ec458

Commits on Dec 26, 2024

• Amber Station - Fixed evac shuttle screens (#34071)

  Show description for 4b34dd6
  southbridge-fur

  authored
  4b34dd6

  Copy full SHA for 4b34dd6

• bagel update (#34073)

  Emisse

  authored
  52d39aa

  Copy full SHA for 52d39aa

• [Maps] Map pool change (#2887)

  Ko4ergaPunk

  authored
  71c814f

  Copy full SHA for 71c814f

• [MAPS] Paper Tweak (#2882)

  XsenonDash

  authored
  58c1a7e

  Copy full SHA for 58c1a7e

• [Maps] Astra Holo (#2886)

  lastPechkin

  authored
  a02f7e1

  Copy full SHA for a02f7e1

• Reinforced tables require welding to construct/deconstruct (#33992)

  ArtisticRoomba

  authored
  bf727b0

  Copy full SHA for bf727b0

• Automatic changelog update

  PJBot

  committed
  fab5dd1

  Copy full SHA for fab5dd1

Commits on Dec 27, 2024

• Arrivals blacklist for bluespace lockers and QSIs (#34072)

  Show description for 34e9979
  crazybrain23

  authored
  34e9979

  Copy full SHA for 34e9979

• Automatic changelog update

  PJBot

  committed
  ca0596e

  Copy full SHA for ca0596e

• Fix popup on handcuffing for person being handcuffed (#33639)

  Show description for 860052c
  Plykiya

  authored
  860052c

  Copy full SHA for 860052c

• Automatic changelog update

  PJBot

  committed
  9acce42

  Copy full SHA for 9acce42

Commits on Dec 28, 2024

• Ignore audio entities in SpawnAndDeleteEntityCountTest (#34021)

  ElectroJr

  authored
  97dd551

  Copy full SHA for 97dd551

• Fix wagging action name and desc (#34089)

  lzk228

  authored
  d92ed75

  Copy full SHA for d92ed75

• Removed Power Monitoring Computer boards from research and lathe recipes. Added default engineering sprites for atmos computer boards. (#34078)

  Show description for a21d809
  Alpaccalypse

  authored
  a21d809

  Copy full SHA for a21d809

• Automatic changelog update

  PJBot

  committed
  b24ab38

  Copy full SHA for b24ab38

• Traitor can no longer get multiple objectives to save/help/kill the same person (#33704)

  Show description for 616d341
  psykana

  authored
  616d341

  Copy full SHA for 616d341

• Automatic changelog update

  PJBot

  committed
  1b478d4

  Copy full SHA for 1b478d4

• Removes weh.txt from Textures/Parallaxes (#34097)

  Show description for 01980cb
  PursuitInAshes

  authored
  01980cb

  Copy full SHA for 01980cb

• UI improvements for holopads (#34055)

  Show description for 6c46515
  chromiumboy

  authored
  6c46515

  Copy full SHA for 6c46515

• Automatic changelog update

  PJBot

  committed
  4155440

  Copy full SHA for 4155440

Commits on Dec 29, 2024

• Update Credits (#34109)

  Show description for 3f84b04
  

  github-actions[bot]

  and

  PJBot

  authored
  3f84b04

  Copy full SHA for 3f84b04

• Added support so that smile can use hats (#33924)

  Show description for 5d0d371
  zHonys

  authored
  5d0d371

  Copy full SHA for 5d0d371

• Automatic changelog update

  PJBot

  committed
  9f9553b

  Copy full SHA for 9f9553b

• Add a guaranteed cotton pizza to pizza crates (#33997)

  Show description for bfb256f
  ewokswagger

  authored
  bfb256f

  Copy full SHA for bfb256f

• Automatic changelog update

  PJBot

  committed
  4bb68c4

  Copy full SHA for 4bb68c4

• Corrected Cotton Dough Recipe (#33988)

  Booblesnoot42

  authored
  2c41ed0

  Copy full SHA for 2c41ed0

• New cotton baguette, crostini, chevre-chaud, bagel, and croissant foods for moffs (#33508)

  Show description for e07609b
  ArtisticRoomba

  authored
  e07609b

  Copy full SHA for e07609b

• Automatic changelog update

  PJBot

  committed
  a7ca552

  Copy full SHA for a7ca552

• Rolling joints no longer requires a filter (#34106)

  Show description for d6a9fe1
  

  IamVelcroboy

  and

  BurningRash

  authored
  d6a9fe1

  Copy full SHA for d6a9fe1

• Automatic changelog update

  PJBot

  committed
  da8bb99

  Copy full SHA for da8bb99

• fix interdimensional teleporter desc (#34108)

  Show description for 072b973
  lzk228

  authored
  072b973

  Copy full SHA for 072b973

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

  Roudenn

  committed
  4d092f9

  Copy full SHA for 4d092f9

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

  Roudenn

  committed
  a2ffe6f

  Copy full SHA for a2ffe6f

• fix

  Show description for fe93c20
  Roudenn

  committed
  fe93c20

  Copy full SHA for fe93c20