From 1b42a98f4aee22a49ad59fa11bea58a14d4f8027 Mon Sep 17 00:00:00 2001
From: alberyk <alberyk.alberyk@gmail.com>
Date: Fri, 21 Jan 2022 23:58:41 -0300
Subject: [PATCH] sanity fix

---
 .../preference_setup/general/01_basic.dm      |  7 +++
 maps/sccv_horizon/code/sccv_horizon.dm        |  1 +
 maps/sccv_horizon/placeholder-3_deck_3.dmm    |  9 +++-
 maps/sccv_horizon/placeholder-4_centcomm.dmm  | 44 ++++---------------
 4 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/code/modules/client/preference_setup/general/01_basic.dm b/code/modules/client/preference_setup/general/01_basic.dm
index 54a8f9c1a16..6a468ddfe6f 100644
--- a/code/modules/client/preference_setup/general/01_basic.dm
+++ b/code/modules/client/preference_setup/general/01_basic.dm
@@ -137,6 +137,13 @@
 	if(!is_in_playable_species)
 		pref.species = SPECIES_HUMAN
 
+	var/list/spawnkeys = list()
+	for(var/S in SSatlas.spawn_locations)
+		spawnkeys += S
+
+	if(!(pref.spawnpoint in spawnkeys))
+		pref.spawnpoint = current_map.default_spawn
+
 	pref.age                = sanitize_integer(text2num(pref.age), pref.getMinAge(), pref.getMaxAge(), initial(pref.age))
 	pref.gender             = sanitize_gender(pref.gender, pref.species)
 	pref.pronouns           = sanitize_pronouns(pref.pronouns, pref.species, pref.gender)
diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm
index c9d696f58c3..d96ad310cbb 100644
--- a/maps/sccv_horizon/code/sccv_horizon.dm
+++ b/maps/sccv_horizon/code/sccv_horizon.dm
@@ -88,6 +88,7 @@
 	evac_controller_type = /datum/evacuation_controller/starship
 
 	spawn_types = list(/datum/spawnpoint/living_quarters_lift, /datum/spawnpoint/cryo)
+	default_spawn = "Living Quarters Lift"
 
 /datum/map/sccv_horizon/finalize_load()
 	// generate an empty space Z
diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm
index 8842475b45c..b5f6a1c2ba1 100644
--- a/maps/sccv_horizon/placeholder-3_deck_3.dmm
+++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm
@@ -15775,6 +15775,13 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
+"MI" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/effect/landmark{
+	name = "JoinLate"
+	},
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/sleep/cryo)
 "MJ" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -39469,7 +39476,7 @@ bH
 KU
 rJ
 rJ
-rJ
+MI
 xK
 Zm
 ch
diff --git a/maps/sccv_horizon/placeholder-4_centcomm.dmm b/maps/sccv_horizon/placeholder-4_centcomm.dmm
index 0bb41f1c44a..2239bb70e1e 100644
--- a/maps/sccv_horizon/placeholder-4_centcomm.dmm
+++ b/maps/sccv_horizon/placeholder-4_centcomm.dmm
@@ -14849,9 +14849,6 @@
 	name = "elevator Button";
 	pixel_y = 31
 	},
-/obj/effect/landmark{
-	name = "JoinLate"
-	},
 /turf/unsimulated/floor{
 	icon_state = "dark2"
 	},
@@ -14862,9 +14859,6 @@
 	name = "adjusted light fixture";
 	pixel_y = -16
 	},
-/obj/effect/landmark{
-	name = "JoinLate"
-	},
 /turf/unsimulated/floor{
 	icon_state = "dark2"
 	},
@@ -15108,14 +15102,6 @@
 "aJT" = (
 /turf/unsimulated/floor,
 /area/centcom/spawning)
-"aJU" = (
-/obj/effect/landmark{
-	name = "JoinLate"
-	},
-/turf/unsimulated/floor{
-	icon_state = "dark2"
-	},
-/area/centcom/spawning)
 "aKc" = (
 /obj/effect/decal/fake_object{
 	color = "#545c68";
@@ -15271,20 +15257,6 @@
 	icon_state = "dark2"
 	},
 /area/centcom/holding)
-"aKs" = (
-/obj/effect/decal/fake_object{
-	desc = "Ding.";
-	icon = 'icons/obj/doors/doorlift.dmi';
-	icon_state = "door_open";
-	name = "elevator door"
-	},
-/obj/effect/landmark{
-	name = "JoinLate"
-	},
-/turf/unsimulated/floor{
-	icon_state = "dark2"
-	},
-/area/centcom/spawning)
 "aKF" = (
 /obj/structure/sign/securearea{
 	desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
@@ -66736,8 +66708,8 @@ aHU
 aHC
 aIH
 aJj
-aJU
-aKs
+aPo
+aLb
 aLb
 aLO
 aJT
@@ -66993,8 +66965,8 @@ aHU
 aHC
 aIH
 aJk
-aJU
-aKs
+aPo
+aLb
 aLb
 aLP
 aJT
@@ -68021,8 +67993,8 @@ aHU
 aHC
 aIH
 aJj
-aJU
-aKs
+aPo
+aLb
 aLb
 aLP
 aJT
@@ -68278,8 +68250,8 @@ aHW
 aHC
 aIH
 aJk
-aJU
-aKs
+aPo
+aLb
 aLb
 aLP
 aJT