mobs pushing restrained fix

This commit is contained in:
Jordie0608
2015-05-05 00:43:37 +10:00
parent ba1f186ba4
commit febd9406a0
2 changed files with 1 additions and 8 deletions
+1 -1
View File
@@ -77,7 +77,7 @@ Sorry Giacom. Please don't be mad :(
return 1
//BubbleWrap: Should stop you pushing a restrained person out of the way
if(istype(M, /mob/living/carbon/human))
if(istype(M, /mob/living))
for(var/mob/MM in range(M, 1))
if( ((MM.pulling == M && ( M.restrained() && !( MM.restrained() ) && MM.stat == CONSCIOUS)) || locate(/obj/item/weapon/grab, M.grabbed_by.len)) )
if ( !(world.time % 5) )
@@ -141,13 +141,6 @@
spawn(45)
Atkcool = 0
/mob/living/simple_animal/slime/MobBump(mob/M)
if(istype(M, /mob/living/carbon/human)) //pushing humans
if(is_adult && prob(10)) //only if we're adult, and 10% of the time
return 0
else
return 1
/mob/living/simple_animal/slime/Process_Spacemove(var/movement_dir = 0)
return 2