From 0e72be715cf30b8eb5fc1a0761d15039b38495ab Mon Sep 17 00:00:00 2001 From: CoreyLee Hassell Date: Tue, 27 Aug 2024 17:16:35 -0400 Subject: [PATCH] Box Hospital Ship engineering power fix and dress up (#3261) ## About The Pull Request This fixes the box's issues with power connections crossing in a corner, causing the SMES to feedback on itself. It also dressed it up just a bit so its slightly less jank. Old Layout: ![image](https://github.com/user-attachments/assets/544dacd9-9671-4810-a61a-54ac66d714b6) New Layout: ![image](https://github.com/user-attachments/assets/245c3624-9ae3-4f05-8470-96061f0b55ca) ## Why It's Good For The Game Fixes are great. ## Changelog :cl: fix: Adjusted the Box Hospital Ship's engineering layout so that it's less jank, and the power system doesn't loop on itself anymore. /:cl: --- .../shuttles/independent/independent_box.dmm | 151 ++++++++---------- 1 file changed, 70 insertions(+), 81 deletions(-) diff --git a/_maps/shuttles/independent/independent_box.dmm b/_maps/shuttles/independent/independent_box.dmm index 577290c6581c..31891a371d8c 100644 --- a/_maps/shuttles/independent/independent_box.dmm +++ b/_maps/shuttles/independent/independent_box.dmm @@ -249,9 +249,6 @@ dir = 9 }, /obj/structure/catwalk/over, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, @@ -261,9 +258,8 @@ /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/machinery/meter/atmos/layer2, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plating, /area/ship/engineering) "bk" = ( @@ -324,6 +320,11 @@ dir = 1 }, /obj/effect/decal/cleanable/wrapping, +/obj/machinery/light_switch{ + pixel_x = 19; + pixel_y = 13; + dir = 8 + }, /turf/open/floor/plating, /area/ship/engineering) "bo" = ( @@ -620,12 +621,11 @@ /turf/open/floor/carpet/nanoweave/blue, /area/ship/bridge) "cr" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/components/unary/portables_connector/layer2, -/obj/structure/cable{ - icon_state = "6-8" +/obj/machinery/iv_drip/saline, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 }, -/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plating, /area/ship/engineering) "cu" = ( @@ -1497,6 +1497,10 @@ dir = 8 }, /obj/structure/catwalk/over, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plating, /area/ship/engineering) "ql" = ( @@ -1520,27 +1524,24 @@ /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ dir = 1 }, -/obj/structure/cable{ - icon_state = "5-9" - }, /obj/structure/sign/warning/electricshock{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, /turf/open/floor/plating, /area/ship/engineering) "qX" = ( /turf/open/floor/plasteel/white, /area/ship/medical) "ri" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/iv_drip/saline, -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/structure/railing{ - dir = 4 +/obj/machinery/atmospherics/components/unary/portables_connector/layer2{ + dir = 1 }, +/obj/machinery/portable_atmospherics/canister/air, /obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/plating, /area/ship/engineering) "ro" = ( @@ -1619,11 +1620,11 @@ /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/structure/cable{ + icon_state = "2-8" }, -/obj/structure/cable/yellow{ - icon_state = "2-5" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, /turf/open/floor/plating, /area/ship/engineering) @@ -1836,13 +1837,10 @@ /turf/open/floor/plating, /area/ship/bridge) "wb" = ( -/obj/machinery/power/port_gen/pacman{ - anchored = 1 - }, -/obj/effect/turf_decal/industrial/outline/yellow, +/obj/machinery/power/port_gen/pacman, /obj/item/wrench, -/obj/structure/cable/yellow, -/obj/machinery/airalarm/directional/south, +/obj/structure/cable, +/obj/effect/turf_decal/industrial/hatch/yellow, /turf/open/floor/plating, /area/ship/engineering) "wd" = ( @@ -1871,10 +1869,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/catwalk/over, /obj/structure/cable{ icon_state = "2-4" }, -/obj/structure/catwalk/over, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/open/floor/plating, /area/ship/engineering) "wj" = ( @@ -2200,21 +2201,11 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "CR" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible{ - dir = 8 - }, -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/item/storage/bag/trash{ - pixel_x = 6 +/obj/machinery/power/smes/engineering{ + charge = 1e+006 }, -/obj/item/reagent_containers/glass/bucket, -/obj/item/mop, -/obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, +/obj/effect/turf_decal/industrial/hatch/yellow, /turf/open/floor/plating, /area/ship/engineering) "Dm" = ( @@ -2302,18 +2293,16 @@ /turf/open/floor/plasteel/white, /area/ship/cargo) "FL" = ( -/obj/machinery/firealarm/directional/south, -/obj/structure/catwalk/over, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/meter/atmos/layer2, /obj/effect/turf_decal/trimline/opaque/yellow/filled/corner{ dir = 4 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 10; - pixel_y = -19 +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" }, +/obj/structure/catwalk/over, /turf/open/floor/plating, /area/ship/engineering) "Gb" = ( @@ -2326,10 +2315,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/item/wallframe/firealarm, /obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{ dir = 4 }, +/obj/machinery/firealarm/directional/west, /turf/open/floor/plating, /area/ship/engineering) "Gi" = ( @@ -2372,24 +2361,10 @@ /turf/open/floor/plating, /area/ship/engineering) "HM" = ( -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "0-10" - }, -/obj/effect/spawner/lootdrop/maintenance/three, -/obj/structure/rack, -/obj/item/areaeditor/shuttle, -/obj/item/flashlight{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 4 +/obj/structure/catwalk/over, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 8 }, -/obj/item/bot_assembly/hygienebot, -/obj/machinery/firealarm/directional/north, /turf/open/floor/plating, /area/ship/engineering) "Ic" = ( @@ -2412,12 +2387,11 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "In" = ( -/obj/machinery/power/smes/engineering{ - charge = 1e+006 - }, -/obj/structure/cable{ - icon_state = "0-10" +/obj/machinery/atmospherics/components/unary/tank/air{ + dir = 8; + piping_layer = 2 }, +/obj/effect/turf_decal/industrial/hatch/yellow, /turf/open/floor/plating, /area/ship/engineering) "Ja" = ( @@ -2704,7 +2678,6 @@ /obj/structure/railing{ dir = 4 }, -/obj/machinery/firealarm/directional/north, /turf/open/floor/plating, /area/ship/engineering) "SJ" = ( @@ -2832,10 +2805,20 @@ /turf/open/floor/plating, /area/ship/bridge) "WW" = ( -/obj/machinery/atmospherics/components/unary/tank/air{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "0-10" }, -/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/effect/spawner/lootdrop/maintenance/three, +/obj/structure/rack, +/obj/item/areaeditor/shuttle, +/obj/item/flashlight{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 4 + }, +/obj/item/bot_assembly/hygienebot, /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/ship/engineering) @@ -2963,9 +2946,15 @@ /turf/open/floor/plasteel/tech, /area/ship/medical) "ZN" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/industrial/outline/yellow, +/obj/item/storage/bag/trash{ + pixel_x = 6 + }, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, /obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/machinery/light/small/directional/east, -/obj/structure/salvageable/machine, /turf/open/floor/plating, /area/ship/engineering)