From 83d40f19ea7bd910f9e4f580e6491a977143d463 Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Wed, 6 Jul 2016 02:20:40 +0100 Subject: [PATCH 1/2] Armless Cuffing Makes Sense Now This was entirely DZD's work. It has my name on it because it was a "learn-as-you-code" experience. Regardless: - Can now cuff people with two hands, or one hand; - Can no longer cuff people with no hands --- code/game/objects/items/weapons/handcuffs.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 35b865790c7..b1d10f82c8b 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -24,6 +24,12 @@ to_chat(user, "Uh... how do those things work?!") apply_cuffs(user,user) + if(ishuman(C)) + var/mob/living/carbon/human/H = C + if(!(H.get_organ("l_hand") || H.get_organ("r_hand"))) + to_chat(user, "How do you suggest handcuffing someone with no hands?") + return + if(!C.handcuffed) C.visible_message("[user] is trying to put [src.name] on [C]!", \ "[user] is trying to put [src.name] on [C]!") @@ -117,6 +123,11 @@ /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg/attack(mob/living/carbon/C, mob/user) if(isrobot(user)) + if(ishuman(C)) + var/mob/living/carbon/human/H = C + if(!(H.get_organ("l_hand") || H.get_organ("r_hand"))) + to_chat(user, "How do you suggest handcuffing someone with no hands?") + return if(!C.handcuffed) playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) C.visible_message("[user] is trying to put zipties on [C]!", \ From c8801b2ff5845cfef8368231baee11e8686b5365 Mon Sep 17 00:00:00 2001 From: TullyBurnalot Date: Fri, 15 Jul 2016 00:46:28 +0100 Subject: [PATCH 2/2] Adds sanity check for non-carbon mobs --- code/game/objects/items/weapons/handcuffs.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index b1d10f82c8b..c3063ada27e 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -20,6 +20,9 @@ if(!user.IsAdvancedToolUser()) return + if(!istype(C)) + return + if(CLUMSY in user.mutations && prob(50)) to_chat(user, "Uh... how do those things work?!") apply_cuffs(user,user)