Merge branch 'FermiChem' of https://github.com/Thalpy/Citadel-Station-13 into FermiChem
This commit is contained in:
@@ -53,9 +53,6 @@
|
||||
var/addiction_tick = 1
|
||||
var/list/datum/reagent/addiction_list = new/list()
|
||||
var/reagents_holder_flags
|
||||
//FermiChem
|
||||
var/purity = 1
|
||||
var/ammoReacted = 0
|
||||
|
||||
/datum/reagents/New(maximum=100)
|
||||
maximum_volume = maximum
|
||||
@@ -369,6 +366,23 @@
|
||||
var/meets_temp_requirement = 0
|
||||
var/has_special_react = C.special_react
|
||||
var/can_special_react = 0
|
||||
//FermiChem WHY ARE VARIBLES SO ESTRANGED it makes me sad
|
||||
var/OptimalTempMin = C.OptimalTempMin // Lower area of bell curve for determining heat based rate reactions
|
||||
var/OptimalTempMax = C.OptimalTempMax
|
||||
var/ExplodeTemp = C.ExplodeTemp
|
||||
var/OptimalpHMin = C.OptimalpHMin
|
||||
var/OptimalpHMax = C.OptimalpHMax
|
||||
var/ReactpHLim = C.ReactpHLim
|
||||
//var/CatalystFact = C.CatalystFact
|
||||
var/CurveSharpT = C.CurveSharpT
|
||||
var/CurveSharppH = C.CurveSharppH
|
||||
var/ThermicConstant = C.ThermicConstant
|
||||
var/HIonRelease = C.HIonRelease
|
||||
var/RateUpLim = C.RateUpLim
|
||||
var/FermiChem = C.FermiChem
|
||||
var/FermiExplod = C.FermiExplod
|
||||
var/ImpureChem = C.ImpureChem
|
||||
|
||||
|
||||
var/datum/chemical_reaction/C/OptimalTempMin = OptimalTempMin // Lower area of bell curve for determining heat based rate reactions
|
||||
var/OptimalTempMax = C.OptimalTempMax
|
||||
@@ -387,6 +401,9 @@
|
||||
var/ImpureChem = C.ImpureChem
|
||||
|
||||
//FermiChem
|
||||
var/purity = 1
|
||||
var/ammoReacted = 0
|
||||
|
||||
var/deltaT = 0
|
||||
var/deltapH = 0
|
||||
var/stepChemAmmount = 0
|
||||
|
||||
Reference in New Issue
Block a user