diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 0a50d6adf4c..04aabb6c448 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -103,7 +103,7 @@ GLOBAL_VAR_INIT(date_override_offset, 0)
 			SStreasury.distribute_estate_incomes()
 			SStreasury.distribute_daily_payments()
 			SStreasury.distribute_interest()
-		for(var/mob/living/player in GLOB.mob_list)
+		for(var/mob/living/player in GLOB.joined_player_list) //CC Edit mob_list -> joined_player_list
 			if(player.stat != DEAD && player.client)
 				player.do_time_change()
 
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index fdb29430632..b1d10349735 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -886,7 +886,7 @@ SUBSYSTEM_DEF(job)
 ///////////////////////////////////
 /datum/controller/subsystem/job/proc/get_living_heads()
 	. = list()
-	for(var/i in GLOB.human_list)
+	for(var/i in GLOB.joined_player_list) //CC Edit human_list -> joined_player_list
 		var/mob/living/carbon/human/player = i
 		if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.command_positions))
 			. |= player.mind
@@ -897,7 +897,7 @@ SUBSYSTEM_DEF(job)
 ////////////////////////////
 /datum/controller/subsystem/job/proc/get_all_heads()
 	. = list()
-	for(var/i in GLOB.mob_list)
+	for(var/i in GLOB.joined_player_list) //CC Edit mob_list -> joined_player_list
 		var/mob/player = i
 		if(player.mind && (player.mind.assigned_role in GLOB.command_positions))
 			. |= player.mind
@@ -907,7 +907,7 @@ SUBSYSTEM_DEF(job)
 //////////////////////////////////////////////
 /datum/controller/subsystem/job/proc/get_living_sec()
 	. = list()
-	for(var/i in GLOB.human_list)
+	for(var/i in GLOB.joined_player_list) //CC Edit human_list -> joined_player_list
 		var/mob/living/carbon/human/player = i
 		if(player.stat != DEAD && player.mind && (player.mind.assigned_role in GLOB.security_positions))
 			. |= player.mind
@@ -917,7 +917,7 @@ SUBSYSTEM_DEF(job)
 ////////////////////////////////////////
 /datum/controller/subsystem/job/proc/get_all_sec()
 	. = list()
-	for(var/i in GLOB.human_list)
+	for(var/i in GLOB.joined_player_list) //CC Edit human_list -> joined_player_list
 		var/mob/living/carbon/human/player = i
 		if(player.mind && (player.mind.assigned_role in GLOB.security_positions))
 			. |= player.mind
diff --git a/code/modules/roguetown/roguemachine/questing/questing_components.dm b/code/modules/roguetown/roguemachine/questing/questing_components.dm
index 720b6df7748..1f68dd4c6f0 100644
--- a/code/modules/roguetown/roguemachine/questing/questing_components.dm
+++ b/code/modules/roguetown/roguemachine/questing/questing_components.dm
@@ -16,6 +16,7 @@
 		if(is_mob)
 			var/mob/M = parent
 			M.add_filter(outline_filter_id, 2, list("type" = "outline", "color" = "#ff0000", "size" = 0.5))
+			GLOB.quest_mobs += M //CC Edit for registering mobs to quests so we don't go through a global list
 			RegisterSignal(parent, COMSIG_MOB_DEATH, PROC_REF(on_target_death))
 			RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_mob_examine))
 		else
diff --git a/code/modules/roguetown/roguemachine/questing/types/__quest.dm b/code/modules/roguetown/roguemachine/questing/types/__quest.dm
index 5841eda2584..108acbab8cd 100644
--- a/code/modules/roguetown/roguemachine/questing/types/__quest.dm
+++ b/code/modules/roguetown/roguemachine/questing/types/__quest.dm
@@ -1,3 +1,8 @@
+//CC Edit Begin
+//This list holds all mobs currently associated with active quests.
+GLOBAL_LIST_EMPTY(quest_mobs)
+//CC Edit End
+
 /datum/quest
 	var/title = ""
 	var/datum/weakref/quest_giver_reference
@@ -37,7 +42,7 @@
 
 /datum/quest/Destroy()
 	// Clean up mobs with quest components
-	for(var/mob/living/M in GLOB.mob_list)
+	for(var/mob/living/M in GLOB.quest_mobs)
 		var/datum/component/quest_object/Q = M.GetComponent(/datum/component/quest_object)
 		if(Q && Q.quest_ref?.resolve() == src)
 			M.remove_filter("quest_item_outline")
diff --git a/code/modules/spells/roguetown/acolyte/necra.dm b/code/modules/spells/roguetown/acolyte/necra.dm
index f92704b2750..4a187e8e122 100644
--- a/code/modules/spells/roguetown/acolyte/necra.dm
+++ b/code/modules/spells/roguetown/acolyte/necra.dm
@@ -124,7 +124,7 @@
 	var/mob/living/carbon/spirit/capturedsoul = null
 	var/list/souloptions = list()
 	var/list/itemstore = list()
-	for(var/mob/living/carbon/spirit/S in GLOB.mob_list)
+	for(var/mob/living/carbon/spirit/S in GLOB.player_list) //CC Edit mob_list -> player_list
 		if(S.summoned)
 			continue
 		if(!S.client)
@@ -134,7 +134,7 @@
 	if(!pickedsoul)
 		to_chat(user, span_warning("I was unable to commune with a soul."))
 		return
-	for(var/mob/living/carbon/spirit/P in GLOB.mob_list)
+	for(var/mob/living/carbon/spirit/P in GLOB.player_list) //CC Edit mob_list -> player_list
 		if(P.livingname == pickedsoul)
 			to_chat(P, "<font color='blue'>You feel yourself being pulled out of the Underworld.</font>")
 			sleep(2 SECONDS)
diff --git a/code/modules/vampire_neu/objects/scrying.dm b/code/modules/vampire_neu/objects/scrying.dm
index 9b5ca96bdeb..458e04bb49b 100644
--- a/code/modules/vampire_neu/objects/scrying.dm
+++ b/code/modules/vampire_neu/objects/scrying.dm
@@ -100,7 +100,7 @@
 		to_chat(V, span_boldnotice("A message from [src.real_name]:[msg]"))
 	for(var/datum/mind/D in SSmapping.retainer.death_knights)
 		to_chat(D, span_boldnotice("A message from [src.real_name]:[msg]"))
-	for(var/mob/dead/observer/rogue/arcaneeye/A in GLOB.mob_list)
+	for(var/mob/dead/observer/rogue/arcaneeye/A in GLOB.player_list) //CC Edit mob_list -> player_list
 		to_chat(A, span_boldnotice("A message from [src.real_name]:[msg]"))
 
 /mob/dead/observer/rogue/arcaneeye/proc/eye_up()