Reworks the Tajaran Smuggler ship (#15184)

aurorastation.dme

@@ -3216,6 +3216,7 @@
 #include "maps\away\ships\sol_pirate\sfa_patrol_ship.dm"
 #include "maps\away\ships\sol_pirate\sfa_patrol_ship_ghostroles.dm"
 #include "maps\away\ships\tajara\taj_smuggler\tajaran_smuggler.dm"
+#include "maps\away\ships\tajara\taj_smuggler\tajaran_smuggler_areas.dm"
 #include "maps\away\ships\tajara\taj_smuggler\tajaran_smuggler_ghostroles.dm"
 #include "maps\away\ships\tcfl_patrol\tcfl_peacekeeper_ship.dm"
 #include "maps\away\ships\tcfl_patrol\tcfl_peacekeeper_ship_ghostroles.dm"

html/changelogs/alberyk-smuggler.yml

@@ -0,0 +1,7 @@
+author: Alberyk
+
+delete-after: True
+
+changes:
+  - maptweak: "The Tajaran smuggler ship now has working atmos and power."
+  - maptweak: "The Tajaran smuggler ship can now eject its cargo hold."

maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm

@@ -6,20 +6,12 @@
 	spawn_weight = 1
 	spawn_cost = 1
 	id = "tajaran_smuggler"
-	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/tajaran_smuggler_shuttle)
+	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/tajaran_smuggler_shuttle, /datum/shuttle/autodock/overmap/tajaran_smuggler_cargo)
 
 /decl/submap_archetype/tajaran_smuggler
 	map = "Adhomian Freighter"
 	descriptor = "Built with reliability in mind, the Zhsram Freighter is one of the most common Adhomian designs. This vessel is cheap and has a sizeable cargo hold. It is commonly used by Tajaran traders and smugglers."
 
-//areas
-/area/ship/tajaran_smuggler
-	name = "Adhomian Freighter"
-
-/area/shuttle/tajaran_smuggler
-	name = "Adhomian Freight Shuttle"
-	icon_state = "shuttle2"
-
 //ship stuff
 
 /obj/effect/overmap/visitable/ship/tajaran_smuggler
@@ -34,7 +26,8 @@
 	fore_dir = SOUTH
 	vessel_size = SHIP_SIZE_SMALL
 	initial_restricted_waypoints = list(
-		"Adhomian Freight Shuttle" = list("nav_tajaran_smuggler_shuttle")
+		"Adhomian Freight Shuttle" = list("nav_tajaran_smuggler_shuttle"),
+		"Adhomian Freight Cargo" = list("nav_tajaran_smuggler_cargo")
 	)
 
 	initial_generic_waypoints = list(
@@ -85,6 +78,7 @@
 	name = "Adhomian Freight Shuttle"
 	move_time = 20
 	shuttle_area = list(/area/shuttle/tajaran_smuggler)
+	dock_target = "tajaran_smuggler_shuttle"
 	current_location = "nav_tajaran_smuggler_shuttle"
 	landmark_transition = "nav_transit_tajaran_smuggler_shuttle"
 	range = 1
@@ -96,11 +90,67 @@
 	name = "Adhomian Freight Shuttle Hangar"
 	landmark_tag = "nav_tajaran_smuggler_shuttle"
 	docking_controller = "tajaran_smuggler_shuttle_dock"
-	base_area = /area/ship/tajaran_smuggler
+	base_area = /area/tajaran_smuggler/hangar
 	base_turf = /turf/simulated/floor/plating
 	movable_flags = MOVABLE_FLAG_EFFECTMOVE
 
 /obj/effect/shuttle_landmark/tajaran_smuggler_shuttle/transit
 	name = "In transit"
 	landmark_tag = "nav_transit_tajaran_smuggler_shuttle"
-	base_turf = /turf/space/transit/north
+	base_turf = /turf/space/transit/north
+
+//cargo hold - the smuggler can just send its cargo hold into space
+
+/obj/effect/overmap/visitable/ship/landable/tajaran_smuggler_cargo
+	name = "Cargo Hold"
+	class = "ACV"
+	designation = "Cargo Hold"
+	desc = "A floating cargo container."
+	shuttle = "Adhomian Freight Cargo"
+	max_speed = 1/(3 SECONDS)
+	burn_delay = 2 SECONDS
+	vessel_mass = 3000 //very inefficient pod
+	fore_dir = NORTH
+	vessel_size = SHIP_SIZE_TINY
+
+/obj/machinery/computer/shuttle_control/explore/tajaran_smuggler_cargo
+	name = "cargo ejection control console"
+	shuttle_tag = "Adhomian Freight Cargo"
+
+
+/datum/shuttle/autodock/overmap/tajaran_smuggler_cargo
+	name = "Adhomian Freight Cargo"
+	move_time = 20
+	shuttle_area = list(/area/shuttle/tajaran_smuggler_cargo)
+	dock_target = "tajaran_smuggler_cargo"
+	current_location = "nav_tajaran_smuggler_cargo"
+	landmark_transition = "nav_transit_tajaran_smuggler_cargo"
+	range = 1
+	fuel_consumption = 2
+	logging_home_tag = "nav_tajaran_smuggler_cargo"
+	defer_initialisation = TRUE
+
+/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/hangar
+	name = "Adhomian Freight Cargo Hangar"
+	landmark_tag = "nav_tajaran_smuggler_cargo"
+	docking_controller = "tajaran_smuggler_cargo_dock"
+	base_area = /area/space
+	base_turf = /turf/space/dynamic
+	movable_flags = MOVABLE_FLAG_EFFECTMOVE
+
+/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/transit
+	name = "In transit"
+	landmark_tag = "nav_transit_tajaran_smuggler_cargo"
+	base_turf = /turf/space/transit/north
+
+/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/nav1
+	name = "Cargo Hold - Port Side"
+	landmark_tag = "nav_tajaran_smuggler_cargo_1"
+	base_turf = /turf/space/dynamic
+	base_area = /area/space
+
+/obj/effect/shuttle_landmark/tajaran_smuggler_cargo/nav2
+	name = "Cargo Hold - Starboard Side"
+	landmark_tag = "nav_tajaran_smuggler_cargo_2"
+	base_turf = /turf/space/dynamic
+	base_area = /area/space

maps/away/ships/tajara/taj_smuggler/tajaran_smuggler_areas.dm

@@ -0,0 +1,47 @@
+/area/tajaran_smuggler
+	name = "Adhomian Freighter"
+	icon_state = "bluenew"
+	requires_power = 1
+	dynamic_lighting = 1
+	no_light_control = 0
+	base_turf = /turf/space
+	flags = RAD_SHIELDED
+
+/area/tajaran_smuggler/bridge
+	name = "Adhomian Freighter Bridge"
+	icon_state = "bridge"
+
+/area/tajaran_smuggler/hangar
+	name = "Adhomian Freighter Hangar"
+	icon_state = "quartloading"
+
+/area/tajaran_smuggler/dorms
+	name = "Adhomian Freighter Quarters"
+	icon_state = "crew_quarters"
+
+/area/tajaran_smuggler/captain_quarters
+	name = "Adhomian Freighter Captain Quarters"
+	icon_state = "captain"
+
+/area/tajaran_smuggler/atmos
+	name = "Adhomian Freighter Atmospherics"
+	icon_state = "engineering"
+
+/area/tajaran_smuggler/engine
+	name = "Adhomian Freighter Engine"
+	icon_state = "engine"
+
+/area/tajaran_smuggler/power
+	name = "Adhomian Freighter Power Room"
+	icon_state = "substation"
+
+//shuttles
+
+/area/shuttle/tajaran_smuggler
+	name = "Adhomian Freight Shuttle"
+	icon_state = "shuttle2"
+
+/area/shuttle/tajaran_smuggler_cargo
+	name = "Adhomian Freight Cargo Hold"
+	icon_state = "shuttle2"
+