diff --git a/maps/intrepid/intrepid1.dmm b/maps/intrepid/intrepid1.dmm
index d1a03acfbe..ccf06bc805 100644
--- a/maps/intrepid/intrepid1.dmm
+++ b/maps/intrepid/intrepid1.dmm
@@ -629,6 +629,18 @@
 	},
 /turf/simulated/floor,
 /area/shuttle/research/maint)
+"aNE" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/tele_beacon{
+	identifier = "Fore Portside Wing"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/intrepid/misc/hallway/portside)
 "aNF" = (
 /obj/structure/table/standard,
 /obj/item/reagent_containers/spray/cleaner,
@@ -1189,6 +1201,11 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/blast/regular/open{
+	dir = 4;
+	icon_state = "pdoor0";
+	id_tag = "bridgewindow"
+	},
 /turf/simulated/floor,
 /area/intrepid/department/command/bridge)
 "bkC" = (
@@ -2089,6 +2106,11 @@
 	dir = 4
 	},
 /obj/effect/wingrille_spawn/reinforced/full,
+/obj/machinery/door/blast/regular/open{
+	dir = 4;
+	icon_state = "pdoor0";
+	id_tag = "bridgewindow"
+	},
 /turf/simulated/floor,
 /area/intrepid/department/command/bridge)
 "ccy" = (
@@ -4573,6 +4595,10 @@
 /obj/random_multi/single_item/boombox,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/pandora/lifesupport)
+"epR" = (
+/obj/machinery/constructable_frame,
+/turf/simulated/wall/r_wall/prepainted,
+/area/intrepid/misc/maint/portside)
 "eqG" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
@@ -4906,6 +4932,21 @@
 	},
 /turf/simulated/wall/r_wall/hull,
 /area/intrepid/misc/maint/starboard)
+"eGP" = (
+/obj/effect/floor_decal/corner/red{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/intrepid/department/security/wing)
 "eGY" = (
 /obj/machinery/power/smes/buildable/preset/torch/substation_full{
 	RCon_tag = "Substation - Amidship"
@@ -6426,7 +6467,9 @@
 /area/security/prison)
 "goc" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/closet/crate,
+/obj/structure/closet/crate{
+	name = "materials crate"
+	},
 /obj/item/stack/material/steel/fifty,
 /obj/item/stack/material/steel/fifty,
 /obj/item/stack/material/glass/fifty,
@@ -6906,6 +6949,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/intrepid/department/security/wing)
 "gTe" = (
@@ -6925,6 +6971,10 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/engineering/monitoring)
+"gVc" = (
+/obj/machinery/constructable_frame,
+/turf/simulated/floor,
+/area/intrepid/misc/maint/portside)
 "gVi" = (
 /obj/effect/paint/red,
 /obj/effect/paint_stripe/paleblue,
@@ -7772,6 +7822,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/intrepid/department/security/wing)
 "hMs" = (
@@ -10870,6 +10923,15 @@
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/portside)
+"kUW" = (
+/obj/machinery/button/blast_door{
+	dir = 1;
+	id_tag = "bridgewindow";
+	name = "Bridge Window blast door button";
+	pixel_y = -27
+	},
+/turf/simulated/floor/tiled/dark,
+/area/intrepid/department/command/bridge)
 "kVn" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -11916,7 +11978,6 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/obj/structure/closet/walllocker,
 /turf/simulated/floor/tiled/techmaint,
 /area/intrepid/department/engineering/assembly/robotics)
 "maK" = (
@@ -13800,6 +13861,11 @@
 /obj/structure/table/rack,
 /turf/simulated/floor/tiled,
 /area/intrepid/department/cargo/cargobay)
+"nEQ" = (
+/obj/effect/wallframe_spawn/reinforced,
+/obj/structure/cable/green,
+/turf/simulated/floor,
+/area/intrepid/department/security/wing)
 "nFG" = (
 /obj/structure/bed/chair/office/comfy/yellow,
 /turf/simulated/floor/tiled/techfloor,
@@ -15289,6 +15355,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled/dark/monotile,
 /area/intrepid/department/security/wing)
 "pbc" = (
@@ -15436,6 +15505,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
+/obj/machinery/tele_beacon{
+	identifier = "Fore Starboard Wing"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/intrepid/misc/hallway/starboard)
 "pif" = (
@@ -16961,6 +17033,12 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
+/obj/machinery/button/blast_door{
+	dir = 8;
+	pixel_x = 25;
+	id_tag = "bridgewindow";
+	name = "Bridge Window blast door button"
+	},
 /turf/simulated/floor/tiled/dark/monotile,
 /area/intrepid/department/command/bridge)
 "qDJ" = (
@@ -17785,9 +17863,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/sleep/bunk)
 "rwe" = (
-/obj/item/caution/cone,
-/turf/simulated/wall/r_wall/prepainted,
-/area/intrepid/department/medical/chemistry)
+/obj/machinery/computer{
+	dir = 1
+	},
+/turf/simulated/floor,
+/area/intrepid/misc/maint/portside)
 "rwt" = (
 /turf/simulated/wall/r_wall/prepainted,
 /area/intrepid/department/command/AI/AIFoyer)
@@ -19157,6 +19237,10 @@
 	pixel_x = 23;
 	pixel_y = 32
 	},
+/obj/structure/hygiene/sink{
+	dir = 4;
+	pixel_x = 12
+	},
 /turf/simulated/floor/tiled/white,
 /area/intrepid/misc/maint/aft)
 "sGK" = (
@@ -19395,6 +19479,7 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/item/caution/cone,
 /turf/simulated/floor/tiled/white,
 /area/shuttle/research/virology)
 "sSX" = (
@@ -19635,6 +19720,12 @@
 	},
 /turf/simulated/floor/tiled/dark/monotile,
 /area/security/prison)
+"tdR" = (
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/tiled/dark,
+/area/intrepid/department/security/wing)
 "tdY" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -21210,6 +21301,9 @@
 /area/intrepid/department/engineering/assembly/robotics)
 "uDQ" = (
 /obj/effect/wallframe_spawn/reinforced,
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
 /turf/simulated/floor,
 /area/intrepid/department/security/wing)
 "uEU" = (
@@ -21310,6 +21404,9 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
 /area/intrepid/department/security/wing)
 "uHl" = (
@@ -21465,6 +21562,9 @@
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 1
 	},
+/obj/machinery/requests_console{
+	pixel_y = 26
+	},
 /turf/simulated/floor/tiled/white,
 /area/intrepid/department/medical/treatment)
 "uPG" = (
@@ -21965,6 +22065,18 @@
 	},
 /turf/space,
 /area/space)
+"vrE" = (
+/obj/machinery/door/firedoor{
+	dir = 4
+	},
+/obj/effect/wingrille_spawn/reinforced/full,
+/obj/machinery/door/blast/regular/open{
+	dir = 8;
+	icon_state = "pdoor0";
+	id_tag = "bridgewindow"
+	},
+/turf/simulated/floor,
+/area/intrepid/department/command/bridge)
 "vso" = (
 /obj/effect/floor_decal/corner/red/mono,
 /turf/simulated/floor/tiled/white/monotile,
@@ -23438,7 +23550,6 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/blue/border,
-/obj/item/caution/cone,
 /turf/simulated/floor/tiled/white,
 /area/intrepid/department/medical/treatment)
 "wLi" = (
@@ -24743,7 +24854,7 @@
 /turf/simulated/floor,
 /area/intrepid/misc/maint/aft)
 "yfs" = (
-/obj/structure/window/reinforced/full,
+/obj/effect/wallframe_spawn/reinforced,
 /turf/simulated/floor,
 /area/intrepid/department/security/armory)
 "yfM" = (
@@ -37972,7 +38083,7 @@ kwA
 wWo
 cao
 jMF
-dlG
+aNE
 tGm
 olh
 wnQ
@@ -45053,7 +45164,7 @@ nTt
 nTt
 wcT
 gAL
-rwe
+gQn
 gQn
 gQn
 gQn
@@ -45262,7 +45373,7 @@ gQn
 tnG
 jOe
 oMt
-vVc
+epR
 rXr
 raF
 cjD
@@ -45425,7 +45536,7 @@ rZr
 rZr
 rZr
 bkB
-ccu
+vrE
 oWX
 vwP
 vUg
@@ -45463,7 +45574,7 @@ sJe
 gQn
 eVK
 fNC
-fNC
+gVc
 vVc
 rXr
 raF
@@ -45665,8 +45776,8 @@ mlM
 gQn
 eVK
 fNC
-fNC
-vVc
+rwe
+epR
 rXr
 raF
 cjD
@@ -45867,7 +45978,7 @@ qeE
 gQn
 eVK
 fNC
-fNC
+gVc
 vVc
 rXr
 raF
@@ -46035,7 +46146,7 @@ xBz
 bjM
 xLP
 ePI
-xBz
+kUW
 mKt
 fbY
 ryl
@@ -50254,8 +50365,8 @@ rHE
 qqt
 lIn
 vWU
-gRQ
-wsX
+eGP
+tdR
 bgv
 dMv
 tYb
@@ -51063,7 +51174,7 @@ tWb
 agP
 bWq
 paO
-uDQ
+nEQ
 skQ
 lUE
 nNT
diff --git a/maps/intrepid/intrepid2.dmm b/maps/intrepid/intrepid2.dmm
index 4ba3cdfc0e..a321a8e1c8 100644
--- a/maps/intrepid/intrepid2.dmm
+++ b/maps/intrepid/intrepid2.dmm
@@ -110,16 +110,13 @@
 /turf/simulated/floor,
 /area/intrepid/department/command/obstructionfielddisperser)
 "aY" = (
-/obj/structure/ship_munition/disperser_charge/emp,
-/obj/structure/railing/mapped,
+/obj/effect/floor_decal/industrial/warning{
+	dir = 1
+	},
 /obj/structure/sign/warning/moving_parts{
 	dir = 8;
 	pixel_x = 32
 	},
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "ion"
-	},
 /turf/simulated/floor,
 /area/intrepid/department/command/obstructionfielddisperser)
 "ba" = (
@@ -221,15 +218,9 @@
 /turf/simulated/floor,
 /area/intrepid/department/command/obstructionfielddisperser)
 "bu" = (
-/obj/structure/ship_munition/disperser_charge/fire,
-/obj/structure/railing/mapped,
-/obj/structure/sign/warning/moving_parts{
-	dir = 8;
-	pixel_x = 32
-	},
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "fire"
+/obj/machinery/door/blast/regular{
+	id_tag = "ofdloading";
+	name = "OFD Loading blast door"
 	},
 /turf/simulated/floor,
 /area/intrepid/department/command/obstructionfielddisperser)
@@ -348,7 +339,8 @@
 "cf" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/blast/regular{
-	id_tag = "ofdbarrel"
+	id_tag = "ofdloading";
+	name = "OFD Loading blast door"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1086,6 +1078,9 @@
 /obj/structure/cable{
 	icon_state = "5-8"
 	},
+/obj/machinery/tele_beacon{
+	identifier = "Top Deck Corridor"
+	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
 "hT" = (
@@ -1196,6 +1191,17 @@
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
+"iq" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+	icon_state = "1-2"
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor,
+/area/intrepid/misc/maint/upper)
 "ir" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -1898,13 +1904,16 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/engineering/engine_room/aux)
 "ow" = (
-/obj/machinery/light{
-	dir = 8
-	},
 /obj/structure/catwalk,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/button/blast_door{
+	dir = 4;
+	pixel_x = -25;
+	name = "OFD Loading blast door button";
+	id_tag = "ofdloading"
+	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
 "ox" = (
@@ -1999,6 +2008,7 @@
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
+/obj/item/caution/cone,
 /turf/simulated/floor/tiled/steel_grid,
 /area/tcommsat)
 "pb" = (
@@ -2373,16 +2383,14 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/civillian/dockbay)
 "sD" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/catwalk,
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/structure/railing/mapped,
+/obj/effect/floor_decal/industrial/warning,
+/obj/structure/sign/warning/moving_parts{
+	dir = 8;
+	pixel_x = 32
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/black,
 /turf/simulated/floor,
-/area/intrepid/misc/maint/upper)
+/area/intrepid/department/command/obstructionfielddisperser)
 "sH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -4380,6 +4388,7 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/item/caution/cone,
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/engineering/engine_room/aux)
 "Ml" = (
@@ -4861,6 +4870,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/fuel,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
 "QC" = (
@@ -5319,6 +5331,7 @@
 /obj/structure/cable/orange{
 	icon_state = "1-2"
 	},
+/obj/item/caution/cone,
 /turf/simulated/floor,
 /area/intrepid/department/engineering/engine_room/aux)
 "Vi" = (
@@ -29184,13 +29197,13 @@ re
 qJ
 bR
 pK
-be
+sD
 by
-aY
+aX
 bh
-bu
+oG
 bC
-yA
+aY
 pK
 Vi
 rB
@@ -29387,11 +29400,11 @@ dV
 Qx
 pK
 pK
-pK
-pK
+bu
+bu
 mF
-pK
-pK
+bu
+bu
 pK
 pK
 Qx
@@ -29588,12 +29601,12 @@ fP
 BM
 VI
 PF
-PF
 ow
+PF
 eS
 xP
 mZ
-sD
+mZ
 mZ
 mZ
 pZ
@@ -29791,7 +29804,7 @@ Jh
 Jh
 GI
 LG
-LG
+iq
 SU
 Zo
 cA