Allows resisting while restrained, prevents stop-drop-and-roll while buckled.

This commit is contained in:
mwerezak
2015-09-09 02:50:37 -04:00
parent 6c2647d894
commit cfa82e0c5e
3 changed files with 3 additions and 15 deletions

View File

@@ -2,7 +2,7 @@
/mob/living/carbon/process_resist()
//drop && roll
if(on_fire)
if(on_fire && !buckled)
fire_stacks -= 1.2
Weaken(3)
spin(32,2)

View File

@@ -574,21 +574,12 @@ default behaviour is:
set name = "Resist"
set category = "IC"
if(can_resist())
if(!(stat || next_move > world.time))
next_move = world.time + 20
resist_grab()
if(!weakened && !restrained())
if(!weakened)
process_resist()
/mob/living/proc/can_resist()
//need to allow !canmove, or otherwise neck grabs can't be resisted
//similar thing with weakened and pinning
if(stat)
return 0
if(next_move > world.time)
return 0
return 1
/mob/living/proc/process_resist()
//Getting out of someone's inventory.
if(istype(src.loc, /obj/item/weapon/holder))

View File

@@ -34,9 +34,6 @@
/mob/living/captive_brain/emote(var/message)
return
/mob/living/captive_brain/can_resist()
return !(stat || next_move > world.time)
/mob/living/captive_brain/process_resist()
//Resisting control by an alien mind.
if(istype(src.loc,/mob/living/simple_animal/borer))