Merge pull request #402 from Meowykins/master

Fixes
This commit is contained in:
skull132
2015-02-25 21:13:37 +02:00
3 changed files with 12 additions and 17 deletions
@@ -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
@@ -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 ..()
if(in_range(usr, src))
if(H.a_intent == "help")
get_scooped(H)
return
@@ -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