Merge pull request #9756 from Baystation12/master

Dev-freeze
This commit is contained in:
PsiOmegaDelta
2015-06-09 12:12:40 +02:00
2 changed files with 24 additions and 10 deletions

View File

@@ -672,7 +672,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
mob/dead/observer/MayRespawn(var/feedback = 0)
if(!client)
return 0
if(mind && mind.current && mind.current.stat != DEAD)
if(mind && mind.current && mind.current.stat != DEAD && can_reenter_corpse)
if(feedback)
src << "<span class='warning'>Your non-dead body prevent you from respawning.</span>"
return 0