Skip to content

Commit

Permalink
Shetland wiring fix (#3237)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## 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

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

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:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
zimon9 authored Aug 2, 2024
1 parent fd7868e commit 3335511
Showing 1 changed file with 27 additions and 15 deletions.
42 changes: 27 additions & 15 deletions _maps/shuttles/independent/independent_shetland.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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
},
Expand All @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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
},
Expand All @@ -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" = (
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down

0 comments on commit 3335511

Please sign in to comment.