changes

code/datums/shuttles.dm

@@ -4,6 +4,7 @@
 	var/suffix
 	var/port_id
 	var/shuttle_id = "SHOULD NEVER EXIST"
+	var/elevator_network
 
 	var/description
 	var/prerequisites
@@ -108,7 +109,6 @@
 /datum/map_template/shuttle/trijent_elevator
 	name = "Trijent Elevator"
 	shuttle_id = MOBILE_TRIJENT_ELEVATOR
-	var/elevator_network
 
 /datum/map_template/shuttle/trijent_elevator/A
 	elevator_network = "A"
@@ -134,14 +134,15 @@
 /datum/map_template/shuttle/trijent_elevator/ice_elevator/requisitions
 	elevator_network = "Requisitions"
 
-/datum/map_template/shuttle/golden_arrow_vehicle_one
+/datum/map_template/shuttle/golden_arrow/vehicleone
 	shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_ONE
 	name = "Vehicle Elevator One"
 
-/datum/map_template/shuttle/golden_arrow_vehicle_two
+/datum/map_template/shuttle/golden_arrow/vehicletwo
 	shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_TWO
 	name = "Vehicle Elevator Two"
 
-/datum/map_template/shuttle/golden_arrow_cargo
+/datum/map_template/shuttle/golden_arrow/cargo
 	shuttle_id = MOBILE_SHUTTLE_SHIPMAP_ELEVATOR_CARGO
 	name = "Cargo Elevator"
+	elevator_network = "garrow_cargo"

code/modules/shuttle/shuttles/shipmap_elevator.dm

@@ -57,6 +57,7 @@
 	dir = NORTH
 	height = 5
 	width = 7
+	var/elevator_network
 
 /obj/docking_port/stationary/shipmap_elevator/one
 	name = "Vehicle Elevator One"

maps/map_files/golden_arrow/golden_arrow.dmm

@@ -4715,7 +4715,8 @@
 "mH" = (
 /obj/docking_port/stationary/shipmap_elevator/two{
 	id = "garrow_vehicle_elevator_two_storage";
-	roundstart_template = /datum/map_template/shuttle/golden_arrow_vehicle_one
+	roundstart_template = /datum/map_template/shuttle/golden_arrow/vehicletwo;
+	name = "Vehicle Elevator Two Storage"
 	},
 /turf/open/floor/almayer/empty,
 /area/golden_arrow/motor_pool)
@@ -6190,12 +6191,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
-"qR" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/motor_pool)
 "qT" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/kitchen/tray{
@@ -7505,6 +7500,15 @@
 	icon_state = "test_floor4"
 	},
 /area/golden_arrow/hangar)
+"uw" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/sign/banners/united_americas_flag{
+	pixel_y = 28
+	},
+/turf/open/floor/almayer,
+/area/golden_arrow/briefing)
 "ux" = (
 /obj/structure/prop{
 	name = "\improper seat-like case";
@@ -10175,11 +10179,15 @@
 	},
 /area/golden_arrow/motor_pool)
 "Bt" = (
-/obj/structure/cable/heavyduty{
-	icon_state = "1-2"
+/obj/effect/decal/cleanable/dirt{
+	layer = 2.52
+	},
+/obj/structure/pipes/vents/pump{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo_arrow"
 	},
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating/plating_catwalk,
 /area/golden_arrow/hangar)
 "Bv" = (
 /obj/structure/machinery/door/poddoor/almayer{
@@ -10780,6 +10788,13 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/motor_pool)
+"Ds" = (
+/obj/structure/pipes/vents/pump,
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "cargo_arrow"
+	},
+/area/golden_arrow/hangar)
 "Dt" = (
 /obj/effect/decal/cleanable/dirt{
 	layer = 2.52
@@ -12341,15 +12356,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/golden_arrow/cryo_cells)
-"HG" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/sign/banners/united_americas_flag{
-	pixel_y = 28
-	},
-/turf/open/floor/almayer,
-/area/golden_arrow/briefing)
 "HH" = (
 /obj/structure/machinery/light/double/blue{
 	dir = 1;
@@ -12922,9 +12928,11 @@
 /area/golden_arrow/supply)
 "Jg" = (
 /obj/docking_port/stationary/shipmap_elevator/cargo{
-	id = "garrow_cargo_elevator";
+	id = "garrow_cargo_elevator_lower";
 	name = "Cargo Elevator Storage";
-	roundstart_template = /datum/map_template/shuttle/golden_arrow_cargo
+	roundstart_template = /datum/map_template/shuttle/golden_arrow/cargo;
+	elevator_network = "garrowcargo";
+	tag = "e1"
 	},
 /turf/open/floor/almayer/empty,
 /area/golden_arrow/supply)
@@ -15574,7 +15582,7 @@
 /obj/docking_port/stationary/shipmap_elevator/one{
 	id = "garrow_vehicle_elevator_one_storage";
 	name = "Vehicle Elevator One Storage";
-	roundstart_template = /datum/map_template/shuttle/golden_arrow_vehicle_two
+	roundstart_template = /datum/map_template/shuttle/golden_arrow/vehicleone
 	},
 /turf/open/floor/almayer/empty,
 /area/golden_arrow/motor_pool)
@@ -17432,6 +17440,14 @@
 	dir = 4
 	},
 /area/golden_arrow/hangar)
+"Vf" = (
+/obj/structure/pipes/vents/pump{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "cargo_arrow"
+	},
+/area/golden_arrow/hangar)
 "Vg" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -18610,6 +18626,12 @@
 	},
 /turf/open/floor/almayer,
 /area/golden_arrow/platoonarmory)
+"Yc" = (
+/obj/structure/machinery/power/apc/almayer{
+	dir = 1
+	},
+/turf/open/floor/almayer,
+/area/golden_arrow/motor_pool)
 "Yd" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -19393,7 +19415,9 @@
 /area/golden_arrow/prep_hallway)
 "ZU" = (
 /obj/docking_port/stationary/shipmap_elevator/cargo{
-	id = "garrow_cargo_elevator"
+	id = "garrow_cargo_elevator_upper";
+	elevator_network = "garrowcargo";
+	tag = "e1"
 	},
 /turf/open/floor/almayer/empty,
 /area/golden_arrow/supply)
@@ -27407,7 +27431,7 @@ EG
 EG
 EG
 zs
-HG
+uw
 QW
 DO
 Jm
@@ -29363,7 +29387,7 @@ Ip
 Ip
 Ip
 Pt
-qR
+Yc
 hs
 FF
 Pt
@@ -31502,9 +31526,9 @@ EG
 EG
 tb
 xa
-Bg
+Ds
 Xl
-Bt
+NB
 NF
 vP
 LP
@@ -31586,7 +31610,7 @@ vP
 vP
 vP
 LP
-xy
+Bt
 xa
 Bg
 EG
@@ -31806,7 +31830,7 @@ EG
 EG
 tb
 xa
-Bg
+Ds
 oN
 vP
 NB
@@ -31890,7 +31914,7 @@ NB
 NB
 NB
 dl
-tb
+Vf
 xa
 Bg
 EG

maps/shuttles/garrow_cargo_elevator.dmm

@@ -36,15 +36,14 @@
 	},
 /area/shuttle/elevator1)
 "s" = (
-/obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call{
-	pixel_y = 32;
-	shuttleId = "garrow_cargo_elevator"
-	},
 /obj/structure/machinery/light/small/blue{
 	dir = 4;
 	light_color = "#dae2ff";
 	light_power = 0.25
 	},
+/obj/structure/machinery/computer/shuttle/elevator_controller{
+	pixel_y = 32
+	},
 /turf/open/floor/almayer{
 	icon_state = "mono"
 	},