cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds a analyse function for advanced chems

Browse Source
This commit is contained in:
Fermi
2019-08-07 16:52:58 +01:00
parent a8e2311caf
commit 10b2cec485
3 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/reagents/chemistry/machinery/chem_master.dm
View File

@@ -21,6 +21,7 @@
var/analyzeVars[0]
var/useramount = 30 // Last used amount
var/list/pillStyles
var/fermianalyze //Give more detail on fermireactions on analysis
/obj/machinery/chem_master/Initialize()
create_reagents(100)
@@ -170,6 +171,7 @@
data["condi"] = condi
data["screen"] = screen
data["analyzeVars"] = analyzeVars
data["fermianalyze"] = fermianalyze
data["chosenPillStyle"] = chosenPillStyle
data["isPillBottleLoaded"] = bottle ? 1 : 0
if(bottle)
@@ -389,7 +391,15 @@
state = "Gas"
var/const/P = 3 //The number of seconds between life ticks
var/T = initial(R.metabolization_rate) * (60 / P)
analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold))
if(istype(R, /datum/reagent/fermi))
fermianalyze = TRUE
var/datum/chemical_reaction/Rcr = get_chemical_reaction(R.id)
message_admins("[Rcr]")
var/pHpeakCache = (Rcr.OptimalpHMin + Rcr.OptimalpHMax)/2
analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold), "purityF" = initial(R.purity), "inverseRatioF" = initial(R.InverseChemVal), "purityE" = initial(Rcr.PurityMin), "minTemp" = initial(Rcr.OptimalTempMin), "maxTemp" = initial(Rcr.OptimalTempMax), "eTemp" = initial(Rcr.ExplodeTemp), "pHpeak" = pHpeakCache)
else
fermianalyze = FALSE
analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold))
screen = "analyze"
return

34
tgui/assets/tgui.js
View File

File diff suppressed because one or more lines are too long

23
tgui/src/interfaces/chem_master.ract
View File

@@ -112,6 +112,29 @@
<span class='highlight'>Addiction Threshold: </span>
<span class='content'>{{data.analyzeVars.addicD}}</span>
<br/>
{{#if data.fermianalyze}}
<span class='highlight'>Minumum Reaction Temperature: </span>
<span class='content'>{{data.analyzeVars.minTemp}}K</span>
<br/>
<span class='highlight'>Optimal Reaction Temperature: </span>
<span class='content'>{{data.analyzeVars.maxTemp}}K</span>
<br/>
<span class='highlight'>Explosion Reaction Temperature: </span>
<span class='content'>{{data.analyzeVars.eTemp}}K</span>
<br/>
<span class='highlight'>Optimal reaction pH: </span>
<span class='content'>{{data.analyzeVars.pHpeak}}</span>
<br/>
<span class='highlight'>Current Purity: </span>
<span class='content'>{{data.analyzeVars.purityF}}</span>
<br/>
<span class='highlight'>Inverse Purity Threshold: </span>
<span class='content'>{{data.analyzeVars.inverseRatioF}}</span>
<br/>
<span class='highlight'>Explosion Purity Threshold: </span>
<span class='content'>{{data.analyzeVars.purityE}}</span>
<br/>
{{/if}}
<br/>
<ui-button action='goScreen' params='{"screen": "home"}'>Back</ui-button>
</ui-display>