more improvements

Author: mrmanlikesbt

code/controllers/subsystem/ticker.dm

@@ -392,8 +392,7 @@ SUBSYSTEM_DEF(ticker)
 		LAZYADD(round_end_events, cb)
 
 /datum/controller/subsystem/ticker/proc/create_characters()
-	for(var/i in GLOB.auth_new_player_list)
-		var/mob/dead/new_player/authenticated/player = i
+	for(var/mob/dead/new_player/authenticated/player as anything in GLOB.auth_new_player_list)
 		if(player.ready == PLAYER_READY_TO_PLAY && player.mind)
 			GLOB.joined_player_list += player.ckey
 			var/atom/destination = player.mind.assigned_role.get_roundstart_spawn_point()
@@ -406,12 +405,11 @@ SUBSYSTEM_DEF(ticker)
 		CHECK_TICK
 
 /datum/controller/subsystem/ticker/proc/collect_minds()
-	for(var/mob/dead/new_player/authenticated/P in GLOB.player_list)
+	for(var/mob/dead/new_player/authenticated/P as anything in GLOB.auth_new_player_list)
 		if(P.new_character?.mind)
 			SSticker.minds += P.new_character.mind
 		CHECK_TICK
 
-
 /datum/controller/subsystem/ticker/proc/equip_characters()
 	GLOB.security_officer_distribution = decide_security_officer_departments(
 		shuffle(GLOB.auth_new_player_list),

code/modules/jobs/job_types/_job.dm

@@ -653,7 +653,6 @@
 		return get_latejoin_spawn_point()
 	return spawn_point
 
-
 /// Handles finding and picking a valid roundstart effect landmark spawn point, in case no uncommon different spawning events occur.
 /datum/job/proc/get_default_roundstart_spawn_point()
 	for(var/obj/effect/landmark/start/spawn_point as anything in GLOB.start_landmarks_list)
@@ -667,7 +666,6 @@
 	if(!.)
 		log_mapping("Couldn't find a round start spawn point for [title]")
 
-
 /// Finds a valid latejoin spawn point, checking for events and special conditions.
 /datum/job/proc/get_latejoin_spawn_point()
 	if(length(GLOB.jobspawn_overrides[title])) //We're doing something special today.
@@ -676,7 +674,6 @@
 		return pick(SSjob.latejoin_trackers)
 	return SSjob.get_last_resort_spawn_points()
 
-
 /// Spawns the mob to be played as, taking into account preferences and the desired spawn point.
 /datum/job/proc/get_spawn_mob(client/player_client, atom/spawn_point)
 	var/mob/living/spawn_instance

code/modules/mapping/mapping_helpers.dm

@@ -1305,8 +1305,15 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/foodpreserver)
 	var/minimum_pop = 0
 	/// The payload is executed if the configured job's roundstart amount is less than this
 	var/minimum_job_amount = 0
-	/// The job datum type
-	var/targeted_job_type = null
+	/// A list of job datum types to compare [minimum_job_amount] against
+	var/list/targeted_job_types = null
+	/**
+	 * It's highly likely that there will be several lowpop mapping helpers with an identical configuration.
+	 *
+	 * To avoid repeated checks, we generate a unique identifier for this mapping helper's configuration and store
+	 * whether or not it passed in a static associative list formatted as: [check identifier --> TRUE/FALSE].
+	 */
+	VAR_PROTECTED/static/list/cached_succeeded_checks = list()
 
 /obj/effect/mapping_helpers/lowpop/Initialize(mapload)
 	. = ..()
@@ -1325,29 +1332,32 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/foodpreserver)
 /obj/effect/mapping_helpers/lowpop/proc/on_round_start()
 	SIGNAL_HANDLER
 
-	var/static/list/cached_succeeded_checks = list()
-	var/cached_check_identifier = "[targeted_job_type];[minimum_job_amount];[minimum_pop]"
+	var/cached_check_identifier = "[targeted_job_types.Join(",")];[minimum_job_amount];[minimum_pop]"
 	if(!isnull(cached_succeeded_checks[cached_check_identifier]))
 		if(cached_succeeded_checks[cached_check_identifier])
 			payload()
-		qdel(src)
-		return
-
-	if(length(GLOB.manifest.general) < minimum_pop || (ispath(targeted_job_type) && SSjob.get_job_type(targeted_job_type)?.current_positions < minimum_job_amount))
-		cached_succeeded_checks[cached_check_identifier] = TRUE
-		payload()
 	else
-		cached_succeeded_checks[cached_check_identifier] = FALSE
+		var/amount_of_specified_jobs = 0
+		for(var/job_type in targeted_job_types)
+			amount_of_specified_jobs += SSjob.get_job_type(job_type)?.current_positions
+
+		if(length(GLOB.manifest.general) < minimum_pop || amount_of_specified_jobs < minimum_job_amount)
+			cached_succeeded_checks[cached_check_identifier] = TRUE
+			payload()
+		else
+			cached_succeeded_checks[cached_check_identifier] = FALSE
+
 	qdel(src)
 
 /obj/effect/mapping_helpers/lowpop/proc/payload()
+	SHOULD_NOT_SLEEP(TRUE)
 	return
 
 /obj/effect/mapping_helpers/lowpop/cable_spawner
 	name = "lowpop cable spawner"
 	icon_state = "lowpop_cable"
 	minimum_job_amount = 1
-	targeted_job_type = /datum/job/station_engineer
+	targeted_job_types = list(/datum/job/station_engineer, /datum/job/chief_engineer)
 
 	/// The type of cable to spawn
 	var/cable_type = /obj/structure/cable
@@ -1362,7 +1372,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/foodpreserver)
 	name = "lowpop solar console enabler"
 	icon_state = "lowpop_solar"
 	minimum_job_amount = 1
-	targeted_job_type = /datum/job/station_engineer
+	targeted_job_types = list(/datum/job/station_engineer, /datum/job/chief_engineer)
 
 /obj/effect/mapping_helpers/lowpop/solar_console/register_signal()
 	RegisterSignal(SSdcs, COMSIG_GLOB_POST_START, PROC_REF(on_round_start))