diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index 12b57b84ace..2843de4eab6 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -144,7 +144,7 @@ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "tanks", name, 420, 200, master_ui, state) + ui = new(user, src, ui_key, "tanks", name, 400, 120, master_ui, state) ui.open() /obj/item/tank/ui_data(mob/user) diff --git a/tgui-next/packages/tgui/interfaces/Mint.js b/tgui-next/packages/tgui/interfaces/Mint.js index 7af59bbcff7..a0713d38da2 100644 --- a/tgui-next/packages/tgui/interfaces/Mint.js +++ b/tgui-next/packages/tgui/interfaces/Mint.js @@ -11,15 +11,13 @@ export const Mint = props => {
act(ref, 'stoppress')} /> - ) : ( -
+
+ + + 50 + ? "bad" + : Math.abs(data.targetTemp - data.currentTemp) > 20 ? "average" : "good"}> + {data.currentTemp}°C + + + + {data.open + ? ( + act(ref, 'target', { + target: value, + })} /> + ) : ( + data.targetTemp + "°C" + )} + + + {!data.open + ? ("Auto" + ) : ( + +
+
+ ); +}; diff --git a/tgui-next/packages/tgui/interfaces/StationAlertConsole.js b/tgui-next/packages/tgui/interfaces/StationAlertConsole.js index 541f3d3364c..31b54df42f6 100644 --- a/tgui-next/packages/tgui/interfaces/StationAlertConsole.js +++ b/tgui-next/packages/tgui/interfaces/StationAlertConsole.js @@ -20,7 +20,7 @@ export const StationAlertConsole = props => { )} {fire.map(alert => ( -
  • +
  • {alert}
  • ))} @@ -34,7 +34,7 @@ export const StationAlertConsole = props => { )} {atmos.map(alert => ( -
  • +
  • {alert}
  • ))} @@ -48,7 +48,7 @@ export const StationAlertConsole = props => { )} {power.map(alert => ( -
  • +
  • {alert}
  • ))} diff --git a/tgui-next/packages/tgui/interfaces/Tank.js b/tgui-next/packages/tgui/interfaces/Tank.js new file mode 100644 index 00000000000..bc4f91346a0 --- /dev/null +++ b/tgui-next/packages/tgui/interfaces/Tank.js @@ -0,0 +1,58 @@ +import { Fragment } from 'inferno'; +import { act } from '../byond'; +import { Section, ProgressBar, LabeledList, Button, NumberInput } from '../components'; +import { LabeledListItem } from '../components/LabeledList'; + +export const Tank = props => { + const { state } = props; + const { config, data } = state; + const { ref } = config; + return ( +
    + + + + + +
    + ); +}; diff --git a/tgui-next/packages/tgui/interfaces/VaultController.js b/tgui-next/packages/tgui/interfaces/VaultController.js index 5e64ba4b2bc..df2376c998e 100644 --- a/tgui-next/packages/tgui/interfaces/VaultController.js +++ b/tgui-next/packages/tgui/interfaces/VaultController.js @@ -12,6 +12,7 @@ export const VaultController = props => { buttons={(