Merge branch 'garrow-fixes-2' of https://github.com/DexterDude/PvE-CM…

…SS13 into garrow-fixes-2

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"

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"

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
 

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

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"