From c889a965df15ca6b4d6e7724137cda25b1130544 Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Sun, 21 Jan 2018 22:15:07 -0500 Subject: [PATCH 1/2] Fixes each monkey having it's own individual monkey_team (#34709) * Fixes monkey teams * Update monkey.dm --- code/datums/antagonists/monkey.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/datums/antagonists/monkey.dm b/code/datums/antagonists/monkey.dm index 4d218b612c..25e80f6afb 100644 --- a/code/datums/antagonists/monkey.dm +++ b/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()