cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 01:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2165 from Yoshax/removebucklecuffing

Browse Source 
Makes handcuff resisting take priority over unbuckle resisting by removing bucklecuff resisting
This commit is contained in:
Neerti
2016-07-22 14:21:31 -04:00
committed by GitHub
parent 92f74e12a6 f493ac7e17
commit c185b7c22b
2 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/mob/living/carbon/resist.dm
View File

@@ -18,9 +18,6 @@
ExtinguishMob()
return TRUE
if(..())
return TRUE
if(handcuffed)
spawn() escape_handcuffs()
else if(legcuffed)
@@ -59,8 +56,8 @@
"<span class='warning'>You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)</span>"
)
if(do_after(src, breakouttime, incapacitation_flags = INCAPACITATION_DEFAULT & ~INCAPACITATION_RESTRAINED))
if(!handcuffed || buckled)
if(do_after(src, breakouttime, incapacitation_flags = INCAPACITATION_DISABLED & INCAPACITATION_KNOCKDOWN))
if(!handcuffed)
return
visible_message(
"<span class='danger'>\The [src] manages to remove \the [handcuffed]!</span>",