From 0600a348cd921dc007f1f7952869caab8f8b8b6d Mon Sep 17 00:00:00 2001
From: DreamySkrell <>
Date: Thu, 26 Oct 2023 22:28:45 +0200
Subject: [PATCH] merc ship generic dock landmark huh

---
 maps/sccv_horizon/code/sccv_horizon_overmap.dm        |  7 ++++---
 .../code/sccv_horizon_shuttle_landmarks.dm            | 10 +++++++++-
 maps/sccv_horizon/code/sccv_horizon_shuttles.dm       | 11 ++---------
 maps/sccv_horizon/sccv_horizon-3_deck_3.dmm           |  4 ++--
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/maps/sccv_horizon/code/sccv_horizon_overmap.dm b/maps/sccv_horizon/code/sccv_horizon_overmap.dm
index 6835a17a382..a44a38b178b 100644
--- a/maps/sccv_horizon/code/sccv_horizon_overmap.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_overmap.dm
@@ -29,8 +29,9 @@
 		"nav_horizon_hangar_1",
 		"nav_horizon_hangar_2",
 		"nav_horizon_dock_deck_3_starboard_1",
-		"nav_horizon_dock_deck_3_port_2",
+		"nav_horizon_dock_deck_3_starboard_2",
 		"nav_horizon_dock_deck_3_starboard_3",
+		"nav_horizon_dock_deck_3_port_2",
 		"nav_horizon_dock_deck_3_port_4",
 		"nav_horizon_dock_deck_3_port_5",
 		"nav_horizon_exterior_deck_1_fore",
@@ -63,10 +64,10 @@
 		"nav_distress_blue",
 		"nav_merchant_dock",
 		"nav_ccia_dock",
-		"nav_merc_dock",
 		"nav_horizon_dock_deck_3_starboard_1",
-		"nav_horizon_dock_deck_3_port_2",
+		"nav_horizon_dock_deck_3_starboard_2",
 		"nav_horizon_dock_deck_3_starboard_3",
+		"nav_horizon_dock_deck_3_port_2",
 		"nav_horizon_dock_deck_3_port_4",
 		"nav_horizon_dock_deck_3_port_5",
 		"nav_ert_dock"
diff --git a/maps/sccv_horizon/code/sccv_horizon_shuttle_landmarks.dm b/maps/sccv_horizon/code/sccv_horizon_shuttle_landmarks.dm
index b1a0ece6d82..c177a058076 100644
--- a/maps/sccv_horizon/code/sccv_horizon_shuttle_landmarks.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_shuttle_landmarks.dm
@@ -21,8 +21,16 @@
 // ================================ exterior docks
 
 /obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_1
-	name = "Third Deck Starboard Dock 2"
+	name = "Third Deck Starboard Dock 1"
 	landmark_tag = "nav_horizon_dock_deck_3_starboard_1"
+	docking_controller = "nuke_shuttle_dock_airlock"
+	base_turf = /turf/simulated/floor/reinforced/airless
+	base_area = /area/space
+
+
+/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_2
+	name = "Third Deck Starboard Dock 2"
+	landmark_tag = "nav_horizon_dock_deck_3_starboard_2"
 	docking_controller = "dock_horizon_1_airlock"
 	base_turf = /turf/simulated/floor/reinforced/airless
 	base_area = /area/space
diff --git a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm
index 0954ec367b4..5ecb037c2ad 100644
--- a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm
@@ -108,11 +108,11 @@
 	move_time = 75
 	shuttle_area = /area/shuttle/mercenary
 	destination_tags = list(
-		"nav_merc_dock",
 		"nav_merc_start",
 		"nav_third_deck",
 		"nav_second_deck",
-		"nav_first_deck"
+		"nav_first_deck",
+		// "nav_horizon_dock_deck_3_starboard_1",
 		)
 
 	landmark_transition = "nav_merc_interim"
@@ -133,13 +133,6 @@
 	base_turf = /turf/space/transit/north
 	base_area = /area/template_noop
 
-/obj/effect/shuttle_landmark/merc_ship/dock
-	name = "Third Deck Starboard Dock 1"
-	landmark_tag = "nav_merc_dock"
-	docking_controller = "nuke_shuttle_dock_airlock"
-	base_turf = /turf/simulated/floor/reinforced/airless
-	base_area = /area/space
-
 /obj/effect/shuttle_landmark/merc_ship/third_deck
 	name = "Third Deck Outside"
 	landmark_tag = "nav_third_deck"
diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
index e65f9428ef1..1f6320453ed 100644
--- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
@@ -13631,7 +13631,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/meeting_room)
 "kyo" = (
-/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_1,
+/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_2,
 /obj/machinery/door/airlock/external{
 	dir = 1;
 	frequency = 1380;
@@ -17023,7 +17023,7 @@
 	name = "Docking Port Airlock";
 	req_access = list(13)
 	},
-/obj/effect/shuttle_landmark/merc_ship/dock{
+/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_1{
 	dir = 4
 	},
 /turf/simulated/floor/plating,