cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-22 04:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11121 from farie82/diona-fix

Browse Source 
Diona nymphs are now eatable and punchable
This commit is contained in:
variableundefined
2019-03-25 22:39:10 +08:00
committed by GitHub
parent 5adce5da46 b24555ab64
commit bbf19c1ae2
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/friendly/diona.dm
+2
View File
@@ -109,6 +109,8 @@
forceMove(M)
else
get_scooped(M)
else
..()
/mob/living/simple_animal/diona/proc/merge()
if(stat != CONSCIOUS)