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
+1 -1
View File
@@ -89,7 +89,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
/mob/dead/observer/Destroy()
if (ghostimage)
ghost_darkness_images -= ghostimage
qdel(ghostimage)
del(ghostimage)
ghostimage = null
updateallghostimages()
..()
+1 -1
View File
@@ -160,7 +160,7 @@ var/list/ai_verbs_default = list(
if(!safety)//Only used by AIize() to successfully spawn an AI.
if (!B)//If there is no player/brain inside.
new/obj/structure/AIcore/deactivated(loc)//New empty terminal.
del(src)//Delete AI.
qdel(src)//Delete AI.
return
else
if (B.brainmob.mind)
@@ -26,7 +26,7 @@
/mob/aiEye/Destroy()
if (ghostimage)
ghost_darkness_images -= ghostimage
qdel(ghostimage)
del(ghostimage)
ghostimage = null;
updateallghostimages()
+1 -1
View File
@@ -220,7 +220,7 @@
*/
/datum/nanomanager/proc/user_transferred(var/mob/oldMob, var/mob/newMob)
//testing("nanomanager/user_transferred from mob [oldMob.name] to mob [newMob.name]")
if (isnull(oldMob.open_uis) || !istype(oldMob.open_uis, /list) || open_uis.len == 0)
if (!oldMob || isnull(oldMob.open_uis) || !istype(oldMob.open_uis, /list) || open_uis.len == 0)
//testing("nanomanager/user_transferred mob [oldMob.name] has no open uis")
return 0 // has no open uis