Merge pull request #512 from Markolie/master

Fix player panel, other fixes
This commit is contained in:
ZomgPonies
2015-03-04 10:23:36 -05:00
8 changed files with 26 additions and 14 deletions
+2 -2
View File
@@ -72,11 +72,11 @@ datum/mind
if(current) //remove ourself from our old body's mind variable
current.mind = null
nanomanager.user_transferred(current, new_character)
if(new_character.mind) //remove any mind currently in our new body's mind variable
new_character.mind.current = null
nanomanager.user_transferred(current, new_character)
current = new_character //link ourself to our new body
new_character.mind = src //and link our new body to ourself