Code

Merge Upstream 20.01.2025#1028

Code

Merged

Gaxeer merged 24 commits intomasterss220club/BandaStation:masterfrom merge-upstreamss220club/BandaStation:merge-upstreamCopy head branch name to clipboardJan 20, 2025

+1,026-541

Commits

Commits on Jan 18, 2025

• Grillable foods grill in hot air (tgstation#88914)

  Show description for 04a6723
  Jacquerel

  authored
  04a6723

  Copy full SHA for 04a6723

• Automatic changelog for PR tgstation#88914 [ci skip]

  tgstation-ci[bot]

  authored
  63f4281

  Copy full SHA for 63f4281

• Redo of the Geyser Code: Second Attempt (tgstation#89111)

  Show description for 4f14df1
  Chowder-McArthor

  authored
  4f14df1

  Copy full SHA for 4f14df1

• Automatic changelog for PR tgstation#89111 [ci skip]

  tgstation-ci[bot]

  authored
  d1e3444

  Copy full SHA for d1e3444

• Small and tiny mobs no longer trigger the squeak component (tgstation#89100)

  Show description for 8c721d1
  Absolucy

  authored
  8c721d1

  Copy full SHA for 8c721d1

• Automatic changelog for PR tgstation#89100 [ci skip]

  tgstation-ci[bot]

  authored
  1f270ee

  Copy full SHA for 1f270ee

Commits on Jan 19, 2025

• Automatic changelog compile [ci skip]

  tgstation-ci[bot]

  committed
  ed54b22

  Copy full SHA for ed54b22

• Resprites default and mirage grenades (tgstation#89118)

  SmArtKar

  authored
  85f1199

  Copy full SHA for 85f1199

• Touches up the unholy water flask (tgstation#89117)

  SmArtKar

  authored
  e1c8779

  Copy full SHA for e1c8779

• Automatic changelog for PR tgstation#89118 [ci skip]

  tgstation-ci[bot]

  authored
  d28db31

  Copy full SHA for d28db31

• Automatic changelog for PR tgstation#89117 [ci skip]

  tgstation-ci[bot]

  authored
  622f8de

  Copy full SHA for 622f8de

• A Small Circuit Expansion: Wallmounts, Undertiles, and Wire Bundles (tgstation#89122)

  Show description for 90b67b0
  Y0SH1M4S73R

  authored
  90b67b0

  Copy full SHA for 90b67b0

• Automatic changelog for PR tgstation#89122 [ci skip]

  tgstation-ci[bot]

  authored
  ff5a9ec

  Copy full SHA for ff5a9ec

• Fixes Engine Diagnostic surgery (tgstation#89131)

  Show description for 3986b5d
  RengaN02

  authored
  3986b5d

  Copy full SHA for 3986b5d

• Automatic changelog for PR tgstation#89131 [ci skip]

  tgstation-ci[bot]

  authored
  60a56f7

  Copy full SHA for 60a56f7

• Removes the from from from from (tgstation#89127)

  vinylspiders

  authored
  cbc7437

  Copy full SHA for cbc7437

• makes mimics into basicmobs (tgstation#88910)

  Show description for 4b512f1
  

  mc-oofert

  and

  Jacquerel

  authored
  4b512f1

  Copy full SHA for 4b512f1

• Automatic changelog for PR tgstation#88910 [ci skip]

  tgstation-ci[bot]

  authored
  192b698

  Copy full SHA for 192b698

Commits on Jan 20, 2025

• Cancelling stray admin configured syndicate cargo-pods actually works, also adds missing uplinks to customization (tgstation#89047)

  Show description for 2d156a0
  NamelessFairy

  authored
  2d156a0

  Copy full SHA for 2d156a0

• Automatic changelog compile [ci skip]

  tgstation-ci[bot]

  committed
  1ad83be

  Copy full SHA for 1ad83be

• Automatic changelog for PR tgstation#89047 [ci skip]

  tgstation-ci[bot]

  authored
  1bf9e41

  Copy full SHA for 1bf9e41

• Fixes HFR moderator overflow runtime. (tgstation#89095)

  Show description for 059d17a
  Pickle-Coding

  authored
  059d17a

  Copy full SHA for 059d17a

• Automatic changelog for PR tgstation#89095 [ci skip]

  tgstation-ci[bot]

  authored
  66858d8

  Copy full SHA for 66858d8

• Merge branch 'master' into merge-upstream

  m-dzianishchyts

  authored
  ccfeda3

  Copy full SHA for ccfeda3