diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm
index 7e96d8f93b53..14823f92db63 100644
--- a/_maps/shuttles/independent/independent_lagoon.dmm
+++ b/_maps/shuttles/independent/independent_lagoon.dmm
@@ -930,12 +930,6 @@
 	},
 /turf/open/floor/carpet/nanoweave/red,
 /area/ship/crew/canteen)
-"fZ" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering)
 "gb" = (
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
@@ -1150,9 +1144,6 @@
 /turf/open/floor/wood,
 /area/ship/crew/library)
 "hK" = (
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
 	dir = 4
 	},
@@ -2507,12 +2498,6 @@
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
-"qq" = (
-/obj/structure/disposalpipe/segment{
-	dir = 6
-	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering)
 "qu" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
@@ -3147,7 +3132,6 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen/kitchen)
 "uV" = (
-/obj/structure/closet/radiation,
 /obj/machinery/firealarm/directional/west,
 /turf/open/floor/plating,
 /area/ship/engineering)
@@ -5503,6 +5487,11 @@
 /obj/effect/turf_decal/industrial/radiation{
 	dir = 10
 	},
+/obj/machinery/button/ignition/incinerator/atmos{
+	dir = 4;
+	pixel_x = -27;
+	pixel_y = 8
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "LB" = (
@@ -5560,12 +5549,6 @@
 /turf/open/floor/light,
 /area/ship/engineering)
 "Me" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/obj/item/weldingtool,
-/obj/item/weldingtool,
 /obj/machinery/button/door/incinerator_vent_atmos_aux{
 	dir = 4;
 	pixel_x = -28;
@@ -5581,6 +5564,9 @@
 	pixel_x = -28;
 	pixel_y = -8
 	},
+/obj/machinery/computer/atmos_control/incinerator{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Mf" = (
@@ -5610,13 +5596,11 @@
 /turf/open/floor/wood,
 /area/ship/crew/library)
 "Mr" = (
-/obj/machinery/computer/atmos_control/incinerator{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 4
 	},
 /obj/effect/turf_decal/trimline/opaque/green/arrow_ccw,
+/obj/structure/closet/radiation,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Mx" = (
@@ -5888,6 +5872,7 @@
 /area/ship/hallway/fore)
 "Pc" = (
 /obj/machinery/air_sensor/atmos/incinerator_tank,
+/obj/machinery/igniter/incinerator_atmos,
 /turf/open/floor/engine,
 /area/ship/engineering)
 "Pe" = (
@@ -7664,7 +7649,7 @@ Pn
 Bz
 Pn
 Nr
-qq
+Pn
 hK
 Pc
 FA
@@ -7705,7 +7690,7 @@ eS
 Vc
 Pn
 VS
-fZ
+Pn
 NB
 cT
 RC
diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
index 13599cc298cf..e269c70cfefa 100644
--- a/_maps/shuttles/independent/independent_shetland.dmm
+++ b/_maps/shuttles/independent/independent_shetland.dmm
@@ -1895,7 +1895,6 @@
 /obj/machinery/atmospherics/pipe/simple/dark/visible{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
@@ -2215,12 +2214,6 @@
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
 /area/ship/hallway/fore)
-"sV" = (
-/obj/structure/disposalpipe/segment{
-	dir = 9
-	},
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
 "sX" = (
 /obj/machinery/disposal/bin,
 /obj/structure/disposalpipe/trunk{
@@ -2299,9 +2292,6 @@
 "tU" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "tX" = (
@@ -2935,9 +2925,6 @@
 	pixel_x = -23;
 	pixel_y = 8
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 6
-	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "yU" = (
@@ -4406,9 +4393,6 @@
 	pixel_x = -4;
 	pixel_y = 10
 	},
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
 /turf/open/floor/engine/vacuum,
 /area/ship/engineering/engine)
 "LQ" = (
@@ -5912,11 +5896,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering)
 "Zn" = (
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/obj/machinery/disposal/bin,
-/obj/item/weldingtool/mini,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Zr" = (
@@ -6109,7 +6088,7 @@ pr
 NK
 yP
 qk
-sV
+Zn
 CZ
 vz
 on
diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
index 1e08e3912dc6..f5f113f79e4a 100644
--- a/_maps/shuttles/inteq/inteq_talos.dmm
+++ b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -2961,6 +2961,11 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1,
+/obj/machinery/button/ignition/incinerator/atmos{
+	dir = 4;
+	pixel_x = -30;
+	pixel_y = 12
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engine)
 "sa" = (
@@ -3419,10 +3424,10 @@
 	},
 /obj/item/gun/ballistic/shotgun/bulldog/inteq/no_mag{
 	pixel_x = -8;
-	pixel_y = 8;
+	pixel_y = 8
 	},
 /obj/item/gun/ballistic/shotgun/bulldog/inteq/no_mag{
-	pixel_x = -12;
+	pixel_x = -12
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
@@ -6310,6 +6315,7 @@
 /obj/machinery/atmospherics/pipe/simple/purple/hidden{
 	dir = 4
 	},
+/obj/machinery/igniter/incinerator_atmos,
 /turf/open/floor/engine/vacuum,
 /area/ship/engineering/engine)
 "Ps" = (
@@ -7253,7 +7259,6 @@
 	},
 /obj/machinery/button/door{
 	id = "talos_tank_burn";
-	name = "Access Door Control";
 	pixel_x = 4;
 	pixel_y = 21;
 	req_access = null;
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
index 8314f17e288c..b05fd520c158 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
@@ -263,9 +263,6 @@
 	},
 /area/ship/maintenance/starboard)
 "cv" = (
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
 /obj/machinery/igniter/incinerator_atmos,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -426,7 +423,6 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/crew)
 "dZ" = (
-/obj/effect/spawner/lootdrop/maintenance,
 /obj/effect/turf_decal/ntspaceworks_big/one{
 	dir = 4
 	},
@@ -2843,9 +2839,6 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/fore)
 "CF" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8
-	},
 /obj/effect/spawner/structure/window/plasma/reinforced,
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
@@ -4360,9 +4353,6 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering/engine)
 "Sv" = (
-/obj/structure/disposalpipe/segment{
-	dir = 9
-	},
 /obj/machinery/power/generator{
 	dir = 4
 	},
@@ -4906,7 +4896,6 @@
 /area/ship/hallway/fore)
 "WN" = (
 /obj/machinery/atmospherics/components/binary/circulator,
-/obj/structure/disposalpipe/segment,
 /turf/open/floor/engine,
 /area/ship/engineering/engine)
 "WR" = (
@@ -5257,9 +5246,13 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/fore)
 "ZS" = (
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/button/ignition/incinerator/atmos{
+	dir = 4;
+	pixel_x = -23;
+	pixel_y = -3
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "ZX" = (