shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update logout.dm

Browse Source
This commit is contained in:
deathride58
2017-12-14 19:12:27 -05:00
committed by GitHub
parent c27c52cf58
commit d2d9cd7fc2
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/logout.dm
-7
View File
@@ -1,14 +1,7 @@
<<<<<<< HEAD
/mob/living/Logout()
if(ranged_ability && client)
ranged_ability.remove_mousepointer(client)
..()
=======
/mob/living/Logout() /mob/living/Logout()
update_z(null) update_z(null)
if(ranged_ability && client) if(ranged_ability && client)
ranged_ability.remove_mousepointer(client) ranged_ability.remove_mousepointer(client)
..() ..()
>>>>>>> de51ac3... Player Z-tracking, again (#33216)
if(!key && mind) //key and mind have become separated. 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. mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.