Skip to content

Commit

Permalink
[MIRROR] Fix handcuffing (#2073) (#2967)
Browse files Browse the repository at this point in the history
* Fix handcuffing (#82760)

Changed this to an early return but then didn't invert the condition

:cl: Melbert
fix: You can handcuff people with 2 arms and you can no longer handcuff
people with 0 arms
/:cl:

* Fix handcuffing

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: ReezeBL <[email protected]>
  • Loading branch information
4 people authored Apr 19, 2024
1 parent 22e1f7e commit e2e9058
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions code/game/objects/items/handcuffs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
if(!iscarbon(target_mob))
return

attempt_to_cuff(target_mob, user) // avoid locking up the attack chain with sleeps
attempt_to_cuff(target_mob, user)

/// Handles all of the checks and application in a typical situation where someone attacks a carbon victim with the handcuff item.
/obj/item/restraints/handcuffs/proc/attempt_to_cuff(mob/living/carbon/victim, mob/living/user)
Expand All @@ -93,9 +93,8 @@
victim.balloon_alert(user, "already handcuffed!")
return

if(victim.canBeHandcuffed())
if(!victim.canBeHandcuffed())
victim.balloon_alert(user, "can't be handcuffed!")
to_chat(user, span_warning("[victim] doesn't have two hands..."))
return

victim.visible_message(
Expand Down

0 comments on commit e2e9058

Please sign in to comment.