diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index 80262ec61937..f8c9cc99d534 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -2825,9 +2825,6 @@
 	icon_state = "redfull"
 	},
 /area/almayer/command/cic)
-"ajo" = (
-/turf/closed/wall/almayer/white,
-/area/almayer/medical/medical_science)
 "ajp" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/dropship_equipment/fuel/cooling_system{
@@ -3489,6 +3486,20 @@
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/commandbunks)
+"alk" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 1";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple,
+/area/almayer/medical/containment/cell)
 "all" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -3699,47 +3710,19 @@
 	},
 /area/almayer/hallways/repair_bay)
 "amk" = (
-/turf/closed/wall/almayer/white/outer_tile,
-/area/almayer/medical/medical_science)
-"aml" = (
-/obj/structure/filingcabinet/filingcabinet,
-/obj/item/folder/black,
-/obj/item/folder/black,
-/obj/item/folder/black,
-/obj/item/folder/white,
-/obj/item/folder/white,
-/obj/item/folder/white,
-/obj/structure/machinery/status_display{
-	pixel_y = 30
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
-"amm" = (
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
-"amn" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/surface/rack,
-/obj/item/stack/sheet/mineral/plastic{
-	amount = 15
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 1
 	},
-/obj/item/stack/sheet/glass{
-	amount = 20;
-	pixel_x = 3;
-	pixel_y = 3
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
 	},
 /turf/open/floor/almayer{
 	dir = 1;
-	icon_state = "sterile_green_side"
+	icon_state = "sterile_green_corner"
 	},
-/area/almayer/medical/testlab)
+/area/almayer/medical/containment)
 "amo" = (
 /obj/structure/largecrate/random/secure,
 /obj/structure/sign/safety/rewire{
@@ -4103,36 +4086,33 @@
 /turf/open/floor/plating/almayer,
 /area/almayer/hull/upper_hull/u_a_s)
 "anw" = (
-/obj/structure/pipes/vents/pump,
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
-"anx" = (
-/obj/structure/surface/table/almayer,
-/obj/item/folder/white{
-	pixel_x = 6
+/obj/structure/machinery/flasher{
+	id = "Containment Cell 1";
+	layer = 2.1;
+	name = "Mounted Flash";
+	pixel_y = 30
 	},
-/obj/item/clothing/glasses/science{
-	pixel_x = -4;
-	pixel_y = 7
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 1
 	},
-/area/almayer/medical/testlab)
+/area/almayer/medical/containment/cell)
 "anz" = (
-/obj/structure/surface/table/almayer,
-/obj/item/tool/pen{
-	pixel_y = 8
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
 	},
-/obj/structure/machinery/light{
-	dir = 4
+/obj/structure/machinery/photocopier,
+/obj/structure/machinery/firealarm{
+	pixel_y = 28
 	},
-/obj/item/paper_bin/wy{
-	pixel_y = 7
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
 	},
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
+/area/almayer/medical/hydroponics)
 "anB" = (
 /obj/structure/sign/safety/storage{
 	pixel_x = -17
@@ -4157,11 +4137,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/repair_bay)
-"anF" = (
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/medical/testlab)
 "anG" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -4508,23 +4483,51 @@
 	},
 /area/almayer/lifeboat_pumps/north1)
 "aoJ" = (
-/obj/structure/bed/chair{
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 1";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple{
 	dir = 1
 	},
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment/cell)
 "aoK" = (
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
 	},
-/obj/structure/reagent_dispensers/water_cooler/stacks,
-/obj/structure/sign/safety/chem_lab{
-	pixel_x = 32
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/structure/machinery/door_display/research_cell{
+	dir = 1;
+	id = "Containment Cell 5";
+	name = "Cell 5 Control";
+	pixel_x = 4;
+	pixel_y = -3
+	},
+/obj/structure/machinery/door_control{
+	id = "W_Containment Cell 5";
+	name = "Containment Lockdown";
+	pixel_x = -8;
+	pixel_y = -3;
+	req_one_access_txt = "19;28"
 	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green_corner"
+	icon_state = "sterile_green"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "aoL" = (
 /obj/structure/bed/chair/office/dark,
 /turf/open/floor/almayer,
@@ -4543,17 +4546,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
-"aoO" = (
-/obj/structure/machinery/autolathe/medilathe/full,
-/obj/structure/machinery/firealarm{
-	dir = 8;
-	pixel_x = -24
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/testlab)
 "aoP" = (
 /obj/structure/machinery/camera/autoname/almayer{
 	dir = 1;
@@ -4894,40 +4886,42 @@
 	},
 /area/almayer/engineering/engineering_workshop/hangar)
 "apR" = (
-/obj/structure/surface/rack,
-/obj/item/storage/box/beakers{
-	pixel_y = 12
-	},
-/obj/item/storage/box/sprays{
-	pixel_y = 5
+/obj/structure/pipes/vents/pump{
+	name = "Secure Air Vent";
+	welded = 1
 	},
-/obj/item/storage/box/autoinjectors{
-	pixel_x = 1;
-	pixel_y = -3
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
-/obj/structure/sign/safety/storage{
-	pixel_x = 23;
-	pixel_y = 32
+/obj/structure/machinery/alarm/almayer{
+	dir = 1
 	},
 /turf/open/floor/almayer{
 	icon_state = "sterile_green"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "apS" = (
-/obj/structure/surface/rack,
-/obj/item/storage/box/pillbottles{
-	pixel_y = -2
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
-/obj/item/storage/box/pillbottles{
-	pixel_y = 6
+/obj/structure/surface/rack{
+	density = 0;
+	pixel_y = 16
 	},
-/obj/item/storage/box/pillbottles{
-	pixel_y = 12
+/obj/item/storage/xeno_tag_case/full{
+	pixel_y = 15
+	},
+/obj/item/device/camera{
+	pixel_x = -3;
+	pixel_y = 22
 	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
+	dir = 1;
+	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "apT" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/machinery/door/airlock/almayer/engineering/reinforced/OT{
@@ -4939,11 +4933,21 @@
 	},
 /area/almayer/engineering/engineering_workshop/hangar)
 "apU" = (
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 2";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple{
+	dir = 8
 	},
-/area/almayer/medical/testlab)
+/area/almayer/medical/containment/cell)
 "apV" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -5206,7 +5210,7 @@
 /turf/open/floor/almayer{
 	icon_state = "plate"
 	},
-/area/almayer/hull/upper_hull)
+/area/almayer/medical/medical_science)
 "aqJ" = (
 /turf/open/floor/almayer{
 	dir = 5;
@@ -5229,43 +5233,41 @@
 	icon_state = "plate"
 	},
 /area/almayer/command/cic)
-"aqO" = (
-/obj/structure/machinery/chem_master{
-	vial_maker = 1
-	},
-/turf/open/floor/almayer{
+"aqP" = (
+/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
 	dir = 1;
-	icon_state = "sterile_green_side"
+	id = "Containment Cell 1";
+	locked = 1;
+	name = "\improper Containment Cell 1"
+	},
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	id = "Containment Cell 1";
+	name = "\improper Containment Cell 1";
+	unacidable = 1
 	},
-/area/almayer/medical/medical_science)
-"aqP" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	dir = 9;
-	icon_state = "sterile_green_side"
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/area/almayer/medical/medical_science)
-"aqQ" = (
-/turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "sterile_green_side"
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
 	},
-/area/almayer/medical/medical_science)
-"aqR" = (
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+	icon_state = "test_floor4"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment/cell)
 "aqS" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 6
-	},
+/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
-	dir = 9;
-	icon_state = "sterile_green_side"
+	icon_state = "sterile_green"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "aqT" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/hand_labeler{
@@ -5729,6 +5731,10 @@
 /obj/structure/machinery/door/firedoor/border_only/almayer{
 	dir = 2
 	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
 /turf/open/floor/plating,
 /area/almayer/medical/upper_medical)
 "aso" = (
@@ -6021,14 +6027,14 @@
 	pixel_y = -32
 	},
 /turf/open/floor/plating/almayer,
-/area/almayer/hull/upper_hull)
+/area/almayer/medical/medical_science)
 "atb" = (
 /obj/structure/ladder{
 	height = 2;
 	id = "cicladder2"
 	},
 /turf/open/floor/plating/almayer,
-/area/almayer/hull/upper_hull)
+/area/almayer/medical/medical_science)
 "atc" = (
 /turf/open/floor/almayer{
 	dir = 4;
@@ -6968,12 +6974,6 @@
 "avo" = (
 /turf/closed/wall/almayer/outer,
 /area/almayer/powered/agent)
-"avp" = (
-/obj/structure/surface/table/almayer,
-/obj/item/folder/white,
-/obj/item/device/flashlight/pen,
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
 "avr" = (
 /obj/structure/bed/sofa/south/grey/left{
 	pixel_y = 12
@@ -7025,14 +7025,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/brig/general_equipment)
-"avA" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/medical/medical_science)
 "avB" = (
 /turf/open/floor/almayer{
 	dir = 8;
@@ -7049,32 +7041,35 @@
 /turf/open/floor/almayer,
 /area/almayer/hallways/aft_hallway)
 "avF" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 1
+	},
 /turf/open/floor/almayer{
+	dir = 9;
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "avG" = (
 /turf/open/floor/almayer{
-	dir = 10;
+	dir = 6;
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "avH" = (
-/turf/open/floor/almayer{
-	dir = 6;
-	icon_state = "sterile_green_side"
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
-/area/almayer/medical/medical_science)
-"avI" = (
-/obj/structure/machinery/botany/editor,
-/obj/structure/machinery/firealarm{
-	pixel_y = 28
+/obj/structure/machinery/light{
+	dir = 1
 	},
 /turf/open/floor/almayer{
 	dir = 1;
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/hydroponics)
+/area/almayer/medical/containment)
 "avJ" = (
 /obj/item/clothing/head/helmet/marine{
 	pixel_x = 16;
@@ -7466,20 +7461,43 @@
 	},
 /area/almayer/medical/upper_medical)
 "awQ" = (
-/mob/living/simple_animal/mouse/white/Doc,
+/obj/structure/surface/table/almayer,
+/obj/item/cell/high{
+	pixel_x = -8;
+	pixel_y = 8
+	},
+/obj/item/cell/high{
+	pixel_x = -8;
+	pixel_y = 8
+	},
+/obj/item/cell/high{
+	pixel_x = -8;
+	pixel_y = -2
+	},
+/obj/item/cell/high{
+	pixel_x = -8;
+	pixel_y = -2
+	},
+/obj/item/device/multitool{
+	pixel_x = 8
+	},
+/obj/item/tool/screwdriver{
+	pixel_x = -3;
+	pixel_y = 4
+	},
+/obj/structure/machinery/power/apc/almayer{
+	dir = 1
+	},
 /turf/open/floor/almayer{
 	icon_state = "sterile_green"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/hydroponics)
 "awR" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 5
-	},
+/obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "sterile_green_side"
+	icon_state = "sterile_green"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "awS" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/poddoor/shutters/almayer/open{
@@ -7563,21 +7581,24 @@
 	},
 /area/almayer/medical/upper_medical)
 "axn" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/reagent_analyzer{
-	pixel_x = 2;
-	pixel_y = 3
+/obj/structure/sign/safety/rewire{
+	layer = 2.4;
+	pixel_x = 8;
+	pixel_y = 32
 	},
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_container/glass/beaker{
+	pixel_x = 6;
+	pixel_y = 7
+	},
+/obj/item/reagent_container/glass/beaker/large{
+	pixel_x = -6;
+	pixel_y = 8
 	},
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_corner"
+	icon_state = "mono"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/hydroponics)
 "axo" = (
 /obj/structure/window/framed/almayer,
 /turf/open/floor/plating,
@@ -8105,43 +8126,20 @@
 "ayX" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/extinguisher,
-/obj/structure/sign/safety/biolab{
-	pixel_y = 32
-	},
-/obj/structure/sign/safety/biohazard{
-	pixel_x = 15;
+/obj/structure/sign/catclock{
 	pixel_y = 32
 	},
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_corner"
-	},
-/area/almayer/medical/upper_medical)
-"ayY" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 4;
-	name = "ship-grade camera"
-	},
-/obj/item/storage/fancy/vials/empty{
-	pixel_y = 10;
-	start_vials = 2
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
+	icon_state = "sterile_green"
 	},
 /area/almayer/medical/medical_science)
 "ayZ" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/light{
+	dir = 1
 	},
 /turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "sterile_green_side"
+	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/medical_science)
 "azb" = (
@@ -8556,31 +8554,16 @@
 /turf/open/floor/almayer,
 /area/almayer/command/cichallway)
 "aAr" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/box/donkpockets{
-	pixel_x = -4;
-	pixel_y = 8
-	},
-/obj/item/storage/box/drinkingglasses{
-	pixel_x = -4
-	},
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 11
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
-"aAt" = (
-/obj/structure/machinery/portable_atmospherics/hydroponics,
-/obj/structure/machinery/light{
-	dir = 8
+/obj/structure/machinery/camera/autoname/almayer{
+	name = "ship-grade camera"
 	},
+/obj/structure/surface/rack,
+/obj/item/storage/box/botanydisk,
+/obj/item/storage/box/botanydisk,
+/obj/item/storage/box/botanydisk,
+/obj/item/storage/box/botanydisk,
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
 /area/almayer/medical/hydroponics)
 "aAv" = (
@@ -8742,11 +8725,14 @@
 /turf/open/floor/almayer,
 /area/almayer/command/cic)
 "aAT" = (
-/obj/structure/machinery/smartfridge/chemistry,
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "sterile_green"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "aAW" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -8816,10 +8802,21 @@
 	},
 /area/almayer/medical/morgue)
 "aBe" = (
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 2";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
 	},
-/area/almayer/medical/testlab)
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple{
+	dir = 4
+	},
+/area/almayer/medical/containment/cell)
 "aBf" = (
 /obj/structure/machinery/door/airlock/almayer/secure/reinforced{
 	name = "Telecommunications";
@@ -9237,18 +9234,11 @@
 	},
 /area/almayer/medical/upper_medical)
 "aCt" = (
-/obj/structure/reagent_dispensers/water_cooler,
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/sign/safety/intercom{
-	pixel_x = 8;
-	pixel_y = 32
-	},
+/obj/structure/bed/sofa/south/white/right,
 /turf/open/floor/almayer{
-	icon_state = "sterile_green_corner"
+	icon_state = "sterile_green"
 	},
-/area/almayer/medical/upper_medical)
+/area/almayer/medical/medical_science)
 "aCu" = (
 /obj/structure/sink{
 	pixel_y = 24
@@ -9273,41 +9263,40 @@
 /area/almayer/medical/morgue)
 "aCC" = (
 /turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "sterile_green_side"
+	icon_state = "sterile_green"
 	},
-/area/almayer/medical/upper_medical)
+/area/almayer/medical/medical_science)
 "aCD" = (
-/obj/structure/machinery/door_control{
-	dir = 1;
-	id = "researchdoorint";
-	name = "Research Interior Door";
-	normaldoorcontrol = 1;
-	pixel_x = -25;
-	pixel_y = -5;
-	req_access_txt = "28"
-	},
-/obj/structure/machinery/door_control{
-	dir = 1;
-	id = "researchlockdownint";
-	name = "Research Interior Lockdown";
-	pixel_x = -25;
-	pixel_y = 5;
-	req_access_txt = "28"
+/obj/structure/pipes/vents/pump,
+/obj/structure/machinery/computer/cameras/almayer{
+	dir = 4;
+	pixel_x = -16
 	},
 /turf/open/floor/almayer{
-	dir = 8;
+	dir = 10;
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/medical_science)
 "aCR" = (
-/obj/structure/bed/chair/office/dark{
-	dir = 1
+/obj/structure/machinery/door_control{
+	id = "containmentlockdown_S";
+	name = "Containment Lockdown";
+	pixel_y = 28;
+	req_one_access_txt = "19;28"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	dir = 1;
+	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "aCX" = (
 /obj/effect/step_trigger/clone_cleaner,
 /obj/effect/decal/warning_stripes{
@@ -9827,29 +9816,31 @@
 	},
 /area/almayer/hallways/aft_hallway)
 "aEZ" = (
-/obj/structure/sign/safety/biolab{
-	pixel_x = -17;
-	pixel_y = -8
+/obj/structure/surface/table/almayer,
+/obj/item/storage/box/gloves{
+	pixel_x = -4;
+	pixel_y = 13
 	},
-/obj/structure/sign/safety/biohazard{
-	pixel_x = -17;
-	pixel_y = 7
+/obj/item/storage/box/masks{
+	pixel_x = -6;
+	pixel_y = 4
+	},
+/obj/item/tool/hand_labeler{
+	pixel_x = 5;
+	pixel_y = 3
 	},
-/obj/structure/machinery/cm_vending/clothing/medical_crew,
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_corner"
+	icon_state = "mono"
 	},
 /area/almayer/medical/medical_science)
 "aFa" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
 /turf/open/floor/almayer{
-	dir = 5;
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "aFf" = (
 /obj/item/reagent_container/glass/beaker/bluespace,
 /obj/structure/machinery/chem_dispenser/research,
@@ -10551,12 +10542,17 @@
 /area/almayer/command/cichallway)
 "aIo" = (
 /obj/structure/window/framed/almayer/white,
+/obj/structure/machinery/door/firedoor/border_only/almayer,
 /obj/structure/machinery/door/poddoor/shutters/almayer/open{
+	dir = 8;
+	id = "researchlockdownext_windoor";
+	name = "\improper Research Windoor Shutter"
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
 	dir = 4;
-	id = "researchlockdownext";
-	name = "\improper Research Lockdown"
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
 	},
-/obj/structure/machinery/door/firedoor/border_only/almayer,
 /turf/open/floor/plating,
 /area/almayer/medical/medical_science)
 "aIq" = (
@@ -10611,31 +10607,53 @@
 /turf/open/floor/almayer,
 /area/almayer/lifeboat_pumps/north1)
 "aIC" = (
-/obj/structure/machinery/shower{
-	dir = 1
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/obj/structure/machinery/door_control{
-	id = "containmentlockdown_E";
-	name = "Containment Lockdown";
-	pixel_x = 25;
-	req_one_access_txt = "19;28"
+/obj/structure/transmitter/rotary{
+	name = "Researcher Office Telephone";
+	phone_category = "Almayer";
+	phone_id = "Research";
+	pixel_y = 6
+	},
+/obj/item/reagent_container/glass/beaker{
+	pixel_x = 6;
+	pixel_y = -1
+	},
+/obj/item/reagent_container/glass/beaker/large{
+	pixel_x = -6
 	},
 /turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_corner"
+	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "aID" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/light{
+	dir = 1
+	},
 /turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/hydroponics)
 "aIM" = (
 /obj/structure/largecrate/random,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_a_s)
+"aIP" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1;
+	pixel_y = -1
+	},
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "sterile_green_corner"
+	},
+/area/almayer/medical/containment)
 "aIQ" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer,
 /obj/structure/machinery/door/airlock/almayer/command/reinforced{
@@ -10821,6 +10839,19 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/upper_engineering)
+"aJn" = (
+/obj/structure/machinery/camera/autoname/almayer/containment{
+	dir = 1;
+	name = "ship-grade camera"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "sterile_green_corner"
+	},
+/area/almayer/medical/containment)
 "aJp" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "pottedplant_22";
@@ -11282,13 +11313,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/command/cic)
-"aLP" = (
-/obj/structure/window/framed/almayer/white,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/almayer/medical/medical_science)
 "aLQ" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "pottedplant_21"
@@ -11327,33 +11351,11 @@
 "aLZ" = (
 /obj/structure/surface/table/almayer,
 /obj/item/tool/pen,
-/obj/structure/machinery/door_control{
-	id = "researchlockdownext";
-	name = "Research Exterior Lockdown";
-	pixel_x = -5;
-	pixel_y = -20;
-	range = 20;
-	req_access_txt = "5"
-	},
-/obj/structure/machinery/door_control{
-	id = "researchlockdownint";
-	name = "Research Interior Lockdown";
-	pixel_x = 5;
-	pixel_y = -20;
-	range = 20;
-	req_access_txt = "5"
-	},
 /obj/item/paper_bin/wy,
-/obj/structure/machinery/door_control{
-	id = "containmentlockdown_S";
-	name = "Containment Exterior Lockdown";
-	pixel_x = -25;
-	range = 20;
-	req_one_access_txt = "19;14"
-	},
 /obj/structure/machinery/computer/cameras/containment{
 	dir = 4;
 	layer = 2.981;
+	name = "Research Cameras";
 	pixel_y = 16
 	},
 /obj/item/clothing/accessory/stethoscope,
@@ -11363,30 +11365,45 @@
 	},
 /area/almayer/medical/upper_medical)
 "aMd" = (
-/obj/structure/machinery/door/airlock/almayer/research/reinforced{
-	dir = 1;
-	name = "\improper Containment Airlock"
+/obj/structure/filingcabinet/seeds{
+	density = 0;
+	pixel_x = 5;
+	pixel_y = 16
 	},
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "containmentlockdown_S";
-	name = "\improper Containment Lockdown"
+/obj/structure/filingcabinet/disk{
+	density = 0;
+	pixel_x = -11;
+	pixel_y = 16
 	},
-/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/hydroponics)
 "aMg" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/sign/safety/intercom{
+	layer = 2.9;
+	pixel_x = -6;
+	pixel_y = 29
 	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/obj/structure/machinery/botany/extractor{
+	density = 0;
+	pixel_x = 15;
+	pixel_y = 16
+	},
+/obj/item/device/flashlight/pen{
+	pixel_x = 14;
+	pixel_y = 15
+	},
+/obj/structure/machinery/vending/hydroseeds{
+	density = 0;
+	pixel_x = -7;
+	pixel_y = 16;
+	req_access_txt = "28"
 	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/hydroponics)
 "aMh" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -11734,28 +11751,40 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha)
 "aNY" = (
-/obj/structure/bed/chair/office/dark,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "aOd" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
 /turf/open/floor/almayer{
-	dir = 9;
+	dir = 5;
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "aOe" = (
-/obj/structure/pipes/vents/pump{
-	dir = 8
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/reagent_container/spray/cleaner{
+	desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
+	name = "Surgery Cleaner"
 	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/area/almayer/medical/medical_science)
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer/research/containment/corner{
+	dir = 1
+	},
+/area/almayer/medical/containment/cell)
 "aOg" = (
 /obj/structure/bed/sofa/south/grey{
 	pixel_y = 12
@@ -12124,13 +12153,15 @@
 	},
 /area/almayer/command/cic)
 "aPJ" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/area/almayer/medical/medical_science)
+/turf/open/floor/almayer/research/containment/corner2,
+/area/almayer/medical/containment/cell)
 "aPK" = (
 /obj/structure/sign/nosmoking_1,
 /turf/closed/wall/almayer,
@@ -12324,38 +12355,39 @@
 	},
 /area/almayer/living/grunt_rnr)
 "aQZ" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/machinery/botany/editor{
+	density = 0;
+	pixel_x = 5;
+	pixel_y = 16
 	},
-/turf/open/floor/almayer{
-	dir = 6;
-	icon_state = "sterile_green_side"
+/obj/item/clothing/glasses/science{
+	pixel_x = 5;
+	pixel_y = 24
 	},
-/area/almayer/medical/medical_science)
-"aRc" = (
 /turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/hydroponics)
 "aRd" = (
 /obj/structure/surface/table/reinforced/prison,
 /obj/structure/machinery/door/window/westright,
-/obj/structure/machinery/door/poddoor/shutters/almayer/open{
-	dir = 4;
-	id = "researchlockdownext";
-	name = "\improper Research Lockdown"
-	},
 /obj/structure/machinery/door/firedoor/border_only/almayer,
 /obj/structure/machinery/door/window/westright{
 	dir = 4;
 	req_access_txt = "28"
 	},
+/obj/structure/machinery/door/poddoor/shutters/almayer/open{
+	dir = 8;
+	id = "researchlockdownext_windoor";
+	name = "\improper Research Windoor Shutter"
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
+	icon_state = "test_floor4"
 	},
 /area/almayer/medical/medical_science)
 "aRi" = (
@@ -12605,8 +12637,13 @@
 "aSl" = (
 /obj/structure/machinery/light,
 /obj/structure/machinery/cm_vending/sorted/medical,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
+	dir = 4;
+	icon_state = "sterile_green_corner"
 	},
 /area/almayer/medical/medical_science)
 "aSm" = (
@@ -12615,45 +12652,32 @@
 	},
 /area/almayer/hull/lower_hull/l_m_s)
 "aSn" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/centrifuge{
-	pixel_x = -2;
-	pixel_y = 7
-	},
-/obj/structure/sign/safety/ref_bio_storage{
-	pixel_x = 15;
-	pixel_y = -32
+/obj/item/stack/sheet/mineral/plastic{
+	amount = 15
 	},
-/obj/structure/sign/safety/biohazard{
-	pixel_y = -32
+/obj/item/stack/sheet/glass{
+	amount = 20;
+	pixel_x = 3;
+	pixel_y = 3
 	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
+	icon_state = "test_floor4"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/hydroponics)
 "aSo" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/firstaid/o2{
-	pixel_x = -6;
-	pixel_y = 6
-	},
-/obj/item/storage/firstaid/fire{
-	pixel_x = 8;
-	pixel_y = 6
-	},
-/obj/item/storage/firstaid/adv{
-	pixel_x = -6;
-	pixel_y = -2
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1
 	},
-/obj/item/storage/firstaid/toxin{
-	pixel_x = 8;
-	pixel_y = -2
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
 	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_corner"
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/area/almayer/medical/medical_science)
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/medical/hydroponics)
 "aSq" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/structure/machinery/chem_dispenser/soda,
@@ -16218,18 +16242,16 @@
 	},
 /area/almayer/hull/upper_hull/u_a_s)
 "bkT" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/cameras/containment{
-	dir = 4;
-	layer = 2.99;
-	pixel_y = 16
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/obj/structure/machinery/computer/med_data/laptop{
-	dir = 4;
-	layer = 2.991
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/hydroponics)
 "bkU" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -16806,9 +16828,6 @@
 	icon_state = "sterile_green_corner"
 	},
 /area/almayer/medical/lower_medical_lobby)
-"bnL" = (
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
 "bnR" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -17927,12 +17946,11 @@
 /turf/open/floor/carpet,
 /area/almayer/command/corporateliason)
 "btC" = (
-/obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
+	dir = 1
 	},
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer{
-	dir = 10;
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/medical_science)
@@ -21132,6 +21150,12 @@
 	icon_state = "kitchen"
 	},
 /area/almayer/living/grunt_rnr)
+"bIM" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/medical/hydroponics)
 "bIN" = (
 /obj/structure/bed/chair/office/dark,
 /turf/open/floor/plating/plating_catwalk,
@@ -22852,13 +22876,7 @@
 	},
 /area/almayer/squads/req)
 "bPF" = (
-/obj/structure/pipes/standard/simple/hidden{
-	dir = 5
-	},
-/obj/structure/bed,
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
+/turf/closed/wall/almayer/white/outer_tile,
 /area/almayer/medical/medical_science)
 "bPG" = (
 /obj/effect/decal/warning_stripes{
@@ -23535,10 +23553,17 @@
 	},
 /area/almayer/hallways/hangar)
 "bST" = (
-/turf/closed/wall/almayer/research/containment/wall/purple{
-	dir = 4
+/obj/structure/closet/secure_closet/hydroresearch,
+/obj/item/reagent_container/glass/watertank,
+/obj/item/reagent_container/glass/watertank,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/area/almayer/medical/containment/cell)
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/hydroponics)
 "bSY" = (
 /obj/structure/disposalpipe/junction{
 	dir = 4
@@ -24107,17 +24132,12 @@
 	},
 /area/almayer/shipboard/port_point_defense)
 "bVe" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/item/reagent_container/food/snacks/cheesewedge,
+/obj/structure/closet/l3closet/general,
 /obj/structure/window/reinforced{
 	dir = 8;
 	health = 80
 	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green"
-	},
+/turf/open/floor/plating/plating_catwalk,
 /area/almayer/medical/medical_science)
 "bVi" = (
 /obj/structure/disposalpipe/segment{
@@ -25384,24 +25404,15 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/operating_room_three)
-"cba" = (
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/testlab)
 "cbg" = (
-/obj/structure/machinery/flasher{
-	alpha = 1;
-	id = "Containment Cell 3";
-	layer = 2.1;
-	name = "Mounted Flash";
-	pixel_y = 30
+/obj/structure/machinery/door/airlock/almayer/command{
+	dir = 2;
+	name = "\improper Command Ladder"
 	},
-/turf/open/floor/almayer/research/containment/floor2{
-	dir = 1
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
 	},
-/area/almayer/medical/containment/cell)
+/area/almayer/medical/medical_science)
 "cbh" = (
 /obj/structure/machinery/cm_vending/clothing/pilot_officer{
 	density = 0;
@@ -26378,6 +26389,12 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/repair_bay)
+"cfT" = (
+/turf/open/floor/almayer{
+	dir = 10;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "cgl" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer,
 /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/charlie_delta{
@@ -27952,11 +27969,13 @@
 	},
 /area/almayer/hull/upper_hull/u_a_s)
 "coJ" = (
-/obj/structure/pipes/vents/pump,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
 /turf/open/floor/almayer{
 	icon_state = "sterile_green"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "coT" = (
 /obj/structure/machinery/status_display{
 	pixel_y = 30
@@ -27969,11 +27988,10 @@
 	},
 /area/almayer/shipboard/starboard_point_defense)
 "coZ" = (
-/obj/structure/machinery/portable_atmospherics/hydroponics,
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/turf/open/floor/almayer/research/containment/corner{
+	dir = 4
 	},
-/area/almayer/medical/hydroponics)
+/area/almayer/medical/containment/cell)
 "cpf" = (
 /obj/structure/ladder{
 	height = 2;
@@ -28955,8 +28973,47 @@
 /turf/closed/wall/almayer,
 /area/almayer/shipboard/sea_office)
 "cJM" = (
-/turf/closed/wall/almayer/white/outer_tile,
-/area/almayer/medical/hydroponics)
+/obj/structure/machinery/door_display/research_cell{
+	dir = 8;
+	has_wall_divider = 1;
+	id = "Containment Cell 3";
+	layer = 3.2;
+	name = "Cell 3 Control";
+	pixel_x = 16;
+	pixel_y = -16
+	},
+/obj/structure/machinery/door_display/research_cell{
+	dir = 8;
+	has_wall_divider = 1;
+	id = "Containment Cell 2";
+	layer = 3.2;
+	name = "Cell 2 Control";
+	pixel_x = 16;
+	pixel_y = 16
+	},
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/structure/machinery/door_control{
+	id = "W_Containment Cell 2";
+	name = "Containment Lockdown";
+	pixel_x = 13;
+	pixel_y = 7;
+	req_one_access_txt = "19;28"
+	},
+/obj/structure/machinery/door_control{
+	id = "W_Containment Cell 3";
+	name = "Containment Lockdown";
+	pixel_x = 13;
+	pixel_y = -6;
+	req_one_access_txt = "19;28"
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical/containment)
 "cJP" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -29034,15 +29091,6 @@
 /obj/structure/bed/chair,
 /turf/open/floor/almayer,
 /area/almayer/squads/alpha_bravo_shared)
-"cLI" = (
-/obj/structure/sign/safety/waterhazard{
-	pixel_x = 8;
-	pixel_y = -32
-	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/hydroponics)
 "cLN" = (
 /obj/structure/machinery/cryopod{
 	layer = 3.1;
@@ -29174,20 +29222,17 @@
 	},
 /area/almayer/engineering/upper_engineering/starboard)
 "cQo" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/light,
-/obj/structure/machinery/reagentgrinder{
-	pixel_y = 8
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 5
 	},
-/obj/item/stack/sheet/mineral/phoron{
-	amount = 25;
-	pixel_x = 3;
-	pixel_y = 3
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
 	},
 /turf/open/floor/almayer{
+	dir = 8;
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "cQv" = (
 /turf/closed/wall/almayer/reinforced,
 /area/almayer/shipboard/brig/general_equipment)
@@ -29276,16 +29321,6 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/starboard_missiles)
-"cSK" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/centrifuge{
-	pixel_y = 7
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "cSN" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/machinery/light{
@@ -29509,6 +29544,15 @@
 	icon_state = "red"
 	},
 /area/almayer/hull/upper_hull/u_a_p)
+"cXC" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/structure/machinery/light,
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/containment)
 "cXF" = (
 /obj/structure/machinery/flasher{
 	alpha = 1;
@@ -30224,18 +30268,18 @@
 	icon_state = "silverfull"
 	},
 /area/almayer/command/computerlab)
-"dnx" = (
-/obj/structure/machinery/portable_atmospherics/hydroponics,
-/obj/structure/machinery/light,
+"dnC" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 6
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
+	icon_state = "sterile_green_corner"
 	},
 /area/almayer/medical/hydroponics)
-"dnC" = (
-/turf/closed/wall/almayer/research/containment/wall/purple{
-	dir = 1
-	},
-/area/almayer/medical/containment/cell)
 "dnE" = (
 /obj/structure/machinery/light,
 /turf/open/floor/almayer{
@@ -30482,17 +30526,25 @@
 	},
 /area/almayer/hallways/port_hallway)
 "drT" = (
-/obj/structure/machinery/light{
-	dir = 4
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 4;
+	name = "ship-grade camera"
 	},
-/obj/structure/machinery/medical_pod/sleeper{
-	dir = 8
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
+/obj/structure/surface/rack,
+/obj/item/storage/fancy/vials,
+/obj/item/storage/fancy/vials,
+/obj/item/storage/fancy/vials,
+/obj/item/storage/fancy/vials,
+/obj/item/storage/fancy/vials,
+/obj/item/storage/fancy/vials,
 /turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_side"
+	icon_state = "sterile_green"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/hydroponics)
 "dsk" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -30679,11 +30731,13 @@
 /turf/open/floor/almayer,
 /area/almayer/living/briefing)
 "dwr" = (
-/turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "sterile_green_side"
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/centrifuge{
+	layer = 3.1;
+	pixel_y = 4
 	},
-/area/almayer/medical/containment)
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/medical/medical_science)
 "dwA" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/sign/safety/bathunisex{
@@ -30769,6 +30823,17 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/lobby)
+"dyb" = (
+/obj/structure/machinery/smartfridge/chemistry,
+/obj/item/device/radio/intercom{
+	freerange = 1;
+	name = "General Listening Channel";
+	pixel_y = 28
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "dyd" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 1
@@ -30859,18 +30924,15 @@
 	},
 /area/almayer/command/cic)
 "dBj" = (
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 8;
-	name = "ship-grade camera"
-	},
-/obj/structure/machinery/medical_pod/bodyscanner{
-	dir = 8
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
 /turf/open/floor/almayer{
 	dir = 4;
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/hydroponics)
 "dBp" = (
 /obj/structure/machinery/camera/autoname/almayer{
 	dir = 8;
@@ -31053,29 +31115,21 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/upper_hull/u_f_p)
-"dEl" = (
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/glass/beaker/large,
-/obj/item/reagent_container/glass/beaker/large,
-/obj/item/reagent_container/glass/beaker{
-	pixel_x = 5
-	},
-/obj/item/reagent_container/glass/beaker{
-	pixel_x = 5
-	},
-/obj/item/reagent_container/dropper,
-/obj/structure/machinery/firealarm{
-	dir = 8;
-	pixel_x = -24
+"dEm" = (
+/obj/structure/machinery/power/apc/almayer,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/obj/item/reagent_container/glass/beaker/bluespace{
-	pixel_y = 12
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
+/obj/structure/reagent_dispensers/fueltank/custom,
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
+	dir = 4;
+	icon_state = "sterile_green_corner"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment/cell)
 "dEn" = (
 /obj/structure/machinery/firealarm{
 	pixel_y = -28
@@ -31188,11 +31242,6 @@
 /obj/structure/largecrate/random/case/double,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_a_p)
-"dGB" = (
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/medical/containment)
 "dGC" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
@@ -31294,6 +31343,17 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/shipboard/brig/surgery)
+"dHV" = (
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/structure/pipes/unary/freezer{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "dHZ" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/poddoor/almayer/open{
@@ -31420,12 +31480,10 @@
 	},
 /area/almayer/living/cryo_cells)
 "dMK" = (
-/obj/structure/machinery/portable_atmospherics/hydroponics,
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_corner"
+/turf/closed/wall/almayer/research/containment/wall/corner{
+	dir = 8
 	},
-/area/almayer/medical/hydroponics)
+/area/almayer/medical/containment/cell)
 "dNe" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -31433,6 +31491,19 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/hull/lower_hull/l_f_p)
+"dNq" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/structure/sink{
+	pixel_y = 24
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/containment)
 "dNt" = (
 /obj/structure/window/framed/almayer/hull/hijack_bustable,
 /obj/structure/machinery/door/poddoor/shutters/almayer/open{
@@ -31531,6 +31602,16 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_f_p)
+"dRh" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/medical/hydroponics)
 "dRv" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -31706,6 +31787,15 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/operating_room_two)
+"dVd" = (
+/obj/structure/machinery/seed_extractor{
+	density = 0;
+	pixel_y = 16
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/hydroponics)
 "dVe" = (
 /turf/open/floor/almayer{
 	dir = 1;
@@ -31713,21 +31803,10 @@
 	},
 /area/almayer/living/briefing)
 "dVu" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
-/obj/structure/disposalpipe/segment,
-/obj/structure/machinery/door/poddoor/shutters/almayer/open{
-	dir = 2;
-	id = "researchlockdownint";
-	name = "\improper Research Lockdown"
-	},
-/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
-	dir = 1;
-	name = "\improper Medical Research Wing"
-	},
+/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	dir = 4;
+	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/medical_science)
 "dVO" = (
@@ -31934,11 +32013,21 @@
 /turf/open/floor/almayer,
 /area/almayer/living/port_emb)
 "ean" = (
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 3";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
 	},
-/area/almayer/medical/hydroponics)
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple{
+	dir = 4
+	},
+/area/almayer/medical/containment/cell)
 "eas" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -32041,15 +32130,6 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/engineering_workshop)
-"ecx" = (
-/obj/structure/transmitter{
-	name = "Researcher Office Telephone";
-	phone_category = "Almayer";
-	phone_id = "Research";
-	pixel_y = 29
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
 "ecM" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -32101,18 +32181,11 @@
 	},
 /area/almayer/shipboard/navigation)
 "edv" = (
-/obj/structure/bed/chair,
-/obj/structure/machinery/door_control{
-	id = "containmentlockdown_S";
-	name = "Containment Lockdown";
-	pixel_y = 28;
-	req_one_access_txt = "19;28"
-	},
+/obj/structure/bed/sofa/south/white/left,
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+	icon_state = "sterile_green"
 	},
-/area/almayer/medical/upper_medical)
+/area/almayer/medical/medical_science)
 "edx" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer,
 /obj/structure/sign/safety/maint{
@@ -32412,15 +32485,18 @@
 	},
 /area/almayer/medical/operating_room_two)
 "eiE" = (
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/machinery/light{
+	unacidable = 1;
+	unslashable = 1
 	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/obj/structure/machinery/optable,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/area/almayer/medical/medical_science)
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 1
+	},
+/area/almayer/medical/containment/cell)
 "eiH" = (
 /obj/structure/sink{
 	pixel_y = 24
@@ -32533,21 +32609,6 @@
 "eky" = (
 /turf/open/floor/almayer,
 /area/almayer/command/lifeboat)
-"ekF" = (
-/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
-	id = "Containment Cell 2";
-	locked = 1;
-	name = "\improper Containment Cell 2"
-	},
-/obj/structure/machinery/door/poddoor/shutters/almayer/containment{
-	dir = 4;
-	id = "Containment Cell 2";
-	name = "\improper Containment Cell 2"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/containment/cell)
 "ekY" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -32606,26 +32667,11 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/operating_room_one)
-"elH" = (
-/obj/structure/bed/chair/office/dark{
-	dir = 8;
-	layer = 3.25
-	},
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
 "elR" = (
-/obj/structure/surface/table/almayer,
-/obj/item/paper_bin/wy{
-	pixel_y = 7
-	},
-/obj/item/tool/pen{
-	pixel_y = 8
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_corner"
+/turf/closed/wall/almayer/research/containment/wall/corner{
+	dir = 1
 	},
-/area/almayer/medical/testlab)
+/area/almayer/medical/containment/cell)
 "eme" = (
 /obj/structure/pipes/vents/pump{
 	dir = 4
@@ -32666,14 +32712,9 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_a_p)
 "emK" = (
-/obj/structure/machinery/door_control{
-	id = "containmentlockdown_E";
-	name = "Containment Lockdown";
-	pixel_x = -25;
-	req_one_access_txt = "19;28"
-	},
+/obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer{
-	dir = 8;
+	dir = 10;
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/medical_science)
@@ -32686,18 +32727,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/command/corporateliason)
-"emR" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = 3;
-	pixel_y = 5
-	},
-/obj/item/storage/toolbox/electrical,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/testlab)
 "ene" = (
 /turf/open/floor/almayer{
 	dir = 4;
@@ -32739,12 +32768,6 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/main_office)
-"eoz" = (
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/containment)
 "eoG" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
@@ -32845,10 +32868,10 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
 	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 1
 	},
-/area/almayer/medical/testlab)
+/area/almayer/medical/containment/cell)
 "eqI" = (
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
 	pixel_y = 25
@@ -33063,11 +33086,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/living/officer_study)
-"euB" = (
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_corner"
-	},
-/area/almayer/medical/testlab)
 "euN" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SE-out"
@@ -33380,13 +33398,10 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/starboard_umbilical)
 "eBO" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/obj/structure/machinery/iv_drip,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/bed,
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
 /area/almayer/medical/medical_science)
 "eBV" = (
@@ -33863,17 +33878,15 @@
 	},
 /area/almayer/hull/lower_hull/l_f_s)
 "eNI" = (
-/obj/structure/machinery/light{
-	dir = 8
-	},
-/obj/structure/machinery/autodispenser{
-	dir = 4
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "containmentlockdown_S";
+	name = "\improper Containment Lockdown"
 	},
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
+	icon_state = "test_floor4"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "eNL" = (
 /obj/structure/surface/table/almayer,
 /obj/item/stack/sheet/cardboard{
@@ -33882,25 +33895,6 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/hull/lower_hull/l_f_p)
-"eNP" = (
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
-"eNT" = (
-/obj/structure/bed/chair/office/dark{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/medical/testlab)
 "eOh" = (
 /turf/open/floor/almayer{
 	dir = 1;
@@ -34047,14 +34041,12 @@
 	},
 /area/almayer/lifeboat_pumps/south1)
 "eSo" = (
-/obj/structure/surface/table/almayer,
-/obj/effect/spawner/random/toolbox,
-/obj/item/tool/extinguisher,
+/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_corner"
+	dir = 5;
+	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "eSJ" = (
 /obj/structure/surface/table/woodentable/fancy,
 /obj/structure/transmitter/rotary{
@@ -34239,16 +34231,18 @@
 /area/almayer/living/chapel)
 "eVT" = (
 /obj/structure/surface/table/almayer,
-/obj/item/storage/box/gloves{
-	pixel_x = 5;
-	pixel_y = 8
+/obj/item/paper_bin/wy{
+	pixel_x = 6;
+	pixel_y = 5
 	},
-/obj/item/storage/box/masks{
-	pixel_x = 5
+/obj/item/tool/pen{
+	pixel_x = 8
 	},
-/obj/item/tool/hand_labeler{
-	pixel_x = -8;
-	pixel_y = 3
+/obj/item/clipboard{
+	pixel_x = -8
+	},
+/obj/item/folder/white{
+	pixel_x = -8
 	},
 /turf/open/floor/almayer{
 	icon_state = "sterile_green_side"
@@ -34547,8 +34541,14 @@
 /turf/open/floor/almayer,
 /area/almayer/living/briefing)
 "fcy" = (
-/turf/closed/wall/almayer/research/containment/wall/west,
-/area/almayer/medical/containment/cell)
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/structure/machinery/autolathe,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/hydroponics)
 "fcB" = (
 /turf/open/floor/almayer{
 	dir = 8;
@@ -35017,6 +35017,24 @@
 	icon_state = "emeraldcorner"
 	},
 /area/almayer/squads/charlie)
+"foP" = (
+/obj/structure/machinery/shower{
+	pixel_y = 16
+	},
+/obj/structure/machinery/door_control{
+	id = "containmentlockdown_S";
+	name = "Containment Lockdown";
+	pixel_x = 29;
+	pixel_y = 3;
+	req_one_access_txt = "19;28"
+	},
+/obj/structure/window/reinforced{
+	dir = 8;
+	health = 80;
+	pixel_y = 6
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/medical/medical_science)
 "fpd" = (
 /obj/structure/sign/safety/hvac_old{
 	pixel_x = 8;
@@ -35252,16 +35270,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_m_p)
-"ftG" = (
-/obj/structure/machinery/light{
-	dir = 1
-	},
-/obj/structure/machinery/cm_vending/clothing/medical_crew,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "fut" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
@@ -35441,16 +35449,6 @@
 	icon_state = "plating"
 	},
 /area/almayer/engineering/engine_core)
-"fxY" = (
-/obj/structure/machinery/iv_drip,
-/obj/structure/machinery/camera/autoname/almayer/containment{
-	dir = 1;
-	name = "ship-grade camera"
-	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/containment)
 "fxZ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -35590,11 +35588,17 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/aft_hallway)
 "fBO" = (
+/obj/structure/machinery/chem_master{
+	vial_maker = 1
+	},
+/obj/item/clothing/glasses/science{
+	pixel_x = 1;
+	pixel_y = 8
+	},
 /turf/open/floor/almayer{
-	dir = 6;
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "fCL" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -35799,16 +35803,22 @@
 /turf/open/floor/almayer,
 /area/almayer/lifeboat_pumps/south1)
 "fGu" = (
-/obj/structure/machinery/firealarm{
-	dir = 8;
-	pixel_x = -24
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment,
+/obj/structure/machinery/door_control{
+	dir = 1;
+	id = "researchlockdownext";
+	name = "Window Shutters";
+	pixel_x = -26;
+	pixel_y = 6;
+	req_access_txt = "28"
 	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 6
+/obj/structure/machinery/door_control{
+	dir = 1;
+	id = "researchlockdownext_door";
+	name = "Door Shutters";
+	pixel_x = -26;
+	pixel_y = 1;
+	req_access_txt = "28"
 	},
 /turf/open/floor/almayer{
 	dir = 8;
@@ -36841,9 +36851,7 @@
 /turf/closed/wall/almayer/research/containment/wall/west,
 /area/almayer/medical/containment/cell/cl)
 "ger" = (
-/obj/structure/machinery/chem_master{
-	vial_maker = 1
-	},
+/obj/structure/surface/table/almayer,
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
@@ -36949,6 +36957,15 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
+"ggl" = (
+/obj/structure/closet/secure_closet/freezer/fridge,
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "ggt" = (
 /turf/open/floor/almayer{
 	dir = 5;
@@ -37201,6 +37218,18 @@
 	icon_state = "sterile_green_corner"
 	},
 /area/almayer/medical/lower_medical_medbay)
+"glB" = (
+/obj/structure/machinery/chem_master{
+	vial_maker = 1
+	},
+/obj/structure/sign/safety/chem_lab{
+	pixel_x = 5;
+	pixel_y = 29
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "glM" = (
 /obj/structure/window/reinforced{
 	dir = 8;
@@ -37358,15 +37387,6 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/navigation)
-"grN" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	dir = 6;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "grR" = (
 /turf/open/floor/almayer{
 	dir = 4;
@@ -37694,13 +37714,14 @@
 	},
 /area/almayer/living/gym)
 "gxP" = (
-/obj/structure/machinery/chem_storage/research{
-	dir = 1
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 8
 	},
-/area/almayer/medical/testlab)
+/area/almayer/medical/containment/cell)
 "gxU" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/status_display{
@@ -37902,11 +37923,11 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/alpha_bravo_shared)
 "gAS" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_corner"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "gBc" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
@@ -38097,11 +38118,15 @@
 /turf/open/floor/plating,
 /area/almayer/hallways/hangar)
 "gGx" = (
+/obj/structure/filingcabinet/chestdrawer{
+	density = 0;
+	pixel_x = -16
+	},
+/obj/structure/machinery/iv_drip,
 /turf/open/floor/almayer{
-	dir = 5;
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "gGI" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/machinery/light{
@@ -38279,15 +38304,19 @@
 	},
 /area/almayer/engineering/upper_engineering)
 "gLc" = (
-/obj/structure/surface/rack,
-/obj/item/storage/fancy/vials,
-/obj/item/storage/fancy/vials,
-/obj/item/storage/fancy/vials,
-/obj/item/storage/fancy/vials,
-/turf/open/floor/almayer{
-	icon_state = "sterile_green"
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/area/almayer/medical/medical_science)
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/medical/hydroponics)
 "gLu" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
@@ -38310,11 +38339,6 @@
 	icon_state = "cargo"
 	},
 /area/almayer/engineering/upper_engineering/port)
-"gLB" = (
-/turf/open/floor/almayer/research/containment/entrance{
-	dir = 8
-	},
-/area/almayer/medical/containment/cell)
 "gLE" = (
 /obj/structure/platform{
 	dir = 1
@@ -38426,6 +38450,12 @@
 	icon_state = "cargo"
 	},
 /area/almayer/engineering/engine_core)
+"gNp" = (
+/turf/open/floor/almayer{
+	dir = 9;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "gNq" = (
 /obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{
 	req_access = null;
@@ -38532,13 +38562,13 @@
 	},
 /area/almayer/engineering/engineering_workshop/hangar)
 "gQF" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 6
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/obj/structure/bed/chair/comfy{
+	buckling_y = 2;
+	dir = 8;
+	pixel_y = 2
 	},
-/area/almayer/medical/containment)
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/medical/medical_science)
 "gRd" = (
 /obj/structure/platform,
 /obj/structure/target{
@@ -38706,6 +38736,16 @@
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/lifeboat_pumps/north2)
+"gVq" = (
+/obj/structure/machinery/light,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "sterile_green_corner"
+	},
+/area/almayer/medical/containment)
 "gVA" = (
 /obj/structure/disposalpipe/down/almayer{
 	dir = 8;
@@ -39096,6 +39136,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
+"hec" = (
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "hee" = (
 /turf/open/floor/almayer{
 	dir = 4;
@@ -39226,9 +39272,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/engineering/engine_core)
-"hgv" = (
-/turf/closed/wall/almayer/white/reinforced,
-/area/almayer/medical/testlab)
 "hgB" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/computer/intel,
@@ -39480,8 +39523,16 @@
 	},
 /area/almayer/hallways/starboard_hallway)
 "hme" = (
-/turf/open/floor/almayer/research/containment/floor2,
-/area/almayer/medical/containment/cell)
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/hydroponics)
 "hmy" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -39521,10 +39572,20 @@
 	},
 /area/almayer/command/cichallway)
 "hng" = (
-/turf/closed/wall/almayer/research/containment/wall/corner{
-	dir = 4
+/obj/structure/surface/table/almayer,
+/obj/item/clothing/accessory/storage/black_vest/acid_harness,
+/obj/item/clothing/accessory/storage/black_vest/acid_harness,
+/obj/structure/machinery/alarm/almayer{
+	dir = 1
 	},
-/area/almayer/medical/containment/cell)
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical/hydroponics)
 "hnV" = (
 /obj/structure/machinery/light,
 /turf/open/floor/almayer,
@@ -39596,18 +39657,18 @@
 /turf/open/floor/almayer,
 /area/almayer/living/chapel)
 "hqh" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{
-	name = "\improper Research Laboratory"
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 1
 	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_y = 1
 	},
-/area/almayer/medical/medical_science)
+/turf/open/floor/almayer/research/containment/entrance,
+/area/almayer/medical/containment/cell)
 "hqs" = (
 /obj/structure/machinery/light/small{
 	dir = 8
@@ -39616,14 +39677,6 @@
 	icon_state = "cargo"
 	},
 /area/almayer/hull/lower_hull/l_f_s)
-"hqw" = (
-/turf/open/floor/almayer/research/containment/corner4,
-/area/almayer/medical/containment/cell)
-"hqL" = (
-/turf/open/floor/almayer/research/containment/corner_var1{
-	dir = 4
-	},
-/area/almayer/medical/containment/cell)
 "hqW" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{
 	name = "\improper Medical Bay";
@@ -39644,6 +39697,19 @@
 	icon_state = "redfull"
 	},
 /area/almayer/command/cic)
+"hrn" = (
+/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
+	name = "\improper Research Reception Laboratory"
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 8;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/medical_science)
 "hrF" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -39879,11 +39945,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/charlie_delta_shared)
-"hyp" = (
-/turf/open/floor/almayer/research/containment/floor2{
-	dir = 1
-	},
-/area/almayer/medical/containment/cell)
 "hyw" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NW-out";
@@ -40213,34 +40274,12 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/hull/lower_hull/l_f_p)
-"hER" = (
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/containment)
-"hEU" = (
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/glass/beaker{
-	pixel_x = 8
-	},
-/obj/item/reagent_container/spray/cleaner{
-	pixel_x = -3
-	},
-/obj/item/reagent_container/dropper{
-	pixel_y = -3
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_corner"
-	},
-/area/almayer/medical/containment)
 "hEV" = (
 /obj/structure/pipes/vents/pump,
 /turf/open/floor/almayer,
 /area/almayer/lifeboat_pumps/south1)
 "hFC" = (
-/obj/structure/bed/chair/office/dark,
+/obj/structure/bed/chair/comfy,
 /turf/open/floor/almayer{
 	dir = 8;
 	icon_state = "sterile_green_side"
@@ -40431,9 +40470,19 @@
 	},
 /area/almayer/hull/upper_hull/u_f_s)
 "hKl" = (
-/obj/structure/disposalpipe/segment,
-/turf/closed/wall/almayer/white/outer_tile,
-/area/almayer/medical/medical_science)
+/obj/structure/pipes/vents/pump,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/hydroponics)
 "hKq" = (
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
 	pixel_y = 25
@@ -40566,19 +40615,15 @@
 /turf/open/floor/almayer,
 /area/almayer/hallways/port_hallway)
 "hPe" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
+/obj/structure/disposalpipe/segment,
+/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research,
 /obj/structure/machinery/door/poddoor/shutters/almayer/open{
-	dir = 2;
-	id = "researchlockdownint";
-	name = "\improper Research Lockdown"
+	id = "researchlockdownext_door";
+	name = "\improper Research Doorway Shutter"
 	},
-/obj/structure/disposalpipe/segment,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
-	dir = 1;
-	name = "\improper Medical Research Wing"
+/obj/structure/machinery/door/poddoor/almayer/open{
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
 	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -40608,21 +40653,17 @@
 	},
 /area/almayer/hallways/stern_hallway)
 "hPN" = (
-/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
-	id = "Containment Cell 1";
-	locked = 1;
-	name = "\improper Containment Cell 1"
-	},
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	dir = 4;
-	id = "Containment Cell 1";
-	name = "\improper Containment Cell 1";
-	unacidable = 1
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	dir = 5;
+	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/containment/cell)
+/area/almayer/medical/hydroponics)
 "hPT" = (
 /obj/structure/largecrate/random/case/small,
 /turf/open/floor/almayer{
@@ -40675,6 +40716,17 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
+"hRa" = (
+/obj/structure/machinery/vending/snack{
+	pixel_x = -7
+	},
+/obj/structure/machinery/vending/coffee{
+	pixel_x = 14
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "hRd" = (
 /obj/structure/machinery/vending/coffee,
 /turf/open/floor/almayer{
@@ -40882,15 +40934,6 @@
 /obj/effect/landmark/yautja_teleport,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_f_s)
-"hUR" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/machinery/light,
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "hUW" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -40901,31 +40944,24 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cic_hallway)
-"hVz" = (
-/obj/structure/machinery/light{
+"hVf" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
 	},
 /turf/open/floor/almayer{
-	dir = 1;
+	dir = 6;
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/upper_medical)
-"hVO" = (
-/obj/structure/closet/l3closet/general,
+/area/almayer/medical/medical_science)
+"hVz" = (
 /obj/structure/machinery/light{
-	dir = 4
-	},
-/obj/structure/sign/safety/biolab{
-	pixel_y = 32
-	},
-/obj/structure/sign/safety/biohazard{
-	pixel_x = 15;
-	pixel_y = 32
+	dir = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green_corner"
+	dir = 1;
+	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/upper_medical)
 "hWa" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/item/ashtray/plastic,
@@ -41184,9 +41220,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
-"icM" = (
-/turf/closed/wall/almayer/research/containment/wall/north,
-/area/almayer/medical/containment/cell)
 "icX" = (
 /obj/structure/machinery/brig_cell/perma_2{
 	pixel_x = -32;
@@ -41644,10 +41677,15 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cells)
 "inL" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green_corner"
+	dir = 8;
+	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "inN" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/manifold/hidden/supply{
@@ -41717,17 +41755,25 @@
 	},
 /area/almayer/hull/upper_hull/u_m_s)
 "ipQ" = (
-/obj/structure/window/reinforced{
-	dir = 8;
-	health = 80
+/obj/structure/surface/rack,
+/obj/item/storage/fancy/vials/empty,
+/obj/item/storage/fancy/vials/empty,
+/obj/item/storage/fancy/vials/empty,
+/obj/item/storage/fancy/vials/empty,
+/obj/item/storage/fancy/vials/empty,
+/obj/item/storage/fancy/vials/empty,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/obj/structure/machinery/door/window/southleft{
-	req_access_txt = "28"
+/obj/item/device/radio/intercom{
+	freerange = 1;
+	name = "General Listening Channel";
+	pixel_x = -29
 	},
 /turf/open/floor/almayer{
 	icon_state = "sterile_green"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/hydroponics)
 "ipT" = (
 /obj/structure/surface/rack,
 /obj/effect/spawner/random/toolbox,
@@ -41798,9 +41844,6 @@
 	icon_state = "red"
 	},
 /area/almayer/lifeboat_pumps/south2)
-"irA" = (
-/turf/closed/wall/almayer/white/reinforced,
-/area/almayer/medical/containment)
 "irI" = (
 /obj/structure/sign/safety/maint{
 	pixel_y = 32
@@ -41834,6 +41877,18 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/living/port_emb)
+"irU" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "isC" = (
 /obj/effect/projector{
 	name = "Almayer_AresDown";
@@ -42069,6 +42124,22 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/engineering/laundry)
+"iwJ" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_y = -1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer/research/containment/entrance{
+	dir = 8
+	},
+/area/almayer/medical/containment/cell)
 "iwW" = (
 /obj/structure/bed/chair/comfy/beige,
 /turf/open/floor/carpet,
@@ -42232,12 +42303,15 @@
 /turf/open/floor/almayer,
 /area/almayer/hallways/hangar)
 "iAz" = (
-/obj/structure/pipes/standard/manifold/hidden/supply,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out"
+	},
 /turf/open/floor/almayer{
-	dir = 1;
+	dir = 10;
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "iAB" = (
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
 	pixel_y = -25
@@ -42831,13 +42905,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/command/cichallway)
-"iQo" = (
-/obj/structure/closet/l3closet/general,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/containment)
 "iQt" = (
 /obj/structure/largecrate/random/case/small,
 /obj/item/toy/deck{
@@ -42898,16 +42965,21 @@
 /turf/open/floor/almayer,
 /area/almayer/living/gym)
 "iRN" = (
-/obj/structure/filingcabinet/seeds,
-/obj/structure/sign/safety/intercom{
-	pixel_x = 8;
-	pixel_y = 32
+/obj/structure/machinery/light/containment{
+	dir = 4
 	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/area/almayer/medical/hydroponics)
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer/research/containment/corner_var1{
+	dir = 4
+	},
+/area/almayer/medical/containment/cell)
 "iRS" = (
 /obj/item/trash/chips,
 /turf/open/floor/plating,
@@ -42996,13 +43068,26 @@
 /turf/open/floor/plating,
 /area/almayer/hull/lower_hull/l_f_p)
 "iUo" = (
-/obj/structure/pipes/vents/scrubber{
-	dir = 8
+/obj/structure/sign/safety/terminal{
+	pixel_x = 7;
+	pixel_y = -25
+	},
+/obj/structure/surface/rack,
+/obj/item/storage/box/autoinjectors{
+	pixel_x = 7;
+	pixel_y = 5
+	},
+/obj/item/storage/box/beakers{
+	pixel_x = -6;
+	pixel_y = 5
+	},
+/obj/item/storage/box/sprays{
+	pixel_y = -3
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/hydroponics)
 "iUZ" = (
 /obj/docking_port/stationary/escape_pod/cl,
 /turf/open/floor/plating,
@@ -43148,13 +43233,19 @@
 /turf/open/floor/almayer,
 /area/almayer/living/tankerbunks)
 "iYf" = (
-/obj/structure/machinery/camera/autoname/almayer/containment{
-	dir = 4
+/obj/structure/machinery/cm_vending/clothing/medical_crew{
+	density = 0;
+	pixel_y = 16
 	},
-/turf/open/floor/almayer/research/containment/floor2{
-	dir = 8
+/obj/structure/window/reinforced{
+	dir = 8;
+	health = 80
 	},
-/area/almayer/medical/containment/cell)
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "cargo_arrow"
+	},
+/area/almayer/medical/hydroponics)
 "iYi" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "SW-out"
@@ -43390,6 +43481,14 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/upper_engineering/port)
+"jbK" = (
+/obj/structure/bed/chair/comfy{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical/containment)
 "jbO" = (
 /obj/structure/machinery/cm_vending/sorted/medical,
 /turf/open/floor/almayer{
@@ -43478,11 +43577,20 @@
 /turf/closed/wall/almayer,
 /area/almayer/squads/alpha_bravo_shared)
 "jeq" = (
-/obj/structure/window/reinforced,
+/obj/structure/surface/rack,
+/obj/item/storage/box/pillbottles{
+	pixel_x = 6;
+	pixel_y = 7
+	},
+/obj/item/storage/box/pillbottles{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/item/storage/box/pillbottles,
 /turf/open/floor/almayer{
-	icon_state = "sterile_green"
+	icon_state = "mono"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/hydroponics)
 "jew" = (
 /obj/structure/surface/table/reinforced/black,
 /turf/open/floor/almayer{
@@ -43600,6 +43708,18 @@
 	icon_state = "kitchen"
 	},
 /area/almayer/living/grunt_rnr)
+"jgg" = (
+/obj/structure/machinery/camera/autoname/almayer/containment{
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 8
+	},
+/area/almayer/medical/containment/cell)
 "jgk" = (
 /obj/structure/machinery/shower{
 	dir = 1
@@ -43640,14 +43760,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/upper_engineering/notunnel)
-"jgA" = (
-/obj/structure/surface/table/almayer,
-/obj/item/clothing/accessory/storage/black_vest/acid_harness,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_corner"
-	},
-/area/almayer/medical/testlab)
 "jgF" = (
 /obj/structure/platform,
 /turf/open/floor/almayer{
@@ -43789,6 +43901,19 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/main_office)
+"jjS" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_corner"
+	},
+/area/almayer/medical/medical_science)
 "jjT" = (
 /obj/structure/machinery/light,
 /obj/effect/projector{
@@ -43881,22 +44006,29 @@
 	},
 /area/almayer/shipboard/brig/perma)
 "jlA" = (
-/obj/structure/window/framed/almayer/white,
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/turf/open/floor/plating,
-/area/almayer/medical/hydroponics)
-"jlG" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer{
-	dir = 2
-	},
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{
-	name = "\improper Researcher Study"
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	dir = 5;
+	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
+"jlG" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1;
+	pixel_y = -1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_y = -1
+	},
+/turf/open/floor/almayer/research/containment/entrance,
+/area/almayer/medical/containment/cell)
 "jlN" = (
 /obj/structure/desertdam/decals/road_edge{
 	icon_state = "road_edge_decal3";
@@ -44122,6 +44254,15 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/pilotbunks)
+"jrM" = (
+/obj/structure/machinery/camera/autoname/almayer/containment{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "jss" = (
 /obj/structure/bed/chair/comfy{
 	dir = 8
@@ -44130,16 +44271,17 @@
 	icon_state = "bluefull"
 	},
 /area/almayer/living/captain_mess)
-"jtd" = (
-/obj/structure/machinery/portable_atmospherics/hydroponics,
-/obj/structure/machinery/light{
-	dir = 4
+"jsx" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 1
 	},
 /turf/open/floor/almayer{
-	dir = 4;
+	dir = 5;
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/hydroponics)
+/area/almayer/medical/medical_science)
 "jtj" = (
 /obj/structure/machinery/status_display{
 	pixel_y = 30
@@ -44414,17 +44556,21 @@
 	},
 /area/almayer/hull/upper_hull/u_a_s)
 "jBO" = (
-/obj/structure/closet/secure_closet/hydroresearch,
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 3";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
 	},
-/obj/item/reagent_container/glass/watertank,
-/obj/item/reagent_container/glass/watertank,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
 	},
-/area/almayer/medical/hydroponics)
+/turf/closed/wall/almayer/research/containment/wall/purple{
+	dir = 8
+	},
+/area/almayer/medical/containment/cell)
 "jCa" = (
 /obj/structure/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
@@ -44433,9 +44579,6 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/main_office)
-"jCG" = (
-/turf/closed/wall/almayer/research/containment/wall/connect_w,
-/area/almayer/medical/containment/cell)
 "jCK" = (
 /obj/effect/decal/medical_decals{
 	icon_state = "triagedecalbottomleft";
@@ -44488,6 +44631,20 @@
 /obj/item/frame/rack,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_s)
+"jFf" = (
+/obj/structure/machinery/shower{
+	pixel_y = 16
+	},
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4;
+	health = 80;
+	pixel_y = 6
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/medical/medical_science)
 "jFg" = (
 /obj/structure/pipes/standard/cap/hidden{
 	dir = 4
@@ -44579,15 +44736,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cic_hallway)
-"jHs" = (
-/obj/structure/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 8
-	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "jHC" = (
 /turf/open/floor/almayer{
 	dir = 1;
@@ -44824,13 +44972,36 @@
 /turf/open/floor/almayer,
 /area/almayer/living/briefing)
 "jNc" = (
+/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
+	id = "Containment Cell 3";
+	locked = 1;
+	name = "\improper Containment Cell 3";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/shutters/almayer/containment{
+	dir = 4;
+	id = "Containment Cell 3";
+	name = "\improper Containment Cell 3"
+	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "test_floor4"
 	},
-/area/almayer/medical/hydroponics)
+/area/almayer/medical/containment/cell)
 "jNq" = (
 /obj/structure/closet/secure_closet/personal/cabinet{
 	req_access = null
@@ -44942,6 +45113,11 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_f_p)
+"jQt" = (
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 8
+	},
+/area/almayer/medical/containment/cell)
 "jQA" = (
 /obj/structure/pipes/vents/scrubber{
 	dir = 4
@@ -45150,6 +45326,15 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_a_s)
+"jUM" = (
+/obj/structure/machinery/camera/autoname/almayer/containment{
+	dir = 8
+	},
+/obj/structure/pipes/vents/pump,
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/medical/medical_science)
 "jUW" = (
 /obj/effect/step_trigger/clone_cleaner,
 /obj/effect/decal/warning_stripes{
@@ -45184,6 +45369,15 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/alpha)
+"jVt" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/turf/open/floor/almayer/research/containment/corner3,
+/area/almayer/medical/containment/cell)
 "jVE" = (
 /turf/open/floor/almayer{
 	icon_state = "test_floor5"
@@ -45296,12 +45490,20 @@
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/processing)
 "jZs" = (
-/obj/structure/surface/table/almayer,
-/obj/item/clothing/accessory/storage/black_vest/acid_harness,
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
+/obj/structure/machinery/light/containment{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/area/almayer/medical/testlab)
+/turf/open/floor/almayer/research/containment/corner{
+	dir = 1
+	},
+/area/almayer/medical/containment/cell)
 "jZu" = (
 /obj/structure/machinery/door_control{
 	id = "CIC_Conference";
@@ -45453,19 +45655,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/squads/bravo)
-"kbf" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "containmentlockdown_N";
-	name = "\improper Containment Lockdown"
-	},
-/obj/structure/machinery/door/airlock/almayer/research/reinforced{
-	dir = 1;
-	name = "\improper Containment Airlock"
-	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
-	},
-/area/almayer/medical/containment)
 "kbx" = (
 /obj/structure/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -45492,6 +45681,17 @@
 	icon_state = "ai_floors"
 	},
 /area/almayer/command/airoom)
+"kbJ" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	dir = 6;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/containment)
 "kbV" = (
 /obj/structure/platform{
 	dir = 1
@@ -45547,17 +45747,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/lower_medical_lobby)
-"kex" = (
-/obj/structure/machinery/cm_vending/sorted/medical/blood,
-/obj/structure/sign/safety/ref_bio_storage{
-	pixel_x = 8;
-	pixel_y = 32
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "keO" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer{
 	dir = 2
@@ -45669,12 +45858,16 @@
 "kgs" = (
 /obj/structure/window/framed/almayer/white,
 /obj/structure/machinery/door/poddoor/shutters/almayer/open{
-	id = "researchlockdownext";
-	name = "\improper Research Lockdown"
+	id = "researchlockdownext_se_2";
+	name = "\improper Research Window Shutter"
 	},
 /obj/structure/machinery/door/firedoor/border_only/almayer{
 	dir = 1
 	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
 /turf/open/floor/plating,
 /area/almayer/medical/medical_science)
 "khd" = (
@@ -45968,12 +46161,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/bravo)
-"koL" = (
-/obj/structure/pipes/vents/pump,
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/medical/testlab)
 "koT" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -46137,17 +46324,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/gym)
-"krq" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "krN" = (
 /obj/structure/machinery/conveyor{
 	id = "req_belt"
@@ -46561,6 +46737,17 @@
 	icon_state = "red"
 	},
 /area/almayer/lifeboat_pumps/south2)
+"kBo" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1;
+	pixel_y = -1
+	},
+/turf/open/floor/almayer{
+	dir = 6;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "kBy" = (
 /obj/structure/machinery/ares/processor,
 /turf/open/floor/almayer/no_build{
@@ -46568,11 +46755,15 @@
 	},
 /area/almayer/command/airoom)
 "kBP" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
 /turf/open/floor/almayer{
-	dir = 9;
+	dir = 4;
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "kBY" = (
 /obj/structure/machinery/cryopod/right,
 /turf/open/floor/almayer{
@@ -46582,6 +46773,12 @@
 "kCi" = (
 /turf/closed/wall/almayer/reinforced,
 /area/almayer/shipboard/port_missiles)
+"kCj" = (
+/obj/structure/machinery/light,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/hydroponics)
 "kCm" = (
 /obj/structure/sign/safety/fire_haz{
 	pixel_x = 15;
@@ -46596,10 +46793,19 @@
 /area/almayer/hallways/hangar)
 "kCE" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_y = 1
+	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "kCS" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer,
@@ -46634,17 +46840,23 @@
 	},
 /area/almayer/medical/lower_medical_medbay)
 "kDk" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer,
 /obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+	dir = 6
 	},
-/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
-	name = "\improper Medical Research Workshop"
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1;
+	pixel_y = -1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/medical/testlab)
+/area/almayer/medical/containment)
 "kDt" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -46776,6 +46988,14 @@
 	icon_state = "green"
 	},
 /area/almayer/hallways/aft_hallway)
+"kGQ" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer/research/containment/corner_var1{
+	icon_state = "containment_corner_variant_2"
+	},
+/area/almayer/medical/containment/cell)
 "kGX" = (
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
 	pixel_y = 25
@@ -46816,12 +47036,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_p)
-"kHB" = (
-/obj/structure/machinery/vending/cola/research,
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "kHK" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -47033,20 +47247,19 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/briefing)
 "kNx" = (
-/obj/structure/machinery/door_control{
-	id = "containmentlockdown_S";
-	name = "Containment Lockdown";
-	pixel_y = -20;
-	req_one_access_txt = "19;28"
+/obj/structure/sign/safety/ref_bio_storage{
+	pixel_x = -17;
+	pixel_y = 7
 	},
-/obj/structure/machinery/light{
-	dir = 8
+/obj/structure/sign/safety/biohazard{
+	pixel_x = -17;
+	pixel_y = -7
 	},
+/obj/structure/machinery/cm_vending/sorted/medical/chemistry,
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_corner"
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "kNO" = (
 /obj/structure/desertdam/decals/road_edge{
 	icon_state = "road_edge_decal3";
@@ -47253,16 +47466,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/hangar)
-"kSc" = (
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 8;
-	name = "ship-grade camera"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/testlab)
 "kSd" = (
 /obj/item/cell/high/empty,
 /obj/item/cell/high/empty,
@@ -47517,11 +47720,11 @@
 	},
 /area/almayer/command/computerlab)
 "kXw" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	dir = 1;
+	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/upper_medical)
+/area/almayer/medical/medical_science)
 "kXJ" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/structure/machinery/computer/secure_data{
@@ -47597,6 +47800,20 @@
 	icon_state = "orange"
 	},
 /area/almayer/hallways/port_umbilical)
+"kZV" = (
+/obj/structure/machinery/light,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/hydroponics)
 "lah" = (
 /turf/open/floor/almayer{
 	dir = 6;
@@ -47792,8 +48009,23 @@
 	},
 /area/almayer/hull/upper_hull/u_a_p)
 "lea" = (
-/turf/closed/wall/almayer/research/containment/wall/east,
-/area/almayer/medical/containment/cell)
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
+	},
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 10
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/medical/hydroponics)
 "lef" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
@@ -47960,6 +48192,14 @@
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/basketball)
+"lid" = (
+/obj/structure/machinery/chem_master{
+	vial_maker = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "lin" = (
 /obj/effect/projector{
 	name = "Almayer_AresDown";
@@ -47983,6 +48223,25 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/command/computerlab)
+"liY" = (
+/obj/structure/machinery/flasher{
+	id = "Containment Cell 5";
+	layer = 2.1;
+	name = "Mounted Flash";
+	pixel_y = 30
+	},
+/obj/structure/machinery/iv_drip,
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/turf/open/floor/almayer/research/containment/corner_var1{
+	icon_state = "containment_corner_variant_2"
+	},
+/area/almayer/medical/containment/cell)
 "liZ" = (
 /obj/structure/surface/table/almayer,
 /obj/item/toy/deck,
@@ -48101,30 +48360,19 @@
 /turf/open/floor/almayer,
 /area/almayer/squads/bravo)
 "lmw" = (
-/obj/structure/pipes/standard/simple/hidden{
-	dir = 6
-	},
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
+/obj/structure/closet/l3closet/general,
+/obj/structure/machinery/light{
+	dir = 8
 	},
-/obj/structure/bed,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+/obj/structure/window/reinforced{
+	dir = 4;
+	health = 80
 	},
+/turf/open/floor/plating/plating_catwalk,
 /area/almayer/medical/medical_science)
 "lmz" = (
 /turf/closed/wall/almayer/white/hull,
 /area/space)
-"lmE" = (
-/obj/structure/reagent_dispensers/fueltank/custom,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/containment)
 "lmW" = (
 /obj/structure/pipes/vents/pump,
 /obj/structure/mirror{
@@ -48205,6 +48453,17 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/charlie)
+"lou" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "loK" = (
 /obj/structure/closet/crate/medical,
 /obj/item/storage/firstaid/adv,
@@ -48467,13 +48726,11 @@
 	},
 /area/almayer/squads/req)
 "lto" = (
-/obj/structure/machinery/light{
-	dir = 4
-	},
+/obj/structure/machinery/iv_drip,
 /turf/open/floor/almayer{
 	icon_state = "sterile_green"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "ltA" = (
 /obj/item/tool/weldingtool,
 /turf/open/floor/almayer,
@@ -48786,6 +49043,14 @@
 	icon_state = "redcorner"
 	},
 /area/almayer/shipboard/brig/main_office)
+"lzA" = (
+/obj/structure/machinery/sleep_console{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "lzH" = (
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
 	pixel_y = -25
@@ -48913,6 +49178,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/engineering/engineering_workshop/hangar)
+"lCt" = (
+/turf/open/floor/almayer{
+	dir = 10;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/containment)
 "lCz" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -49311,18 +49582,20 @@
 	},
 /area/almayer/living/cryo_cells)
 "lJv" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "containmentlockdown_S";
-	name = "\improper Containment Lockdown"
+/obj/structure/window/framed/almayer/white,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 1
 	},
-/obj/structure/machinery/door/airlock/almayer/research/reinforced{
-	dir = 1;
-	name = "\improper Containment Airlock"
+/obj/structure/machinery/door/poddoor/shutters/almayer/open{
+	id = "researchlockdownext";
+	name = "\improper Research Window Shutter"
 	},
-/turf/open/floor/almayer{
-	icon_state = "test_floor4"
+/obj/structure/machinery/door/poddoor/almayer/open{
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
 	},
-/area/almayer/medical/containment)
+/turf/open/floor/plating,
+/area/almayer/medical/medical_science)
 "lJG" = (
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /obj/structure/disposalpipe/segment{
@@ -49415,6 +49688,13 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/lifeboat_pumps/south2)
+"lMv" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+	dir = 6;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "lMw" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
@@ -49533,6 +49813,20 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/operating_room_two)
+"lON" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/poddoor/shutters/almayer/open{
+	id = "researchlockdownext_door";
+	name = "\improper Research Doorway Shutter"
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/medical_science)
 "lPB" = (
 /obj/structure/surface/table/almayer,
 /obj/item/device/lightreplacer,
@@ -49815,6 +50109,15 @@
 "lYA" = (
 /turf/closed/wall/almayer/outer,
 /area/almayer/hull/upper_hull/u_m_s)
+"lYL" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical/hydroponics)
 "lYN" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E"
@@ -49873,10 +50176,11 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_f_p)
 "lZZ" = (
-/turf/closed/wall/almayer/research/containment/wall/corner{
-	dir = 8
+/obj/structure/machinery/autolathe/medilathe/full,
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
 	},
-/area/almayer/medical/containment/cell)
+/area/almayer/medical/hydroponics)
 "maa" = (
 /obj/structure/closet/emcloset,
 /turf/open/floor/almayer{
@@ -49884,11 +50188,6 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/general_equipment)
-"mab" = (
-/turf/open/floor/almayer/research/containment/entrance{
-	dir = 4
-	},
-/area/almayer/medical/containment/cell)
 "maq" = (
 /obj/structure/machinery/cryopod/right{
 	pixel_y = 6
@@ -50344,6 +50643,21 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_f_s)
+"mmN" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 1
+	},
+/obj/structure/machinery/door/poddoor/shutters/almayer/open{
+	id = "researchlockdownext_se_2";
+	name = "\improper Research Window Shutter"
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/obj/structure/window/framed/almayer/white,
+/turf/open/floor/plating,
+/area/almayer/medical/medical_science)
 "mnf" = (
 /obj/structure/window/framed/almayer,
 /obj/structure/machinery/door/firedoor/border_only/almayer,
@@ -50391,6 +50705,31 @@
 	icon_state = "blue"
 	},
 /area/almayer/living/briefing)
+"mnW" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/surface/table/almayer,
+/obj/item/device/reagent_scanner{
+	pixel_x = -8;
+	pixel_y = 4
+	},
+/obj/item/clipboard{
+	pixel_x = 8
+	},
+/obj/item/paper{
+	pixel_x = 8
+	},
+/obj/effect/spawner/random/toolbox{
+	pixel_x = 5;
+	pixel_y = -3
+	},
+/obj/item/storage/box/monkeycubes{
+	pixel_x = 7;
+	pixel_y = 7
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical/containment)
 "moh" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating/plating_catwalk,
@@ -50544,10 +50883,31 @@
 	},
 /area/almayer/squads/req)
 "msi" = (
-/obj/structure/window/framed/almayer/white,
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/turf/open/floor/plating,
-/area/almayer/medical/testlab)
+/obj/structure/filingcabinet/filingcabinet{
+	density = 0;
+	layer = 2.9;
+	pixel_x = 7;
+	pixel_y = 16
+	},
+/obj/structure/filingcabinet/filingcabinet{
+	density = 0;
+	layer = 2.9;
+	pixel_x = -8;
+	pixel_y = 16
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/structure/reagent_dispensers/fueltank/custom,
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_corner"
+	},
+/area/almayer/medical/containment)
 "msm" = (
 /obj/structure/sign/poster{
 	pixel_y = 32
@@ -50603,14 +50963,6 @@
 	icon_state = "red"
 	},
 /area/almayer/command/lifeboat)
-"mtI" = (
-/obj/structure/filingcabinet/chestdrawer{
-	pixel_x = -8
-	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/medical/medical_science)
 "mtM" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
@@ -50813,14 +51165,18 @@
 /turf/closed/wall/almayer,
 /area/almayer/hull/lower_hull/l_f_p)
 "mzq" = (
-/obj/structure/machinery/light{
-	unacidable = 1;
-	unslashable = 1
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 6
 	},
-/turf/open/floor/almayer/research/containment/floor2{
-	dir = 1
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
 	},
-/area/almayer/medical/containment/cell)
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "sterile_green_corner"
+	},
+/area/almayer/medical/hydroponics)
 "mzz" = (
 /obj/structure/machinery/light,
 /turf/open/floor/almayer,
@@ -51003,6 +51359,19 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/briefing)
+"mFq" = (
+/obj/structure/machinery/door_control{
+	dir = 1;
+	id = "researchlockdownext_door";
+	name = "Door Shutters";
+	pixel_y = 29;
+	req_access_txt = "28"
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "mFD" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -51115,15 +51484,18 @@
 /turf/open/floor/almayer,
 /area/almayer/living/gym)
 "mHD" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/light{
-	dir = 8
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
 	},
-/obj/structure/machinery/computer/research{
-	dir = 4
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/hydroponics)
 "mHE" = (
 /turf/open/floor/almayer/no_build{
 	dir = 8;
@@ -51285,15 +51657,18 @@
 	},
 /area/almayer/medical/lower_medical_lobby)
 "mKx" = (
-/obj/structure/machinery/status_display{
-	pixel_y = 30
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
 	},
-/obj/structure/machinery/iv_drip,
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/hydroponics)
 "mKJ" = (
 /obj/structure/machinery/firealarm{
 	pixel_y = 28
@@ -51672,17 +52047,15 @@
 	},
 /area/almayer/command/securestorage)
 "mSK" = (
-/obj/structure/machinery/cryo_cell{
-	dir = 1
-	},
-/obj/structure/pipes/standard/cap/hidden{
-	dir = 8
+/obj/structure/machinery/portable_atmospherics/hydroponics,
+/obj/structure/window/reinforced{
+	dir = 4;
+	health = 80
 	},
 /turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_side"
+	icon_state = "test_floor5"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/hydroponics)
 "mSP" = (
 /obj/structure/machinery/door/poddoor/shutters/almayer/open{
 	dir = 4;
@@ -51712,6 +52085,13 @@
 	icon_state = "green"
 	},
 /area/almayer/hallways/aft_hallway)
+"mTd" = (
+/obj/structure/machinery/smartfridge/chemistry{
+	pixel_x = -3;
+	pixel_y = -1
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/medical/medical_science)
 "mTi" = (
 /obj/structure/machinery/cryopod/right,
 /turf/open/floor/almayer{
@@ -51734,14 +52114,19 @@
 	},
 /area/almayer/shipboard/navigation)
 "mTp" = (
-/obj/structure/surface/table/almayer,
-/obj/item/clipboard,
-/obj/item/paper,
-/obj/item/storage/xeno_tag_case/full,
+/obj/structure/window/reinforced{
+	dir = 4;
+	health = 80
+	},
+/obj/structure/machinery/cm_vending/clothing/medical_crew{
+	density = 0;
+	pixel_y = 16
+	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green_corner"
+	dir = 1;
+	icon_state = "cargo_arrow"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/hydroponics)
 "mUa" = (
 /obj/structure/disposalpipe/junction{
 	dir = 4;
@@ -51849,6 +52234,17 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/general_equipment)
+"mWs" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "mWw" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
@@ -51901,10 +52297,10 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 10
 	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 1
 	},
-/area/almayer/medical/hydroponics)
+/area/almayer/medical/containment/cell)
 "mXj" = (
 /turf/closed/wall/almayer,
 /area/almayer/living/commandbunks)
@@ -51914,19 +52310,6 @@
 	icon_state = "red"
 	},
 /area/almayer/hallways/aft_hallway)
-"mYj" = (
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
-	},
-/obj/structure/surface/rack,
-/obj/item/stack/sheet/cardboard{
-	amount = 50
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/testlab)
 "mYs" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -52065,6 +52448,20 @@
 	icon_state = "kitchen"
 	},
 /area/almayer/engineering/upper_engineering/port)
+"naR" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/machinery/iv_drip,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	dir = 4;
+	icon_state = "sterile_green_corner"
+	},
+/area/almayer/medical/medical_science)
 "naV" = (
 /obj/structure/machinery/door/airlock/almayer/generic{
 	dir = 2;
@@ -52087,29 +52484,17 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/grunt_rnr)
-"ncB" = (
-/obj/structure/machinery/chem_master{
-	vial_maker = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "ncE" = (
-/obj/structure/machinery/door_control{
-	id = "containmentlockdown_N";
-	name = "Containment Lockdown";
-	pixel_y = 28;
-	req_one_access_txt = "19;28"
-	},
-/obj/structure/machinery/power/apc/almayer{
+/obj/structure/machinery/light{
 	dir = 8
 	},
+/obj/structure/machinery/autodispenser{
+	dir = 4
+	},
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_corner"
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "ndx" = (
 /obj/structure/sign/safety/nonpress_ag{
 	pixel_x = 15;
@@ -52382,12 +52767,14 @@
 	},
 /area/almayer/living/bridgebunks)
 "niL" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/structure/bed/chair,
 /turf/open/floor/almayer{
-	dir = 9;
-	icon_state = "sterile_green_side"
+	icon_state = "sterile_green"
 	},
-/area/almayer/medical/upper_medical)
+/area/almayer/medical/medical_science)
 "niR" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "pottedplant_10"
@@ -52657,10 +53044,18 @@
 /turf/open/floor/plating,
 /area/almayer/shipboard/brig/armory)
 "nos" = (
-/turf/closed/wall/almayer/research/containment/wall/corner{
+/obj/structure/machinery/chem_storage/medbay{
 	dir = 1
 	},
-/area/almayer/medical/containment/cell)
+/obj/structure/machinery/chem_storage/research{
+	dir = 1;
+	layer = 3;
+	pixel_y = 18
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/hydroponics)
 "noV" = (
 /obj/structure/sign/safety/storage{
 	pixel_x = 8;
@@ -52676,13 +53071,20 @@
 /turf/open/floor/plating,
 /area/almayer/engineering/starboard_atmos)
 "npt" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 8
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1;
+	pixel_y = -1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_y = -1
 	},
 /turf/open/floor/almayer{
 	icon_state = "dark_sterile"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "nqx" = (
 /obj/structure/pipes/standard/manifold/hidden/supply,
 /turf/open/floor/plating/plating_catwalk,
@@ -52949,6 +53351,14 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/squads/req)
+"nwi" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer/research/containment/corner{
+	dir = 4
+	},
+/area/almayer/medical/containment/cell)
 "nwu" = (
 /obj/structure/closet/crate/freezer{
 	desc = "A freezer crate. Someone has written 'open on christmas' in marker on the top."
@@ -53040,6 +53450,10 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/shipboard/brig/main_office)
+"nxF" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/closed/wall/almayer/white/reinforced,
+/area/almayer/medical/medical_science)
 "nxK" = (
 /obj/structure/sign/safety/high_voltage{
 	pixel_y = -32
@@ -53211,16 +53625,6 @@
 	icon_state = "red"
 	},
 /area/almayer/hallways/aft_hallway)
-"nCc" = (
-/obj/structure/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_corner"
-	},
-/area/almayer/medical/medical_science)
 "nCf" = (
 /obj/effect/landmark/start/marine/tl/charlie,
 /obj/effect/landmark/late_join/charlie,
@@ -53272,19 +53676,16 @@
 /turf/open/floor/carpet,
 /area/almayer/command/corporateliason)
 "nDo" = (
-/obj/structure/pipes/unary/freezer{
-	dir = 8
-	},
-/obj/structure/sign/safety/med_cryo{
-	pixel_x = 15;
-	pixel_y = 32
-	},
-/obj/structure/sign/safety/intercom{
-	pixel_y = 32
+/obj/structure/closet/l3closet/general,
+/obj/structure/window/reinforced{
+	dir = 8;
+	health = 80
 	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_corner"
+/obj/structure/window/reinforced{
+	dir = 4;
+	health = 80
 	},
+/turf/open/floor/plating/plating_catwalk,
 /area/almayer/medical/medical_science)
 "nDL" = (
 /obj/structure/barricade/handrail{
@@ -53350,12 +53751,22 @@
 	},
 /area/almayer/hull/upper_hull/u_a_s)
 "nEH" = (
-/obj/structure/machinery/smartfridge/chemistry,
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/light{
+	dir = 8
+	},
+/obj/structure/machinery/computer/research{
+	dir = 4;
+	pixel_y = 4
+	},
+/obj/item/tool/hand_labeler{
+	pixel_x = -6;
+	pixel_y = -5
+	},
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "nEJ" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer{
@@ -53462,18 +53873,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/port_point_defense)
-"nGr" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/research,
-/obj/structure/sign/safety/terminal{
-	pixel_x = 8;
-	pixel_y = 32
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/testlab)
 "nHg" = (
 /obj/structure/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -53649,13 +54048,19 @@
 	},
 /area/almayer/squads/req)
 "nLI" = (
-/obj/structure/bed/chair/office/dark{
-	dir = 1
+/obj/structure/sign/safety/terminal{
+	layer = 2.5;
+	pixel_x = 8;
+	pixel_y = 32
+	},
+/obj/structure/machinery/chem_simulator{
+	density = 0;
+	pixel_y = 16
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "nLJ" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "E";
@@ -53676,6 +54081,18 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hull/upper_hull/u_f_s)
+"nMe" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer/research/containment/corner{
+	dir = 1
+	},
+/area/almayer/medical/containment/cell)
 "nMp" = (
 /obj/structure/surface/table/almayer,
 /obj/item/reagent_container/food/condiment/hotsauce/franks,
@@ -53833,6 +54250,29 @@
 	icon_state = "red"
 	},
 /area/almayer/lifeboat_pumps/south1)
+"nPf" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/computer/cameras/almayer/containment{
+	dir = 8;
+	pixel_x = -4;
+	pixel_y = 6
+	},
+/obj/structure/surface/table/almayer,
+/obj/item/tool/extinguisher{
+	pixel_x = 7;
+	pixel_y = 7
+	},
+/obj/structure/machinery/door_control{
+	id = "containmentlockdown_S";
+	name = "Containment Lockdown";
+	pixel_x = -5;
+	pixel_y = -4;
+	req_one_access_txt = "19;28"
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical/containment)
 "nPs" = (
 /obj/structure/prop/invuln/overhead_pipe{
 	pixel_x = 12
@@ -53857,11 +54297,16 @@
 	},
 /area/almayer/hallways/hangar)
 "nPE" = (
-/obj/structure/machinery/body_scanconsole{
-	dir = 8
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/centrifuge{
+	pixel_y = 7
+	},
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 8;
+	name = "ship-grade camera"
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "mono"
 	},
 /area/almayer/medical/medical_science)
 "nPM" = (
@@ -54393,11 +54838,6 @@
 	icon_state = "cargo"
 	},
 /area/almayer/squads/alpha_bravo_shared)
-"oeg" = (
-/turf/open/floor/almayer{
-	icon_state = "sterile_green"
-	},
-/area/almayer/medical/medical_science)
 "oeo" = (
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating/plating_catwalk,
@@ -54554,18 +54994,21 @@
 /turf/open/floor/almayer,
 /area/almayer/squads/bravo)
 "oiY" = (
-/obj/structure/machinery/light,
-/obj/structure/machinery/iv_drip,
-/obj/structure/machinery/door_control{
-	id = "containmentlockdown_N";
-	name = "Containment Lockdown";
-	pixel_y = -20;
-	req_one_access_txt = "19;28"
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/obj/structure/disposalpipe/trunk,
+/obj/structure/machinery/disposal,
+/obj/structure/sink{
+	pixel_x = 1;
+	pixel_y = -2
 	},
 /turf/open/floor/almayer{
+	dir = 8;
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "ojF" = (
 /obj/structure/machinery/cm_vending/clothing/tl/charlie{
 	density = 0;
@@ -54965,11 +55408,20 @@
 /turf/open/floor/almayer,
 /area/almayer/squads/req)
 "oqZ" = (
-/obj/structure/machinery/sleep_console{
-	dir = 8
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/microwave{
+	pixel_y = 5
+	},
+/obj/item/storage/box/donkpockets{
+	pixel_x = -4;
+	pixel_y = 19
+	},
+/obj/item/storage/box/donkpockets{
+	pixel_x = 4;
+	pixel_y = 16
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "mono"
 	},
 /area/almayer/medical/medical_science)
 "ora" = (
@@ -55102,6 +55554,9 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/pilotbunks)
+"otu" = (
+/turf/closed/wall/almayer/research/containment/wall/connect_w,
+/area/almayer/medical/containment/cell)
 "otX" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W"
@@ -55217,12 +55672,18 @@
 	},
 /area/almayer/hull/lower_hull/l_m_p)
 "ovG" = (
-/obj/structure/machinery/computer/pandemic,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/area/almayer/medical/containment)
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer/research/containment/corner_var1{
+	dir = 4
+	},
+/area/almayer/medical/containment/cell)
 "ovP" = (
 /obj/structure/sign/safety/security{
 	pixel_x = 15
@@ -55470,6 +55931,20 @@
 "oDf" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_p)
+"oDi" = (
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "oDu" = (
 /obj/structure/sign/safety/distribution_pipes{
 	pixel_x = 32
@@ -55498,19 +55973,25 @@
 	},
 /area/almayer/living/grunt_rnr)
 "oDL" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/reagent_scanner{
-	pixel_x = -6
+/obj/item/device/radio/intercom{
+	freerange = 1;
+	name = "General Listening Channel";
+	pixel_y = 28
 	},
-/obj/item/storage/box/monkeycubes{
-	pixel_x = 7;
-	pixel_y = 7
+/obj/structure/machinery/photocopier,
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
+"oDR" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 9
 	},
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
+	dir = 4;
+	icon_state = "sterile_green_corner"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "oDY" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/recharger,
@@ -55581,11 +56062,6 @@
 	icon_state = "red"
 	},
 /area/almayer/living/port_emb)
-"oFj" = (
-/turf/open/floor/almayer/research/containment/corner_var1{
-	icon_state = "containment_corner_variant_2"
-	},
-/area/almayer/medical/containment/cell)
 "oFG" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -55702,6 +56178,30 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_m_s)
+"oIr" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/structure/machinery/door/airlock/almayer/research/reinforced{
+	dir = 8;
+	name = "\improper Containment Airlock"
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/medical_science)
 "oIB" = (
 /turf/closed/wall/almayer,
 /area/almayer/command/combat_correspondent)
@@ -55850,10 +56350,11 @@
 /turf/open/floor/almayer,
 /area/almayer/hallways/port_hallway)
 "oLU" = (
-/turf/closed/wall/almayer/research/containment/wall/purple{
-	dir = 8
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/containment/cell)
+/area/almayer/medical/hydroponics)
 "oMd" = (
 /obj/structure/closet/secure_closet/freezer/meat,
 /turf/open/floor/almayer{
@@ -55948,8 +56449,10 @@
 /turf/open/floor/almayer,
 /area/almayer/squads/charlie_delta_shared)
 "oNp" = (
-/turf/closed/wall/almayer/research/containment/wall/south,
-/area/almayer/medical/containment/cell)
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/hydroponics)
 "oNJ" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "N"
@@ -56380,6 +56883,13 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
+"paa" = (
+/obj/structure/machinery/iv_drip,
+/turf/open/floor/almayer{
+	dir = 9;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/containment)
 "paq" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/faxmachine/uscm/brig,
@@ -56639,6 +57149,15 @@
 	icon_state = "ai_floors"
 	},
 /area/almayer/command/airoom)
+"pgM" = (
+/obj/structure/reagent_dispensers/water_cooler/walk_past{
+	pixel_x = 10;
+	pixel_y = 3
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "pha" = (
 /obj/structure/machinery/photocopier,
 /turf/open/floor/almayer{
@@ -56707,12 +57226,6 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_lobby)
-"pjC" = (
-/obj/structure/machinery/autolathe,
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/testlab)
 "pjF" = (
 /obj/structure/surface/table/almayer,
 /obj/item/paper,
@@ -56964,6 +57477,14 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/gym)
+"prx" = (
+/obj/structure/bed/chair/comfy{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/medical/medical_science)
 "prE" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/item/tool/kitchen/tray,
@@ -57121,12 +57642,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer,
 /area/almayer/living/port_emb)
-"pvm" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
-	},
-/area/almayer/medical/hydroponics)
 "pvt" = (
 /obj/structure/sign/safety/refridgeration{
 	pixel_y = -32
@@ -57213,11 +57728,13 @@
 	},
 /area/almayer/command/combat_correspondent)
 "pxo" = (
-/obj/structure/pipes/standard/manifold/hidden/supply,
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
 /turf/open/floor/almayer{
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/upper_medical)
+/area/almayer/medical/medical_science)
 "pxD" = (
 /obj/structure/machinery/vending/coffee{
 	pixel_x = 3;
@@ -57547,12 +58064,24 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cic_hallway)
 "pEJ" = (
-/obj/structure/filingcabinet/filingcabinet,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+/obj/structure/machinery/flasher{
+	alpha = 1;
+	id = "Containment Cell 2";
+	layer = 2.1;
+	name = "Mounted Flash";
+	pixel_y = 30
 	},
-/area/almayer/medical/containment)
+/obj/structure/machinery/light/containment{
+	dir = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 1
+	},
+/area/almayer/medical/containment/cell)
 "pEY" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "pottedplant_22";
@@ -57631,20 +58160,16 @@
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/execution)
 "pGK" = (
-/obj/structure/machinery/flasher{
-	alpha = 1;
-	id = "Containment Cell 2";
-	layer = 2.1;
-	name = "Mounted Flash";
-	pixel_y = 30
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/obj/structure/machinery/light/containment{
-	dir = 1
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/turf/open/floor/almayer/research/containment/floor2{
-	dir = 1
+/turf/open/floor/almayer{
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment/cell)
+/area/almayer/medical/hydroponics)
 "pGM" = (
 /obj/structure/machinery/light{
 	dir = 1
@@ -57840,6 +58365,22 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/medical/lower_medical_medbay)
+"pLO" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 5";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple{
+	dir = 1
+	},
+/area/almayer/medical/containment/cell)
 "pLW" = (
 /obj/structure/machinery/firealarm{
 	dir = 4;
@@ -57919,10 +58460,18 @@
 	},
 /area/almayer/lifeboat_pumps/south1)
 "pNP" = (
-/turf/open/floor/almayer/research/containment/corner{
-	dir = 4
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/area/almayer/medical/containment/cell)
+/obj/item/reagent_container/food/snacks/cheesewedge{
+	pixel_x = -10;
+	pixel_y = 7
+	},
+/mob/living/simple_animal/mouse/white/Doc,
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical/hydroponics)
 "pNQ" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "NE-out";
@@ -58061,19 +58610,16 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
 "pQP" = (
-/obj/structure/machinery/door/airlock/almayer/research/reinforced{
-	name = "\improper Containment Airlock"
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	dir = 4;
-	id = "containmentlockdown_E";
-	name = "\improper Containment Lockdown"
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
-/obj/structure/machinery/door/firedoor/border_only/almayer,
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "pQV" = (
 /obj/structure/machinery/vending/cola,
 /turf/open/floor/almayer{
@@ -58092,6 +58638,18 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/offices)
+"pRn" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/structure/bed,
+/obj/structure/machinery/power/apc/almayer{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "pRy" = (
 /turf/open/floor/almayer/research/containment/corner_var1{
 	dir = 4
@@ -58114,10 +58672,11 @@
 	},
 /area/almayer/shipboard/brig/cic_hallway)
 "pRX" = (
-/turf/closed/wall/almayer/research/containment/wall/connect_e2{
-	icon_state = "containment_wall_connect_e"
+/obj/structure/machinery/portable_atmospherics/hydroponics,
+/turf/open/floor/almayer{
+	icon_state = "test_floor5"
 	},
-/area/almayer/medical/containment/cell)
+/area/almayer/medical/hydroponics)
 "pSL" = (
 /obj/structure/machinery/alarm/almayer{
 	dir = 1
@@ -58149,15 +58708,6 @@
 	icon_state = "silvercorner"
 	},
 /area/almayer/command/computerlab)
-"pTM" = (
-/obj/structure/sign/safety/water{
-	pixel_x = 8;
-	pixel_y = -32
-	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/hydroponics)
 "pTT" = (
 /obj/structure/platform{
 	dir = 4
@@ -58454,15 +59004,14 @@
 	},
 /area/almayer/command/airoom)
 "pYo" = (
-/obj/structure/machinery/chem_simulator,
-/obj/structure/machinery/light{
-	dir = 1
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
 	},
 /turf/open/floor/almayer{
-	dir = 1;
+	dir = 8;
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "pYu" = (
 /obj/item/tool/warning_cone{
 	pixel_x = -12;
@@ -58523,6 +59072,17 @@
 	icon_state = "red"
 	},
 /area/almayer/shipboard/brig/perma)
+"qam" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "qau" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -58748,11 +59308,29 @@
 	},
 /area/almayer/squads/alpha_bravo_shared)
 "qfy" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/obj/structure/filingcabinet/filingcabinet{
+	density = 0;
+	pixel_x = -11;
+	pixel_y = 16
+	},
+/obj/structure/filingcabinet/filingcabinet{
+	density = 0;
+	pixel_x = 4;
+	pixel_y = 16
+	},
 /turf/open/floor/almayer{
-	dir = 4;
+	dir = 1;
 	icon_state = "sterile_green_corner"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "qfA" = (
 /turf/open/floor/almayer{
 	icon_state = "silvercorner"
@@ -58995,10 +59573,10 @@
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/door_control{
 	dir = 1;
-	id = "researchlockdownext";
-	name = "Window Shutters";
-	pixel_x = -8;
-	pixel_y = -5;
+	id = "researchlockdownext_windoor";
+	name = "Windoor Shutters";
+	pixel_x = -7;
+	pixel_y = 9;
 	req_access_txt = "28"
 	},
 /obj/structure/machinery/computer/med_data/laptop{
@@ -59006,6 +59584,21 @@
 	pixel_x = 6;
 	pixel_y = -4
 	},
+/obj/structure/sign/safety/biohazard{
+	pixel_y = -32
+	},
+/obj/structure/sign/safety/ref_bio_storage{
+	pixel_x = 15;
+	pixel_y = -32
+	},
+/obj/structure/machinery/door_control{
+	dir = 1;
+	id = "researchlockdownext_se_2";
+	name = "Window Shutters";
+	pixel_x = -7;
+	pixel_y = 4;
+	req_access_txt = "28"
+	},
 /turf/open/floor/almayer{
 	dir = 8;
 	icon_state = "sterile_green_corner"
@@ -59025,6 +59618,18 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/shipboard/brig/main_office)
+"qmD" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 5
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/bed/chair/comfy,
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/medical/medical_science)
 "qmE" = (
 /obj/structure/sign/safety/restrictedarea{
 	pixel_x = 32;
@@ -59240,14 +59845,18 @@
 	},
 /area/almayer/shipboard/brig/main_office)
 "qqQ" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
+/obj/structure/machinery/cm_vending/sorted/medical/blood{
+	density = 0;
+	pixel_y = 16
 	},
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	dir = 5;
+	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/medical_science)
 "qrc" = (
@@ -59456,6 +60065,20 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/airoom)
+"qxm" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	dir = 4;
+	id = "W_Containment Cell 5";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/turf/closed/wall/almayer/research/containment/wall/purple,
+/area/almayer/medical/containment/cell)
 "qxA" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/almayer{
@@ -59495,12 +60118,18 @@
 	},
 /area/almayer/medical/lower_medical_medbay)
 "qxP" = (
-/obj/structure/bed/chair,
-/obj/structure/machinery/firealarm{
-	pixel_y = 28
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer/research/containment/corner_var1{
+	dir = 4
+	},
+/area/almayer/medical/containment/cell)
 "qyd" = (
 /turf/open/floor/almayer{
 	allow_construction = 0
@@ -59615,6 +60244,28 @@
 	icon_state = "mono"
 	},
 /area/almayer/engineering/ce_room)
+"qAT" = (
+/obj/structure/machinery/light,
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/reagentgrinder{
+	pixel_y = 8
+	},
+/obj/item/stack/sheet/mineral/phoron{
+	amount = 25;
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/device/reagent_scanner{
+	pixel_x = -16;
+	pixel_y = 5
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out"
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "qCc" = (
 /obj/structure/sign/safety/security{
 	pixel_x = 15;
@@ -59722,8 +60373,22 @@
 	},
 /area/almayer/command/cic)
 "qEn" = (
-/turf/closed/wall/almayer/research/containment/wall/corner,
-/area/almayer/medical/containment/cell)
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "SW-out";
+	pixel_x = -1
+	},
+/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/research{
+	name = "\improper Research Hydroponics Workshop"
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/hydroponics)
 "qEy" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply{
@@ -59879,6 +60544,26 @@
 	icon_state = "orange"
 	},
 /area/almayer/engineering/upper_engineering)
+"qIL" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/camera/autoname/almayer{
+	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/item/tool/pen{
+	pixel_y = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "qJf" = (
 /obj/structure/closet/secure_closet/guncabinet/red,
 /obj/item/weapon/gun/shotgun/combat,
@@ -59911,7 +60596,18 @@
 	},
 /area/almayer/engineering/upper_engineering/starboard)
 "qJy" = (
-/turf/closed/wall/almayer/white/reinforced,
+/obj/structure/pipes/vents/pump,
+/obj/structure/sign/safety/storage{
+	pixel_x = 33;
+	pixel_y = -1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
 /area/almayer/medical/hydroponics)
 "qJF" = (
 /obj/structure/largecrate/supply,
@@ -60012,17 +60708,21 @@
 	},
 /area/almayer/hallways/port_hallway)
 "qLi" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/obj/structure/pipes/standard/manifold/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "SE-out";
+	pixel_x = 1;
+	pixel_y = -1
 	},
-/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
-	name = "\improper Hydroponics Laboratory"
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_x = 1;
+	pixel_y = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/medical/hydroponics)
+/area/almayer/medical/containment)
 "qLj" = (
 /obj/structure/pipes/vents/pump{
 	dir = 1
@@ -60119,13 +60819,16 @@
 /turf/closed/wall/almayer/outer,
 /area/almayer/hull/upper_hull/u_a_p)
 "qMP" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/box/pillbottles{
-	pixel_y = 6
+/obj/structure/bed/chair/comfy{
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/obj/item/reagent_container/glass/beaker/cryoxadone,
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	dir = 4;
+	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/medical_science)
 "qMR" = (
@@ -60824,6 +61527,15 @@
 	},
 /turf/open/floor/plating,
 /area/almayer/hull/lower_hull/l_f_p)
+"rdt" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/turf/open/floor/almayer/research/containment/corner4,
+/area/almayer/medical/containment/cell)
 "rdI" = (
 /obj/structure/surface/rack,
 /obj/effect/spawner/random/technology_scanner,
@@ -60918,15 +61630,6 @@
 	icon_state = "plate"
 	},
 /area/almayer/shipboard/port_point_defense)
-"rgn" = (
-/obj/structure/filingcabinet/disk,
-/obj/structure/machinery/alarm/almayer{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_corner"
-	},
-/area/almayer/medical/hydroponics)
 "rgy" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 1
@@ -60969,19 +61672,11 @@
 	},
 /area/almayer/living/briefing)
 "rhO" = (
-/obj/structure/machinery/disposal{
-	density = 0;
-	desc = "A pneumatic delivery unit. Sends items to the requisitions.";
-	icon_state = "delivery_med";
-	name = "Requisitions Delivery Unit";
-	pixel_y = 28
-	},
-/obj/structure/disposalpipe/trunk{
-	dir = 1
+/obj/structure/machinery/vending/cola/research{
+	pixel_x = 4
 	},
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
 /area/almayer/medical/medical_science)
 "rhQ" = (
@@ -61013,11 +61708,17 @@
 	},
 /area/almayer/engineering/engine_core)
 "riE" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_x = -1;
+	pixel_y = 1
+	},
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_corner"
+	dir = 9;
+	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "riJ" = (
 /turf/open/floor/almayer{
 	dir = 5;
@@ -61058,28 +61759,6 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cells)
-"rjF" = (
-/obj/structure/surface/table/almayer,
-/obj/item/cell/high{
-	pixel_x = 8;
-	pixel_y = -2
-	},
-/obj/item/cell/high{
-	pixel_x = 8;
-	pixel_y = 8
-	},
-/obj/item/cell/high{
-	pixel_x = -8;
-	pixel_y = 8
-	},
-/obj/item/cell/high{
-	pixel_x = -8;
-	pixel_y = -2
-	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/testlab)
 "rjH" = (
 /obj/structure/surface/rack,
 /obj/item/storage/beer_pack,
@@ -61576,17 +62255,16 @@
 	},
 /area/almayer/command/computerlab)
 "ruc" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/cameras/almayer,
-/obj/structure/sign/safety/terminal{
-	pixel_x = 8;
-	pixel_y = 32
+/obj/structure/machinery/camera/autoname/almayer/containment{
+	dir = 4
 	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
 	},
-/area/almayer/medical/containment)
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 8
+	},
+/area/almayer/medical/containment/cell)
 "rui" = (
 /obj/structure/disposalpipe/junction{
 	dir = 8
@@ -61615,9 +62293,6 @@
 	icon_state = "cargo"
 	},
 /area/almayer/hallways/hangar)
-"ruV" = (
-/turf/closed/wall/almayer/research/containment/wall/divide,
-/area/almayer/medical/containment/cell)
 "rvo" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 4
@@ -61742,14 +62417,10 @@
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/cic_hallway)
 "rzN" = (
-/obj/structure/sign/safety/chem_lab{
-	pixel_x = 31
-	},
 /turf/open/floor/almayer{
-	dir = 6;
-	icon_state = "sterile_green_side"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "rAb" = (
 /turf/open/floor/almayer{
 	icon_state = "bluecorner"
@@ -61951,6 +62622,12 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_a_p)
+"rDr" = (
+/obj/structure/pipes/vents/pump,
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical/medical_science)
 "rDt" = (
 /obj/structure/disposalpipe/junction{
 	dir = 1
@@ -61973,6 +62650,12 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/offices)
+"rDV" = (
+/obj/structure/bed/chair/comfy{
+	dir = 8
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/medical/medical_science)
 "rEf" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -62131,13 +62814,6 @@
 	icon_state = "test_floor4"
 	},
 /area/almayer/command/cichallway)
-"rGR" = (
-/obj/structure/filingcabinet/filingcabinet,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "rHc" = (
 /turf/open/floor/carpet,
 /area/almayer/command/cichallway)
@@ -62503,27 +63179,8 @@
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/cic_hallway)
 "rQy" = (
-/obj/structure/machinery/door_display/research_cell{
-	dir = 8;
-	has_wall_divider = 1;
-	id = "Containment Cell 2";
-	name = "Cell 2 Control";
-	pixel_x = 14;
-	pixel_y = 8
-	},
-/obj/structure/machinery/door_display/research_cell{
-	dir = 8;
-	has_wall_divider = 1;
-	id = "Containment Cell 3";
-	name = "Cell 3 Control";
-	pixel_x = 14;
-	pixel_y = -10
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/containment)
+/turf/closed/wall/almayer/white/reinforced,
+/area/almayer/medical/hydroponics)
 "rQA" = (
 /turf/open/floor/almayer{
 	dir = 8;
@@ -62615,14 +63272,6 @@
 	icon_state = "orangefull"
 	},
 /area/almayer/squads/alpha_bravo_shared)
-"rSD" = (
-/obj/structure/surface/table/almayer,
-/obj/item/paper_bin/wy,
-/obj/item/tool/pen,
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/containment)
 "rSG" = (
 /obj/structure/toilet{
 	pixel_y = 16
@@ -63073,7 +63722,6 @@
 /area/almayer/shipboard/brig/chief_mp_office)
 "sdu" = (
 /obj/structure/disposalpipe/segment,
-/obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
 	dir = 9;
 	icon_state = "sterile_green_side"
@@ -64498,19 +65146,13 @@
 	},
 /area/almayer/squads/bravo)
 "sNz" = (
-/obj/structure/machinery/light,
-/obj/structure/surface/table/almayer,
-/obj/item/device/multitool{
-	pixel_x = 8
-	},
-/obj/item/tool/screwdriver{
-	pixel_x = -3;
-	pixel_y = 4
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 1
 	},
-/area/almayer/medical/testlab)
+/area/almayer/medical/containment/cell)
 "sNO" = (
 /obj/structure/desertdam/decals/road_edge{
 	icon_state = "road_edge_decal3"
@@ -64866,27 +65508,29 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cryo)
 "sWW" = (
-/obj/structure/machinery/seed_extractor,
-/obj/structure/machinery/light{
-	dir = 1
+/obj/structure/machinery/flasher{
+	alpha = 1;
+	id = "Containment Cell 3";
+	layer = 2.1;
+	name = "Mounted Flash";
+	pixel_y = 30
 	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
-/area/almayer/medical/hydroponics)
-"sXd" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/reagent_scanner{
-	pixel_x = -6
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 1
 	},
-/obj/item/tool/hand_labeler{
-	pixel_x = 8
+/area/almayer/medical/containment/cell)
+"sXd" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
 	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
+	icon_state = "dark_sterile"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "sXs" = (
 /obj/structure/surface/table/almayer,
 /obj/item/device/flashlight/lamp{
@@ -65056,6 +65700,20 @@
 	icon_state = "plate"
 	},
 /area/almayer/squads/charlie)
+"sZy" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "sZH" = (
 /obj/structure/surface/table/almayer,
 /obj/item/ashtray/bronze{
@@ -65126,13 +65784,35 @@
 	},
 /area/almayer/hallways/starboard_hallway)
 "taH" = (
+/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
+	id = "Containment Cell 2";
+	locked = 1;
+	name = "\improper Containment Cell 2"
+	},
+/obj/structure/machinery/door/poddoor/shutters/almayer/containment{
+	dir = 4;
+	id = "Containment Cell 2";
+	name = "\improper Containment Cell 2"
+	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "test_floor4"
 	},
-/area/almayer/medical/testlab)
+/area/almayer/medical/containment/cell)
 "tbD" = (
 /obj/structure/ladder{
 	height = 2;
@@ -65310,13 +65990,14 @@
 	},
 /area/almayer/hallways/port_hallway)
 "tfH" = (
-/obj/structure/pipes/vents/pump{
-	dir = 1
+/obj/structure/machinery/light/containment,
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 1
 	},
-/area/almayer/medical/hydroponics)
+/area/almayer/medical/containment/cell)
 "tfO" = (
 /obj/structure/machinery/power/apc/almayer{
 	dir = 4
@@ -65374,13 +66055,10 @@
 /turf/open/floor/wood/ship,
 /area/almayer/shipboard/brig/cells)
 "thN" = (
-/obj/structure/machinery/camera/autoname/almayer/containment{
-	dir = 8
-	},
-/turf/open/floor/almayer/research/containment/floor2{
-	dir = 8
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
 	},
-/area/almayer/medical/containment/cell)
+/area/almayer/medical/hydroponics)
 "thP" = (
 /turf/open/floor/almayer{
 	dir = 10;
@@ -65494,11 +66172,10 @@
 	},
 /area/almayer/squads/req)
 "tjn" = (
-/obj/structure/reagent_dispensers/fueltank/custom,
 /turf/open/floor/almayer{
 	icon_state = "sterile_green_side"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "tjU" = (
 /obj/structure/bed/chair/wood/normal,
 /obj/item/bedsheet/brown,
@@ -65696,8 +66373,15 @@
 	},
 /area/almayer/hull/upper_hull/u_m_p)
 "tpa" = (
-/turf/open/floor/almayer/research/containment/corner3,
-/area/almayer/medical/containment/cell)
+/obj/structure/machinery/portable_atmospherics/hydroponics,
+/obj/structure/window/reinforced{
+	dir = 8;
+	health = 80
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor5"
+	},
+/area/almayer/medical/hydroponics)
 "tpd" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 4
@@ -65841,13 +66525,35 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_p)
 "trF" = (
-/obj/structure/machinery/shower{
-	dir = 1
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/obj/structure/surface/table/almayer,
+/obj/item/storage/firstaid/o2{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/item/storage/firstaid/fire{
+	pixel_x = 8;
+	pixel_y = 6
+	},
+/obj/item/storage/firstaid/adv{
+	pixel_x = -6;
+	pixel_y = -2
+	},
+/obj/item/storage/firstaid/toxin{
+	pixel_x = 8;
+	pixel_y = -2
 	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
+	dir = 8;
+	icon_state = "sterile_green_corner"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "trW" = (
 /obj/item/stack/tile/carpet{
 	amount = 20
@@ -66030,16 +66736,6 @@
 	icon_state = "redcorner"
 	},
 /area/almayer/shipboard/weapon_room)
-"tvu" = (
-/obj/structure/filingcabinet/filingcabinet,
-/obj/item/clipboard,
-/obj/item/clipboard,
-/obj/item/clipboard,
-/obj/item/clipboard,
-/obj/item/clipboard,
-/obj/item/clipboard,
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
 "tvw" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 4
@@ -66185,10 +66881,10 @@
 	},
 /area/almayer/hull/upper_hull/u_a_p)
 "tyD" = (
-/turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+/turf/open/floor/almayer/research/containment/corner_var1{
+	dir = 4
 	},
-/area/almayer/medical/hydroponics)
+/area/almayer/medical/containment/cell)
 "tyK" = (
 /obj/effect/spawner/random/toolbox,
 /turf/open/floor/almayer{
@@ -66237,6 +66933,23 @@
 	icon_state = "plate"
 	},
 /area/almayer/engineering/engineering_workshop)
+"tzL" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/structure/sign/safety/waterhazard{
+	pixel_x = 8;
+	pixel_y = -32
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/hydroponics)
 "tzP" = (
 /obj/structure/barricade/handrail/medical,
 /turf/open/floor/almayer{
@@ -66860,6 +67573,19 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/aft_hallway)
+"tOr" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_corner"
+	},
+/area/almayer/medical/hydroponics)
 "tOC" = (
 /obj/structure/machinery/light/small{
 	dir = 8
@@ -66894,17 +67620,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/squads/alpha_bravo_shared)
-"tPX" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/structure/machinery/camera/autoname/almayer{
-	dir = 8;
-	name = "ship-grade camera"
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/hydroponics)
 "tQd" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -67369,21 +68084,30 @@
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/lower_medical_medbay)
-"uaI" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/box/autoinjectors{
-	pixel_x = -6;
-	pixel_y = 7
+"ual" = (
+/obj/structure/sink{
+	pixel_y = 24
 	},
-/obj/item/storage/box/autoinjectors{
-	pixel_x = -6;
-	pixel_y = -1
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
-/obj/item/device/mass_spectrometer{
-	pixel_x = 8
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer/research/containment/corner_var1{
+	dir = 4
+	},
+/area/almayer/medical/containment/cell)
+"uaI" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/processor{
+	pixel_x = -2;
+	pixel_y = 6
 	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
 /area/almayer/medical/medical_science)
 "uaU" = (
@@ -67538,6 +68262,17 @@
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/engineering/ce_room)
+"ueJ" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "ueZ" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer,
 /obj/structure/machinery/door/airlock/multi_tile/almayer/marine/alpha{
@@ -67639,10 +68374,6 @@
 	icon_state = "cargo_arrow"
 	},
 /area/almayer/living/offices)
-"uhV" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
 "uia" = (
 /obj/structure/prop/invuln/overhead_pipe{
 	pixel_x = 12
@@ -67877,18 +68608,14 @@
 	},
 /area/almayer/medical/lower_medical_medbay)
 "uoi" = (
-/obj/structure/surface/rack,
-/obj/item/storage/fancy/vials/empty,
-/obj/item/storage/fancy/vials/empty,
-/obj/item/storage/fancy/vials/empty,
-/obj/structure/sign/safety/storage{
-	pixel_x = 23;
-	pixel_y = -32
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
+/obj/structure/machinery/power/apc/almayer,
 /turf/open/floor/almayer{
 	icon_state = "sterile_green"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "uoA" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
@@ -67963,20 +68690,35 @@
 	},
 /area/almayer/hull/upper_hull/u_f_p)
 "uqd" = (
-/obj/structure/sign/safety/ref_bio_storage{
-	pixel_x = -17;
-	pixel_y = 7
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
-/obj/structure/sign/safety/biohazard{
-	pixel_x = -17;
-	pixel_y = -7
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/structure/machinery/door_control{
+	id = "W_Containment Cell 1";
+	name = "Containment Lockdown";
+	pixel_x = -7;
+	pixel_y = 1;
+	req_one_access_txt = "19;28"
+	},
+/obj/structure/machinery/door_display/research_cell{
+	id = "Containment Cell 1";
+	name = "Cell 1 Control";
+	pixel_x = 5;
+	pixel_y = 2
 	},
-/obj/structure/machinery/cm_vending/sorted/medical/chemistry,
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_corner"
+	icon_state = "sterile_green"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "uqo" = (
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/armory)
@@ -68013,16 +68755,6 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/command/lifeboat)
-"urc" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = 11
-	},
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/hydroponics)
 "urM" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -68081,6 +68813,17 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/engineering/engine_core)
+"usy" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 9
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "usB" = (
 /obj/structure/pipes/standard/manifold/hidden/supply{
 	dir = 8
@@ -68124,6 +68867,11 @@
 	icon_state = "plate"
 	},
 /area/almayer/living/tankerbunks)
+"utX" = (
+/turf/closed/wall/almayer/research/containment/wall/connect_e2{
+	icon_state = "containment_wall_connect_e"
+	},
+/area/almayer/medical/containment/cell)
 "utZ" = (
 /obj/structure/machinery/door/poddoor/almayer/open{
 	dir = 4;
@@ -68278,6 +69026,21 @@
 	icon_state = "plating"
 	},
 /area/almayer/hull/lower_hull/l_a_s)
+"uvP" = (
+/obj/structure/machinery/light{
+	unacidable = 1;
+	unslashable = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer/research/containment/corner{
+	dir = 4
+	},
+/area/almayer/medical/containment/cell)
 "uvS" = (
 /obj/structure/sign/safety/hvac_old{
 	pixel_x = 8;
@@ -68324,17 +69087,14 @@
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/cic_hallway)
 "uwZ" = (
-/obj/structure/machinery/botany/extractor,
-/obj/item/device/radio/intercom{
-	freerange = 1;
-	name = "General Listening Channel";
-	pixel_y = 28
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 1
 	},
-/area/almayer/medical/hydroponics)
+/area/almayer/medical/containment/cell)
 "uxa" = (
 /obj/structure/bed/chair/wood/normal{
 	dir = 8
@@ -68407,6 +69167,9 @@
 /obj/structure/window/framed/almayer/hull,
 /turf/open/floor/plating,
 /area/almayer/lifeboat_pumps/south2)
+"uyH" = (
+/turf/closed/wall/almayer/research/containment/wall/divide,
+/area/almayer/medical/containment/cell)
 "uyJ" = (
 /obj/structure/machinery/cm_vending/sorted/medical/chemistry,
 /turf/open/floor/almayer{
@@ -69211,24 +69974,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/almayer,
 /area/almayer/living/port_emb)
-"uPX" = (
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/glass/beaker/large,
-/obj/item/reagent_container/glass/beaker{
-	pixel_x = 5
-	},
-/obj/structure/machinery/disposal{
-	density = 0;
-	desc = "A pneumatic delivery unit. Sends items to the requisitions.";
-	icon_state = "delivery_med";
-	name = "Requisitions Delivery Unit";
-	pixel_y = 28
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/testlab)
 "uQm" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -69505,14 +70250,6 @@
 	icon_state = "green"
 	},
 /area/almayer/living/grunt_rnr)
-"uVi" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/camera,
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_corner"
-	},
-/area/almayer/medical/containment)
 "uVv" = (
 /obj/structure/pipes/standard/manifold/hidden/supply/no_boom{
 	dir = 1
@@ -69634,7 +70371,12 @@
 	},
 /area/almayer/medical/lower_medical_medbay)
 "uXj" = (
-/turf/closed/wall/almayer/white/reinforced,
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 8
+	},
 /area/almayer/medical/containment/cell)
 "uXL" = (
 /obj/effect/decal/warning_stripes{
@@ -69850,21 +70592,16 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/shipboard/brig/cells)
 "vdO" = (
-/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
-	id = "Containment Cell 3";
-	locked = 1;
-	name = "\improper Containment Cell 3";
-	unacidable = 1
+/obj/structure/pipes/standard/cap/hidden{
+	dir = 4
 	},
-/obj/structure/machinery/door/poddoor/shutters/almayer/containment{
-	dir = 4;
-	id = "Containment Cell 3";
-	name = "\improper Containment Cell 3"
+/obj/structure/machinery/cryo_cell{
+	dir = 1
 	},
 /turf/open/floor/almayer{
-	icon_state = "test_floor4"
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment/cell)
+/area/almayer/medical/medical_science)
 "vdU" = (
 /turf/open/floor/wood/ship,
 /area/almayer/living/grunt_rnr)
@@ -69975,6 +70712,11 @@
 	icon_state = "plate"
 	},
 /area/almayer/hull/lower_hull/l_m_p)
+"vfP" = (
+/turf/open/floor/almayer/research/containment/corner{
+	dir = 1
+	},
+/area/almayer/medical/containment/cell)
 "vgk" = (
 /obj/structure/closet/firecloset,
 /obj/structure/machinery/camera/autoname/almayer{
@@ -69987,29 +70729,32 @@
 	},
 /area/almayer/hallways/port_hallway)
 "vgx" = (
-/obj/structure/machinery/flasher{
-	id = "Containment Cell 1";
-	layer = 2.1;
-	name = "Mounted Flash";
-	pixel_y = 30
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
 	},
-/turf/open/floor/almayer/research/containment/floor2{
-	dir = 1
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/research,
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "sterile_green_corner"
 	},
-/area/almayer/medical/containment/cell)
+/area/almayer/medical/hydroponics)
 "vgB" = (
 /obj/structure/surface/table/almayer,
-/obj/item/paper_bin/wy{
-	pixel_x = 6;
-	pixel_y = 5
+/obj/item/reagent_container/glass/beaker/cryoxadone{
+	pixel_x = -6;
+	pixel_y = 8
 	},
-/obj/item/clipboard{
-	pixel_x = -8
+/obj/item/storage/box/autoinjectors{
+	pixel_x = -6;
+	pixel_y = -1
 	},
-/obj/item/folder/white{
-	pixel_x = -8
+/obj/item/storage/box/pillbottles{
+	pixel_x = 6;
+	pixel_y = 7
 	},
-/obj/item/tool/pen{
+/obj/item/device/mass_spectrometer{
 	pixel_x = 8
 	},
 /turf/open/floor/almayer{
@@ -70056,12 +70801,8 @@
 	},
 /area/almayer/hallways/starboard_hallway)
 "vgO" = (
-/obj/structure/machinery/portable_atmospherics/hydroponics,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/hydroponics)
+/turf/closed/wall/almayer/research/containment/wall/east,
+/area/almayer/medical/containment/cell)
 "vgQ" = (
 /obj/structure/surface/rack,
 /obj/item/tool/crowbar,
@@ -70282,11 +71023,15 @@
 	},
 /area/almayer/living/captain_mess)
 "vkp" = (
-/obj/structure/machinery/light/containment,
-/turf/open/floor/almayer/research/containment/floor2{
-	dir = 1
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
-/area/almayer/medical/containment/cell)
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "vkD" = (
 /obj/structure/prop/invuln/overhead_pipe{
 	dir = 4;
@@ -70500,17 +71245,41 @@
 	},
 /area/almayer/hull/upper_hull/u_a_p)
 "vqW" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/machinery/camera/autoname/almayer{
+	dir = 1;
+	name = "ship-grade camera"
+	},
 /turf/open/floor/almayer{
-	dir = 6;
 	icon_state = "sterile_green_side"
 	},
 /area/almayer/medical/medical_science)
+"vqZ" = (
+/obj/structure/machinery/shower{
+	pixel_y = 16
+	},
+/obj/structure/sign/safety/biolab{
+	pixel_x = -9;
+	pixel_y = 32
+	},
+/obj/structure/sign/safety/biohazard{
+	pixel_x = 25;
+	pixel_y = 32
+	},
+/obj/structure/window/reinforced{
+	dir = 4;
+	health = 80;
+	pixel_y = 6
+	},
+/obj/structure/window/reinforced{
+	dir = 8;
+	health = 80;
+	pixel_y = 6
+	},
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/medical/medical_science)
 "vra" = (
 /turf/closed/wall/almayer,
 /area/almayer/squads/charlie_delta_shared)
@@ -70634,6 +71403,23 @@
 	icon_state = "silver"
 	},
 /area/almayer/command/cichallway)
+"vti" = (
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
+"vtm" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/turf/open/floor/almayer{
+	icon_state = "dark_sterile"
+	},
+/area/almayer/medical/medical_science)
 "vtr" = (
 /obj/structure/machinery/mech_bay_recharge_port,
 /turf/open/shuttle/dropship{
@@ -70954,17 +71740,15 @@
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/chief_mp_office)
 "vAQ" = (
-/obj/structure/machinery/light,
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = -12;
-	pixel_y = 2
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/reagent_analyzer{
+	pixel_x = 2;
+	pixel_y = 3
 	},
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_corner"
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "vAU" = (
 /obj/structure/machinery/light{
 	dir = 8
@@ -71025,8 +71809,14 @@
 	},
 /area/almayer/hallways/hangar)
 "vCk" = (
-/turf/closed/wall/almayer/research/containment/wall/purple,
-/area/almayer/medical/containment/cell)
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	dir = 10;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/hydroponics)
 "vCx" = (
 /obj/structure/machinery/status_display{
 	pixel_y = -30
@@ -71063,8 +71853,13 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/bridgebunks)
 "vDa" = (
-/turf/open/floor/almayer/research/containment/corner2,
-/area/almayer/medical/containment/cell)
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/hydroponics)
 "vDh" = (
 /obj/item/weapon/dart/green,
 /turf/open/floor/plating,
@@ -71084,6 +71879,16 @@
 /obj/effect/landmark/start/synthetic,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/synthcloset)
+"vEr" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	dir = 8;
+	icon_state = "sterile_green_side"
+	},
+/area/almayer/medical/medical_science)
 "vEx" = (
 /obj/structure/machinery/door/firedoor/border_only/almayer{
 	dir = 2
@@ -71188,18 +71993,17 @@
 /turf/open/floor/almayer,
 /area/almayer/living/port_emb)
 "vHO" = (
-/obj/structure/machinery/vending/hydroseeds{
-	req_access_txt = "28"
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
 	},
-/obj/structure/sign/safety/rewire{
-	pixel_x = 8;
-	pixel_y = 32
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
 	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+/turf/open/floor/almayer/research/containment/corner_var1{
+	icon_state = "containment_corner_variant_2"
 	},
-/area/almayer/medical/hydroponics)
+/area/almayer/medical/containment/cell)
 "vHW" = (
 /obj/structure/surface/rack,
 /obj/item/tool/extinguisher,
@@ -71325,6 +72129,19 @@
 	},
 /turf/open/floor/wood/ship,
 /area/almayer/living/basketball)
+"vKb" = (
+/obj/structure/machinery/smartfridge/chemistry{
+	density = 0;
+	pixel_y = 16
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green_corner"
+	},
+/area/almayer/medical/containment)
 "vKe" = (
 /obj/structure/pipes/standard/simple/hidden/supply,
 /turf/open/floor/almayer{
@@ -71376,10 +72193,14 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/poddoor/almayer/open{
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/upper_medical)
 "vLA" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -71478,6 +72299,18 @@
 "vOy" = (
 /turf/closed/wall/almayer/white/reinforced,
 /area/almayer/medical/medical_science)
+"vOP" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+	dir = 2
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/upper_medical)
 "vPj" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/item/device/flashlight/lamp{
@@ -71840,6 +72673,11 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/briefing)
+"vVs" = (
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical/containment)
 "vVw" = (
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -71873,16 +72711,27 @@
 	},
 /area/almayer/shipboard/brig/evidence_storage)
 "vWt" = (
-/obj/structure/sink{
+/obj/structure/surface/table/almayer,
+/obj/item/reagent_container/glass/beaker/large,
+/obj/item/reagent_container/glass/beaker/large,
+/obj/item/reagent_container/glass/beaker{
+	pixel_x = 5
+	},
+/obj/item/reagent_container/glass/beaker{
+	pixel_x = 5
+	},
+/obj/item/reagent_container/dropper,
+/obj/structure/machinery/firealarm{
 	dir = 8;
-	pixel_x = -12;
-	pixel_y = 2
+	pixel_x = -24
+	},
+/obj/item/reagent_container/glass/beaker/bluespace{
+	pixel_y = 12
 	},
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/medical_science)
 "vWx" = (
 /obj/structure/largecrate/random/barrel/blue,
 /obj/structure/sign/safety/restrictedarea{
@@ -72028,13 +72877,32 @@
 	},
 /area/almayer/medical/lower_medical_medbay)
 "vYz" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
-	dir = 4
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/surface/table/almayer,
+/obj/item/reagent_container/glass/beaker{
+	pixel_x = 8
+	},
+/obj/item/paper_bin/wy{
+	pixel_x = -5;
+	pixel_y = 6
+	},
+/obj/item/tool/pen{
+	pixel_y = -2
+	},
+/obj/structure/machinery/door_control/brbutton/alt{
+	id = "Containment Breach";
+	name = "Emergency Containment Breach";
+	pixel_x = 8;
+	pixel_y = 10
+	},
+/obj/item/reagent_container/dropper{
+	pixel_x = -1;
+	pixel_y = 9
 	},
 /turf/open/floor/almayer{
-	icon_state = "dark_sterile"
+	icon_state = "sterile_green"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment)
 "vYC" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
@@ -72244,6 +73112,26 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/living/tankerbunks)
+"wdo" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/machinery/door/airlock/almayer/research/reinforced{
+	dir = 8;
+	name = "\improper Containment Airlock"
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
+	},
+/area/almayer/medical/medical_science)
 "wdr" = (
 /obj/structure/machinery/power/apc/almayer,
 /turf/open/floor/almayer{
@@ -72279,18 +73167,18 @@
 	},
 /area/almayer/engineering/upper_engineering/starboard)
 "wei" = (
-/obj/structure/machinery/door_display/research_cell{
-	dir = 4;
-	id = "Containment Cell 1";
-	name = "Cell 1 Control";
-	pixel_x = -14;
-	pixel_y = 8
+/obj/structure/machinery/door/poddoor/almayer/open{
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
 	},
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
+	icon_state = "test_floor4"
 	},
-/area/almayer/medical/containment)
+/area/almayer/medical/hydroponics)
 "wex" = (
 /obj/structure/machinery/light{
 	dir = 4
@@ -72533,6 +73421,14 @@
 	icon_state = "silver"
 	},
 /area/almayer/shipboard/brig/cic_hallway)
+"wiW" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/hydroponics)
 "wjq" = (
 /obj/structure/bed/chair/comfy/beige{
 	dir = 8
@@ -72588,10 +73484,15 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
 /turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
+	icon_state = "test_floor4"
 	},
-/area/almayer/medical/upper_medical)
+/area/almayer/medical/medical_science)
 "wkH" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/item/device/whistle{
@@ -72795,13 +73696,10 @@
 /turf/open/floor/almayer,
 /area/almayer/squads/alpha_bravo_shared)
 "woh" = (
-/obj/structure/bed/chair,
-/obj/structure/sign/safety/intercom{
-	pixel_x = 8;
-	pixel_y = 32
+/turf/closed/wall/almayer/research/containment/wall/corner{
+	dir = 4
 	},
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment/cell)
 "wom" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -72971,6 +73869,14 @@
 	icon_state = "cargo"
 	},
 /area/almayer/hallways/hangar)
+"wse" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+	dir = 4
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical/containment)
 "wsD" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -73069,16 +73975,6 @@
 /obj/item/reagent_container/food/snacks/sliceable/pizza/vegetablepizza,
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/lower_hull/l_m_p)
-"wuP" = (
-/obj/structure/machinery/vending/coffee,
-/obj/structure/sign/safety/coffee{
-	pixel_x = 8;
-	pixel_y = -32
-	},
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
 "wvb" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -73696,8 +74592,21 @@
 	},
 /area/almayer/command/combat_correspondent)
 "wKP" = (
-/obj/structure/disposalpipe/segment,
-/turf/closed/wall/almayer/white/reinforced,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/obj/structure/window/framed/almayer/white,
+/turf/open/floor/plating,
 /area/almayer/medical/containment)
 "wLi" = (
 /obj/structure/machinery/door_control/airlock{
@@ -73737,13 +74646,14 @@
 /turf/open/floor/almayer,
 /area/almayer/lifeboat_pumps/south2)
 "wLy" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer{
-	dir = 9;
-	icon_state = "sterile_green_side"
+/obj/structure/pipes/vents/pump{
+	name = "Secure Air Vent";
+	welded = 1
 	},
-/area/almayer/medical/medical_science)
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 1
+	},
+/area/almayer/medical/containment/cell)
 "wLG" = (
 /obj/item/bedsheet/blue{
 	layer = 3.2
@@ -73787,6 +74697,14 @@
 	icon_state = "kitchen"
 	},
 /area/almayer/living/grunt_rnr)
+"wLN" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "sterile_green"
+	},
+/area/almayer/medical/containment)
 "wMm" = (
 /obj/structure/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -73805,14 +74723,15 @@
 	},
 /area/almayer/squads/alpha)
 "wMO" = (
-/obj/structure/sign/catclock{
-	pixel_y = 32
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
 	},
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+	icon_state = "test_floor4"
 	},
-/area/almayer/medical/upper_medical)
+/area/almayer/medical/medical_science)
 "wNl" = (
 /obj/structure/surface/table/almayer,
 /obj/item/trash/USCMtray{
@@ -73888,10 +74807,10 @@
 	},
 /area/almayer/shipboard/brig/execution)
 "wPz" = (
-/turf/open/floor/almayer/research/containment/corner{
-	dir = 1
+/turf/open/floor/almayer{
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment/cell)
+/area/almayer/medical/hydroponics)
 "wPC" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 4
@@ -74083,12 +75002,8 @@
 /turf/open/floor/almayer,
 /area/almayer/engineering/upper_engineering/port)
 "wTM" = (
-/obj/structure/machinery/vending/snack,
-/obj/structure/machinery/light,
-/turf/open/floor/almayer{
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/medical_science)
+/turf/closed/wall/almayer/research/containment/wall/south,
+/area/almayer/medical/containment/cell)
 "wTN" = (
 /obj/structure/surface/table/almayer,
 /obj/item/storage/box/cups{
@@ -74306,25 +75221,13 @@
 	},
 /area/almayer/hallways/aft_hallway)
 "wWm" = (
-/obj/structure/machinery/photocopier,
-/obj/structure/sign/safety/terminal{
-	pixel_y = 32
-	},
-/obj/structure/sign/safety/commline_connection{
-	pixel_x = 15;
-	pixel_y = 32
+/turf/open/floor/almayer/research/containment/corner_var1{
+	icon_state = "containment_corner_variant_2"
 	},
-/turf/open/floor/wood/ship,
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment/cell)
 "wWz" = (
-/obj/structure/machinery/chem_storage/medbay{
-	dir = 1
-	},
-/turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
-	},
-/area/almayer/medical/testlab)
+/turf/closed/wall/almayer/research/containment/wall/north,
+/area/almayer/medical/containment/cell)
 "wWC" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "pottedplant_21"
@@ -74356,6 +75259,17 @@
 	},
 /turf/open/floor/almayer,
 /area/almayer/hallways/port_hallway)
+"wWR" = (
+/obj/structure/machinery/medical_pod/bodyscanner{
+	dir = 8
+	},
+/obj/structure/machinery/status_display{
+	pixel_y = 30
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "wWT" = (
 /turf/open/floor/almayer{
 	icon_state = "test_floor4"
@@ -75207,6 +76121,25 @@
 	icon_state = "green"
 	},
 /area/almayer/hallways/starboard_hallway)
+"xqp" = (
+/obj/structure/machinery/body_scanconsole{
+	dir = 8;
+	layer = 3.1
+	},
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
+/obj/structure/machinery/disposal{
+	density = 0;
+	desc = "A pneumatic delivery unit. Sends items to the requisitions.";
+	icon_state = "delivery_med";
+	name = "Requisitions Delivery Unit";
+	pixel_y = 29
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "xqv" = (
 /obj/structure/bed/sofa/south/white/right,
 /turf/open/floor/almayer{
@@ -75348,16 +76281,33 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hull/upper_hull/u_f_p)
 "xuE" = (
+/obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{
+	dir = 1;
+	id = "Containment Cell 5";
+	locked = 1;
+	name = "\improper Containment Cell 5"
+	},
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+	id = "Containment Cell 5";
+	name = "\improper Containment Cell 5";
+	unacidable = 1
+	},
 /obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
 	},
 /turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "sterile_green_side"
+	icon_state = "test_floor4"
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment/cell)
 "xuI" = (
 /obj/structure/sign/safety/water{
 	pixel_x = 8;
@@ -75626,15 +76576,21 @@
 /area/almayer/shipboard/brig/main_office)
 "xyt" = (
 /obj/structure/surface/table/almayer,
-/obj/structure/machinery/power/apc/almayer{
-	dir = 1
+/obj/item/storage/toolbox/mechanical{
+	pixel_x = 3;
+	pixel_y = 12
+	},
+/obj/item/storage/toolbox/electrical{
+	pixel_y = 5
+	},
+/obj/item/folder/white{
+	layer = 2.9;
+	pixel_x = -8
 	},
-/obj/item/folder/white,
 /turf/open/floor/almayer{
-	dir = 1;
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
-/area/almayer/medical/containment/cell)
+/area/almayer/medical/hydroponics)
 "xyw" = (
 /turf/open/floor/almayer{
 	icon_state = "plate"
@@ -75684,12 +76640,8 @@
 /turf/open/floor/almayer,
 /area/almayer/shipboard/brig/cells)
 "xAe" = (
-/obj/structure/machinery/portable_atmospherics/hydroponics,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_corner"
-	},
-/area/almayer/medical/hydroponics)
+/turf/closed/wall/almayer/research/containment/wall/corner,
+/area/almayer/medical/containment/cell)
 "xAj" = (
 /obj/structure/bed/chair/bolted{
 	dir = 8
@@ -76321,18 +77273,20 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/living/grunt_rnr)
 "xOY" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
-	dir = 4
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/closet/secure_closet/surgical{
+	pixel_x = -30
 	},
-/obj/structure/disposalpipe/junction{
-	dir = 8;
-	icon_state = "pipe-j2"
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
 	},
-/turf/open/floor/almayer{
-	dir = 10;
-	icon_state = "sterile_green_side"
+/obj/effect/decal/warning_stripes{
+	icon_state = "W"
 	},
-/area/almayer/medical/medical_science)
+/turf/open/floor/almayer/research/containment/corner{
+	dir = 4
+	},
+/area/almayer/medical/containment/cell)
 "xPg" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 9
@@ -76359,13 +77313,10 @@
 /turf/open/floor/almayer,
 /area/almayer/living/pilotbunks)
 "xQm" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/microwave,
-/turf/open/floor/almayer{
-	dir = 4;
-	icon_state = "sterile_green_corner"
+/turf/open/floor/almayer/research/containment/floor2{
+	dir = 1
 	},
-/area/almayer/medical/medical_science)
+/area/almayer/medical/containment/cell)
 "xQD" = (
 /obj/structure/surface/table/almayer,
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
@@ -76564,6 +77515,19 @@
 	icon_state = "red"
 	},
 /area/almayer/squads/alpha)
+"xSY" = (
+/obj/structure/machinery/light{
+	dir = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/almayer{
+	dir = 1;
+	icon_state = "sterile_green_corner"
+	},
+/area/almayer/medical/containment)
 "xTp" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -76772,12 +77736,15 @@
 	},
 /area/almayer/engineering/upper_engineering/port)
 "xXh" = (
-/obj/structure/machinery/portable_atmospherics/hydroponics,
+/turf/closed/wall/almayer/research/containment/wall/west,
+/area/almayer/medical/containment/cell)
+"xXr" = (
+/obj/item/reagent_container/glass/beaker/bluespace,
+/obj/structure/machinery/chem_dispenser/research,
 /turf/open/floor/almayer{
-	dir = 8;
-	icon_state = "sterile_green_side"
+	icon_state = "mono"
 	},
-/area/almayer/medical/hydroponics)
+/area/almayer/medical/medical_science)
 "xXu" = (
 /obj/structure/pipes/vents/pump{
 	dir = 1
@@ -76803,8 +77770,8 @@
 /obj/effect/spawner/random/toolbox,
 /obj/structure/machinery/computer/working_joe{
 	dir = 4;
-	pixel_y = 14;
-	pixel_x = -17
+	pixel_x = -17;
+	pixel_y = 14
 	},
 /turf/open/floor/almayer{
 	dir = 10;
@@ -76992,6 +77959,14 @@
 	},
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/squads/delta)
+"ycj" = (
+/obj/structure/machinery/medical_pod/sleeper{
+	dir = 8
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/medical_science)
 "ycm" = (
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
@@ -77039,6 +78014,15 @@
 	icon_state = "mono"
 	},
 /area/almayer/lifeboat_pumps/north2)
+"ydE" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/turf/open/floor/almayer{
+	icon_state = "mono"
+	},
+/area/almayer/medical/hydroponics)
 "ydI" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
@@ -77336,11 +78320,26 @@
 	},
 /area/almayer/shipboard/brig/main_office)
 "ylc" = (
-/obj/structure/disposalpipe/down/almayer{
-	dir = 2;
-	id = "almayerlink_med_req"
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = 1
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	pixel_x = -1
+	},
+/obj/structure/machinery/door/poddoor/almayer/open{
+	dir = 4;
+	id = "Containment Breach";
+	name = "\improper Secure Airlock"
+	},
+/obj/structure/machinery/door/airlock/almayer/research/reinforced{
+	dir = 8;
+	name = "\improper Containment Airlock"
+	},
+/turf/open/floor/almayer{
+	icon_state = "test_floor4"
 	},
-/turf/closed/wall/almayer/white/reinforced,
 /area/almayer/medical/containment)
 "yle" = (
 /obj/effect/landmark/start/marine/engineer/delta,
@@ -107272,22 +108271,22 @@ avn
 nFr
 ajt
 ajC
-irA
-irA
-irA
-irA
-irA
-irA
-irA
-irA
-irA
-irA
-irA
-irA
-irA
-irA
-irA
-sqf
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
 wMO
 wky
 ajl
@@ -107475,24 +108474,24 @@ abE
 jKK
 pjM
 aim
-irA
+vOy
 nos
 fcy
-fcy
-fcy
+drT
+ipQ
 lZZ
-hEU
+vOy
 oDL
 nEH
 vAQ
-irA
+qIL
 ncE
 vWt
 kNx
-irA
+vOy
 ayX
-aos
-wky
+kXw
+pxo
 ajl
 kHT
 pjM
@@ -107678,21 +108677,21 @@ abE
 atL
 akV
 atL
-irA
-icM
-oFj
-iYf
-pNP
+vOy
 oNp
-ruc
+aSn
+lYL
+pNP
+kCj
+vOy
 nLI
-dGB
+rDV
 dwr
-kbf
-kBP
+rDV
+mTd
 gQF
-aID
-aMd
+xXr
+vOy
 niL
 kXw
 pxo
@@ -107881,24 +108880,24 @@ agA
 ago
 snm
 cwJ
-irA
-icM
+vOy
+anz
 vgx
 hme
 mzq
-oNp
-ovG
-dGB
-dGB
+qJy
+vOy
+vti
+vti
 fBO
-kbf
+vti
 gGx
-iUo
-fBO
+vti
+lid
 lJv
 aCC
-akw
-wky
+kXw
+pxo
 asn
 ago
 asW
@@ -108084,24 +109083,24 @@ uZZ
 bYe
 amO
 avj
-irA
-icM
-hqL
-mab
+vOy
+awQ
+oLU
+thN
 vDa
-oNp
-pEJ
+vOy
+vOy
 qfy
 inL
 oiY
-irA
-iQo
-dGB
+ueJ
+ueJ
+oDi
 trF
-irA
+lJv
 edv
-akw
-wky
+kXw
+pxo
 asn
 ayT
 akU
@@ -108287,24 +109286,24 @@ agq
 ahM
 kSJ
 avj
-uXj
+vOy
 hng
 dnC
 hPN
 vCk
 qEn
-lmE
+qam
 riE
 gAS
-fxY
-irA
-hVO
-dGB
+lMv
+dVu
+eSo
+qmD
 aIC
-irA
+lJv
 aCt
-aCC
-wky
+kXw
+pxo
 asn
 ayT
 aii
@@ -108490,25 +109489,25 @@ agA
 ayT
 ajt
 avm
-uXj
-uVi
-hER
-dGB
-hER
+vOy
+xyt
+wiW
+tOr
+dBj
 wei
 kBP
-dGB
-dGB
+kBP
+jsx
 tjn
-irA
-irA
+aCC
+kXw
 pQP
-irA
-irA
+qAT
+vOy
 vOy
-eNP
-hUR
-ajo
+mFq
+vqW
+ajl
 ybf
 aii
 avj
@@ -108693,19 +109692,19 @@ abE
 aTL
 ajt
 avj
-uXj
-xyt
-dGB
-dGB
-dGB
-dGB
-dGB
-dGB
-dGB
-rSD
-irA
-aEZ
-aoM
+vOy
+iYf
+bIM
+wPz
+iUo
+vOy
+xqp
+lzA
+vkp
+tjn
+aCC
+kXw
+vtm
 emK
 fGu
 hPe
@@ -108896,25 +109895,25 @@ agA
 ayT
 akU
 avj
-uXj
+vOy
 mTp
-eoz
-dGB
-eoz
+wiW
+wPz
+jeq
 rQy
-eoz
-dGB
-eoz
-eSo
-irA
-ftG
-aoM
-aoM
-vqW
+wWR
+ycj
+vkp
+cfT
+hec
+gNp
+hVf
 dVu
-aRc
-aRc
-aPJ
+dVu
+lON
+dVu
+oDR
+vOP
 bYe
 bnD
 aWH
@@ -109099,21 +110098,21 @@ agA
 ayT
 akU
 avj
-uXj
-nos
-oLU
-ekF
+vOy
+axn
+dRh
+ydE
 bST
-jCG
-oLU
+rQy
+vOy
 vdO
-bST
-lZZ
-irA
-kex
-aoM
+vkp
 aoM
-aMg
+kBo
+kBP
+naR
+vOy
+hrn
 vOy
 aRd
 aIo
@@ -109302,20 +110301,20 @@ agA
 ayT
 akU
 avj
-irA
-icM
-oFj
-gLB
+vOy
+aAr
+pGK
 tpa
-ruV
-oFj
-gLB
-hqw
-oNp
-irA
+tpa
+tpa
+vOy
+dHV
+vkp
+jUM
+lou
 eBO
-aoM
-aoM
+pRn
+nxF
 ayZ
 aCD
 hFC
@@ -109505,20 +110504,20 @@ abE
 aTL
 aii
 avj
-irA
-icM
-hyp
-hme
-hyp
-ruV
-hyp
-hme
-hyp
-oNp
-irA
+vOy
+aID
+gLc
 mKx
-aoM
-aoM
+mKx
+kZV
+vOy
+vOy
+oIr
+vOy
+wdo
+vOy
+vOy
+vOy
 qqQ
 aoM
 aoM
@@ -109708,22 +110707,22 @@ agA
 ayT
 aii
 avj
-irA
-icM
+vOy
+aMd
 pGK
-hme
-hyp
-ruV
-cbg
-hme
+pRX
+pRX
+pRX
+vOy
+jFf
 vkp
-oNp
-irA
+jrM
+mWs
 lmw
-bPF
-aoM
-qqQ
-aAT
+vOy
+dyb
+vkp
+prx
 aoM
 eVT
 kgs
@@ -109911,25 +110910,25 @@ uZZ
 bYe
 aii
 avj
-irA
-icM
-hyp
-hme
-hyp
-ruV
-hyp
-hme
-hyp
-oNp
-irA
+vOy
+aMg
+aSo
+mHD
+mHD
+tzL
+vOy
+vqZ
+vkp
+rDr
+usy
 nDo
-mSK
-aqQ
-qqQ
+vOy
+glB
+vkp
 ger
 aoM
 aFf
-kgs
+mmN
 ayT
 aii
 avj
@@ -110114,23 +111113,23 @@ eWF
 bYe
 aii
 avj
-irA
-icM
-hqL
-thN
-wPz
-ruV
-hqL
-thN
-wPz
-oNp
-irA
+vOy
+aQZ
+bkT
+pRX
+pRX
+pRX
+vOy
+foP
+sZy
+vEr
+irU
 bVe
-ipQ
-aqR
-qqQ
+vOy
+ggl
+jjS
 qMP
-aoM
+kBP
 aSl
 vOy
 aTL
@@ -110317,24 +111316,24 @@ agA
 ayT
 akU
 avj
-irA
-hng
-lea
-lea
-lea
-pRX
-lea
-lea
+vOy
+dVd
 lea
-qEn
-irA
-awQ
-jeq
-aqR
-qqQ
-aoM
-aoM
-aSn
+hKl
+mKx
+kZV
+vOy
+vOy
+eNI
+eNI
+eNI
+vOy
+vOy
+hRa
+vti
+vti
+vti
+aEZ
 vOy
 ayT
 akU
@@ -110520,21 +111519,21 @@ abE
 giB
 akU
 avj
-irA
-irA
-irA
-irA
-irA
-irA
-irA
-irA
+vOy
+vOy
+vOy
+mSK
+mSK
+mSK
+vOy
+vOy
 ylc
 wKP
-wKP
-hKl
-hKl
+ylc
+vOy
+vOy
 rhO
-qqQ
+pgM
 nPE
 oqZ
 uaI
@@ -110726,21 +111725,21 @@ ali
 amD
 cwJ
 vOy
-wWm
-mHD
-bkT
-amk
-axn
-ayY
+vOy
+vOy
+vOy
+vOy
+vOy
 eNI
-dEl
-uqd
-aLP
-aqR
-aQZ
-dBj
-drT
-aSo
+eNI
+eNI
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
 vOy
 vIN
 aii
@@ -110929,19 +111928,19 @@ abx
 abx
 avj
 vOy
-ecx
-elH
-elH
-aLP
-cSK
+elR
+xXh
+xXh
+xXh
+dMK
 aCR
 aAT
 aNY
-aFf
-aLP
-aqR
-krq
-ajo
+elR
+xXh
+xXh
+xXh
+dMK
 vOy
 vOy
 vOy
@@ -111132,19 +112131,19 @@ all
 amK
 avj
 vOy
-tvu
-bnL
-bnL
-aLP
-aqO
-aoM
-mtI
-aoM
-ncB
-aLP
-aqR
+wWz
+vHO
+ruc
+uvP
+wTM
+dNq
+vVs
+aFa
+wWz
+liY
+ruc
 xOY
-nCc
+wTM
 vOy
 nzA
 amD
@@ -111335,19 +112334,19 @@ aEX
 aii
 avm
 vOy
-aml
+wWz
 anw
-uhV
+wLy
 jlG
 aqP
 kCE
-kCE
+wLN
 npt
 xuE
 hqh
 wLy
 eiE
-wuP
+wTM
 vOy
 ayT
 akT
@@ -111538,17 +112537,17 @@ ybf
 ajt
 avj
 vOy
-amm
-bnL
-bnL
-aPJ
-aqQ
-aoM
-aoM
-avA
-grN
+wWz
+ovG
+gxP
 aPJ
-aqQ
+wTM
+apS
+wse
+aFa
+wWz
+ual
+gxP
 aOe
 wTM
 vOy
@@ -111742,18 +112741,18 @@ ani
 avj
 vOy
 woh
-avp
+vgO
 aoJ
-aLP
-rGR
+alk
+xAe
 avH
-oeg
-aFa
-jHs
-aLP
-aqR
-aoM
-kHB
+wse
+cXC
+woh
+pLO
+qxm
+vgO
+xAe
 vOy
 aOP
 aii
@@ -111944,19 +112943,19 @@ bYe
 ajt
 avj
 vOy
-qxP
-anz
-aoJ
+vOy
+vOy
+uqd
 amk
 pYo
 avF
 coJ
 iAz
 cQo
-amk
+aIP
 aoK
-aAr
-xQm
+vOy
+vOy
 vOy
 asp
 aii
@@ -112150,13 +113149,13 @@ vOy
 vOy
 vOy
 vOy
-amk
-aqR
+vKb
+rzN
 avG
-oeg
+jbK
 aOd
 sXd
-amk
+aJn
 vOy
 vOy
 vOy
@@ -112349,14 +113348,14 @@ aNi
 asp
 amO
 avj
-alH
+bPF
 aqG
 ata
 vOy
 apR
 aqS
-kCE
-kCE
+mnW
+nPf
 vYz
 awR
 uoi
@@ -112552,17 +113551,17 @@ rfg
 bYe
 amO
 bYe
-apI
+cbg
 aqG
 atb
 vOy
-apS
-avA
+xSY
 rzN
+lCt
 lto
-aqQ
-avA
-gLc
+paa
+sXd
+gVq
 vOy
 aMi
 biB
@@ -112755,21 +113754,21 @@ aej
 iiC
 amO
 tHh
-hgv
-hgv
-hgv
-hgv
+vOy
+vOy
+vOy
+vOy
 msi
 kDk
-msi
+kbJ
 cJM
 jlA
 qLi
-jlA
-qJy
-qJy
-qJy
-qJy
+dEm
+vOy
+vOy
+vOy
+vOy
 apv
 akU
 jHG
@@ -112958,21 +113957,21 @@ aej
 ayT
 amO
 avj
-hgv
+vOy
 elR
-anx
-aoO
+xXh
+xXh
 apU
 taH
 aBe
-cJM
+otu
 jBO
 jNc
 ean
 xXh
-aAt
+xXh
 dMK
-qJy
+vOy
 ayT
 akU
 avj
@@ -113161,21 +114160,21 @@ yaz
 bYe
 ajt
 avj
-hgv
-nGr
-eNT
-anF
-anF
-taH
-aBe
-cJM
+vOy
+wWz
 vHO
-jNc
-tyD
-tyD
-tyD
-pTM
-qJy
+uXj
+uXj
+iwJ
+jVt
+uyH
+vHO
+iwJ
+uXj
+uXj
+rdt
+wTM
+vOy
 ayT
 aii
 avj
@@ -113364,21 +114363,21 @@ eup
 bYe
 ajt
 avj
-hgv
-uPX
-anF
-anF
-anF
-taH
-pjC
-cJM
-avI
-jNc
-tyD
-coZ
+vOy
+wWz
+uwZ
+wWm
+jQt
+nwi
+sNz
+uyH
+uwZ
+kGQ
+jQt
 coZ
-dnx
-qJy
+sNz
+wTM
+vOy
 ayT
 aii
 avj
@@ -113567,21 +114566,21 @@ aej
 pSL
 amT
 mIW
-hgv
-amn
-anF
-anF
-koL
+vOy
+wWz
+pEJ
+xQm
+wLy
 eqD
 sNz
-cJM
+uyH
 sWW
 mWW
-pvm
-pvm
+wLy
+xQm
 tfH
-cLI
-qJy
+wTM
+vOy
 aEK
 aSv
 ioX
@@ -113770,21 +114769,21 @@ aej
 atL
 akV
 atL
-hgv
-mYj
-anF
-anF
-anF
-anF
-rjF
-cJM
+vOy
+wWz
 uwZ
 tyD
+jQt
+vfP
+sNz
+uyH
+uwZ
 tyD
-coZ
-coZ
-dnx
-qJy
+jQt
+vfP
+sNz
+wTM
+vOy
 atL
 akV
 atL
@@ -113973,21 +114972,21 @@ aaO
 alp
 aio
 baB
-hgv
+vOy
 wWz
-anF
+qxP
 gxP
-anF
-anF
+gxP
+jgg
 jZs
-cJM
+uyH
 iRN
-tyD
-tyD
-tyD
-tyD
-pTM
-qJy
+jgg
+gxP
+gxP
+nMe
+wTM
+vOy
 alp
 aio
 baB
@@ -114176,21 +115175,21 @@ acC
 iWN
 amO
 dLE
-hgv
-euB
-cba
-kSc
-cba
-emR
-jgA
-cJM
-rgn
-urc
-tPX
+vOy
+woh
+vgO
+vgO
+vgO
+vgO
+vgO
+utX
+vgO
+vgO
+vgO
+vgO
 vgO
-jtd
 xAe
-qJy
+vOy
 aIS
 alq
 wWk
@@ -114379,21 +115378,21 @@ aaE
 afD
 kaA
 anh
-hgv
-hgv
-hgv
-hgv
-hgv
-hgv
-hgv
-qJy
-qJy
-qJy
-qJy
-qJy
-qJy
-qJy
-qJy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
+vOy
 xFw
 iTK
 anh