diff --git a/maps/intrepid/intrepid1.dmm b/maps/intrepid/intrepid1.dmm
index 1349e19f23..0008b70f6d 100644
--- a/maps/intrepid/intrepid1.dmm
+++ b/maps/intrepid/intrepid1.dmm
@@ -388,7 +388,7 @@
 /obj/machinery/igniter{
 	id_tag = "portsparker"
 	},
-/turf/simulated/floor/reinforced/carbon_dioxide,
+/turf/simulated/floor/reinforced/phoron/fuel,
 /area/intrepid/department/engineering/portthruster)
 "axh" = (
 /obj/structure/handrail{
@@ -473,6 +473,10 @@
 /obj/effect/overmap/visitable/ship/landable/exploration_shuttle,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/pandora/cockpit)
+"aBm" = (
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/simulated/floor,
+/area/intrepid/misc/maint/aft)
 "aBQ" = (
 /obj/machinery/door/firedoor{
 	dir = 4
@@ -731,7 +735,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/tiled/dark/monotile,
 /area/crew_quarters/sleep/bunk)
 "aPJ" = (
 /obj/structure/cable/green{
@@ -831,7 +835,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/brown,
 /area/crew_quarters/sleep/bunk)
 "aSm" = (
 /obj/structure/table/standard,
@@ -1069,10 +1073,10 @@
 /turf/simulated/wall/r_wall/prepainted,
 /area/intrepid/department/command/bridge)
 "bcJ" = (
+/obj/item/gun/projectile/automatic/t12,
 /obj/structure/closet/secure_closet/guncabinet{
-	name = "ballistic guns cabinet"
+	name = "rifle cabinet"
 	},
-/obj/item/gun/projectile/automatic/t12,
 /turf/simulated/floor/carpet/red,
 /area/intrepid/department/command/commandquarters/cos)
 "bcY" = (
@@ -1086,7 +1090,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/brown,
 /area/crew_quarters/sleep/bunk)
 "bdc" = (
 /obj/structure/railing/mapped{
@@ -1359,7 +1363,7 @@
 	pixel_x = 25;
 	pixel_y = 25
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/carpet/brown,
 /area/intrepid/department/medical/therapy)
 "bpK" = (
 /obj/structure/cable/green{
@@ -2063,7 +2067,7 @@
 /obj/structure/bed/padded,
 /obj/item/bedsheet/brown,
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/brown,
 /area/crew_quarters/sleep/bunk)
 "bYR" = (
 /obj/machinery/light,
@@ -2264,7 +2268,7 @@
 "chN" = (
 /obj/structure/bed/psych,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/carpet/brown,
 /area/intrepid/department/medical/therapy)
 "cin" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -2592,7 +2596,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/tiled/dark/monotile,
 /area/crew_quarters/sleep/bunk)
 "czG" = (
 /obj/structure/bed/chair/comfy{
@@ -2991,7 +2995,7 @@
 	id = "combustion_portside";
 	use_power = 1
 	},
-/turf/simulated/floor/reinforced/carbon_dioxide,
+/turf/simulated/floor/reinforced/phoron/fuel,
 /area/intrepid/department/engineering/starboardthruster)
 "cRV" = (
 /turf/simulated/wall/r_wall/prepainted,
@@ -3091,9 +3095,9 @@
 /turf/simulated/floor,
 /area/space)
 "cZl" = (
-/obj/structure/table/woodentable,
 /obj/item/modular_computer/laptop/preset/custom_loadout/standard,
-/turf/simulated/floor/wood,
+/obj/structure/table/woodentable/walnut,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "daH" = (
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -3456,13 +3460,11 @@
 /turf/simulated/wall/r_wall/prepainted,
 /area/intrepid/misc/maint/internalstarboard)
 "dnJ" = (
-/obj/structure/table/standard,
-/obj/item/storage/secure/safe{
-	pixel_x = -26;
-	name = "captain's safe"
-	},
 /obj/item/gun/projectile/revolver,
 /obj/item/ammo_magazine/speedloader/magnum,
+/obj/structure/closet/secure_closet/guncabinet{
+	name = "revolver cabinet"
+	},
 /turf/simulated/floor/carpet/blue,
 /area/intrepid/department/command/commandquarters/co)
 "doc" = (
@@ -3560,7 +3562,7 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/brown,
 /area/crew_quarters/sleep/bunk)
 "dvi" = (
 /obj/structure/cable/green{
@@ -4158,6 +4160,7 @@
 /obj/effect/floor_decal/corner/research/border{
 	dir = 9
 	},
+/obj/item/stack/material/phoron/ten,
 /turf/simulated/floor/tiled/white,
 /area/shuttle/research/xenobiolab)
 "dSo" = (
@@ -4294,7 +4297,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/brown,
 /area/crew_quarters/sleep/bunk)
 "dWI" = (
 /obj/machinery/power/apc{
@@ -4839,7 +4842,7 @@
 /area/intrepid/misc/hallway/portside)
 "euB" = (
 /obj/structure/undies_wardrobe,
-/turf/simulated/floor/carpet/blue2,
+/turf/simulated/floor/carpet/blue3,
 /area/intrepid/department/command/commandquarters/cmo)
 "euE" = (
 /obj/structure/bed/chair{
@@ -5136,6 +5139,18 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/intrepid/department/command/bridgeofficer)
+"eHX" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/brown,
+/area/intrepid/department/medical/therapy)
 "eIg" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
@@ -5229,6 +5244,15 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/intrepid/department/exploration/hangar)
+"eOt" = (
+/obj/structure/mattress,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/beans{
+	pixel_y = -6;
+	pixel_x = -10
+	},
+/turf/simulated/floor/tiled,
+/area/intrepid/misc/maint/aft)
 "ePa" = (
 /obj/structure/girder,
 /turf/simulated/floor,
@@ -6707,6 +6731,10 @@
 /obj/machinery/cell_charger,
 /turf/simulated/floor/tiled/white,
 /area/intrepid/department/medical/treatment)
+"gpO" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/tiled,
+/area/intrepid/misc/maint/aft)
 "gpY" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -7488,7 +7516,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/tiled/dark/monotile,
 /area/crew_quarters/sleep/bunk)
 "hgp" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -7770,7 +7798,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "huo" = (
 /obj/effect/paint/expeditionary,
@@ -8150,7 +8178,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/tiled/dark/monotile,
 /area/crew_quarters/sleep/bunk)
 "hRh" = (
 /obj/structure/table/standard,
@@ -8964,7 +8992,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "iEk" = (
 /obj/machinery/alarm{
@@ -9724,7 +9752,8 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/simulated/floor/wood,
+/obj/item/stool/padded,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "jtt" = (
 /obj/structure/cable/orange{
@@ -10278,7 +10307,7 @@
 /area/intrepid/misc/hallway/center)
 "jQl" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/brown,
 /area/crew_quarters/sleep/bunk)
 "jQx" = (
 /turf/simulated/wall/r_wall/prepainted,
@@ -10551,7 +10580,7 @@
 /area/space)
 "khp" = (
 /obj/structure/closet/secure_closet/counselor,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "khB" = (
 /obj/effect/floor_decal/corner/research/border{
@@ -11077,7 +11106,7 @@
 	dir = 6;
 	icon_state = "intact"
 	},
-/turf/simulated/floor/reinforced/carbon_dioxide,
+/turf/simulated/floor/reinforced/phoron/fuel,
 /area/intrepid/department/engineering/portthruster)
 "kLs" = (
 /obj/machinery/door/airlock/highsecurity/bolted,
@@ -11414,6 +11443,9 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/intrepid/department/command/bridgeofficer)
+"leD" = (
+/turf/simulated/floor/wood/walnut,
+/area/intrepid/department/medical/therapy)
 "lfm" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -12014,7 +12046,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "lDg" = (
 /obj/machinery/power/smes/buildable/preset/torch/shuttle{
@@ -12281,7 +12313,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/brown,
 /area/crew_quarters/sleep/bunk)
 "lXj" = (
 /obj/effect/floor_decal/corner/green{
@@ -12397,7 +12429,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/tiled/dark/monotile,
 /area/crew_quarters/sleep/bunk)
 "mda" = (
 /obj/structure/cable{
@@ -12581,7 +12613,7 @@
 /obj/machinery/igniter{
 	id_tag = "starboardsparker"
 	},
-/turf/simulated/floor/reinforced/carbon_dioxide,
+/turf/simulated/floor/reinforced/phoron/fuel,
 /area/intrepid/department/engineering/starboardthruster)
 "mio" = (
 /obj/machinery/optable,
@@ -12604,7 +12636,7 @@
 	id = "combustion_portside";
 	use_power = 1
 	},
-/turf/simulated/floor/reinforced/carbon_dioxide,
+/turf/simulated/floor/reinforced/phoron/fuel,
 /area/intrepid/department/engineering/portthruster)
 "miw" = (
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -13125,7 +13157,7 @@
 /area/intrepid/misc/hallway/portside)
 "mFo" = (
 /obj/structure/bed/chair/armchair/brown,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/carpet/brown,
 /area/intrepid/department/medical/therapy)
 "mFy" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -13614,7 +13646,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "mXM" = (
 /obj/structure/table/standard,
@@ -13828,7 +13860,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/brown,
 /area/crew_quarters/sleep/bunk)
 "nja" = (
 /obj/structure/bed/chair/office{
@@ -14007,7 +14039,7 @@
 /area/security/prison)
 "nrM" = (
 /obj/structure/bookcase,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "nsg" = (
 /obj/structure/dispenser/oxygen,
@@ -14285,7 +14317,8 @@
 /turf/simulated/floor/tiled/dark,
 /area/intrepid/department/security/armory_tactical)
 "nGw" = (
-/turf/simulated/floor/wood,
+/obj/structure/flora/pottedplant/floorleaf,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "nGD" = (
 /obj/effect/floor_decal/corner/red{
@@ -15050,9 +15083,9 @@
 /turf/simulated/floor,
 /area/intrepid/misc/maint/portside)
 "oui" = (
-/obj/structure/table/woodentable,
 /obj/machinery/photocopier/faxmachine,
-/turf/simulated/floor/wood,
+/obj/structure/table/woodentable/walnut,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "ovZ" = (
 /obj/structure/cable/orange{
@@ -15201,7 +15234,7 @@
 "oAv" = (
 /obj/item/bedsheet/medical,
 /obj/structure/bed/padded,
-/turf/simulated/floor/carpet/blue2,
+/turf/simulated/floor/carpet/blue3,
 /area/intrepid/department/command/commandquarters/cmo)
 "oAH" = (
 /obj/machinery/smartfridge,
@@ -15520,7 +15553,7 @@
 /turf/simulated/floor/tiled/dark/airless,
 /area/intrepid/department/command/AI/AIFoyer)
 "oPj" = (
-/turf/simulated/floor/carpet/blue2,
+/turf/simulated/floor/carpet/blue3,
 /area/intrepid/department/command/commandquarters/cmo)
 "oQj" = (
 /obj/structure/table/standard,
@@ -15831,7 +15864,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/brown,
 /area/crew_quarters/sleep/bunk)
 "paO" = (
 /obj/machinery/door/airlock/glass/security,
@@ -16147,7 +16180,7 @@
 /area/shuttle/research/hallway)
 "ptB" = (
 /obj/machinery/psi_meter,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "ptD" = (
 /obj/machinery/computer/ship/navigation,
@@ -17741,11 +17774,14 @@
 /turf/simulated/floor,
 /area/intrepid/department/engineering/starboardthruster)
 "qMl" = (
-/obj/structure/table/woodentable,
 /obj/machinery/alarm{
 	pixel_y = 23
 	},
-/turf/simulated/floor/wood,
+/obj/structure/table/woodentable/walnut,
+/obj/structure/flora/pottedplant/deskferntrim{
+	pixel_y = 8
+	},
+/turf/simulated/floor/carpet/brown,
 /area/intrepid/department/medical/therapy)
 "qMr" = (
 /obj/effect/shuttle_landmark/stardust/out,
@@ -18457,7 +18493,7 @@
 "rxw" = (
 /obj/structure/table/standard,
 /obj/item/rig/medical/equipped,
-/turf/simulated/floor/carpet/blue2,
+/turf/simulated/floor/carpet/blue3,
 /area/intrepid/department/command/commandquarters/cmo)
 "ryl" = (
 /obj/structure/closet/secure_closet/guncabinet/PPE,
@@ -18842,7 +18878,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "rMM" = (
 /obj/machinery/artifact_harvester,
@@ -18874,7 +18910,7 @@
 /obj/machinery/igniter{
 	id_tag = "starboardsparker"
 	},
-/turf/simulated/floor/reinforced/carbon_dioxide,
+/turf/simulated/floor/reinforced/phoron/fuel,
 /area/intrepid/department/engineering/starboardthruster)
 "rOx" = (
 /obj/machinery/computer/rdconsole/core{
@@ -19583,7 +19619,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/tiled/dark/monotile,
 /area/crew_quarters/sleep/bunk)
 "swI" = (
 /obj/structure/closet/secure_closet/guncabinet,
@@ -20378,7 +20414,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/brown,
 /area/crew_quarters/sleep/bunk)
 "tfT" = (
 /obj/effect/floor_decal/industrial/warning,
@@ -21598,7 +21634,7 @@
 /obj/structure/bed/padded,
 /obj/item/bedsheet/green,
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/brown,
 /area/crew_quarters/sleep/bunk)
 "ulf" = (
 /obj/structure/bed/chair/comfy/captain{
@@ -21712,7 +21748,7 @@
 /area/intrepid/misc/hallway/center)
 "upK" = (
 /obj/machinery/light/small,
-/turf/simulated/floor/carpet/blue2,
+/turf/simulated/floor/carpet/blue3,
 /area/intrepid/department/command/commandquarters/cmo)
 "uqS" = (
 /obj/machinery/power/smes/buildable/preset/torch/shuttle,
@@ -21812,7 +21848,7 @@
 /area/intrepid/department/engineering/primarythruster)
 "uvv" = (
 /obj/structure/table/standard,
-/turf/simulated/floor/carpet/blue2,
+/turf/simulated/floor/carpet/blue3,
 /area/intrepid/department/command/commandquarters/cmo)
 "uvy" = (
 /obj/structure/disposalpipe/segment{
@@ -22177,7 +22213,7 @@
 /area/intrepid/misc/hallway/portside)
 "uND" = (
 /obj/machinery/papershredder,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "uNE" = (
 /obj/structure/table/standard,
@@ -22544,7 +22580,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/brown,
 /area/crew_quarters/sleep/bunk)
 "vhH" = (
 /obj/machinery/door/blast/shutters/open{
@@ -22630,7 +22666,7 @@
 /obj/machinery/door/airlock/civilian{
 	name = "Restroom"
 	},
-/turf/simulated/floor/tiled/white/monotile,
+/turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/sleep/bunk)
 "vmc" = (
 /obj/effect/floor_decal/corner/orange/border{
@@ -23066,12 +23102,12 @@
 /turf/simulated/floor/grass,
 /area/intrepid/department/civillian/hydroponics)
 "vFc" = (
-/obj/structure/table/woodentable,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
 /obj/machinery/light,
-/turf/simulated/floor/wood,
+/obj/structure/table/woodentable/walnut,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "vFH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -23129,7 +23165,7 @@
 /area/intrepid/misc/hallway/portside)
 "vIJ" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "vIX" = (
 /obj/structure/cable{
@@ -23499,7 +23535,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/carpet/brown,
 /area/crew_quarters/sleep/bunk)
 "vZD" = (
 /turf/simulated/floor,
@@ -23574,6 +23610,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/intrepid/misc/hallway/starboard)
+"wfm" = (
+/obj/machinery/vending/snack,
+/turf/simulated/floor/tiled,
+/area/intrepid/misc/maint/aft)
 "wfs" = (
 /obj/effect/wingrille_spawn/reinforced/full,
 /obj/machinery/door/blast/regular{
@@ -23618,9 +23658,9 @@
 /turf/simulated/floor/tiled/dark/monotile,
 /area/intrepid/department/security/armory_tactical)
 "wgV" = (
-/obj/structure/table/woodentable,
 /obj/item/paper_bin,
-/turf/simulated/floor/wood,
+/obj/structure/table/woodentable/walnut,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "whw" = (
 /obj/structure/cable{
@@ -23831,8 +23871,8 @@
 /turf/simulated/floor,
 /area/intrepid/misc/maint/aft)
 "wrp" = (
-/obj/structure/table/woodentable,
-/turf/simulated/floor/wood,
+/obj/structure/table/woodentable/walnut,
+/turf/simulated/floor/wood/walnut,
 /area/intrepid/department/medical/therapy)
 "wrW" = (
 /obj/structure/table/standard,
@@ -24828,7 +24868,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/carpet/brown,
 /area/intrepid/department/medical/therapy)
 "xkQ" = (
 /obj/item/storage/mirror{
@@ -49162,8 +49202,8 @@ qcB
 tHl
 ncK
 qMl
-mXk
-nGw
+eHX
+leD
 wrp
 ncK
 jze
@@ -53744,7 +53784,7 @@ bYa
 wws
 qng
 fWH
-vld
+tYb
 rai
 iYG
 aui
@@ -54755,8 +54795,8 @@ cjD
 bYa
 wws
 qng
-tYb
-tYb
+etu
+etu
 tYb
 pTC
 tIB
@@ -54957,8 +54997,8 @@ cjD
 bYa
 wws
 qng
-tYb
-tYb
+wfm
+aBm
 tYb
 pTC
 tIB
@@ -55159,8 +55199,8 @@ cjD
 bYa
 wws
 qng
-tYb
-tYb
+eOt
+gpO
 tYb
 pTC
 tIB
diff --git a/maps/intrepid/intrepid2.dmm b/maps/intrepid/intrepid2.dmm
index 495ffc44c9..bd84bc3980 100644
--- a/maps/intrepid/intrepid2.dmm
+++ b/maps/intrepid/intrepid2.dmm
@@ -408,12 +408,14 @@
 "cv" = (
 /obj/machinery/embedded_controller/radio/airlock/airlock_controller{
 	dir = 4;
-	id_tag = "ofd_port_airlock_controller";
 	pixel_x = -20;
 	tag_airpump = "ofd_port_airlock_pump";
 	tag_chamber_sensor = "ofd_port_sensor";
 	tag_exterior_door = "ofd_port_exterior_door";
-	tag_interior_door = "ofd_port_interior_door"
+	tag_interior_door = "ofd_port_interior_door";
+	tag_interior_sensor = "ofd_port_interior_sensor";
+	id_tag = "ofd_port_airlock_controller";
+	tag_exterior_sensor = "ofd_port_exterior_sensor"
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	id_tag = "ofd_port_airlock_pump"
@@ -511,6 +513,9 @@
 /obj/structure/cable/green{
 	icon_state = "0-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/intrepid/department/civillian/dockbay)
 "dn" = (
@@ -834,6 +839,12 @@
 /area/intrepid/misc/maint/upper)
 "fU" = (
 /obj/structure/bed/chair/office/comfy/black,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/civillian/dockbay)
 "fV" = (
@@ -862,7 +873,8 @@
 	},
 /obj/machinery/door/airlock/external/glass/bolted{
 	id_tag = "ofd_port_interior_door";
-	name = "OFD Exterior Access"
+	name = "OFD Exterior Access";
+	frequency = 1379
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
@@ -874,6 +886,8 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/techmaint,
 /area/intrepid/department/civillian/dockbay)
 "gm" = (
@@ -1011,6 +1025,9 @@
 "hg" = (
 /obj/structure/closet/secure_closet/personal/empty,
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/intrepid/department/civillian/dockbay)
 "hn" = (
@@ -1060,6 +1077,23 @@
 	},
 /turf/simulated/floor/bluegrid,
 /area/tcommsat)
+"hI" = (
+/obj/structure/table/standard,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/intrepid/department/civillian/dockbay)
+"hN" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/intrepid/department/civillian/dockbay)
 "hP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -1081,6 +1115,11 @@
 	pixel_x = -10;
 	pixel_y = 22
 	},
+/obj/machinery/airlock_sensor/airlock_interior{
+	pixel_y = 22;
+	pixel_x = 1;
+	id_tag = "ofd_port_interior_sensor"
+	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
 "hR" = (
@@ -1143,6 +1182,15 @@
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/space)
+"hW" = (
+/obj/structure/catwalk,
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor,
+/area/intrepid/misc/maint/upper)
 "hX" = (
 /obj/structure/flora/pottedplant/floorleaf,
 /obj/machinery/light{
@@ -1281,7 +1329,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /obj/machinery/door/airlock/external/glass/bolted{
 	id_tag = "ofd_port_interior_door";
-	name = "OFD Exterior Access"
+	name = "OFD Exterior Access";
+	frequency = 1379
 	},
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
@@ -1438,6 +1487,12 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/civillian/dockbay)
 "kN" = (
@@ -1523,6 +1578,8 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/steel_grid,
 /area/intrepid/misc/maint/upper)
 "lg" = (
@@ -1700,7 +1757,8 @@
 	},
 /obj/machinery/door/airlock/external/glass/bolted{
 	id_tag = "ofd_starboard_exterior_door";
-	name = "OFD Interior Access"
+	name = "OFD Interior Access";
+	frequency = 1379
 	},
 /turf/simulated/floor,
 /area/intrepid/department/command/obstructionfielddisperser)
@@ -1936,6 +1994,8 @@
 /obj/machinery/atmospherics/pipe/simple/visible/fuel{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
 "os" = (
@@ -2689,6 +2749,9 @@
 	dir = 8;
 	pixel_x = 22
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/intrepid/department/civillian/dockbay)
 "uF" = (
@@ -3068,6 +3131,11 @@
 	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/tcommsat)
+"xn" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/techfloor,
+/area/intrepid/department/civillian/dockbay)
 "xr" = (
 /obj/structure/bed/chair/office{
 	dir = 8
@@ -3494,6 +3562,14 @@
 	},
 /turf/simulated/floor,
 /area/intrepid/department/command/obstructionfielddisperser)
+"BW" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/techmaint,
+/area/intrepid/department/civillian/dockbay)
 "BX" = (
 /obj/machinery/telecomms/bus/preset_one,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -3763,15 +3839,11 @@
 /obj/structure/cable/orange{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/visible/black{
-	dir = 4
-	},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
 "Fi" = (
@@ -4069,6 +4141,8 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
 "Hk" = (
@@ -4301,6 +4375,9 @@
 "JV" = (
 /obj/structure/closet/firecloset,
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/civillian/dockbay)
 "Ka" = (
@@ -4385,6 +4462,12 @@
 /turf/simulated/floor,
 /area/intrepid/misc/maint/upper)
 "KF" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/civillian/dockbay)
 "KI" = (
@@ -4503,6 +4586,9 @@
 	dir = 4;
 	icon_state = "railing0-1"
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/intrepid/department/civillian/dockbay)
 "LY" = (
@@ -4578,6 +4664,9 @@
 "MH" = (
 /obj/structure/table/standard,
 /obj/item/paper/pamphlet,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/civillian/dockbay)
 "MO" = (
@@ -4592,6 +4681,15 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/intrepid/department/engineering/engine_room/aux)
+"MP" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/intrepid/department/civillian/dockbay)
 "MQ" = (
 /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{
 	dir = 4
@@ -4611,6 +4709,16 @@
 	},
 /turf/simulated/open,
 /area/intrepid/misc/maint/upper)
+"MS" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/techmaint,
+/area/intrepid/department/civillian/dockbay)
 "MZ" = (
 /obj/machinery/atmospherics/binary/pump{
 	dir = 8
@@ -4682,6 +4790,14 @@
 /obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled/dark/monotile,
 /area/eva)
+"Nr" = (
+/obj/structure/closet/secure_closet/personal/empty,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/intrepid/department/civillian/dockbay)
 "Ns" = (
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -5205,6 +5321,10 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/intrepid/department/civillian/dockbay)
 "Sr" = (
@@ -5247,6 +5367,9 @@
 	dir = 8;
 	icon_state = "railing0-1"
 	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/intrepid/department/civillian/dockbay)
 "SN" = (
@@ -5358,6 +5481,8 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/steel_grid,
 /area/intrepid/misc/maint/upper)
 "Ug" = (
@@ -5383,7 +5508,8 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/external/glass/bolted{
 	id_tag = "ofd_port_exterior_door";
-	name = "OFD Interior Access"
+	name = "OFD Interior Access";
+	frequency = 1379
 	},
 /turf/simulated/floor,
 /area/intrepid/department/command/obstructionfielddisperser)
@@ -5401,6 +5527,9 @@
 /area/space)
 "Us" = (
 /obj/structure/filingcabinet/chestdrawer,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/civillian/dockbay)
 "Ut" = (
@@ -5490,6 +5619,12 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/intrepid/department/civillian/dockbay)
 "Vr" = (
@@ -5688,6 +5823,12 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/security,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/intrepid/department/civillian/dockbay)
 "WS" = (
@@ -5865,6 +6006,18 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/intrepid/department/civillian/dockbay)
+"Yw" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/intrepid/department/civillian/dockbay)
 "YC" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -5900,6 +6053,12 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/intrepid/department/civillian/dockbay)
+"YS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/intrepid/department/civillian/dockbay)
 "YV" = (
 /obj/machinery/atmospherics/pipe/simple/visible/universal,
 /obj/machinery/atmospherics/pipe/simple/visible/black{
@@ -5977,6 +6136,11 @@
 	pixel_x = -10;
 	pixel_y = -22
 	},
+/obj/machinery/airlock_sensor/airlock_exterior{
+	pixel_y = -22;
+	pixel_x = 2;
+	id_tag = "ofd_port_exterior_sensor"
+	},
 /turf/simulated/floor/reinforced/airless,
 /area/intrepid/department/command/obstructionfielddisperser)
 "ZA" = (
@@ -5986,6 +6150,15 @@
 	},
 /turf/simulated/floor,
 /area/intrepid/department/engineering/engine_room)
+"ZC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/intrepid/department/civillian/dockbay)
 "ZF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -30137,12 +30310,12 @@ JA
 RH
 hg
 Vr
-hg
+Nr
 RH
 MH
 zg
 UX
-KJ
+hI
 oB
 oB
 oB
@@ -30338,19 +30511,19 @@ ZZ
 JA
 RH
 di
-Vn
+Yw
 Sp
 gi
+MS
+BW
 Vn
-Vn
-Vn
-Vn
+hN
 lf
-PF
-PF
+hW
+hW
 Hf
-PF
-PF
+hW
+hW
 Uf
 oq
 Fa
@@ -30545,7 +30718,7 @@ RH
 RH
 CH
 Pw
-Pw
+MP
 gx
 Ro
 Ro
@@ -30747,7 +30920,7 @@ sC
 uA
 KJ
 Pw
-Pw
+MP
 Yr
 Ro
 LZ
@@ -30943,13 +31116,13 @@ ZZ
 ZZ
 JA
 kL
-KF
+xn
 fU
 fY
 uA
 KJ
 Pw
-Pw
+MP
 Zs
 Ro
 fd
@@ -31151,7 +31324,7 @@ cB
 uA
 KJ
 Pw
-Pw
+MP
 WE
 Ro
 qj
@@ -31353,7 +31526,7 @@ Vw
 RH
 uK
 Pw
-Pw
+MP
 Ms
 Ro
 Ro
@@ -31555,7 +31728,7 @@ cb
 oN
 ei
 Pw
-Pw
+ZC
 SG
 oB
 hX
@@ -31757,7 +31930,7 @@ Ik
 dg
 yD
 Pw
-Pw
+YS
 pL
 Rj
 Rj