From e7dcda13de221064bc3985f5dff3637802a62e3c Mon Sep 17 00:00:00 2001 From: mwerezak Date: Thu, 30 Oct 2014 20:07:50 -0400 Subject: [PATCH] Adds feedback when handcuffs cannot be placed, fixes robot cuffs. --- code/game/objects/items/weapons/handcuffs.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 4e3235ecf9..f7d9edf8a3 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -41,6 +41,11 @@ if (ishuman(target)) var/mob/living/carbon/human/H = target + + if (!H.has_organ_for_slot("handcuff")) + user << "\red [H] needs at least two wrists before you can cuff them together!" + return + H.attack_log += text("\[[time_stamp()]\] Has been handcuffed (attempt) by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Attempted to handcuff [H.name] ([H.ckey])") msg_admin_attack("[key_name(user)] attempted to handcuff [key_name(H)]") @@ -150,6 +155,13 @@ var/last_chew = 0 var/turf/p_loc_m = C.loc playsound(src.loc, cuff_sound, 30, 1, -2) user.visible_message("\red [user] is trying to put handcuffs on [C]!") + + if (ishuman(C)) + var/mob/living/carbon/human/H = C + if (!H.has_organ_for_slot("handcuff")) + user << "\red [H] needs at least two wrists before you can cuff them together!" + return + spawn(30) if(!C) return if(p_loc == user.loc && p_loc_m == C.loc)