also syncs a bunch of shit

code/game/gamemodes/miniantags/monkey/monkey.dm

@@ -1,5 +1,6 @@
 /datum/game_mode
 	var/list/ape_infectees = list()
+	var/list/ape_leaders = list()
 
 /datum/game_mode/monkey
 	name = "monkey"
@@ -21,6 +22,9 @@
 
 	var/players_per_carrier = 30
 
+	var/datum/team/monkey/monkey_team
+
+
 
 /datum/game_mode/monkey/pre_setup()
 	carriers_to_make = max(round(num_players()/players_per_carrier, 1), 1)
@@ -30,79 +34,59 @@
 			break
 		var/datum/mind/carrier = pick(antag_candidates)
 		carriers += carrier
-		carrier.special_role = "monkey"
+		carrier.special_role = "Monkey Leader"
 		carrier.restricted_roles = restricted_jobs
 		log_game("[carrier.key] (ckey) has been selected as a Jungle Fever carrier")
 		antag_candidates -= carrier
 
 	if(!carriers.len)
-		return 0
-	return 1
+		return FALSE
+	return TRUE
 
 
 /datum/game_mode/monkey/announce()
 	to_chat(world, "<B>The current game mode is - Monkey!</B>")
 	to_chat(world, "<B>One or more crewmembers have been infected with Jungle Fever! Crew: Contain the outbreak. None of the infected monkeys may escape alive to CentCom. Monkeys: Ensure that your kind lives on! Rise up against your captors!</B>")
 
-
-/datum/game_mode/monkey/proc/greet_carrier(datum/mind/carrier)
-	to_chat(carrier.current, "<B><span class='notice'>You are the Jungle Fever patient zero!!</B></span>")
-	to_chat(carrier.current, "<b>You have been planted onto this station by the Animal Rights Consortium.</b>")
-	to_chat(carrier.current, "<b>Soon the disease will transform you into an ape. Afterwards, you will be able spread the infection to others with a bite.</b>")
-	to_chat(carrier.current, "<b>While your infection strain is undetectable by scanners, any other infectees will show up on medical equipment.</b>")
-	to_chat(carrier.current, "<b>Your mission will be deemed a success if any of the live infected monkeys reach CentCom.</b>")
-	carrier.current.playsound_local(get_turf(carrier.current), 'sound/ambience/antag/monkey.ogg', 100, FALSE, pressure_affected = FALSE)
-	return
-
 /datum/game_mode/monkey/post_setup()
 	for(var/datum/mind/carriermind in carriers)
-		greet_carrier(carriermind)
-		ape_infectees += carriermind
-
-		var/datum/disease/D = new /datum/disease/transformation/jungle_fever
-		D.visibility_flags = HIDDEN_SCANNER|HIDDEN_PANDEMIC
-		D.affected_mob = carriermind.current
-		carriermind.current.viruses += D
-	..()
+		var/datum/antagonist/monkey/M = add_monkey_leader(carriermind, monkey_team)
+		if(M)
+			monkey_team = M.monkey_team
+	return ..()
 
 /datum/game_mode/monkey/check_finished()
 	if((SSshuttle.emergency.mode == SHUTTLE_ENDGAME) || station_was_nuked)
-		return 1
+		return TRUE
 
 	if(!round_converted)
 		for(var/datum/mind/monkey_mind in ape_infectees)
-			continuous_sanity_checked = 1
+			continuous_sanity_checked = TRUE
 			if(monkey_mind.current && monkey_mind.current.stat != DEAD)
-				return 0
+				return FALSE
 
 		var/datum/disease/D = new /datum/disease/transformation/jungle_fever() //ugly but unfortunately needed
 		for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
-			if(H.mind && H.stat != DEAD)
+			if(!(H.z in GLOB.station_z_levels))
+				continue
+			if(H.mind && H.client && H.stat != DEAD)
 				if(H.HasDisease(D))
-					return 0
+					return FALSE
 
-	..()
+	return ..()
 
 /datum/game_mode/monkey/proc/check_monkey_victory()
 	if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME)
-		return 0
+		return FALSE
 	var/datum/disease/D = new /datum/disease/transformation/jungle_fever()
 	for(var/mob/living/carbon/monkey/M in GLOB.alive_mob_list)
 		if (M.HasDisease(D))
 			if(M.onCentCom() || M.onSyndieBase())
 				escaped_monkeys++
 	if(escaped_monkeys >= monkeys_to_win)
-		return 1
+		return TRUE
 	else
-		return 0
-
-/datum/game_mode/proc/add_monkey(datum/mind/monkey_mind)
-	ape_infectees |= monkey_mind
-	monkey_mind.special_role = "Infected Monkey"
-
-/datum/game_mode/proc/remove_monkey(datum/mind/monkey_mind)
-	ape_infectees.Remove(monkey_mind)
-	monkey_mind.special_role = null
+		return FALSE
 
 
 /datum/game_mode/monkey/set_round_result()
@@ -120,3 +104,29 @@
 
 /datum/game_mode/monkey/generate_report()
 	return "Reports of an ancient [pick("retrovirus", "flesh eating bacteria", "disease", "magical curse blamed on viruses", "banana blight")] outbreak that turn humans into monkeys has been reported in your quadrant.  Any such infections may be treated with banana juice.  If an outbreak occurs, ensure the station is quarantined to prevent a largescale outbreak at CentCom."
+
+/proc/add_monkey_leader(datum/mind/monkey_mind)
+	if(is_monkey_leader(monkey_mind))
+		return FALSE
+	var/datum/antagonist/monkey/leader/M = monkey_mind.add_antag_datum(ANTAG_DATUM_MONKEY_LEADER)
+	return M
+
+/proc/add_monkey(datum/mind/monkey_mind)
+	if(is_monkey(monkey_mind))
+		return FALSE
+	var/datum/antagonist/monkey/M = monkey_mind.add_antag_datum(ANTAG_DATUM_MONKEY)
+	return M
+
+/proc/remove_monkey(datum/mind/monkey_mind)
+	if(!is_monkey(monkey_mind))
+		return FALSE
+	var/datum/antagonist/monkey/M = monkey_mind.has_antag_datum(ANTAG_DATUM_MONKEY)
+	M.on_removal()
+	return TRUE
+
+/proc/is_monkey_leader(datum/mind/monkey_mind)
+	return monkey_mind && monkey_mind.has_antag_datum(ANTAG_DATUM_MONKEY_LEADER)
+
+/proc/is_monkey(datum/mind/monkey_mind)
+	return monkey_mind && (monkey_mind.has_antag_datum(ANTAG_DATUM_MONKEY) || is_monkey_leader(monkey_mind))
+