diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm index 77978cf1482c..8e6f20605f92 100644 --- a/maps/rift/levels/rift-04-surface1.dmm +++ b/maps/rift/levels/rift-04-surface1.dmm @@ -2001,7 +2001,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/space/basic, +/turf/simulated/floor/plating, /area/maintenance/substation/surface_one) "brd" = ( /obj/machinery/light{ @@ -4736,11 +4736,6 @@ "did" = ( /turf/simulated/wall/prepainted/cargo, /area/maintenance/substation/cargo) -"die" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment, -/turf/space/basic, -/area/maintenance/security/lower) "dix" = ( /obj/structure/table/rack/shelf, /obj/fiftyspawner/hardwood, @@ -59200,7 +59195,7 @@ cFW cFW lUJ jAY -die +jAY vaO jAY dVt diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 5b3998495923..a927771d1875 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -20052,11 +20052,6 @@ /obj/structure/railing, /turf/simulated/open, /area/maintenance/station/exploration) -"fax" = ( -/obj/structure/foamedmetal, -/obj/structure/grille, -/turf/space/basic, -/area/rift/surfacebase/outside/outside3) "fbX" = ( /obj/machinery/door/blast/regular, /turf/simulated/floor/reinforced, @@ -26712,7 +26707,7 @@ "xUe" = ( /obj/structure/foamedmetal, /obj/structure/grille, -/turf/space/basic, +/turf/simulated/floor/plating, /area/ai) "xVh" = ( /obj/effect/floor_decal/borderfloor{ @@ -53561,7 +53556,7 @@ hNS hNS aBL bWN -fax +iKl xUe eod eod @@ -53577,7 +53572,7 @@ aTG eod eod eod -fax +iKl cYF afq afq diff --git a/tgui/packages/tgui/interfaces/PowerMonitor.js b/tgui/packages/tgui/interfaces/PowerMonitor.js index 7fbfb6951c17..f3b8c7f37f9b 100644 --- a/tgui/packages/tgui/interfaces/PowerMonitor.js +++ b/tgui/packages/tgui/interfaces/PowerMonitor.js @@ -7,7 +7,7 @@ import { useBackend, useLocalState } from '../backend'; import { Box, Button, Chart, ColorBox, Flex, Icon, LabeledList, ProgressBar, Section, Table } from '../components'; import { Window } from '../layouts'; -const PEAK_DRAW = 500000; +const PEAK_DRAW = 500; export const powerRank = str => { const unit = String(str.split(' ')[1]).toLowerCase(); @@ -130,7 +130,7 @@ export const PowerMonitorFocus = (props, context) => { minValue={0} maxValue={maxValue} color="teal"> - {toFixed(supply / 1000) + ' kW'} + {toFixed(supply) + ' kW'} @@ -139,7 +139,7 @@ export const PowerMonitorFocus = (props, context) => { minValue={0} maxValue={maxValue} color="pink"> - {toFixed(demand / 1000) + ' kW'} + {toFixed(demand) + ' kW'}