diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index e96d6b18a31e..1812775c9027 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -22494,8 +22494,22 @@
 	pixel_x = 8;
 	pixel_y = -32
 	},
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/cleanable/blood/oil,
+/obj/structure/machinery/prop/almayer/computer{
+	dir = 4;
+	pixel_x = 8;
+	pixel_y = 9
+	},
+/obj/item/reagent_container/food/drinks/coffee{
+	pixel_x = 8;
+	pixel_y = -4
+	},
+/obj/item/trash/uscm_mre{
+	pixel_x = -8
+	},
 /turf/open/floor/almayer{
-	icon_state = "orange"
+	icon_state = "silver"
 	},
 /area/almayer/hallways/hangar)
 "bOG" = (
@@ -28973,7 +28987,6 @@
 	pixel_y = 1
 	},
 /turf/open/floor/almayer/no_build{
-	dir = 2;
 	icon_state = "cargo_arrow"
 	},
 /area/almayer/command/airoom)
@@ -29829,14 +29842,14 @@
 	},
 /area/almayer/shipboard/brig/surgery)
 "dgg" = (
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 4;
-	name = "ship-grade camera"
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 1;
 	icon_state = "pipe-c"
 	},
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 4;
+	name = "ship-grade camera"
+	},
 /turf/open/floor/almayer{
 	dir = 8;
 	icon_state = "silver"
@@ -30488,10 +30501,11 @@
 	},
 /area/almayer/shipboard/brig/cryo)
 "dtH" = (
-/obj/structure/bed/chair/comfy{
-	dir = 8
+/obj/effect/decal/cleanable/blood/oil/streak,
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "silver"
 	},
-/turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "dtM" = (
 /turf/open/floor/almayer{
@@ -33117,6 +33131,15 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/squads/delta)
+"ewR" = (
+/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
+	name = "\improper Intel Chute Room";
+	req_access = null
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/hallways/hangar)
 "ewS" = (
 /turf/open/floor/almayer{
 	dir = 8;
@@ -33203,7 +33226,8 @@
 	pixel_y = -32
 	},
 /turf/open/floor/almayer{
-	icon_state = "orange"
+	dir = 10;
+	icon_state = "silver"
 	},
 /area/almayer/hallways/hangar)
 "eyV" = (
@@ -37118,6 +37142,7 @@
 /obj/structure/machinery/light{
 	dir = 1
 	},
+/obj/structure/closet/coffin/woodencrate,
 /turf/open/floor/almayer{
 	icon_state = "test_floor5"
 	},
@@ -42100,10 +42125,10 @@
 	},
 /area/almayer/living/bridgebunks)
 "ivg" = (
-/obj/structure/janitorialcart,
+/obj/structure/closet/crate,
 /turf/open/floor/almayer{
 	dir = 5;
-	icon_state = "orange"
+	icon_state = "silver"
 	},
 /area/almayer/hallways/hangar)
 "ivs" = (
@@ -42256,6 +42281,10 @@
 	unacidable = 1;
 	unslashable = 1
 	},
+/obj/structure/disposalpipe/down/almayer{
+	dir = 2;
+	id = "almayerlink_IO_hanger"
+	},
 /turf/open/floor/almayer/no_build{
 	icon_state = "ai_floors"
 	},
@@ -43132,6 +43161,10 @@
 	pixel_x = -15;
 	pixel_y = 6
 	},
+/obj/structure/disposalpipe/up/almayer{
+	dir = 4;
+	id = "almayerlink_IO_hanger"
+	},
 /turf/open/floor/plating,
 /area/almayer/hull/lower_hull/l_f_p)
 "iUo" = (
@@ -44234,6 +44267,14 @@
 /obj/structure/machinery/door/firedoor/border_only/almayer,
 /turf/open/floor/plating,
 /area/almayer/command/cic)
+"jon" = (
+/obj/structure/machinery/cm_vending/clothing/medical_crew,
+/obj/structure/disposalpipe/up/almayer{
+	dir = 8;
+	id = "almayerlink_IO_hanger"
+	},
+/turf/open/space/basic,
+/area/almayer/medical/lockerroom)
 "jox" = (
 /obj/structure/machinery/brig_cell/cell_3{
 	pixel_x = -32
@@ -44992,6 +45033,12 @@
 	icon_state = "kitchen"
 	},
 /area/almayer/living/captain_mess)
+"jLE" = (
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "silver"
+	},
+/area/almayer/hallways/hangar)
 "jLK" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -45452,6 +45499,17 @@
 /turf/open/floor/almayer/research/containment/corner3,
 /area/almayer/medical/containment/cell)
 "jVE" = (
+/obj/structure/disposaloutlet{
+	density = 0;
+	desc = "An outlet for the intel chute";
+	icon_state = "delivery_outlet";
+	name = "delivery outlet";
+	pixel_y = 26;
+	range = 0
+	},
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor5"
 	},
@@ -47564,10 +47622,12 @@
 	},
 /area/almayer/hull/upper_hull/u_a_s)
 "kSv" = (
-/obj/item/reagent_container/glass/bucket/janibucket,
+/obj/structure/bed/chair/office/dark{
+	dir = 4
+	},
 /turf/open/floor/almayer{
 	dir = 6;
-	icon_state = "orange"
+	icon_state = "silver"
 	},
 /area/almayer/hallways/hangar)
 "kSy" = (
@@ -50054,11 +50114,18 @@
 /turf/open/floor/almayer,
 /area/almayer/hallways/starboard_hallway)
 "lRX" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/flashlight/lamp,
+/obj/structure/machinery/disposal/delivery{
+	density = 0;
+	desc = "A pneumatic delivery unit. Sends items to the research department.";
+	icon_state = "delivery_med";
+	name = "Research Delivery Unit";
+	pixel_x = -30
+	},
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
 /turf/open/floor/almayer{
-	dir = 9;
-	icon_state = "orange"
+	icon_state = "cargo"
 	},
 /area/almayer/hallways/hangar)
 "lRZ" = (
@@ -50527,10 +50594,9 @@
 /obj/structure/machinery/light{
 	dir = 1
 	},
-/obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/almayer{
 	dir = 1;
-	icon_state = "orange"
+	icon_state = "silver"
 	},
 /area/almayer/hallways/hangar)
 "mhl" = (
@@ -51216,11 +51282,9 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_f_s)
 "myo" = (
-/obj/structure/surface/table/almayer,
-/obj/item/clothing/head/soft/purple,
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "orange"
+	dir = 9;
+	icon_state = "silver"
 	},
 /area/almayer/hallways/hangar)
 "myC" = (
@@ -52093,6 +52157,12 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/cichallway)
+"mQk" = (
+/obj/structure/janitorialcart,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/lower_hull/l_f_p)
 "mQC" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/port_atmos)
@@ -52665,6 +52735,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_m_p)
+"ndU" = (
+/obj/item/clothing/head/soft/purple,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/lower_hull/l_f_p)
 "ndZ" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/item/device/flashlight/lamp,
@@ -54996,6 +55072,12 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/computerlab)
+"ofh" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/closed/wall/almayer,
+/area/almayer/hallways/hangar)
 "ofs" = (
 /obj/structure/sign/safety/hvac_old{
 	pixel_x = 8;
@@ -55329,11 +55411,10 @@
 	},
 /area/almayer/shipboard/brig/cic_hallway)
 "omP" = (
-/obj/item/tool/mop,
-/obj/structure/surface/rack,
+/obj/structure/closet/crate,
 /turf/open/floor/almayer{
 	dir = 1;
-	icon_state = "orange"
+	icon_state = "silver"
 	},
 /area/almayer/hallways/hangar)
 "onN" = (
@@ -56320,6 +56401,10 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
+"oJr" = (
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall/almayer/reinforced,
+/area/almayer/command/airoom)
 "oJR" = (
 /obj/effect/projector{
 	name = "Almayer_AresDown";
@@ -57759,6 +57844,9 @@
 /obj/structure/surface/rack,
 /obj/item/tool/weldpack,
 /obj/effect/spawner/random/tool,
+/obj/item/reagent_container/glass/bucket/janibucket,
+/obj/item/storage/bag/trash,
+/obj/item/storage/bag/trash,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -58053,6 +58141,14 @@
 	icon_state = "greencorner"
 	},
 /area/almayer/hallways/port_hallway)
+"pBx" = (
+/obj/structure/surface/rack,
+/obj/item/tool/mop,
+/obj/item/reagent_container/spray/cleaner,
+/turf/open/floor/almayer{
+	icon_state = "plate"
+	},
+/area/almayer/hull/lower_hull/l_f_p)
 "pBW" = (
 /turf/open/floor/almayer{
 	icon_state = "orangecorner"
@@ -60675,15 +60771,16 @@
 	dir = 4;
 	name = "ship-grade camera"
 	},
-/obj/item/folder/white{
-	pixel_x = 6
-	},
-/obj/item/storage/fancy/vials/empty{
-	pixel_y = 10;
-	start_vials = 2
+/obj/structure/disposaloutlet{
+	density = 0;
+	desc = "An outlet for the intel chute";
+	icon_state = "delivery_outlet";
+	name = "delivery outlet";
+	range = 0;
+	pixel_x = -26
 	},
-/obj/item/tool/pen{
-	pixel_y = 8
+/obj/structure/disposalpipe/trunk{
+	dir = 8
 	},
 /turf/open/floor/almayer{
 	icon_state = "mono"
@@ -62079,6 +62176,10 @@
 /obj/structure/sign/nosmoking_2{
 	pixel_x = 32
 	},
+/obj/structure/disposalpipe/down/almayer{
+	dir = 4;
+	id = "almayerlink_RND_hanger"
+	},
 /turf/open/floor/almayer{
 	dir = 4;
 	icon_state = "sterile_green_side"
@@ -62416,12 +62517,15 @@
 /area/almayer/living/grunt_rnr)
 "rux" = (
 /obj/structure/surface/table/almayer,
-/obj/item/paper_bin/uscm,
-/obj/item/tool/pen,
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "orange"
+/obj/item/clipboard{
+	pixel_x = 5;
+	pixel_y = -3
+	},
+/obj/item/clipboard{
+	pixel_x = 7;
+	pixel_y = 6
 	},
+/turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "ruz" = (
 /obj/effect/decal/warning_stripes{
@@ -63730,6 +63834,12 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/general_equipment)
+"sau" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/closed/wall/almayer/white/reinforced,
+/area/almayer/medical/medical_science)
 "saB" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -64529,6 +64639,10 @@
 "sti" = (
 /obj/structure/closet/crate/trashcart,
 /obj/effect/spawner/random/balaclavas,
+/obj/structure/disposalpipe/up/almayer{
+	dir = 4;
+	id = "almayerlink_RND_hanger"
+	},
 /turf/open/floor/plating,
 /area/almayer/hull/lower_hull/l_f_p)
 "str" = (
@@ -64990,11 +65104,18 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
 "sEt" = (
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/spray/cleaner,
+/obj/structure/machinery/disposal/delivery{
+	density = 0;
+	desc = "A pneumatic delivery unit. Sends items to the computer lab.";
+	icon_state = "delivery_engi";
+	name = "Intel Delivery Unit";
+	pixel_x = -30
+	},
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
 /turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "orange"
+	icon_state = "cargo"
 	},
 /area/almayer/hallways/hangar)
 "sEK" = (
@@ -66914,7 +67035,7 @@
 /area/almayer/shipboard/port_missiles)
 "tuN" = (
 /turf/open/floor/almayer{
-	icon_state = "orange"
+	icon_state = "silver"
 	},
 /area/almayer/hallways/hangar)
 "tuZ" = (
@@ -70108,6 +70229,14 @@
 	icon_state = "redcorner"
 	},
 /area/almayer/shipboard/brig/chief_mp_office)
+"uNy" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/door/window/eastright{
+	dir = 8;
+	req_access_txt = list(19)
+	},
+/turf/open/floor/almayer,
+/area/almayer/hallways/hangar)
 "uNB" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -73478,6 +73607,7 @@
 /obj/structure/machinery/light/small{
 	dir = 1
 	},
+/obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
@@ -74719,7 +74849,6 @@
 /obj/structure/machinery/door/airlock/almayer/research/reinforced{
 	dir = 1;
 	name = "\improper CMO's Bedroom";
-	req_access = null;
 	req_one_access_txt = "1;5";
 	access_modified = 1
 	},
@@ -98042,8 +98171,8 @@ vRz
 aag
 ajZ
 aaa
-aaa
-aaa
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -98245,8 +98374,8 @@ vRz
 aag
 ajZ
 aaa
-aaa
-aaa
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -99247,9 +99376,9 @@ xyw
 bHB
 btO
 bcm
+ofh
 bcm
-bcm
-bcm
+ofh
 bcm
 mzo
 sYC
@@ -99263,10 +99392,10 @@ aaf
 ajY
 bdH
 aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -99456,7 +99585,7 @@ sEt
 bcm
 wbx
 vhq
-vhq
+ndU
 oFG
 vhq
 vRz
@@ -99466,10 +99595,10 @@ aag
 ajZ
 bdH
 aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -99669,10 +99798,10 @@ aag
 ajZ
 bdH
 aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -99862,7 +99991,7 @@ tuN
 fPn
 nqU
 nqU
-vhq
+mQk
 dQH
 hYc
 vRz
@@ -99872,10 +100001,10 @@ aag
 ajZ
 bdH
 aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -100063,7 +100192,7 @@ omP
 aYt
 bOC
 bcm
-vhq
+pBx
 nqU
 vhq
 dQH
@@ -100075,10 +100204,10 @@ aag
 ajZ
 bdH
 aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -100263,7 +100392,7 @@ bHB
 aYt
 cdA
 ivg
-llO
+jLE
 kSv
 bcm
 mzo
@@ -100278,10 +100407,10 @@ aag
 ajZ
 bdH
 aaa
-aaa
-aaa
-aaa
-aaa
+bdH
+bdH
+bdH
+bdH
 aaa
 aaa
 aaa
@@ -100466,8 +100595,8 @@ bHB
 aqs
 bcm
 bcm
-wXT
-cdA
+ewR
+uNy
 bcm
 bcm
 mzo
@@ -103502,7 +103631,7 @@ tGh
 gfW
 sgj
 bDv
-bDv
+jon
 bDv
 bEP
 gfW
@@ -108470,7 +108599,7 @@ vOy
 vOy
 vOy
 vOy
-vOy
+sau
 vOy
 vOy
 vOy
@@ -117200,7 +117329,7 @@ mOi
 asF
 asG
 iyH
-aqU
+oJr
 jVE
 nTs
 pje