From 958f948a76a41a089e57e7bdbd99fa2e0730deec Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 29 Sep 2020 12:23:36 +0200 Subject: [PATCH] [MIRROR] Cross server evacuation messages now include the evacuation reason (#1035) * Cross server evacuation messages now include the evacuation reason (#53980) Co-authored-by: Bobbahbrown * Cross server evacuation messages now include the evacuation reason Co-authored-by: Hulkamania <39933245+JetBrody@users.noreply.github.com> Co-authored-by: Bobbahbrown --- code/controllers/subsystem/shuttle.dm | 1 + code/controllers/subsystem/ticker.dm | 8 +++++++- code/modules/shuttle/emergency.dm | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index def56818816..a9c99705614 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -256,6 +256,7 @@ SUBSYSTEM_DEF(shuttle) if(call_reason) SSblackbox.record_feedback("text", "shuttle_reason", 1, "[call_reason]") log_shuttle("Shuttle call reason: [call_reason]") + SSticker.emergency_reason = call_reason message_admins("[ADMIN_LOOKUPFLW(user)] has called the shuttle. (TRIGGER CENTCOM RECALL)") /datum/controller/subsystem/shuttle/proc/centcom_recall(old_timer, admiral_message) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 02aff955936..9022fdbcaa0 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -62,6 +62,9 @@ SUBSYSTEM_DEF(ticker) /// People who have been commended and will receive a heart var/list/hearts + /// Why an emergency shuttle was called + var/emergency_reason + /datum/controller/subsystem/ticker/Initialize(timeofday) load_mode() @@ -525,7 +528,10 @@ SUBSYSTEM_DEF(ticker) if(STATION_DESTROYED_NUKE) news_message = "We would like to reassure all employees that the reports of a Syndicate backed nuclear attack on [station_name()] are, in fact, a hoax. Have a secure day!" if(STATION_EVACUATED) - news_message = "The crew of [station_name()] has been evacuated amid unconfirmed reports of enemy activity." + if(emergency_reason) + news_message = "[station_name()] has been evacuated after transmitting the following distress beacon:\n\n[emergency_reason]" + else + news_message = "The crew of [station_name()] has been evacuated amid unconfirmed reports of enemy activity." if(BLOB_WIN) news_message = "[station_name()] was overcome by an unknown biological outbreak, killing all crew on board. Don't let it happen to you! Remember, a clean work station is a safe work station." if(BLOB_NUKE) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 897646bb8a2..a26be90d9f1 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -263,6 +263,8 @@ SSshuttle.emergencyLastCallLoc = null priority_announce("The emergency shuttle has been recalled.[SSshuttle.emergencyLastCallLoc ? " Recall signal traced. Results can be viewed on any communications console." : "" ]", null, 'sound/ai/shuttlerecalled.ogg', "Priority") + SSticker.emergency_reason = null + /obj/docking_port/mobile/emergency/proc/is_hijacked() var/has_people = FALSE var/hijacker_present = FALSE