Update overmind.dm

code/game/gamemodes/blob/overmind.dm

@@ -58,18 +58,12 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 
 /mob/camera/blob/proc/validate_location()
 	var/turf/T = get_turf(src)
-<<<<<<< HEAD
-	var/area/A = get_area(T)
-	if(((A && !A.blob_allowed) || !T || !(T.z in GLOB.station_z_levels)) && LAZYLEN(GLOB.blobstart))
-		T = get_turf(pick(GLOB.blobstart))
-=======
 	if(!is_valid_turf(T) && LAZYLEN(GLOB.blobstart))
 		var/list/blobstarts = shuffle(GLOB.blobstart)
 		for(var/_T in blobstarts)
 			if(is_valid_turf(_T))
 				T = _T
 				break
->>>>>>> ca1da30... Adds spaceturf check to blob overmind spawning (#34100)
 	if(!T)
 		CRASH("No blobspawnpoints and blob spawned in nullspace.")
 	forceMove(T)