Code

Upstream sync#1026

Code

Merged

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

+2,856-2,395

Commits

Commits on Feb 1, 2025

• Armory Packed update. (#34808)

  ToxicSonicFan04

  authored
  763136f

  Copy full SHA for 763136f

• Automatic changelog update

  PJBot

  committed
  3fa83d8

  Copy full SHA for 3fa83d8

Commits on Feb 2, 2025

• Add Reagent gold and silver solification with frost oil (#33239)

  Show description for 4aaa7ba
  

  Minty642

  and

  slarticodefast

  authored
  4aaa7ba

  Copy full SHA for 4aaa7ba

• Automatic changelog update

  PJBot

  committed
  4864d47

  Copy full SHA for 4864d47

• Ghost orbit jitter fix (#34797)

  Show description for a238f71
  Tayrtahn

  authored
  a238f71

  Copy full SHA for a238f71

• Automatic changelog update

  PJBot

  committed
  67e6664

  Copy full SHA for 67e6664

• Update submodule to 242.0.1 (#34817)

  metalgearsloth

  authored
  26f6a15

  Copy full SHA for 26f6a15

• Fix diona plushie bloom visuals (#34832)

  Tayrtahn

  authored
  eeccdbf

  Copy full SHA for eeccdbf

• Reworded the "SAY HEY LISTEN" silicon law (#34819)

  Show description for 2991f1a
  Utmanarn

  authored
  2991f1a

  Copy full SHA for 2991f1a

• Wizard Touch Spells (Smite, Cluwne's Curse, Slippery Slope) (#34531)

  Show description for c82f77e
  keronshb

  authored
  c82f77e

  Copy full SHA for c82f77e

• Fixes debug assertion thrown when spiking with pills (#34813)

  Plykiya

  authored
  95b863d

  Copy full SHA for 95b863d

• Fixes debug assertion thrown when chopping logs (#34814)

  Plykiya

  authored
  28709fd

  Copy full SHA for 28709fd

• Fixes debug assertion crash when inserting cash (#34812)

  Plykiya

  authored
  75e4697

  Copy full SHA for 75e4697

• [Admin] Omni Accent Smite (#34824)

  Show description for 8d1a300
  ScarKy0

  authored
  8d1a300

  Copy full SHA for 8d1a300

• Automatic changelog update

  PJBot

  committed
  c52ff59

  Copy full SHA for c52ff59

• Fixed Wehxplosion yaml error (#34837)

  Alpha-Two

  authored
  20f5cbf

  Copy full SHA for 20f5cbf

• HOTFIX update staging submodule to 242.0.1 (#34833)

  Errant-4

  authored
  7579620

  Copy full SHA for 7579620

• HOTFIX revert lecter visual update #34589 (#34826)

  Errant-4

  authored
  f34233a

  Copy full SHA for f34233a

• Allowed windows to be properly clicked on (#34751)

  impubbi

  authored
  82bd0a2

  Copy full SHA for 82bd0a2

• Fix hitting through directional windows (and more!) (#34793)

  SlamBamActionman

  authored
  f257201

  Copy full SHA for f257201

• Revert "Add taped logo back for 10th anniversary" (#34831)

  slarticodefast

  authored
  87fa6a3

  Copy full SHA for 87fa6a3

Commits on Feb 3, 2025

• Security Shield Naming Structure Inconsistency Change (#34841)

  DieselMohawk

  authored
  8b56f6f

  Copy full SHA for 8b56f6f

• Automatic changelog update

  PJBot

  committed
  f8c203b

  Copy full SHA for f8c203b

• DSword Replacement - the Hypereutactic Blade (#32414)

  Show description for 3d6188c
  keronshb

  authored
  3d6188c

  Copy full SHA for 3d6188c

• Automatic changelog update

  PJBot

  committed
  4476b1e

  Copy full SHA for 4476b1e

• fixed effect string typos (#34858)

  Show description for a4599f6
  Alpha-Two

  authored
  a4599f6

  Copy full SHA for a4599f6

• Store Test Change (#34844)

  ActiveMammmoth

  authored
  ca4e99b

  Copy full SHA for ca4e99b

• contrabandInventory Changes (Fixed) (#32934)

  Show description for 2ffe539
  

  AgentSmithRadio

  and

  Jarmer123

  authored
  2ffe539

  Copy full SHA for 2ffe539

• Automatic changelog update

  PJBot

  committed
  df56b67

  Copy full SHA for df56b67

Commits on Feb 4, 2025

• Cabinetification (#34293)

  Show description for b2a6d5c
  ps3moira

  authored
  b2a6d5c

  Copy full SHA for b2a6d5c

• Automatic changelog update

  PJBot

  committed
  d531a9d

  Copy full SHA for d531a9d

• Fixed bola effect stacking (#34723)

  impubbi

  authored
  a71a79d

  Copy full SHA for a71a79d

• Automatic changelog update

  PJBot

  committed
  1d5b011

  Copy full SHA for 1d5b011

• Mind Swap Fix (#33553)

  Show description for 6a017ef
  ActiveMammmoth

  authored
  6a017ef

  Copy full SHA for 6a017ef

• Add binoculars (#34687)

  Show description for 8035455
  slarticodefast

  authored
  8035455

  Copy full SHA for 8035455

• Automatic changelog update

  PJBot

  committed
  b5125f0

  Copy full SHA for b5125f0

• Hristov & .60 changes - Hristov Rework, Part 2 (#31662)

  Show description for e58d031
  SlamBamActionman

  authored
  e58d031

  Copy full SHA for e58d031

• Dehardcoded Space Heaters UI window title (#34884)

  Menshin

  authored
  5af55bb

  Copy full SHA for 5af55bb

• Plasma evac shuttle timer fix (#34847)

  Show description for 26cff2c
  Compilatron144

  authored
  26cff2c

  Copy full SHA for 26cff2c

• Fix Oasis evac timer (#34849)

  Show description for d9d451d
  DinnerCalzone

  authored
  d9d451d

  Copy full SHA for d9d451d

• Omega Armory Restock (#34810)

  ToxicSonicFan04

  authored
  8482767

  Copy full SHA for 8482767

• Adds randomized maintenance rooms to convex station (#34866)

  Show description for 26d9f22
  Spessmann

  authored
  26d9f22

  Copy full SHA for 26d9f22

• Automatic changelog update

  PJBot

  committed
  7478af2

  Copy full SHA for 7478af2

• Add clientside personal pointlight for observers (#33607)

  Show description for 265de76
  

  3 peopleauthored
  265de76

  Copy full SHA for 265de76

• Automatic changelog update

  PJBot

  committed
  5b41728

  Copy full SHA for 5b41728

Commits on Feb 5, 2025

• Update Credits (#34815)

  Show description for f52116b
  

  github-actions[bot]

  and

  PJBot

  authored
  f52116b

  Copy full SHA for f52116b

• HealingSystem: check blood restoration, staunching (#33526)

  Show description for 5092681
  whatston3

  authored
  5092681

  Copy full SHA for 5092681

• Automatic changelog update

  PJBot

  committed
  a725de1

  Copy full SHA for a725de1

• Expand variety of strange pills (#34843)

  Show description for 2cea673
  DuckManZach

  authored
  2cea673

  Copy full SHA for 2cea673

• Automatic changelog update

  PJBot

  committed
  16b91ce

  Copy full SHA for 16b91ce

• Remove Vector assets and renames Vector SMG magazines (#34603)

  Show description for e9c0338
  K-Dynamic

  authored
  e9c0338

  Copy full SHA for e9c0338

• revert engine

  Errant-4

  committed
  eb2aa08

  Copy full SHA for eb2aa08

• Changed utensil sprites to appear smaller. (#34277)

  Show description for 13be8de
  Gavin-TC

  authored
  13be8de

  Copy full SHA for 13be8de

• Automatic changelog update

  PJBot

  committed
  214fb24

  Copy full SHA for 214fb24

• Revert "Storage sidebar fix (#34680)"

  Show description for d6a9ddd
  Errant-4

  committed
  d6a9ddd

  Copy full SHA for d6a9ddd

• Revert "Storage UI V2 (#33045)"

  Show description for fc80a18
  Errant-4

  committed
  fc80a18

  Copy full SHA for fc80a18

• Revert "Update ScalingViewport for Engine PR (#28786)"

  Show description for f2c74ef
  Errant-4

  committed
  f2c74ef

  Copy full SHA for f2c74ef

• Remove instant cryobed insertion (#34619)

  Show description for ded6b46
  Booblesnoot42

  authored
  ded6b46

  Copy full SHA for ded6b46

• Automatic changelog update

  PJBot

  committed
  4964aae

  Copy full SHA for 4964aae

• Reduce NukeOps Reinforcement price from 35TC to 30TC (#34675)

  Show description for 54d5ef9
  hyperDelegate

  authored
  54d5ef9

  Copy full SHA for 54d5ef9

• Automatic changelog update

  PJBot

  committed
  1e7b414

  Copy full SHA for 1e7b414

• Elf Ears (#33572)

  Show description for d0bdbc8
  Farrellka-dev

  authored
  d0bdbc8

  Copy full SHA for d0bdbc8

• Automatic changelog update

  PJBot

  committed
  efa067c

  Copy full SHA for efa067c

• Make hacking energy swords predicted (#34877)

  Show description for 0d9f9e9
  Plykiya

  authored
  0d9f9e9

  Copy full SHA for 0d9f9e9

• Sec Balance Part 1: Buffs Disabler and Disabler SMG (#34890)

  Show description for f964908
  keronshb

  authored
  f964908

  Copy full SHA for f964908

• Automatic changelog update

  PJBot

  committed
  3a3268b

  Copy full SHA for 3a3268b

• Emisse told me I can name it the grinch (#34905)

  VasilisThePikachu

  authored
  6824ab4

  Copy full SHA for 6824ab4

Commits on Feb 6, 2025

• Merge branch 'master' of ssh://github.com/space-wizards/space-station-14 into staging

  VasilisThePikachu

  committed
  36e42fb

  Copy full SHA for 36e42fb

• Update engine properly

  VasilisThePikachu

  committed
  0c2baf9

  Copy full SHA for 0c2baf9

• ~~Stable~~ Staging merge for the grinch (#34909)

  VasilisThePikachu

  authored
  434d158

  Copy full SHA for 434d158

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

  Rxup

  committed
  2c57b3a

  Copy full SHA for 2c57b3a

• upstream

  Show description for 3b2b397
  Rxup

  committed
  3b2b397

  Copy full SHA for 3b2b397