diff --git a/tgui/packages/tgui/interfaces/ChemDispenser.js b/tgui/packages/tgui/interfaces/ChemDispenser.js
index b30e8096b4..6b3f34b83e 100644
--- a/tgui/packages/tgui/interfaces/ChemDispenser.js
+++ b/tgui/packages/tgui/interfaces/ChemDispenser.js
@@ -157,7 +157,7 @@ export const ChemDispenser = (props, context) => {
- /{data.beakerMaxVolume} units
+ /{data.beakerMaxVolume} units, {data.beakerCurrentpH} pH
)
|| 'No beaker'}
diff --git a/tgui/packages/tgui/interfaces/ChemMaster.js b/tgui/packages/tgui/interfaces/ChemMaster.js
index 1bd39eb258..1997b3b9b6 100644
--- a/tgui/packages/tgui/interfaces/ChemMaster.js
+++ b/tgui/packages/tgui/interfaces/ChemMaster.js
@@ -1,26 +1,11 @@
-import { Fragment } from 'inferno';
-import { useBackend, useSharedState } from '../backend';
+import { Component, Fragment } from 'inferno';
+import { act } from '../byond';
import { AnimatedNumber, Box, Button, ColorBox, LabeledList, NumberInput, Section, Table } from '../components';
-import { Window } from '../layouts';
-export const ChemMaster = (props, context) => {
- const { data } = useBackend(context);
- const { screen } = data;
- return (
-
-
- {screen === 'analyze' && (
-
- ) || (
-
- )}
-
-
- );
-};
-
-const ChemMasterContent = (props, context) => {
- const { act, data } = useBackend(context);
+export const ChemMaster = props => {
+ const { state } = props;
+ const { config, data } = state;
+ const { ref } = config;
const {
screen,
beakerContents = [],
@@ -32,9 +17,7 @@ const ChemMasterContent = (props, context) => {
pillBottleCurrentAmount,
pillBottleMaxAmount,
} = data;
- if (screen === 'analyze') {
- return ;
- }
+
return (
{
)}>
{!isBeakerLoaded && (
@@ -67,6 +50,7 @@ const ChemMasterContent = (props, context) => {
{beakerContents.map(chemical => (
))}
@@ -83,7 +67,7 @@ const ChemMasterContent = (props, context) => {
color={data.mode ? 'good' : 'bad'}
icon={data.mode ? 'exchange-alt' : 'times'}
content={data.mode ? 'Transfer' : 'Destroy'}
- onClick={() => act('toggleMode')} />
+ onClick={() => act(ref, 'toggleMode')} />
)}>
{bufferContents.length === 0 && (
@@ -95,6 +79,7 @@ const ChemMasterContent = (props, context) => {
{bufferContents.map(chemical => (
))}
@@ -102,7 +87,7 @@ const ChemMasterContent = (props, context) => {
{!!isPillBottleLoaded && (
{