From 77e106e01cc46d1c0d706e956b980155ea1d91b6 Mon Sep 17 00:00:00 2001 From: Leshana Date: Thu, 12 Mar 2020 23:34:19 -0400 Subject: [PATCH] Southern Cross map shuttle datum and landmark definitions. --- maps/southern_cross/shuttles/crew_shuttles.dm | 76 ++-- maps/southern_cross/shuttles/ert.dm | 41 +- maps/southern_cross/shuttles/heist.dm | 37 +- maps/southern_cross/shuttles/merc.dm | 41 +- maps/southern_cross/shuttles/ninja.dm | 40 +- maps/southern_cross/southern_cross_areas.dm | 23 +- .../southern_cross/southern_cross_shuttles.dm | 359 ++++++++++-------- 7 files changed, 338 insertions(+), 279 deletions(-) diff --git a/maps/southern_cross/shuttles/crew_shuttles.dm b/maps/southern_cross/shuttles/crew_shuttles.dm index 010328602c7..415faba24d8 100644 --- a/maps/southern_cross/shuttles/crew_shuttles.dm +++ b/maps/southern_cross/shuttles/crew_shuttles.dm @@ -5,10 +5,11 @@ shuttle_tag = "Shuttle 1" req_access = list(access_pilot) -/datum/shuttle/web_shuttle/shuttle1 +/datum/shuttle/autodock/web_shuttle/shuttle1 name = "Shuttle 1" warmup_time = 0 - current_area = /area/shuttle/shuttle1/start + shuttle_area = /area/shuttle/shuttle1/start + current_location = "hangar_1" docking_controller_tag = "shuttle1_shuttle" web_master_type = /datum/shuttle_web_master/shuttle1 autopilot = TRUE @@ -48,10 +49,11 @@ shuttle_tag = "Shuttle 2" req_access = list(access_pilot) -/datum/shuttle/web_shuttle/shuttle2 +/datum/shuttle/autodock/web_shuttle/shuttle2 name = "Shuttle 2" warmup_time = 0 - current_area = /area/shuttle/shuttle2/start + shuttle_area = /area/shuttle/shuttle2/start + current_location = "hangar_2" docking_controller_tag = "shuttle2_shuttle" web_master_type = /datum/shuttle_web_master/shuttle2 autopilot = TRUE @@ -88,10 +90,9 @@ /datum/shuttle_destination/shuttle1/root name = "Southern Cross Hangar One" - my_area = /area/shuttle/shuttle1/start - preferred_interim_area = /area/shuttle/shuttle1/transit + my_landmark = "hangar_1" + preferred_interim_tag = "shuttle1_transit" - dock_target = "hangar_1" radio_announce = 1 announcer = "Southern Cross Docking Computer" @@ -107,10 +108,9 @@ /datum/shuttle_destination/shuttle2/root name = "Southern Cross Hangar Two" - my_area = /area/shuttle/shuttle2/start - preferred_interim_area = /area/shuttle/shuttle2/transit + my_landmark = "hangar_2" + preferred_interim_tag = "shuttle2_transit" - dock_target = "hangar_2" radio_announce = 1 announcer = "Southern Cross Docking Computer" @@ -127,8 +127,8 @@ /datum/shuttle_destination/shuttle1/outside_SC name = "Outside of NLS Southern Cross" - my_area = /area/shuttle/shuttle1/seconddeck - preferred_interim_area = /area/shuttle/shuttle1/transit + my_landmark = "shuttle1_seconddeck" + preferred_interim_tag = "shuttle1_transit" routes_to_make = list( /datum/shuttle_destination/shuttle1/sif_orbit = 25 SECONDS, @@ -137,8 +137,8 @@ /datum/shuttle_destination/shuttle2/outside_SC name = "Outside of NLS Southern Cross" - my_area = /area/shuttle/shuttle2/seconddeck - preferred_interim_area = /area/shuttle/shuttle2/transit + my_landmark = "shuttle2_seconddeck" + preferred_interim_tag = "shuttle2_transit" routes_to_make = list( /datum/shuttle_destination/shuttle2/sif_orbit = 25 SECONDS, @@ -148,10 +148,9 @@ /datum/shuttle_destination/shuttle1/docked_SC name = "Southern Cross Docking Port" - my_area = /area/shuttle/shuttle1/arrivals_dock - preferred_interim_area = /area/shuttle/shuttle1/transit + my_landmark = "shuttle1_arrivals_dock" + preferred_interim_tag = "shuttle1_transit" - dock_target = "shuttle1_dock_airlocksc" radio_announce = 1 announcer = "Southern Cross Docking Computer" @@ -164,10 +163,9 @@ /datum/shuttle_destination/shuttle2/docked_SC name = "Southern Cross Docking Port" - my_area = /area/shuttle/shuttle2/arrivals_dock - preferred_interim_area = /area/shuttle/shuttle2/transit + my_landmark = "shuttle2_arrivals_dock" + preferred_interim_tag = "shuttle2_transit" - dock_target = "shuttle2_dock_airlocksc" radio_announce = 1 announcer = "Southern Cross Docking Computer" @@ -180,8 +178,8 @@ /datum/shuttle_destination/shuttle1/sif_orbit name = "Sif Orbit" - my_area = /area/shuttle/shuttle1/orbit - preferred_interim_area = /area/shuttle/shuttle1/transit + my_landmark = "shuttle1_orbit" + preferred_interim_tag = "shuttle1_transit" routes_to_make = list( /datum/shuttle_destination/shuttle1/sky = 25 SECONDS @@ -189,8 +187,8 @@ /datum/shuttle_destination/shuttle2/sif_orbit name = "Sif Orbit" - my_area = /area/shuttle/shuttle2/orbit - preferred_interim_area = /area/shuttle/shuttle2/transit + my_landmark = "shuttle2_orbit" + preferred_interim_tag = "shuttle2_transit" routes_to_make = list( /datum/shuttle_destination/shuttle2/sky = 25 SECONDS @@ -199,8 +197,8 @@ /datum/shuttle_destination/shuttle1/sky name = "Skies of Sif" - my_area = /area/shuttle/shuttle1/sky - preferred_interim_area = /area/shuttle/shuttle1/sky_transit + my_landmark = "shuttle1_sky" + preferred_interim_tag = "shuttle1_sky_transit" routes_to_make = list( /datum/shuttle_destination/shuttle1/main_base = 10 SECONDS, @@ -209,8 +207,8 @@ /datum/shuttle_destination/shuttle2/sky name = "Skies of Sif" - my_area = /area/shuttle/shuttle2/sky - preferred_interim_area = /area/shuttle/shuttle2/sky_transit + my_landmark = "shuttle2_sky" + preferred_interim_tag = "shuttle2_sky_transit" routes_to_make = list( /datum/shuttle_destination/shuttle2/main_base = 10 SECONDS, @@ -220,10 +218,9 @@ /datum/shuttle_destination/shuttle1/main_base name = "Main Outpost" - my_area = /area/shuttle/shuttle1/planet - preferred_interim_area = /area/shuttle/shuttle1/sky_transit + my_landmark = "shuttle1_planet" + preferred_interim_tag = "shuttle1_sky_transit" - dock_target = "surface_dock_1" radio_announce = 1 announcer = "Outpost Automated ATC" @@ -235,10 +232,9 @@ /datum/shuttle_destination/shuttle2/main_base name = "Main Outpost" - my_area = /area/shuttle/shuttle2/planet - preferred_interim_area = /area/shuttle/shuttle2/sky_transit + my_landmark = "shuttle2_planet" + preferred_interim_tag = "shuttle2_sky_transit" - dock_target = "surface_dock_2" radio_announce = 1 announcer = "Outpost Automated ATC" @@ -251,10 +247,10 @@ /datum/shuttle_destination/shuttle1/mining_base name = "Wilderness Landing Site" - my_area = /area/shuttle/shuttle1/mining - preferred_interim_area = /area/shuttle/shuttle1/sky_transit + // Note: Left area under this landmark as /area/shuttle/shuttle1/mining so it doesn't get seeded with POIs + my_landmark = "shuttle1_mining" + preferred_interim_tag = "shuttle1_sky_transit" - dock_target = "mining_dock_1" radio_announce = 1 announcer = "Outpost Automated ATC" @@ -266,10 +262,10 @@ /datum/shuttle_destination/shuttle2/mining_base name = "Wilderness Landing Site " - my_area = /area/shuttle/shuttle2/mining - preferred_interim_area = /area/shuttle/shuttle2/sky_transit + // Note: Left area under this landmark as /area/shuttle/shuttle2/mining so it doesn't get seeded with POIs + my_landmark = "shuttle2_mining" + preferred_interim_tag = "shuttle2_sky_transit" - dock_target = "mining_dock_2" radio_announce = 1 announcer = "Outpost Automated ATC" diff --git a/maps/southern_cross/shuttles/ert.dm b/maps/southern_cross/shuttles/ert.dm index 4ab0314aff6..b739d131ab2 100644 --- a/maps/southern_cross/shuttles/ert.dm +++ b/maps/southern_cross/shuttles/ert.dm @@ -27,12 +27,13 @@ req_access = list(access_cent_specops) shuttle_tag = "Response Operations" -/datum/shuttle/web_shuttle/ert +/datum/shuttle/autodock/web_shuttle/ert name = "Response Operations" warmup_time = 0 can_cloak = TRUE cloaked = FALSE - current_area = /area/shuttle/response_ship/start + shuttle_area = /area/shuttle/response_ship/start + current_location = "response_ship_start" docking_controller_tag = "response_shuttle" web_master_type = /datum/shuttle_web_master/ert flight_time_modifier = 0.5 // High speed low drag etc @@ -41,13 +42,10 @@ destination_class = /datum/shuttle_destination/ert starting_destination = /datum/shuttle_destination/ert/root - /datum/shuttle_destination/ert/root name = "Central Command" - my_area = /area/shuttle/response_ship/start - preferred_interim_area = /area/shuttle/response_ship/transit - - dock_target = "response_base" + my_landmark = "response_ship_start" + preferred_interim_tag = "response_ship_transit" routes_to_make = list( /datum/shuttle_destination/ert/orbit = 1 MINUTE, @@ -55,8 +53,8 @@ /datum/shuttle_destination/ert/orbit name = "Orbit of Sif" - my_area = /area/shuttle/response_ship/orbit - preferred_interim_area = /area/shuttle/response_ship/transit + my_landmark = "response_ship_orbit" + preferred_interim_tag = "response_ship_transit" routes_to_make = list( /datum/shuttle_destination/ert/outside_SC_1d = 30 SECONDS, @@ -67,8 +65,8 @@ /datum/shuttle_destination/ert/outside_SC_1d name = "NLS Southern Cross - Fore Port of First Deck" - my_area = /area/shuttle/response_ship/firstdeck - preferred_interim_area = /area/shuttle/response_ship/transit + my_landmark = "response_ship_firstdeck" + preferred_interim_tag = "response_ship_transit" routes_to_make = list( /datum/shuttle_destination/ert/outside_SC_2d = 0, @@ -79,8 +77,8 @@ /datum/shuttle_destination/ert/outside_SC_2d name = "NLS Southern Cross - Aft Starboard of Second Deck" - my_area = /area/shuttle/response_ship/seconddeck - preferred_interim_area = /area/shuttle/response_ship/transit + my_landmark = "response_ship_seconddeck" + preferred_interim_tag = "response_ship_transit" routes_to_make = list( /datum/shuttle_destination/ert/outside_SC_1d = 0, @@ -90,8 +88,8 @@ /datum/shuttle_destination/ert/outside_SC_3d name = "NLS Southern Cross - Aft Starboard of Third Deck" - my_area = /area/shuttle/response_ship/thirddeck - preferred_interim_area = /area/shuttle/response_ship/transit + my_landmark = "response_ship_thirddeck" + preferred_interim_tag = "response_ship_transit" routes_to_make = list( /datum/shuttle_destination/ert/outside_SC_1d = 0, @@ -101,10 +99,9 @@ /datum/shuttle_destination/ert/docked_SC name = "NLS Southern Cross - Arrivals Docking Port" - my_area = /area/shuttle/response_ship/arrivals_dock - preferred_interim_area = /area/shuttle/response_ship/transit + my_landmark = "response_ship_arrivals_dock" + preferred_interim_tag = "response_ship_transit" - dock_target = "response_shuttle_dock_airlock" announcer = "Southern Cross Docking Computer" /datum/shuttle_destination/ert/docked_SC/get_arrival_message() @@ -115,8 +112,8 @@ /datum/shuttle_destination/ert/sky name = "Skies of Sif" - my_area = /area/shuttle/response_ship/sky - preferred_interim_area = /area/shuttle/response_ship/sky_transit + my_landmark = "response_ship_sky" + preferred_interim_tag = "response_ship_sky_transit" routes_to_make = list( /datum/shuttle_destination/ert/planet = 15 SECONDS @@ -124,5 +121,5 @@ /datum/shuttle_destination/ert/planet name = "Sif Surface" - my_area = /area/shuttle/response_ship/planet - preferred_interim_area = /area/shuttle/response_ship/sky_transit \ No newline at end of file + my_landmark = "response_ship_planet" + preferred_interim_tag = "response_ship_sky_transit" \ No newline at end of file diff --git a/maps/southern_cross/shuttles/heist.dm b/maps/southern_cross/shuttles/heist.dm index cfbc39d33d6..6fbadd9e21f 100644 --- a/maps/southern_cross/shuttles/heist.dm +++ b/maps/southern_cross/shuttles/heist.dm @@ -3,12 +3,13 @@ req_access = list(access_syndicate) shuttle_tag = "Skipjack" -/datum/shuttle/web_shuttle/heist +/datum/shuttle/autodock/web_shuttle/heist name = "Skipjack" warmup_time = 0 can_cloak = TRUE cloaked = TRUE - current_area = /area/skipjack_station/start + shuttle_area = /area/skipjack_station/start + current_location = "skipjack_start" // docking_controller_tag = "skipjack_shuttle" web_master_type = /datum/shuttle_web_master/heist @@ -20,8 +21,8 @@ /datum/shuttle_destination/heist/root name = "Raider Outpost" - my_area = /area/skipjack_station/start - preferred_interim_area = /area/skipjack_station/transit + my_landmark = "skipjack_start" + preferred_interim_tag = "skipjack_transit" // dock_target = "skipjack_base" @@ -31,8 +32,8 @@ /datum/shuttle_destination/heist/orbit name = "Orbit of Sif" - my_area = /area/skipjack_station/orbit - preferred_interim_area = /area/skipjack_station/transit + my_landmark = "skipjack_orbit" + preferred_interim_tag = "skipjack_transit" routes_to_make = list( /datum/shuttle_destination/heist/outside_SC_1d = 30 SECONDS, @@ -43,8 +44,8 @@ /datum/shuttle_destination/heist/outside_SC_1d name = "NLS Southern Cross - Aft of First Deck" - my_area = /area/skipjack_station/firstdeck - preferred_interim_area = /area/skipjack_station/transit + my_landmark = "skipjack_firstdeck" + preferred_interim_tag = "skipjack_transit" routes_to_make = list( /datum/shuttle_destination/heist/outside_SC_2d = 0, @@ -54,8 +55,8 @@ /datum/shuttle_destination/heist/outside_SC_2d name = "NLS Southern Cross - Fore of Second Deck" - my_area = /area/skipjack_station/seconddeck - preferred_interim_area = /area/skipjack_station/transit + my_landmark = "skipjack_seconddeck" + preferred_interim_tag = "skipjack_transit" routes_to_make = list( /datum/shuttle_destination/heist/outside_SC_1d = 0, @@ -65,8 +66,8 @@ /datum/shuttle_destination/heist/outside_SC_3d name = "NLS Southern Cross - Starboard of Third Deck" - my_area = /area/skipjack_station/thirddeck - preferred_interim_area = /area/skipjack_station/transit + my_landmark = "skipjack_thirddeck" + preferred_interim_tag = "skipjack_transit" routes_to_make = list( /datum/shuttle_destination/heist/outside_SC_1d = 0, @@ -77,8 +78,8 @@ /datum/shuttle_destination/heist/docked_SC name = "NLS Southern Cross - Arrivals Docking Port" - my_area = /area/skipjack_station/arrivals_dock - preferred_interim_area = /area/skipjack_station/transit + my_landmark = "skipjack_arrivals_dock" + preferred_interim_tag = "skipjack_transit" // dock_target = "skipjack_shuttle_dock_airlock" announcer = "Southern Cross Docking Computer" @@ -91,8 +92,8 @@ /datum/shuttle_destination/heist/sky name = "Skies of Sif" - my_area = /area/skipjack_station/sky - preferred_interim_area = /area/skipjack_station/sky_transit + my_landmark = "skipjack_sky" + preferred_interim_tag = "skipjack_sky_transit" routes_to_make = list( /datum/shuttle_destination/heist/planet = 15 SECONDS @@ -100,5 +101,5 @@ /datum/shuttle_destination/heist/planet name = "Sif Surface" - my_area = /area/skipjack_station/planet - preferred_interim_area = /area/skipjack_station/sky_transit \ No newline at end of file + my_landmark = "skipjack_planet" + preferred_interim_tag = "skipjack_sky_transit" \ No newline at end of file diff --git a/maps/southern_cross/shuttles/merc.dm b/maps/southern_cross/shuttles/merc.dm index e47707876ed..6027261e843 100644 --- a/maps/southern_cross/shuttles/merc.dm +++ b/maps/southern_cross/shuttles/merc.dm @@ -32,13 +32,14 @@ req_access = list(access_syndicate) shuttle_tag = "Mercenary" -/datum/shuttle/web_shuttle/syndicate +/datum/shuttle/autodock/web_shuttle/syndicate name = "Mercenary" visible_name = "Unknown Vessel" warmup_time = 0 can_cloak = TRUE cloaked = TRUE - current_area = /area/syndicate_station/start + shuttle_area = /area/syndicate_station/start + current_location = "syndie_start" docking_controller_tag = "merc_shuttle" web_master_type = /datum/shuttle_web_master/syndie flight_time_modifier = 2 // Assumption that 'larger ship + few engines = slower' @@ -51,10 +52,10 @@ /datum/shuttle_destination/syndie/root name = "Mercenary Asteroid" - my_area = /area/syndicate_station/start - preferred_interim_area = /area/syndicate_station/transit + my_landmark = "syndie_start" + preferred_interim_tag = "syndie_transit" - dock_target = "merc_base" + // dock_target = "merc_base" routes_to_make = list( /datum/shuttle_destination/syndie/orbit = 1.5 MINUTES, @@ -62,8 +63,8 @@ /datum/shuttle_destination/syndie/orbit name = "Orbit of Sif" - my_area = /area/syndicate_station/orbit - preferred_interim_area = /area/syndicate_station/transit + my_landmark = "syndie_orbit" + preferred_interim_tag = "syndie_transit" routes_to_make = list( /datum/shuttle_destination/syndie/outside_SC_1d = 30 SECONDS, @@ -74,8 +75,8 @@ /datum/shuttle_destination/syndie/outside_SC_1d name = "NLS Southern Cross - Fore Port of First Deck" - my_area = /area/syndicate_station/firstdeck - preferred_interim_area = /area/syndicate_station/transit + my_landmark = "syndie_firstdeck" + preferred_interim_tag = "syndie_transit" routes_to_make = list( /datum/shuttle_destination/syndie/outside_SC_2d = 0, @@ -85,8 +86,8 @@ /datum/shuttle_destination/syndie/outside_SC_2d name = "NLS Southern Cross - Fore Starboard of Second Deck" - my_area = /area/syndicate_station/seconddeck - preferred_interim_area = /area/syndicate_station/transit + my_landmark = "syndie_seconddeck" + preferred_interim_tag = "syndie_transit" routes_to_make = list( /datum/shuttle_destination/syndie/outside_SC_1d = 0, @@ -96,8 +97,8 @@ /datum/shuttle_destination/syndie/outside_SC_3d name = "NLS Southern Cross - Aft Starboard of Third Deck" - my_area = /area/syndicate_station/thirddeck - preferred_interim_area = /area/syndicate_station/transit + my_landmark = "syndie_thirddeck" + preferred_interim_tag = "syndie_transit" routes_to_make = list( /datum/shuttle_destination/syndie/outside_SC_1d = 0, @@ -107,10 +108,10 @@ /datum/shuttle_destination/syndie/docked_SC name = "NLS Southern Cross - Arrivals Docking Port" - my_area = /area/syndicate_station/arrivals_dock - preferred_interim_area = /area/syndicate_station/transit + my_landmark = "syndie_arrivals_dock" + preferred_interim_tag = "syndie_transit" - dock_target = "nuke_shuttle_dock_airlock" + // dock_target = "nuke_shuttle_dock_airlock" announcer = "Southern Cross Docking Computer" /datum/shuttle_destination/syndie/docked_SC/get_arrival_message() @@ -121,8 +122,8 @@ /datum/shuttle_destination/syndie/sky name = "Skies of Sif" - my_area = /area/syndicate_station/sky - preferred_interim_area = /area/syndicate_station/sky_transit + my_landmark = "syndie_sky" + preferred_interim_tag = "syndie_sky_transit" routes_to_make = list( /datum/shuttle_destination/syndie/planet = 15 SECONDS @@ -130,5 +131,5 @@ /datum/shuttle_destination/syndie/planet name = "Sif Surface" - my_area = /area/syndicate_station/planet - preferred_interim_area = /area/syndicate_station/sky_transit \ No newline at end of file + my_landmark = "syndie_planet" + preferred_interim_tag = "syndie_sky_transit" \ No newline at end of file diff --git a/maps/southern_cross/shuttles/ninja.dm b/maps/southern_cross/shuttles/ninja.dm index b7cb597124c..5cdded0255b 100644 --- a/maps/southern_cross/shuttles/ninja.dm +++ b/maps/southern_cross/shuttles/ninja.dm @@ -3,13 +3,14 @@ req_access = list(access_syndicate) shuttle_tag = "Ninja" -/datum/shuttle/web_shuttle/ninja +/datum/shuttle/autodock/web_shuttle/ninja name = "Ninja" visible_name = "Unknown Vessel" warmup_time = 0 can_cloak = TRUE cloaked = TRUE - current_area = /area/ninja_dojo/start + shuttle_area = /area/ninja_dojo/start + current_location = "ninja_start" docking_controller_tag = "ninja_shuttle" web_master_type = /datum/shuttle_web_master/ninja flight_time_modifier = 0.5 // Nippon steel. @@ -20,10 +21,8 @@ /datum/shuttle_destination/ninja/root name = "Dojo Outpost" - my_area = /area/ninja_dojo/start - preferred_interim_area = /area/ninja_dojo/sky_transit - - dock_target = "ninja_base" + my_landmark = "ninja_start" + preferred_interim_tag = "ninja_sky_transit" routes_to_make = list( /datum/shuttle_destination/ninja/sky = 15 SECONDS, @@ -31,8 +30,8 @@ /datum/shuttle_destination/ninja/orbit name = "Orbit of Sif" - my_area = /area/ninja_dojo/orbit - preferred_interim_area = /area/ninja_dojo/transit + my_landmark = "ninja_orbit" + preferred_interim_tag = "ninja_transit" routes_to_make = list( /datum/shuttle_destination/ninja/outside_SC_1d = 30 SECONDS, @@ -43,8 +42,8 @@ /datum/shuttle_destination/ninja/outside_SC_1d name = "NLS Southern Cross - Aft of First Deck" - my_area = /area/ninja_dojo/firstdeck - preferred_interim_area = /area/ninja_dojo/transit + my_landmark = "ninja_firstdeck" + preferred_interim_tag = "ninja_transit" routes_to_make = list( /datum/shuttle_destination/ninja/outside_SC_2d = 0, @@ -54,8 +53,8 @@ /datum/shuttle_destination/ninja/outside_SC_2d name = "NLS Southern Cross - Fore of Second Deck" - my_area = /area/ninja_dojo/seconddeck - preferred_interim_area = /area/ninja_dojo/transit + my_landmark = "ninja_seconddeck" + preferred_interim_tag = "ninja_transit" routes_to_make = list( /datum/shuttle_destination/ninja/outside_SC_1d = 0, @@ -65,8 +64,8 @@ /datum/shuttle_destination/ninja/outside_SC_3d name = "NLS Southern Cross - Port of Third Deck" - my_area = /area/ninja_dojo/thirddeck - preferred_interim_area = /area/ninja_dojo/transit + my_landmark = "ninja_thirddeck" + preferred_interim_tag = "ninja_transit" routes_to_make = list( /datum/shuttle_destination/ninja/outside_SC_1d = 0, @@ -77,10 +76,9 @@ /datum/shuttle_destination/ninja/docked_SC name = "NLS Southern Cross - Arrivals Docking Port" - my_area = /area/ninja_dojo/arrivals_dock - preferred_interim_area = /area/ninja_dojo/transit + my_landmark = "ninja_arrivals_dock" + preferred_interim_tag = "ninja_transit" - dock_target = "ninja_shuttle_dock_airlock" announcer = "Southern Cross Docking Computer" /datum/shuttle_destination/syndie/docked_SC/get_arrival_message() @@ -91,8 +89,8 @@ /datum/shuttle_destination/ninja/sky name = "Skies of Sif" - my_area = /area/ninja_dojo/sky - preferred_interim_area = /area/ninja_dojo/sky_transit + my_landmark = "ninja_sky" + preferred_interim_tag = "ninja_sky_transit" routes_to_make = list( /datum/shuttle_destination/ninja/planet = 15 SECONDS @@ -100,5 +98,5 @@ /datum/shuttle_destination/ninja/planet name = "Sif Surface" - my_area = /area/ninja_dojo/planet - preferred_interim_area = /area/ninja_dojo/sky_transit \ No newline at end of file + my_landmark = "ninja_planet" + preferred_interim_tag = "ninja_sky_transit" \ No newline at end of file diff --git a/maps/southern_cross/southern_cross_areas.dm b/maps/southern_cross/southern_cross_areas.dm index 1ff78f62808..bd7cca429ee 100644 --- a/maps/southern_cross/southern_cross_areas.dm +++ b/maps/southern_cross/southern_cross_areas.dm @@ -1125,9 +1125,8 @@ area/crew_quarters/heads/sc/hop/quarters flags = RAD_SHIELDED /area/shuttle/shuttle1/start - name = "\improper Hangar One" + name = "Shuttle One" icon_state = "shuttlered" - base_turf = /turf/simulated/floor/reinforced /area/shuttle/shuttle1/arrivals_dock name = "\improper docked with Southern Cross" @@ -1176,9 +1175,8 @@ area/crew_quarters/heads/sc/hop/quarters flags = RAD_SHIELDED /area/shuttle/shuttle2/start - name = "\improper Hangar Two" + name = "Shuttle Two" icon_state = "shuttlered" - base_turf = /turf/simulated/floor/reinforced /area/shuttle/shuttle2/arrivals_dock name = "\improper docked with Southern Cross" @@ -1220,20 +1218,20 @@ area/crew_quarters/heads/sc/hop/quarters // Centcom Transport Shuttle /area/shuttle/transport1/centcom icon_state = "shuttle" - name = "\improper Transport Shuttle Centcom" + name = "\improper Transport Shuttle" /area/shuttle/transport1/station icon_state = "shuttle" - name = "\improper Transport Shuttle" + name = "\improper Transport Shuttle Station" // Centcom Admin Shuttle /area/shuttle/administration/centcom - name = "\improper Administration Shuttle CentCom" + name = "\improper Administration Shuttle" icon_state = "shuttlered" /area/shuttle/administration/station - name = "\improper Administration Shuttle" + name = "\improper Administration Shuttle Station" icon_state = "shuttlered2" //Merc @@ -1435,6 +1433,15 @@ area/crew_quarters/heads/sc/hop/quarters /area/shuttle/merchant/away name = "\improper Merchant Vessel - Away" + +// Main escape shuttle + +// Note: Keeping this "legacy" area path becuase of its use in lots of legacy code. +/area/shuttle/escape/centcom + name = "\improper Emergency Shuttle" + icon_state = "shuttle" + dynamic_lighting = 0 + //Small Escape Pods /area/shuttle/escape_pod1 diff --git a/maps/southern_cross/southern_cross_shuttles.dm b/maps/southern_cross/southern_cross_shuttles.dm index 6b8483b74c0..b0a39424275 100644 --- a/maps/southern_cross/southern_cross_shuttles.dm +++ b/maps/southern_cross/southern_cross_shuttles.dm @@ -1,29 +1,51 @@ // Cargo shuttle. -/datum/shuttle/ferry/supply/cargo +/datum/shuttle/autodock/ferry/supply/cargo name = "Supply" - location = 1 + location = FERRY_LOCATION_OFFSITE warmup_time = 10 - area_offsite = /area/supply/dock - area_station = /area/supply/station + shuttle_area = /area/shuttle/supply + landmark_offsite = "supply_offsite" + landmark_station = "supply_station" docking_controller_tag = "supply_shuttle" - dock_target_station = "cargo_bay" flags = SHUTTLE_FLAGS_PROCESS|SHUTTLE_FLAGS_SUPPLY +/obj/effect/shuttle_landmark/southern_cross/supply_offsite + name = "Centcom Supply Depot" + landmark_tag = "supply_offsite" + base_area = /area/centcom/command + base_turf = /turf/simulated/floor/plating + +/obj/effect/shuttle_landmark/southern_cross/supply_station + name = "Station" + landmark_tag = "supply_station" + docking_controller = "cargo_bay" + //Admin /obj/machinery/computer/shuttle_control/administration name = "shuttle control console" req_access = list(access_cent_general) shuttle_tag = "Administration" -/datum/shuttle/ferry/administration +/datum/shuttle/autodock/ferry/administration name = "Administration" - location = 1 + location = FERRY_LOCATION_OFFSITE warmup_time = 0 - area_offsite = /area/shuttle/administration/centcom - area_station = /area/shuttle/administration/station + shuttle_area = /area/shuttle/administration/centcom + landmark_offsite = "admin_offsite" + landmark_station = "admin_station" docking_controller_tag = "admin_shuttle" - dock_target_station = "admin_shuttle_dock_airlock" - dock_target_offsite = "admin_shuttle_bay" + +/obj/effect/shuttle_landmark/southern_cross/admin_offsite + name = "Centcom" + landmark_tag = "admin_offsite" + docking_controller = "admin_shuttle_bay" + base_area = /area/centcom/command + base_turf = /turf/simulated/floor/plating + +/obj/effect/shuttle_landmark/southern_cross/admin_station + name = "SC Dock 2-E" + landmark_tag = "admin_station" + docking_controller = "admin_shuttle_dock_airlock" //Transport @@ -32,15 +54,27 @@ req_access = list(access_cent_general) shuttle_tag = "Centcom" -/datum/shuttle/ferry/centcom +/datum/shuttle/autodock/ferry/centcom name = "Centcom" - location = 1 + location = FERRY_LOCATION_OFFSITE warmup_time = 0 - area_offsite = /area/shuttle/transport1/centcom - area_station = /area/shuttle/transport1/station + shuttle_area = /area/shuttle/transport1/centcom + landmark_offsite = "transport1_offsite" + landmark_station = "transport1_station" docking_controller_tag = "centcom_shuttle" - dock_target_station = "centcom_shuttle_dock_airlock" - dock_target_offsite = "centcom_shuttle_bay" + +/obj/effect/shuttle_landmark/southern_cross/transport1_offsite + name = "Centcom" + landmark_tag = "transport1_offsite" + docking_controller = "centcom_shuttle_bay" + base_area = /area/centcom/command + base_turf = /turf/simulated/floor/plating + +/obj/effect/shuttle_landmark/southern_cross/transport1_station + name = "SC Dock 3-A" + landmark_tag = "transport1_station" + docking_controller = "centcom_shuttle_dock_airlock" + //Merc @@ -104,171 +138,196 @@ icon_screen = "shuttle" shuttle_tag = "Merchant" -/datum/shuttle/ferry/merchant +/datum/shuttle/autodock/ferry/merchant name = "Merchant" + location = FERRY_LOCATION_OFFSITE warmup_time = 0 + shuttle_area = /area/shuttle/merchant/home + landmark_station = "merchant_station" + landmark_offsite = "merchant_offsite" docking_controller_tag = "trade_shuttle" - dock_target_station = "trade_shuttle_bay" - dock_target_offsite = "trade_shuttle_dock_airlock" - area_station = /area/shuttle/merchant/home - area_offsite = /area/shuttle/merchant/away + +/obj/effect/shuttle_landmark/southern_cross/merchant_offsite + name = "Trade Station" + landmark_tag = "merchant_offsite" + docking_controller = "trade_shuttle_bay" + base_area = /area/space + base_turf = /turf/space + +/obj/effect/shuttle_landmark/southern_cross/merchant_station + name = "SC Dock 1-E" + landmark_tag = "merchant_station" + docking_controller = "trade_shuttle_dock_airlock" + +// Arrivals Shuttle +/datum/shuttle/autodock/ferry/arrivals/southern_cross + name = "Arrivals" + location = FERRY_LOCATION_OFFSITE + shuttle_area = /area/shuttle/arrival/pre_game + landmark_offsite = "arrivals_offsite" + landmark_station = "arrivals_station" + docking_controller_tag = "arrivals_shuttle" + +/obj/effect/shuttle_landmark/southern_cross/arrivals_offsite + name = "Transit to Station" + landmark_tag = "arrivals_offsite" + base_area = /area/space + base_turf = /turf/space + +/obj/effect/shuttle_landmark/southern_cross/arrivals_station + name = "SC Dock 2-C/D" + landmark_tag = "arrivals_station" + docking_controller = "arrivals_dock" //Escape Pods -/datum/shuttle/ferry/emergency/centcom +/datum/shuttle/autodock/ferry/emergency/centcom name = "Escape" - location = 1 + location = FERRY_LOCATION_OFFSITE warmup_time = 10 - area_offsite = /area/shuttle/escape/centcom - area_station = /area/shuttle/escape/station - area_transition = /area/shuttle/escape/transit + shuttle_area = /area/shuttle/escape/centcom + landmark_offsite = "escape_offsite" + landmark_station = "escape_station" + landmark_transition = "escape_transit"; docking_controller_tag = "escape_shuttle" - dock_target_station = "escape_dock" - dock_target_offsite = "centcom_dock" - transit_direction = NORTH move_time = SHUTTLE_TRANSIT_DURATION_RETURN -/datum/shuttle/ferry/escape_pod/escape_pod_one - name = "Escape Pod 1" - location = 0 - warmup_time = 0 - area_station = /area/shuttle/escape_pod1/station - area_offsite = /area/shuttle/escape_pod1/centcom - area_transition = /area/shuttle/escape_pod1/transit - docking_controller_tag = "escape_pod_1" - dock_target_station = "escape_pod_1_berth" - dock_target_offsite = "escape_pod_1_recovery" - transit_direction = NORTH - move_time = SHUTTLE_TRANSIT_DURATION_RETURN +/obj/effect/shuttle_landmark/southern_cross/escape/offsite + name = "Centcom" + landmark_tag = "escape_offsite" + docking_controller = "centcom_dock" + base_area = /area/space + base_turf = /turf/space -/datum/shuttle/ferry/escape_pod/escape_pod_two - name = "Escape Pod 2" - location = 0 - warmup_time = 0 - area_station = /area/shuttle/escape_pod2/station - area_offsite = /area/shuttle/escape_pod2/centcom - area_transition = /area/shuttle/escape_pod2/transit - docking_controller_tag = "escape_pod_2" - dock_target_station = "escape_pod_2_berth" - dock_target_offsite = "escape_pod_2_recovery" - transit_direction = NORTH - move_time = SHUTTLE_TRANSIT_DURATION_RETURN +/obj/effect/shuttle_landmark/southern_cross/escape/station + name = "Station Escape Dock" + landmark_tag = "escape_station" + docking_controller = "escape_dock" -/datum/shuttle/ferry/escape_pod/escape_pod_three - name = "Escape Pod 3" - location = 0 - warmup_time = 0 - area_station = /area/shuttle/escape_pod3/station - area_offsite = /area/shuttle/escape_pod3/centcom - area_transition = /area/shuttle/escape_pod3/transit - docking_controller_tag = "escape_pod_3" - dock_target_station = "escape_pod_3_berth" - dock_target_offsite = "escape_pod_3_recovery" - transit_direction = NORTH - move_time = SHUTTLE_TRANSIT_DURATION_RETURN +/obj/effect/shuttle_landmark/southern_cross/escape/transit + landmark_tag = "escape_transit" -/datum/shuttle/ferry/escape_pod/escape_pod_four - name = "Escape Pod 4" - location = 0 - warmup_time = 0 - area_station = /area/shuttle/escape_pod4/station - area_offsite = /area/shuttle/escape_pod4/centcom - area_transition = /area/shuttle/escape_pod4/transit - docking_controller_tag = "escape_pod_4" - dock_target_station = "escape_pod_4_berth" - dock_target_offsite = "escape_pod_4_recovery" - transit_direction = NORTH //should this be SOUTH? I have no idea. - move_time = SHUTTLE_TRANSIT_DURATION_RETURN +// Escape Pods - Save me from typing this eight billion times +#define ESCAPE_POD(NUMBER) \ +/datum/shuttle/autodock/ferry/escape_pod/escape_pod##NUMBER { \ + name = "Escape Pod " + #NUMBER; \ + location = FERRY_LOCATION_STATION; \ + warmup_time = 0; \ + shuttle_area = /area/shuttle/escape_pod##NUMBER/station; \ + docking_controller_tag = "escape_pod_" + #NUMBER; \ + landmark_station = "escape_pod_"+ #NUMBER +"_station"; \ + landmark_offsite = "escape_pod_"+ #NUMBER +"_offsite"; \ + landmark_transition = "escape_pod_"+ #NUMBER +"_transit"; \ + move_time = SHUTTLE_TRANSIT_DURATION_RETURN; \ +} \ +/obj/effect/shuttle_landmark/southern_cross/escape_pod##NUMBER/station { \ + name = "Station"; \ + landmark_tag = "escape_pod_"+ #NUMBER +"_station"; \ + docking_controller = "escape_pod_"+ #NUMBER +"_berth"; \ + base_area = /area/space; \ + base_turf = /turf/simulated/floor/airless; \ +} \ +/obj/effect/shuttle_landmark/southern_cross/escape_pod##NUMBER/offsite { \ + name = "Recovery"; \ + landmark_tag = "escape_pod_"+ #NUMBER +"_offsite"; \ + docking_controller = "escape_pod_"+ #NUMBER +"_recovery"; \ +} \ +/obj/effect/shuttle_landmark/southern_cross/escape_pod##NUMBER/transit { \ + landmark_tag = "escape_pod_"+ #NUMBER +"_transit"; \ + flags = SLANDMARK_FLAG_AUTOSET; \ +} -/datum/shuttle/ferry/escape_pod/escape_pod_five - name = "Escape Pod 5" - location = 0 - warmup_time = 0 - area_station = /area/shuttle/escape_pod5/station - area_offsite = /area/shuttle/escape_pod5/centcom - area_transition = /area/shuttle/escape_pod5/transit - docking_controller_tag = "escape_pod_5" - dock_target_station = "escape_pod_5_berth" - dock_target_offsite = "escape_pod_5_recovery" - transit_direction = NORTH //should this be WEST? I have no idea. - move_time = SHUTTLE_TRANSIT_DURATION_RETURN +ESCAPE_POD(1) +ESCAPE_POD(2) +ESCAPE_POD(3) +ESCAPE_POD(4) +ESCAPE_POD(5) +ESCAPE_POD(6) +ESCAPE_POD(7) +ESCAPE_POD(8) -/datum/shuttle/ferry/escape_pod/escape_pod_six - name = "Escape Pod 6" - location = 0 - warmup_time = 0 - area_station = /area/shuttle/escape_pod6/station - area_offsite = /area/shuttle/escape_pod6/centcom - area_transition = /area/shuttle/escape_pod6/transit - docking_controller_tag = "escape_pod_6" - dock_target_station = "escape_pod_6_berth" - dock_target_offsite = "escape_pod_6_recovery" - transit_direction = NORTH //should this be WEST? I have no idea. - move_time = SHUTTLE_TRANSIT_DURATION_RETURN +#undef ESCAPE_POD -/datum/shuttle/ferry/escape_pod/escape_pod_seven - name = "Escape Pod 7" - location = 0 - warmup_time = 0 - area_station = /area/shuttle/escape_pod7/station - area_offsite = /area/shuttle/escape_pod7/centcom - area_transition = /area/shuttle/escape_pod7/transit - docking_controller_tag = "escape_pod_7" - dock_target_station = "escape_pod_7_berth" - dock_target_offsite = "escape_pod_7_recovery" - transit_direction = WEST - -/datum/shuttle/ferry/escape_pod/escape_pod_eight - name = "Escape Pod 8" - location = 0 - warmup_time = 0 - area_station = /area/shuttle/escape_pod8/station - area_offsite = /area/shuttle/escape_pod8/centcom - area_transition = /area/shuttle/escape_pod8/transit - docking_controller_tag = "escape_pod_8" - dock_target_station = "escape_pod_8_berth" - dock_target_offsite = "escape_pod_8_recovery" - transit_direction = EAST - -/datum/shuttle/ferry/escape_pod/escape_pod_cryo +// Cryostorage Escape Pod +/datum/shuttle/autodock/ferry/escape_pod/escape_pod_cryo name = "Cryostorage Shuttle" - location = 0 + location = FERRY_LOCATION_STATION warmup_time = 0 - area_station = /area/shuttle/cryo/station - area_offsite = /area/shuttle/cryo/centcom - area_transition = /area/shuttle/cryo/transit + shuttle_area = /area/shuttle/cryo/station + landmark_station = "cryostorage_station" + landmark_offsite = "cryostorage_offsite" + landmark_transition = "cryostorage_transit" docking_controller_tag = "cryostorage_shuttle" - dock_target_station = "cryostorage_shuttle_berth" - dock_target_offsite = "cryostorage_shuttle_recovery" - transit_direction = NORTH move_time = SHUTTLE_TRANSIT_DURATION_RETURN -/datum/shuttle/ferry/escape_pod/large_escape_pod1 +/obj/effect/shuttle_landmark/southern_cross/cryostorage_station + name = "Station Cryostorage Dock" + landmark_tag = "cryostorage_station" + docking_controller = "cryostorage_shuttle_berth" + base_area = /area/space + base_turf = /turf/simulated/floor/airless + +/obj/effect/shuttle_landmark/southern_cross/cryostorage_offsite + name = "Recovery" + landmark_tag = "cryostorage_offsite" + docking_controller = "cryostorage_shuttle_recovery" + +/obj/effect/shuttle_landmark/southern_cross/cryostorage_transit + landmark_tag = "cryostorage_transit" + +// Large Escape Pod 1 +/datum/shuttle/autodock/ferry/escape_pod/large_escape_pod1 name = "Large Escape Pod 1" - location = 0 + location = FERRY_LOCATION_STATION warmup_time = 0 - area_station = /area/shuttle/large_escape_pod1/station - area_offsite = /area/shuttle/large_escape_pod1/centcom - area_transition = /area/shuttle/large_escape_pod1/transit + shuttle_area = /area/shuttle/large_escape_pod1/station + landmark_station = "large_escape_pod1_station" + landmark_offsite = "large_escape_pod1_offsite" + landmark_transition = "large_escape_pod1_transit" docking_controller_tag = "large_escape_pod_1" - dock_target_station = "large_escape_pod_1_berth" - dock_target_offsite = "large_escape_pod_1_recovery" - transit_direction = EAST move_time = SHUTTLE_TRANSIT_DURATION_RETURN -/datum/shuttle/ferry/escape_pod/large_escape_pod2 +/obj/effect/shuttle_landmark/southern_cross/large_escape_pod1/station + name = "Station" + landmark_tag = "large_escape_pod1_station" + docking_controller = "large_escape_pod_1_berth" + base_area = /area/maintenance/firstdeck/centralstarboard + base_turf = /turf/simulated/floor/airless + +/obj/effect/shuttle_landmark/southern_cross/large_escape_pod1/offsite + name = "Recovery" + landmark_tag = "large_escape_pod1_offsite" + docking_controller = "large_escape_pod_1_recovery" + +/obj/effect/shuttle_landmark/southern_cross/large_escape_pod1/transit + landmark_tag = "large_escape_pod1_transit" + +// Large Escape Pod 2 +/datum/shuttle/autodock/ferry/escape_pod/large_escape_pod2 name = "Large Escape Pod 2" - location = 0 + location = FERRY_LOCATION_STATION warmup_time = 0 - area_station = /area/shuttle/large_escape_pod2/station - area_offsite = /area/shuttle/large_escape_pod2/centcom - area_transition = /area/shuttle/large_escape_pod2/transit + shuttle_area = /area/shuttle/large_escape_pod2/station + landmark_station = "large_escape_pod2_station" + landmark_offsite = "large_escape_pod2_offsite" + landmark_transition = "large_escape_pod2_transit" docking_controller_tag = "large_escape_pod_2" - dock_target_station = "large_escape_pod_2_berth" - dock_target_offsite = "large_escape_pod_2_recovery" - transit_direction = EAST move_time = SHUTTLE_TRANSIT_DURATION_RETURN +/obj/effect/shuttle_landmark/southern_cross/large_escape_pod2/station + name = "Station" + landmark_tag = "large_escape_pod2_station" + docking_controller = "large_escape_pod_2_berth" + base_area = /area/maintenance/firstdeck/centralport + base_turf = /turf/simulated/floor/airless + +/obj/effect/shuttle_landmark/southern_cross/large_escape_pod2/offsite + name = "Recovery" + landmark_tag = "large_escape_pod2_offsite" + docking_controller = "large_escape_pod_2_recovery" + +/obj/effect/shuttle_landmark/southern_cross/large_escape_pod2/transit + landmark_tag = "large_escape_pod2_transit" // Destination datums