Allows grabs to be resisted while weakened

This commit is contained in:
mwerezak
2015-08-26 14:55:38 -04:00
parent 7f17505e48
commit 3e967872a3

View File

@@ -576,12 +576,14 @@ default behaviour is:
if(can_resist())
next_move = world.time + 20
process_resist()
resist_grab()
if(!weakened && !restrained())
process_resist()
/mob/living/proc/can_resist()
//need to allow !canmove, or otherwise neck grabs can't be resisted
//so just check weakened instead.
if(stat || weakened)
//similar thing with weakened and pinning
if(stat)
return 0
if(next_move > world.time)
return 0
@@ -593,10 +595,6 @@ default behaviour is:
escape_inventory(src.loc)
return
//resisting grabs (as if it helps anyone...)
if (!restrained())
resist_grab()
//unbuckling yourself
if(buckled)
spawn() escape_buckle()