Skip to content

Commit

Permalink
* Getting into regenerative statis now put the changeling into uncons…
Browse files Browse the repository at this point in the history
…cious state

* Fixed reviving not working
  • Loading branch information
Menshin committed Feb 17, 2015
1 parent dcd2096 commit 89df7f3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion code/game/gamemodes/changeling/changeling_power.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
if(req_stat < user.stat)
user << "<span class='warning'>We are incapacitated.</span>"
return 0
if((user.status_flags & FAKEDEATH) && name!="Regenerate")
if((user.status_flags & FAKEDEATH) && name!="Revive")
user << "<span class='warning'>We are incapacitated.</span>"
return 0
if(c.geneticdamage > max_genetic_damage)
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/living/carbon/human/life.dm
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,8 @@
if( prob(10) && health && !hal_crit )
spawn(0)
emote("snore")
else if (status_flags & FAKEDEATH)
stat = UNCONSCIOUS
//CONSCIOUS
else
stat = CONSCIOUS
Expand Down

0 comments on commit 89df7f3

Please sign in to comment.