Skip to content

Commit

Permalink
Fixes combustion turbine power grid (Aurorastation#19973)
Browse files Browse the repository at this point in the history 
### Introduction
The power grid of the new combustion turbine is behaving very weird. For
example, the TEG outputs 300kW of power, but inspecting the wire with a
multitool shows very random things like 12mW. The SMES shows a different
value as well.

### Fix
I noticed that a lot of cabling has been used with the d1,d2 properties
set, which the wiki states to not use. I replaced all cabling starting
from the TEG up to the main grid with cabling without the d1,d2
properties. This fixed all power values in the power network. The TEG,
cabling and SMES now show the exact same value of power available in the
network.

Additionally i added a powernet sensor to the turbine grid, as it was
missing.

_Edit: Grammar_
  • Loading branch information
@FabianK3
FabianK3 authored Oct 2, 2024
1 parent edd7f97 commit 197d44b
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 83 deletions.
7 changes: 7 additions & 0 deletions html/changelogs/fabiank3-bugfix-combustion-turbine-wiring.yml
View file
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
Original file line number Diff line number Diff line change
Expand Up @@ -20144,38 +20144,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 @@ -23139,8 +23135,6 @@
dir = 1
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/meter,
Expand Down Expand Up @@ -24564,18 +24558,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 @@ -35767,11 +35759,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 @@ -35789,6 +35776,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 @@ -37310,8 +37300,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -39798,11 +39786,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 @@ -43400,22 +43388,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 @@ -50931,17 +50922,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 @@ -52720,7 +52709,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 @@ -52729,6 +52717,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 @@ -72510,14 +72499,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 @@ -81610,17 +81597,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 @@ -82650,12 +82636,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 @@ -111107,8 +111093,6 @@
dir = 1
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/tiled/dark,
Expand Down Expand Up @@ -138429,11 +138413,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 @@ -138443,6 +138422,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 @@ -142497,8 +142479,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -154903,14 +154883,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 @@ -157736,8 +157716,6 @@
dir = 4
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -160454,16 +160432,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 @@ -160478,6 +160446,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

0 comments on commit 197d44b

Please sign in to comment.