Merge pull request #5007 from Citadel-Station-13/upstream-merge-34709

[MIRROR] Fixes each monkey having it's own individual monkey_team

code/datums/antagonists/monkey.dm

@@ -49,9 +49,11 @@
 
 /datum/antagonist/monkey/create_team(datum/team/monkey/new_team)
 	if(!new_team)
-		for(var/datum/antagonist/monkey/N in get_antagonists(/datum/antagonist/monkey, TRUE))
-			if(N.monkey_team)
-				monkey_team = N.monkey_team
+		for(var/datum/antagonist/monkey/H in GLOB.antagonists)
+			if(!H.owner)
+				continue
+			if(H.monkey_team)
+				monkey_team = H.monkey_team
 				return
 		monkey_team = new /datum/team/monkey
 		monkey_team.update_objectives()