diff --git a/tgui/packages/tgui/interfaces/@UNUSED/VaultController.js b/tgui/packages/tgui/interfaces/@UNUSED/VaultController.js index 074353f50..f8e73f8ff 100644 --- a/tgui/packages/tgui/interfaces/@UNUSED/VaultController.js +++ b/tgui/packages/tgui/interfaces/@UNUSED/VaultController.js @@ -21,13 +21,13 @@ export const VaultController = (props, context) => { + }}> + {toFixed(data.stored/1000)} / {toFixed(data.max/1000)} kW + diff --git a/tgui/packages/tgui/interfaces/BorgPanel.js b/tgui/packages/tgui/interfaces/BorgPanel.js index c1e672f89..b2629b55f 100644 --- a/tgui/packages/tgui/interfaces/BorgPanel.js +++ b/tgui/packages/tgui/interfaces/BorgPanel.js @@ -44,8 +44,9 @@ export const BorgPanel = (props, context) => { {!cell.missing ? ( + value={cellPercent}> + {cell.charge} / {cell.maxcharge} + ) : ( No cell installed ) } diff --git a/tgui/packages/tgui/interfaces/ChemDispenser.js b/tgui/packages/tgui/interfaces/ChemDispenser.js index 081f79205..f27e05292 100644 --- a/tgui/packages/tgui/interfaces/ChemDispenser.js +++ b/tgui/packages/tgui/interfaces/ChemDispenser.js @@ -39,8 +39,9 @@ export const ChemDispenser = (props, context) => { + value={data.energy / data.maxEnergy}> + {toFixed(data.energy)} units + diff --git a/tgui/packages/tgui/interfaces/DnaVault.js b/tgui/packages/tgui/interfaces/DnaVault.js index 73a9d6765..68f12d897 100644 --- a/tgui/packages/tgui/interfaces/DnaVault.js +++ b/tgui/packages/tgui/interfaces/DnaVault.js @@ -23,18 +23,21 @@ export const DnaVault = (props, context) => { + value={dna / dna_max}> + {dna} / {dna_max} Samples + + value={plants / plants_max}> + {plants} / {plants_max} Samples + + value={animals / animals}> + {animals} / {animals_max} Samples + diff --git a/tgui/packages/tgui/interfaces/OperatingComputer.js b/tgui/packages/tgui/interfaces/OperatingComputer.js index 024a49935..693c53f95 100644 --- a/tgui/packages/tgui/interfaces/OperatingComputer.js +++ b/tgui/packages/tgui/interfaces/OperatingComputer.js @@ -75,19 +75,17 @@ export const OperatingComputer = (props, context) => { value={patient.health} minValue={patient.minHealth} maxValue={patient.maxHealth} - color={patient.health >= 0 ? 'good' : 'average'} - content={( - - )} /> + color={patient.health >= 0 ? 'good' : 'average'}> + + {damageTypes.map(type => ( - )} /> + color="bad"> + + ))} diff --git a/tgui/packages/tgui/interfaces/PowerMonitor.js b/tgui/packages/tgui/interfaces/PowerMonitor.js index 7d30cf512..7c118b640 100644 --- a/tgui/packages/tgui/interfaces/PowerMonitor.js +++ b/tgui/packages/tgui/interfaces/PowerMonitor.js @@ -161,8 +161,9 @@ const SupplyDraw = (props, context) => { value={supply} minValue={0} maxValue={maxValue} - color="teal" - content={toFixed(supply / 1000) + ' kW'} /> + color="teal"> + {toFixed(supply / 1000)} kW + { minValue={0} maxValue={maxValue} color="pink" - content={toFixed(demand / 1000) + ' kW'} /> + content> + {toFixed(demand / 1000)} kW + ); diff --git a/tgui/packages/tgui/interfaces/SatelliteControl.js b/tgui/packages/tgui/interfaces/SatelliteControl.js index c43e45fb2..2474c695c 100644 --- a/tgui/packages/tgui/interfaces/SatelliteControl.js +++ b/tgui/packages/tgui/interfaces/SatelliteControl.js @@ -16,13 +16,14 @@ export const SatelliteControl = (props, context) => { + }}> + {100 * data.meteor_shield_coverage + / data.meteor_shield_coverage_max}% + diff --git a/tgui/packages/tgui/interfaces/Smes.js b/tgui/packages/tgui/interfaces/Smes.js index 5a81f3b76..e893900ea 100644 --- a/tgui/packages/tgui/interfaces/Smes.js +++ b/tgui/packages/tgui/interfaces/Smes.js @@ -60,8 +60,9 @@ export const Smes = (props, context) => { + value={data.inputLevel/data.inputLevelMax}> + {data.inputLevel_text} +