cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allows grabs to be resisted while weakened

Browse Source
This commit is contained in:
mwerezak
2015-08-26 14:55:38 -04:00
parent 7f17505e48
commit 3e967872a3
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/mob/living/living.dm
View File

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