Player Z-tracking, again

2017-12-14 17:35:35 -06:00
parent e5671eece5
commit c27c52cf58
13 changed files with 80 additions and 7 deletions
@@ -1,6 +1,14 @@
+<<<<<<< HEAD
 /mob/living/Logout()
 	if(ranged_ability && client)
 		ranged_ability.remove_mousepointer(client)
 	..()
+=======
+/mob/living/Logout()
+	update_z(null)
+	if(ranged_ability && client)
+		ranged_ability.remove_mousepointer(client)
+	..()
+>>>>>>> de51ac3... Player Z-tracking, again (#33216)
 	if(!key && mind)	//key and mind have become separated.
 		mind.active = 0	//This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.