Freebooter Ship - turns pods into submaps

aurorastation.dme

@@ -3899,8 +3899,10 @@
 #include "maps\away\ships\elyra\elyra_corvette\elyra_corvette.dm"
 #include "maps\away\ships\elyra\elyra_corvette\elyra_corvette_areas.dm"
 #include "maps\away\ships\elyra\elyra_corvette\elyra_corvette_ghostroles.dm"
-#include "maps\away\ships\freebooter\freebooter_ship.dm"
+#include "maps\away\ships\freebooter\freebooter_ship_.dm"
+#include "maps\away\ships\freebooter\freebooter_ship_areas.dm"
 #include "maps\away\ships\freebooter\freebooter_ship_ghostroles.dm"
+#include "maps\away\ships\freebooter\freebooter_ship_landmarks.dm"
 #include "maps\away\ships\golden_deep\golden_deep.dm"
 #include "maps\away\ships\golden_deep\golden_deep_areas.dm"
 #include "maps\away\ships\golden_deep\golden_deep_ghostroles.dm"

html/changelogs/DreamySkrell-freebooter-submaps.yml

@@ -0,0 +1,7 @@
+
+author: DreamySkrell
+
+delete-after: True
+
+changes:
+  - rscadd: "Freebooter Ship - turns pods into submaps."

maps/away/ships/freebooter/freebooter_ship.dm → maps/away/ships/freebooter/freebooter_ship_.dm

@@ -1,9 +1,12 @@
+
+// ------------------ map/template stuff
+
 /datum/map_template/ruin/away_site/freebooter_ship
 	name = "Freebooter Ship"
 	description = "One of the most common sights in the Orion Spur, even outside of human space, is the Hephaestus-produced Ox-class freighter. Designed to haul significant amounts of cargo on well-charted routes between civilized systems, the Ox-class is the backbone of many interstellar markets outside of the United Syndicates of Himeo. Repurposed Ox-class freighters are often used by pirates throughout the Spur thanks to their large size and ease of maintenance – and modification."
 
 	prefix = "ships/freebooter/"
-	suffix = "freebooter_ship.dmm"
+	suffix = "freebooter_ship_.dmm"
 
 	sectors = list(ALL_POSSIBLE_SECTORS)
 	spawn_weight = 1
@@ -17,94 +20,21 @@
 	map = "Freebooter Ship"
 	descriptor = "One of the most common sights in the Orion Spur, even outside of human space, is the Hephaestus-produced Ox-class freighter. Designed to haul significant amounts of cargo on well-charted routes between civilized systems, the Ox-class is the backbone of many interstellar markets outside of the United Syndicates of Himeo. Repurposed Ox-class freighters are often used by pirates throughout the Spur thanks to their large size and ease of maintenance – and modification."
 
-//areas
-/area/ship/freebooter_ship
-	name = "Freebooter Ship"
-	requires_power = TRUE
-
-/area/ship/freebooter_ship/foyer
-	name = "Freebooter Foyer"
-
-/area/ship/freebooter_ship/gunnery
-	name = "Freebooter Gunnery"
-
-/area/ship/freebooter_ship/ammo
-	name = "Freebooter Ammunition Storage"
-
-/area/ship/freebooter_ship/gunneryentrance
-	name = "Freebooter Ship Gunnery Entrance"
-
-/area/ship/freebooter_ship/bridge
-	name = "Freebooter Bridge"
-
-/area/ship/freebooter_ship/forehallway
-	name = "Freebooter Fore Hallway"
-
-/area/ship/freebooter_ship/forehallwayport
-	name = "Freebooter Fore Hallway Port"
-
-/area/ship/freebooter_ship/closet
-	name = "Freebooter Multi-Purpose Closet"
-
-/area/ship/freebooter_ship/cryo
-	name = "Freebooter Cryogenics Storage"
-
-/area/ship/freebooter_ship/dorms
-	name = "Freebooter Dormitories"
-
-/area/ship/freebooter_ship/lockers
-	name = "Freebooter Locker Rooms"
-
-/area/ship/freebooter_ship/head
-	name = "Freebooter Head"
+// ------------------ mapmanip stuff
 
-/area/ship/freebooter_ship/medical
-	name = "Freebooter Medical Bay"
+/obj/effect/map_effect/marker/mapmanip/submap/extract/freebooter_ship/pod_starboard
+	name = "Freebooter Ship, Pod, Starboard"
 
-/area/ship/freebooter_ship/pod1
-	name = "Freebooter Pod One"
+/obj/effect/map_effect/marker/mapmanip/submap/insert/freebooter_ship/pod_starboard
+	name = "Freebooter Ship, Pod, Starboard"
 
-/area/ship/freebooter_ship/pod2
-	name = "Freebooter Pod Two"
+/obj/effect/map_effect/marker/mapmanip/submap/extract/freebooter_ship/pod_port
+	name = "Freebooter Ship, Pod, Port"
 
-/area/ship/freebooter_ship/pod3
-	name = "Freebooter Pod Three"
+/obj/effect/map_effect/marker/mapmanip/submap/insert/freebooter_ship/pod_port
+	name = "Freebooter Ship, Pod, Port"
 
-/area/ship/freebooter_ship/pod4
-	name = "Freebooter Pod Four"
-
-/area/ship/freebooter_ship/pod5
-	name = "Freebooter Pod Five"
-
-/area/ship/freebooter_ship/pod6
-	name = "Freebooter Pod Six"
-
-/area/ship/freebooter_ship/pod7
-	name = "Freebooter Pod Seven"
-
-/area/ship/freebooter_ship/pod8
-	name = "Freebooter Pod Eight"
-
-/area/ship/freebooter_ship/thruster1
-	name = "Freebooter Starboard Thruster"
-
-/area/ship/freebooter_ship/thruster2
-	name = "Freebooter Port Thruster"
-
-/area/ship/freebooter_ship/engineering
-	name = "Freebooter Engineering"
-
-
-/area/ship/freebooter_ship/exterior
-	name = "Freebooter Ship Exterior"
-	requires_power = FALSE
-
-/area/shuttle/freebooter_shuttle
-	name = "Freebooter Shuttle"
-	icon_state = "shuttle2"
-	requires_power = TRUE
-
-//ship stuff
+// ------------------ ship stuff
 
 /obj/effect/overmap/visitable/ship/freebooter_ship
 	name = "Freebooter Ship"
@@ -146,24 +76,8 @@
 	skybox_image.pixel_y = rand(128,256)
 	return skybox_image
 
-/obj/effect/shuttle_landmark/freebooter_ship/nav1
-	name = "Freebooter Ship - Port Side"
-	landmark_tag = "nav_freebooter_ship_1"
-	base_turf = /turf/space/dynamic
-	base_area = /area/space
+// ------------------ shuttle stuff
 
-/obj/effect/shuttle_landmark/freebooter_ship/nav2
-	name = "Freebooter Ship - Port Side"
-	landmark_tag = "nav_freebooter_ship_2"
-	base_turf = /turf/space/dynamic
-	base_area = /area/space
-
-/obj/effect/shuttle_landmark/freebooter_ship/transit
-	name = "In transit"
-	landmark_tag = "nav_transit_freebooter_ship"
-	base_turf = /turf/space/transit/north
-
-//shuttle stuff
 /obj/effect/overmap/visitable/ship/landable/freebooter_shuttle
 	name = "Freebooter Shuttle"
 	class = "ICV"
@@ -193,16 +107,3 @@
 	fuel_consumption = 2
 	logging_home_tag = "nav_hangar_freebooter"
 	defer_initialisation = TRUE
-
-/obj/effect/shuttle_landmark/freebooter_shuttle/hangar
-	name = "Freebooter Shuttle Hangar"
-	landmark_tag = "nav_hangar_freebooter"
-	docking_controller = "freebooter_shuttle_dock"
-	base_area = /area/ship/freebooter_ship
-	base_turf = /turf/simulated/floor/plating
-	movable_flags = MOVABLE_FLAG_EFFECTMOVE
-
-/obj/effect/shuttle_landmark/freebooter_shuttle/transit
-	name = "In transit"
-	landmark_tag = "nav_transit_freebooter_shuttle"
-	base_turf = /turf/space/transit/north