Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into json_serialization2

code/modules/mob/living/living.dm

@@ -18,6 +18,7 @@
 	var/turf/T = get_turf(src)
 	if(!T)
 		return 0
+	// TODO: Tie into space manager
 	if(T.z == ZLEVEL_CENTCOMM) //dont detect mobs on centcomm
 		return 0
 	if(T.z >= MAX_Z)

code/modules/mob/living/silicon/ai/ai.dm

@@ -640,13 +640,14 @@ var/list/ai_verbs_default = list(
 	if(check_unable(AI_CHECK_WIRELESS | AI_CHECK_RADIO))
 		return
 
-	var/ai_allowed_Zlevel = list(1,3,5)
+	var/ai_allowed_Zlevel = list(ZLEVEL_STATION,ZLEVEL_TELECOMMS,ZLEVEL_ASTEROID)
 	var/d
 	var/area/bot_area
 	d += "<A HREF=?src=\ref[src];botrefresh=\ref[Bot]>Query network status</A><br>"
 	d += "<table width='100%'><tr><td width='40%'><h3>Name</h3></td><td width='20%'><h3>Status</h3></td><td width='30%'><h3>Location</h3></td><td width='10%'><h3>Control</h3></td></tr>"
 
 	for(var/mob/living/simple_animal/bot/Bot in simple_animal_list)
+		// TODO: Tie into space manager
 		if((Bot.z in ai_allowed_Zlevel) && !Bot.remote_disabled) //Only non-emagged bots on the allowed Z-level are detected!
 			bot_area = get_area(Bot)
 			d += "<tr><td width='30%'>[Bot.hacked ? "<span class='bad'>(!) </span>[Bot.name]" : Bot.name] ([Bot.model])</td>"

code/modules/mob/living/silicon/ai/latejoin.dm

@@ -34,7 +34,7 @@ var/global/list/empty_playable_ai_cores = list()
 	job_master.FreeRole(job)
 
 	if(mind.objectives.len)
-		qdel(mind.objectives)
+		mind.objectives.Cut()
 		mind.special_role = null
 	else
 		if(ticker.mode.name == "AutoTraitor")

code/modules/mob/living/silicon/pai/software_modules.dm

@@ -499,6 +499,7 @@
 /mob/living/silicon/pai/proc/hackloop()
 	var/turf/T = get_turf_or_move(src.loc)
 	for(var/mob/living/silicon/ai/AI in player_list)
+		// TODO: Tie into space manager
 		if(!T || !(T.z in config.contact_levels))
 			break
 		if(T.loc)

code/modules/mob/new_player/new_player.dm

@@ -402,7 +402,7 @@
 					global_announcer.autosay("A new[rank ? " [rank]" : " visitor" ] [join_message ? join_message : "has arrived on the station"].", "Arrivals Announcement Computer")
 
 /mob/new_player/proc/LateChoices()
-	var/mills = world.time // 1/10 of a second, not real milliseconds but whatever
+	var/mills = ROUND_TIME // 1/10 of a second, not real milliseconds but whatever
 	//var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence.. or something
 	var/mins = (mills % 36000) / 600
 	var/hours = mills / 36000