Diona nymphs are now eatable and punchable

This commit is contained in:
joep van der velden
2019-03-24 21:46:45 +01:00
parent c2a2c1c4ce
commit b24555ab64
@@ -109,6 +109,8 @@
forceMove(M)
else
get_scooped(M)
else
..()
/mob/living/simple_animal/diona/proc/merge()
if(stat != CONSCIOUS)