From 24ef06d249b58ab587faad39288a367147c08ae9 Mon Sep 17 00:00:00 2001 From: datlo Date: Mon, 25 Feb 2019 14:29:58 +0000 Subject: [PATCH] Allow hijackers to take hostages --- code/game/gamemodes/objective.dm | 4 ++-- code/modules/shuttle/emergency.dm | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 0f59f234d49..210b1bb786e 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -180,8 +180,8 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) - /datu /datum/objective/hijack martyr_compatible = 0 //Technically you won't get both anyway. - explanation_text = "Hijack the shuttle by escaping on it with no loyalist Nanotrasen crew on board and alive. \ - Syndicate agents, other enemies of Nanotrasen, cyborgs, and pets may be allowed to escape alive." + explanation_text = "Hijack the shuttle by escaping on it with no loyalist Nanotrasen crew on board and free. \ + Syndicate agents, other enemies of Nanotrasen, cyborgs, pets, and cuffed/restrained hostages may be allowed on the shuttle alive." /datum/objective/hijack/check_completion() if(!owner.current || owner.current.stat) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 80760e1cb50..b796e3d8a7d 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -180,7 +180,16 @@ continue if(isanimal(player)) //Poly does not own the shuttle continue - + if(ishuman(player)) //hostages allowed on the shuttle, check for restraints + var/mob/living/carbon/human/H = player + if(H.handcuffed) //cuffs + continue + if(H.wear_suit && H.wear_suit.breakouttime) //straight jacket + continue + if(istype(H.loc, /obj/structure/closet)) //locked/welded locker, all aboard the clown train honk honk + var/obj/structure/closet/C = H.loc + if(C.welded || C.locked) + continue var/special_role = player.mind.special_role if(special_role) if(special_role == SPECIAL_ROLE_TRAITOR) // traitors can hijack the shuttle