Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00
parent e66cbfd7db 55dd3876e5
commit 52fa1f314f
531 changed files with 5863 additions and 3439 deletions
@@ -41,9 +41,10 @@
 	data["open"] = state_open

 	data["occupant"] = list()
-	if(occupant)
-		data["occupant"]["name"] = occupant.name
-		data["occupant"]["stat"] = occupant.stat
+	if(occupant)
+		var/mob/living/mob_occupant = occupant
+		data["occupant"]["name"] = mob_occupant.name
+		data["occupant"]["stat"] = mob_occupant.stat

 	data["special_name"] = special ? special_name : null
 	data["ready_implants"]  = ready_implants