From febd9406a03c19de4f308e9ca6d6716dacf12022 Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Tue, 5 May 2015 00:43:37 +1000 Subject: [PATCH] mobs pushing restrained fix --- code/modules/mob/living/living.dm | 2 +- code/modules/mob/living/simple_animal/slime/slime.dm | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 5ef8323ec04..b6046414201 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -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) ) diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index 7dd50a1008d..b71b86e23ac 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -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