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 (
{
- +
{!!isPillBottleLoaded && (
{ - ))} - - )} - {!condi && ( - setPillAmount(value)} - onCreate={() => act('create', { - type: 'pill', - amount: pillAmount, - volume: 'auto', - })} /> - )} - {!condi && ( - setPatchAmount(value)} - onCreate={() => act('create', { - type: 'patch', - amount: patchAmount, - volume: 'auto', - })} /> - )} - {!condi && ( - setBottleAmount(value)} - onCreate={() => act('create', { - type: 'bottle', - amount: bottleAmount, - volume: 'auto', - })} /> - )} - {!!condi && ( - setPackAmount(value)} - onCreate={() => act('create', { - type: 'condimentPack', - amount: packAmount, - volume: 'auto', - })} /> - )} - {!!condi && ( - setBottleAmount(value)} - onCreate={() => act('create', { - type: 'condimentBottle', - amount: bottleAmount, - volume: 'auto', - })} /> - )} - - ); -}; +class PackagingControls extends Component { + constructor() { + super(); + this.state = { + pillAmount: 1, + patchAmount: 1, + bottleAmount: 1, + packAmount: 1, + vialAmount: 1, + dartAmount: 1, + }; + } -const AnalysisResults = (props, context) => { - const { act, data } = useBackend(context); - const { analyzeVars } = data; + render() { + const { state, props } = this; + const { ref } = props.state.config; + const { + pillAmount, + patchAmount, + bottleAmount, + packAmount, + vialAmount, + dartAmount, + } = this.state; + const { + condi, + chosenPillStyle, + pillStyles = [], + } = props.state.data; + return ( + + {!condi && ( + + {pillStyles.map(pill => ( + + ))} + + )} + {!condi && ( + this.setState({ + pillAmount: value, + })} + onCreate={() => act(ref, 'create', { + type: 'pill', + amount: pillAmount, + volume: 'auto', + })} /> + )} + {!condi && ( + this.setState({ + patchAmount: value, + })} + onCreate={() => act(ref, 'create', { + type: 'patch', + amount: patchAmount, + volume: 'auto', + })} /> + )} + {!condi && ( + this.setState({ + bottleAmount: value, + })} + onCreate={() => act(ref, 'create', { + type: 'bottle', + amount: bottleAmount, + volume: 'auto', + })} /> + )} + {!condi && ( + this.setState({ + vialAmount: value, + })} + onCreate={() => act(ref, 'create', { + type: 'hypoVial', + amount: vialAmount, + volume: 'auto', + })} /> + )} + {!condi && ( + this.setState({ + dartAmount: value, + })} + onCreate={() => act(ref, 'create', { + type: 'smartDart', + amount: dartAmount, + volume: 'auto', + })} /> + )} + {!!condi && ( + this.setState({ + packAmount: value, + })} + onCreate={() => act(ref, 'create', { + type: 'condimentPack', + amount: packAmount, + volume: 'auto', + })} /> + )} + {!!condi && ( + this.setState({ + bottleAmount: value, + })} + onCreate={() => act(ref, 'create', { + type: 'condimentBottle', + amount: bottleAmount, + volume: 'auto', + })} /> + )} + + ); + } +} + +const AnalysisResults = props => { + const { state, fermianalyze } = props; + const { ref } = state.config; + const { analyzeVars } = state.data; return (
{
); };