From d2d9cd7fc2a80bc7d4e4e8a7f4df2c5fdf5149e0 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Thu, 14 Dec 2017 19:12:27 -0500 Subject: [PATCH] Update logout.dm --- code/modules/mob/living/logout.dm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm index 9b998b2d89..18b171753a 100644 --- a/code/modules/mob/living/logout.dm +++ b/code/modules/mob/living/logout.dm @@ -1,14 +1,7 @@ -<<<<<<< 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. \ No newline at end of file + mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.