From c1c082d70de63fa5da123d7de22a8b61994a4367 Mon Sep 17 00:00:00 2001 From: HelmCrab <90987989+Thera-Pissed@users.noreply.github.com> Date: Sun, 26 May 2024 20:21:03 -0500 Subject: [PATCH] test your map changes. duh. --- .../independent/independent_dwayne.dmm | 1 + _maps/shuttles/solgov/solgov_inkwell.dmm | 262 +++++++++--------- .../syndicate/syndicate_gorlex_komodo.dmm | 1 + 3 files changed, 133 insertions(+), 131 deletions(-) diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index ef0bff812fc5..70063e0ac720 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -1884,6 +1884,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/closet/crate/large, /obj/machinery/portable_atmospherics/canister/hydrogen, /turf/open/floor/plating, /area/ship/cargo) diff --git a/_maps/shuttles/solgov/solgov_inkwell.dmm b/_maps/shuttles/solgov/solgov_inkwell.dmm index 679cb166c7ee..22f6c55e224a 100644 --- a/_maps/shuttles/solgov/solgov_inkwell.dmm +++ b/_maps/shuttles/solgov/solgov_inkwell.dmm @@ -225,16 +225,6 @@ }, /turf/open/floor/engine/hull, /area/ship/external/dark) -"ci" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/techfloor/orange{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 6 - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) "cn" = ( /obj/structure/fluff/hedge, /obj/machinery/light/directional/north, @@ -1033,16 +1023,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/white, /area/ship/hallway/starboard) -"gZ" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/light/floor, -/obj/machinery/power/shuttle/engine/fire{ - dir = 4 - }, -/turf/open/floor/engine/hull, -/area/ship/maintenance/port) "ha" = ( /obj/structure/rack, /obj/item/storage/box/emptysandbags{ @@ -1459,6 +1439,27 @@ }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"jJ" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/techfloor/orange{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/maintenance/port) +"jK" = ( +/obj/effect/turf_decal/techfloor/orange{ + dir = 6 + }, +/obj/effect/turf_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ + dir = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/maintenance/starboard) "jM" = ( /obj/structure/cable{ icon_state = "1-2" @@ -1786,25 +1787,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/carpet/blue, /area/ship/crew/dorm) -"lG" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/poddoor{ - id = "sgi_engine"; - dir = 4 - }, -/obj/machinery/door/window/westright{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/starboard) "lT" = ( /obj/structure/railing/corner/wood{ color = "#543C30"; @@ -2293,14 +2275,13 @@ /area/ship/cargo) "oG" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/components/trinary/mixer/flipped{ - dir = 4; - name = "Fuel Mixer"; - piping_layer = 5 - }, /obj/effect/turf_decal/techfloor/orange/corner{ dir = 8 }, +/obj/machinery/atmospherics/components/trinary/mixer/flipped{ + dir = 4; + name = "Fuel Mixer" + }, /turf/open/floor/plasteel/tech, /area/ship/maintenance/starboard) "oH" = ( @@ -2585,11 +2566,6 @@ }, /turf/open/floor/wood/maple, /area/ship/bridge) -"qQ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/portable_atmospherics/canister/hydrogen, -/turf/open/floor/plasteel/mono, -/area/ship/cargo) "qS" = ( /obj/effect/turf_decal/corner/opaque/solgovblue{ dir = 6 @@ -3050,6 +3026,25 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/carpet/royalblue, /area/ship/crew/dorm/dormthree) +"tz" = ( +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/poddoor{ + id = "sgi_engine"; + dir = 4 + }, +/obj/machinery/door/window/westright{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{ + dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/maintenance/starboard) "tB" = ( /obj/effect/turf_decal/techfloor/corner, /obj/effect/turf_decal/techfloor/corner{ @@ -3079,6 +3074,12 @@ }, /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormtwo) +"tE" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet/crate/large, +/obj/machinery/portable_atmospherics/canister/hydrogen, +/turf/open/floor/plasteel/mono, +/area/ship/cargo) "tK" = ( /obj/structure/table/wood, /obj/item/radio/intercom/directional/east, @@ -3134,6 +3135,17 @@ }, /turf/open/floor/plasteel/white, /area/ship/engineering) +"ub" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/techfloor/orange{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/maintenance/starboard) "uc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -3381,16 +3393,6 @@ }, /turf/open/floor/plasteel/mono/dark, /area/ship/hallway/starboard) -"vp" = ( -/obj/machinery/light/directional/south, -/obj/effect/turf_decal/techfloor/orange{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 5 - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) "vz" = ( /obj/effect/turf_decal/siding/wood{ dir = 1; @@ -3477,6 +3479,16 @@ }, /turf/open/floor/wood, /area/ship/bridge) +"vY" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light/floor, +/obj/machinery/power/shuttle/engine/fire{ + dir = 4 + }, +/turf/open/floor/engine/hull, +/area/ship/maintenance/starboard) "wb" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/maintenance/starboard) @@ -4685,6 +4697,20 @@ }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"DL" = ( +/obj/structure/sign/poster/solgov/random{ + pixel_y = 32 + }, +/obj/effect/turf_decal/techfloor/orange{ + dir = 5 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plasteel/tech, +/area/ship/maintenance/port) "DP" = ( /obj/effect/turf_decal/corner/opaque/solgovblue{ dir = 10 @@ -4977,16 +5003,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/tech, /area/ship/maintenance/starboard) -"FI" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 6 - }, -/obj/effect/turf_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/starboard) "FJ" = ( /obj/effect/turf_decal/techfloor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -5015,16 +5031,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/hallway/starboard) -"FR" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/light/floor, -/obj/machinery/power/shuttle/engine/fire{ - dir = 4 - }, -/turf/open/floor/engine/hull, -/area/ship/maintenance/starboard) "Ga" = ( /obj/structure/fluff/hedge, /turf/open/floor/wood/walnut, @@ -5300,19 +5306,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/ship/crew/canteen/kitchen) -"Ii" = ( -/obj/structure/sign/poster/solgov/random{ - pixel_y = 32 - }, -/obj/effect/turf_decal/techfloor/orange{ - dir = 5 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer3{ - dir = 8 - }, -/turf/open/floor/plasteel/tech, -/area/ship/maintenance/port) "Ik" = ( /obj/structure/cable{ icon_state = "1-8" @@ -5653,25 +5646,6 @@ /obj/structure/table/wood/fancy/purple, /turf/open/floor/wood/maple, /area/ship/crew/dorm/dormtwo) -"Kk" = ( -/obj/effect/turf_decal/techfloor/orange{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/poddoor{ - id = "sgi_engine"; - dir = 4 - }, -/obj/machinery/door/window/westright{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{ - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/maintenance/port) "Kt" = ( /turf/open/floor/plasteel/mono, /area/ship/cargo) @@ -5763,9 +5737,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"KV" = ( -/turf/closed/wall/mineral/titanium, -/area/template_noop) "KX" = ( /obj/effect/turf_decal/siding/wood{ dir = 8; @@ -5991,6 +5962,25 @@ }, /turf/open/floor/wood/birch, /area/ship/crew/dorm/dormthree) +"MA" = ( +/obj/effect/turf_decal/techfloor/orange{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/poddoor{ + id = "sgi_engine"; + dir = 4 + }, +/obj/machinery/door/window/westright{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{ + dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/maintenance/port) "MI" = ( /obj/effect/turf_decal/techfloor{ dir = 4 @@ -7073,6 +7063,16 @@ }, /turf/open/floor/wood/walnut, /area/ship/crew/canteen/kitchen) +"UJ" = ( +/obj/effect/turf_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light/floor, +/obj/machinery/power/shuttle/engine/fire{ + dir = 4 + }, +/turf/open/floor/engine/hull, +/area/ship/maintenance/port) "UM" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -7845,7 +7845,7 @@ (1,1,1) = {" iG hE -gZ +UJ Hp Hp zI @@ -7871,7 +7871,7 @@ hE ni dv dv -FR +vY hE iG iG @@ -7879,7 +7879,7 @@ iG (2,1,1) = {" iG Od -Kk +MA op op op @@ -7905,13 +7905,13 @@ DH Zj Zj Zj -lG +tz DH iG iG "} (3,1,1) = {" -KV +Od Od XQ ia @@ -7941,12 +7941,12 @@ FG FH Qt DH -KV +DH iG "} (4,1,1) = {" -KV -ci +Od +jJ Ud rD Bp @@ -7974,13 +7974,13 @@ Iw BQ QT oG -vp -KV +ub +DH iG "} (5,1,1) = {" -KV -Ii +Od +DL fG xs Xu @@ -8008,12 +8008,12 @@ xS nJ YE SB -FI -KV +jK +DH iG "} (6,1,1) = {" -KV +Od Od Od Od @@ -8043,7 +8043,7 @@ su DH DH DH -KV +DH iG "} (7,1,1) = {" @@ -8134,7 +8134,7 @@ dH Nb Kt qw -qQ +tE sH Sf hl diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm index 7837cd11cc29..aa8d2f680d07 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -185,6 +185,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/structure/closet/crate/large, /obj/machinery/portable_atmospherics/canister/hydrogen, /turf/open/floor/plating/rust, /area/ship/maintenance/starboard)