cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-14 08:35:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-03-27 04:11:30 -04:00
parent 09b01407e3
commit 4e67e1b9ab
7 changed files with 4 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/logout.dm
-4
View File
@@ -1,11 +1,7 @@
/mob/Logout()
GLOB.nanomanager.user_logout(src) // this is used to clean up (remove) this user's Nano UIs
player_list -= src
<<<<<<< HEAD
disconnect_time = world.realtime
=======
update_client_z(null)
>>>>>>> 5fb77b3... Merge pull request #5791 from Neerti/looping_sounds
log_access_out(src)
if(admin_datums[src.ckey])
if (ticker && ticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.