Skip to content
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

Urgent: Removes space tiles from Atlas #6033

Merged
merged 2 commits into from
Oct 1, 2023
Merged

Urgent: Removes space tiles from Atlas #6033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1810dbd
Makes the power manager display supply/draw correctly
SingingSpock Sep 29, 2023
c7069e9
Removes space from planet
SingingSpock Sep 29, 2023
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
9 changes: 2 additions & 7 deletions maps/rift/levels/rift-04-surface1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -59200,7 +59195,7 @@ cFW
cFW
lUJ
jAY
die
jAY
vaO
jAY
dVt
Expand Down
11 changes: 3 additions & 8 deletions maps/rift/levels/rift-06-surface3.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -53561,7 +53556,7 @@ hNS
hNS
aBL
bWN
fax
iKl
xUe
eod
eod
Expand All @@ -53577,7 +53572,7 @@ aTG
eod
eod
eod
fax
iKl
cYF
afq
afq
Expand Down
6 changes: 3 additions & 3 deletions tgui/packages/tgui/interfaces/PowerMonitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -130,7 +130,7 @@ export const PowerMonitorFocus = (props, context) => {
minValue={0}
maxValue={maxValue}
color="teal">
{toFixed(supply / 1000) + ' kW'}
{toFixed(supply) + ' kW'}
</ProgressBar>
</LabeledList.Item>
<LabeledList.Item label="Draw">
Expand All @@ -139,7 +139,7 @@ export const PowerMonitorFocus = (props, context) => {
minValue={0}
maxValue={maxValue}
color="pink">
{toFixed(demand / 1000) + ' kW'}
{toFixed(demand) + ' kW'}
</ProgressBar>
</LabeledList.Item>
</LabeledList>
Expand Down
Loading