diff --git a/_maps/PentestMaps/Shuttles/syndicate/syndicate_aegis.dmm b/_maps/PentestMaps/Shuttles/syndicate/syndicate_aegis.dmm
index b01354e85b..58806763c7 100644
--- a/_maps/PentestMaps/Shuttles/syndicate/syndicate_aegis.dmm
+++ b/_maps/PentestMaps/Shuttles/syndicate/syndicate_aegis.dmm
@@ -216,6 +216,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 2
 	},
+/obj/machinery/igniter/incinerator_atmos,
 /turf/open/floor/engine/airless,
 /area/ship/engineering)
 "bw" = (
@@ -306,7 +307,6 @@
 /obj/structure/window/reinforced/fulltile,
 /obj/structure/grille,
 /obj/machinery/door/poddoor/shutters{
-	dir = 2;
 	id = "aegis_library";
 	name = "Exterior Shutters"
 	},
@@ -416,7 +416,6 @@
 "di" = (
 /obj/machinery/power/generator,
 /obj/structure/railing{
-	dir = 2;
 	layer = 3.1
 	},
 /obj/structure/cable,
@@ -489,7 +488,6 @@
 /obj/machinery/light/small/directional/north,
 /obj/item/gun/ballistic/automatic/marksman/f4,
 /obj/effect/decal/cleanable/blood/old{
-	pixel_x = 0;
 	pixel_y = 31
 	},
 /turf/open/floor/plating,
@@ -590,7 +588,6 @@
 	dir = 8
 	},
 /obj/structure/railing{
-	dir = 2;
 	layer = 3.1
 	},
 /obj/machinery/door/firedoor/border_only,
@@ -673,7 +670,7 @@
 /obj/machinery/atmospherics/components/unary/passive_vent/layer4{
 	dir = 1
 	},
-/turf/open/floor/plating,
+/turf/open/floor/engine/hull/reinforced,
 /area/ship/engineering)
 "fw" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
@@ -799,9 +796,6 @@
 /turf/open/floor/wood/walnut,
 /area/ship/crew/dorm/dormtwo)
 "gw" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 10
-	},
 /obj/structure/closet/wall/orange/directional/north{
 	name = "Engineering Supplies"
 	},
@@ -818,6 +812,9 @@
 /obj/item/clothing/suit/hooded/wintercoat/engineering,
 /obj/item/clothing/under/rank/engineering/engineer/hazard,
 /obj/item/clothing/under/rank/engineering/engineer/nt/skirt,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "gx" = (
@@ -1233,7 +1230,9 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "jE" = (
-/obj/machinery/atmospherics/components/binary/pump/on/layer4,
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+	name = "TEG Exhaust to Environment"
+	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plating,
@@ -1626,7 +1625,7 @@
 /turf/open/floor/engine/plasma,
 /area/ship/engineering)
 "mS" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{
 	dir = 4
 	},
 /turf/open/floor/engine/n2,
@@ -1734,13 +1733,13 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "nz" = (
-/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{
-	dir = 4
-	},
 /obj/machinery/light/directional/north,
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 5
 	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "nA" = (
@@ -1911,13 +1910,10 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "pn" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 8
-	},
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 4
 	},
+/obj/machinery/atmospherics/components/trinary/filter/atmos/o2,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "pu" = (
@@ -2023,7 +2019,7 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/crew/canteen)
 "qe" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
 	dir = 8
 	},
 /turf/open/floor/engine/plasma,
@@ -2316,7 +2312,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "sE" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{
 	dir = 4
 	},
 /turf/open/floor/engine/o2,
@@ -2429,6 +2425,9 @@
 "tG" = (
 /obj/structure/grille,
 /obj/structure/window/plasma/reinforced/fulltile,
+/obj/machinery/atmospherics/pipe/layer_manifold/visible{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "tJ" = (
@@ -2592,6 +2591,15 @@
 "uU" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/crew/library)
+"uX" = (
+/obj/effect/turf_decal/techfloor/orange{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 6
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
 "uZ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -2642,9 +2650,8 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "vw" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 10
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
@@ -3593,7 +3600,6 @@
 /area/ship/hallway/central)
 "Dt" = (
 /obj/machinery/atmospherics/components/binary/pump{
-	dir = 2;
 	name = "Cooling to TEG"
 	},
 /obj/machinery/atmospherics/pipe/simple/violet/visible/layer1{
@@ -3671,7 +3677,6 @@
 /obj/structure/window/reinforced/fulltile,
 /obj/structure/grille,
 /obj/machinery/door/poddoor/shutters{
-	dir = 2;
 	id = "aegis_bedroom";
 	name = "Exterior Shutters"
 	},
@@ -3880,7 +3885,9 @@
 /obj/effect/turf_decal/trimline/opaque/orange/line{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 5
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Gx" = (
@@ -4036,7 +4043,6 @@
 /obj/item/flashlight,
 /obj/item/flashlight,
 /obj/structure/closet/wall{
-	dir = 2;
 	name = "Equipment closet";
 	pixel_y = 32
 	},
@@ -4045,7 +4051,6 @@
 /area/ship/crew/dorm)
 "It" = (
 /obj/structure/railing{
-	dir = 2;
 	layer = 3.1
 	},
 /obj/machinery/power/smes/engineering,
@@ -4353,6 +4358,15 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
 	},
+/obj/machinery/button/door/incinerator_vent_atmos_aux{
+	dir = 1;
+	pixel_y = -25
+	},
+/obj/machinery/button/ignition/incinerator/atmos{
+	dir = 1;
+	pixel_y = -23;
+	pixel_x = -10
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Lc" = (
@@ -4440,7 +4454,6 @@
 	dir = 4
 	},
 /obj/docking_port/mobile{
-	can_move_docking_ports = 1;
 	dir = 8;
 	launch_status = 0;
 	port_direction = 4
@@ -4667,8 +4680,7 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
-	dir = 4;
-	layer = 2.35
+	dir = 4
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
@@ -4686,7 +4698,6 @@
 /area/ship/crew/canteen)
 "NS" = (
 /obj/machinery/atmospherics/components/binary/pump{
-	dir = 2;
 	name = "Activate Cooling"
 	},
 /obj/machinery/atmospherics/pipe/simple/violet/visible/layer1{
@@ -4714,13 +4725,6 @@
 	},
 /turf/open/floor/wood/walnut,
 /area/ship/crew/library)
-"Os" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/obj/effect/turf_decal/techfloor/orange{
-	dir = 4
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
 "OC" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Medbay"
@@ -4770,12 +4774,14 @@
 /turf/open/floor/carpet/blue,
 /area/ship/crew/library)
 "OW" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 4
-	},
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 1
 	},
+/obj/machinery/atmospherics/components/binary/pump/on{
+	name = "Oxygen to Air and Mix";
+	target_pressure = 1000;
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Pc" = (
@@ -4896,7 +4902,6 @@
 "Qd" = (
 /obj/machinery/atmospherics/pipe/manifold/yellow/visible,
 /obj/structure/railing{
-	dir = 2;
 	layer = 3.1
 	},
 /obj/machinery/door/firedoor/border_only,
@@ -5335,10 +5340,8 @@
 	environment_smash = 0;
 	faction = list("neutral","playerSysndicate");
 	mob_size = 2;
-	move_force = 1000;
 	move_resist = 1000;
 	name = "Wasabi";
-	pull_force = 1000;
 	pixel_x = -2
 	},
 /turf/open/floor/carpet/blue,
@@ -5430,9 +5433,6 @@
 "UC" = (
 /obj/structure/window/plasma/reinforced/fulltile,
 /obj/structure/grille,
-/obj/machinery/atmospherics/pipe/layer_manifold/visible{
-	dir = 4
-	},
 /turf/open/floor/engine/air,
 /area/ship/engineering)
 "UH" = (
@@ -5574,7 +5574,6 @@
 	dir = 4
 	},
 /obj/structure/railing{
-	dir = 2;
 	layer = 3.1
 	},
 /obj/machinery/door/firedoor/border_only,
@@ -5587,6 +5586,14 @@
 /obj/effect/turf_decal/trimline/opaque/blue/line,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
+"Wa" = (
+/obj/structure/window/plasma/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
 "Wb" = (
 /obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 4
@@ -5806,9 +5813,6 @@
 /turf/open/floor/engine/airless,
 /area/ship/external)
 "Xd" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible{
-	dir = 6
-	},
 /obj/structure/closet/wall/orange/directional/north{
 	name = "Engineering Supplies"
 	},
@@ -5828,14 +5832,13 @@
 /obj/item/clothing/suit/hooded/wintercoat/engineering,
 /obj/item/clothing/under/rank/engineering/engineer/hazard,
 /obj/item/clothing/under/rank/engineering/engineer/nt/skirt,
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Xk" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
-	name = "Oxygen to Air and Mix";
-	target_pressure = 1000;
-	dir = 4
-	},
+/obj/machinery/portable_atmospherics/pump,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Xl" = (
@@ -6408,9 +6411,9 @@ SW
 mn
 NO
 eN
-aR
 sE
 md
+aR
 iq
 eN
 eN
@@ -6488,7 +6491,7 @@ Nd
 eN
 OW
 Xk
-PU
+Wa
 mO
 qK
 Wy
@@ -6526,8 +6529,8 @@ SW
 eF
 eN
 nz
+uX
 pn
-Os
 XU
 sN
 Dk