From 001c533ddc193921c56024c0434ae417c086d980 Mon Sep 17 00:00:00 2001 From: datlo Date: Fri, 12 Jul 2019 21:57:03 +0200 Subject: [PATCH] hijack considers hard crit'd newcrit users dead --- code/modules/shuttle/emergency.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 5481d7856d3..0efd49b0e54 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -182,6 +182,8 @@ continue if(ishuman(player)) //hostages allowed on the shuttle, check for restraints var/mob/living/carbon/human/H = player + if(!H.check_death_method() && H.health <= HEALTH_THRESHOLD_DEAD) //new crit users who are in hard crit are considered dead + continue if(H.handcuffed) //cuffs continue if(H.wear_suit && H.wear_suit.breakouttime) //straight jacket