diff --git a/maps/offmap_vr/om_ships/lunaship.dm b/maps/offmap_vr/om_ships/lunaship.dm
index 8e9df9f070..8d32813b87 100644
--- a/maps/offmap_vr/om_ships/lunaship.dm
+++ b/maps/offmap_vr/om_ships/lunaship.dm
@@ -32,6 +32,47 @@
 	name = "LUNA - Robotics Bay"
 /area/lunaship/engineering
 	name = "LUNA - Engineering"
+/area/luna/flight_boat_dock
+	name = "LUNA - Boat Dock"
+	requires_power = 0
+
+/area/shuttle/luna_ship_boat
+	name = "LUNA - Ship's Boat"
+	requires_power = 1
+	dynamic_lighting = 1
+	base_turf = /turf/simulated/floor/reinforced
+
+/obj/effect/shuttle_landmark/premade/luna_near_fore
+	name = "Near ISV LUNA (Fore)"
+	landmark_tag = "luna_near_fore"
+
+/obj/effect/shuttle_landmark/premade/luna_near_fore_port
+	name = "Near ISV LUNA (Fore-Port)"
+	landmark_tag = "luna_near_fore_port"
+
+/obj/effect/shuttle_landmark/premade/luna_near_fore_star
+	name = "Near ISV LUNA (Fore-Starboard)"
+	landmark_tag = "luna_near_fore_star"
+
+/obj/effect/shuttle_landmark/premade/luna_near_aft
+	name = "Near ISV LUNA (Aft)"
+	landmark_tag = "luna_near_aft"
+
+/obj/effect/shuttle_landmark/premade/luna_near_aft_port
+	name = "Near ISV LUNA (Aft-Port)"
+	landmark_tag = "luna_near_aft_port"
+
+/obj/effect/shuttle_landmark/premade/luna_near_aft_star
+	name = "Near ISV LUNA (Aft-Starboard)"
+	landmark_tag = "luna_near_aft_star"
+
+/obj/effect/shuttle_landmark/premade/luna_wing_port
+	name = "ISV LUNA (Port Wingtip)"
+	landmark_tag = "luna_wing_star"
+
+/obj/effect/shuttle_landmark/premade/luna_wing_star
+	name = "ISV LUNA (Starboard Wingtip)"
+	landmark_tag = "luna_wing_star"
 
 
 /turf/simulated/floor/water/indoors/surfluid
diff --git a/maps/offmap_vr/om_ships/lunaship.dmm b/maps/offmap_vr/om_ships/lunaship.dmm
index 5bfa807c4b..3bbcbb5875 100644
--- a/maps/offmap_vr/om_ships/lunaship.dmm
+++ b/maps/offmap_vr/om_ships/lunaship.dmm
@@ -12,12 +12,16 @@
 /area/lunaship/hallway_starboard)
 "al" = (
 /obj/structure/table/woodentable,
-/obj/item/device/perfect_tele,
-/obj/item/weapon/cell/device/weapon/recharge/alien,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/item/weapon/implantcase/armblade,
+/obj/item/device/perfect_tele/alien{
+	desc = "An enhanced device that allows one to teleport people and objects across large distances.";
+	name = "advanced translocator"
+	},
+/obj/item/weapon/card/id/event/polymorphic/altcard{
+	access = list(777)
+	},
 /turf/simulated/floor/wood,
 /area/lunaship/office)
 "aF" = (
@@ -92,20 +96,14 @@
 "bj" = (
 /turf/space/internal_edge/top,
 /area/lunaship/park)
+"bp" = (
+/obj/machinery/computer/ship/navigation/telescreen,
+/turf/simulated/wall/tgmc/durawall,
+/area/lunaship/bar)
 "bx" = (
-/obj/machinery/power/shield_generator/upgraded{
-	field_radius = 39;
-	initial_shield_modes = 2113;
-	req_one_access = 777;
-	target_radius = 39
-	},
-/obj/structure/cable/cyan,
-/obj/structure/cable/cyan{
-	icon_state = "0-8"
-	},
-/obj/structure/railing/grey,
-/turf/simulated/floor/tiled/milspec/raised,
-/area/lunaship/cockpit)
+/obj/structure/bed/chair/sofa/right/purp,
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/lunaship/bar)
 "by" = (
 /obj/structure/hull_corner/long_vert{
 	dir = 9
@@ -120,9 +118,9 @@
 /area/space)
 "bD" = (
 /obj/structure/cable/cyan{
-	d1 = 2;
+	d1 = 4;
 	d2 = 8;
-	icon_state = "2-8"
+	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/milspec/raised,
 /area/lunaship/cockpit)
@@ -130,6 +128,12 @@
 /obj/machinery/media/jukebox,
 /turf/simulated/floor/tiled/eris/steel/bar_dance,
 /area/lunaship/bar)
+"bI" = (
+/obj/effect/floor_decal/techfloor/corner{
+	dir = 8
+	},
+/turf/simulated/floor/water/indoors/surfluid,
+/area/lunaship/engineering)
 "bK" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
@@ -150,9 +154,20 @@
 	},
 /turf/space,
 /area/space)
+"cq" = (
+/obj/effect/floor_decal/techfloor/corner{
+	dir = 4
+	},
+/obj/effect/floor_decal/techfloor/corner,
+/turf/simulated/floor/water/indoors/surfluid,
+/area/lunaship/robotics_bay)
 "cx" = (
 /turf/space/internal_edge/left,
 /area/lunaship/park)
+"cK" = (
+/obj/structure/bed/chair/sofa/purp,
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/lunaship/bar)
 "cM" = (
 /obj/effect/floor_decal/milspec_sterile/green/half{
 	dir = 4
@@ -181,25 +196,48 @@
 /obj/structure/lattice,
 /turf/space,
 /area/space)
-"dB" = (
+"do" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
 /obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
+	icon_state = "0-2"
 	},
 /obj/structure/cable/cyan{
 	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
+/turf/simulated/floor/tiled/eris/white/gray_platform,
+/area/lunaship/engineering)
+"dB" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/plating/eris/under,
 /area/lunaship/engineering)
+"dH" = (
+/obj/effect/floor_decal/techfloor/corner{
+	dir = 4
+	},
+/obj/effect/floor_decal/techfloor/corner,
+/obj/effect/floor_decal/industrial/outline/grey{
+	pixel_x = 16;
+	pixel_y = 16
+	},
+/obj/effect/floor_decal/techfloor/corner,
+/turf/simulated/floor/water/indoors/surfluid,
+/area/lunaship/engineering)
 "dN" = (
 /obj/machinery/atmospherics/portables_connector{
 	piping_layer = 3
@@ -216,6 +254,9 @@
 	},
 /turf/simulated/floor/tiled/milspec/sterile,
 /area/lunaship/medical)
+"eE" = (
+/turf/simulated/floor/water/indoors/surfluid,
+/area/lunaship/engineering)
 "fc" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -235,10 +276,6 @@
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/hallway_starboard)
 "fv" = (
-/obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
-	},
 /obj/structure/table/darkglass,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -263,8 +300,15 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
-/obj/effect/floor_decal/techfloor/corner,
-/turf/simulated/floor/water/indoors/surfluid,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 6
+	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/tiled/eris/white/gray_platform,
 /area/lunaship/engineering)
 "gc" = (
 /obj/structure/cable/cyan{
@@ -354,13 +398,9 @@
 /turf/simulated/floor/water/deep/indoors,
 /area/lunaship/park)
 "he" = (
-/obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1"
-	},
 /obj/machinery/sleeper,
 /obj/effect/floor_decal/milspec_sterile/green/half{
-	dir = 8
+	dir = 9
 	},
 /turf/simulated/floor/tiled/milspec/sterile,
 /area/lunaship/medical)
@@ -368,17 +408,12 @@
 /turf/simulated/floor/water/indoors/surfluid,
 /area/lunaship/cockpit)
 "hs" = (
-/obj/machinery/power/smes/buildable/hybrid{
-	input_attempt = 1;
-	input_level = 250000;
-	input_level_max = 250000;
-	output_level = 190000
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
 	},
-/obj/structure/cable/cyan,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/eris/white/gray_platform,
+/turf/simulated/floor/plating/eris/under,
 /area/lunaship/engineering)
 "hu" = (
 /obj/machinery/recharge_station,
@@ -435,13 +470,9 @@
 /turf/simulated/floor/tiled/eris/steel/bar_dance,
 /area/lunaship/bar)
 "iq" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/milspec/raised,
-/area/lunaship/cockpit)
+/obj/structure/bed/chair/sofa/corner/purp,
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/lunaship/bar)
 "iu" = (
 /obj/machinery/power/apc/hyper{
 	alarms_hidden = 1;
@@ -502,21 +533,16 @@
 /turf/space,
 /area/space)
 "iB" = (
-/obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
-	},
-/obj/machinery/mecha_part_fabricator{
-	req_access = list()
-	},
 /obj/effect/floor_decal/milspec/color/black/half{
-	dir = 4
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
+	dir = 5
 	},
+/obj/machinery/autolathe,
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/robotics_bay)
+"iK" = (
+/obj/effect/shuttle_landmark/premade/luna_near_aft_star,
+/turf/space,
+/area/space)
 "iN" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -546,22 +572,13 @@
 /turf/space/internal_edge/bottom,
 /area/lunaship/cockpit)
 "jG" = (
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 4
-	},
-/turf/simulated/floor/water/indoors/surfluid,
-/area/lunaship/engineering)
+/turf/simulated/floor/wood,
+/area/lunaship/office)
 "jK" = (
-/obj/effect/floor_decal/milspec_sterile/green/corner{
-	dir = 1
+/obj/effect/floor_decal/milspec_sterile/green/half{
+	dir = 8
 	},
 /obj/structure/table/glass,
-/obj/item/device/paicard/sleevecard,
-/obj/item/device/paicard/sleevecard,
-/obj/item/device/sleevemate{
-	pixel_y = -5
-	},
-/obj/item/device/sleevemate,
 /turf/simulated/floor/tiled/milspec/sterile,
 /area/lunaship/medical)
 "jQ" = (
@@ -627,22 +644,15 @@
 /area/lunaship/medical)
 "kL" = (
 /obj/effect/floor_decal/milspec_sterile/green/half{
-	dir = 8
+	dir = 4
 	},
-/obj/structure/table/glass,
-/obj/item/device/healthanalyzer/advanced{
-	pixel_x = -5
-	},
-/obj/item/device/healthanalyzer/advanced{
-	pixel_x = -5;
-	pixel_y = -5
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/milspec/sterile,
 /area/lunaship/medical)
 "kM" = (
-/obj/effect/floor_decal/milspec_sterile/green/corner{
-	dir = 1
-	},
 /obj/structure/table/glass,
 /obj/item/weapon/storage/firstaid/adv,
 /obj/structure/closet/walllocker/medical/west,
@@ -652,24 +662,56 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/effect/floor_decal/milspec_sterile/green/half{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/milspec/sterile,
 /area/lunaship/medical)
 "kZ" = (
 /obj/item/device/radio/beacon,
 /turf/simulated/floor/tiled/milspec/raised,
 /area/lunaship/cockpit)
-"lm" = (
-/obj/machinery/ion_engine{
-	dir = 1
+"lb" = (
+/obj/machinery/power/shield_generator/upgraded{
+	field_radius = 20;
+	initial_shield_modes = 2113;
+	req_one_access = 777;
+	target_radius = 18
 	},
-/turf/simulated/wall/rpshull,
-/area/lunaship/engineering)
+/obj/structure/cable/cyan,
+/obj/structure/cable/cyan{
+	icon_state = "0-8"
+	},
+/obj/structure/railing/grey,
+/obj/effect/floor_decal/industrial/outline/grey,
+/turf/simulated/floor/tiled/milspec/raised,
+/area/lunaship/cockpit)
+"lm" = (
+/obj/effect/floor_decal/milspec/color/black/half{
+	dir = 6
+	},
+/obj/machinery/mecha_part_fabricator{
+	req_access = list()
+	},
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/milspec,
+/area/lunaship/robotics_bay)
 "lI" = (
 /obj/effect/floor_decal/milspec/color/orange/half{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/engineering)
+"lP" = (
+/obj/structure/table/darkglass,
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/lunaship/bar)
 "mf" = (
 /obj/structure/table/steel,
 /obj/item/weapon/storage/belt/utility/chief/full,
@@ -685,6 +727,10 @@
 "mj" = (
 /turf/space/internal_edge/topleft,
 /area/lunaship/cockpit)
+"mm" = (
+/obj/machinery/telecomms/allinone,
+/turf/simulated/floor/plating/eris/under,
+/area/lunaship/engineering)
 "mp" = (
 /obj/machinery/optable{
 	name = "Robotics Operating Table"
@@ -725,29 +771,22 @@
 	},
 /turf/space,
 /area/space)
+"mV" = (
+/obj/effect/shuttle_landmark/premade/luna_near_fore_star,
+/turf/space,
+/area/space)
 "na" = (
-/obj/structure/cable/cyan{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
-/turf/simulated/floor/tiled/milspec/raised,
-/area/lunaship/cockpit)
-"nc" = (
-/obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1"
-	},
-/obj/effect/floor_decal/milspec_sterile/green/half{
+/obj/structure/bed/chair/sofa/purp{
 	dir = 8
 	},
-/obj/structure/table/glass,
-/obj/item/weapon/storage/firstaid/combat,
-/obj/item/weapon/storage/firstaid/bonemed,
-/obj/item/weapon/storage/firstaid/clotting,
-/obj/structure/closet/walllocker/medical/west,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/lunaship/bar)
+"nc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/effect/floor_decal/milspec_sterile/green/half{
+	dir = 9
 	},
 /turf/simulated/floor/tiled/milspec/sterile,
 /area/lunaship/medical)
@@ -786,15 +825,13 @@
 /area/lunaship/robotics_bay)
 "ns" = (
 /obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
+	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
 /turf/simulated/floor/plating/eris/under,
 /area/lunaship/engineering)
@@ -868,10 +905,6 @@
 "oG" = (
 /turf/simulated/floor/tiled/eris/steel/bar_flat,
 /area/lunaship/bar)
-"oI" = (
-/obj/effect/floor_decal/techfloor/corner,
-/turf/simulated/floor/water/indoors/surfluid,
-/area/lunaship/engineering)
 "pj" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -905,18 +938,15 @@
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/hallway_port)
 "pR" = (
-/obj/machinery/power/terminal{
-	dir = 1;
-	icon_state = "term"
+/obj/structure/table/woodentable,
+/obj/machinery/alarm/alarms_hidden{
+	dir = 4;
+	pixel_x = -26
 	},
-/obj/structure/cable/cyan{
-	icon_state = "0-8"
-	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/eris/white/gray_platform,
-/area/lunaship/engineering)
+/obj/item/weapon/implanter,
+/obj/item/weapon/implant/organ/limbaugment/upperarm/blade,
+/turf/simulated/floor/wood,
+/area/lunaship/office)
 "pT" = (
 /obj/structure/hull_corner/long_vert{
 	dir = 9
@@ -955,18 +985,15 @@
 /turf/simulated/wall/tgmc/durawall,
 /area/space)
 "qB" = (
-/obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1"
+/obj/item/device/defib_kit/jumper_kit,
+/obj/structure/table/steel,
+/obj/item/weapon/storage/firstaid/surgery,
+/obj/structure/closet/walllocker_double/east,
+/obj/effect/floor_decal/milspec/color/black/half{
+	dir = 6
 	},
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 1
-	},
-/turf/simulated/floor/water/indoors/surfluid,
-/area/lunaship/engineering)
-"rb" = (
-/turf/simulated/floor/water/indoors/surfluid,
-/area/lunaship/engineering)
+/turf/simulated/floor/tiled/milspec,
+/area/lunaship/robotics_bay)
 "rh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -1055,9 +1082,22 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/lunaship/hallway_port)
 "rX" = (
-/obj/structure/undies_wardrobe,
-/turf/simulated/floor/wood,
-/area/lunaship/office)
+/obj/effect/floor_decal/milspec_sterile/green/corner{
+	dir = 1
+	},
+/obj/structure/table/glass,
+/obj/item/device/paicard/sleevecard,
+/obj/item/device/paicard/sleevecard,
+/obj/item/device/sleevemate{
+	pixel_y = -5
+	},
+/obj/item/device/sleevemate,
+/obj/machinery/light{
+	dir = 8;
+	icon_state = "tube1"
+	},
+/turf/simulated/floor/tiled/milspec/sterile,
+/area/lunaship/medical)
 "rZ" = (
 /obj/structure/cable/cyan{
 	icon_state = "4-8"
@@ -1078,16 +1118,6 @@
 "si" = (
 /turf/space,
 /area/space)
-"sw" = (
-/obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1"
-	},
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 8
-	},
-/turf/simulated/floor/water/indoors/surfluid,
-/area/lunaship/engineering)
 "sC" = (
 /turf/simulated/wall/tgmc/durawall,
 /area/lunaship/medical)
@@ -1105,6 +1135,10 @@
 	},
 /turf/simulated/floor/carpet/turcarpet,
 /area/lunaship/office)
+"sN" = (
+/obj/machinery/ntnet_relay,
+/turf/simulated/floor/plating/eris/under,
+/area/lunaship/engineering)
 "sT" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -1154,6 +1188,10 @@
 /obj/item/weapon/soap/nanotrasen,
 /turf/simulated/floor/tiled/milspec/sterile,
 /area/lunaship/medical)
+"tf" = (
+/obj/effect/shuttle_landmark/premade/luna_wing_port,
+/turf/space,
+/area/space)
 "th" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -1194,31 +1232,46 @@
 	},
 /turf/simulated/floor/wood,
 /area/lunaship/office)
+"tB" = (
+/obj/effect/floor_decal/techfloor/corner{
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 8;
+	icon_state = "tube1"
+	},
+/turf/simulated/floor/water/indoors/surfluid,
+/area/lunaship/engineering)
 "tQ" = (
 /obj/effect/floor_decal/techfloor/corner{
 	dir = 4
 	},
 /turf/simulated/floor/water/indoors/surfluid,
 /area/lunaship/cockpit)
-"ud" = (
+"tW" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/turf/simulated/floor/plating/eris/under,
-/area/lunaship/engineering)
+/turf/simulated/wall/rpshull,
+/area/space)
+"ud" = (
+/obj/structure/closet/walllocker_double/east,
+/turf/space,
+/area/space)
 "ui" = (
-/obj/effect/floor_decal/milspec_sterile/green,
 /obj/machinery/vending/medical{
 	dir = 4
 	},
+/obj/effect/floor_decal/milspec_sterile/green/corner{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/milspec/sterile,
 /area/lunaship/medical)
 "um" = (
@@ -1290,8 +1343,6 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plating/eris/under,
 /area/lunaship/engineering)
 "vy" = (
@@ -1300,6 +1351,12 @@
 	},
 /turf/simulated/floor/tiled/milspec/sterile,
 /area/lunaship/medical)
+"vA" = (
+/obj/effect/floor_decal/techfloor/corner{
+	dir = 4
+	},
+/turf/simulated/floor/water/indoors/surfluid,
+/area/lunaship/engineering)
 "vB" = (
 /obj/machinery/computer/teleporter{
 	dir = 1
@@ -1394,6 +1451,20 @@
 	},
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/robotics_bay)
+"wK" = (
+/obj/structure/table/glass,
+/obj/item/weapon/storage/firstaid/combat,
+/obj/item/weapon/storage/firstaid/bonemed,
+/obj/item/weapon/storage/firstaid/clotting,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/structure/closet/walllocker/medical/west,
+/obj/effect/floor_decal/milspec_sterile/green/corner{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/milspec/sterile,
+/area/lunaship/medical)
 "wM" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -1402,34 +1473,9 @@
 	},
 /turf/simulated/wall/rpshull,
 /area/space)
-"wV" = (
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/structure/cable/cyan{
-	icon_state = "0-8"
-	},
-/obj/machinery/power/terminal{
-	dir = 1;
-	icon_state = "term"
-	},
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/tiled/eris/white/gray_platform,
-/area/lunaship/engineering)
 "wZ" = (
-/obj/structure/cable/cyan{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/cable/cyan{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
 	},
 /turf/simulated/floor/plating/eris/under,
 /area/lunaship/engineering)
@@ -1442,6 +1488,10 @@
 	},
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/hallway_starboard)
+"xd" = (
+/obj/effect/shuttle_landmark/premade/luna_wing_star,
+/turf/space,
+/area/space)
 "xg" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -1452,6 +1502,16 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/hallway_port)
+"xj" = (
+/obj/structure/undies_wardrobe{
+	anchored = 1
+	},
+/obj/machinery/light{
+	dir = 8;
+	icon_state = "tube1"
+	},
+/turf/simulated/floor/carpet/turcarpet,
+/area/lunaship/office)
 "xv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -1485,11 +1545,21 @@
 /obj/structure/cable/cyan{
 	icon_state = "0-8"
 	},
-/obj/machinery/alarm/alarms_hidden{
-	pixel_y = 26
-	},
 /turf/simulated/floor/tiled/eris/steel/bar_dance,
 /area/lunaship/bar)
+"yl" = (
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/wall/rpshull,
+/area/space)
 "yw" = (
 /obj/machinery/alarm/alarms_hidden{
 	dir = 4;
@@ -1502,19 +1572,14 @@
 /turf/simulated/floor/tiled/milspec/raised,
 /area/lunaship/cockpit)
 "yB" = (
-/obj/structure/cable/cyan{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
 	},
 /turf/simulated/floor/plating/eris/under,
 /area/lunaship/engineering)
 "yH" = (
-/obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
+/obj/structure/bed/chair/sofa/left/purp{
+	dir = 8
 	},
 /turf/simulated/floor/tiled/eris/steel/bar_dance,
 /area/lunaship/bar)
@@ -1538,6 +1603,15 @@
 	icon_state = "map_on";
 	name = "gas pump - waste - scrubbers"
 	},
+/obj/structure/cable/cyan{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/plating/eris/under,
 /area/lunaship/engineering)
 "yX" = (
@@ -1548,6 +1622,10 @@
 /obj/structure/fans/hardlight,
 /turf/simulated/floor/tiled/eris/steel/panels,
 /area/lunaship/hallway_starboard)
+"zm" = (
+/obj/effect/shuttle_landmark/premade/luna_near_aft,
+/turf/space,
+/area/space)
 "zp" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
@@ -1618,10 +1696,6 @@
 /obj/structure/cable/cyan,
 /turf/space,
 /area/space)
-"Ae" = (
-/obj/machinery/ntnet_relay,
-/turf/simulated/floor/plating/eris/under,
-/area/lunaship/engineering)
 "Ag" = (
 /turf/simulated/floor/water/deep/indoors,
 /area/lunaship/park)
@@ -1647,9 +1721,6 @@
 /area/lunaship/robotics_bay)
 "Ao" = (
 /obj/structure/table/darkglass,
-/obj/machinery/computer/ship/navigation/telescreen{
-	pixel_y = 23
-	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
@@ -1670,16 +1741,9 @@
 /turf/simulated/floor/tiled/milspec/raised,
 /area/lunaship/cockpit)
 "Ax" = (
-/obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
-	},
 /obj/effect/floor_decal/techfloor/corner{
 	dir = 1
 	},
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 4
-	},
 /turf/simulated/floor/water/indoors/surfluid,
 /area/lunaship/robotics_bay)
 "AR" = (
@@ -1716,21 +1780,10 @@
 	},
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/robotics_bay)
-"Br" = (
-/obj/machinery/power/smes/buildable/hybrid{
-	input_attempt = 1;
-	input_level = 250000;
-	input_level_max = 250000;
-	output_level = 190000
-	},
-/obj/structure/cable/cyan,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/eris/white/gray_platform,
-/area/lunaship/engineering)
 "Ca" = (
-/obj/effect/floor_decal/milspec/color/black/corner,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/robotics_bay)
 "Cf" = (
@@ -1807,14 +1860,14 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 4
-	},
-/turf/simulated/floor/water/indoors/surfluid,
-/area/lunaship/engineering)
-"DZ" = (
 /obj/effect/floor_decal/industrial/warning{
-	dir = 10
+	dir = 5
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable/cyan{
+	icon_state = "0-2"
 	},
 /turf/simulated/floor/tiled/eris/white/gray_platform,
 /area/lunaship/engineering)
@@ -1857,10 +1910,6 @@
 	},
 /area/lunaship/park)
 "EH" = (
-/obj/effect/floor_decal/techfloor/corner,
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 8
-	},
 /turf/simulated/floor/water/indoors/surfluid,
 /area/lunaship/robotics_bay)
 "EK" = (
@@ -1897,6 +1946,17 @@
 	},
 /turf/space,
 /area/space)
+"EZ" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/cable/cyan{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled/eris/white/gray_platform,
+/area/lunaship/engineering)
 "Fb" = (
 /obj/structure/cable/cyan{
 	d1 = 2;
@@ -2072,9 +2132,16 @@
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/hallway_starboard)
 "Ih" = (
-/obj/machinery/telecomms/allinone,
-/turf/simulated/floor/plating/eris/under,
-/area/lunaship/engineering)
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
+/obj/effect/floor_decal/techfloor/corner{
+	dir = 4
+	},
+/obj/effect/floor_decal/techfloor/corner,
+/turf/simulated/floor/water/indoors/surfluid,
+/area/lunaship/robotics_bay)
 "Iv" = (
 /obj/structure/lattice,
 /obj/structure/cable/cyan{
@@ -2085,9 +2152,31 @@
 /turf/space,
 /area/space)
 "Iz" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 9
+	},
+/obj/machinery/power/smes/buildable/hybrid{
+	input_attempt = 1;
+	input_level = 250000;
+	input_level_max = 250000;
+	output_level = 190000
+	},
+/obj/structure/cable/cyan{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/tiled/eris/white/gray_platform,
+/area/lunaship/engineering)
+"Jc" = (
 /obj/effect/floor_decal/techfloor/corner{
 	dir = 1
 	},
+/obj/effect/floor_decal/techfloor/corner{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/outline/grey{
+	pixel_x = -16;
+	pixel_y = -16
+	},
 /turf/simulated/floor/water/indoors/surfluid,
 /area/lunaship/engineering)
 "Jn" = (
@@ -2147,9 +2236,6 @@
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/medical)
 "Ke" = (
-/obj/effect/floor_decal/milspec_sterile/green/half{
-	dir = 9
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -2175,11 +2261,15 @@
 /turf/simulated/floor/tiled/milspec/sterile,
 /area/lunaship/medical)
 "KX" = (
-/obj/effect/floor_decal/milspec_sterile/green/corner{
-	dir = 8
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
 	},
-/turf/simulated/floor/tiled/milspec/sterile,
-/area/lunaship/medical)
+/obj/machinery/alarm/alarms_hidden{
+	pixel_y = 26
+	},
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/lunaship/bar)
 "KY" = (
 /obj/structure/cable/cyan{
 	d1 = 2;
@@ -2200,21 +2290,17 @@
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/engineering)
 "LA" = (
-/obj/structure/closet/walllocker_double/east,
-/obj/item/device/defib_kit/jumper_kit,
-/obj/structure/table/steel,
-/obj/item/weapon/storage/firstaid/surgery,
-/obj/effect/floor_decal/milspec/color/black/half{
-	dir = 4
-	},
+/obj/effect/floor_decal/milspec/color/black/corner,
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/robotics_bay)
-"LO" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
+"LI" = (
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
 	},
-/turf/simulated/floor/tiled/eris/white/gray_platform,
-/area/lunaship/engineering)
+/obj/structure/table/darkglass,
+/turf/simulated/floor/tiled/eris/steel/bar_dance,
+/area/lunaship/bar)
 "LS" = (
 /obj/structure/lattice,
 /turf/space,
@@ -2255,6 +2341,9 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/robotics_bay)
 "No" = (
@@ -2280,6 +2369,15 @@
 	name = "gas pump - air - distro";
 	piping_layer = 1
 	},
+/obj/structure/cable/cyan{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/plating/eris/under,
 /area/lunaship/engineering)
 "NS" = (
@@ -2298,11 +2396,15 @@
 /obj/item/device/mmi/digital/posibrain/nano,
 /turf/simulated/floor/wood,
 /area/lunaship/office)
+"Oa" = (
+/obj/effect/shuttle_landmark/premade/luna_near_fore_port,
+/turf/space,
+/area/space)
 "Om" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 9
+/obj/effect/floor_decal/techfloor/corner{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/eris/white/gray_platform,
+/turf/simulated/floor/water/indoors/surfluid,
 /area/lunaship/engineering)
 "Oo" = (
 /obj/structure/closet/walllocker_double/east,
@@ -2345,14 +2447,11 @@
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/hallway_port)
 "OQ" = (
-/obj/structure/cable/cyan{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 8
+	dir = 5
 	},
 /turf/simulated/floor/plating/eris/under,
 /area/lunaship/engineering)
@@ -2385,9 +2484,6 @@
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/office)
 "PL" = (
-/obj/effect/floor_decal/milspec_sterile/green/half{
-	dir = 9
-	},
 /obj/structure/cable/cyan{
 	d1 = 2;
 	d2 = 4;
@@ -2406,13 +2502,28 @@
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/space)
+"PU" = (
+/obj/effect/shuttle_landmark/premade/luna_near_aft_port,
+/turf/space,
+/area/space)
 "PY" = (
-/obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1"
+/obj/structure/cable/cyan{
+	icon_state = "4-8"
 	},
-/turf/simulated/floor/carpet/turcarpet,
-/area/lunaship/office)
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/lunaship/engineering)
+"Qa" = (
+/obj/machinery/ion_engine{
+	dir = 1
+	},
+/turf/simulated/wall/rpshull,
+/area/lunaship/engineering)
 "Qp" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -2420,10 +2531,16 @@
 /turf/simulated/floor/tiled/milspec/raised,
 /area/lunaship/cockpit)
 "Qs" = (
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 8
+/obj/effect/floor_decal/industrial/warning{
+	dir = 10
 	},
-/turf/simulated/floor/water/indoors/surfluid,
+/obj/structure/cable/cyan{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/rtg/kugelblitz{
+	pixel_y = 10
+	},
+/turf/simulated/floor/tiled/eris/white/gray_platform,
 /area/lunaship/engineering)
 "Qu" = (
 /obj/machinery/shipsensors{
@@ -2431,6 +2548,7 @@
 	range = 3.5
 	},
 /obj/effect/floor_decal/industrial/warning/full,
+/obj/structure/cable/cyan,
 /turf/simulated/floor/reinforced/airless,
 /area/space)
 "QF" = (
@@ -2465,11 +2583,14 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/structure/cable/cyan{
+	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
 /turf/simulated/floor/plating/eris/under,
 /area/lunaship/engineering)
@@ -2500,6 +2621,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/milspec/sterile,
 /area/lunaship/medical)
+"Sy" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/white/gray_platform,
+/area/lunaship/engineering)
 "SC" = (
 /obj/structure/cable/cyan{
 	d1 = 2;
@@ -2539,15 +2666,6 @@
 /obj/structure/railing/grey,
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/engineering)
-"Tk" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/cable/cyan{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/tiled/eris/white/gray_platform,
-/area/lunaship/engineering)
 "Ty" = (
 /obj/machinery/computer/ship/sensors{
 	req_one_access = list(777)
@@ -2594,14 +2712,19 @@
 	},
 /area/lunaship/bar)
 "UK" = (
-/obj/effect/floor_decal/techfloor/corner{
-	dir = 4
+/obj/structure/table/glass,
+/obj/item/device/healthanalyzer/advanced{
+	pixel_x = -5
 	},
-/obj/effect/floor_decal/techfloor/corner{
+/obj/item/device/healthanalyzer/advanced{
+	pixel_x = -5;
+	pixel_y = -5
+	},
+/obj/effect/floor_decal/milspec_sterile/green/corner{
 	dir = 1
 	},
-/turf/simulated/floor/water/indoors/surfluid,
-/area/lunaship/robotics_bay)
+/turf/simulated/floor/tiled/milspec/sterile,
+/area/lunaship/medical)
 "UM" = (
 /obj/effect/floor_decal/milspec/color/orange/corner{
 	dir = 4
@@ -2682,25 +2805,24 @@
 /turf/simulated/floor/tiled/eris/steel/panels,
 /area/lunaship/hallway_starboard)
 "VY" = (
-/obj/machinery/alarm/alarms_hidden{
-	dir = 4;
-	pixel_x = -26
-	},
-/turf/simulated/floor/carpet/turcarpet,
-/area/lunaship/office)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plating/eris/under,
+/area/lunaship/engineering)
 "Wg" = (
 /obj/structure/railing/grey,
 /turf/simulated/floor/plating/eris/under,
 /area/lunaship/engineering)
 "Wj" = (
-/obj/machinery/power/rtg/kugelblitz{
-	pixel_y = 10
+/obj/effect/floor_decal/techfloor/corner{
+	dir = 4
 	},
-/obj/structure/cable/cyan{
-	icon_state = "0-4"
+/obj/effect/floor_decal/techfloor/corner,
+/obj/effect/floor_decal/industrial/outline/grey{
+	pixel_x = 16;
+	pixel_y = 16
 	},
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/tiled/eris/white/gray_platform,
+/turf/simulated/floor/water/indoors/surfluid,
 /area/lunaship/engineering)
 "Wm" = (
 /obj/structure/table/steel,
@@ -2742,6 +2864,17 @@
 	},
 /turf/simulated/floor/carpet/turcarpet,
 /area/lunaship/office)
+"WN" = (
+/obj/machinery/light{
+	dir = 8;
+	icon_state = "tube1"
+	},
+/turf/simulated/floor/plating/eris/under,
+/area/lunaship/engineering)
+"WZ" = (
+/obj/effect/floor_decal/techfloor/corner,
+/turf/simulated/floor/water/indoors/surfluid,
+/area/lunaship/engineering)
 "Xg" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
@@ -2787,11 +2920,11 @@
 /turf/simulated/floor/tiled/milspec,
 /area/lunaship/engineering)
 "XE" = (
-/obj/machinery/autolathe,
-/obj/effect/floor_decal/milspec/color/black/half{
-	dir = 5
+/obj/effect/floor_decal/techfloor/corner,
+/obj/effect/floor_decal/techfloor/corner{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/milspec,
+/turf/simulated/floor/water/indoors/surfluid,
 /area/lunaship/robotics_bay)
 "XO" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
@@ -2799,6 +2932,21 @@
 	},
 /turf/simulated/floor/plating/eris/under,
 /area/lunaship/engineering)
+"XW" = (
+/obj/effect/floor_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/power/smes/buildable/hybrid{
+	input_attempt = 1;
+	input_level = 250000;
+	input_level_max = 250000;
+	output_level = 190000
+	},
+/obj/structure/cable/cyan{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/tiled/eris/white/gray_platform,
+/area/lunaship/engineering)
 "XZ" = (
 /obj/effect/floor_decal/milspec/color/orange/half{
 	dir = 8
@@ -2927,7 +3075,7 @@
 /turf/simulated/floor/tiled/eris/steel/bar_dance,
 /area/lunaship/bar)
 "ZT" = (
-/obj/effect/shuttle_landmark,
+/obj/effect/shuttle_landmark/premade/luna_near_fore,
 /turf/space,
 /area/space)
 "ZX" = (
@@ -3639,7 +3787,7 @@ si
 si
 si
 si
-ZT
+Oa
 si
 si
 si
@@ -3659,7 +3807,7 @@ si
 si
 si
 si
-ZT
+tf
 si
 si
 si
@@ -3677,7 +3825,7 @@ si
 si
 si
 si
-ZT
+PU
 si
 si
 si
@@ -4020,7 +4168,7 @@ si
 si
 qx
 wM
-Gu
+yl
 Qu
 ZL
 ZL
@@ -4088,7 +4236,7 @@ ZL
 sC
 sC
 sC
-sC
+wK
 ui
 sC
 NH
@@ -4097,7 +4245,7 @@ OK
 NH
 Ri
 UR
-Ri
+jG
 Ri
 Ri
 Ri
@@ -4148,10 +4296,10 @@ LS
 sC
 sC
 sC
-sC
+UK
 kM
 nc
-KX
+FU
 sC
 pO
 Ba
@@ -4161,7 +4309,7 @@ Ri
 gY
 Vp
 al
-Ri
+pR
 Ri
 Ri
 Ri
@@ -4208,9 +4356,9 @@ si
 sC
 sC
 sC
-sC
+rX
 jK
-kL
+Ee
 Ke
 oc
 FU
@@ -4223,9 +4371,9 @@ PJ
 SF
 WC
 SF
-VY
+SF
 iu
-Ri
+xj
 Ri
 Ri
 Ri
@@ -4287,8 +4435,8 @@ Vx
 cU
 xJ
 nZ
-PY
-rX
+SF
+jG
 Ri
 Ri
 Ri
@@ -4353,7 +4501,7 @@ Vz
 xJ
 DJ
 od
-Ri
+jG
 Ri
 Ri
 si
@@ -4393,7 +4541,7 @@ Hf
 sC
 sC
 Wz
-cM
+kL
 cM
 kF
 iv
@@ -4418,7 +4566,7 @@ HW
 AS
 HC
 Ri
-si
+qz
 si
 si
 si
@@ -4480,8 +4628,8 @@ cQ
 cQ
 cQ
 cQ
-lm
-si
+cQ
+Qa
 si
 si
 si
@@ -4538,13 +4686,13 @@ Np
 Lo
 TY
 XZ
-qB
-rb
-rb
-sw
+WN
+Om
+eE
+tB
+sN
 cQ
-lm
-si
+Qa
 si
 si
 si
@@ -4590,7 +4738,7 @@ aK
 Kn
 Kn
 bD
-na
+Kn
 yX
 hr
 hr
@@ -4600,13 +4748,13 @@ Jv
 qn
 aL
 Wg
-jG
-rb
-rb
-oI
+YU
+WZ
+Wj
+vA
+YU
 cQ
-lm
-si
+Qa
 si
 si
 si
@@ -4651,8 +4799,8 @@ Kn
 Kn
 Kn
 Kn
+bD
 Kn
-iq
 yX
 tQ
 hr
@@ -4661,14 +4809,14 @@ cQ
 vO
 zE
 ns
-vw
-ud
+YU
+YU
+bI
+Jc
 Om
-DZ
-Ae
+mm
 cQ
-lm
-si
+Qa
 si
 si
 si
@@ -4713,8 +4861,8 @@ uQ
 Kn
 Kn
 Kn
+bD
 Kn
-iq
 Kn
 QF
 hr
@@ -4725,11 +4873,11 @@ XO
 yQ
 Xo
 yB
-LO
-Wj
+WZ
+dH
+vA
 cQ
-lm
-si
+Qa
 si
 si
 si
@@ -4775,8 +4923,8 @@ uQ
 Kn
 Kn
 vd
-yX
-bx
+lb
+Kn
 kZ
 zB
 hr
@@ -4784,11 +4932,12 @@ jF
 cQ
 YU
 YU
-YU
-YU
+PY
+VY
 OQ
-LO
-Tk
+bI
+Jc
+Om
 cQ
 si
 si
@@ -4804,7 +4953,6 @@ si
 si
 si
 si
-si
 "}
 (31,1,1) = {"
 si
@@ -4849,14 +4997,14 @@ sU
 NR
 Xo
 wZ
-Br
-wV
+vA
+eE
+WZ
 cQ
-lm
+Qa
 si
 si
-si
-ZT
+zm
 si
 si
 si
@@ -4912,11 +5060,11 @@ RA
 vw
 dB
 hs
-pR
-Ih
+YU
+YU
+YU
 cQ
-lm
-si
+Qa
 si
 si
 si
@@ -4973,12 +5121,12 @@ QU
 rZ
 Wg
 Iz
-rb
-rb
+XW
+Sy
 Qs
+YU
 cQ
-lm
-si
+Qa
 si
 si
 si
@@ -5035,12 +5183,12 @@ UM
 sV
 Tb
 DP
-rb
-rb
+do
+EZ
 fT
+YU
 cQ
-lm
-si
+Qa
 si
 si
 si
@@ -5100,8 +5248,8 @@ cQ
 cQ
 cQ
 cQ
-lm
-si
+cQ
+Qa
 si
 si
 si
@@ -5136,7 +5284,7 @@ ER
 Zm
 ve
 ve
-Fh
+bx
 Fh
 oG
 Xg
@@ -5159,10 +5307,10 @@ ng
 Ak
 aV
 Zr
-UK
+Ax
 kh
 EF
-si
+qz
 si
 si
 si
@@ -5198,7 +5346,7 @@ si
 Iv
 LS
 ve
-Fh
+cK
 pN
 Fh
 Xg
@@ -5221,7 +5369,7 @@ HR
 nr
 RI
 mf
-EF
+cq
 EF
 EF
 si
@@ -5260,8 +5408,8 @@ si
 Iv
 LS
 ve
-ve
-Fh
+iq
+na
 yH
 SC
 gj
@@ -5281,7 +5429,7 @@ gc
 hR
 Ax
 EH
-EF
+XE
 EF
 EF
 EF
@@ -5324,7 +5472,7 @@ si
 ve
 ve
 ve
-ve
+KX
 yh
 ZO
 in
@@ -5341,7 +5489,7 @@ GT
 Ca
 LA
 mp
-EF
+Ih
 EF
 EF
 EF
@@ -5388,20 +5536,20 @@ LS
 ve
 ve
 ve
-ve
+lP
 Ao
 fv
-Fh
+ZO
 ve
 fd
 QP
 af
 Hh
 EF
-XE
-iB
+wy
+GT
 MX
-EF
+qB
 EF
 EF
 EF
@@ -5450,9 +5598,9 @@ LS
 ZL
 ZL
 ve
+bp
 ve
-ve
-ve
+LI
 bF
 ve
 Rd
@@ -5460,8 +5608,8 @@ Rd
 bK
 Rd
 EF
-EF
-EF
+iB
+lm
 EF
 EF
 EF
@@ -5508,7 +5656,7 @@ si
 si
 Dt
 wM
-rn
+tW
 Qu
 ZL
 ZL
@@ -5525,7 +5673,7 @@ EF
 EF
 EF
 EF
-si
+ud
 si
 LS
 ZL
@@ -5871,7 +6019,7 @@ si
 si
 si
 si
-ZT
+mV
 si
 si
 si
@@ -5891,7 +6039,7 @@ si
 si
 si
 si
-ZT
+xd
 si
 si
 si
@@ -5909,7 +6057,7 @@ si
 si
 si
 si
-ZT
+iK
 si
 si
 si
diff --git a/vorestation.dme b/vorestation.dme
index 83afbdca72..f16d597381 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -4142,6 +4142,7 @@
 #include "maps\southern_cross\loadout\loadout_suit.dm"
 #include "maps\southern_cross\loadout\loadout_uniform.dm"
 #include "maps\southern_cross\loadout\loadout_vr.dm"
+#include "maps\stellardelight\stellar_delight.dm"
 #include "maps\submaps\_helpers.dm"
 #include "maps\submaps\_readme.dm"
 #include "maps\submaps\engine_submaps\engine.dm"
@@ -4151,6 +4152,5 @@
 #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm"
 #include "maps\submaps\surface_submaps\wilderness\wilderness.dm"
 #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
-#include "maps\virgo_minitest\virgo_minitest.dm"
 #include "maps\~map_system\maps.dm"
 // END_INCLUDE