From 1c7759e3d797d3b684e254a93a7e43cc272db898 Mon Sep 17 00:00:00 2001 From: zimon9 <122945887+zimon9@users.noreply.github.com> Date: Thu, 1 Aug 2024 23:07:35 -0400 Subject: [PATCH] Shetland wiring fix (#3237) ## About The Pull Request Fixes a minor wiring issue on the Shetland, where the input and output power lines are shorted together. Before: ![shetlandShort_circled](https://github.com/user-attachments/assets/6769c666-7a6f-4b9e-b4cf-866229a992cd) ![roundstartShetlandPowerMonitor_NoFix](https://github.com/user-attachments/assets/55ef1250-f05c-47bf-b198-97b8c803bf17) After: ![shetlandShort_fixed](https://github.com/user-attachments/assets/f9e9280c-92db-4451-b3cd-e8556c107aad) ![roundstartShetlandPowerMonitor_Fixed](https://github.com/user-attachments/assets/a1ee706a-8fa3-4984-a5d7-5fa7549d855a) ## Why It's Good For The Game This short bypasses the SMES units aboard and more or less renders them useless. This change should fix this, and allow them to work as they're supposed to. ## Changelog :cl: fix: fixed a short on the Shetland /:cl: --- .../independent/independent_shetland.dmm | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm index f147aeb822769..459bfebcd48fb 100644 --- a/_maps/shuttles/independent/independent_shetland.dmm +++ b/_maps/shuttles/independent/independent_shetland.dmm @@ -377,6 +377,9 @@ }, /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer5, /obj/item/radio/intercom/directional/east, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "dl" = ( @@ -930,9 +933,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer5{ dir = 5 }, -/obj/structure/cable/yellow{ - icon_state = "4-10" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -945,6 +945,12 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 10 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "ib" = ( @@ -1336,6 +1342,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "lu" = ( @@ -2144,6 +2153,9 @@ /obj/structure/cable{ icon_state = "1-6" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "sb" = ( @@ -2686,9 +2698,6 @@ /turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "wW" = ( -/obj/structure/cable/yellow{ - icon_state = "1-6" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, @@ -2698,6 +2707,12 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-5" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/plating, /area/ship/engineering/engine) "xd" = ( @@ -3115,12 +3130,6 @@ /obj/effect/turf_decal/number/zero{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "5-9" - }, -/obj/structure/cable/yellow{ - icon_state = "5-10" - }, /obj/machinery/atmospherics/pipe/layer_manifold/visible{ dir = 4 }, @@ -5524,12 +5533,12 @@ /turf/open/floor/plasteel, /area/ship/hallway/fore) "VV" = ( -/obj/structure/cable/yellow{ - icon_state = "2-5" - }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "VZ" = ( @@ -5766,6 +5775,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/cable/yellow{ + icon_state = "4-10" + }, /turf/open/floor/plasteel/dark, /area/ship/engineering/engine) "XY" = (