Блять.

mods/_fd/_maps/sfv_warspite/code/core.dm → maps/away/sfv_warspite/code/core.dm

@@ -1,18 +1,22 @@
+#include "npc.dm"
+#include "lifepods.dm"
+#include "shuttles.dm"
+
 /obj/structure/fake_zlvl
 	name = "open space"
 	density = TRUE
 	anchored = TRUE
 	opacity = FALSE
 
-	icon = 'mods/_fd/_maps/sfv_warspite/icons/shadow.dmi'
+	icon = 'maps/away/sfv_warspite/icons/shadow.dmi'
 	icon_state = "shadow"
 	layer = ABOVE_HUMAN_LAYER
 
 /datum/map_template/ruin/away_site/sfv_warspite
 	name = "SFV Warspite"
 	id = "awaysite_sfv_warspite"
 	description = "Flagman of Vice-Admiral of Third Fleet"
-	mappaths = list("mods/_fd/_maps/sfv_warspite/warspite.dmm")
+	suffixes = list("sfv_warspite/warspite.dmm")
 	area_usage_test_exempted_root_areas = list(/area/warspite)
 	spawn_cost = 1000
 	player_cost = 4
@@ -23,9 +27,7 @@
 		/datum/shuttle/autodock/overmap/lifepod/three,
 		/datum/shuttle/autodock/overmap/lifepod/four,
 		/datum/shuttle/autodock/overmap/lifepod/five,
-		/datum/shuttle/autodock/overmap/lifepod/six,
-		/datum/shuttle/autodock/ferry/warspite/from_bridge_to_hangar,
-		/datum/shuttle/autodock/ferry/warspite/from_dorms_to_bridge
+		/datum/shuttle/autodock/overmap/lifepod/six
 	)
 
 /obj/overmap/visitable/ship/sfv_warspite
@@ -66,6 +68,7 @@
 	name = "Warspite"
 	icon_state = "yellow"
 	area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
+	base_turf = /turf/simulated/floor/plating
 
 /area/warspite/bridge
 	name = "Warspite - Bridge"
@@ -137,82 +140,3 @@
 /turf/unsimulated/floor/plating/void
 	color = COLOR_BLACK
 	density = 1
-
-// ELEVATOR
-
-/area/wayspite/lift
-	name = "Warspite | Elevator - Bridge2Hangar"
-	requires_power = FALSE
-
-/area/wayspite/lift/engi
-	name = "Warspite | Elevator - Bridge2Engi"
-
-/obj/machinery/computer/shuttle_control/lift/warspite/from_bridge_to_hangar
-	name = "Bridge to Hangar"
-	shuttle_tag = "Bridge to Hangar"
-	ui_template = "shuttle_control_console_lift.tmpl"
-	icon_state = "tiny"
-	icon_keyboard = "tiny_keyboard"
-	icon_screen = "lift"
-	density = FALSE
-
-/datum/shuttle/autodock/ferry/warspite/from_bridge_to_hangar
-	name = "Bridge to Hangar"
-	shuttle_area = /area/wayspite/lift
-	warmup_time = 3
-	waypoint_station = "nav_warspite_bridge_hangar"
-	waypoint_offsite = "nav_warspite_hangar_bridge"
-	sound_takeoff = 'sound/effects/lift_heavy_start.ogg'
-	sound_landing = 'sound/effects/lift_heavy_stop.ogg'
-	ceiling_type = null
-	knockdown = 0
-	defer_initialisation = TRUE
-
-/obj/shuttle_landmark/lift/warspite/from_bridge_to_hangar
-	name = "Bridge Deck"
-	landmark_tag = "nav_warspite_bridge_hangar"
-	base_area = /area/warspite/hallway
-	base_turf = /turf/unsimulated/floor/plating/void
-
-/obj/shuttle_landmark/lift/warspite/from_hangar_to_bridge
-	name = "Hangar Deck"
-	landmark_tag = "nav_warspite_hangar_bridge"
-	flags = SLANDMARK_FLAG_AUTOSET
-	base_area = /area/warspite/hangar
-	base_turf = /turf/simulated/floor/plating
-
-/obj/machinery/computer/shuttle_control/lift/warspite/from_dorms_to_bridge
-	name = "Dorms to Bridge"
-	shuttle_tag = "Dorms to Bridge"
-	ui_template = "shuttle_control_console_lift.tmpl"
-	icon_state = "tiny"
-	icon_keyboard = "tiny_keyboard"
-	icon_screen = "lift"
-	density = FALSE
-
-/datum/shuttle/autodock/ferry/warspite/from_dorms_to_bridge
-	name = "Dorms to Bridge"
-	shuttle_area = /area/wayspite/lift/engi
-	warmup_time = 3
-	waypoint_station = "nav_warspite_dorms_bridge"
-	waypoint_offsite = "nav_warspite_bridge_dorms"
-	sound_takeoff = 'sound/effects/lift_heavy_start.ogg'
-	sound_landing = 'sound/effects/lift_heavy_stop.ogg'
-	ceiling_type = null
-	knockdown = 0
-	defer_initialisation = TRUE
-
-/obj/shuttle_landmark/lift/warspite/from_dorms_to_bridge
-	name = "Dorms Deck"
-	landmark_tag = "nav_warspite_dorms_bridge"
-	base_area = /area/warspite/engibay
-	base_turf = /turf/simulated/floor/plating
-
-/obj/shuttle_landmark/lift/warspite/from_bridge_to_dorms
-	name = "Bridge Deck"
-	landmark_tag = "nav_warspite_bridge_dorms"
-	flags = SLANDMARK_FLAG_AUTOSET
-	base_area = /area/warspite/hallway
-	base_turf = /turf/unsimulated/floor/plating/void
-
-//

mods/_fd/_maps/sfv_warspite/code/npc.dm → maps/away/sfv_warspite/code/npc.dm

@@ -276,7 +276,7 @@
 /mob/living/simple_animal/hostile/human/fleet/warspite
 	name = "\improper Fleet Engineer"
 	desc = "An Engineer wearing Fleet garbs. They have a Third Fleet patch on their uniform, and pride on their shoulders."
-	icon = 'mods/_fd/_maps/sfv_warspite/icons/fleetcrew.dmi'
+	icon = 'maps/away/sfv_warspite/icons/fleetcrew.dmi'
 	icon_state = "engineer"
 	icon_dead = "fleetassault_dead"
 	icon_gib = "fleetarmsman_gib"

maps/torch_fd/fd_torch.dm

@@ -215,6 +215,7 @@
 	#include "../away/miningstation/miningstation.dm"
 	#include "../away/mininghome/mininghome.dm"
 	#include "../away/scavver/scavver_gantry.dm"
+	#include "../away/sfv_warspite/code/core.dm"
 	#include "../away/abandoned_hotel/abandoned_hotel.dm"
 
 		// ~EVENT SHIPS~ //
@@ -293,8 +294,6 @@
 	#include "../../mods/_fd/_maps/gccv_ulyanovsk/_ulyanovsk.dme"
 	#include "../../mods/_fd/_maps/dead_sea/_dead_sea.dme"
 
-	#include "../../mods/_fd/_maps/sfv_warspite/_warspite.dme"
-
 
 		// ~EXOPLANET RUINS~ //