Readding the gateway to Exodus.

NebulaSS13 · Oct 24, 2023 · 57ece29 · 57ece29
1 parent ed2fb20
commit 57ece29
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/code/modules/client/preferences_spawnpoints.dm b/code/modules/client/preferences_spawnpoints.dm
@@ -26,7 +26,7 @@
 	/// Determines validity for get_random_spawn_turf()
 	var/spawn_flags = (SPAWN_FLAG_GHOSTS_CAN_SPAWN | SPAWN_FLAG_JOBS_CAN_SPAWN | SPAWN_FLAG_PRISONERS_CAN_SPAWN | SPAWN_FLAG_PERSISTENCE_CAN_SPAWN)
 	/// List of turfs to spawn on. Retrieved via get_spawn_turfs().
-	var/list/_spawn_turfs
+	VAR_PRIVATE/list/_spawn_turfs
 	/// A list of job types that are allowed to use this spawnpoint.
 	var/list/restrict_job
 	/// A list of event categories that are allowed to use this spawnpoint (ex. ASSIGNMENT_JANITOR)
@@ -73,6 +73,8 @@
 /decl/spawnpoint/observer
 	name = "Observer"
 	uid = "spawn_observer"
+	spawn_flags = SPAWN_FLAG_GHOSTS_CAN_SPAWN
+
 /obj/abstract/landmark/latejoin/observer
 	spawn_decl = /decl/spawnpoint/observer
 

diff --git a/code/unit_tests/map_tests.dm b/code/unit_tests/map_tests.dm
@@ -305,9 +305,9 @@
 
 	var/list/failed = list()
 	var/list/check_spawn_flags = list(
-		"SPAWN_FLAG_PRISONERS_CAN_SPAWN" = SPAWN_FLAG_PRISONERS_CAN_SPAWN,
-		"SPAWN_FLAG_JOBS_CAN_JOIN"       = SPAWN_FLAG_JOBS_CAN_SPAWN,
-		"SPAWN_FLAG_PERSISTENCE_CAN_USE" = SPAWN_FLAG_PERSISTENCE_CAN_SPAWN
+		"SPAWN_FLAG_PRISONERS_CAN_SPAWN"   = SPAWN_FLAG_PRISONERS_CAN_SPAWN,
+		"SPAWN_FLAG_JOBS_CAN_SPAWN"        = SPAWN_FLAG_JOBS_CAN_SPAWN,
+		"SPAWN_FLAG_PERSISTENCE_CAN_SPAWN" = SPAWN_FLAG_PERSISTENCE_CAN_SPAWN
 	)
 
 	// Check that all flags are represented in compiled spawnpoints.

diff --git a/maps/away_sites_testing/away_sites_testing_define.dm b/maps/away_sites_testing/away_sites_testing_define.dm
@@ -8,6 +8,10 @@
 	allowed_latejoin_spawns = list()
 	default_spawn = null
 
+// Set the observer spawn to include every flag so that CI flag checks pass.
+/decl/spawnpoint/observer
+	spawn_flags = (SPAWN_FLAG_GHOSTS_CAN_SPAWN | SPAWN_FLAG_JOBS_CAN_SPAWN | SPAWN_FLAG_PRISONERS_CAN_SPAWN | SPAWN_FLAG_PERSISTENCE_CAN_SPAWN)
+
 /datum/map/away_sites_testing/build_away_sites()
 	var/list/unsorted_sites = list_values(SSmapping.get_templates_by_category(MAP_TEMPLATE_CATEGORY_AWAYSITE))
 	var/list/sorted_sites = sortTim(unsorted_sites, /proc/cmp_sort_templates_tallest_to_shortest)

diff --git a/maps/exodus/exodus_jobs.dm b/maps/exodus/exodus_jobs.dm
@@ -1,3 +1,11 @@
+/decl/spawnpoint/gateway
+	name = "Gateway"
+	spawn_announcement = "has completed translation from offsite gateway"
+	uid = "spawn_exodus_gateway"
+
+/obj/abstract/landmark/latejoin/gateway
+	spawn_decl = /decl/spawnpoint/gateway
+
 /datum/map/exodus
 	default_job_type = /datum/job/assistant
 	default_department_type = /decl/department/civilian

diff --git a/maps/planets_testing/planets_testing_define.dm b/maps/planets_testing/planets_testing_define.dm
@@ -6,6 +6,10 @@
 	allowed_latejoin_spawns = list()
 	default_spawn  = null
 
+// Set the observer spawn to include every flag so that CI flag checks pass.
+/decl/spawnpoint/observer
+	spawn_flags = (SPAWN_FLAG_GHOSTS_CAN_SPAWN | SPAWN_FLAG_JOBS_CAN_SPAWN | SPAWN_FLAG_PRISONERS_CAN_SPAWN | SPAWN_FLAG_PERSISTENCE_CAN_SPAWN)
+
 /datum/map/planet_testing/build_planets()
 	report_progress("Instantiating planets...")