diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index 1578c3e6d07..a88284398b9 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -123,11 +123,14 @@ if(ishuman(entered)) var/mob/living/carbon/H = entered - if(IS_HORIZONTAL(H)) + if(H.buckled) // if you ride your wheelchair into the trap, snare that instead + var/obj/buckled_obj = H.buckled + buckled_obj.take_damage(trap_damage, BRUTE) + else if(IS_HORIZONTAL(H)) H.apply_damage(trap_damage, BRUTE, "chest") else H.apply_damage(trap_damage, BRUTE, pick("l_leg", "r_leg")) - if(!H.legcuffed && H.get_num_legs() >= 2) //beartrap can't cuff you leg if there's already a beartrap or legcuffs. + if(!H.legcuffed && H.get_num_legs() >= 2 && !H.buckled) // beartrap can't cuff you leg if there's already a beartrap or legcuffs. H.legcuffed = src forceMove(H) H.update_inv_legcuffed()