cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 21:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10063 from Kelenius/ofSlimesAndMonkeys

Browse Source 
Fixes #9908
This commit is contained in:
PsiOmegaDelta
2015-07-09 10:50:00 +02:00
parent 3751e1cdbf 12fdb7521a
commit 2dc613c4f1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/metroid/powers.dm
View File

@@ -21,7 +21,7 @@
return "I cannot feed on other slimes..." return "I cannot feed on other slimes..."
if (!Adjacent(M)) if (!Adjacent(M))
return "This subject is too far away..." return "This subject is too far away..."
if (istype(M, /mob/living/carbon) && M.getCloneLoss() > 150 || istype(M, /mob/living/simple_animal) && M.stat == DEAD) if (istype(M, /mob/living/carbon) && M.getCloneLoss() >= M.maxHealth * 1.5 || istype(M, /mob/living/simple_animal) && M.stat == DEAD)
return "This subject does not have an edible life energy..." return "This subject does not have an edible life energy..."
for(var/mob/living/carbon/slime/met in view()) for(var/mob/living/carbon/slime/met in view())
if(met.Victim == M && met != src) if(met.Victim == M && met != src)