Skip to content

Handle null values in ThermalGenerator progress bars #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ossa88 wants to merge 3 commits into
base: master
Choose a base branch
from
+7 −7
Open

Handle null values in ThermalGenerator progress bars #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaa9ed2
FIX: Handle null values in ThermalGenerator progress bars
Ossa88 Mar 23, 2026
6faee01
fixes thermogenerator entirely
Ossa88 May 27, 2026
2b2a33e
Merge branch 'master' into Thermogenerator
Ossa88 May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
var/mode = CIRCULATOR_HOT
var/obj/machinery/power/generator/generator

/obj/machinery/atmospherics/components/unary/shuttle/heater/on_construction(obj_color, set_layer)
/obj/machinery/atmospherics/components/binary/circulator/on_construction(obj_color, set_layer)
var/obj/item/circuitboard/machine/circulator/board = circuit
if(board)
piping_layer = board.pipe_layer
Expand Down
12 changes: 6 additions & 6 deletions tgui/packages/tgui/interfaces/ThermalGenerator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ export const ThermalGenerator = (props, context) => {
</LabeledList.Item>
<LabeledList.Item label="Power Output">
<ProgressBar
value={power}
value={power ?? 0}
minValue={0}
maxValue={maxPowerDisplay}
color="yellow"
>
{formatSiUnit(power, 0, 'W')}
{formatSiUnit(power ?? 0, 0, 'W')}
</ProgressBar>
</LabeledList.Item>
<LabeledList.Item label="Cold Loop">
<ProgressBar
value={coldCircTemp}
value={coldCircTemp ?? 0}
minValue={0}
maxValue={600}
ranges={{
Expand All @@ -60,12 +60,12 @@ export const ThermalGenerator = (props, context) => {
average: [500, Infinity],
}}
>
{coldCircTemp} K {coldCircPressure} kPa
{coldCircTemp ?? 0} K {coldCircPressure ?? 0} kPa
</ProgressBar>
</LabeledList.Item>
<LabeledList.Item label="Hot Loop">
<ProgressBar
value={hotCircTemp}
value={hotCircTemp ?? 0}
minValue={0}
maxValue={600}
ranges={{
Expand All @@ -74,7 +74,7 @@ export const ThermalGenerator = (props, context) => {
average: [500, Infinity],
}}
>
{hotCircTemp} K {hotCircPressure} kPa
{hotCircTemp ?? 0} K {hotCircPressure ?? 0} kPa
</ProgressBar>
</LabeledList.Item>
</LabeledList>
Expand Down
Loading