Merge pull request #4834 from Citadel-Station-13/upstream-merge-34409

[MIRROR] Fixes monkeymode shit

code/datums/antagonists/monkey.dm

@@ -16,7 +16,7 @@
 
 	var/datum/disease/D = new /datum/disease/transformation/jungle_fever/monkeymode
 	if(!owner.current.HasDisease(D))
-		owner.current.AddDisease(D)
+		owner.current.ForceContractDisease(D)
 	else
 		QDEL_NULL(D)
 
@@ -50,9 +50,12 @@
 		stack_trace("Wrong team type passed to [type] initialization.")
 	monkey_team = new_team
 
+/datum/antagonist/monkey/get_team()
+	return monkey_team
+
 /datum/antagonist/monkey/proc/forge_objectives()
-	if(monkey_team)
-		owner.objectives |= monkey_team.objectives
+	objectives |= monkey_team.objectives
+	owner.objectives |= objectives
 
 /datum/antagonist/monkey/leader
 	name = "Monkey Leader"
@@ -100,10 +103,9 @@
 
 /datum/team/monkey/proc/update_objectives()
 	objectives = list()
-	var/datum/objective/monkey/O = new /datum/objective/monkey()
+	var/datum/objective/monkey/O = new()
 	O.team = src
 	objectives += O
-	return
 
 /datum/team/monkey/proc/infected_monkeys_alive()
 	var/datum/disease/D = new /datum/disease/transformation/jungle_fever()
@@ -166,4 +168,4 @@
 	if(LAZYLEN(monkeys))
 		parts += "<span class='header'>The monkeys were:</span>"
 		parts += printplayerlist(SSticker.mode.ape_infectees)
-	return "<div class='panel redborder'>[parts.Join("<br>")]</div>"
+	return "<div class='panel redborder'>[parts.Join("<br>")]</div>"