shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147

Browse Source
This commit is contained in:
Ghommie
2019-09-03 21:08:09 +02:00
parent 05d839029a c7941fda58
commit 9ec97579bd
1529 changed files with 21814 additions and 7632 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tgui/src/interfaces/chem_dispenser.ract
+1
View File
@@ -34,6 +34,7 @@
<ui-section label='Contents'>
{{#if data.isBeakerLoaded}}
<span>{{Math.round(adata.beakerCurrentVolume)}}/{{data.beakerMaxVolume}} Units</span>
<span>pH: {{Math.round(adata.beakerCurrentpH*adata.partRating)/adata.partRating}}</span>
<br/>
{{#each adata.beakerContents}}
<span class='highlight' intro-outro='fade'>{{Math.fixed(volume, 2)}} units of {{name}}</span><br/>
tgui/src/interfaces/chem_heater.ract
+6 -1
View File
@@ -16,9 +16,14 @@
<ui-section label='Contents'>
{{#if data.isBeakerLoaded}}
<span>Temperature: {{Math.round(adata.currentTemp)}} K</span>
<br />
<span>pH: {{Math.round(adata.currentpH*adata.partRating)/adata.partRating}}</span>
<br />
{{#each adata.beakerContents}}
<span class='highlight' intro-outro='fade'>{{Math.fixed(volume, 2)}} units of {{name}}</span><br/>
<span class='highlight' intro-outro='fade'>{{Math.fixed(volume, 2)}} units of {{name}}</span><br />
{{#if data.showPurity}}
<span class='highlight' intro-outro='fade'>Purity: {{Math.fixed(purity, 2)}}</span><br />
{{/if}}
{{else}}
<span class='bad'>Beaker Empty</span>
{{/each}}
tgui/src/interfaces/chem_master.ract
+24 -1
View File
@@ -77,7 +77,7 @@
<ui-button action='createBottle' params='{"many": 1}' state='{{data.bufferContents ? null : "disabled"}}' >Dispense Buffer to Bottles</ui-button>
<br/>
<br/>
<ui-button action='createVial' params='{"many": 0}' state='{{data.bufferContents ? null : "disabled"}}' >Create Hypo Vial (max 30µ)</ui-button>
<ui-button action='createVial' params='{"many": 0}' state='{{data.bufferContents ? null : "disabled"}}' >Create Hypo Vial (max 60µ)</ui-button>
<br/>
<ui-button action='createVial' params='{"many": 1}' state='{{data.bufferContents ? null : "disabled"}}' >Dispense Buffer to Hypo vials </ui-button>
<br/>
@@ -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>