From 6814022a1b6a345a495f2ed6fe1f1195db5a9081 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sat, 30 Jun 2018 04:37:20 -0400 Subject: [PATCH] Fixes arrivals shuttle damage message runtime (#38779) --- code/modules/shuttle/arrivals.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index 5090800ff4..60998215de 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -76,8 +76,9 @@ damaged = TRUE if(console) console.say("Alert, hull breach detected!") - var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems) - announcer.announce("ARRIVALS_BROKEN", channels = list()) + var/obj/machinery/announcement_system/announcer = safepick(GLOB.announcement_systems) + if(!QDELETED(announcer)) + announcer.announce("ARRIVALS_BROKEN", channels = list()) if(mode != SHUTTLE_CALL) sound_played = FALSE mode = SHUTTLE_IDLE