From 09d2acee62e1f9f393ab408aa384ff80d62ea36e Mon Sep 17 00:00:00 2001 From: Walter0o Date: Mon, 11 Aug 2014 04:45:50 +0200 Subject: [PATCH] fixes #5923 and a few other range issues --- code/modules/mob/living/carbon/monkey/diona.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/diona.dm b/code/modules/mob/living/carbon/monkey/diona.dm index 2469ded956..b0e885e6c9 100644 --- a/code/modules/mob/living/carbon/monkey/diona.dm +++ b/code/modules/mob/living/carbon/monkey/diona.dm @@ -108,7 +108,7 @@ var/list/trays = list() for(var/obj/machinery/hydroponics/tray in range(1)) - if(tray.nutrilevel < 10) + if(tray.nutrilevel < 10 && src.Adjacent(tray)) trays += tray var/obj/machinery/hydroponics/target = input("Select a tray:") as null|anything in trays @@ -127,7 +127,7 @@ var/list/trays = list() for(var/obj/machinery/hydroponics/tray in range(1)) - if(tray.weedlevel > 0) + if(tray.weedlevel > 0 && src.Adjacent(tray)) trays += tray var/obj/machinery/hydroponics/target = input("Select a tray:") as null|anything in trays @@ -186,7 +186,8 @@ var/list/choices = list() for(var/mob/living/carbon/human/H in oview(1,src)) - choices += H + if(src.Adjacent(H)) + choices += H var/mob/living/carbon/human/M = input(src,"Who do you wish to take a sample from?") in null|choices