From d47a3b29c701e5e29d81411badc8a6c000645f60 Mon Sep 17 00:00:00 2001 From: Afevis Date: Sun, 9 Jun 2024 09:39:59 -0400 Subject: [PATCH] Fixes fake announcements for the shuttle loan event (#83801) ``` [18:29:06] Runtime in code/modules/events/shuttle_loan/shuttle_loan_event.dm, line 47: Cannot read null.sender proc name: announce (/datum/round_event/shuttle_loan/announce) src: /datum/round_event/shuttle_loa... (/datum/round_event/shuttle_loan) call stack: /datum/round_event/shuttle_loa... (/datum/round_event/shuttle_loan): announce(1) /datum/round_event/falsealarm (/datum/round_event/falsealarm): announce(0) /datum/round_event/falsealarm (/datum/round_event/falsealarm): process(2) Events (/datum/controller/subsystem/events): fire(0) Events (/datum/controller/subsystem/events): ignite(0) Master (/datum/controller/master): RunQueue() Master (/datum/controller/master): Loop(2) Master (/datum/controller/master): StartProcessing(0) ``` --- .../events/shuttle_loan/shuttle_loan_event.dm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/code/modules/events/shuttle_loan/shuttle_loan_event.dm b/code/modules/events/shuttle_loan/shuttle_loan_event.dm index ac5faa6971f..c3fa0770c1d 100644 --- a/code/modules/events/shuttle_loan/shuttle_loan_event.dm +++ b/code/modules/events/shuttle_loan/shuttle_loan_event.dm @@ -40,12 +40,15 @@ situation = new situation() /datum/round_event/shuttle_loan/announce(fake) - var/announcement_text = situation?.announcement_text - if(isnull(announcement_text) || fake) + if(fake) var/datum/shuttle_loan_situation/fake_situation = pick(subtypesof(/datum/shuttle_loan_situation)) - announcement_text = initial(fake_situation.announcement_text) - priority_announce("Cargo: [announcement_text]", situation.sender) - SSshuttle.shuttle_loan = src + situation = new fake_situation + else + SSshuttle.shuttle_loan = src + priority_announce("Cargo: [situation.announcement_text]", situation.sender) + if(fake) + qdel(situation) + /datum/round_event/shuttle_loan/proc/loan_shuttle() priority_announce(situation.thanks_msg, "Cargo shuttle commandeered by [command_name()].")