Merge pull request #1950 from Yoshax/grabfuckoff

Fixes resisting out of grabs when weakened
This commit is contained in:
Neerti
2016-06-17 17:17:09 -04:00
committed by GitHub
+3 -1
View File
@@ -630,7 +630,9 @@ default behaviour is:
resisting++
switch(G.state)
if(GRAB_PASSIVE)
qdel(G)
if(!incapacitated(INCAPACITATION_KNOCKDOWN))
visible_message("<span class='warning'>[src] has broken free of [G.assailant]'s grip!</span>")
qdel(G)
if(GRAB_AGGRESSIVE)
//Not standing up makes it much harder to break, so it is easier to cuff someone who is down without forcing them into unconsciousness.
//Otherwise, it's the same chance of breaking the grab as disarm.