From 90abb82ba6ad8608bf136993ee048631ec8209ef Mon Sep 17 00:00:00 2001 From: Tkdrg Date: Tue, 8 Dec 2015 22:10:24 -0300 Subject: [PATCH] Fixes human canUseTopic() misbehaving Now works properly when you're inside something. Fixes #13233 --- code/modules/mob/living/carbon/human/human.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 4a36767eeee..17afa3091b4 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -851,11 +851,9 @@ /mob/living/carbon/human/canUseTopic(atom/movable/M, be_close = 0) if(incapacitated() || lying ) return - if(!Adjacent(M)) + if(!Adjacent(M) && (M.loc != src)) if((be_close == 0) && (dna.check_mutation(TK))) if(tkMaxRangeCheck(src, M)) return 1 return - if(!isturf(M.loc) && M.loc != src) - return return 1