From adb06297a4542495cba33c21778ab86720d8b093 Mon Sep 17 00:00:00 2001 From: Meowykins Date: Tue, 24 Feb 2015 02:19:03 -0600 Subject: [PATCH] #401 Bugfix for #401 --- code/modules/mob/living/simple_animal/friendly/cat.dm | 9 ++++----- .../mob/living/simple_animal/friendly/lizard.dm | 10 ++++------ .../modules/mob/living/simple_animal/friendly/mouse.dm | 10 ++++------ 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 0965f82d..29d74192 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -66,12 +66,11 @@ var/mob/living/carbon/H = over_object if(!istype(H)) return ..() + if(in_range(usr, src)) + if(H.a_intent == "help") + get_scooped(H) + return - if(H.a_intent == "help") - get_scooped(H) - return - else - return ..() //RUNTIME IS ALIVE! SQUEEEEEEEE~ /mob/living/simple_animal/cat/Runtime diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm index 6e41b194..09fc7743 100644 --- a/code/modules/mob/living/simple_animal/friendly/lizard.dm +++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm @@ -22,9 +22,7 @@ var/mob/living/carbon/H = over_object if(!istype(H)) return ..() - - if(H.a_intent == "help") - get_scooped(H) - return - else - return ..() \ No newline at end of file + if(in_range(usr, src)) + if(H.a_intent == "help") + get_scooped(H) + return diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index dcd0eff5..ce9c73fe 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -114,12 +114,10 @@ var/mob/living/carbon/H = over_object if(!istype(H)) return ..() - - if(H.a_intent == "help") - get_scooped(H) - return - else - return ..() + if(in_range(usr, src)) + if(H.a_intent == "help") + get_scooped(H) + return /* * Mouse types