diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 2a619e53db9..1d8b1ed9946 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -8,8 +8,8 @@ name = "portable air pump" icon_state = "psiphon:0" density = TRUE - ui_x = 420 - ui_y = 415 + ui_x = 300 + ui_y = 315 var/on = FALSE var/direction = PUMP_OUT @@ -92,8 +92,8 @@ /obj/machinery/portable_atmospherics/pump/ui_data() var/data = list() data["on"] = on - data["direction"] = direction - data["connected"] = connected_port ? 1 : 0 + data["direction"] = direction == PUMP_IN ? TRUE : FALSE + data["connected"] = connected_port ? TRUE : FALSE data["pressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0) data["target_pressure"] = round(pump.target_pressure ? pump.target_pressure : 0) data["default_pressure"] = round(PUMP_DEFAULT_PRESSURE) @@ -104,6 +104,8 @@ data["holding"] = list() data["holding"]["name"] = holding.name data["holding"]["pressure"] = round(holding.air_contents.return_pressure()) + else + data["holding"] = null return data /obj/machinery/portable_atmospherics/pump/ui_act(action, params) diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index f9403f86dec..2b51775e3ae 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -2,8 +2,8 @@ name = "portable air scrubber" icon_state = "pscrubber:0" density = TRUE - ui_x = 420 - ui_y = 435 + ui_x = 320 + ui_y = 335 var/on = FALSE var/volume_rate = 1000 @@ -93,6 +93,8 @@ data["holding"] = list() data["holding"]["name"] = holding.name data["holding"]["pressure"] = round(holding.air_contents.return_pressure()) + else + data["holding"] = null return data /obj/machinery/portable_atmospherics/scrubber/replace_tank(mob/living/user, close_valve) diff --git a/tgui-next/packages/tgui/components/TitleBar.js b/tgui-next/packages/tgui/components/TitleBar.js index c9c4eb630a4..a9e44bf4bed 100644 --- a/tgui-next/packages/tgui/components/TitleBar.js +++ b/tgui-next/packages/tgui/components/TitleBar.js @@ -1,4 +1,5 @@ import { classes, pureComponentHooks } from 'common/react'; +import { toTitleCase } from 'common/string'; import { UI_DISABLED, UI_INTERACTIVE, UI_UPDATE } from '../constants'; import { Icon } from './Icon'; @@ -27,12 +28,14 @@ export const TitleBar = props => { color={statusToColor(status)} name="eye" />