Merge upstream

This commit is contained in:
Cyberboss
2017-04-01 23:38:37 -04:00
121 changed files with 2258 additions and 4320 deletions
-1
View File
@@ -2,7 +2,6 @@
SStgui.on_logout(src)
unset_machine()
player_list -= src
log_access("Logout: [key_name(src)]")
if(admin_datums[src.ckey])
if (SSticker && SSticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
var/admins_number = admins.len