diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 1420fc9c5ae..d39bc8e2ec3 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -327,7 +327,7 @@ datum/objective/protect//The opposite of killing a dude. datum/objective/hijack - explanation_text = "Hijack the emergency shuttle by escaping alone." + explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive." check_completion() if(!owner.current || owner.current.stat) @@ -337,9 +337,9 @@ datum/objective/hijack if(issilicon(owner.current)) return 0 var/area/shuttle = locate(/area/shuttle/escape/centcom) - var/list/protected_mobs = list(/mob/living/silicon/ai, /mob/living/silicon/pai) for(var/mob/living/player in player_list) - if(player.type in protected_mobs) continue + if(istype(player, /mob/living/silicon) || istype(player, /mob/living/simple_animal) || player.mind.special_role && !player.mind.special_role == "Response Team") + continue if (player.mind && (player.mind != owner)) if(player.stat != DEAD) //they're not dead! if(get_turf(player) in shuttle)