Code

Upstream merge#295

Code

Merged

irismessage merged 41 commits intoimpstation:masterimpstation/imp-station-14:masterfrom irismessage:upstreamirismessage/imp-station-14:upstreamCopy head branch name to clipboardSep 19, 2024

+1,538-359

Commits

Commits on Sep 18, 2024

• Fix bagel vox box (space-wizards#32208)

  Show description for a123791
  lzk228

  authored
  a123791

  Copy full SHA for a123791

• New publish workflow for Robust.Cdn (space-wizards#32222)

  Show description for 8322b1c
  PJB3005

  authored
  8322b1c

  Copy full SHA for 8322b1c

• chmod +x publish_multi_request.py (space-wizards#32274)

  Show description for b55366c
  PJB3005

  authored
  b55366c

  Copy full SHA for b55366c

• ghost-role-information-silicon-rules (space-wizards#32275)

  Show description for 489938c
  AsnDen

  authored
  489938c

  Copy full SHA for 489938c

• Fix guidebook cakebatter recipe (space-wizards#32276)

  Show description for ed83593
  Calecute

  authored
  ed83593

  Copy full SHA for ed83593

• Automatic changelog update

  PJBot

  committed
  697f4f5

  Copy full SHA for 697f4f5

• Wires ui tooltip localization (space-wizards#32284)

  Show description for 9fad1ab
  chavonadelal

  authored
  9fad1ab

  Copy full SHA for 9fad1ab

• Localization of the shuttle call sender (space-wizards#32286)

  chavonadelal

  authored
  6d41775

  Copy full SHA for 6d41775

• change jamjar glasses description (space-wizards#32215)

  Show description for 55b7e3c
  Skarletto

  authored
  55b7e3c

  Copy full SHA for 55b7e3c

• Fix recycler eating materials (Salvage mains rejoice) (space-wizards#32144)

  Show description for 58119bc
  beck-thompson

  authored
  58119bc

  Copy full SHA for 58119bc

• Automatic changelog update

  PJBot

  committed
  64aab9e

  Copy full SHA for 64aab9e

• Localization cooldown/remaining string in alerts (space-wizards#32282)

  Show description for ba24ebf
  chavonadelal

  authored
  ba24ebf

  Copy full SHA for ba24ebf

• add interaction success/failure events (space-wizards#32216)

  Show description for 8a924c8
  deltanedas

  authored
  8a924c8

  Copy full SHA for 8a924c8

• make epinephrine adrenaline (space-wizards#32076)

  Show description for 2c9a302
  deltanedas

  authored
  2c9a302

  Copy full SHA for 2c9a302

• Automatic changelog update

  PJBot

  committed
  a8686b3

  Copy full SHA for a8686b3

• Fix unbuckling others when clicking on the strap entity (space-wizards#29998)

  Show description for d4a5bc8
  ShadowCommander

  authored
  d4a5bc8

  Copy full SHA for d4a5bc8

• Add a method to get the first available ItemSlot (space-wizards#29846)

  Show description for 7ceb2d2
  ShadowCommander

  authored
  7ceb2d2

  Copy full SHA for 7ceb2d2

• Automatic changelog update

  PJBot

  committed
  e6e1664

  Copy full SHA for e6e1664

• let FlashArea be called from shared (space-wizards#30343)

  Show description for 84062da
  

  deltanedas

  and

  metalgearsloth

  authored
  84062da

  Copy full SHA for 84062da

Commits on Sep 19, 2024

• move TriggerExplosion to shared (space-wizards#30227)

  Show description for 1c839da
  deltanedas

  authored
  1c839da

  Copy full SHA for 1c839da

• Add flip button to mapping state (space-wizards#30636)

  metalgearsloth

  authored
  4f77709

  Copy full SHA for 4f77709

• Give prototype refactor (space-wizards#29697)

  Show description for 6958789
  ShadowCommander

  authored
  6958789

  Copy full SHA for 6958789

• Allow containment field generators to be enabled on mapinit (space-wizards#31158)

  Show description for cc7e5e0
  SlamBamActionman

  authored
  cc7e5e0

  Copy full SHA for cc7e5e0

• Make fire leave burnt decals on the tiles (space-wizards#31939)

  Show description for c2a201d
  Winkarst-cpu

  authored
  c2a201d

  Copy full SHA for c2a201d

• Automatic changelog update

  PJBot

  committed
  0c5a053

  Copy full SHA for 0c5a053

• Coordinates under IFF Label on Mass Scanners and Shuttle Consoles (space-wizards#31501)

  Show description for 1c3cfee
  

  ArchRBX

  and

  archrbx

  authored
  1c3cfee

  Copy full SHA for 1c3cfee

• Automatic changelog update

  PJBot

  committed
  c2f0626

  Copy full SHA for c2f0626

• Fix TEG acting as infinite energy source on destruction (space-wizards#29972)

  Show description for 9c905cd
  

  3 peopleauthored
  9c905cd

  Copy full SHA for 9c905cd

• Automatic changelog update

  PJBot

  committed
  b129629

  Copy full SHA for b129629

• Clean up solution regen and drain comps (space-wizards#29777)

  Show description for 550c423
  

  IProduceWidgets

  and

  Tayrtahn

  authored
  550c423

  Copy full SHA for 550c423

• Make status effect networking not use TryAddStatusEffect (space-wizards#28766)

  Show description for bdd0561
  ElectroJr

  authored
  bdd0561

  Copy full SHA for bdd0561

• Move PlaceableSurfaceComponent usages to PlaceableSurfaceSystem (space-wizards#28384)

  Show description for 3fc9f96
  

  ShadowCommander

  and

  metalgearsloth

  authored
  3fc9f96

  Copy full SHA for 3fc9f96

• Padded ItemStatus Text (space-wizards#29560)

  Show description for 3acf6b9
  

  Willhelm53

  and

  metalgearsloth

  authored
  3acf6b9

  Copy full SHA for 3acf6b9

• Fix Set Outfit command/verb (space-wizards#29672)

  Show description for 94ad76f
  

  Tayrtahn

  and

  metalgearsloth

  authored
  94ad76f

  Copy full SHA for 94ad76f

• adds plasma and uranium arrows (space-wizards#31241)

  Boaz1111

  authored
  59a8f44

  Copy full SHA for 59a8f44

• Automatic changelog update

  PJBot

  committed
  75ff65d

  Copy full SHA for 75ff65d

• Wanted list cartridge (space-wizards#31223)

  Show description for 1468cbd
  Ertanic

  authored
  1468cbd

  Copy full SHA for 1468cbd

• Automatic changelog update

  PJBot

  committed
  ccadcc9

  Copy full SHA for ccadcc9

• Crew Monitor filter (space-wizards#31659)

  Show description for 854bfd2
  

  Errant-4

  and

  slarticodefast

  authored
  854bfd2

  Copy full SHA for 854bfd2

• Automatic changelog update

  PJBot

  committed
  eb90479

  Copy full SHA for eb90479

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

  irismessage

  committed
  e621474

  Copy full SHA for e621474