From caf373550095daf60129eb116787ef02ee2a4bc6 Mon Sep 17 00:00:00 2001 From: atermonera Date: Mon, 15 Jan 2018 17:00:00 -0800 Subject: [PATCH] Shuttles can announce over radio too! --- code/modules/shuttles/web_datums.dm | 11 +++++++++-- maps/southern_cross/shuttles/crew_shuttles.dm | 9 +++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/code/modules/shuttles/web_datums.dm b/code/modules/shuttles/web_datums.dm index d30df26863..693ce435b1 100644 --- a/code/modules/shuttles/web_datums.dm +++ b/code/modules/shuttles/web_datums.dm @@ -57,6 +57,7 @@ var/dock_target = null // The tag_id that the shuttle will use to try to dock to the destination, if able. + var/radio_announce = 0 // Whether it will make a station announcement (0) or a radio announcement (1). var/announcer = null // The name of the 'announcer' that will say the arrival/departure messages. Defaults to the map's boss name if blank. // var/arrival_message = null // Message said if the ship enters this destination. Not announced if the ship is cloaked. // var/departure_message = null // Message said if the ship exits this destination. Not announced if the ship is cloaked. @@ -116,7 +117,10 @@ if(isnull(get_departure_message()) || master.my_shuttle.cloaked) return - command_announcement.Announce(get_departure_message(),(announcer ? announcer : "[using_map.boss_name]")) + if(!radio_announce) + command_announcement.Announce(get_departure_message(),(announcer ? announcer : "[using_map.boss_name]")) + else + global_announcer.autosay(get_departure_message(),(announcer ? announcer : "[using_map.boss_name]")) /datum/shuttle_destination/proc/get_arrival_message() return null @@ -125,7 +129,10 @@ if(isnull(get_arrival_message()) || master.my_shuttle.cloaked) return - command_announcement.Announce(get_arrival_message(),(announcer ? announcer : "[using_map.boss_name]")) + if(!radio_announce) + command_announcement.Announce(get_arrival_message(),(announcer ? announcer : "[using_map.boss_name]")) + else + global_announcer.autosay(get_arrival_message(),(announcer ? announcer : "[using_map.boss_name]")) /datum/shuttle_destination/proc/link_destinations(var/datum/shuttle_destination/other_place, var/area/interim_area, var/travel_time = 0) // First, check to make sure this doesn't cause a duplicate route. diff --git a/maps/southern_cross/shuttles/crew_shuttles.dm b/maps/southern_cross/shuttles/crew_shuttles.dm index 7b8970d16d..fd46fbc488 100644 --- a/maps/southern_cross/shuttles/crew_shuttles.dm +++ b/maps/southern_cross/shuttles/crew_shuttles.dm @@ -90,6 +90,7 @@ preferred_interim_area = /area/shuttle/shuttle1/transit dock_target = "hangar_1" + radio_announce = 1 announcer = "Southern Cross Docking Computer" routes_to_make = list( @@ -108,6 +109,7 @@ preferred_interim_area = /area/shuttle/shuttle2/transit dock_target = "hangar_2" + radio_announce = 1 announcer = "Southern Cross Docking Computer" routes_to_make = list( @@ -148,6 +150,7 @@ preferred_interim_area = /area/shuttle/shuttle1/transit dock_target = "shuttle1_dock_airlocksc" + radio_announce = 1 announcer = "Southern Cross Docking Computer" /datum/shuttle_destination/shuttle1/docked_SC/get_arrival_message() @@ -163,6 +166,7 @@ preferred_interim_area = /area/shuttle/shuttle2/transit dock_target = "shuttle2_dock_airlocksc" + radio_announce = 1 announcer = "Southern Cross Docking Computer" /datum/shuttle_destination/shuttle2/docked_SC/get_arrival_message() @@ -218,6 +222,7 @@ preferred_interim_area = /area/shuttle/shuttle1/sky_transit dock_target = "surface_dock_1" + radio_announce = 1 announcer = "Outpost Automated ATC" /datum/shuttle_destination/shuttle1/main_base/get_arrival_message() @@ -232,6 +237,7 @@ preferred_interim_area = /area/shuttle/shuttle2/sky_transit dock_target = "surface_dock_2" + radio_announce = 1 announcer = "Outpost Automated ATC" /datum/shuttle_destination/shuttle2/main_base/get_arrival_message() @@ -247,7 +253,9 @@ preferred_interim_area = /area/shuttle/shuttle1/sky_transit dock_target = "mining_dock_1" + radio_announce = 1 announcer = "Outpost Automated ATC" + /datum/shuttle_destination/shuttle1/mining_base/get_arrival_message() return "Attention, [master.my_shuttle.visible_name] has arrived to the Mining Outpost." @@ -260,6 +268,7 @@ preferred_interim_area = /area/shuttle/shuttle2/sky_transit dock_target = "mining_dock_2" + radio_announce = 1 announcer = "Outpost Automated ATC" /datum/shuttle_destination/shuttle2/mining_base/get_arrival_message()