Merge pull request #5401 from Citadel-Station-13/upstream-merge-35459

[MIRROR] Fix a runtime if someone is deleted on the arrivals shuttle
This commit is contained in:
deathride58
2018-02-11 00:49:36 +00:00
committed by GitHub

View File

@@ -539,7 +539,7 @@
winset(C, "mainwindow", "flash=5")
/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
if(!SSticker.IsRoundInProgress() || !character)
if(!SSticker.IsRoundInProgress() || QDELETED(character))
return
var/area/A = get_area(character)
var/message = "<span class='game deadsay'><span class='name'>\