Fixes Cargo Shuttle Docking (#14915)

* Fixes Cargo Shuttle Docking

* Merchant Shuttle Fix

code/modules/recycling/conveyor2.dm

@@ -7,7 +7,7 @@
 	icon_state = "conveyor0"
 	name = "conveyor belt"
 	desc = "A conveyor belt."
-	layer = 2.9			// so they appear under stuff
+	layer = 2.4			// so they appear above pipes but under doors, objects etc
 	anchored = 1
 	var/operating = 0	// 1 if running forward, -1 if backwards, 0 if off
 	var/operable = 1	// true if can operate (no broken segments in this belt run)

html/changelogs/cargo_shuttle_docking_fix.yml

@@ -0,0 +1,9 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixes the cargo shuttle dock not working properly."
+  - bugfix: "Fixes conveyors layering over things."
+  - bugfix: "Fixes the merchant shuttle not using cardinal-directional windows."
+  - tweak: "Restores the old CCIA shuttle design."

maps/sccv_horizon/code/sccv_horizon.dm

@@ -98,7 +98,7 @@
 		/datum/shuttle/autodock/ferry/escape_pod/pod/escape_pod2,
 		/datum/shuttle/autodock/ferry/escape_pod/pod/escape_pod3,
 		/datum/shuttle/autodock/ferry/escape_pod/pod/escape_pod4,
-		/datum/shuttle/autodock/ferry/supply/aurora,
+		/datum/shuttle/autodock/ferry/supply/horizon,
 		/datum/shuttle/autodock/ferry/specops/ert_aurora,
 		/datum/shuttle/autodock/multi/antag/skipjack_ship,
 		/datum/shuttle/autodock/multi/antag/burglar_ship,

maps/sccv_horizon/code/sccv_horizon_shuttles.dm

@@ -197,4 +197,25 @@
 
 /obj/effect/shuttle_landmark/mining/transit
 	name = "In transit"
-	landmark_tag = "nav_transit_mining"
+	landmark_tag = "nav_transit_mining"
+
+// Cargo Shuttle
+/datum/shuttle/autodock/ferry/supply/horizon
+	name = "Horizon Cargo Shuttle"
+	location = 1
+	shuttle_area = /area/supply/dock
+	dock_target = "cargo_shuttle"
+	waypoint_station = "nav_cargo_shuttle_dock"
+	waypoint_offsite = "nav_cargo_shuttle_start"
+
+/obj/effect/shuttle_landmark/supply/horizon/start
+	name = "Horizon Cargo Shuttle Central Command Dock"
+	landmark_tag = "nav_cargo_shuttle_start"
+	base_turf = /turf/unsimulated/floor/plating
+	base_area = /area/centcom
+
+/obj/effect/shuttle_landmark/supply/horizon/dock
+	name = "Horizon Cargo Shuttle Dock"
+	landmark_tag = "nav_cargo_shuttle_dock"
+	docking_controller = "cargo_shuttle_dock"
+	landmark_flags = SLANDMARK_FLAG_AUTOSET

maps/sccv_horizon/sccv_horizon-1_deck_1.dmm

@@ -9922,7 +9922,7 @@
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
 	icon_state = "door_locked";
-	id_tag = "cargo_shuttle_airlock";
+	id_tag = "cargo_shuttle_dock_airlock";
 	locked = 1;
 	name = "Cargo Shuttle";
 	req_access = list(13,31)
@@ -23084,7 +23084,7 @@
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
 	icon_state = "door_locked";
-	id_tag = "cargo_shuttle_airlock";
+	id_tag = "cargo_shuttle_dock_airlock";
 	locked = 1;
 	name = "Cargo Shuttle";
 	req_access = list(13,31)
@@ -25424,7 +25424,7 @@
 /turf/simulated/floor/tiled,
 /area/hangar/intrepid)
 "ujV" = (
-/obj/effect/shuttle_landmark/supply/dock,
+/obj/effect/shuttle_landmark/supply/horizon/dock,
 /turf/simulated/floor/plating,
 /area/hangar/operations)
 "ukl" = (
@@ -27777,11 +27777,11 @@
 	},
 /obj/machinery/embedded_controller/radio/simple_docking_controller{
 	frequency = 1380;
-	id_tag = "cargo_shuttle";
+	id_tag = "cargo_shuttle_dock";
 	name = "cargo shuttle docking controller";
 	pixel_y = -25;
 	req_one_access = list(13,31);
-	tag_door = "cargo_shuttle_airlock";
+	tag_door = "cargo_shuttle_dock_airlock";
 	pixel_x = -7
 	},
 /turf/simulated/floor/tiled,