Merge pull request #6557 from Citadel-Station-13/upstream-merge-37384

[MIRROR] Re-adds and reworks fusion.
2018-04-28 14:07:08 -05:00
parent 811cc06188 f33c47db7b
commit b565ef9171
12 changed files with 94 additions and 59 deletions
@@ -9,7 +9,7 @@
 #define META_GAS_OVERLAY		4
 #define META_GAS_DANGER			5
 #define META_GAS_ID				6
-
+#define META_GAS_FUSION_POWER   7
 //ATMOS
 //stuff you should probably leave well alone!
 #define R_IDEAL_GAS_EQUATION	8.31	//kPa*L/(K*mol)