diff --git a/maps/placeholder/placeholder-1_deck_1.dmm b/maps/placeholder/placeholder-1_deck_1.dmm
index a4596e851a2..6b413080b28 100644
--- a/maps/placeholder/placeholder-1_deck_1.dmm
+++ b/maps/placeholder/placeholder-1_deck_1.dmm
@@ -1560,6 +1560,10 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/engineering/atmos)
+"eK" = (
+/obj/machinery/pipedispenser/disposal,
+/turf/simulated/floor/plating,
+/area/maintenance/vault)
 "eL" = (
 /obj/effect/floor_decal/corner_wide/purple{
 	dir = 6
@@ -1707,7 +1711,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos)
 "fm" = (
-/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/cryopod/robot,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "fn" = (
@@ -3749,7 +3753,7 @@
 	},
 /area/shuttle/escape_pod)
 "ll" = (
-/obj/machinery/atmospherics/pipe/tank/oxygen,
+/obj/machinery/mech_recharger,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "lm" = (
@@ -3862,7 +3866,7 @@
 /turf/simulated/floor/plating,
 /area/engineering/atmos/air)
 "lG" = (
-/obj/machinery/atmospherics/pipe/tank,
+/obj/machinery/recharge_station,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "lH" = (
@@ -4011,7 +4015,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/engineering/atmos)
 "me" = (
-/obj/machinery/pipedispenser/disposal,
+/obj/machinery/portable_atmospherics/canister/nitrogen,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "mf" = (
@@ -4557,7 +4561,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "nM" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
+/obj/machinery/portable_atmospherics/canister/hydrogen,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "nN" = (
@@ -4966,7 +4970,7 @@
 /turf/simulated/floor/plating,
 /area/shuttle/escape_pod)
 "pc" = (
-/obj/machinery/portable_atmospherics/canister/empty,
+/obj/machinery/atmospherics/pipe/tank/oxygen,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "pf" = (
@@ -5007,7 +5011,7 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/kitchen/freezer)
 "pn" = (
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/obj/machinery/atmospherics/pipe/tank,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "pp" = (
@@ -5108,7 +5112,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "pD" = (
-/obj/machinery/portable_atmospherics/canister/nitrogen,
+/obj/machinery/portable_atmospherics/canister/air,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "pE" = (
@@ -5153,7 +5157,7 @@
 /turf/simulated/floor/plating,
 /area/engineering/storage/lower)
 "pJ" = (
-/obj/machinery/portable_atmospherics/canister/hydrogen,
+/obj/machinery/portable_atmospherics/canister/phoron,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "pK" = (
@@ -5746,7 +5750,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "rD" = (
-/obj/machinery/portable_atmospherics/canister/phoron,
+/obj/machinery/portable_atmospherics/canister/sleeping_agent,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "rE" = (
@@ -5951,7 +5955,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenoarch_atrium)
 "sk" = (
-/obj/machinery/portable_atmospherics/canister/sleeping_agent,
+/obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "sl" = (
@@ -9150,6 +9154,10 @@
 /obj/structure/grille,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
+"CD" = (
+/obj/machinery/pipedispenser,
+/turf/simulated/floor/plating,
+/area/maintenance/vault)
 "CE" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/loot,
@@ -10435,19 +10443,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenoarch_atrium)
 "Gz" = (
-/obj/structure/ladder/up{
-	pixel_y = 13
-	},
-/obj/structure/lattice/catwalk/indoor,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
+/obj/machinery/portable_atmospherics/canister/empty,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "GA" = (
@@ -11391,6 +11387,9 @@
 /obj/structure/cable{
 	icon_state = "12-0"
 	},
+/obj/structure/ladder/up{
+	pixel_y = 13
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "Jp" = (
@@ -14144,7 +14143,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "Rp" = (
-/obj/machinery/pipedispenser,
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "Rr" = (
@@ -39766,8 +39765,8 @@ RI
 SK
 rg
 LK
-LK
-LK
+me
+me
 LK
 kA
 oB
@@ -39968,9 +39967,9 @@ RI
 Ru
 bE
 LK
-LK
-LK
-LK
+nM
+pJ
+pJ
 kA
 ZQ
 ZQ
@@ -40170,9 +40169,9 @@ RI
 hH
 rg
 LK
-LK
-LK
-LK
+nM
+rD
+rD
 kA
 Qi
 XT
@@ -40372,9 +40371,9 @@ RI
 Gu
 rg
 LK
-LK
-LK
-LK
+pc
+sk
+sk
 kA
 nr
 hG
@@ -40574,9 +40573,9 @@ RI
 Gu
 rg
 LK
-LK
-LK
-LK
+pn
+Gz
+Gz
 kA
 Vm
 Aj
@@ -40776,9 +40775,9 @@ RI
 Gu
 rg
 LK
-LK
-LK
-LK
+pD
+Rp
+Rp
 kA
 Vm
 uC
@@ -40980,7 +40979,7 @@ rg
 LK
 LK
 LK
-LK
+CD
 kA
 xq
 yQ
@@ -41182,7 +41181,7 @@ rg
 LK
 LK
 LK
-LK
+eK
 kA
 kA
 kA
@@ -41384,7 +41383,7 @@ rg
 LK
 LK
 LK
-LK
+pD
 Ab
 GX
 GX
@@ -42170,11 +42169,11 @@ bh
 cR
 Kq
 hq
-ll
-nM
-nM
-pD
-pD
+LK
+LK
+rg
+LK
+LK
 LK
 LK
 LK
@@ -42371,13 +42370,13 @@ jD
 WB
 Nv
 Kq
-Rp
-lG
-pc
-pc
-pJ
-rD
-rD
+LK
+LK
+LK
+rg
+Nr
+LK
+LK
 LK
 LK
 LK
@@ -42573,20 +42572,20 @@ jD
 GU
 cT
 Kq
-me
+LK
+LK
+LK
+rg
+LK
+LK
+LK
+LK
+LK
+LK
+LK
+LK
 fm
-pn
-pn
-pJ
-sk
-sk
-LK
-LK
-LK
-LK
-LK
-LK
-LK
+ll
 LK
 rg
 rg
@@ -42775,20 +42774,20 @@ jD
 bQ
 cW
 Kq
+LK
+LK
+LK
+FO
+FO
+FO
+FO
+FO
+FO
+FO
+LK
+LK
 fm
-LK
-LK
-FO
-FO
-FO
-FO
-FO
-FO
-FO
-LK
-LK
-LK
-LK
+lG
 LK
 LK
 LK
@@ -45213,7 +45212,7 @@ aa
 aa
 aa
 hq
-Gz
+tZ
 NV
 NV
 NV
diff --git a/maps/placeholder/placeholder-2_deck_2.dmm b/maps/placeholder/placeholder-2_deck_2.dmm
index 84039a9ebc1..ac9b4dbbac2 100644
--- a/maps/placeholder/placeholder-2_deck_2.dmm
+++ b/maps/placeholder/placeholder-2_deck_2.dmm
@@ -2249,8 +2249,9 @@
 /turf/simulated/floor/plating,
 /area/medical/exam)
 "cyG" = (
-/obj/effect/map_effect/wingrille_spawn/reinforced,
-/turf/simulated/floor/tiled/dark,
+/obj/structure/window/shuttle/placeholder,
+/obj/structure/grille,
+/turf/simulated/floor/plating,
 /area/turret_protected/ai)
 "cyZ" = (
 /obj/structure/disposalpipe/segment{
@@ -5255,14 +5256,14 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/mail_room)
 "gat" = (
-/obj/structure/computerframe,
+/obj/structure/table/standard,
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai_upload)
 "gax" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/structure/ladder{
+	pixel_y = 16
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/open,
 /area/maintenance/vault)
 "gaA" = (
 /obj/structure/cable/green{
@@ -6401,9 +6402,9 @@
 /turf/simulated/floor/plating,
 /area/hallway/primary/central_two)
 "hpw" = (
-/obj/machinery/computer/robotics,
-/turf/simulated/floor/reinforced,
-/area/maintenance/vault)
+/obj/machinery/computer/aiupload,
+/turf/simulated/floor/bluegrid,
+/area/turret_protected/ai_upload)
 "hpG" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -8150,9 +8151,9 @@
 /turf/simulated/open,
 /area/hallway/engineering)
 "jsI" = (
-/obj/machinery/computer/aiupload,
-/turf/simulated/floor/reinforced,
-/area/maintenance/vault)
+/obj/machinery/computer/borgupload,
+/turf/simulated/floor/bluegrid,
+/area/turret_protected/ai_upload)
 "jsS" = (
 /obj/structure/table/reinforced,
 /obj/machinery/recharger{
@@ -8722,8 +8723,8 @@
 /obj/item/aiModule/robocop,
 /obj/item/aiModule/paladin,
 /obj/item/aiModule/corp,
-/turf/simulated/floor/reinforced,
-/area/maintenance/vault)
+/turf/simulated/floor/carpet/rubber,
+/area/server)
 "kbM" = (
 /obj/machinery/door/airlock/maintenance_hatch,
 /turf/simulated/floor/plating,
@@ -8863,8 +8864,12 @@
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical)
 "kpi" = (
-/turf/simulated/floor/reinforced,
-/area/maintenance/vault)
+/obj/structure/table/standard,
+/obj/item/aiModule/freeformcore,
+/obj/item/aiModule/asimov,
+/obj/item/aiModule/nanotrasen,
+/turf/simulated/floor/carpet/rubber,
+/area/server)
 "kqi" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -9183,9 +9188,12 @@
 /turf/simulated/floor/tiled/white,
 /area/assembly/chargebay)
 "kGX" = (
-/obj/machinery/cryopod/robot,
-/turf/simulated/floor/plating,
-/area/maintenance/vault)
+/obj/structure/table/standard,
+/obj/item/aiModule/teleporterOffline,
+/obj/item/aiModule/antimov,
+/obj/item/aiModule/purge,
+/turf/simulated/floor/carpet/rubber,
+/area/server)
 "kHj" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -10724,9 +10732,8 @@
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
 "mve" = (
-/obj/structure/lattice,
-/obj/structure/cable{
-	icon_state = "11-1"
+/obj/structure/ladder{
+	pixel_y = 16
 	},
 /obj/structure/railing/mapped,
 /turf/simulated/open,
@@ -11108,9 +11115,12 @@
 /turf/simulated/floor/plating,
 /area/hallway/engineering)
 "mRW" = (
-/obj/item/modular_computer/console/preset/ai,
-/turf/simulated/floor/reinforced,
-/area/maintenance/vault)
+/obj/structure/table/standard,
+/obj/item/aiModule/oneHuman,
+/obj/item/aiModule/oxygen,
+/obj/item/aiModule/freeformcore,
+/turf/simulated/floor/carpet/rubber,
+/area/server)
 "mSR" = (
 /obj/machinery/door/airlock/multi_tile/glass{
 	dir = 2
@@ -12074,9 +12084,6 @@
 /area/medical/reception)
 "obZ" = (
 /obj/machinery/door/airlock/research,
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /turf/simulated/floor/tiled,
 /area/rnd/misc_lab)
 "ocm" = (
@@ -12129,13 +12136,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/security/brig)
-"ohP" = (
-/obj/structure/ladder{
-	pixel_y = 16
-	},
-/obj/structure/railing/mapped,
-/turf/simulated/open,
-/area/maintenance/vault)
 "ohQ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -13227,10 +13227,6 @@
 "pxY" = (
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hor)
-"pyi" = (
-/obj/machinery/computer/borgupload,
-/turf/simulated/floor/reinforced,
-/area/maintenance/vault)
 "pyJ" = (
 /obj/machinery/shower{
 	dir = 1
@@ -13906,14 +13902,6 @@
 /obj/structure/lattice,
 /turf/simulated/open,
 /area/maintenance/vault)
-"qof" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/railing/mapped,
-/obj/machinery/light/small/emergency{
-	dir = 1
-	},
-/turf/simulated/floor/plating,
-/area/maintenance/vault)
 "qqs" = (
 /obj/structure/coatrack{
 	pixel_x = 4
@@ -16750,13 +16738,6 @@
 /obj/machinery/light,
 /turf/simulated/floor/grass/alt,
 /area/hydroponics)
-"tiG" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/maintenance/vault)
 "tje" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced,
 /turf/simulated/floor/plating,
@@ -17237,13 +17218,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/or2)
-"tST" = (
-/obj/structure/table/standard,
-/obj/item/aiModule/freeformcore,
-/obj/item/aiModule/asimov,
-/obj/item/aiModule/nanotrasen,
-/turf/simulated/floor/reinforced,
-/area/maintenance/vault)
 "tTD" = (
 /obj/machinery/power/apc{
 	dir = 8;
@@ -18070,13 +18044,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/reinforced,
 /area/quartermaster/break_room)
-"uQd" = (
-/obj/structure/table/standard,
-/obj/item/aiModule/oneHuman,
-/obj/item/aiModule/oxygen,
-/obj/item/aiModule/freeformcore,
-/turf/simulated/floor/reinforced,
-/area/maintenance/vault)
 "uQQ" = (
 /obj/machinery/light,
 /turf/simulated/floor/tiled/dark,
@@ -18121,10 +18088,6 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/engineering/engine_room)
-"uTh" = (
-/obj/machinery/mech_recharger,
-/turf/simulated/floor/plating,
-/area/maintenance/vault)
 "uTn" = (
 /obj/machinery/door/airlock/glass_security,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -20308,10 +20271,6 @@
 "xzV" = (
 /turf/simulated/floor/tiled/freezer,
 /area/security/main)
-"xBd" = (
-/obj/machinery/recharge_station,
-/turf/simulated/floor/plating,
-/area/maintenance/vault)
 "xBg" = (
 /obj/machinery/optable,
 /turf/simulated/floor/tiled/dark,
@@ -20338,13 +20297,6 @@
 "xBX" = (
 /turf/simulated/floor/tiled,
 /area/security/security_office)
-"xCv" = (
-/obj/structure/table/standard,
-/obj/item/aiModule/teleporterOffline,
-/obj/item/aiModule/antimov,
-/obj/item/aiModule/purge,
-/turf/simulated/floor/reinforced,
-/area/maintenance/vault)
 "xCx" = (
 /obj/machinery/door/airlock/medical,
 /obj/structure/cable/green{
@@ -45755,10 +45707,10 @@ hyS
 hyS
 hyS
 hyS
-kpi
-kpi
-kbC
-xCv
+hyS
+hyS
+hyS
+hyS
 hyS
 lcs
 vQd
@@ -45957,11 +45909,11 @@ hyS
 hyS
 hyS
 hyS
-jsI
-kpi
-tST
-uQd
-gax
+hyS
+hyS
+hyS
+hyS
+hyS
 obZ
 nXQ
 nXQ
@@ -46157,12 +46109,12 @@ aPy
 uEq
 hyS
 hyS
-kGX
-uTh
-pyi
-kpi
-mRW
-mRW
+hyS
+hyS
+hyS
+hyS
+hyS
+hyS
 hyS
 lcs
 vQd
@@ -46357,14 +46309,14 @@ bLB
 aPy
 aPy
 uEq
+gax
+hyS
+hyS
+hyS
+hyS
+hyS
 hyS
 hyS
-kGX
-xBd
-hpw
-hpw
-mRW
-mRW
 hyS
 lcs
 otf
@@ -46768,7 +46720,7 @@ rMw
 juY
 iXI
 gat
-gat
+hpw
 gat
 cer
 pxY
@@ -47980,7 +47932,7 @@ xPj
 bhT
 iXI
 gat
-gat
+jsI
 gat
 cer
 cer
@@ -48993,7 +48945,7 @@ hyS
 hyS
 hyS
 hst
-qof
+sVB
 weq
 weq
 weq
@@ -49195,7 +49147,7 @@ hyS
 hyS
 hyS
 hst
-ohP
+sVB
 weq
 weq
 weq
@@ -49396,7 +49348,7 @@ kEh
 hyS
 hyS
 hyS
-tiG
+hst
 mve
 weq
 weq
@@ -49413,8 +49365,8 @@ rDh
 rDh
 eZp
 gKG
-ihe
-ihe
+kbC
+kGX
 gKG
 sYc
 sYc
@@ -49615,8 +49567,8 @@ rVL
 rDh
 eZp
 gKG
-ihe
-ihe
+kpi
+mRW
 gKG
 uoz
 lRx
diff --git a/maps/placeholder/placeholder-3_deck_3.dmm b/maps/placeholder/placeholder-3_deck_3.dmm
index 4d6e1e62884..df02141df2a 100644
--- a/maps/placeholder/placeholder-3_deck_3.dmm
+++ b/maps/placeholder/placeholder-3_deck_3.dmm
@@ -9499,6 +9499,7 @@
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
 "WC" = (
+/obj/item/modular_computer/console/preset/ai,
 /turf/simulated/floor/bluegrid,
 /area/turret_protected/ai)
 "WH" = (