Merge pull request #1885 from caelaislinn/bs12_with_tgport

remaining map updates, plus misc
This commit is contained in:
Hawk-v3
2012-11-09 06:49:39 -08:00
3 changed files with 8744 additions and 8695 deletions

View File

@@ -2,5 +2,5 @@
..()
if(!key && mind) //key and mind have become seperated.
mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.
if(!immune_to_ssd && sleeping < 2)
sleeping = 2
if(!immune_to_ssd && sleeping < 2 && mind.active)
sleeping = 2