From a41914f8d684713c1f8750714b939eafc71119ef Mon Sep 17 00:00:00 2001 From: AndroBetel <44546836+AndroBetel@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:53:03 +0300 Subject: [PATCH] 1 --- code/__DEFINES/shuttles.dm | 4 + code/datums/shuttles.dm | 12 ++ code/modules/shuttle/shuttle.dm | 2 + .../shuttle/shuttles/shipmap_elevator.dm | 59 ++++++ colonialmarines.dme | 1 + maps/map_files/golden_arrow/golden_arrow.dmm | 179 +++++++++++------- maps/shuttles/garrow_cargo_elevator.dmm | 37 ++-- maps/shuttles/garrow_vehicle_elevator_one.dmm | 27 +-- maps/shuttles/garrow_vehicle_elevator_two.dmm | 27 +-- 9 files changed, 237 insertions(+), 111 deletions(-) create mode 100644 code/modules/shuttle/shuttles/shipmap_elevator.dm diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index 3356782946..ef2e27c7f3 100644 --- a/code/__DEFINES/shuttles.dm +++ b/code/__DEFINES/shuttles.dm @@ -140,3 +140,7 @@ #define ESCAPE_SHUTTLE_SOUTH_PREFIX "escape_shuttle_s" #define ESCAPE_SHUTTLE_DOCK_PREFIX "almayer-hangar-escape-shuttle-" + +#define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_ONE "garrow_vehicle_elevator_one" +#define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_TWO "garrow_vehicle_elevator_two" +#define MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO "garrow_cargo_elevator" diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index bf3644aca0..feb54e3485 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -133,3 +133,15 @@ /datum/map_template/shuttle/trijent_elevator/ice_elevator/requisitions elevator_network = "Requisitions" + +/datum/map_template/shuttle/golden_arrow_vehicle_one + shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_ONE + name = "Vehicle Elevator One" + +/datum/map_template/shuttle/golden_arrow_vehicle_two + shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_TWO + name = "Vehicle Elevator Two" + +/datum/map_template/shuttle/golden_arrow_cargo + shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO + name = "Cargo Elevator" diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 85fc38bf5f..e1737fb53d 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -558,6 +558,8 @@ /obj/docking_port/mobile/proc/on_prearrival() if(destination) destination.on_prearrival(src) + var/obj/docking_port/stationary/dropzone = destination + playsound(dropzone.return_center_turf(), landing_sound, 60, 0) playsound(return_center_turf(), landing_sound, 60, 0) return diff --git a/code/modules/shuttle/shuttles/shipmap_elevator.dm b/code/modules/shuttle/shuttles/shipmap_elevator.dm new file mode 100644 index 0000000000..70de6be09a --- /dev/null +++ b/code/modules/shuttle/shuttles/shipmap_elevator.dm @@ -0,0 +1,59 @@ +/obj/docking_port/mobile/shipmap_elevator + name = "Vehicle Elevator One" + height = 5 + width = 7 + preferred_direction = NORTH + port_direction = SOUTH + + id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_ONE + + callTime = 5 SECONDS + ignitionTime = 1 SECONDS + + ignition_sound = null + landing_sound = 'sound/machines/asrs_raising.ogg' + ambience_idle = null + ambience_flight = null + var/list/railings = list() + var/list/gears = list() + +/obj/docking_port/mobile/shipmap_elevator/register() + . = ..() + for(var/obj/structure/machinery/gear/G in machines) + if(G.id == id) + gears += G + for(var/obj/structure/machinery/door/poddoor/railing/R in machines) + if(R.id == id) + railings += R + +/obj/docking_port/mobile/shipmap_elevator/on_ignition() + for(var/i in gears) + var/obj/structure/machinery/gear/G = i + G.start_moving() + +/obj/docking_port/mobile/shipmap_elevator/set_idle() + ..() + for(var/i in gears) + var/obj/structure/machinery/gear/G = i + G.stop_moving() + for(var/i in railings) + var/obj/structure/machinery/door/poddoor/railing/R = i + if(R.density) + INVOKE_ASYNC(R, TYPE_PROC_REF(/obj/structure/machinery/door, open)) + else + INVOKE_ASYNC(R, TYPE_PROC_REF(/obj/structure/machinery/door, close)) + +/obj/docking_port/mobile/shipmap_elevator/two + name = "Vehicle Elevator Two" + id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_TWO + +/obj/docking_port/mobile/shipmap_elevator/cargo + name = "Cargo Elevator" + height = 6 + width = 8 + id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO + +/obj/docking_port/stationary/shipmap_elevator + dir = NORTH + height = 5 + width = 7 diff --git a/colonialmarines.dme b/colonialmarines.dme index 58cee33fcf..3e3a3eacce 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -2299,6 +2299,7 @@ #include "code\modules\shuttle\computers\trijent_elevator_control.dm" #include "code\modules\shuttle\shuttles\dropship.dm" #include "code\modules\shuttle\shuttles\ert.dm" +#include "code\modules\shuttle\shuttles\shipmap_elevator.dm" #include "code\modules\shuttle\shuttles\trijent_elevator.dm" #include "code\modules\shuttle\shuttles\crashable\crashable.dm" #include "code\modules\shuttle\shuttles\crashable\escape_shuttle.dm" diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index faf7d5e47e..0be6ad1543 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -704,7 +704,7 @@ /area/golden_arrow/hangar) "cv" = ( /obj/structure/machinery/door/poddoor/railing{ - id = "vehiclebay1railing" + id = "garrow_vehicle_elevator_one" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -1040,8 +1040,10 @@ }, /area/golden_arrow/cryo_cells) "dC" = ( -/obj/docking_port/mobile{ - name = "elevator one" +/obj/docking_port/stationary/shipmap_elevator{ + roundstart_template = /datum/map_template/shuttle/golden_arrow_vehicle_one; + id = "garrow_vehicle_elevator_one_storage"; + name = "Vehicle Elevator One Storage" }, /turf/closed/void, /area/golden_arrow/hangar) @@ -1061,14 +1063,14 @@ }, /area/golden_arrow/cryo_cells) "dH" = ( -/obj/structure/machinery/gear{ - id = "supply_elevator_gear" - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; pixel_y = 1 }, +/obj/structure/machinery/gear{ + id = "garrow_vehicle_elevator_one" + }, /turf/open/floor/almayer{ icon_state = "blackcorner"; dir = 1 @@ -1412,9 +1414,6 @@ }, /area/golden_arrow/dorms) "eN" = ( -/obj/structure/machinery/gear{ - id = "supply_elevator_gear" - }, /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -1423,6 +1422,9 @@ icon_state = "SE-out"; pixel_x = 1 }, +/obj/structure/machinery/gear{ + id = "garrow_vehicle_elevator_two" + }, /turf/open/floor/almayer{ icon_state = "blackcorner" }, @@ -1809,7 +1811,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/door/poddoor/railing{ dir = 8; - id = "vehiclebay1railing" + id = "garrow_vehicle_elevator_one" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -2643,7 +2645,7 @@ /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/poddoor/railing{ dir = 4; - id = "vehiclebay1railing" + id = "garrow_vehicle_elevator_one" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -3414,7 +3416,7 @@ dir = 8 }, /obj/structure/machinery/door/poddoor/railing{ - id = "vehiclebay2railing" + id = "garrow_vehicle_elevator_two" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -3473,7 +3475,7 @@ }, /obj/structure/machinery/door/poddoor/railing{ dir = 2; - id = "vehiclebay1railing" + id = "garrow_vehicle_elevator_one" }, /turf/open/floor/almayer{ icon_state = "black" @@ -3543,7 +3545,7 @@ }, /obj/structure/machinery/door/poddoor/railing{ dir = 2; - id = "vehiclebay1railing" + id = "garrow_vehicle_elevator_one" }, /turf/open/floor/almayer{ icon_state = "black" @@ -3551,7 +3553,7 @@ /area/golden_arrow/hangar) "lK" = ( /obj/structure/machinery/door/poddoor/railing{ - id = "vehiclebay2railing" + id = "garrow_vehicle_elevator_two" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -3720,7 +3722,7 @@ "mo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/door/poddoor/railing{ - id = "vehiclebay2railing" + id = "garrow_vehicle_elevator_two" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -4549,6 +4551,15 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"oY" = ( +/obj/docking_port/stationary/shipmap_elevator{ + id = "garrow_cargo_elevator"; + name = "Cargo Elevator"; + width = 8; + height = 6 + }, +/turf/closed/void, +/area/golden_arrow/supply) "pa" = ( /obj/structure/ship_ammo/rocket/widowmaker, /obj/effect/decal/cleanable/dirt, @@ -4566,7 +4577,7 @@ /area/golden_arrow/medical) "pe" = ( /obj/structure/machinery/gear{ - id = "supply_elevator_gear" + id = "garrow_vehicle_elevator_two" }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -4738,17 +4749,6 @@ dir = 4 }, /area/golden_arrow/hangar) -"pO" = ( -/obj/structure/machinery/door/poddoor/railing{ - dir = 8; - id = "vehiclebay1railing" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "black"; - dir = 8 - }, -/area/golden_arrow/hangar) "pR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/heavyduty{ @@ -5392,8 +5392,8 @@ dir = 8 }, /obj/structure/machinery/door/poddoor/railing{ - dir = 2; - id = "vehiclebay2railing" + id = "garrow_vehicle_elevator_two"; + dir = 2 }, /turf/open/floor/almayer{ icon_state = "black" @@ -6174,13 +6174,13 @@ /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) "uH" = ( -/obj/structure/machinery/gear{ - id = "supply_elevator_gear" - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, +/obj/structure/machinery/gear{ + id = "garrow_vehicle_elevator_two" + }, /turf/open/floor/almayer{ icon_state = "blackcorner"; dir = 8 @@ -6439,8 +6439,8 @@ dir = 8 }, /obj/structure/machinery/door/poddoor/railing{ - dir = 2; - id = "vehiclebay2railing" + id = "garrow_vehicle_elevator_two"; + dir = 2 }, /turf/open/floor/almayer{ icon_state = "black" @@ -6666,7 +6666,7 @@ dir = 8 }, /obj/structure/machinery/door/poddoor/railing{ - id = "vehiclebay1railing" + id = "garrow_vehicle_elevator_one" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -7053,7 +7053,7 @@ "xn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/door/poddoor/railing{ - id = "vehiclebay1railing" + id = "garrow_vehicle_elevator_one" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -7515,7 +7515,7 @@ /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/poddoor/railing{ dir = 4; - id = "vehiclebay2railing" + id = "garrow_vehicle_elevator_two" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -7557,13 +7557,13 @@ }, /area/golden_arrow/briefing) "zi" = ( -/obj/structure/machinery/gear{ - id = "supply_elevator_gear" - }, /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; pixel_y = 1 }, +/obj/structure/machinery/gear{ + id = "garrow_vehicle_elevator_two" + }, /turf/open/floor/almayer{ icon_state = "blackcorner"; dir = 1 @@ -8359,8 +8359,8 @@ /area/golden_arrow/hangar) "Cg" = ( /obj/structure/machinery/door/poddoor/railing{ - dir = 2; - id = "vehiclebay2railing" + id = "garrow_vehicle_elevator_two"; + dir = 2 }, /turf/open/floor/almayer{ icon_state = "black" @@ -8372,6 +8372,13 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) +"Ci" = ( +/obj/docking_port/stationary/shipmap_elevator{ + id = "garrow_vehicle_elevator_one"; + name = "Vehicle Elevator One" + }, +/turf/closed/void, +/area/golden_arrow/hangar) "Cj" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 1 @@ -8677,7 +8684,7 @@ /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/poddoor/railing{ dir = 4; - id = "vehiclebay1railing" + id = "garrow_vehicle_elevator_one" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -10175,7 +10182,7 @@ dir = 8 }, /obj/structure/machinery/door/poddoor/railing{ - id = "vehiclebay1railing" + id = "garrow_vehicle_elevator_one" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -10338,7 +10345,7 @@ /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/poddoor/railing{ dir = 4; - id = "vehiclebay2railing" + id = "garrow_vehicle_elevator_two" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -10444,8 +10451,12 @@ }, /area/golden_arrow/engineering) "Jo" = ( -/obj/docking_port/mobile{ - name = "cargo elevator" +/obj/docking_port/stationary/shipmap_elevator{ + roundstart_template = /datum/map_template/shuttle/golden_arrow_cargo; + id = "garrow_cargo_elevator_storage"; + name = "Cargo Elevator Storage"; + height = 6; + width = 8 }, /turf/closed/void, /area/golden_arrow/supply) @@ -10662,6 +10673,23 @@ }, /turf/open/floor/plating, /area/golden_arrow/hangar) +"Kd" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1; + pixel_x = 1 + }, +/obj/structure/machinery/gear{ + id = "garrow_vehicle_elevator_one" + }, +/turf/open/floor/almayer{ + icon_state = "blackcorner"; + dir = 4 + }, +/area/golden_arrow/hangar) "Kf" = ( /obj/structure/machinery/light, /turf/open/floor/almayer/edge/smooth{ @@ -10754,7 +10782,7 @@ }, /obj/structure/machinery/door/poddoor/railing{ dir = 4; - id = "vehiclebay1railing" + id = "garrow_vehicle_elevator_one" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -11136,7 +11164,7 @@ "LK" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 8; - id = "vehiclebay1railing" + id = "garrow_vehicle_elevator_one" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -11152,12 +11180,12 @@ }, /area/golden_arrow/hangar) "LM" = ( -/obj/structure/machinery/gear{ - id = "supply_elevator_gear" - }, /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, +/obj/structure/machinery/gear{ + id = "garrow_vehicle_elevator_one" + }, /turf/open/floor/almayer{ icon_state = "blackcorner"; dir = 8 @@ -11326,6 +11354,13 @@ icon_state = "plate" }, /area/golden_arrow/briefing) +"Mj" = ( +/obj/docking_port/stationary/shipmap_elevator{ + id = "garrow_vehicle_elevator_two"; + name = "Vehicle Elevator Two" + }, +/turf/closed/void, +/area/golden_arrow/hangar) "Mn" = ( /turf/closed/shuttle/midway/transparent{ icon_state = "80"; @@ -11633,8 +11668,10 @@ /turf/open/floor/almayer, /area/golden_arrow/platoonprep) "Nl" = ( -/obj/docking_port/mobile{ - name = "elevator two" +/obj/docking_port/stationary/shipmap_elevator{ + roundstart_template = /datum/map_template/shuttle/golden_arrow_vehicle_two; + id = "garrow_vehicle_elevator_two_storage"; + name = "Vehicle Elevator Two Storage" }, /turf/closed/void, /area/golden_arrow/hangar) @@ -11646,7 +11683,7 @@ }, /obj/structure/machinery/door_control/brbutton{ pixel_y = 28; - id = "vehiclebay1railing"; + id = "garrow_vehicle_elevator_one"; name = "vehicle bay railing control"; pixel_x = 13 }, @@ -12854,7 +12891,7 @@ }, /obj/structure/machinery/door/poddoor/railing{ dir = 4; - id = "vehiclebay2railing" + id = "garrow_vehicle_elevator_two" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -13358,7 +13395,7 @@ "SX" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 2; - id = "vehiclebay1railing" + id = "garrow_vehicle_elevator_one" }, /turf/open/floor/almayer{ icon_state = "black" @@ -13609,7 +13646,7 @@ }, /obj/structure/machinery/door_control/brbutton{ pixel_y = 28; - id = "vehiclebay2railing"; + id = "garrow_vehicle_elevator_two"; name = "vehicle bay railing control"; pixel_x = 13 }, @@ -13755,7 +13792,7 @@ /area/golden_arrow/prep_hallway) "Uu" = ( /obj/structure/machinery/gear{ - id = "supply_elevator_gear" + id = "garrow_vehicle_elevator_one" }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -14876,8 +14913,8 @@ /area/golden_arrow/platoon_commander_rooms) "XW" = ( /obj/structure/machinery/door/poddoor/railing{ - dir = 8; - id = "vehiclebay2railing" + id = "garrow_vehicle_elevator_two"; + dir = 8 }, /turf/open/floor/almayer{ icon_state = "black"; @@ -15358,8 +15395,8 @@ "Zx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/door/poddoor/railing{ - dir = 8; - id = "vehiclebay2railing" + id = "garrow_vehicle_elevator_two"; + dir = 8 }, /turf/open/floor/almayer{ icon_state = "black"; @@ -15510,7 +15547,7 @@ dir = 8 }, /obj/structure/machinery/door/poddoor/railing{ - id = "vehiclebay2railing" + id = "garrow_vehicle_elevator_two" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -15539,7 +15576,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/door/poddoor/railing{ - id = "vehiclebay1railing" + id = "garrow_vehicle_elevator_one" }, /turf/open/floor/almayer{ icon_state = "black"; @@ -23988,7 +24025,7 @@ PX PX PX PX -PX +oY hl EG EG @@ -31739,7 +31776,7 @@ Dz Kx iU Dz -pe +Kd cC dz cC @@ -31890,7 +31927,7 @@ lk lk lk lk -lk +Ci Ix ts dz @@ -31900,7 +31937,7 @@ lk lk lk lk -lk +Mj ZV JK dz @@ -32950,7 +32987,7 @@ EG dz cC LM -pO +gd LK LK LK diff --git a/maps/shuttles/garrow_cargo_elevator.dmm b/maps/shuttles/garrow_cargo_elevator.dmm index c7bdf7c667..6bb7acdd1b 100644 --- a/maps/shuttles/garrow_cargo_elevator.dmm +++ b/maps/shuttles/garrow_cargo_elevator.dmm @@ -1,25 +1,25 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/closed/shuttle/elevator, -/area/space) +/area/shuttle/elevator1) "e" = ( /turf/closed/shuttle/elevator{ dir = 5 }, -/area/space) +/area/shuttle/elevator1) "i" = ( /turf/closed/shuttle/elevator{ dir = 4 }, -/area/space) +/area/shuttle/elevator1) "m" = ( /turf/closed/shuttle/elevator/button/research, -/area/space) +/area/shuttle/elevator1) "n" = ( /turf/closed/shuttle/elevator{ dir = 6 }, -/area/space) +/area/shuttle/elevator1) "o" = ( /obj/structure/machinery/light{ dir = 4 @@ -27,12 +27,12 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/space) +/area/shuttle/elevator1) "q" = ( /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/space) +/area/shuttle/elevator1) "s" = ( /obj/structure/machinery/computer/shuttle_control/ice_colony{ pixel_y = 33 @@ -43,18 +43,18 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/space) +/area/shuttle/elevator1) "t" = ( /obj/effect/decal/cleanable/dirt, /turf/open/shuttle/elevator/grating, -/area/space) +/area/shuttle/elevator1) "u" = ( /obj/effect/decal/cleanable/dirt, /turf/open/shuttle/elevator, -/area/space) +/area/shuttle/elevator1) "A" = ( /turf/open/shuttle/elevator, -/area/space) +/area/shuttle/elevator1) "E" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/research{ name = "\improper Supply Elevator Hatch" @@ -62,13 +62,13 @@ /turf/open/floor/almayer{ icon_state = "test_floor4" }, -/area/space) +/area/shuttle/elevator1) "H" = ( /turf/open/shuttle/elevator/grating, -/area/space) +/area/shuttle/elevator1) "R" = ( /turf/closed/shuttle/elevator/freight, -/area/space) +/area/shuttle/elevator1) "S" = ( /obj/structure/machinery/light{ dir = 8 @@ -76,20 +76,21 @@ /turf/open/floor/almayer{ icon_state = "mono" }, -/area/space) +/area/shuttle/elevator1) "T" = ( /turf/closed/shuttle/elevator/gears, -/area/space) +/area/shuttle/elevator1) "W" = ( +/obj/docking_port/mobile/shipmap_elevator/cargo, /turf/closed/shuttle/elevator{ dir = 10 }, -/area/space) +/area/shuttle/elevator1) "X" = ( /turf/closed/shuttle/elevator{ dir = 9 }, -/area/space) +/area/shuttle/elevator1) (1,1,1) = {" X diff --git a/maps/shuttles/garrow_vehicle_elevator_one.dmm b/maps/shuttles/garrow_vehicle_elevator_one.dmm index af73beaa11..7dbd902617 100644 --- a/maps/shuttles/garrow_vehicle_elevator_one.dmm +++ b/maps/shuttles/garrow_vehicle_elevator_one.dmm @@ -1,26 +1,31 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/open/floor/plating/plating_catwalk, -/area/space) +/area/shuttle/vehicle_elevator) "o" = ( /obj/effect/decal/cleanable/dirt, +/obj/docking_port/mobile/shipmap_elevator, /turf/open/floor/plating/plating_catwalk, -/area/space) +/area/shuttle/vehicle_elevator) "u" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/space) +/area/shuttle/vehicle_elevator) "A" = ( /turf/open/floor/almayer{ icon_state = "plate" }, -/area/space) +/area/shuttle/vehicle_elevator) +"K" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/shuttle/vehicle_elevator) "T" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/plating_catwalk, -/area/space) +/area/shuttle/vehicle_elevator) (1,1,1) = {" a @@ -41,33 +46,33 @@ a A u A -o +K "} (4,1,1) = {" T u A A -o +K "} (5,1,1) = {" a u A A -o +K "} (6,1,1) = {" a A A A -o +K "} (7,1,1) = {" a a a -o -o +K +K "} diff --git a/maps/shuttles/garrow_vehicle_elevator_two.dmm b/maps/shuttles/garrow_vehicle_elevator_two.dmm index af73beaa11..19c7f63918 100644 --- a/maps/shuttles/garrow_vehicle_elevator_two.dmm +++ b/maps/shuttles/garrow_vehicle_elevator_two.dmm @@ -1,26 +1,31 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/open/floor/plating/plating_catwalk, -/area/space) +/area/shuttle/vehicle_elevator) "o" = ( /obj/effect/decal/cleanable/dirt, +/obj/docking_port/mobile/shipmap_elevator/two, /turf/open/floor/plating/plating_catwalk, -/area/space) +/area/shuttle/vehicle_elevator) "u" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/space) +/area/shuttle/vehicle_elevator) "A" = ( /turf/open/floor/almayer{ icon_state = "plate" }, -/area/space) +/area/shuttle/vehicle_elevator) "T" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/plating_catwalk, -/area/space) +/area/shuttle/vehicle_elevator) +"Z" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/shuttle/vehicle_elevator) (1,1,1) = {" a @@ -41,33 +46,33 @@ a A u A -o +Z "} (4,1,1) = {" T u A A -o +Z "} (5,1,1) = {" a u A A -o +Z "} (6,1,1) = {" a A A A -o +Z "} (7,1,1) = {" a a a -o -o +Z +Z "}