Merge pull request #6763 from Citadel-Station-13/upstream-merge-37863

[MIRROR] Fixes changeling team objectives (a bit)
2018-05-17 18:10:01 +00:00
parent 93a9afcf88 db93253168
commit 583de894f3
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()