Merge pull request #6193 from Novacat/nova-pathfinder

Adds Ninja, Heist, and Keegan's Beach

maps/tether/tether_areas2.dm

@@ -1088,7 +1088,7 @@
 	name = "Small Cruiser Shuttle - Station"
 	icon_state = "blue2"
 
-
+// ERT/Deathsquad Shuttle
 /area/shuttle/specialops/centcom
 	name = "Special Operations Shuttle - Centcom"
 	icon_state = "shuttlered"
@@ -1098,6 +1098,11 @@
 	name = "Special Operations Shuttle - Tether"
 	icon_state = "shuttlered"
 
+/area/shuttle/specialops/transit
+	name = "transit"
+	icon_state = "shuttlered"
+	base_turf = /turf/space/transit/east
+
 // Tether Map has this shuttle
 /area/shuttle/tether/surface
 	name = "Tether Shuttle Landed"
@@ -1112,6 +1117,59 @@
 	name = "Tether Shuttle Transit"
 	icon_state = "shuttle2"
 
+//Skipjack
+
+/area/skipjack_station
+	name = "Raider Outpost"
+	icon_state = "yellow"
+	requires_power = 0
+	dynamic_lighting = 0
+	flags = RAD_SHIELDED
+	ambience = AMBIENCE_HIGHSEC
+
+/area/skipjack_station/transit
+	name = "transit"
+	icon_state = "shuttlered"
+	base_turf = /turf/space/transit/north
+
+/area/skipjack_station/orbit
+	name = "near the Tether"
+	icon_state = "northwest"
+
+/area/skipjack_station/arrivals_dock
+	name = "\improper docked with Tether"
+	icon_state = "shuttle"
+
+// Ninja areas
+/area/ninja_dojo
+	name = "\improper Ninja Base"
+	icon_state = "green"
+	requires_power = 0
+	flags = RAD_SHIELDED
+	ambience = AMBIENCE_HIGHSEC
+
+/area/ninja_dojo/dojo
+	name = "\improper Clan Dojo"
+	dynamic_lighting = 0
+
+/area/ninja_dojo/start
+	name = "\improper Clan Dojo"
+	icon_state = "shuttlered"
+	base_turf = /turf/simulated/floor/plating
+
+/area/ninja_dojo/orbit
+	name = "near the Tether"
+	icon_state = "south"
+
+/area/ninja_dojo/transit
+	name = "transit"
+	icon_state = "shuttlered"
+	base_turf = /turf/space/transit/north
+
+/area/ninja_dojo/arrivals_dock
+	name = "\improper docked with Tether"
+	icon_state = "shuttle"
+	dynamic_lighting = 0
 
 // Exclude some more areas from the atmos leak event so people don't get trapped when spawning.
 /datum/event/atmos_leak/setup()

maps/tether/tether_shuttles.dm

@@ -282,6 +282,129 @@
 	my_area = /area/shuttle/excursion/bluespace
 	preferred_interim_area = /area/shuttle/excursion/space_moving
 
+// Heist
+/obj/machinery/computer/shuttle_control/web/heist
+	name = "skipjack control console"
+	req_access = list(access_syndicate)
+	shuttle_tag = "Skipjack"
+
+/datum/shuttle/web_shuttle/heist
+	name = "Skipjack"
+	warmup_time = 0
+	can_cloak = TRUE
+	cloaked = TRUE
+	current_area = /area/skipjack_station/start
+//	docking_controller_tag = "skipjack_shuttle"
+	web_master_type = /datum/shuttle_web_master/heist
+
+/datum/shuttle_web_master/heist
+	destination_class = /datum/shuttle_destination/heist
+	starting_destination = /datum/shuttle_destination/heist/root
+
+/datum/shuttle_destination/heist/root
+	name = "Raider Outpost"
+	my_area = /area/skipjack_station/start
+	preferred_interim_area = /area/skipjack_station/transit
+
+//	dock_target = "skipjack_base"
+
+	routes_to_make = list(
+		/datum/shuttle_destination/heist/outside_Tether = 1 MINUTE,
+		// /datum/shuttle_destination/heist/docked_Tether = 1 MINUTE
+	)
+
+/datum/shuttle_destination/heist/outside_Tether
+	name = "NSB Adephagia - Nearby"
+	my_area = /area/skipjack_station/orbit
+	preferred_interim_area = /area/skipjack_station/transit
+
+	routes_to_make = list(
+		/datum/shuttle_destination/heist/root = 1 MINUTE,
+		// /datum/shuttle_destination/heist/docked_Tether = 0
+	)
+
+/*
+/datum/shuttle_destination/heist/docked_Tether
+	name = "NSB Adephagia - Arrivals Docking Port"
+	my_area = /area/skipjack_station/arrivals_dock
+	preferred_interim_area = /area/skipjack_station/transit
+
+//	dock_target = "skipjack_shuttle_dock_airlock"
+	announcer = "NSB Adephagia Docking Computer"
+
+	routes_to_make = list(
+		/datum/shuttle_destination/heist/root = 1 MINUTE,
+		/datum/shuttle_destination/heist/outside_Tether = 0
+	)
+
+/datum/shuttle_destination/heist/docked_SC/get_arrival_message()
+	return "Attention, [master.my_shuttle.visible_name] has arrived to the Arrivals Dock."
+
+/datum/shuttle_destination/heist/docked_SC/get_departure_message()
+	return "Attention, [master.my_shuttle.visible_name] has departed the Arrivals Dock."
+*/
+
+// Ninja
+/obj/machinery/computer/shuttle_control/web/ninja
+	name = "stealth shuttle control console"
+	req_access = list(access_syndicate)
+	shuttle_tag = "Ninja"
+
+/datum/shuttle/web_shuttle/ninja
+	name = "Ninja"
+	visible_name = "Unknown Vessel"
+	warmup_time = 0
+	can_cloak = TRUE
+	cloaked = TRUE
+	current_area = /area/ninja_dojo/start
+	docking_controller_tag = "ninja_shuttle"
+	web_master_type = /datum/shuttle_web_master/ninja
+
+/datum/shuttle_web_master/ninja
+	destination_class = /datum/shuttle_destination/ninja
+	starting_destination = /datum/shuttle_destination/ninja/root
+
+/datum/shuttle_destination/ninja/root
+	name = "Dojo Outpost"
+	my_area = /area/ninja_dojo/start
+	preferred_interim_area = /area/ninja_dojo/transit
+
+	dock_target = "ninja_base"
+
+	routes_to_make = list(
+		/datum/shuttle_destination/ninja/outside_Tether = 30 SECONDS,
+		// /datum/shuttle_destination/ninja/docked_Tether = 30 SECONDS
+	)
+
+/datum/shuttle_destination/ninja/outside_Tether
+	name = "NSB Adephagia - Nearby"
+	my_area = /area/ninja_dojo/orbit
+	preferred_interim_area = /area/ninja_dojo/transit
+
+	routes_to_make = list(
+		/datum/shuttle_destination/ninja/root = 30 SECONDS,
+		// /datum/shuttle_destination/ninja/docked_Tether = 0
+	)
+/*
+/datum/shuttle_destination/ninja/docked_Tether
+	name = "NSB Adephagia - Arrivals Docking Port"
+	my_area = /area/ninja_dojo/arrivals_dock
+	preferred_interim_area = /area/ninja_dojo/transit
+
+	dock_target = "ninja_shuttle_dock_airlock"
+	announcer = "NSB Adephagia Docking Computer"
+
+	routes_to_make = list(
+		/datum/shuttle_destination/ninja/root = 30 SECONDS,
+		/datum/shuttle_destination/ninja/outside_Tether = 0
+	)
+
+/datum/shuttle_destination/syndie/docked_SC/get_arrival_message()
+	return "Attention, [master.my_shuttle.visible_name] has arrived to the Arrivals Dock."
+
+/datum/shuttle_destination/syndie/docked_SC/get_departure_message()
+	return "Attention, [master.my_shuttle.visible_name] has departed the Arrivals Dock."
+*/
 
 ////////////////////////////////////
 //////// Specops Shuttle ///////////
@@ -310,13 +433,14 @@
 /datum/shuttle_destination/specialops/tether
 	name = "NSB Adephagia Docking Arm 2"
 	my_area = /area/shuttle/specialops/tether
+	preferred_interim_area = /area/shuttle/specialops/transit
 
 	dock_target = "specops_dock"
 	radio_announce = 1
 	announcer = "A.L.I.C.E."
 
 	routes_to_make = list(
-		/datum/shuttle_destination/specialops/centcom = 0,
+		/datum/shuttle_destination/specialops/centcom = 15,
 	)
 
 /datum/shuttle_destination/specialops/tether/get_arrival_message()
@@ -329,7 +453,8 @@
 /datum/shuttle_destination/specialops/centcom
 	name = "Central Command"
 	my_area = /area/shuttle/specialops/centcom
+	preferred_interim_area = /area/shuttle/specialops/transit
 
 	routes_to_make = list(
-		/datum/shuttle_destination/specialops/tether = 0
+		/datum/shuttle_destination/specialops/tether = 15
 	)

vorestation.dme

@@ -3310,6 +3310,7 @@
 #include "code\ZAS\Zone.dm"
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
+#include "maps\RandomZLevels\blackmarketpackers.dm"
 #include "maps\southern_cross\southern_cross_jobs_vr.dm"
 #include "maps\southern_cross\items\encryptionkey_sc.dm"
 #include "maps\southern_cross\items\encryptionkey_vr.dm"