Code

Port Supermatter from Impstation#2717

Code

Open

FaintSpeaker wants to merge 36 commits intoDeltaV-Station:masterDeltaV-Station/Delta-v:masterfrom FaintSpeaker:port/impstation/supermatterFaintSpeaker/Delta-v:port/impstation/supermatterCopy head branch name to clipboard

+3,732-26

Commits

Commits on Jan 12, 2025

• Hi

  

  VMSolidus

  authored and

  FaintSpeaker

  committed
  f9a1001

  Copy full SHA for f9a1001

• Moves stuff to EE folders

  

  honeyed-lemons

  authored and

  FaintSpeaker

  committed
  72999ef

  Copy full SHA for 72999ef

• Adjust radiation protection on various structures and entities

  

  VMSolidus

  authored and

  FaintSpeaker

  committed
  0082a24

  Copy full SHA for 0082a24

• Radiation can no longer prevent doafters

  

  honeyed-lemons

  authored and

  FaintSpeaker

  committed
  bbb4e32

  Copy full SHA for bbb4e32

• Fix supermatter.ftl (DeltaV-Station#790)

  Show description for 15dbfcc
  

  FoxxoTrystan

  authored and

  FaintSpeaker

  committed
  15dbfcc

  Copy full SHA for 15dbfcc

• Bunch of fixes

  

  honeyed-lemons

  authored and

  FaintSpeaker

  committed
  44f3bf4

  Copy full SHA for 44f3bf4

Commits on Jan 13, 2025

• Remove steal objectives

  

  honeyed-lemons

  authored and

  FaintSpeaker

  committed
  6c1daa8

  Copy full SHA for 6c1daa8

• oops

  

  honeyed-lemons

  authored and

  FaintSpeaker

  committed
  4f0ff25

  Copy full SHA for 4f0ff25

• first pass of changes

  

  Darkmajia

  authored and

  FaintSpeaker

  committed
  2978714

  Copy full SHA for 2978714

• more stuff

  

  Darkmajia

  authored and

  FaintSpeaker

  committed
  f63329f

  Copy full SHA for f63329f

• its fucking done

  

  Darkmajia

  authored and

  FaintSpeaker

  committed
  72fdde3

  Copy full SHA for 72fdde3

• forgot one tiny little popup

  

  Darkmajia

  authored and

  FaintSpeaker

  committed
  1e84a0f

  Copy full SHA for 1e84a0f

• guidebook update

  

  Darkmajia

  authored and

  FaintSpeaker

  committed
  192e6da

  Copy full SHA for 192e6da

• computer and board entities, barebones ui without functionality

  

  Darkmajia

  authored and

  FaintSpeaker

  committed
  5f610d4

  Copy full SHA for 5f610d4

• i dont know shit about staging commits

  

  Darkmajia

  authored and

  FaintSpeaker

  committed
  a205fef

  Copy full SHA for a205fef

• Rename _EinsteinEngines => _EE

  FaintSpeaker

  committed
  17eee9a

  Copy full SHA for 17eee9a

• Move CCVars to their own file, remove CCVars that snuck in during cherry-pick

  FaintSpeaker

  committed
  fd5736d

  Copy full SHA for fd5736d

• Port ClothingGrantTag from impstation/imp-station-14#673

  FaintSpeaker

  committed
  1d34a48

  Copy full SHA for 1d34a48

• Fixed CCVar class name in a missed file

  FaintSpeaker

  committed
  d161075

  Copy full SHA for d161075

• Fix missing keys state for the supermatter monitor computer

  FaintSpeaker

  committed
  ea907f9

  Copy full SHA for ea907f9

• supermatter air alarm

  

  Darkmajia

  authored and

  FaintSpeaker

  committed
  4264a1c

  Copy full SHA for 4264a1c

• lightning system fixes

  

  Darkmajia

  authored and

  FaintSpeaker

  committed
  8cded46

  Copy full SHA for 8cded46

• what the fuck

  

  Darkmajia

  authored and

  FaintSpeaker

  committed
  f25a44e

  Copy full SHA for f25a44e

Commits on Jan 14, 2025

• Commenting changes

  FaintSpeaker

  committed
  27e1215

  Copy full SHA for 27e1215

• Remove empty file, remove unused tag.

  FaintSpeaker

  committed
  b1f3813

  Copy full SHA for b1f3813

• Merge branch 'master' into port/impstation/supermatter

  FaintSpeaker

  committed
  9e764f8

  Copy full SHA for 9e764f8

• Merge branch 'master' into port/impstation/supermatter

  FaintSpeaker

  committed
  aa5a019

  Copy full SHA for aa5a019

• Missing lathe recipe.

  FaintSpeaker

  committed
  5a7c098

  Copy full SHA for 5a7c098

• Requested changes

  FaintSpeaker

  committed
  5b744f5

  Copy full SHA for 5b744f5

• Reorder yaml to type > parent > id > name

  FaintSpeaker

  committed
  30275a2

  Copy full SHA for 30275a2

• Merge branch 'master' into port/impstation/supermatter

  FaintSpeaker

  committed
  661378f

  Copy full SHA for 661378f

Commits on Jan 15, 2025

• Missed some change requests; Moved supermatter computer into it's own RSI.

  FaintSpeaker

  committed
  d9df112

  Copy full SHA for d9df112

• Merge branch 'master' into port/impstation/supermatter

  FaintSpeaker

  committed
  26a05e8

  Copy full SHA for 26a05e8

Commits on Jan 18, 2025

• Merge branch 'master' into port/impstation/supermatter

  FaintSpeaker

  committed
  55c1e21

  Copy full SHA for 55c1e21

• Requested code change

  FaintSpeaker

  committed
  f7edf35

  Copy full SHA for f7edf35

Commits on Jan 19, 2025

• Merge branch 'master' into port/impstation/supermatter

  FaintSpeaker

  authored
  ec06412

  Copy full SHA for ec06412