From 099a82b93686ab6546b82f0bd30f610b28a54d66 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Fri, 16 Oct 2020 13:27:37 -0700 Subject: [PATCH] Made fermichem displays work correctly. (#13577) --- code/modules/reagents/chemistry/machinery/chem_heater.dm | 2 +- tgui/packages/tgui/interfaces/ChemDispenser.js | 7 +++++++ tgui/packages/tgui/interfaces/ChemHeater.js | 5 ++--- tgui/packages/tgui/interfaces/common/BeakerContents.js | 2 +- tgui/public/tgui.bundle.js | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index 28f0b2366a..99c1cf97a6 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -107,7 +107,7 @@ data["beakerMaxVolume"] = beaker ? beaker.volume : null //purity and pH accuracy for(var/obj/item/stock_parts/micro_laser/M in component_parts) - data["partRating"]= 10**(M.rating-1) + data["partRating"]= M.rating if(M.rating == 4) data["showPurity"] = 1 else diff --git a/tgui/packages/tgui/interfaces/ChemDispenser.js b/tgui/packages/tgui/interfaces/ChemDispenser.js index c2f68b5e28..0724a9e85f 100644 --- a/tgui/packages/tgui/interfaces/ChemDispenser.js +++ b/tgui/packages/tgui/interfaces/ChemDispenser.js @@ -182,6 +182,13 @@ export const ChemDispenser = (props, context) => { units of {chemical.name} ))} + + pH: + + diff --git a/tgui/packages/tgui/interfaces/ChemHeater.js b/tgui/packages/tgui/interfaces/ChemHeater.js index c9b530a493..16acaf3656 100644 --- a/tgui/packages/tgui/interfaces/ChemHeater.js +++ b/tgui/packages/tgui/interfaces/ChemHeater.js @@ -15,7 +15,6 @@ export const ChemHeater = (props, context) => { beakerCurrentVolume, beakerMaxVolume, beakerContents = [], - currentpH, } = data; return ( { buttons={!!isBeakerLoaded && ( - {beakerCurrentVolume} / {beakerMaxVolume} units, - {data.currentpH} pH + {beakerCurrentVolume} / {beakerMaxVolume} units