Merge pull request #3036 from Citadel-Station-13/upstream-merge-31129

[MIRROR] Cleans up some antag/event landmark checks

code/modules/mob/dead/new_player/login.dm

@@ -21,15 +21,6 @@
 
 	sight |= SEE_TURFS
 
-/*
-	var/list/watch_locations = list()
-	for(var/obj/effect/landmark/landmark in landmarks_list)
-		if(landmark.tag == "landmark*new_player")
-			watch_locations += landmark.loc
-
-	if(watch_locations.len>0)
-		loc = pick(watch_locations)
-*/
 	new_player_panel()
 	client.playtitlemusic()
 	if(SSticker.current_state < GAME_STATE_SETTING_UP)

code/modules/mob/transform_procs.dm

@@ -329,16 +329,14 @@
 			continue
 		loc_landmark = sloc.loc
 	if(!loc_landmark)
-		for(var/obj/effect/landmark/tripai in GLOB.landmarks_list)
-			if(tripai.name == "tripai")
-				if(locate(/mob/living/silicon/ai) in tripai.loc)
-					continue
-				loc_landmark = tripai.loc
+		for(var/obj/effect/landmark/tripai/L in GLOB.landmarks_list)
+			if(locate(/mob/living/silicon/ai) in L.loc)
+				continue
+			loc_landmark = L.loc
 	if(!loc_landmark)
 		to_chat(src, "Oh god sorry we can't find an unoccupied AI spawn location, so we're spawning you on top of someone.")
-		for(var/obj/effect/landmark/start/sloc in GLOB.landmarks_list)
-			if (sloc.name == "AI")
-				loc_landmark = sloc.loc
+		for(var/obj/effect/landmark/start/ai/sloc in GLOB.landmarks_list)
+			loc_landmark = sloc.loc
 
 	if(!transfer_after)
 		mind.active = FALSE