cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1985 from Fox-McCloud/hijack-rework

Browse Source 
Hijack Objective Rework+Fix
This commit is contained in:
Mark van Alphen
2015-09-10 01:14:08 +02:00
parent e499554fef 8e88ceabd1
commit e58d193e83
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/objective.dm
+3 -3
View File
@@ -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)