From f936dbda319130ffb447bffce52d0cd3e668a47a Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Thu, 19 Dec 2013 00:00:28 +1030 Subject: [PATCH] Possible fix for borers teleporting through windows. --- code/modules/mob/living/simple_animal/borer.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/borer.dm b/code/modules/mob/living/simple_animal/borer.dm index a0db352d7fe..8a9bf699b48 100644 --- a/code/modules/mob/living/simple_animal/borer.dm +++ b/code/modules/mob/living/simple_animal/borer.dm @@ -355,13 +355,15 @@ mob/living/simple_animal/borer/proc/detatch() var/list/choices = list() for(var/mob/living/carbon/C in view(1,src)) - if(C.stat != 2) + if(C.stat != 2 && src.Adjacent(C)) choices += C var/mob/living/carbon/M = input(src,"Who do you wish to infest?") in null|choices if(!M || !src) return + if(!(src.Adjacent(M))) return + if(M.has_brain_worms()) src << "You cannot infest someone who is already infested!" return