cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-22 23:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some handcuff oversights

Browse Source 
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
This commit is contained in:
mwerezak
2014-08-03 11:49:37 -04:00
committed by ZomgPonies
parent 90e0da92cc
commit c22ea7a5c0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/carbon/human/inventory.dm
View File

@@ -687,11 +687,11 @@ It can still be worn/put on as normal.
slot_to_process = slot_handcuffed
if (target.handcuffed)
strip_item = target.handcuffed
else
else if (source != target && ishuman(source))
//check that we are still grabbing them
var/grabbing = 0
for (var/obj/item/weapon/grab/G in target.grabbed_by)
if (G.loc == source && G.state == GRAB_AGGRESSIVE)
if (G.loc == source && G.state >= GRAB_AGGRESSIVE)
grabbing = 1
if (!grabbing)
slot_to_process = null