From b674f247b88aff472343b4e0f8192c05d40189b9 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 8 Sep 2015 16:44:51 -0400 Subject: [PATCH 1/3] Hijack Objective Rework+Fix --- code/game/gamemodes/objective.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 1420fc9c5ae..987f5773f6c 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) + continue if (player.mind && (player.mind != owner)) if(player.stat != DEAD) //they're not dead! if(get_turf(player) in shuttle) From 380d085f28a8e49e77238679b21d0f28444c76df Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 8 Sep 2015 20:12:28 -0400 Subject: [PATCH 2/3] ERT exception --- code/game/gamemodes/objective.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 987f5773f6c..0d9ae613499 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -338,7 +338,7 @@ datum/objective/hijack return 0 var/area/shuttle = locate(/area/shuttle/escape/centcom) for(var/mob/living/player in player_list) - if(istype(player, /mob/living/silicon) || istype(player, /mob/living/simple_animal) || player.mind.special_role) + 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! From 8e88ceabd1a2da99cc987fb83a80963c3b2c5268 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Tue, 8 Sep 2015 22:25:21 -0400 Subject: [PATCH 3/3] fix --- code/game/gamemodes/objective.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 0d9ae613499..d39bc8e2ec3 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -338,7 +338,7 @@ datum/objective/hijack return 0 var/area/shuttle = locate(/area/shuttle/escape/centcom) for(var/mob/living/player in player_list) - if(istype(player, /mob/living/silicon) || istype(player, /mob/living/simple_animal) || player.mind.special_role && !player.mind.special_role = "Response Team") + 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!