diff --git a/_maps/map_files/NSV_Triumph/triumph-03-deck3.dmm b/_maps/map_files/NSV_Triumph/triumph-03-deck3.dmm
index 7ab0746d378..3e5b469fbb7 100644
--- a/_maps/map_files/NSV_Triumph/triumph-03-deck3.dmm
+++ b/_maps/map_files/NSV_Triumph/triumph-03-deck3.dmm
@@ -715,6 +715,15 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/ward)
+"cc" = (
+/obj/structure/sign/directions/cryo{
+	pixel_y = -24
+	},
+/obj/structure/sign/directions/cargo{
+	pixel_y = -30
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/primary/aft)
 "cd" = (
 /obj/machinery/light{
 	dir = 1
@@ -1192,18 +1201,16 @@
 /turf/simulated/floor/tiled,
 /area/rnd/research/testingrange)
 "dm" = (
+/obj/machinery/atmospherics/valve/digital{
+	dir = 4
+	},
 /obj/structure/cable/green{
-	d2 = 4;
-	icon_state = "0-4"
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
 	},
-/obj/machinery/power/apc{
-	cell_type = /obj/item/cell/super;
-	dir = 8;
-	name = "west bump";
-	pixel_x = -30
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/substation/medical)
+/turf/simulated/floor/tiled,
+/area/rnd/anomaly_lab)
 "do" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -2019,6 +2026,22 @@
 	},
 /turf/simulated/floor/tiled,
 /area/rnd/test_area)
+"fu" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/power/apc{
+	cell_type = /obj/item/cell/super;
+	dir = 8;
+	name = "west bump";
+	pixel_x = -30
+	},
+/obj/structure/cable/green{
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/substation/medical)
 "fv" = (
 /obj/structure/toilet{
 	pixel_y = 10
@@ -3063,6 +3086,16 @@
 /obj/machinery/atmospherics/valve/digital{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
 "ih" = (
@@ -5213,6 +5246,19 @@
 /obj/item/bodybag/cryobag,
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery_storage)
+"nV" = (
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/substation/medical)
 "nW" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -7218,6 +7264,11 @@
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
 "th" = (
@@ -8488,6 +8539,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
 "wD" = (
@@ -11824,12 +11880,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/obj/structure/sign/directions/cryo{
-	pixel_y = -24
-	},
-/obj/structure/sign/directions/cargo{
-	pixel_y = -30
-	},
+/obj/structure/railing,
 /turf/simulated/floor/tiled,
 /area/triumph/station/stairs_three)
 "EJ" = (
@@ -12926,7 +12977,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/turf/simulated/floor/bluegrid/airless,
+/obj/structure/plasticflaps,
+/turf/simulated/floor/reinforced,
 /area/rnd/xenobiology)
 "HA" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -14840,6 +14892,7 @@
 	name = "south bump";
 	pixel_y = -28
 	},
+/obj/structure/cable/green,
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
 "ML" = (
@@ -15598,6 +15651,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery_hallway)
+"OB" = (
+/obj/structure/railing,
+/turf/simulated/floor/tiled,
+/area/triumph/station/stairs_three)
 "OD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -15655,6 +15712,11 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
 "OO" = (
@@ -16071,6 +16133,11 @@
 "PU" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
 "PV" = (
@@ -17718,8 +17785,11 @@
 /turf/simulated/wall,
 /area/maintenance/medbay)
 "TX" = (
-/turf/simulated/wall,
-/area/rnd/research)
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/research_foyer_auxiliary)
 "TY" = (
 /obj/machinery/camera/network/research{
 	dir = 4
@@ -18865,6 +18935,11 @@
 "WX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
 /area/rnd/anomaly_lab)
 "WY" = (
@@ -26893,9 +26968,9 @@ vd
 tB
 Yv
 EI
+vd
+vd
 lB
-vd
-vd
 Pw
 iw
 Fe
@@ -27034,10 +27109,10 @@ vd
 vd
 gl
 VU
-YY
+OB
+vd
+vd
 lB
-vd
-vd
 lB
 TW
 BO
@@ -27176,11 +27251,11 @@ fn
 Vs
 cr
 VG
-cr
+cc
 mx
 mx
 mx
-hK
+fu
 KW
 BO
 Bw
@@ -27321,8 +27396,8 @@ VG
 cr
 mx
 Qf
-dm
 zr
+nV
 QK
 BO
 lS
@@ -29279,7 +29354,7 @@ DJ
 Yz
 YO
 uw
-Yz
+TX
 Yz
 Ly
 Yz
@@ -30129,7 +30204,7 @@ TL
 Bu
 Lp
 WW
-ig
+dm
 RP
 DR
 ie
@@ -32420,7 +32495,7 @@ GS
 GS
 GS
 GS
-GS
+qK
 lR
 Hl
 DX
@@ -32562,7 +32637,7 @@ hC
 FE
 Ss
 pR
-GS
+qK
 wm
 Hl
 lR
@@ -32704,7 +32779,7 @@ oW
 Pl
 Pl
 DU
-GS
+qK
 NY
 LV
 gy
@@ -32846,7 +32921,7 @@ Kh
 mp
 mp
 pA
-GS
+qK
 lR
 Hl
 lR
@@ -32988,7 +33063,7 @@ TF
 ur
 NH
 Bp
-GS
+qK
 lR
 Hl
 lR
@@ -33130,7 +33205,7 @@ GS
 LJ
 GS
 yJ
-GS
+qK
 CD
 Hl
 lR
@@ -33272,7 +33347,7 @@ Bg
 qI
 mg
 Ro
-TX
+tq
 lR
 Hl
 lR
@@ -33414,7 +33489,7 @@ El
 ST
 Zi
 Nd
-TX
+tq
 lR
 Hl
 lR
@@ -33556,7 +33631,7 @@ Ey
 OR
 Lt
 oO
-TX
+tq
 np
 Hl
 DX
@@ -33698,7 +33773,7 @@ SL
 QV
 QQ
 AC
-TX
+tq
 lR
 Hl
 lR
diff --git a/_maps/tether.json b/_maps/tether.json
index 4611507bfb1..f2198ffcf7b 100644
--- a/_maps/tether.json
+++ b/_maps/tether.json
@@ -1,17 +1,12 @@
 {
-   "map_name":"Tether",
-   "map_path":"map_files/tether",
+   "map_name":"Triumph",
+   "map_path":"map_files/nsv_triumph",
    "map_file":[
-        "tether-01-surface1.dmm",
-        "tether-02-surface2.dmm",
-        "tether-03-surface3.dmm",
-        "tether-04-transit.dmm",
-        "tether-05-station1.dmm",
-        "tether-06-station2.dmm",
-        "tether-07-station3.dmm",
-        "tether-08-mining.dmm",
-        "tether-09-solars.dmm",
-        "tether-10-colony.dmm"
+        "triumph-01-deck1.dmm",
+        "triumph-02-deck2.dmm",
+        "triumph-03-deck3.dmm",
+        "triumph-04-deck4.dmm",
+        "triumph-05-flagship.dmm"
    ],
    "traits":[
       {
@@ -19,33 +14,11 @@
         "Station":true,
         "Linkage":null,
         "Gravity":true,
-        "Baseturf":"/turf/simulated/floor/outdoors/grass/sif/virgo3b"
+        "Baseturf":"/turf/space"
       },
       {
+        "Up":1,
         "Down":-1,
-        "Up":1,
-        "Station":true,
-        "Linkage":null,
-        "Gravity":true,
-        "Baseturf":"/turf/simulated/open/virgo3b"
-      },
-      {
-        "Down":-1,
-        "Station":true,
-        "Linkage":null,
-        "Gravity":true,
-        "Baseturf":"/turf/simulated/open/virgo3b"
-      },
-      {
-         "Down":-1,
-        "Up":1,
-         "Station":true,
-         "Linkage":null,
-         "Gravity":true,
-         "Baseturf":"/turf/simulated/sky/virgo3b"
-      },
-      {
-        "Up":1,
         "Station":true,
         "Linkage":null,
         "Gravity":true,
@@ -66,23 +39,11 @@
         "Gravity":true,
         "Baseturf":"/turf/space"
       },
-      {
-        "Mining":true,
-        "Linkage":null,
-        "Gravity":true,
-        "Baseturf":"/turf/simulated/floor/outdoors/grass/sif/virgo3b"
-      },
-      {
-        "Station":true,
-        "Linkage":null,
-        "Gravity":true,
-        "Baseturf":"/turf/simulated/floor/outdoors/grass/sif/virgo3b"
-      },
       {
         "Station":false,
         "Linkage":null,
         "Gravity":true,
-        "Baseturf":"/turf/simulated/floor/outdoors/grass/sif/virgo3b"
+        "Baseturf":"/turf/space"
       }
    ],
    "minetype":"none"
diff --git a/_maps/triumph.json b/_maps/triumph.json
deleted file mode 100644
index e4e9076bf03..00000000000
--- a/_maps/triumph.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-   "map_name":"Triumph",
-   "map_path":"map_files/triumph",
-   "map_file":[
-        "triumph-01-deck1.dmm",
-        "triumph-02-deck2.dmm",
-        "triumph-03-deck3.dmm",
-        "triumph-04-deck4.dmm",
-        "triumph-05-flagship.dmm",
-
-   ],
-   "traits":[
-      {
-        "Up":1,
-        "Station":true,
-        "Linkage":null,
-        "Gravity":true,
-        "Baseturf":"/turf/space"
-      },
-      {
-        "Up":1,
-        "Down":-1,
-        "Station":true,
-        "Linkage":null,
-        "Gravity":true,
-        "Baseturf":"/turf/space"
-      },
-      {
-        "Up":1,
-        "Down":-1,
-        "Station":true,
-        "Linkage":null,
-        "Gravity":true,
-        "Baseturf":"/turf/space"
-      },
-      {
-        "Down":-1,
-        "Station":true,
-        "Linkage":null,
-        "Gravity":true,
-        "Baseturf":"/turf/space"
-      },
-      {
-        "Station":false,
-        "Linkage":null,
-        "Gravity":true,
-        "Baseturf":"/turf/space"
-      }
-   ],
-   "minetype":"none"
-}
diff --git a/code/controllers/configuration_old/configuration.dm b/code/controllers/configuration_old/configuration.dm
index 65a825e27d6..88dda0a6400 100644
--- a/code/controllers/configuration_old/configuration.dm
+++ b/code/controllers/configuration_old/configuration.dm
@@ -164,7 +164,7 @@
 	var/use_loyalty_implants = 0
 
 	var/welder_vision = 1
-	var/generate_map = 0
+	var/generate_map = 1
 	var/no_click_cooldown = 0
 
 	//Used for modifying movement speed for mobs.
diff --git a/maps/nsv_triumph/submaps/_triumph_submaps.dm b/maps/nsv_triumph/submaps/_triumph_submaps.dm
index 74273f54d73..8ff869cdf8e 100644
--- a/maps/nsv_triumph/submaps/_triumph_submaps.dm
+++ b/maps/nsv_triumph/submaps/_triumph_submaps.dm
@@ -33,32 +33,28 @@
 /// Away Missions
 #if AWAY_MISSION_TEST
 #include "space/debrisfield.dmm"
-//#include "beach/beach.dmm"
-//#include "beach/cave.dmm"
-//#include "alienship/alienship.dmm"
-//#include "aerostat/aerostat.dmm"
-//#include "aerostat/surface.dmm"
 #endif
 
 #include "space/_debrisfield.dm"
-#include "space/pois/_templates.dm"
-#include "space/pois/debrisfield_things.dm"
+#include "space/_templates.dm"
+#include "space/debrisfield_things.dm"
 /datum/map_template/triumph_lateload/away_debrisfield
 	name = "Debris Field - Z1 Space"
 	desc = "A random debris field out in space."
 	mappath = 'space/debrisfield.dmm'
 	associated_map_datum = /datum/map_z_level/triumph_lateload/away_debrisfield
-
-/datum/map_template/triumph_lateload/away_debrisfield/on_map_loaded(z)
-	. = ..()
-	//Commented out until we actually get POIs
-	seed_submaps(list(Z_LEVEL_DEBRISFIELD), 200, /area/triumph_away/debrisfield/unexplored, /datum/map_template/debrisfield)
+	ztraits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_GRAVITY = FALSE)
 
 /datum/map_z_level/triumph_lateload/away_debrisfield
 	name = "Away Mission - Debris Field"
 	z = Z_LEVEL_DEBRISFIELD
 	base_turf = /turf/space
 
+
+/datum/map_template/triumph_lateload/away_debrisfield/on_map_loaded(z)
+	. = ..()
+	seed_submaps(list(Z_LEVEL_DEBRISFIELD), 200, /area/triumph_away/debrisfield/unexplored, /datum/map_template/debrisfield/)
+
 //////////////////////////////////////////////////////////////////////////////////////
 // Admin-use z-levels for loading whenever an admin feels like
 #if AWAY_MISSION_TEST
diff --git a/maps/nsv_triumph/submaps/space/_debrisfield.dm b/maps/nsv_triumph/submaps/space/_debrisfield.dm
index 27cc7fb17fb..f73b35945d3 100644
--- a/maps/nsv_triumph/submaps/space/_debrisfield.dm
+++ b/maps/nsv_triumph/submaps/space/_debrisfield.dm
@@ -40,7 +40,7 @@
 	teleport_y = y
 	teleport_z = z
 
-//This does nothing right now, but is framework if we do POIs for this place
+//POI Init
 /obj/away_mission_init/debrisfield
 	name = "away mission initializer - debrisfield"
 
diff --git a/maps/nsv_triumph/submaps/space/pois/_templates.dm b/maps/nsv_triumph/submaps/space/_templates.dm
similarity index 93%
rename from maps/nsv_triumph/submaps/space/pois/_templates.dm
rename to maps/nsv_triumph/submaps/space/_templates.dm
index 33fcab8398f..0bd7121f085 100644
--- a/maps/nsv_triumph/submaps/space/pois/_templates.dm
+++ b/maps/nsv_triumph/submaps/space/_templates.dm
@@ -1,48 +1,53 @@
 /datum/map_template/debrisfield
 	name = "Debris Field Content"
 	desc = "For seeding submaps in debris field"
-	allow_duplicates = TRUE
 
 /datum/map_template/debrisfield/asteroids1
 	name = "Asteroids 1"
 	mappath = 'asteroids1.dmm'
 	cost = 2
+	allow_duplicates = TRUE
 
 /datum/map_template/debrisfield/asteroids2
 	name = "Asteroids 2"
 	mappath = 'asteroids2.dmm'
 	cost = 2
+	allow_duplicates = TRUE
 
 /datum/map_template/debrisfield/asteroids3
 	name = "Asteroids 3"
 	mappath = 'asteroids3.dmm'
 	cost = 2
+	allow_duplicates = TRUE
 
 /datum/map_template/debrisfield/carp_asteroids1
 	name = "Carp Asteroids 1"
 	mappath = 'carp_asteroids1.dmm'
 	cost = 5
+	allow_duplicates = TRUE
 
 /datum/map_template/debrisfield/carp_asteroids2
 	name = "Carp Asteroids 2"
 	mappath = 'carp_asteroids2.dmm'
 	cost = 5
+	allow_duplicates = TRUE
 
 /datum/map_template/debrisfield/carp_asteroids3
 	name = "Carp Asteroids 3"
 	mappath = 'carp_asteroids3.dmm'
 	cost = 5
+	allow_duplicates = TRUE
 
 /datum/map_template/debrisfield/carp_asteroids4
 	name = "Carp Asteroids 4"
 	mappath = 'carp_asteroids4.dmm'
 	cost = 5
+	allow_duplicates = TRUE
 
 /datum/map_template/debrisfield/foodstand
 	name = "Food Stand"
 	mappath = 'foodstand.dmm'
 	cost = 20
-	allow_duplicates = FALSE
 
 /datum/map_template/debrisfield/debris1
 	name = "Debris 1"
@@ -78,29 +83,24 @@
 	name = "Exploded Cargo Ship"
 	mappath = 'ship_sup_exploded.dmm'
 	cost = 35
-	allow_duplicates = FALSE
 
 /datum/map_template/debrisfield/ship_med_crashed
 	name = "Crashed Medical Ship"
 	mappath = 'ship_med_crashed.dmm'
 	cost = 35
-	allow_duplicates = FALSE
 
 /datum/map_template/debrisfield/ship_sci_overrun
 	name = "Overrun Research Ship"
 	mappath = 'ship_sci_overrun.dmm'
 	cost = 35
-	allow_duplicates = FALSE
 
 /datum/map_template/debrisfield/oldshuttle
 	name = "Old Expedition Shuttle"
 	mappath = 'oldshuttle.dmm'
 	cost = 30
-	allow_duplicates = FALSE
 
 /datum/map_template/debrisfield/alien_massive_derelict
 	name = "Alien Derelict"
 	mappath = 'derelict.dmm'
 	cost = 35
-	allow_duplicates = FALSE
 	discard_prob = 50
diff --git a/maps/nsv_triumph/submaps/space/pois/asteroids1.dmm b/maps/nsv_triumph/submaps/space/asteroids1.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/asteroids1.dmm
rename to maps/nsv_triumph/submaps/space/asteroids1.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/asteroids2.dmm b/maps/nsv_triumph/submaps/space/asteroids2.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/asteroids2.dmm
rename to maps/nsv_triumph/submaps/space/asteroids2.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/asteroids3.dmm b/maps/nsv_triumph/submaps/space/asteroids3.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/asteroids3.dmm
rename to maps/nsv_triumph/submaps/space/asteroids3.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/carp_asteroids1.dmm b/maps/nsv_triumph/submaps/space/carp_asteroids1.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/carp_asteroids1.dmm
rename to maps/nsv_triumph/submaps/space/carp_asteroids1.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/carp_asteroids2.dmm b/maps/nsv_triumph/submaps/space/carp_asteroids2.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/carp_asteroids2.dmm
rename to maps/nsv_triumph/submaps/space/carp_asteroids2.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/carp_asteroids3.dmm b/maps/nsv_triumph/submaps/space/carp_asteroids3.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/carp_asteroids3.dmm
rename to maps/nsv_triumph/submaps/space/carp_asteroids3.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/carp_asteroids4.dmm b/maps/nsv_triumph/submaps/space/carp_asteroids4.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/carp_asteroids4.dmm
rename to maps/nsv_triumph/submaps/space/carp_asteroids4.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/debris1.dmm b/maps/nsv_triumph/submaps/space/debris1.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/debris1.dmm
rename to maps/nsv_triumph/submaps/space/debris1.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/debris2.dmm b/maps/nsv_triumph/submaps/space/debris2.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/debris2.dmm
rename to maps/nsv_triumph/submaps/space/debris2.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/debris3.dmm b/maps/nsv_triumph/submaps/space/debris3.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/debris3.dmm
rename to maps/nsv_triumph/submaps/space/debris3.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/debris4.dmm b/maps/nsv_triumph/submaps/space/debris4.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/debris4.dmm
rename to maps/nsv_triumph/submaps/space/debris4.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/debris5.dmm b/maps/nsv_triumph/submaps/space/debris5.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/debris5.dmm
rename to maps/nsv_triumph/submaps/space/debris5.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/debris6.dmm b/maps/nsv_triumph/submaps/space/debris6.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/debris6.dmm
rename to maps/nsv_triumph/submaps/space/debris6.dmm
diff --git a/maps/nsv_triumph/submaps/space/debrisfield.dmm b/maps/nsv_triumph/submaps/space/debrisfield.dmm
index 98596ba01ee..362d1609692 100644
--- a/maps/nsv_triumph/submaps/space/debrisfield.dmm
+++ b/maps/nsv_triumph/submaps/space/debrisfield.dmm
@@ -5,25 +5,9 @@
 "c" = (
 /turf/space,
 /area/triumph_away/debrisfield/explored)
-"e" = (
-/obj/effect/step_trigger/teleporter/debrisfield_loop/north,
-/turf/space,
-/area/triumph_away/debrisfield/explored)
 "f" = (
 /turf/space,
 /area/shuttle/excursion/debrisfield)
-"g" = (
-/obj/effect/step_trigger/teleporter/debrisfield_loop/east,
-/turf/space,
-/area/triumph_away/debrisfield/explored)
-"h" = (
-/obj/effect/step_trigger/teleporter/debrisfield_loop/west,
-/turf/space,
-/area/triumph_away/debrisfield/explored)
-"j" = (
-/obj/effect/step_trigger/teleporter/debrisfield_loop/south,
-/turf/space,
-/area/triumph_away/debrisfield/explored)
 "W" = (
 /obj/away_mission_init/debrisfield,
 /turf/space,
@@ -34,149 +18,148 @@
 /area/triumph_away/debrisfield/explored)
 
 (1,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
 "}
 (2,1,1) = {"
-e
 c
 c
 c
@@ -315,10 +298,10 @@ c
 c
 c
 c
-j
+c
+c
 "}
 (3,1,1) = {"
-e
 c
 c
 c
@@ -457,10 +440,11 @@ c
 c
 c
 c
-j
+c
+c
 "}
 (4,1,1) = {"
-e
+c
 c
 c
 a
@@ -599,10 +583,10 @@ a
 a
 c
 c
-j
+c
 "}
 (5,1,1) = {"
-e
+c
 c
 c
 a
@@ -741,10 +725,10 @@ a
 a
 c
 c
-j
+c
 "}
 (6,1,1) = {"
-e
+c
 c
 c
 a
@@ -883,10 +867,10 @@ a
 a
 c
 c
-j
+c
 "}
 (7,1,1) = {"
-e
+c
 c
 c
 a
@@ -1025,10 +1009,10 @@ a
 a
 c
 c
-j
+c
 "}
 (8,1,1) = {"
-e
+c
 c
 c
 a
@@ -1167,10 +1151,10 @@ a
 a
 c
 c
-j
+c
 "}
 (9,1,1) = {"
-e
+c
 c
 c
 a
@@ -1309,10 +1293,10 @@ a
 a
 c
 c
-j
+c
 "}
 (10,1,1) = {"
-e
+c
 c
 c
 a
@@ -1451,10 +1435,10 @@ a
 a
 c
 c
-j
+c
 "}
 (11,1,1) = {"
-e
+c
 c
 c
 a
@@ -1593,10 +1577,10 @@ a
 a
 c
 c
-j
+c
 "}
 (12,1,1) = {"
-e
+c
 c
 c
 a
@@ -1735,10 +1719,10 @@ a
 a
 c
 c
-j
+c
 "}
 (13,1,1) = {"
-e
+c
 c
 c
 a
@@ -1877,10 +1861,10 @@ a
 a
 c
 c
-j
+c
 "}
 (14,1,1) = {"
-e
+c
 c
 c
 a
@@ -2019,10 +2003,10 @@ a
 a
 c
 c
-j
+c
 "}
 (15,1,1) = {"
-e
+c
 c
 c
 a
@@ -2161,10 +2145,10 @@ a
 a
 c
 c
-j
+c
 "}
 (16,1,1) = {"
-e
+c
 c
 c
 a
@@ -2303,10 +2287,10 @@ a
 a
 c
 c
-j
+c
 "}
 (17,1,1) = {"
-e
+c
 c
 c
 a
@@ -2445,10 +2429,10 @@ a
 a
 c
 c
-j
+c
 "}
 (18,1,1) = {"
-e
+c
 c
 c
 a
@@ -2587,10 +2571,10 @@ a
 a
 c
 c
-j
+c
 "}
 (19,1,1) = {"
-e
+c
 c
 c
 a
@@ -2729,10 +2713,10 @@ a
 a
 c
 c
-j
+c
 "}
 (20,1,1) = {"
-e
+c
 c
 c
 a
@@ -2871,10 +2855,10 @@ a
 a
 c
 c
-j
+c
 "}
 (21,1,1) = {"
-e
+c
 c
 c
 a
@@ -3013,10 +2997,10 @@ a
 a
 c
 c
-j
+c
 "}
 (22,1,1) = {"
-e
+c
 c
 c
 a
@@ -3155,10 +3139,10 @@ a
 a
 c
 c
-j
+c
 "}
 (23,1,1) = {"
-e
+c
 c
 c
 a
@@ -3297,10 +3281,10 @@ a
 a
 c
 c
-j
+c
 "}
 (24,1,1) = {"
-e
+c
 c
 c
 a
@@ -3439,10 +3423,10 @@ a
 a
 c
 c
-j
+c
 "}
 (25,1,1) = {"
-e
+c
 c
 c
 a
@@ -3581,10 +3565,10 @@ a
 a
 c
 c
-j
+c
 "}
 (26,1,1) = {"
-e
+c
 c
 c
 a
@@ -3723,10 +3707,10 @@ a
 a
 c
 c
-j
+c
 "}
 (27,1,1) = {"
-e
+c
 c
 c
 a
@@ -3865,10 +3849,10 @@ a
 a
 c
 c
-j
+c
 "}
 (28,1,1) = {"
-e
+c
 c
 c
 a
@@ -4007,10 +3991,10 @@ a
 a
 c
 c
-j
+c
 "}
 (29,1,1) = {"
-e
+c
 c
 c
 a
@@ -4149,10 +4133,10 @@ a
 a
 c
 c
-j
+c
 "}
 (30,1,1) = {"
-e
+c
 c
 c
 a
@@ -4291,10 +4275,10 @@ a
 a
 c
 c
-j
+c
 "}
 (31,1,1) = {"
-e
+c
 c
 c
 a
@@ -4433,10 +4417,10 @@ a
 a
 c
 c
-j
+c
 "}
 (32,1,1) = {"
-e
+c
 c
 c
 a
@@ -4575,10 +4559,10 @@ a
 a
 c
 c
-j
+c
 "}
 (33,1,1) = {"
-e
+c
 c
 c
 a
@@ -4717,10 +4701,10 @@ a
 a
 c
 c
-j
+c
 "}
 (34,1,1) = {"
-e
+c
 c
 c
 a
@@ -4859,10 +4843,10 @@ a
 a
 c
 c
-j
+c
 "}
 (35,1,1) = {"
-e
+c
 c
 c
 a
@@ -5001,10 +4985,10 @@ a
 a
 c
 c
-j
+c
 "}
 (36,1,1) = {"
-e
+c
 c
 c
 a
@@ -5143,10 +5127,10 @@ a
 a
 c
 c
-j
+c
 "}
 (37,1,1) = {"
-e
+c
 c
 c
 a
@@ -5285,10 +5269,10 @@ a
 a
 c
 c
-j
+c
 "}
 (38,1,1) = {"
-e
+c
 c
 c
 a
@@ -5427,10 +5411,10 @@ a
 a
 c
 c
-j
+c
 "}
 (39,1,1) = {"
-e
+c
 c
 c
 a
@@ -5569,10 +5553,10 @@ a
 a
 c
 c
-j
+c
 "}
 (40,1,1) = {"
-e
+c
 c
 c
 a
@@ -5711,10 +5695,10 @@ a
 a
 c
 c
-j
+c
 "}
 (41,1,1) = {"
-e
+c
 c
 c
 a
@@ -5853,10 +5837,10 @@ a
 a
 c
 c
-j
+c
 "}
 (42,1,1) = {"
-e
+c
 c
 c
 a
@@ -5995,10 +5979,10 @@ a
 a
 c
 c
-j
+c
 "}
 (43,1,1) = {"
-e
+c
 c
 c
 a
@@ -6137,10 +6121,10 @@ a
 a
 c
 c
-j
+c
 "}
 (44,1,1) = {"
-e
+c
 c
 c
 a
@@ -6279,10 +6263,10 @@ a
 a
 c
 c
-j
+c
 "}
 (45,1,1) = {"
-e
+c
 c
 c
 a
@@ -6421,10 +6405,10 @@ a
 a
 c
 c
-j
+c
 "}
 (46,1,1) = {"
-e
+c
 c
 c
 a
@@ -6563,10 +6547,10 @@ a
 a
 c
 c
-j
+c
 "}
 (47,1,1) = {"
-e
+c
 c
 c
 a
@@ -6705,10 +6689,10 @@ a
 a
 c
 c
-j
+c
 "}
 (48,1,1) = {"
-e
+c
 c
 c
 a
@@ -6847,10 +6831,10 @@ a
 a
 c
 c
-j
+c
 "}
 (49,1,1) = {"
-e
+c
 c
 c
 a
@@ -6989,10 +6973,10 @@ a
 a
 c
 c
-j
+c
 "}
 (50,1,1) = {"
-e
+c
 c
 c
 a
@@ -7131,10 +7115,10 @@ a
 a
 c
 c
-j
+c
 "}
 (51,1,1) = {"
-e
+c
 c
 c
 a
@@ -7273,10 +7257,10 @@ a
 a
 c
 c
-j
+c
 "}
 (52,1,1) = {"
-e
+c
 c
 c
 a
@@ -7415,10 +7399,10 @@ a
 a
 c
 c
-j
+c
 "}
 (53,1,1) = {"
-e
+c
 c
 c
 a
@@ -7557,10 +7541,10 @@ a
 a
 c
 c
-j
+c
 "}
 (54,1,1) = {"
-e
+c
 c
 c
 a
@@ -7699,10 +7683,10 @@ a
 a
 c
 c
-j
+c
 "}
 (55,1,1) = {"
-e
+c
 c
 c
 a
@@ -7841,10 +7825,10 @@ a
 a
 c
 c
-j
+c
 "}
 (56,1,1) = {"
-e
+c
 c
 c
 a
@@ -7983,10 +7967,10 @@ a
 a
 c
 c
-j
+c
 "}
 (57,1,1) = {"
-e
+c
 c
 c
 a
@@ -8125,10 +8109,10 @@ a
 a
 c
 c
-j
+c
 "}
 (58,1,1) = {"
-e
+c
 c
 c
 a
@@ -8267,10 +8251,10 @@ a
 a
 c
 c
-j
+c
 "}
 (59,1,1) = {"
-e
+c
 c
 c
 a
@@ -8409,10 +8393,10 @@ a
 a
 c
 c
-j
+c
 "}
 (60,1,1) = {"
-e
+c
 c
 c
 a
@@ -8551,10 +8535,10 @@ a
 a
 c
 c
-j
+c
 "}
 (61,1,1) = {"
-e
+c
 c
 c
 a
@@ -8693,10 +8677,10 @@ a
 a
 c
 c
-j
+c
 "}
 (62,1,1) = {"
-e
+c
 c
 c
 a
@@ -8835,10 +8819,10 @@ a
 a
 c
 c
-j
+c
 "}
 (63,1,1) = {"
-e
+c
 c
 c
 a
@@ -8977,10 +8961,10 @@ a
 a
 c
 c
-j
+c
 "}
 (64,1,1) = {"
-e
+c
 c
 c
 a
@@ -9119,10 +9103,10 @@ a
 a
 c
 c
-j
+c
 "}
 (65,1,1) = {"
-e
+c
 c
 c
 a
@@ -9261,10 +9245,10 @@ a
 a
 c
 c
-j
+c
 "}
 (66,1,1) = {"
-e
+c
 c
 c
 a
@@ -9403,10 +9387,10 @@ a
 a
 c
 c
-j
+c
 "}
 (67,1,1) = {"
-e
+c
 c
 c
 a
@@ -9545,10 +9529,10 @@ a
 a
 c
 c
-j
+c
 "}
 (68,1,1) = {"
-e
+c
 c
 c
 a
@@ -9687,10 +9671,10 @@ a
 a
 c
 c
-j
+c
 "}
 (69,1,1) = {"
-e
+c
 c
 c
 a
@@ -9829,10 +9813,10 @@ a
 a
 c
 c
-j
+c
 "}
 (70,1,1) = {"
-e
+c
 c
 c
 a
@@ -9971,10 +9955,10 @@ a
 a
 c
 c
-j
+c
 "}
 (71,1,1) = {"
-e
+c
 c
 c
 a
@@ -10113,10 +10097,10 @@ a
 a
 c
 c
-j
+c
 "}
 (72,1,1) = {"
-e
+c
 c
 c
 a
@@ -10255,10 +10239,10 @@ a
 a
 c
 c
-j
+c
 "}
 (73,1,1) = {"
-e
+c
 c
 c
 a
@@ -10397,10 +10381,10 @@ a
 a
 c
 c
-j
+c
 "}
 (74,1,1) = {"
-e
+c
 c
 c
 a
@@ -10539,10 +10523,10 @@ a
 a
 c
 c
-j
+c
 "}
 (75,1,1) = {"
-e
+c
 c
 c
 a
@@ -10681,10 +10665,10 @@ a
 a
 c
 c
-j
+c
 "}
 (76,1,1) = {"
-e
+c
 c
 c
 a
@@ -10823,10 +10807,10 @@ a
 a
 c
 c
-j
+c
 "}
 (77,1,1) = {"
-e
+c
 c
 c
 a
@@ -10965,10 +10949,10 @@ a
 a
 c
 c
-j
+c
 "}
 (78,1,1) = {"
-e
+c
 c
 c
 a
@@ -11107,10 +11091,10 @@ a
 a
 c
 c
-j
+c
 "}
 (79,1,1) = {"
-e
+c
 c
 c
 a
@@ -11249,10 +11233,10 @@ a
 a
 c
 c
-j
+c
 "}
 (80,1,1) = {"
-e
+c
 c
 c
 a
@@ -11391,10 +11375,10 @@ a
 a
 c
 c
-j
+c
 "}
 (81,1,1) = {"
-e
+c
 c
 c
 a
@@ -11533,10 +11517,10 @@ a
 a
 c
 c
-j
+c
 "}
 (82,1,1) = {"
-e
+c
 c
 c
 a
@@ -11675,10 +11659,10 @@ a
 a
 c
 c
-j
+c
 "}
 (83,1,1) = {"
-e
+c
 c
 c
 a
@@ -11817,10 +11801,10 @@ a
 a
 c
 c
-j
+c
 "}
 (84,1,1) = {"
-e
+c
 c
 c
 a
@@ -11959,10 +11943,10 @@ a
 a
 c
 c
-j
+c
 "}
 (85,1,1) = {"
-e
+c
 c
 c
 a
@@ -12101,10 +12085,10 @@ a
 a
 c
 c
-j
+c
 "}
 (86,1,1) = {"
-e
+c
 c
 c
 a
@@ -12243,10 +12227,10 @@ a
 a
 c
 c
-j
+c
 "}
 (87,1,1) = {"
-e
+c
 c
 c
 a
@@ -12385,10 +12369,10 @@ a
 a
 c
 c
-j
+c
 "}
 (88,1,1) = {"
-e
+c
 c
 c
 a
@@ -12527,10 +12511,10 @@ a
 a
 c
 c
-j
+c
 "}
 (89,1,1) = {"
-e
+c
 c
 c
 a
@@ -12669,10 +12653,10 @@ a
 a
 c
 c
-j
+c
 "}
 (90,1,1) = {"
-e
+c
 c
 c
 a
@@ -12811,10 +12795,10 @@ a
 a
 c
 c
-j
+c
 "}
 (91,1,1) = {"
-e
+c
 c
 c
 a
@@ -12953,10 +12937,10 @@ a
 a
 c
 c
-j
+c
 "}
 (92,1,1) = {"
-e
+c
 c
 c
 a
@@ -13095,10 +13079,10 @@ a
 a
 c
 c
-j
+c
 "}
 (93,1,1) = {"
-e
+c
 c
 c
 a
@@ -13237,10 +13221,10 @@ a
 a
 c
 c
-j
+c
 "}
 (94,1,1) = {"
-e
+c
 c
 c
 a
@@ -13379,10 +13363,10 @@ a
 a
 c
 c
-j
+c
 "}
 (95,1,1) = {"
-e
+c
 c
 c
 a
@@ -13521,10 +13505,10 @@ a
 a
 c
 c
-j
+c
 "}
 (96,1,1) = {"
-e
+c
 c
 c
 a
@@ -13663,10 +13647,10 @@ a
 a
 c
 c
-j
+c
 "}
 (97,1,1) = {"
-e
+c
 c
 c
 a
@@ -13805,10 +13789,10 @@ a
 a
 c
 c
-j
+c
 "}
 (98,1,1) = {"
-e
+c
 c
 c
 a
@@ -13947,10 +13931,10 @@ a
 a
 c
 c
-j
+c
 "}
 (99,1,1) = {"
-e
+c
 c
 c
 a
@@ -14089,10 +14073,10 @@ a
 a
 c
 c
-j
+c
 "}
 (100,1,1) = {"
-e
+c
 c
 c
 a
@@ -14231,10 +14215,10 @@ a
 a
 c
 c
-j
+c
 "}
 (101,1,1) = {"
-e
+c
 c
 c
 a
@@ -14373,10 +14357,10 @@ a
 a
 c
 c
-j
+c
 "}
 (102,1,1) = {"
-e
+c
 c
 c
 a
@@ -14515,10 +14499,10 @@ a
 a
 c
 c
-j
+c
 "}
 (103,1,1) = {"
-e
+c
 c
 c
 a
@@ -14657,10 +14641,10 @@ a
 a
 c
 c
-j
+c
 "}
 (104,1,1) = {"
-e
+c
 c
 c
 a
@@ -14799,10 +14783,10 @@ a
 a
 c
 c
-j
+c
 "}
 (105,1,1) = {"
-e
+c
 c
 c
 a
@@ -14941,10 +14925,10 @@ a
 a
 c
 c
-j
+c
 "}
 (106,1,1) = {"
-e
+c
 c
 c
 a
@@ -15083,10 +15067,10 @@ a
 a
 c
 c
-j
+c
 "}
 (107,1,1) = {"
-e
+c
 c
 c
 a
@@ -15225,10 +15209,10 @@ a
 a
 c
 c
-j
+c
 "}
 (108,1,1) = {"
-e
+c
 c
 c
 a
@@ -15367,10 +15351,10 @@ a
 a
 c
 c
-j
+c
 "}
 (109,1,1) = {"
-e
+c
 c
 c
 a
@@ -15509,10 +15493,10 @@ a
 a
 c
 c
-j
+c
 "}
 (110,1,1) = {"
-e
+c
 c
 c
 a
@@ -15651,10 +15635,10 @@ a
 a
 c
 c
-j
+c
 "}
 (111,1,1) = {"
-e
+c
 c
 c
 a
@@ -15793,10 +15777,10 @@ a
 a
 c
 c
-j
+c
 "}
 (112,1,1) = {"
-e
+c
 c
 c
 a
@@ -15935,10 +15919,10 @@ a
 a
 c
 c
-j
+c
 "}
 (113,1,1) = {"
-e
+c
 c
 c
 a
@@ -16077,10 +16061,10 @@ a
 a
 c
 c
-j
+c
 "}
 (114,1,1) = {"
-e
+c
 c
 c
 a
@@ -16219,10 +16203,10 @@ a
 a
 c
 c
-j
+c
 "}
 (115,1,1) = {"
-e
+c
 c
 c
 a
@@ -16361,10 +16345,10 @@ a
 a
 c
 c
-j
+c
 "}
 (116,1,1) = {"
-e
+c
 c
 c
 a
@@ -16503,10 +16487,10 @@ a
 a
 c
 c
-j
+c
 "}
 (117,1,1) = {"
-e
+c
 c
 c
 a
@@ -16645,10 +16629,10 @@ a
 a
 c
 c
-j
+c
 "}
 (118,1,1) = {"
-e
+c
 c
 c
 a
@@ -16787,10 +16771,10 @@ a
 a
 c
 c
-j
+c
 "}
 (119,1,1) = {"
-e
+c
 c
 c
 a
@@ -16929,10 +16913,10 @@ a
 a
 c
 c
-j
+c
 "}
 (120,1,1) = {"
-e
+c
 c
 c
 a
@@ -17071,10 +17055,10 @@ a
 a
 c
 c
-j
+c
 "}
 (121,1,1) = {"
-e
+c
 c
 c
 a
@@ -17213,10 +17197,10 @@ a
 a
 c
 c
-j
+c
 "}
 (122,1,1) = {"
-e
+c
 c
 c
 a
@@ -17355,10 +17339,10 @@ a
 a
 c
 c
-j
+c
 "}
 (123,1,1) = {"
-e
+c
 c
 c
 a
@@ -17497,10 +17481,10 @@ a
 a
 c
 c
-j
+c
 "}
 (124,1,1) = {"
-e
+c
 c
 c
 a
@@ -17639,10 +17623,10 @@ a
 a
 c
 c
-j
+c
 "}
 (125,1,1) = {"
-e
+c
 c
 c
 a
@@ -17781,10 +17765,10 @@ a
 a
 c
 c
-j
+c
 "}
 (126,1,1) = {"
-e
+c
 c
 c
 a
@@ -17923,10 +17907,10 @@ a
 a
 c
 c
-j
+c
 "}
 (127,1,1) = {"
-e
+c
 c
 c
 a
@@ -18065,10 +18049,10 @@ a
 a
 c
 c
-j
+c
 "}
 (128,1,1) = {"
-e
+c
 c
 c
 a
@@ -18207,10 +18191,10 @@ a
 a
 c
 c
-j
+c
 "}
 (129,1,1) = {"
-e
+c
 c
 c
 a
@@ -18349,10 +18333,10 @@ a
 a
 c
 c
-j
+c
 "}
 (130,1,1) = {"
-e
+c
 c
 c
 a
@@ -18491,10 +18475,10 @@ a
 a
 c
 c
-j
+c
 "}
 (131,1,1) = {"
-e
+c
 c
 c
 a
@@ -18633,10 +18617,10 @@ a
 a
 c
 c
-j
+c
 "}
 (132,1,1) = {"
-e
+c
 c
 c
 a
@@ -18775,10 +18759,10 @@ a
 a
 c
 c
-j
+c
 "}
 (133,1,1) = {"
-e
+c
 c
 c
 a
@@ -18917,10 +18901,10 @@ a
 a
 c
 c
-j
+c
 "}
 (134,1,1) = {"
-e
+c
 c
 c
 a
@@ -19059,10 +19043,10 @@ a
 a
 c
 c
-j
+c
 "}
 (135,1,1) = {"
-e
+c
 c
 c
 a
@@ -19201,10 +19185,10 @@ a
 a
 c
 c
-j
+c
 "}
 (136,1,1) = {"
-e
+c
 c
 c
 a
@@ -19343,10 +19327,10 @@ a
 a
 c
 c
-j
+c
 "}
 (137,1,1) = {"
-e
+c
 c
 c
 a
@@ -19485,10 +19469,9 @@ a
 a
 c
 c
-j
+c
 "}
 (138,1,1) = {"
-e
 c
 c
 c
@@ -19627,10 +19610,10 @@ c
 c
 c
 c
-j
+c
+c
 "}
 (139,1,1) = {"
-e
 c
 c
 c
@@ -19769,147 +19752,148 @@ c
 c
 c
 c
-j
+c
+c
 "}
 (140,1,1) = {"
-e
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
-g
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
+c
 "}
diff --git a/maps/nsv_triumph/submaps/space/pois/debrisfield_things.dm b/maps/nsv_triumph/submaps/space/debrisfield_things.dm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/debrisfield_things.dm
rename to maps/nsv_triumph/submaps/space/debrisfield_things.dm
diff --git a/maps/nsv_triumph/submaps/space/pois/derelict.dmm b/maps/nsv_triumph/submaps/space/derelict.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/derelict.dmm
rename to maps/nsv_triumph/submaps/space/derelict.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/foodstand.dmm b/maps/nsv_triumph/submaps/space/foodstand.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/foodstand.dmm
rename to maps/nsv_triumph/submaps/space/foodstand.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/oldshuttle.dmm b/maps/nsv_triumph/submaps/space/oldshuttle.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/oldshuttle.dmm
rename to maps/nsv_triumph/submaps/space/oldshuttle.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/ship_med_crashed.dmm b/maps/nsv_triumph/submaps/space/ship_med_crashed.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/ship_med_crashed.dmm
rename to maps/nsv_triumph/submaps/space/ship_med_crashed.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/ship_sci_overrun.dmm b/maps/nsv_triumph/submaps/space/ship_sci_overrun.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/ship_sci_overrun.dmm
rename to maps/nsv_triumph/submaps/space/ship_sci_overrun.dmm
diff --git a/maps/nsv_triumph/submaps/space/pois/ship_sup_exploded.dmm b/maps/nsv_triumph/submaps/space/ship_sup_exploded.dmm
similarity index 100%
rename from maps/nsv_triumph/submaps/space/pois/ship_sup_exploded.dmm
rename to maps/nsv_triumph/submaps/space/ship_sup_exploded.dmm
diff --git a/maps/nsv_triumph/triumph_defines.dm b/maps/nsv_triumph/triumph_defines.dm
index cf6a3161bfc..f90941da530 100644
--- a/maps/nsv_triumph/triumph_defines.dm
+++ b/maps/nsv_triumph/triumph_defines.dm
@@ -94,14 +94,15 @@
 	spawnpoint_left = /datum/spawnpoint/shuttle
 	spawnpoint_stayed = /datum/spawnpoint/cryo
 
-	meteor_strike_areas = list(/area/triumph/surfacebase/outside/outside3)
+	meteor_strike_areas = null
 
 	unit_test_exempt_areas = list(
 		/area/vacant/vacant_site,
 		/area/vacant/vacant_site/east)
 	unit_test_exempt_from_atmos = list(
 		/area/engineering/atmos/intake,
-		/area/tcommsat/chamber)
+		/area/tcommsat/chamber,
+		/area/engineering/engineering_airlock)
 
 	lateload_z_levels = list(
 		list("Triumph - Misc","Triumph - Ships",), //Stock Triumph lateload maps
@@ -119,7 +120,7 @@
 	lateload_single_pick = null //Nothing right now.
 
 /datum/map/triumph/perform_map_generation()
-	. = ..()
+	return 1
 
 
 // Short range computers see only the main levels, others can see the surrounding surface levels.
@@ -153,7 +154,7 @@
 	z = Z_LEVEL_DECK_ONE
 	name = "Deck 1"
 	transit_chance = 33
-	flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED|MAP_LEVEL_XENOARCH_EXEMPT
+	flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_XENOARCH_EXEMPT
 	holomap_offset_x = TRIUMPH_HOLOMAP_MARGIN_X
 	holomap_offset_y = TRIUMPH_HOLOMAP_MARGIN_Y + TRIUMPH_MAP_SIZE*1
 
@@ -161,7 +162,7 @@
 	z = Z_LEVEL_DECK_TWO
 	name = "Deck 2"
 	transit_chance = 33
-	flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED|MAP_LEVEL_XENOARCH_EXEMPT
+	flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_XENOARCH_EXEMPT
 	holomap_offset_x = TRIUMPH_HOLOMAP_MARGIN_X
 	holomap_offset_y = TRIUMPH_HOLOMAP_MARGIN_Y + TRIUMPH_MAP_SIZE*2
 
@@ -169,7 +170,7 @@
 	z = Z_LEVEL_DECK_THREE
 	name = "Deck 3"
 	transit_chance = 33
-	flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED|MAP_LEVEL_XENOARCH_EXEMPT
+	flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_XENOARCH_EXEMPT
 	holomap_offset_x = HOLOMAP_ICON_SIZE - TRIUMPH_HOLOMAP_MARGIN_X - TRIUMPH_MAP_SIZE
 	holomap_offset_y = TRIUMPH_HOLOMAP_MARGIN_Y + TRIUMPH_MAP_SIZE*1
 
@@ -177,7 +178,7 @@
 	z = Z_LEVEL_DECK_FOUR
 	name = "Deck 4"
 	transit_chance = 33
-	flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED|MAP_LEVEL_XENOARCH_EXEMPT
+	flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_XENOARCH_EXEMPT
 	holomap_offset_x = HOLOMAP_ICON_SIZE - TRIUMPH_HOLOMAP_MARGIN_X - TRIUMPH_MAP_SIZE
 	holomap_offset_y = TRIUMPH_HOLOMAP_MARGIN_Y + TRIUMPH_MAP_SIZE*2
 
diff --git a/maps/nsv_triumph/triumph_shuttle_defs.dm b/maps/nsv_triumph/triumph_shuttle_defs.dm
index 5903b51d4cb..3e771190f6b 100644
--- a/maps/nsv_triumph/triumph_shuttle_defs.dm
+++ b/maps/nsv_triumph/triumph_shuttle_defs.dm
@@ -13,6 +13,7 @@
 	move_time = SHUTTLE_TRANSIT_DURATION_RETURN
 
 //////////////////////////////////////////////////////////////
+/*
 /datum/shuttle/ferry/escape_pod/large_escape_pod1
 	name = "Large Escape Pod 1"
 	location = 0
@@ -24,7 +25,7 @@
 	dock_target_station = "large_escape_pod_1_berth"
 	dock_target_offsite = "large_escape_pod_1_recovery"
 	move_time = SHUTTLE_TRANSIT_DURATION_RETURN
-
+*/
 //////////////////////////////////////////////////////////////
 /* Removed for the time being
 /datum/shuttle/ferry/escape_pod/large_escape_pod2
@@ -53,6 +54,7 @@
 
 //////////////////////////////////////////////////////////////
 // Trade Ship
+/*
 /datum/shuttle/ferry/trade
 	name = "Trade"
 	location = 1
@@ -62,7 +64,7 @@
 	docking_controller_tag = "trade_shuttle"
 	dock_target_station = "trade_shuttle_dock_airlock"
 	dock_target_offsite = "trade_shuttle_bay"
-
+*/
 //////////////////////////////////////////////////////////////
 // Away Mission Shuttle
 // TODO - Not implemented yet on new map
@@ -113,6 +115,7 @@
 */
 //////////////////////////////////////////////////////////////
 // Antag Space "Proto Shuttle" Shuttle
+/*
 /datum/shuttle/multi_shuttle/protoshuttle
 	name = "Proto"
 	warmup_time = 8
@@ -186,7 +189,7 @@
 	docking_controller_tag_offsite = "specops_shuttle_fore"
 	dock_target_station = "specops_centcom_dock"
 	dock_target_offsite = "specops_dock_airlock"
-
+*/
 
 //////////////////////////////////////////////////////////////
 // RogueMiner "Belter: Shuttle
diff --git a/maps/nsv_triumph/triumph_things.dm b/maps/nsv_triumph/triumph_things.dm
index ae9b1b8e4a8..35aa61cfe50 100644
--- a/maps/nsv_triumph/triumph_things.dm
+++ b/maps/nsv_triumph/triumph_things.dm
@@ -29,86 +29,6 @@
 	music = list('sound/music/elevator.ogg')  // Woo elevator music!
 */
 
-/*
-/obj/machinery/atmospherics/unary/vent_pump/positive
-	use_power = USE_POWER_IDLE
-	icon_state = "map_vent_out"
-	external_pressure_bound = ONE_ATMOSPHERE * 1.1
-
-
-/obj/effect/step_trigger/teleporter/to_mining/New()
-	..()
-	teleport_x = src.x
-	teleport_y = 2
-	teleport_z = Z_LEVEL_SURFACE_MINE
-
-/obj/effect/step_trigger/teleporter/from_mining/New()
-	..()
-	teleport_x = src.x
-	teleport_y = world.maxy - 1
-	teleport_z = Z_LEVEL_SURFACE_LOW
-
-/obj/effect/step_trigger/teleporter/to_solars/New()
-	..()
-	teleport_x = world.maxx - 1
-	teleport_y = src.y
-	teleport_z = Z_LEVEL_SOLARS
-
-/obj/effect/step_trigger/teleporter/from_solars/New()
-	..()
-	teleport_x = 2
-	teleport_y = src.y
-	teleport_z = Z_LEVEL_SURFACE_LOW
-
-/obj/effect/step_trigger/teleporter/wild/New()
-	..()
-
-	//If starting on east/west edges.
-	if (src.x == 1)
-		teleport_x = world.maxx - 1
-	else if (src.x == world.maxx)
-		teleport_x = 2
-	else
-		teleport_x = src.x
-	//If starting on north/south edges.
-	if (src.y == 1)
-		teleport_y = world.maxy - 1
-	else if (src.y == world.maxy)
-		teleport_y = 2
-	else
-		teleport_y = src.y
-
-/obj/effect/step_trigger/teleporter/to_underdark
-	icon = 'icons/obj/stairs.dmi'
-	icon_state = "stairs"
-	invisibility = 0
-/obj/effect/step_trigger/teleporter/to_underdark/Initialize()
-	. = ..()
-	teleport_x = x
-	teleport_y = y
-	for(var/z_num in GLOB.using_map.zlevels)
-		var/datum/map_z_level/Z = GLOB.using_map.zlevels[z_num]
-		if(Z.name == "Underdark")
-			teleport_z = Z.z
-
-/obj/effect/step_trigger/teleporter/from_underdark
-	icon = 'icons/obj/stairs.dmi'
-	icon_state = "stairs"
-	invisibility = 0
-/obj/effect/step_trigger/teleporter/from_underdark/Initialize()
-	. = ..()
-	teleport_x = x
-	teleport_y = y
-	for(var/z_num in GLOB.using_map.zlevels)
-		var/datum/map_z_level/Z = GLOB.using_map.zlevels[z_num]
-		if(Z.name == "Mining Outpost")
-			teleport_z = Z.z
-
-/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/find_planet()
-	planet = planet_virgo3b
-
-*/
-
 /obj/effect/step_trigger/lost_in_space
 	var/deathmessage = "You drift off into space, floating alone in the void until your life support runs out."
 
@@ -132,7 +52,7 @@
 		return ..()
 
 /obj/effect/step_trigger/lost_in_space/shuttle
-	deathmessage = "You fly down the tunnel of the shuttle at high speed for a few moments before impact kills you with sheer concussive force."
+	deathmessage = "You fly out of the shuttle at high speed for a few moments before you see the last hopes of your survival fade away."
 
 
 // Invisible object that blocks z transfer to/from its turf and the turf above.
@@ -151,39 +71,9 @@
 	return TRUE
 
 //
-// shuttle STATION
+// SHUTTLE STATION
 //
 
-// The shuttle's electrified maglev tracks
-/turf/simulated/floor/maglev
-	name = "maglev track"
-	desc = "Magnetic levitation shuttle tracks. Caution! Electrified!"
-	icon = 'icons/turf/flooring/maglevs.dmi'
-	icon_state = "maglevup"
-
-	var/area/shock_area = /area/triumph/surfacebase/tram
-
-/turf/simulated/floor/maglev/Initialize()
-	. = ..()
-	shock_area = locate(shock_area)
-
-// Walking on maglev tracks will shock you! Horray!
-/turf/simulated/floor/maglev/Entered(var/atom/movable/AM, var/atom/old_loc)
-	..()
-	if(isliving(AM) && prob(50))
-		track_zap(AM)
-
-/turf/simulated/floor/maglev/attack_hand(var/mob/user)
-	if(prob(75))
-		track_zap(user)
-
-/turf/simulated/floor/maglev/proc/track_zap(var/mob/living/user)
-	if (!istype(user)) return
-	if (electrocute_mob(user, shock_area, src))
-		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-		s.set_up(5, 1, src)
-		s.start()
-
 // shuttle air scrubbers for keeping arrivals clean - they work even with no area power
 /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/shuttle
 	name = "\improper Shuttle Air Scrubber"
@@ -229,7 +119,7 @@
 	on_store_name = "Crew Shift Transfer Services"
 	on_enter_occupant_message = "The shuttle arrives at the platform; you step inside and take a seat."
 	on_store_visible_message_1 = "'s speakers chime, anouncing a shuttle has arrived to take"
-	on_store_visible_message_2 = "to the commanding ship."
+	on_store_visible_message_2 = "to the commanding ship"
 	time_till_despawn = 10 SECONDS
 	spawnpoint_type = /datum/spawnpoint/shuttle
 /obj/machinery/cryopod/robot/door/shuttle/process()
@@ -256,6 +146,7 @@
 		var/mob/observer/dead/newghost = user.ghostize()
 		newghost.timeofdeath = world.time
 		despawn_occupant(user)
+		qdel(user)
 
 // shuttle arrival point landmarks and datum
 var/global/list/latejoin_shuttle   = list()