Merge pull request #37863 from AnturK/rr4

Fixes changeling team objectives (a bit)
2018-05-16 22:35:25 +03:00
parent 56544307ec
commit aa7a27420c
2 changed files with 23 additions and 20 deletions
@@ -353,7 +353,10 @@
 	if(GLOB.changeling_team_objective_type)
 		var/datum/objective/changeling_team_objective/team_objective = new GLOB.changeling_team_objective_type
 		team_objective.owner = owner
-		objectives += team_objective
+		if(team_objective.prepare())//Setting up succeeded
+			objectives += team_objective
+		else
+			qdel(team_objective)
 	return

 /datum/antagonist/changeling/proc/forge_objectives()