From e984c8b9bc591e29f21126f945144db4b436dc63 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Thu, 16 Aug 2012 19:48:43 +0000 Subject: [PATCH] - Fixes handcuffing and legcuffing errors that the inventory overhaul broke. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4448 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 614f6250e77..e79c82909f3 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -470,6 +470,18 @@ if( istype(src, /obj/item/device/pda) || istype(src, /obj/item/weapon/pen) || is_type_in_list(src, H.wear_suit.allowed) ) return 1 return 0 + if(slot_handcuffed) + if(H.handcuffed) + return 0 + if(!istype(src, /obj/item/weapon/handcuffs)) + return 0 + return 1 + if(slot_legcuffed) + if(H.legcuffed) + return 0 + if(!istype(src, /obj/item/weapon/legcuffs)) + return 0 + return 1 if(slot_in_backpack) if (H.back && istype(H.back, /obj/item/weapon/storage/backpack)) var/obj/item/weapon/storage/backpack/B = H.back