cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 07:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4551 from Atermonera/shuttle_radio_announce

Browse Source 
Shuttles can announce over radio too!
This commit is contained in:
Anewbe
2018-01-16 15:26:57 -06:00
committed by GitHub
parent 4306454637 caf3735500
commit 3aef4a052b
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/shuttles/web_datums.dm
View File

@@ -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/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/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/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. // 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) if(isnull(get_departure_message()) || master.my_shuttle.cloaked)
return return
if(!radio_announce)
command_announcement.Announce(get_departure_message(),(announcer ? announcer : "[using_map.boss_name]")) 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() /datum/shuttle_destination/proc/get_arrival_message()
return null return null
@@ -125,7 +129,10 @@
if(isnull(get_arrival_message()) || master.my_shuttle.cloaked) if(isnull(get_arrival_message()) || master.my_shuttle.cloaked)
return return
if(!radio_announce)
command_announcement.Announce(get_arrival_message(),(announcer ? announcer : "[using_map.boss_name]")) 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) /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. // First, check to make sure this doesn't cause a duplicate route.

9
maps/southern_cross/shuttles/crew_shuttles.dm
View File

@@ -90,6 +90,7 @@
preferred_interim_area = /area/shuttle/shuttle1/transit preferred_interim_area = /area/shuttle/shuttle1/transit
dock_target = "hangar_1" dock_target = "hangar_1"
radio_announce = 1
announcer = "Southern Cross Docking Computer" announcer = "Southern Cross Docking Computer"
routes_to_make = list( routes_to_make = list(
@@ -108,6 +109,7 @@
preferred_interim_area = /area/shuttle/shuttle2/transit preferred_interim_area = /area/shuttle/shuttle2/transit
dock_target = "hangar_2" dock_target = "hangar_2"
radio_announce = 1
announcer = "Southern Cross Docking Computer" announcer = "Southern Cross Docking Computer"
routes_to_make = list( routes_to_make = list(
@@ -148,6 +150,7 @@
preferred_interim_area = /area/shuttle/shuttle1/transit preferred_interim_area = /area/shuttle/shuttle1/transit
dock_target = "shuttle1_dock_airlocksc" dock_target = "shuttle1_dock_airlocksc"
radio_announce = 1
announcer = "Southern Cross Docking Computer" announcer = "Southern Cross Docking Computer"
/datum/shuttle_destination/shuttle1/docked_SC/get_arrival_message() /datum/shuttle_destination/shuttle1/docked_SC/get_arrival_message()
@@ -163,6 +166,7 @@
preferred_interim_area = /area/shuttle/shuttle2/transit preferred_interim_area = /area/shuttle/shuttle2/transit
dock_target = "shuttle2_dock_airlocksc" dock_target = "shuttle2_dock_airlocksc"
radio_announce = 1
announcer = "Southern Cross Docking Computer" announcer = "Southern Cross Docking Computer"
/datum/shuttle_destination/shuttle2/docked_SC/get_arrival_message() /datum/shuttle_destination/shuttle2/docked_SC/get_arrival_message()
@@ -218,6 +222,7 @@
preferred_interim_area = /area/shuttle/shuttle1/sky_transit preferred_interim_area = /area/shuttle/shuttle1/sky_transit
dock_target = "surface_dock_1" dock_target = "surface_dock_1"
radio_announce = 1
announcer = "Outpost Automated ATC" announcer = "Outpost Automated ATC"
/datum/shuttle_destination/shuttle1/main_base/get_arrival_message() /datum/shuttle_destination/shuttle1/main_base/get_arrival_message()
@@ -232,6 +237,7 @@
preferred_interim_area = /area/shuttle/shuttle2/sky_transit preferred_interim_area = /area/shuttle/shuttle2/sky_transit
dock_target = "surface_dock_2" dock_target = "surface_dock_2"
radio_announce = 1
announcer = "Outpost Automated ATC" announcer = "Outpost Automated ATC"
/datum/shuttle_destination/shuttle2/main_base/get_arrival_message() /datum/shuttle_destination/shuttle2/main_base/get_arrival_message()
@@ -247,7 +253,9 @@
preferred_interim_area = /area/shuttle/shuttle1/sky_transit preferred_interim_area = /area/shuttle/shuttle1/sky_transit
dock_target = "mining_dock_1" dock_target = "mining_dock_1"
radio_announce = 1
announcer = "Outpost Automated ATC" announcer = "Outpost Automated ATC"
/datum/shuttle_destination/shuttle1/mining_base/get_arrival_message() /datum/shuttle_destination/shuttle1/mining_base/get_arrival_message()
return "Attention, [master.my_shuttle.visible_name] has arrived to the Mining Outpost." 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 preferred_interim_area = /area/shuttle/shuttle2/sky_transit
dock_target = "mining_dock_2" dock_target = "mining_dock_2"
radio_announce = 1
announcer = "Outpost Automated ATC" announcer = "Outpost Automated ATC"
/datum/shuttle_destination/shuttle2/mining_base/get_arrival_message() /datum/shuttle_destination/shuttle2/mining_base/get_arrival_message()