From c5143880d2de455bd83131731cd87267b58d9c19 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 6 Jun 2017 13:28:23 -0500 Subject: [PATCH] Fixes logged out spawning new_players --- code/controllers/subsystem/ticker.dm | 2 +- code/modules/mob/dead/new_player/new_player.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index ab0c39832f..863cd11957 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -438,7 +438,7 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/transfer_characters() var/list/livings = list() - for(var/mob/dead/new_player/player in GLOB.player_list) + for(var/mob/dead/new_player/player in GLOB.mob_list) var/mob/living = player.transfer_character() if(living) qdel(player) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index dab0cca302..cb76cb29f1 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -140,8 +140,7 @@ observer.name = observer.real_name observer.update_icon() observer.stop_sound_channel(CHANNEL_LOBBYMUSIC) - qdel(mind) - + QDEL_NULL(mind) qdel(src) return 1 @@ -352,7 +351,6 @@ if(SHUTTLE_CALL) if(SSshuttle.emergency.timeLeft(1) > initial(SSshuttle.emergencyCallTime)*0.5) SSticker.mode.make_antag_chance(humanc) - qdel(src) /mob/dead/new_player/proc/AddEmploymentContract(mob/living/carbon/human/employee) //TODO: figure out a way to exclude wizards/nukeops/demons from this. @@ -451,6 +449,8 @@ if(.) new_character.key = key //Manually transfer the key to log them in new_character.stop_sound_channel(CHANNEL_LOBBYMUSIC) + new_character = null + qdel(src) /mob/dead/new_player/proc/ViewManifest() var/dat = ""