Merge branch 'master' into development

code/controllers/subsystems/garbage.dm

@@ -235,22 +235,19 @@ var/datum/controller/subsystem/garbage_collector/SSgarbage
 // This should be overridden to remove all references pointing to the object being destroyed.
 // Return the appropriate QDEL_HINT; in most cases this is QDEL_HINT_QUEUE.
 /datum/proc/Destroy(force=FALSE)
-	if (destroy_listeners)
-		RaiseOnDestroy()
-
-	SSnanoui.close_uis(src)
-	
 	weakref = null
+	destroyed_event.raise_event(src)
+	SSnanoui.close_uis(src)
 	tag = null
-
 	var/list/timers = active_timers
 	active_timers = null
 	if (timers)
-		for(var/thing in timers)
+		for (var/thing in timers)
 			var/datum/timedevent/timer = thing
 			if (timer.spent)
 				continue
 			qdel(timer)
+
 	return QDEL_HINT_QUEUE
 
 /datum/var/gcDestroyed //Time when this object was destroyed.

code/controllers/subsystems/job.dm

@@ -505,6 +505,10 @@
 	H.centcomm_despawn_timer = addtimer(CALLBACK(H, /mob/living/.proc/centcomm_timeout), 10 MINUTES, TIMER_STOPPABLE)
 
 	var/datum/job/job = GetJob(rank)
+
+	if(spawning_at != "Arrivals Shuttle" || job.latejoin_at_spawnpoints)
+		return EquipRank(H, rank, 1)
+
 	var/list/spawn_in_storage = list()
 	H <<"<span class='notice'>You have ten minutes to reach the station before you will be forced there.</span>"
 
@@ -771,8 +775,14 @@
 			else
 				permitted = TRUE
 
-			if(G.whitelisted && !is_alien_whitelisted(H, all_species[G.whitelisted]))
-				permitted = FALSE
+			if (G.whitelisted)
+				var/found = FALSE
+				for (var/species in G.whitelisted)
+					if (is_alien_whitelisted(H, global.all_species[species]))
+						found = TRUE
+						break
+				 if (!found)
+				 	permitted = FALSE
 
 			if(!permitted)
 				H << "<span class='warning'>Your current job or whitelist status does not permit you to spawn with [thing]!</span>"