Merge pull request #6373 from Citadel-Station-13/upstream-merge-37116

[MIRROR] Fixes order of operations math errors with gas defines.
This commit is contained in:
deathride58
2018-04-11 21:26:47 +00:00
committed by GitHub
2 changed files with 7 additions and 7 deletions

View File

@@ -1,7 +1,7 @@
//Plasma fire properties
#define OXYGEN_BURN_RATE_BASE 1.4
#define PLASMA_BURN_RATE_DELTA 9
#define PLASMA_UPPER_TEMPERATURE 1370+T0C
#define PLASMA_UPPER_TEMPERATURE (1370+T0C)
#define PLASMA_MINIMUM_OXYGEN_NEEDED 2
#define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO 30
#define PLASMA_OXYGEN_FULLBURN 10
@@ -28,7 +28,7 @@
#define PLASMA_FUSED_COEFFICENT 0.08
#define CATALYST_COEFFICENT 0.01
#define FUSION_PURITY_THRESHOLD 0.95
#define FUSION_HEAT_DROPOFF 20000+T0C
#define FUSION_HEAT_DROPOFF (20000+T0C)
#define NOBLIUM_FORMATION_ENERGY 2e9 //1 Mole of Noblium takes the planck energy to condense.
/datum/controller/subsystem/air/var/list/gas_reactions //this is our singleton of all reactions