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

Fixes combustion turbine power grid #19973

Merged
merged 2 commits into from
Oct 2, 2024
Merged

Fixes combustion turbine power grid #19973

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
eb994d2
Rewire combustion turbine and add powernet sensor
FabianK3 Oct 1, 2024
f8dba23
Add changelog
FabianK3 Oct 1, 2024
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
7 changes: 7 additions & 0 deletions html/changelogs/fabiank3-bugfix-combustion-turbine-wiring.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
author: FabianK3

delete-after: True

changes:
- bugfix: "Fixed unrealistic power readings throughout the combustion turbine power grid."
- rscadd: "Added a powernet sensor to the combustion turbine power grid."
144 changes: 61 additions & 83 deletions maps/sccv_horizon/sccv_horizon.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20129,38 +20129,34 @@
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 9
},
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/turf/simulated/floor/tiled/dark/full,
/area/engineering/engine_room/turbine)
"cVy" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 5
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/research_port)
"cVA" = (
Expand Down Expand Up @@ -23124,8 +23120,6 @@
dir = 1
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/meter,
Expand Down Expand Up @@ -24545,18 +24539,16 @@
/area/horizon/maintenance/deck_three/aft/starboard)
"dBQ" = (
/obj/machinery/door/firedoor,
/obj/structure/window/shuttle/scc_space_ship/cardinal,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/window/shuttle/scc_space_ship/cardinal,
/turf/simulated/floor/plating,
/area/engineering/engine_room/turbine)
"dCc" = (
Expand Down Expand Up @@ -35744,11 +35736,6 @@
/turf/simulated/floor/wood,
/area/lawoffice/consular)
"fkS" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
Expand All @@ -35766,6 +35753,9 @@
tag_west_con = 0;
use_power = 0
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/simulated/floor/tiled/dark/full,
/area/engineering/engine_room/turbine)
"fkT" = (
Expand Down Expand Up @@ -37282,8 +37272,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -39770,11 +39758,11 @@
},
/obj/machinery/power/apc/west,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "0-2"
},
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/cable,
/turf/simulated/floor/plating,
/area/maintenance/research_port)
"fRO" = (
Expand Down Expand Up @@ -43372,22 +43360,25 @@
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/starboard)
"gsQ" = (
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/structure/cable/yellow{
icon_state = "1-4"
},
/obj/structure/cable/yellow{
icon_state = "0-4"
},
/obj/machinery/power/sensor{
name = "Powernet Sensor - Combustion Turbine Output";
name_tag = "Combustion Turbine Output"
},
/obj/structure/cable/yellow{
icon_state = "2-4"
},
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/engineering/engine_room/turbine)
Expand Down Expand Up @@ -50900,17 +50891,15 @@
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/simulated/floor/tiled/dark/full,
/area/engineering/engine_room/turbine)
"hAl" = (
Expand Down Expand Up @@ -52689,7 +52678,6 @@
/turf/simulated/floor/plating,
/area/engineering/drone_fabrication)
"hNF" = (
/obj/structure/cable/yellow,
/obj/machinery/power/apc/super/critical/south,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
Expand All @@ -52698,6 +52686,7 @@
dir = 8
},
/obj/effect/floor_decal/corner/yellow,
/obj/structure/cable/yellow,
/turf/simulated/floor/tiled/dark,
/area/engineering/engine_room/turbine)
"hNH" = (
Expand Down Expand Up @@ -72468,14 +72457,12 @@
/turf/simulated/floor/tiled/white,
/area/horizon/crew_quarters/washroom/central)
"kHc" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/valve{
name = "Thermal Relief Valve"
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/simulated/floor/tiled/dark/full,
/area/engineering/engine_room/turbine)
"kHe" = (
Expand Down Expand Up @@ -81568,17 +81555,16 @@
/obj/machinery/power/terminal{
dir = 1
},
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 5
},
/obj/structure/cable/yellow{
icon_state = "0-4"
},
/turf/simulated/floor/plating,
/area/engineering/engine_room/turbine)
"mbR" = (
Expand Down Expand Up @@ -82608,12 +82594,12 @@
/turf/simulated/floor/carpet,
/area/horizon/security/head_of_security)
"mjI" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/visible/universal{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "2-8"
},
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/engineering/engine_room/turbine)
Expand Down Expand Up @@ -111065,8 +111051,6 @@
dir = 1
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/tiled/dark,
Expand Down Expand Up @@ -138383,11 +138367,6 @@
/turf/simulated/floor/tiled/white,
/area/centcom/shared_dream)
"uAv" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
Expand All @@ -138397,6 +138376,9 @@
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/simulated/floor/tiled/dark/full,
/area/engineering/engine_room/turbine)
"uAy" = (
Expand Down Expand Up @@ -142451,8 +142433,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -154857,14 +154837,14 @@
/turf/simulated/floor/reinforced,
/area/shuttle/hapt)
"wUC" = (
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/visible/universal{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/engineering/engine_room/turbine)
Expand Down Expand Up @@ -157690,8 +157670,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -160408,16 +160386,6 @@
/turf/simulated/floor/plating,
/area/maintenance/substation/engineering)
"xJg" = (
/obj/machinery/power/smes/buildable{
RCon_tag = "Combustion Turbine - Grid";
cur_coils = 4;
input_level = 500000;
output_level = 500000
},
/obj/structure/cable{
icon_state = "0-8"
},
/obj/structure/cable,
/obj/machinery/light/small{
dir = 8;
must_start_working = 1
Expand All @@ -160432,6 +160400,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 9
},
/obj/structure/cable{
icon_state = "0-8"
},
/obj/structure/cable/yellow,
/obj/machinery/power/smes/buildable{
RCon_tag = "Combustion Turbine - Grid";
cur_coils = 4;
input_level = 500000;
output_level = 500000
},
/turf/simulated/floor/plating,
/area/engineering/engine_room/turbine)
"xJi" = (
Expand Down
Loading