From 82ec93a913ef6b2bc56427ffe084ca8d3672b8fa Mon Sep 17 00:00:00 2001 From: meemofcourse <75212565+meemofcourse@users.noreply.github.com> Date: Sat, 4 Nov 2023 12:32:20 -0300 Subject: [PATCH] oops --- _maps/shuttles/subshuttles/minutemen_crux.dmm | 14 +- .../shuttles/subshuttles/nanotrasen_ancon.dmm | 297 +++++++++++------- 2 files changed, 181 insertions(+), 130 deletions(-) diff --git a/_maps/shuttles/subshuttles/minutemen_crux.dmm b/_maps/shuttles/subshuttles/minutemen_crux.dmm index 087750f0037e..414ec3b1e98c 100644 --- a/_maps/shuttles/subshuttles/minutemen_crux.dmm +++ b/_maps/shuttles/subshuttles/minutemen_crux.dmm @@ -13,7 +13,6 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) "b" = ( @@ -53,10 +52,15 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/tech, /area/ship/bridge) "g" = ( +/obj/docking_port/mobile{ + dir = 8; + name = "crux dock"; + port_direction = 2; + preferred_direction = 8 + }, /obj/machinery/door/poddoor{ id = "crux_blastdoors"; dir = 4 @@ -69,7 +73,6 @@ }, /obj/machinery/light/directional/north, /obj/structure/chair/comfy/shuttle, -/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/tech, /area/ship/bridge) "i" = ( @@ -122,7 +125,6 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/obj/effect/landmark/ert_shuttle_spawn, /obj/machinery/button/door{ id = "crux_blastdoors"; name = "Cargo Bay Doors"; @@ -138,7 +140,6 @@ /obj/effect/turf_decal/steeldecal/steel_decals10{ dir = 4 }, -/obj/effect/landmark/ert_shuttle_spawn, /obj/machinery/airalarm/directional/north, /turf/open/floor/plasteel/tech, /area/ship/bridge) @@ -173,7 +174,6 @@ /obj/effect/turf_decal/industrial/caution{ dir = 4 }, -/obj/effect/landmark/ert_shuttle_brief_spawn, /turf/open/floor/plasteel, /area/ship/bridge) "z" = ( @@ -186,7 +186,6 @@ }, /obj/structure/chair/comfy/shuttle, /obj/effect/turf_decal/steeldecal/steel_decals6, -/obj/effect/landmark/ert_shuttle_spawn, /turf/open/floor/plasteel/tech, /area/ship/bridge) "B" = ( @@ -362,7 +361,6 @@ /obj/effect/turf_decal/steeldecal/steel_decals10{ dir = 4 }, -/obj/effect/landmark/ert_shuttle_spawn, /obj/item/radio/intercom/directional/south{ pixel_x = -12 }, diff --git a/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm index 9a9160cd15fd..e1ab5be3200a 100644 --- a/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm +++ b/_maps/shuttles/subshuttles/nanotrasen_ancon.dmm @@ -1,28 +1,82 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aD" = ( +/obj/effect/turf_decal/corner/opaque/green/diagonal, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/siding/thinplating/light{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"aW" = ( +/obj/machinery/computer/card/centcom{ + dir = 8 + }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, +/turf/open/floor/plasteel/telecomms_floor, +/area/ship/bridge) "br" = ( /obj/machinery/door/airlock/external{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, +/area/ship/bridge) +"dw" = ( +/obj/machinery/door/airlock/external/glass{ + dir = 4 + }, +/obj/docking_port/mobile{ + dir = 4; + name = "ancon dock"; + port_direction = 2; + preferred_direction = 4 + }, +/turf/open/floor/plating, /area/ship/bridge) "hj" = ( /obj/effect/turf_decal/corner/opaque/green/diagonal{ dir = 4 }, -/obj/effect/turf_decal/siding/thinplating/light{ +/obj/effect/turf_decal/siding/thinplating/light, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"jj" = ( +/obj/effect/turf_decal/trimline/opaque/green/warning{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"kE" = ( +/obj/effect/turf_decal/corner/opaque/green/half{ dir = 1 }, +/obj/machinery/power/port_gen/pacman, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/item/stack/sheet/mineral/plasma/fifty, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, /turf/open/floor/plasteel/white, /area/ship/bridge) -"lH" = ( -/obj/machinery/photocopier, -/obj/effect/turf_decal/corner/opaque/green/half, +"lu" = ( +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/open/floor/plasteel/white, /area/ship/bridge) "nV" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/structure/chair/office/light{ dir = 8 }, @@ -34,17 +88,15 @@ }, /turf/open/floor/plasteel/white, /area/ship/bridge) -"ol" = ( -/obj/effect/turf_decal/trimline/opaque/green/warning{ +"pk" = ( +/obj/effect/turf_decal/trimline/opaque/green/corner{ dir = 8 }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) -"oF" = ( -/obj/effect/turf_decal/corner/opaque/green/diagonal, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/turf_decal/siding/thinplating/light{ - dir = 1 +/obj/structure/cable{ + icon_state = "2-5" + }, +/obj/structure/cable{ + icon_state = "1-5" }, /turf/open/floor/plasteel/white, /area/ship/bridge) @@ -56,46 +108,34 @@ "tk" = ( /turf/open/space/basic, /area/template_noop) -"vp" = ( -/obj/structure/table, -/obj/machinery/microwave{ - pixel_y = 6 - }, -/obj/effect/turf_decal/corner/opaque/green/half{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) -"vv" = ( -/obj/structure/table, -/obj/machinery/fax{ - pixel_y = 5 - }, -/obj/effect/turf_decal/corner/opaque/green/half, -/turf/open/floor/plasteel/white, -/area/ship/bridge) -"vV" = ( -/turf/open/floor/plasteel, -/area/ship/bridge) -"wi" = ( +"ty" = ( /obj/effect/turf_decal/corner/opaque/green/diagonal{ dir = 4 }, /obj/effect/turf_decal/siding/thinplating/light{ - dir = 9 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) -"ww" = ( -/obj/effect/turf_decal/trimline/opaque/green/corner{ - dir = 8 + dir = 6 }, /turf/open/floor/plasteel/white, /area/ship/bridge) -"wQ" = ( +"up" = ( +/obj/machinery/photocopier, /obj/effect/turf_decal/corner/opaque/green/half, /turf/open/floor/plasteel/white, /area/ship/bridge) +"vV" = ( +/obj/structure/closet/emcloset/wall{ + pixel_y = 28 + }, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/turf/open/floor/plating, +/area/ship/bridge) "xH" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -132,7 +172,10 @@ /turf/open/floor/plating, /area/ship/bridge) "yi" = ( -/turf/open/floor/plasteel/stairs, +/obj/effect/turf_decal/corner/opaque/green/border{ + dir = 4 + }, +/turf/open/floor/plasteel, /area/ship/bridge) "yp" = ( /obj/structure/grille, @@ -168,42 +211,37 @@ }, /turf/open/floor/plating/airless, /area/ship/external/dark) -"Bc" = ( -/obj/effect/turf_decal/corner/opaque/green/diagonal{ +"Ct" = ( +/obj/structure/chair/office/light{ dir = 4 }, -/obj/effect/turf_decal/siding/thinplating/light, -/turf/open/floor/plasteel/white, -/area/ship/bridge) -"BC" = ( /obj/effect/turf_decal/corner/opaque/green/diagonal{ dir = 4 }, /obj/effect/turf_decal/siding/thinplating/light{ - dir = 6 + dir = 8 }, /turf/open/floor/plasteel/white, /area/ship/bridge) -"Ct" = ( -/obj/structure/chair/office/light{ - dir = 4 +"DF" = ( +/obj/machinery/power/terminal{ + dir = 8 }, +/obj/structure/cable{ + icon_state = "0-1" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) +"Fz" = ( /obj/effect/turf_decal/corner/opaque/green/diagonal{ dir = 4 }, /obj/effect/turf_decal/siding/thinplating/light{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) -"Fu" = ( -/obj/effect/turf_decal/trimline/opaque/green/corner{ - dir = 1 + dir = 9 }, /turf/open/floor/plasteel/white, /area/ship/bridge) "FS" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/corner/opaque/green/diagonal, /obj/effect/turf_decal/siding/thinplating/light{ dir = 5 @@ -237,6 +275,9 @@ }, /turf/open/floor/wood, /area/ship/bridge) +"LE" = ( +/turf/closed/wall, +/area/template_noop) "LV" = ( /turf/closed/wall, /area/ship/bridge) @@ -252,16 +293,22 @@ }, /turf/open/floor/plasteel/white, /area/ship/bridge) +"Nk" = ( +/obj/effect/turf_decal/trimline/opaque/green/corner{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "Om" = ( /obj/machinery/door/airlock/external/glass{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/ship/bridge) "Rg" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/light{ dir = 4 }, @@ -276,30 +323,28 @@ }, /turf/open/floor/plasteel/white, /area/ship/bridge) +"Rz" = ( +/obj/effect/turf_decal/corner/opaque/green/half{ + dir = 1 + }, +/obj/machinery/power/smes/engineering, +/obj/structure/cable{ + icon_state = "0-10" + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "SI" = ( -/obj/structure/chair/office/light{ +/obj/effect/turf_decal/corner/opaque/green/border{ dir = 4 }, -/obj/effect/turf_decal/corner/opaque/green/border{ +/obj/structure/chair/comfy{ dir = 4 }, /turf/open/floor/plasteel, /area/ship/bridge) -"Td" = ( -/obj/structure/table, -/obj/item/storage/box/donkpockets/donkpocketpizza{ - pixel_x = -4; - pixel_y = 10 - }, -/obj/item/storage/box/donkpockets/donkpocketteriyaki{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/effect/turf_decal/corner/opaque/green/half{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "Th" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 4 @@ -325,32 +370,40 @@ /obj/machinery/computer/helm{ dir = 8 }, +/obj/effect/turf_decal/techfloor{ + dir = 4 + }, +/obj/effect/turf_decal/spline/fancy/opaque/black{ + dir = 8 + }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) -"XA" = ( -/obj/structure/closet/crate/internals, -/obj/effect/turf_decal/corner/opaque/green/half{ +"XH" = ( +/obj/effect/turf_decal/corner/opaque/green/diagonal{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating/light{ dir = 1 }, /turf/open/floor/plasteel/white, /area/ship/bridge) +"Zr" = ( +/turf/open/floor/plating, +/area/ship/bridge) "ZG" = ( -/obj/structure/railing, -/obj/structure/curtain{ - layer = 3.07 - }, -/obj/machinery/shower{ - pixel_y = 12 +/obj/structure/table, +/obj/machinery/fax{ + pixel_y = 5 }, -/obj/structure/toilet, -/turf/open/floor/plasteel/mono, +/obj/effect/turf_decal/corner/opaque/green/half, +/turf/open/floor/plasteel/white, /area/ship/bridge) (1,1,1) = {" tk tk LV -Om +dw br LV tk @@ -361,7 +414,7 @@ tk zJ LV vV -vV +Zr LV zJ tk @@ -378,38 +431,38 @@ LV "} (4,1,1) = {" yp -XA -ww -ol -ol -Fu -wQ +lu +pk +jj +jj +Nk +DF yp "} (5,1,1) = {" yp -Td -wi +Rz +Fz Ct MW TQ -vv +ZG yp "} (6,1,1) = {" yp -vp -hj +kE +XH KF IJ -Bc -lH +hj +up yp "} (7,1,1) = {" LV LV -oF +aD zI xH te @@ -422,28 +475,28 @@ LV FS nV Rg -BC +ty LV tk "} (9,1,1) = {" tk LV -ZG +LV SI yi -vV +LV LV tk "} (10,1,1) = {" tk -LV +tk LV Vu +aW LV -LV -LV +tk tk "} (11,1,1) = {" @@ -451,8 +504,8 @@ tk tk LV yp -LV -tk +yp +LE tk tk "}