Code

Upstream Merge 2024-09-26#212

Code

Merged

FoxxoTrystan merged 22 commits intoFansana:masterFansana/floofstation1:masterfrom Mnemotechnician:floof-upstream-merge-2024-09-26Mnemotechnician/floofstation:floof-upstream-merge-2024-09-26Copy head branch name to clipboardSep 27, 2024

+3,673-915

Commits

Commits on Sep 21, 2024

• Update Credits (#923)

  Show description for 0e187aa
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  0e187aa

  Copy full SHA for 0e187aa

• Reimplement Part Upgrading (#917)

  Show description for 49d128c
  

  VMSolidus

  and

  DEATHB4DEFEAT

  authored
  49d128c

  Copy full SHA for 49d128c

• [Port] Uplink Discounts From White Dream (#930)

  Show description for f126bb4
  

  3 peopleauthored
  f126bb4

  Copy full SHA for f126bb4

• Automatic Changelog Update (#917)

  SimpleStation14

  committed
  331d68d

  Copy full SHA for 331d68d

• Automatic Changelog Update (#930)

  SimpleStation14

  committed
  1b43123

  Copy full SHA for 1b43123

• Psionic "Heal Other" Powers (#942)

  Show description for 61e1c8c
  

  VMSolidus

  and

  DEATHB4DEFEAT

  authored
  61e1c8c

  Copy full SHA for 61e1c8c

• Automatic Changelog Update (#942)

  SimpleStation14

  committed
  272b4ec

  Copy full SHA for 272b4ec

• More Objects Hit By Projectiles (#943)

  Show description for 5bf5d57
  VMSolidus

  authored
  5bf5d57

  Copy full SHA for 5bf5d57

• Automatic Changelog Update (#943)

  SimpleStation14

  committed
  900630c

  Copy full SHA for 900630c

Commits on Sep 22, 2024

• Update Credits (#946)

  Show description for 89860b4
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  89860b4

  Copy full SHA for 89860b4

Commits on Sep 24, 2024

• Fix HealingWord & Revivify Bugs (#949)

  Show description for 99ee312
  VMSolidus

  authored
  99ee312

  Copy full SHA for 99ee312

• More Quick Construction Recipes And Upgrades (#945)

  Show description for 7c7619c
  

  gluesniffler

  and

  VMSolidus

  authored
  7c7619c

  Copy full SHA for 7c7619c

• Automatic Changelog Update (#949)

  SimpleStation14

  committed
  5b9f28c

  Copy full SHA for 5b9f28c

• Automatic Changelog Update (#945)

  SimpleStation14

  committed
  08248ff

  Copy full SHA for 08248ff

Commits on Sep 25, 2024

• IPCs Don't Weigh 5kg (#959)

  Show description for 42871bc
  VMSolidus

  authored
  42871bc

  Copy full SHA for 42871bc

• Automatic Changelog Update (#959)

  SimpleStation14

  committed
  b53b555

  Copy full SHA for b53b555

Commits on Sep 26, 2024

• Enemies and Allies Content Port (#956)

  Show description for af0c932
  

  3 peopleauthored
  af0c932

  Copy full SHA for af0c932

• Automatic Changelog Update (#956)

  SimpleStation14

  committed
  883352e

  Copy full SHA for 883352e

• Merge remote-tracking branch 'refs/remotes/real-ee/master' into floof-upstream-merge-2024-09-26

  Show description for 6fe7e67
  Mnemotechnician

  committed
  6fe7e67

  Copy full SHA for 6fe7e67

• Remove obsolete prototypes

  Mnemotechnician

  committed
  f50c29e

  Copy full SHA for f50c29e

• Begone

  Mnemotechnician

  committed
  26d2938

  Copy full SHA for 26d2938

• Fix dead IPCs not having a startup button

  Mnemotechnician

  committed
  5c92c52

  Copy full SHA for 5c92c52