diff --git a/html/changelogs/fabiank3-bugfix-combustion-turbine-wiring.yml b/html/changelogs/fabiank3-bugfix-combustion-turbine-wiring.yml new file mode 100644 index 00000000000..514dcb6e227 --- /dev/null +++ b/html/changelogs/fabiank3-bugfix-combustion-turbine-wiring.yml @@ -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." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index cfa94c01827..bff8e95b9e2 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -20129,20 +20129,18 @@ /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" = ( @@ -20150,17 +20148,15 @@ /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" = ( @@ -23124,8 +23120,6 @@ dir = 1 }, /obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; icon_state = "2-4" }, /obj/machinery/meter, @@ -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" = ( @@ -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 }, @@ -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" = ( @@ -37282,8 +37272,6 @@ dir = 4 }, /obj/structure/cable{ - d1 = 1; - d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -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" = ( @@ -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) @@ -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" = ( @@ -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 @@ -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" = ( @@ -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" = ( @@ -81568,10 +81555,6 @@ /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 @@ -81579,6 +81562,9 @@ /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" = ( @@ -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) @@ -111065,8 +111051,6 @@ dir = 1 }, /obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/tiled/dark, @@ -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 }, @@ -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" = ( @@ -142451,8 +142433,6 @@ dir = 4 }, /obj/structure/cable{ - d1 = 1; - d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -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) @@ -157690,8 +157670,6 @@ dir = 4 }, /obj/structure/cable{ - d1 = 1; - d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -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 @@ -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" = (