Merge pull request #6987 from Citadel-Station-13/upstream-merge-38199

[MIRROR] fixes a locate and adds job checks to download objective
This commit is contained in:
LetterJay
2018-06-03 10:42:27 -05:00
committed by GitHub

View File

@@ -164,7 +164,7 @@
kill_objective.find_target()
add_objective(kill_objective)
else
if(prob(15) && !(locate(/datum/objective/download in owner.objectives)))
if(prob(15) && !(locate(/datum/objective/download) in owner.objectives) && !(owner.assigned_role in list("Research Director", "Scientist", "Roboticist")))
var/datum/objective/download/download_objective = new
download_objective.owner = owner
download_objective.gen_amount_goal()