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-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9275 from Thalpy/InitialD

Browse Source 
Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button.
This commit is contained in:
kevinz000
2019-09-13 10:43:22 -07:00
committed by GitHub
parent 8f8340f567 6b76b09449
commit 591a584785
3 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tgui/assets/tgui.js
View File

File diff suppressed because one or more lines are too long

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

@@ -17,7 +17,7 @@
<ui-button action='transferToBuffer' params='{"id": "{{id}}", "amount": 10}'>10</ui-button>
<ui-button action='transferToBuffer' params='{"id": "{{id}}", "amount": 1000}'>All</ui-button>
<ui-button action='transferToBuffer' params='{"id": "{{id}}", "amount": -1}'>Custom</ui-button>
<ui-button action='analyze' params='{"id": "{{id}}"}'>Analyze</ui-button>
<ui-button action='analyzeBeak' params='{"id": "{{id}}"}'>Analyze</ui-button>
</div>
</ui-section>
{{else}}
@@ -41,7 +41,7 @@
<ui-button action='transferFromBuffer' params='{"id": "{{id}}", "amount": 10}'>10</ui-button>
<ui-button action='transferFromBuffer' params='{"id": "{{id}}", "amount": 1000}'>All</ui-button>
<ui-button action='transferFromBuffer' params='{"id": "{{id}}", "amount": -1}'>Custom</ui-button>
<ui-button action='analyze' params='{"id": "{{id}}"}'>Analyze</ui-button>
<ui-button action='analyzeBuff' params='{"id": "{{id}}"}'>Analyze</ui-button>
</div>
</ui-section>
{{/each}}