Code

Upstream merge#280

Code

Merged

formlessnameless merged 29 commits intoimpstation:masterimpstation/imp-station-14:masterfrom formlessnameless:devformlessnameless/imp-station-14:devCopy head branch name to clipboardSep 18, 2024

+2,444-288

Commits

Commits on Sep 16, 2024

• Fix examine flickering until you examine something around you (space-wizards#32205)

  DrSmugleaf

  authored
  4adbb8d

• Automatic changelog update

  PJBot

  committed
  a585023

• Adds the syndicate Booze-O-Mat (Bruise-O-Mat) to nukie planet (space-wizards#32107)

  ArtisticRoomba

  authored
  65bf3c6

• Automatic changelog update

  PJBot

  committed
  b940d85

• Change the binary translator key's contraband designation to syndicate contraband + minor sprite change for consistency (space-wizards#32193)

  Show description for 65329ab
  ArtisticRoomba

  authored
  65329ab

• Automatic changelog update

  PJBot

  committed
  f05498e

• Immovable Rod Spawn Addition: Lizard Plushie (space-wizards#32113)

  Show description for b2dbad3
  

  august-sun

  and

  august-sun

  authored
  b2dbad3

• Lizards now metabolize chocolate (space-wizards#32147)

  Show description for 4abb6a7
  

  MissKay1994

  and

  slarticodefast

  authored
  4abb6a7

• Automatic changelog update

  PJBot

  committed
  af53d55

• Localization of steal targets (space-wizards#30153)

  Show description for ccc5f61
  

  chavonadelal

  and

  TheShuEd

  authored
  ccc5f61

Commits on Sep 17, 2024

• Crayons buffed to 45 uses (space-wizards#32061)

  Show description for 41617b9
  

  Kanashi-Panda

  and

  slarticodefast

  authored
  41617b9

• Automatic changelog update

  PJBot

  committed
  5eaac00

• Anomalous infections (space-wizards#31876)

  Show description for 92be69a
  TheShuEd

  authored
  92be69a

• Automatic changelog update

  PJBot

  committed
  21bd9df

• fix Tech anomaly loud sounds and superfast flickering (space-wizards#32245)

  Show description for dce537d
  TheShuEd

  authored
  dce537d

• Automatic changelog update

  PJBot

  committed
  9afc786

• Fix plant mutations carrying over to other plants and future rounds (space-wizards#32257)

  Show description for 337af48
  

  drakewill-CRL

  and

  PraxisMapper

  authored
  337af48

• Automatic changelog update

  PJBot

  committed
  60887dd

• Added a number of new and very nerdy names for the AI (space-wizards#31951)

  Show description for 6fc4e96
  Moomoobeef

  authored
  6fc4e96

• Automatic changelog update

  PJBot

  committed
  870bacb

• Fix Anomaly infections infinity growing after curing (space-wizards#32259)

  TheShuEd

  authored
  6108935

Commits on Sep 18, 2024

• Fix borg defib module throwing an exception (space-wizards#32260)

  Show description for eca63a4
  PJB3005

  authored
  eca63a4

• Easy IconSmooth spriting (space-wizards#32210)

  Show description for 675a919
  TheShuEd

  authored
  675a919

• Fix AudioSystem nullability checks for engine PR (space-wizards#32233)

  ElectroJr

  authored
  974c085

• Use TurfSystem.IsTileBlocked instead of TurfHelpers (space-wizards#32174)

  Show description for 2bceaad
  Winkarst-cpu

  authored
  2bceaad

• Update submodule to 235.0.0 (space-wizards#32265)

  metalgearsloth

  authored
  54e4cfe

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

  formlessnameless

  committed
  c540847

• Moved our version of immovable rod to match upstream

  formlessnameless

  committed
  09b3cc7

• fix noSpawn setting updates, fix localization for steal objectives

  formlessnameless

  committed
  3df9c46