From f62d6ed4fc54204a9c7597f2387f4f5176216064 Mon Sep 17 00:00:00 2001
From: Putnam3145 <putnam3145@gmail.com>
Date: Thu, 2 Apr 2020 16:55:45 -0700
Subject: [PATCH] Merge pull request #11717 from PersianXerxes/oopsPHManBad

Chem Dispensers and Heaters now show pH again
---
 .../packages/tgui/interfaces/ChemDispenser.js      |  2 +-
 tgui-next/packages/tgui/interfaces/ChemHeater.js   | 14 +++++++++++++-
 .../tgui/interfaces/common/BeakerContents.js       |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/tgui-next/packages/tgui/interfaces/ChemDispenser.js b/tgui-next/packages/tgui/interfaces/ChemDispenser.js
index 4e9ca5a7..e4790053 100644
--- a/tgui-next/packages/tgui/interfaces/ChemDispenser.js
+++ b/tgui-next/packages/tgui/interfaces/ChemDispenser.js
@@ -150,7 +150,7 @@ export const ChemDispenser = props => {
                     <AnimatedNumber
                       initial={0}
                       value={data.beakerCurrentVolume} />
-                    /{data.beakerMaxVolume} units
+                    /{data.beakerMaxVolume} units, {data.beakerCurrentpH} pH
                   </Fragment>
                 )
               || 'No beaker'}
diff --git a/tgui-next/packages/tgui/interfaces/ChemHeater.js b/tgui-next/packages/tgui/interfaces/ChemHeater.js
index 8618fc0f..3794d614 100644
--- a/tgui-next/packages/tgui/interfaces/ChemHeater.js
+++ b/tgui-next/packages/tgui/interfaces/ChemHeater.js
@@ -11,6 +11,7 @@ export const ChemHeater = props => {
     isActive,
     isBeakerLoaded,
     currentTemp,
+    currentpH,
     beakerCurrentVolume,
     beakerMaxVolume,
     beakerContents = [],
@@ -40,7 +41,7 @@ export const ChemHeater = props => {
                 target: value,
               })} />
           </LabeledList.Item>
-          <LabeledList.Item label="Reading">
+          <LabeledList.Item label="Temperature">
             <Box
               width="60px"
               textAlign="right">
@@ -51,6 +52,17 @@ export const ChemHeater = props => {
               ) || '—'}
             </Box>
           </LabeledList.Item>
+          <LabeledList.Item label="pH">
+            <Box
+              width="60px"
+              textAlign="right">
+              {isBeakerLoaded && (
+                <AnimatedNumber
+                  value={currentpH}
+                  format={value => toFixed(value) + ' pH'} />
+              ) || '-'}
+            </Box>
+          </LabeledList.Item>
         </LabeledList>
       </Section>
       <Section
diff --git a/tgui-next/packages/tgui/interfaces/common/BeakerContents.js b/tgui-next/packages/tgui/interfaces/common/BeakerContents.js
index 6517c844..9e96967e 100644
--- a/tgui-next/packages/tgui/interfaces/common/BeakerContents.js
+++ b/tgui-next/packages/tgui/interfaces/common/BeakerContents.js
@@ -15,7 +15,7 @@ export const BeakerContents = props => {
       )}
       {beakerContents.map(chemical => (
         <Box key={chemical.name} color="label">
-          {chemical.volume} units of {chemical.name}
+          {chemical.volume} units of {chemical.name}, Purity: {chemical.purity}
         </Box>
       ))}
     </Box>