diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index ddade31600..b48daca115 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -273,7 +273,7 @@ "afm" = (/turf/open/floor/plating,/area/maintenance/fore/secondary) "afn" = (/obj/machinery/door/airlock/external{name = "Escape Pod Three"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 8},/turf/open/floor/plating,/area/maintenance/fore/secondary) "afo" = (/obj/docking_port/stationary{dir = 4; dwidth = 1; height = 4; name = "escape pod loader"; roundstart_template = /datum/map_template/shuttle/escape_pod/default; width = 3},/turf/open/space/basic,/area/space) -"afp" = (/obj/docking_port/stationary/random{dir = 4; id = "pod_lavaland3"; name = "lavaland"},/turf/open/space,/area/space/nearstation) +"afp" = (/obj/docking_port/stationary/random{dir = 4; name = "lavaland"; shuttle_id = "pod_lavaland3"},/turf/open/space,/area/space/nearstation) "afq" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/security/execution/transfer) "afr" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 5},/obj/effect/turf_decal/stripes/line{dir = 10},/turf/open/floor/plating,/area/security/execution/transfer) "afs" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; layer = 2.4},/obj/machinery/door/window/southleft{base_state = "right"; dir = 4; icon_state = "right"; name = "Armory"; req_access_txt = "2"},/obj/effect/turf_decal/stripes/line,/turf/open/floor/plating,/area/security/execution/transfer) @@ -1211,7 +1211,7 @@ "axs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/department/electrical) "axt" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/turf/open/floor/plating,/area/maintenance/department/electrical) "axu" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/stock_parts/cell/high/plus,/obj/item/stock_parts/cell/high/plus,/turf/open/floor/plating,/area/maintenance/department/electrical) -"axv" = (/obj/docking_port/stationary/random{dir = 8; id = "pod_lavaland2"; name = "lavaland"},/turf/open/space,/area/space/nearstation) +"axv" = (/obj/docking_port/stationary/random{dir = 8; name = "lavaland"; shuttle_id = "pod_lavaland2"},/turf/open/space,/area/space/nearstation) "axw" = (/obj/docking_port/stationary{dir = 8; dwidth = 1; height = 4; name = "escape pod loader"; roundstart_template = /datum/map_template/shuttle/escape_pod/default; width = 3},/turf/open/space/basic,/area/space) "axx" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/machinery/light{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/central) "axy" = (/obj/machinery/door/airlock/external{dir = 4; name = "Escape Pod One"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel/dark,/area/hallway/secondary/entry) @@ -1691,7 +1691,7 @@ "aGN" = (/turf/open/floor/plasteel/chapel{dir = 1},/area/service/chapel/main) "aGO" = (/obj/structure/table/glass,/obj/item/reagent_containers/food/snacks/grown/poppy,/obj/item/reagent_containers/food/snacks/grown/harebell,/turf/open/floor/plasteel/chapel{dir = 4},/area/service/chapel/main) "aGP" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/service/chapel/main) -"aGQ" = (/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 15; name = "arrivals"; roundstart_template = /datum/map_template/shuttle/arrival/box; width = 7; shuttle_id = "arrivals_stationary"},/turf/open/space/basic,/area/space) +"aGQ" = (/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 15; shuttle_id = "arrivals_stationary"; name = "arrivals"; roundstart_template = /datum/map_template/shuttle/arrival/box; width = 7},/turf/open/space/basic,/area/space) "aGR" = (/obj/effect/turf_decal/stripes/line{dir = 9},/turf/open/floor/plating/airless,/area/space/nearstation) "aGS" = (/obj/machinery/door/airlock/security{name = "Security Checkpoint"; req_access_txt = "1"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/security/checkpoint/auxiliary) "aGT" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/security/checkpoint/auxiliary) @@ -2180,7 +2180,7 @@ "aQl" = (/obj/structure/chair/sofa,/turf/open/floor/carpet,/area/hallway/secondary/exit) "aQm" = (/obj/machinery/camera{c_tag = "Escape Arm Holding Area"; dir = 4},/obj/item/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/obj/structure/chair{dir = 4},/obj/machinery/light{dir = 8},/turf/open/floor/plasteel,/area/hallway/secondary/exit) "aQn" = (/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/dark,/area/hallway/secondary/exit) -"aQo" = (/obj/docking_port/stationary/random{dir = 8; id = "pod_lavaland1"; name = "lavaland"},/turf/open/space,/area/space/nearstation) +"aQo" = (/obj/docking_port/stationary/random{dir = 8; name = "lavaland"; shuttle_id = "pod_lavaland1"},/turf/open/space,/area/space/nearstation) "aQp" = (/obj/structure/sign/warning/vacuum/external{pixel_y = 32},/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/hallway/secondary/entry) "aQq" = (/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/hallway/secondary/entry) "aQr" = (/obj/effect/turf_decal/stripes/corner{dir = 8},/turf/open/floor/plasteel,/area/hallway/secondary/entry) @@ -6582,7 +6582,7 @@ "cyn" = (/obj/machinery/door/poddoor/preopen{id = "Engineering"; name = "engineering security door"},/obj/effect/turf_decal/delivery,/obj/machinery/shower{dir = 8},/turf/open/floor/plasteel,/area/engineering/main) "cyo" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/green/visible,/turf/open/space,/area/space/nearstation) "cyp" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/yellow/visible,/turf/open/space,/area/space/nearstation) -"cyq" = (/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{dir = 1},/obj/structure/lattice/catwalk,/turf/open/space) +"cyq" = (/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{dir = 1},/obj/structure/lattice/catwalk,/turf/open/space,/area/engineering/atmos) "cyr" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/cyan/visible,/turf/open/space,/area/space/nearstation) "cys" = (/obj/structure/sign/warning/nosmoking{pixel_x = -28},/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4; name = "input gas connector port"},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) "cyt" = (/obj/machinery/atmospherics/components/binary/pump{dir = 4; name = "input port pump"},/turf/open/floor/plasteel,/area/maintenance/disposal/incinerator) @@ -6896,7 +6896,7 @@ "cEs" = (/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plasteel,/area/engineering/main) "cEt" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/external{name = "Escape Pod Four"},/turf/open/floor/plating,/area/engineering/main) "cEu" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 8},/obj/machinery/door/airlock/external{name = "Escape Pod Four"; shuttledocked = 1},/turf/open/floor/plating,/area/engineering/main) -"cEv" = (/obj/docking_port/stationary/random{dir = 4; id = "pod_lavaland4"; name = "lavaland"},/turf/open/space,/area/space/nearstation) +"cEv" = (/obj/docking_port/stationary/random{dir = 4; name = "lavaland"; shuttle_id = "pod_lavaland4"},/turf/open/space,/area/space/nearstation) "cEw" = (/obj/machinery/power/turbine{luminosity = 2},/obj/structure/cable/yellow,/turf/open/floor/engine/vacuum,/area/maintenance/disposal/incinerator) "cEx" = (/obj/item/wrench,/obj/structure/lattice/catwalk,/turf/open/space,/area/space/nearstation) "cEy" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table_frame,/obj/item/wirerod,/obj/effect/spawner/lootdrop/maintenance,/turf/open/floor/plating,/area/maintenance/starboard/aft) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index f8b38d4265..c62872d9d5 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1289,8 +1289,8 @@ /area/security/detectives_office) "acy" = ( /obj/docking_port/stationary/random{ - id = "pod_lavaland3"; - name = "lavaland" + name = "lavaland"; + shuttle_id = "pod_lavaland3" }, /turf/open/space, /area/space/nearstation) @@ -40229,9 +40229,9 @@ dir = 8; dwidth = 2; height = 11; - id = "ferry_home"; name = "port bay 2"; - width = 5 + width = 5; + shuttle_id = "ferry_home" }, /turf/open/space/basic, /area/space) @@ -63738,8 +63738,8 @@ "ccg" = ( /obj/docking_port/stationary/random{ dir = 8; - id = "pod_lavaland2"; - name = "lavaland" + name = "lavaland"; + shuttle_id = "pod_lavaland2" }, /turf/open/space, /area/space/nearstation) @@ -78304,8 +78304,8 @@ "cGA" = ( /obj/docking_port/stationary/random{ dir = 2; - id = "pod_lavaland1"; - name = "lavaland" + name = "lavaland"; + shuttle_id = "pod_lavaland1" }, /turf/open/space, /area/space/nearstation) @@ -79255,10 +79255,10 @@ dir = 8; dwidth = 4; height = 9; - id = "aux_base_zone"; name = "aux base zone"; roundstart_template = /datum/map_template/shuttle/aux_base/default; - width = 9 + width = 9; + shuttle_id = "aux_base_zone" }, /turf/open/floor/plating, /area/construction/mining/aux_base) @@ -80715,8 +80715,8 @@ "cOd" = ( /obj/docking_port/stationary/random{ dir = 4; - id = "pod_lavaland4"; - name = "lavaland" + name = "lavaland"; + shuttle_id = "pod_lavaland4" }, /turf/open/space, /area/space/nearstation) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 7c8210d9bc..8ded21eb2e 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1105,8 +1105,8 @@ /area/space) "adG" = ( /obj/docking_port/stationary/random{ - id = "pod_lavaland2"; - name = "lavaland" + name = "lavaland"; + shuttle_id = "pod_lavaland2" }, /turf/open/space, /area/space) @@ -15097,8 +15097,8 @@ "bii" = ( /obj/docking_port/stationary/random{ dir = 4; - id = "pod_lavaland3"; - name = "lavaland" + name = "lavaland"; + shuttle_id = "pod_lavaland3" }, /turf/open/space, /area/space/nearstation) @@ -43252,8 +43252,8 @@ /area/science/xenobiology) "cSP" = ( /obj/docking_port/stationary/random{ - id = "pod_lavaland1"; - name = "lavaland" + name = "lavaland"; + shuttle_id = "pod_lavaland1" }, /turf/open/space, /area/space/nearstation) @@ -43610,8 +43610,8 @@ "cUL" = ( /obj/docking_port/stationary/random{ dir = 4; - id = "pod_lavaland4"; - name = "lavaland" + name = "lavaland"; + shuttle_id = "pod_lavaland4" }, /turf/open/space, /area/space/nearstation) @@ -65686,10 +65686,10 @@ dheight = 4; dwidth = 4; height = 9; - id = "aux_base_zone"; name = "aux base zone"; roundstart_template = /datum/map_template/shuttle/aux_base/default; - width = 9 + width = 9; + shuttle_id = "aux_base_zone" }, /turf/open/floor/plating, /area/construction/mining/aux_base) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index aa5b66b0e2..a0d4ddd3a7 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -22646,9 +22646,9 @@ dir = 4; dwidth = 5; height = 7; - id = "supply_home"; name = "Cargo Bay"; - width = 12 + width = 12; + shuttle_id = "supply_home" }, /turf/open/space/basic, /area/space) @@ -27761,10 +27761,10 @@ dir = 4; dwidth = 3; height = 5; - id = "mining_home"; name = "mining shuttle bay"; roundstart_template = /datum/map_template/shuttle/mining/delta; - width = 7 + width = 7; + shuttle_id = "mining_home" }, /turf/open/space/basic, /area/space) @@ -62637,10 +62637,10 @@ dir = 1; dwidth = 4; height = 9; - id = "aux_base_zone"; name = "aux base zone"; roundstart_template = /datum/map_template/shuttle/aux_base/small; - width = 9 + width = 9; + shuttle_id = "aux_base_zone" }, /turf/open/floor/plating, /area/construction/mining/aux_base)