diff --git a/maps/tether/submaps/space/_guttersite.dm b/maps/tether/submaps/space/_guttersite.dm
index e77038a885..655c067f26 100644
--- a/maps/tether/submaps/space/_guttersite.dm
+++ b/maps/tether/submaps/space/_guttersite.dm
@@ -9,7 +9,7 @@
 	icon_state = "guttersite"
 	known = FALSE
 	color = "#ee3333" //Redish, so it stands out against the other debris-like icons
-	initial_generic_waypoints = list("guttersite_lshuttle", "guttersite_sshuttle")
+	initial_generic_waypoints = list("guttersite_lshuttle", "guttersite_sshuttle", "guttersite_mshuttle")
 
 // -- Objs -- //
 /obj/effect/shuttle_landmark/premade/guttersite/sshuttle
@@ -20,6 +20,9 @@
 	name = "Gutter - Large Shuttle"
 	landmark_tag = "guttersite_lshuttle"
 
+/obj/effect/shuttle_landmark/premade/guttersite/mshuttle
+	name = "Gutter - Medi Shuttle"
+	landmark_tag = "guttersite_mshuttle"
 
 //This does nothing right now, but is framework if we do POIs for this place
 /obj/away_mission_init/guttersite
diff --git a/maps/tether/submaps/space/guttersite.dmm b/maps/tether/submaps/space/guttersite.dmm
index 5caf17bfde..e9e6bded61 100644
--- a/maps/tether/submaps/space/guttersite.dmm
+++ b/maps/tether/submaps/space/guttersite.dmm
@@ -3483,7 +3483,7 @@
 /turf/simulated/floor/tiled/eris/dark/gray_perforated,
 /area/tether_away/guttersite/docking)
 "hI" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden,
 /turf/simulated/floor/tiled/eris/dark/gray_perforated,
 /area/tether_away/guttersite/docking)
 "hJ" = (
@@ -5628,6 +5628,149 @@
 /mob/living/simple_mob/mobs_monsters/clowns/big/tunnelclown,
 /turf/simulated/mineral/floor/vacuum,
 /area/tether_away/guttersite/unexplored)
+"nA" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/tether_away/guttersite/docking)
+"nB" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4;
+	icon_state = "intact-scrubbers"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 5;
+	icon_state = "intact"
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/tether_away/guttersite/docking)
+"nC" = (
+/obj/effect/map_helper/airlock/door/int_door,
+/obj/machinery/door/airlock/glass_external{
+	req_one_access = list(15)
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/tether_away/guttersite/docking)
+"nD" = (
+/obj/machinery/access_button{
+	command = "cycle_interior";
+	frequency = 1990;
+	master_tag = "guttersite_mshuttle";
+	name = "interior access button";
+	pixel_x = -28;
+	pixel_y = -26;
+	req_one_access = list()
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/tether_away/guttersite/docking)
+"nE" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4;
+	icon_state = "intact-scrubbers"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/tether_away/guttersite/docking)
+"nF" = (
+/obj/machinery/embedded_controller/radio/airlock/docking_port{
+	frequency = 1990;
+	id_tag = "guttersite_mshuttle";
+	name = "Airlock controller";
+	pixel_x = -25;
+	pixel_y = 0
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/tether_away/guttersite/docking)
+"nG" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4;
+	icon_state = "intact-scrubbers"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 10;
+	icon_state = "intact"
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/tether_away/guttersite/docking)
+"nH" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/tether_away/guttersite/docking)
+"nI" = (
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+	dir = 4;
+	frequency = 1990;
+	id_tag = "guttersite_mshuttle_pump"
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/tether_away/guttersite/docking)
+"nJ" = (
+/obj/machinery/airlock_sensor{
+	frequency = 1990;
+	id_tag = "guttersite_mshuttle_sensor";
+	pixel_x = 0;
+	pixel_y = -25
+	},
+/obj/effect/map_helper/airlock/sensor/chamber_sensor,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/tether_away/guttersite/docking)
+"nK" = (
+/obj/effect/map_helper/airlock/door/ext_door,
+/obj/machinery/door/airlock/glass_external{
+	req_one_access = list(15)
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/tether_away/guttersite/docking)
+"nL" = (
+/obj/structure/grille,
+/obj/machinery/door/firedoor/glass,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+	dir = 8;
+	icon_state = "rwindow"
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced,
+/turf/simulated/floor/tiled/eris/dark/gray_perforated,
+/area/tether_away/guttersite/docking)
+"nM" = (
+/obj/machinery/access_button{
+	command = "cycle_exterior";
+	frequency = 1990;
+	master_tag = "guttersite_mshuttle";
+	name = "exterior access button";
+	pixel_x = 26;
+	pixel_y = 26;
+	req_one_access = list()
+	},
+/turf/simulated/floor/plating/eris/under/airless,
+/area/tether_away/guttersite/docking)
+"nN" = (
+/obj/effect/shuttle_landmark/premade/guttersite/mshuttle,
+/turf/space,
+/area/space)
 "Ob" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -21259,14 +21402,14 @@ mC
 lz
 hx
 hI
-hO
+nB
 fr
-mG
-eE
-eE
-eE
-eE
-eE
+gu
+iP
+iP
+iP
+iP
+nL
 eE
 eE
 eE
@@ -21401,16 +21544,16 @@ mC
 fr
 hy
 hJ
-hO
+nE
 fr
-mG
-eE
-eE
-eE
-eE
-eE
-eE
+mL
+gu
+nI
+nF
+nK
+nM
 eE
+nN
 eE
 eE
 eE
@@ -21540,17 +21683,17 @@ eE
 eE
 eE
 mC
-fr
+nA
 hz
 hJ
-hO
-fr
-mG
-eE
-eE
-eE
-eE
-eE
+nG
+nH
+nD
+nC
+hM
+nJ
+gu
+QN
 eE
 eE
 eE
@@ -21682,17 +21825,17 @@ eE
 eE
 eE
 mC
-fr
+nA
 hA
 hJ
 hO
 fr
-mG
-eE
-eE
-eE
-eE
-eE
+gu
+iO
+iO
+iO
+iO
+nL
 eE
 eE
 eE