Skip to content

Commit

Permalink
Merge pull request tgstation#7540 from Delimusca/slimefixins
Browse files Browse the repository at this point in the history
slime feeding hotfix
  • Loading branch information
theOperand committed Feb 5, 2015
2 parents ac60a82 + 4f618c9 commit aa3f6d8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/slime/slime.dm
Expand Up @@ -205,9 +205,9 @@
return

/mob/living/carbon/slime/MouseDrop(var/atom/movable/A as mob|obj)
if(isliving(A) && A != usr)
if(isliving(A) && A != src && usr == src)
var/mob/living/Food = A
if(Food.Adjacent(usr) && !stat && Food.stat != DEAD) //messy
if(Food.Adjacent(src) && !stat && Food.stat != DEAD) //messy
Feedon(Food)
..()

Expand Down

0 comments on commit aa3f6d8

Please sign in to comment.