diff --git a/maps/southern_cross/overmap/sectors.dm b/maps/southern_cross/overmap/sectors.dm
index 94f645e4e3..5cda79af26 100644
--- a/maps/southern_cross/overmap/sectors.dm
+++ b/maps/southern_cross/overmap/sectors.dm
@@ -11,6 +11,17 @@
 
 	map_z = list(Z_LEVEL_SURFACE, Z_LEVEL_SURFACE_MINE, Z_LEVEL_SURFACE_WILD, Z_LEVEL_SURFACE_SKYLANDS, Z_LEVEL_SURFACE_VALLEY)
 
+	initial_generic_waypoints = list(
+		"outpost_nw",
+		"outpost_s",
+		"outpost_w",
+		"wilderness_s",
+		"wilderness_se",
+		"wilderness_w",
+		"wilderness_n",
+		"valley_e"
+		)
+
 	in_space = 0
 	start_x  = 10
 	start_y  = 10
@@ -41,7 +52,8 @@
 
 /obj/effect/overmap/visitable/sector/Southern_Cross
 	name = "Southern Cross"
-	icon_state = "object"
+	icon = 'modular_chomp/icons/obj/overmap.dmi'
+	icon_state = "southerncross"
 	desc = "Southern Cross station, orbiting Sif."
 	scanner_desc = @{"[i]Registration[/i]: NLS Southern Cross
 [i]Class[/i]: Installation
diff --git a/maps/southern_cross/southern_cross-10.dmm b/maps/southern_cross/southern_cross-10.dmm
index 4e8755a461..8e16c1cff6 100644
--- a/maps/southern_cross/southern_cross-10.dmm
+++ b/maps/southern_cross/southern_cross-10.dmm
@@ -274,6 +274,14 @@
 	desc = "A heavy duty radio that can pick up all manor of shortwave and subspace frequencies. It's a bit bulkier than a normal radio thanks to the extra hardware. An engraving on the frame reads: IF FOUND, RETURN TO WILDERNESS SHELTER!";
 	name = "Wilderness Shelter subspace radio"
 	},
+/obj/item/device/spaceflare{
+	pixel_y = -10;
+	pixel_x = 5
+	},
+/obj/item/device/spaceflare{
+	pixel_y = -10;
+	pixel_x = -5
+	},
 /turf/simulated/floor/wood/sif,
 /area/surface/outpost/shelter)
 "bh" = (
@@ -461,8 +469,9 @@
 "dd" = (
 /obj/effect/zone_divider,
 /obj/effect/zone_divider,
+/obj/item/stack/marker_beacon,
 /turf/simulated/floor/outdoors/dirt/sif/planetuse,
-/area/surface/outside/wilderness/normal)
+/area/surface/outpost/shelter/exterior)
 "dO" = (
 /obj/machinery/light{
 	dir = 8
@@ -558,12 +567,53 @@
 /turf/simulated/floor/plating,
 /area/surface/outpost/shelter/utilityroom)
 "hX" = (
-/obj/effect/overmap/visitable/planet/Sif,
-/turf/simulated/mineral/sif,
-/area/surface/outside/wilderness/mountains)
+/obj/effect/zone_divider,
+/obj/item/stack/marker_beacon,
+/turf/simulated/floor/outdoors/grass/sif/planetuse{
+	tree_chance = 0
+	},
+/area/surface/outpost/shelter/exterior)
+"iB" = (
+/turf/simulated/floor/outdoors/grass/sif/planetuse{
+	tree_chance = 0
+	},
+/area/surface/outpost/shelter/exterior)
+"jf" = (
+/obj/effect/shuttle_landmark{
+	landmark_tag = "wilderness_s";
+	name = "Wilderness Shelter";
+	base_area = /area/surface/outpost/shelter/exterior;
+	base_turf = /turf/simulated/floor/outdoors/grass/sif/planetuse
+	},
+/turf/simulated/floor/outdoors/grass/sif/planetuse{
+	tree_chance = 0
+	},
+/area/surface/outpost/shelter/exterior)
+"ji" = (
+/obj/effect/zone_divider,
+/turf/simulated/floor/outdoors/grass/sif/planetuse{
+	tree_chance = 0
+	},
+/area/surface/outpost/shelter/exterior)
+"kd" = (
+/turf/simulated/floor/outdoors/grass/sif/forest/planetuse{
+	tree_chance = 0
+	},
+/area/surface/outside/wilderness/deep)
 "kh" = (
 /turf/simulated/wall/solidrock,
 /area/surface/outside/wilderness/normal)
+"kU" = (
+/obj/effect/shuttle_landmark{
+	landmark_tag = "wilderness_se";
+	name = "Southeast of Wilderness";
+	base_area = /area/surface/outside/wilderness/normal;
+	base_turf = /turf/simulated/floor/outdoors/grass/sif/planetuse
+	},
+/turf/simulated/floor/outdoors/grass/sif/planetuse{
+	tree_chance = 0
+	},
+/area/surface/outside/wilderness/normal)
 "kZ" = (
 /obj/effect/zone_divider,
 /obj/effect/zone_divider,
@@ -607,6 +657,10 @@
 /obj/structure/railing/grey,
 /turf/simulated/floor/outdoors/grass/sif/planetuse,
 /area/surface/outpost/shelter/exterior)
+"nA" = (
+/obj/item/stack/marker_beacon,
+/turf/simulated/floor/outdoors/dirt/sif/planetuse,
+/area/surface/outpost/shelter/exterior)
 "nN" = (
 /turf/simulated/wall/rsifwood,
 /area/surface/outside/wilderness/mountains)
@@ -660,6 +714,11 @@
 /obj/structure/railing,
 /turf/simulated/floor/water/deep,
 /area/surface/outside/river/svartan)
+"sR" = (
+/obj/effect/zone_divider,
+/obj/item/stack/marker_beacon,
+/turf/simulated/floor/outdoors/grass/sif/planetuse,
+/area/surface/outpost/shelter/exterior)
 "td" = (
 /obj/structure/curtain/medical{
 	name = "medical curtain"
@@ -719,6 +778,10 @@
 /obj/effect/zone_divider,
 /turf/simulated/floor/water,
 /area/surface/outside/ocean)
+"vz" = (
+/obj/effect/zone_divider,
+/turf/simulated/floor/outdoors/grass/sif/planetuse,
+/area/surface/outpost/shelter/exterior)
 "wg" = (
 /obj/machinery/light,
 /turf/simulated/floor/outdoors/dirt/sif/planetuse,
@@ -759,6 +822,12 @@
 	},
 /turf/simulated/floor/outdoors/dirt/sif/planetuse,
 /area/surface/outpost/shelter/exterior)
+"yL" = (
+/obj/item/stack/marker_beacon,
+/turf/simulated/floor/outdoors/grass/sif/planetuse{
+	tree_chance = 0
+	},
+/area/surface/outpost/shelter/exterior)
 "zb" = (
 /obj/structure/table/rack,
 /obj/fiftyspawner/glass,
@@ -846,6 +915,20 @@
 /obj/structure/reagent_dispensers/fueltank/high,
 /turf/simulated/floor/plating,
 /area/surface/outpost/shelter/utilityroom)
+"GG" = (
+/obj/machinery/light,
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	frequency = 1380;
+	id_tag = "om_wilderness";
+	name = "shuttle bay controller";
+	pixel_y = -29
+	},
+/turf/simulated/floor/outdoors/dirt/sif/planetuse,
+/area/surface/outpost/shelter/exterior)
+"Iw" = (
+/obj/effect/zone_divider,
+/turf/simulated/floor/outdoors/dirt/sif/planetuse,
+/area/surface/outpost/shelter/exterior)
 "IA" = (
 /obj/structure/curtain/medical{
 	name = "medical curtain"
@@ -950,6 +1033,12 @@
 	},
 /turf/simulated/floor/wood/sif,
 /area/surface/outpost/shelter)
+"Rq" = (
+/obj/effect/zone_divider,
+/turf/simulated/floor/outdoors/grass/sif/forest/planetuse{
+	tree_chance = 0
+	},
+/area/surface/outside/wilderness/deep)
 "Rr" = (
 /obj/structure/table/sifwooden_reinforced,
 /obj/item/stack/material/log/sif{
@@ -1033,6 +1122,16 @@
 /obj/item/device/radio/off,
 /turf/simulated/floor/plating,
 /area/surface/outpost/shelter/utilityroom)
+"Us" = (
+/obj/effect/zone_divider,
+/obj/effect/shuttle_landmark/automatic/clearing{
+	name = "Northwest Outpost Perimiter";
+	base_area = /area/surface/outside/plains/normal;
+	base_turf = /turf/simulated/floor/outdoors/grass/sif/planetuse;
+	landmark_tag = "outpost_nw"
+	},
+/turf/simulated/floor/outdoors/dirt/sif/planetuse,
+/area/surface/outside/wilderness/normal)
 "Wo" = (
 /obj/effect/floor_decal/borderfloorwhite{
 	dir = 1
@@ -1080,6 +1179,17 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/surface/outpost/shelter)
+"WL" = (
+/obj/effect/shuttle_landmark{
+	landmark_tag = "wilderness_w";
+	name = "West of Wilderness";
+	base_area = /area/surface/outside/wilderness/deep;
+	base_turf = /turf/simulated/floor/outdoors/grass/sif/planetuse
+	},
+/turf/simulated/floor/outdoors/grass/sif/forest/planetuse{
+	tree_chance = 0
+	},
+/area/surface/outside/wilderness/deep)
 "Xn" = (
 /obj/structure/table/rack,
 /obj/fiftyspawner/steel,
@@ -1091,6 +1201,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/surface/outpost/shelter/utilityroom)
+"Xw" = (
+/obj/item/stack/marker_beacon,
+/turf/simulated/floor/outdoors/grass/sif/planetuse,
+/area/surface/outpost/shelter/exterior)
 "XD" = (
 /turf/simulated/wall/solidrock,
 /area/surface/outside/wilderness/deep)
@@ -1111,6 +1225,17 @@
 "Za" = (
 /turf/simulated/mineral/sif,
 /area/surface/outside/wilderness/deep)
+"Zs" = (
+/obj/effect/shuttle_landmark{
+	landmark_tag = "wilderness_n";
+	name = "North of Wilderness";
+	base_area = /area/surface/outside/wilderness/deep;
+	base_turf = /turf/simulated/floor/outdoors/grass/sif/planetuse
+	},
+/turf/simulated/floor/outdoors/grass/sif/forest/planetuse{
+	tree_chance = 0
+	},
+/area/surface/outside/wilderness/deep)
 "Zt" = (
 /obj/structure/table/sifwooden_reinforced,
 /obj/item/weapon/storage/belt/utility,
@@ -1144,6 +1269,9 @@
 /obj/effect/zone_divider,
 /turf/simulated/wall/wood,
 /area/surface/outside/path/wilderness)
+"ZU" = (
+/turf/simulated/floor/outdoors/grass/sif/planetuse,
+/area/shuttle/shuttle3/mining)
 
 (1,1,1) = {"
 ab
@@ -1658,7 +1786,7 @@ ac
 ac
 ac
 ac
-hX
+ac
 ab
 "}
 (3,1,1) = {"
@@ -4100,22 +4228,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 am
 am
@@ -4358,22 +4486,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 am
 am
@@ -4616,22 +4744,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 am
 am
@@ -4874,22 +5002,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 am
 am
@@ -5132,22 +5260,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 am
 am
@@ -5390,22 +5518,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 am
@@ -5648,22 +5776,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 am
@@ -5906,22 +6034,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 am
@@ -6164,22 +6292,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 am
@@ -6422,22 +6550,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 am
@@ -6680,22 +6808,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+WL
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 am
@@ -6938,22 +7066,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 am
@@ -7196,22 +7324,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 am
@@ -7454,22 +7582,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 ae
@@ -7712,22 +7840,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 ae
@@ -7970,22 +8098,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 ae
@@ -8228,22 +8356,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 ae
@@ -8486,22 +8614,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 ae
@@ -8744,22 +8872,22 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
+kd
 ae
 ae
 ae
@@ -29025,11 +29153,11 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
 ah
 ah
 ah
@@ -29283,26 +29411,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
-ae
+kd
+kd
+kd
+kd
+kd
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -29541,26 +29669,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
+kd
+kd
+kd
+kd
 ah
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -29799,26 +29927,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
+kd
+kd
+kd
+kd
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -30057,26 +30185,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
+kd
+kd
+kd
 ah
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -30315,26 +30443,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
+kd
+kd
+kd
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -30573,26 +30701,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
+kd
+kd
+kd
 ah
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -30831,26 +30959,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
+kd
+kd
+kd
+kd
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -31089,26 +31217,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
+kd
+kd
+kd
 ah
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+Zs
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -31347,26 +31475,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
+kd
+kd
+kd
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -31605,26 +31733,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
+kd
+kd
+kd
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -31863,26 +31991,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
+kd
+kd
+kd
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -32121,26 +32249,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
+kd
+kd
+kd
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -32379,26 +32507,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
+kd
+kd
+kd
 ai
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -32637,26 +32765,26 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
+kd
+kd
+kd
 ai
 ah
 ah
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ag
-ae
-ae
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+kd
+Rq
+kd
+kd
 ae
 ae
 ae
@@ -32895,13 +33023,13 @@ ae
 ae
 ae
 ae
-ae
-ae
-ae
-ae
+kd
+kd
+kd
+kd
 ah
 ah
-ae
+kd
 ae
 ae
 ae
@@ -40586,7 +40714,7 @@ aG
 aG
 aV
 ap
-St
+Us
 ap
 aV
 aV
@@ -42393,22 +42521,22 @@ aH
 aH
 aH
 dd
-tO
-tO
-tO
-tO
-tO
-tO
-tO
-St
-tO
-tO
-St
-tO
-tO
-tO
-tO
-tO
+ji
+ji
+ji
+ji
+hX
+ji
+ji
+Iw
+ji
+hX
+Iw
+ji
+ji
+ji
+ji
+hX
 tO
 tO
 qr
@@ -42650,23 +42778,23 @@ aG
 aG
 aG
 aG
-tO
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-ap
-ap
-aV
-aV
-aV
-aV
+ji
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+aT
+aT
+iB
+iB
+iB
+iB
 aV
 aV
 aV
@@ -42908,23 +43036,23 @@ aG
 aG
 aG
 aG
-tO
-aV
-aV
-aV
-ap
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
+ji
+iB
+iB
+iB
+aT
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+iB
 aV
 aV
 aW
@@ -43166,23 +43294,23 @@ aG
 aG
 aG
 aG
-tO
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-ap
-ap
-ap
-aV
-aV
-aV
+ji
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+aT
+aT
+aT
+iB
+iB
+iB
 aV
 aV
 aW
@@ -43424,27 +43552,27 @@ aG
 aG
 aG
 aG
-tO
-aV
-aV
-aV
-aV
-aV
-aV
-ap
-ap
-aV
-aV
-ap
-ap
-aV
-aV
-ap
-ap
+ji
+iB
+iB
+iB
+iB
+iB
+iB
+aT
+aT
+iB
+iB
+aT
+aT
+iB
+iB
+aT
+aT
 aV
 aV
 aW
-wg
+GG
 ba
 ba
 Dk
@@ -43682,23 +43810,23 @@ aG
 aG
 aG
 aG
-tO
-aV
-aV
-ap
-aV
-aV
-ap
-ap
-ap
-ap
-aV
-aV
-ap
-aV
-ap
-ap
-aV
+ji
+iB
+iB
+aT
+iB
+iB
+aT
+aT
+aT
+aT
+iB
+iB
+aT
+iB
+aT
+aT
+iB
 aV
 aV
 aW
@@ -43940,23 +44068,23 @@ aG
 aG
 aG
 aG
-tO
-aV
-aV
-ap
-ap
-aV
-aV
-ap
-ap
-ap
-aV
-aV
-aV
-aV
-ap
-aV
-aW
+hX
+iB
+iB
+aT
+aT
+iB
+iB
+aT
+aT
+aT
+iB
+iB
+iB
+iB
+aT
+iB
+nA
 aV
 aV
 aW
@@ -44198,23 +44326,23 @@ aG
 aG
 aG
 aG
-tO
-aV
-aV
-ap
-ap
-ap
-aV
-aV
-ap
-ap
-ap
-aV
-aV
-ap
-ap
-aV
-aV
+ji
+iB
+iB
+aT
+aT
+aT
+iB
+iB
+aT
+aT
+aT
+iB
+iB
+aT
+aT
+iB
+iB
 aW
 aW
 aW
@@ -44456,23 +44584,23 @@ aG
 aG
 aG
 aG
-St
-aV
-aV
-ap
-ap
-aV
-ap
-aV
-ap
-ap
-ap
-aV
-aV
-ap
-ap
-aV
-aV
+Iw
+iB
+iB
+aT
+aT
+iB
+aT
+iB
+aT
+aT
+aT
+iB
+iB
+aT
+aT
+iB
+iB
 aW
 aW
 aW
@@ -44714,23 +44842,23 @@ aG
 aG
 aG
 aG
-tO
-aV
-aV
-ap
-aV
-aV
-ap
-aV
-aV
-ap
-aV
-aV
-aV
-aV
-ap
-ap
-aV
+hX
+iB
+iB
+aT
+iB
+iB
+aT
+iB
+iB
+aT
+iB
+iB
+iB
+iB
+aT
+aT
+yL
 aV
 aW
 aW
@@ -44972,23 +45100,23 @@ aG
 aG
 aG
 aG
-tO
-aV
-aV
-aV
-aV
-ap
-ap
-ap
-aV
-aV
-aV
-ap
-ap
-aV
-aV
-ap
-ap
+ji
+iB
+iB
+iB
+iB
+aT
+aT
+aT
+iB
+iB
+iB
+aT
+aT
+iB
+iB
+aT
+aT
 aV
 aV
 aV
@@ -45230,23 +45358,23 @@ aG
 aG
 aG
 aG
-tO
-aV
-aV
-aV
-aV
-aG
-aG
-aV
-aV
-aV
-aV
-ap
-ap
-ap
-aV
-ap
-ap
+ji
+iB
+iB
+iB
+iB
+bz
+bz
+iB
+iB
+iB
+iB
+aT
+aT
+aT
+iB
+aT
+aT
 aV
 aV
 aV
@@ -45488,23 +45616,23 @@ aG
 aG
 aG
 aG
-aH
-aV
-aV
-aV
-aV
-aG
-aG
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
+vz
+iB
+iB
+iB
+iB
+bz
+bz
+iB
+iB
+iB
+iB
+iB
+iB
+jf
+iB
+iB
+iB
 aV
 aV
 aV
@@ -45746,23 +45874,23 @@ aG
 aG
 aG
 aG
-aH
-aG
-aG
-ap
-aV
-aV
-aV
-ap
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
-aV
+vz
+bz
+bz
+aT
+iB
+iB
+iB
+aT
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+iB
+iB
 aV
 aV
 aV
@@ -46004,23 +46132,23 @@ aG
 aG
 aG
 aG
-aH
-aG
-aG
-aG
-aV
-aV
-aV
-ap
-ap
-aV
-ap
-aV
-aV
-ap
-aV
-aV
-aV
+vz
+bz
+bz
+bz
+iB
+iB
+iB
+aT
+aT
+iB
+aT
+iB
+iB
+aT
+iB
+iB
+iB
 aV
 aV
 aV
@@ -46262,23 +46390,23 @@ aG
 aG
 aG
 aG
-aH
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aV
-ap
-aV
-aV
-aV
-ap
-aV
-aV
+sR
+bz
+bz
+bz
+bz
+Xw
+bz
+bz
+bz
+iB
+nA
+iB
+iB
+iB
+aT
+iB
+yL
 aV
 aV
 aV
@@ -52477,7 +52605,7 @@ aG
 aG
 aW
 aW
-aG
+ZU
 aG
 aG
 aG
@@ -53230,22 +53358,22 @@ aG
 aG
 aH
 aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
 aG
 aG
 aG
@@ -53488,22 +53616,22 @@ aG
 aG
 aH
 aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
 aG
 aG
 aG
@@ -53746,22 +53874,22 @@ aG
 aG
 aH
 aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
 aG
 aG
 aG
@@ -54004,22 +54132,22 @@ aG
 aG
 aH
 aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
 aG
 aG
 aW
@@ -54262,22 +54390,22 @@ aG
 aG
 aH
 aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
 aG
 aG
 aW
@@ -54520,22 +54648,22 @@ aG
 aG
 aH
 aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
 aG
 aG
 aW
@@ -54778,22 +54906,22 @@ aG
 aG
 aH
 aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
 aG
 aG
 aW
@@ -55036,22 +55164,22 @@ aG
 aG
 aH
 aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
 aG
 aG
 aW
@@ -55294,22 +55422,22 @@ aG
 aG
 aH
 aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
 aG
 aG
 aW
@@ -55552,22 +55680,22 @@ aG
 aG
 aH
 aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
 aG
 aG
 aW
@@ -55810,22 +55938,22 @@ aG
 aG
 aH
 aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
 aG
 aW
 aW
@@ -56068,22 +56196,22 @@ aG
 aG
 aH
 aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+kU
+aV
+aV
+aV
+aV
+aV
+aV
+aV
 aG
 aW
 aW
@@ -56326,22 +56454,22 @@ aG
 aG
 St
 ap
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
 ap
 ap
 ap
 ap
-aG
-aG
-aG
-aG
-aG
-aG
-aG
+aV
+aV
+aV
+aV
+aV
+aV
+aV
 aG
 aW
 aW
diff --git a/maps/southern_cross/southern_cross-12.dmm b/maps/southern_cross/southern_cross-12.dmm
index 104634c937..cadc9a1f13 100644
--- a/maps/southern_cross/southern_cross-12.dmm
+++ b/maps/southern_cross/southern_cross-12.dmm
@@ -935,10 +935,6 @@
 /obj/structure/flora/smallbould,
 /turf/simulated/floor/water,
 /area/surface/outside/wilderness/skylands)
-"vo" = (
-/obj/effect/overmap/visitable/planet/Sif,
-/turf/simulated/mineral/sif,
-/area/surface/outside/wilderness/skylands)
 "vp" = (
 /obj/structure/outcrop,
 /turf/simulated/floor/outdoors/dirt,
@@ -2803,7 +2799,7 @@ bj
 bj
 bj
 bj
-vo
+bj
 aE
 "}
 (3,1,1) = {"
diff --git a/maps/southern_cross/southern_cross-13.dmm b/maps/southern_cross/southern_cross-13.dmm
index b7f02a937a..b416ebcaac 100644
--- a/maps/southern_cross/southern_cross-13.dmm
+++ b/maps/southern_cross/southern_cross-13.dmm
@@ -4,10 +4,6 @@
 /obj/effect/zone_divider,
 /turf/simulated/mineral/sif,
 /area/surface/outside/valley/walls)
-"aL" = (
-/obj/effect/overmap/visitable/planet/Sif,
-/turf/simulated/mineral/sif,
-/area/surface/outside/valley/edge)
 "bH" = (
 /obj/structure/railing,
 /turf/simulated/floor/water/deep,
@@ -252,6 +248,15 @@
 "WT" = (
 /turf/simulated/wall/wood,
 /area/surface/outside/valley/inner)
+"Xj" = (
+/obj/effect/shuttle_landmark{
+	landmark_tag = "valley_e";
+	name = "Valley Entrance";
+	base_area = /area/surface/outside/valley/inner;
+	base_turf = /turf/simulated/floor/outdoors/grass/sif/planetuse
+	},
+/turf/simulated/floor/outdoors/grass/sif/forest/planetuse,
+/area/surface/outside/valley/inner)
 "Yl" = (
 /turf/simulated/mineral/sif,
 /area/surface/outside/valley/inner)
@@ -776,7 +781,7 @@ FG
 FG
 FG
 FG
-aL
+FG
 RW
 "}
 (3,1,1) = {"
@@ -62811,7 +62816,7 @@ Rk
 Rk
 Rk
 Rk
-Rk
+Xj
 Rk
 Rk
 Rk
diff --git a/maps/southern_cross/southern_cross-5.dmm b/maps/southern_cross/southern_cross-5.dmm
index 3781263b4d..002349c032 100644
--- a/maps/southern_cross/southern_cross-5.dmm
+++ b/maps/southern_cross/southern_cross-5.dmm
@@ -2650,7 +2650,7 @@
 "ff" = (
 /obj/effect/shuttle_landmark{
 	base_area = /area/surface/outside/plains/normal;
-	base_turf = /turf/simulated/floor/outdoors/snow/sif/planetuse;
+	base_turf = /turf/simulated/floor/outdoors/grass/sif/planetuse;
 	landmark_tag = "outpost_nw";
 	name = "Northwest Outpost Perimiter"
 	},
@@ -13779,6 +13779,17 @@
 	},
 /turf/simulated/floor/tiled,
 /area/surface/outpost/main/airlock/left_three)
+"zp" = (
+/obj/effect/shuttle_landmark{
+	base_area = /area/surface/outside/plains/normal;
+	base_turf = /turf/simulated/floor/outdoors/grass/sif/planetuse;
+	landmark_tag = "outpost_w";
+	name = "West Outpost Perimiter"
+	},
+/turf/simulated/floor/outdoors/grass/sif/planetuse{
+	tree_chance = 0
+	},
+/area/surface/outside/plains/normal)
 "zq" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -13906,7 +13917,9 @@
 	landmark_tag = "outpost_s";
 	name = "South of Outpost"
 	},
-/turf/simulated/floor/outdoors/grass/sif/planetuse,
+/turf/simulated/floor/outdoors/grass/sif/planetuse{
+	tree_chance = 0
+	},
 /area/surface/outside/plains/normal)
 "zD" = (
 /obj/machinery/door/firedoor/border_only,
@@ -26705,6 +26718,11 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/steel_grid,
 /area/surface/outpost/main/janitor)
+"XT" = (
+/turf/simulated/floor/outdoors/grass/sif/planetuse{
+	tree_chance = 0
+	},
+/area/surface/outside/plains/normal)
 "XU" = (
 /obj/effect/floor_decal/borderfloor/corner,
 /obj/effect/floor_decal/corner/white/bordercorner,
@@ -34327,7 +34345,7 @@ zw
 zw
 zw
 zw
-ff
+zw
 zw
 zw
 zw
@@ -35463,21 +35481,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -35721,21 +35739,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -35979,21 +35997,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -36237,21 +36255,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -36397,7 +36415,7 @@ zw
 zw
 zw
 zw
-zw
+ff
 zw
 zw
 zw
@@ -36495,21 +36513,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -36753,22 +36771,22 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -37011,21 +37029,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -37269,21 +37287,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+zp
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -37527,21 +37545,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -37785,21 +37803,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -38043,21 +38061,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -38301,21 +38319,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -38559,21 +38577,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 Ey
 yT
 yT
@@ -38817,21 +38835,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 Ey
 yT
 yT
@@ -39075,21 +39093,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 Ey
 yT
 yT
@@ -39333,21 +39351,21 @@ Ey
 Ey
 Ey
 Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 Ey
 yT
 yT
@@ -67006,10 +67024,10 @@ yT
 yT
 yT
 yT
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -67263,11 +67281,11 @@ yT
 yT
 yT
 yT
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -67519,13 +67537,13 @@ yT
 yT
 yT
 yT
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 Ey
 yT
 yT
@@ -67776,15 +67794,15 @@ yT
 yT
 yT
 yT
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -68034,16 +68052,16 @@ yT
 yT
 yT
 yT
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -68293,15 +68311,15 @@ yT
 yT
 yT
 yT
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -68551,15 +68569,15 @@ yT
 yT
 yT
 yT
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -68810,14 +68828,14 @@ yT
 yT
 yT
 yT
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -69068,14 +69086,14 @@ yT
 yT
 yT
 yT
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -69328,12 +69346,12 @@ yT
 yT
 yT
 yT
-Ey
-Ey
-Ey
-Ey
-Ey
-Ey
+XT
+XT
+XT
+XT
+XT
+XT
 yT
 yT
 yT
@@ -69586,10 +69604,10 @@ yT
 yT
 yT
 yT
-Ey
+XT
 zC
-Ey
-Ey
+XT
+XT
 yT
 yT
 yT
diff --git a/maps/southern_cross/southern_cross-7.dmm b/maps/southern_cross/southern_cross-7.dmm
index c29d1fb3eb..d47f3bc0ab 100644
--- a/maps/southern_cross/southern_cross-7.dmm
+++ b/maps/southern_cross/southern_cross-7.dmm
@@ -17259,7 +17259,12 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/wall/rshull,
+/obj/machinery/door/airlock/voidcraft/vertical{
+	frequency = 1380;
+	id_tag = "echidna_inner";
+	name = "External Access"
+	},
+/turf/simulated/floor,
 /area/shuttle/echidna)
 "nuL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -21959,7 +21964,12 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/yellow,
-/turf/simulated/wall/rshull,
+/obj/machinery/door/airlock/voidcraft/vertical{
+	frequency = 1380;
+	id_tag = "echidna_outer";
+	name = "External Access"
+	},
+/turf/simulated/floor,
 /area/shuttle/echidna)
 "rdq" = (
 /obj/machinery/light/small{
diff --git a/maps/southern_cross/southern_cross_areas.dm b/maps/southern_cross/southern_cross_areas.dm
index b2119db440..81b4c9c518 100644
--- a/maps/southern_cross/southern_cross_areas.dm
+++ b/maps/southern_cross/southern_cross_areas.dm
@@ -2195,6 +2195,9 @@ End Chompstation Edit*/
 	icon_state = "storage"
 	ambience = AMBIENCE_RUINS
 
+/area/shuttle/overmap/sif
+	name = "wilderness site"
+	icon_state = "shuttlered"
 
 //Temp Removal TFF 15/2/20
 /*
diff --git a/modular_chomp/icons/obj/overmap.dmi b/modular_chomp/icons/obj/overmap.dmi
new file mode 100644
index 0000000000..f95557917d
Binary files /dev/null and b/modular_chomp/icons/obj/overmap.dmi differ