From aa01eec1fc15f506501b680da7af4d3dfe53df00 Mon Sep 17 00:00:00 2001
From: DreamySkrell <>
Date: Sat, 28 Oct 2023 21:09:48 +0200
Subject: [PATCH] NAV_HORIZON_DOCK_ALL

---
 code/modules/overmap/sectors.dm               | 16 +++++++--
 .../sccv_horizon/code/sccv_horizon_overmap.dm | 34 +++----------------
 .../code/sccv_horizon_shuttle_landmarks.dm    | 14 +++++---
 3 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm
index 36d14fffd72..7778fc5ef97 100644
--- a/code/modules/overmap/sectors.dm
+++ b/code/modules/overmap/sectors.dm
@@ -14,9 +14,16 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap
 	var/obfuscated_desc = "This object is not displaying its IFF signature."
 	var/obfuscated = FALSE //Whether we hide our name and class or not.
 
-	var/list/initial_generic_waypoints //store landmark_tag of landmarks that should be added to the actual lists below on init.
-	var/list/initial_restricted_waypoints //For use with non-automatic landmarks (automatic ones add themselves).
-	var/list/tracked_dock_tags //landmark_tag of landmarks of docks that will be tracked in the docks computer program
+	/// Landmark tags of landmarks that should be added to the actual lists below on init.
+	/// Generic, meaning usable by any shuttle.
+	/// Can contain nested lists, as it is flattened on init.
+	var/list/initial_generic_waypoints
+	/// Restricted, meaning that only specific shuttles can use them.
+	/// Should be an assoc list like `list("Shuttle" = list("nav_landmark_tag"), ...)`
+	var/list/initial_restricted_waypoints
+	/// Landmark tags of landmarks of docks that will be tracked in the docks computer program.
+	/// Can contain nested lists, as it is flattened on init.
+	var/list/tracked_dock_tags
 
 	var/list/generic_waypoints = list()    //waypoints that any shuttle can use
 	var/list/restricted_waypoints = list() //waypoints for specific shuttles
@@ -66,6 +73,9 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap
 	if(!current_map.overmap_z)
 		build_overmap()
 
+	initial_generic_waypoints = flatten_list(initial_generic_waypoints)
+	tracked_dock_tags = flatten_list(tracked_dock_tags)
+
 	var/map_low = OVERMAP_EDGE
 	var/map_high = current_map.overmap_size - OVERMAP_EDGE
 	var/turf/home
diff --git a/maps/sccv_horizon/code/sccv_horizon_overmap.dm b/maps/sccv_horizon/code/sccv_horizon_overmap.dm
index a44a38b178b..444f3b22500 100644
--- a/maps/sccv_horizon/code/sccv_horizon_overmap.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_overmap.dm
@@ -28,29 +28,8 @@
 	initial_generic_waypoints = list(
 		"nav_horizon_hangar_1",
 		"nav_horizon_hangar_2",
-		"nav_horizon_dock_deck_3_starboard_1",
-		"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",
-		"nav_horizon_exterior_deck_1_starboard",
-		"nav_horizon_exterior_deck_1_port",
-		"nav_horizon_exterior_deck_1_aft",
-		"nav_horizon_exterior_deck_1_starboard_propulsion",
-		"nav_horizon_exterior_deck_1_port_propulsion",
-		"nav_horizon_exterior_deck_2_fore",
-		"nav_horizon_exterior_deck_2_starboard_fore",
-		"nav_horizon_exterior_deck_2_port_fore",
-		"nav_horizon_exterior_deck_2_aft",
-		"nav_horizon_exterior_deck_2_port_aft",
-		"nav_horizon_exterior_deck_2_starboard_aft",
-		"nav_horizon_exterior_deck_3_fore",
-		"nav_horizon_exterior_deck_3_starboard_fore",
-		"nav_horizon_exterior_deck_3_port_fore",
-		"nav_horizon_exterior_deck_3_aft",
-		"nav_horizon_exterior_deck_3_port_aft"
+		NAV_HORIZON_DOCK_ALL,
+		NAV_HORIZON_EXTERIOR_ALL_DECKS,
 	)
 
 	tracked_dock_tags = list(
@@ -64,13 +43,8 @@
 		"nav_distress_blue",
 		"nav_merchant_dock",
 		"nav_ccia_dock",
-		"nav_horizon_dock_deck_3_starboard_1",
-		"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"
+		"nav_ert_dock",
+		NAV_HORIZON_DOCK_ALL,
 	)
 
 /obj/effect/overmap/visitable/ship/sccv_horizon/get_skybox_representation()
diff --git a/maps/sccv_horizon/code/sccv_horizon_shuttle_landmarks.dm b/maps/sccv_horizon/code/sccv_horizon_shuttle_landmarks.dm
index 7c841e89309..8cf3f8eb4e2 100644
--- a/maps/sccv_horizon/code/sccv_horizon_shuttle_landmarks.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_shuttle_landmarks.dm
@@ -1,9 +1,4 @@
 
-//
-// This file is intended for "generic" shuttle landmarks.
-// Generic, meaning visible to and selectable by any shuttle.
-//
-
 // ================================ hangars
 
 /obj/effect/shuttle_landmark/horizon/hangar1
@@ -20,6 +15,15 @@
 
 // ================================ exterior docks
 
+#define NAV_HORIZON_DOCK_ALL list(\
+	"nav_horizon_dock_deck_3_starboard_1",\
+	"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",\
+)
+
 /obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_1
 	name = "Third Deck Starboard Dock 1"
 	landmark_tag = "nav_horizon_dock_deck_3_starboard_1"