diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index a467729cb91..c2216d02665 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -1048,6 +1048,10 @@
 	icon_state = "showroomfloor"
 	},
 /area/station/service/kitchen)
+"alQ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "alW" = (
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
@@ -1746,6 +1750,16 @@
 /obj/structure/cable,
 /turf/simulated/floor/plating,
 /area/station/security/checkpoint/secondary)
+"arN" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 4
+	},
+/obj/machinery/door/airlock/atmos{
+	name = "Virology Atmospheric Maintenance"
+	},
+/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "arP" = (
 /turf/simulated/floor/plasteel,
 /area/station/security/main)
@@ -2391,21 +2405,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
-"aww" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "awA" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -2539,8 +2538,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore)
 "axH" = (
-/obj/structure/flora/ausbushes/lavendergrass,
-/obj/item/food/grown/banana,
+/obj/structure/flora/junglebush/large,
 /turf/simulated/floor/grass/no_creep,
 /area/station/medical/virology)
 "axM" = (
@@ -5437,6 +5435,14 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry/lounge)
+"aNi" = (
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/grass/no_creep,
+/area/station/medical/virology)
 "aNl" = (
 /obj/item/kirbyplants/large,
 /obj/structure/disposalpipe/segment{
@@ -17463,8 +17469,15 @@
 /turf/simulated/floor/engine/n20,
 /area/station/engineering/atmos)
 "bRn" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
+/obj/machinery/hologram/holopad,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
@@ -18146,7 +18159,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/tiles/department/virology/side{
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel/white,
@@ -19038,16 +19051,15 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/north)
+"bZk" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "bZl" = (
 /turf/simulated/wall/r_wall,
 /area/station/command/office/blueshield)
-"bZm" = (
-/obj/machinery/hologram/holopad,
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "bZn" = (
 /turf/simulated/wall/r_wall,
 /area/station/command/office/ntrep)
@@ -19117,28 +19129,12 @@
 "bZP" = (
 /turf/simulated/wall,
 /area/station/maintenance/apmaint)
-"bZS" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "bZU" = (
 /turf/simulated/wall,
 /area/station/maintenance/aft)
 "bZX" = (
 /turf/simulated/wall,
 /area/station/supply/expedition)
-"cad" = (
-/obj/structure/chair/office{
-	dir = 8
-	},
-/obj/effect/landmark/start/virologist,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "caj" = (
 /obj/structure/closet/crate/can,
 /obj/effect/spawner/random/maintenance,
@@ -19665,10 +19661,19 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/south)
 "ccp" = (
-/obj/machinery/pandemic,
-/obj/effect/turf_decal/tiles/department/virology/side{
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/structure/chair/office{
 	dir = 8
 	},
+/obj/effect/landmark/start/virologist,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "ccu" = (
@@ -19698,7 +19703,16 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/engine_foyer)
 "ccI" = (
-/obj/machinery/hologram/holopad,
+/obj/effect/landmark/lightsout,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "ccM" = (
@@ -20332,11 +20346,6 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/plasteel,
 /area/station/supply/office)
-"cfV" = (
-/obj/structure/sink/puddle,
-/obj/structure/flora/junglebush/large,
-/turf/simulated/floor/grass/no_creep,
-/area/station/medical/virology)
 "cfW" = (
 /obj/item/radio/intercom{
 	name = "west bump";
@@ -20678,22 +20687,6 @@
 /obj/effect/turf_decal/tiles/department/virology,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/se)
-"chP" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/virology/glass,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "chR" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -20702,16 +20695,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel/dark,
 /area/station/engineering/atmos/control)
-"chS" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/disposaloutlet{
-	dir = 8
-	},
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
-/turf/space,
-/area/space/nearstation)
 "chT" = (
 /obj/machinery/economy/vending/boozeomat,
 /obj/effect/decal/cleanable/cobweb,
@@ -21351,21 +21334,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/security/brig)
-"ckJ" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "ckK" = (
 /obj/structure/chair/stool{
 	dir = 8
@@ -21503,13 +21471,12 @@
 /turf/space,
 /area/space/nearstation)
 "clL" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 4
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "clO" = (
@@ -21558,9 +21525,6 @@
 /area/station/maintenance/port)
 "clU" = (
 /obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/grass/no_creep,
 /area/station/medical/virology)
 "clZ" = (
@@ -21645,24 +21609,11 @@
 /turf/simulated/floor/plating/airless,
 /area/space/nearstation)
 "cmI" = (
-/obj/structure/closet/crate/freezer,
-/obj/item/tank/internals/emergency_oxygen/engi/empty,
-/obj/item/tank/internals/emergency_oxygen/engi/empty,
-/obj/item/reagent_containers/iv_bag/blood/a_minus,
-/obj/item/reagent_containers/iv_bag/blood/a_plus,
-/obj/item/reagent_containers/iv_bag/blood/b_minus,
-/obj/item/reagent_containers/iv_bag/blood/b_plus,
-/obj/item/reagent_containers/iv_bag/blood/o_minus,
-/obj/item/reagent_containers/iv_bag/blood/o_plus,
-/obj/item/reagent_containers/iv_bag/blood/random,
-/obj/item/reagent_containers/iv_bag/blood/random,
-/obj/item/reagent_containers/iv_bag/blood/random,
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 1
 	},
+/obj/structure/closet/crate/freezer/iv_storage,
+/obj/machinery/newscaster/directional/north,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "cmJ" = (
@@ -21783,16 +21734,10 @@
 /turf/simulated/floor/plating,
 /area/station/supply/warehouse)
 "cnq" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/spawner/window/reinforced/polarized{
+	id = "virology_bedroom_2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/turf/simulated/floor/plasteel/white,
+/turf/simulated/floor/plating,
 /area/station/medical/virology)
 "cns" = (
 /obj/effect/turf_decal/tiles/neutral/corner{
@@ -21950,13 +21895,10 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/paramedic)
 "col" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/landmark/spawner/xeno,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
+/mob/living/carbon/human/monkey,
 /turf/simulated/floor/grass/no_creep,
 /area/station/medical/virology)
 "con" = (
@@ -22292,18 +22234,6 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/chemistry)
-"cpW" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/flora/ausbushes/ywflowers,
-/obj/item/food/grown/banana,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
-	},
-/turf/simulated/floor/grass/no_creep,
-/area/station/medical/virology)
 "cpX" = (
 /obj/machinery/door/airlock/command/glass{
 	name = "Trainer's Office";
@@ -22531,17 +22461,17 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/medical/storage)
 "crb" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
-"crc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
+	dir = 9
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
@@ -22574,21 +22504,6 @@
 /obj/effect/turf_decal/tiles/department/medical/corner,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/exam_room)
-"crj" = (
-/obj/structure/table/glass,
-/obj/item/paper_bin{
-	pixel_x = 3;
-	pixel_y = 4
-	},
-/obj/item/ashtray/plastic{
-	pixel_x = -12;
-	pixel_y = 1
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 6
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "crm" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -22650,9 +22565,6 @@
 /area/station/hallway/primary/aft/north)
 "crP" = (
 /obj/structure/flora/ausbushes/sunnybush,
-/obj/machinery/camera{
-	c_tag = "Virology Test Subject Chamber"
-	},
 /turf/simulated/floor/grass/no_creep,
 /area/station/medical/virology)
 "crQ" = (
@@ -22895,17 +22807,13 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
 "csX" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 4
 	},
+/obj/effect/turf_decal/stripes/corner,
+/obj/structure/chair{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "csY" = (
@@ -22958,6 +22866,10 @@
 "cte" = (
 /turf/simulated/wall,
 /area/station/maintenance/starboard2)
+"ctg" = (
+/obj/item/food/grown/banana,
+/turf/simulated/floor/grass/no_creep,
+/area/station/medical/virology)
 "ctm" = (
 /obj/machinery/firealarm/directional/north,
 /obj/machinery/alarm/directional/east,
@@ -23008,10 +22920,11 @@
 /turf/simulated/floor/plasteel,
 /area/station/security/main)
 "cty" = (
-/obj/structure/closet/secure_closet/personal/patient,
+/obj/machinery/alarm/directional/north,
 /obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 1
 	},
+/obj/structure/closet/secure_closet/personal/patient,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "ctH" = (
@@ -23086,14 +22999,13 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft/north)
 "ctT" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 1
+	dir = 5
+	},
+/obj/structure/table/glass,
+/obj/item/storage/firstaid/toxin,
+/obj/machinery/light{
+	dir = 4
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
@@ -23360,17 +23272,11 @@
 /area/station/maintenance/turbine)
 "cuP" = (
 /obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 8
+	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "cuQ" = (
@@ -23451,12 +23357,6 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/exam_room)
-"cvg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "cvh" = (
 /obj/effect/spawner/window/reinforced/polarized{
 	id = "psychoffice"
@@ -23840,14 +23740,11 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft/south)
 "cxm" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
@@ -23895,18 +23792,10 @@
 /turf/simulated/floor/grass/no_creep,
 /area/station/medical/exam_room)
 "cxz" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
+/obj/structure/flora/ausbushes/fernybush,
 /turf/simulated/floor/grass/no_creep,
 /area/station/medical/virology)
 "cxA" = (
@@ -24113,11 +24002,15 @@
 /turf/simulated/floor/plasteel,
 /area/station/public/fitness)
 "cyI" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "cyK" = (
@@ -24426,7 +24319,7 @@
 /obj/structure/cable/extra_insulated{
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel/white,
 /area/station/maintenance/apmaint)
 "cAi" = (
 /obj/item/reagent_containers/syringe,
@@ -24446,14 +24339,6 @@
 /obj/effect/turf_decal/tiles/department/medical/corner,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry/west)
-"cAs" = (
-/obj/structure/flora/ausbushes/lavendergrass,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/grass/no_creep,
-/area/station/medical/virology)
 "cAu" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/maintenance,
@@ -24699,10 +24584,10 @@
 /area/station/maintenance/medmaint)
 "cBC" = (
 /obj/machinery/alarm/directional/south,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/effect/turf_decal/tiles/department/virology/side,
+/obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/obj/effect/turf_decal/tiles/department/virology/side,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "cBD" = (
@@ -24849,13 +24734,19 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/maintenance/apmaint)
 "cCm" = (
-/obj/structure/table/glass,
-/obj/item/folder/white{
-	pixel_y = 4
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 5
 	},
-/obj/item/pen/red,
-/obj/machinery/light/small,
-/turf/simulated/floor/plasteel/white,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/turf/simulated/floor/plasteel/dark,
 /area/station/medical/virology)
 "cCo" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -25109,13 +25000,6 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/cryo)
-"cDS" = (
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
-/obj/machinery/alarm/directional/north,
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "cDT" = (
 /obj/structure/morgue{
 	dir = 1
@@ -25361,22 +25245,16 @@
 /turf/simulated/wall,
 /area/station/medical/surgery/secondary)
 "cFa" = (
-/obj/structure/table/glass,
-/obj/item/folder/white{
-	pixel_x = 4;
-	pixel_y = -3
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 4
 	},
-/obj/item/folder/white,
-/obj/item/pen/red{
-	pixel_x = 7;
-	pixel_y = 10
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/obj/item/storage/fancy/cigarettes/cigpack_robust{
-	pixel_x = 7;
-	pixel_y = -2
+/obj/machinery/camera{
+	c_tag = "Virology Central Hallway";
+	dir = 8
 	},
-/obj/effect/turf_decal/tiles/department/virology/side,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "cFb" = (
@@ -25439,10 +25317,16 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/cryo)
 "cFi" = (
-/obj/structure/disposalpipe/segment{
+/obj/effect/turf_decal/tiles/department/virology/side,
+/obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/turf/simulated/wall/r_wall,
+/obj/machinery/button/windowtint{
+	id = "virology_bedroom_2";
+	pixel_y = -24;
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/dark,
 /area/station/medical/virology)
 "cFm" = (
 /obj/machinery/light{
@@ -25450,13 +25334,6 @@
 	},
 /turf/simulated/floor/mech_bay_recharge_floor,
 /area/station/science/robotics/chargebay)
-"cFr" = (
-/obj/machinery/iv_drip,
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "cFs" = (
 /obj/structure/chair/sofa/right{
 	color = "#A30FAF";
@@ -25687,26 +25564,12 @@
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/mapping_helpers/airlock/autoname,
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plasteel/white,
 /area/station/maintenance/aft)
 "cGo" = (
 /turf/simulated/wall/r_wall,
 /area/station/maintenance/apmaint)
-"cGp" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "cGq" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel{
@@ -25951,16 +25814,19 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/cryo)
 "cHm" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+	dir = 6
 	},
-/obj/effect/turf_decal/tiles/department/virology/side{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/effect/turf_decal/stripes/corner{
 	dir = 8
 	},
 /turf/simulated/floor/plasteel/white,
@@ -26151,19 +26017,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
-"cIg" = (
-/obj/machinery/alarm/directional/north,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "cIh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
@@ -26621,6 +26474,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
 "cKE" = (
@@ -26865,6 +26719,13 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/exam_room)
+"cLS" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+	dir = 4
+	},
+/obj/machinery/atmospherics/portable/canister/air,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "cLT" = (
 /obj/effect/turf_decal/stripes/white/corner,
 /obj/structure/window/reinforced{
@@ -27156,23 +27017,12 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
 "cNA" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/virology/glass{
-	name = "Isolation A"
-	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "cNC" = (
@@ -27216,10 +27066,7 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/exam_room)
 "cNI" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/sink/puddle,
 /turf/simulated/floor/grass/no_creep,
 /area/station/medical/virology)
 "cNK" = (
@@ -27780,10 +27627,6 @@
 /obj/effect/spawner/random/maintenance,
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
-"cRe" = (
-/obj/item/beach_ball,
-/turf/space,
-/area/space)
 "cRg" = (
 /obj/machinery/light_construct{
 	dir = 4
@@ -28095,16 +27938,12 @@
 /turf/simulated/floor/plating,
 /area/station/security/interrogation)
 "cTz" = (
-/obj/structure/lattice/catwalk,
-/obj/item/reagent_containers/drinks/bottle/rum{
-	pixel_x = -7;
-	pixel_y = 2
+/obj/machinery/atmospherics/binary/pump{
+	dir = 4
 	},
-/obj/item/clothing/mask/cigarette/rollie{
-	pixel_y = -3
-	},
-/turf/space,
-/area/space/nearstation)
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "cTB" = (
 /obj/machinery/atmospherics/pipe/simple/visible,
 /obj/machinery/atmospherics/meter{
@@ -29055,6 +28894,7 @@
 /obj/structure/cable/extra_insulated{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/surgery/observation)
 "cZa" = (
@@ -29179,18 +29019,16 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/hallway/secondary/exit)
 "dad" = (
-/obj/structure/table/glass,
-/obj/item/folder/white{
-	pixel_y = 4
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 5
 	},
-/obj/item/pen/red,
-/obj/machinery/light/small{
-	dir = 1
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/structure/table,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
 	},
-/obj/machinery/camera{
-	c_tag = "Virology Isolation A"
-	},
-/turf/simulated/floor/plasteel/white,
+/turf/simulated/floor/plasteel/dark,
 /area/station/medical/virology)
 "dae" = (
 /obj/machinery/camera{
@@ -29232,11 +29070,12 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/science/robotics)
 "dan" = (
-/obj/structure/chair/office,
-/obj/effect/landmark/start/virologist,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 4
 	},
+/obj/structure/chair{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "dap" = (
@@ -29421,6 +29260,11 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/service/janitor)
+"dbu" = (
+/obj/structure/flora/junglebush,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/simulated/floor/grass/no_creep,
+/area/station/medical/virology)
 "dbv" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -30063,10 +29907,22 @@
 /turf/simulated/floor/plasteel,
 /area/station/security/brig)
 "dfU" = (
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/virology/glass{
+	name = "Virology Bedroom"
+	},
+/obj/effect/mapping_helpers/airlock/polarized{
+	id = "virology_bedroom_1"
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
@@ -30433,6 +30289,13 @@
 	},
 /turf/simulated/floor/engine/vacuum,
 /area/station/science/toxins/mixing)
+"dkQ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 5
+	},
+/obj/machinery/atmospherics/meter,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "dlb" = (
 /obj/effect/decal/cleanable/blood/old,
 /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
@@ -31731,6 +31594,18 @@
 /obj/structure/sign/radiation/rad_area,
 /turf/simulated/wall/r_wall,
 /area/station/engineering/transmission_laser)
+"dMG" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/grass/no_creep,
+/area/station/medical/virology)
 "dMK" = (
 /obj/machinery/atmospherics/binary/valve/open,
 /turf/simulated/floor/plating,
@@ -31973,6 +31848,16 @@
 /obj/effect/turf_decal/tiles/department/science,
 /turf/simulated/floor/plasteel/white,
 /area/station/command/office/rd)
+"dRY" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "dSa" = (
 /obj/machinery/power/apc/reinforced/directional/east,
 /obj/structure/cable/extra_insulated{
@@ -31984,19 +31869,12 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/theatre)
 "dSe" = (
+/obj/effect/spawner/window/reinforced/grilled,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-8"
 	},
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/virology/glass{
-	name = "Containment Cells"
-	},
-/obj/effect/turf_decal/tiles/department/virology,
-/turf/simulated/floor/plasteel/white,
+/obj/structure/sign/biohazard,
+/turf/simulated/floor/plating,
 /area/station/medical/virology)
 "dSg" = (
 /obj/structure/disposalpipe/segment{
@@ -33506,11 +33384,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/science/robotics/showroom)
-"esm" = (
-/obj/structure/lattice/catwalk,
-/obj/item/instrument/guitar,
-/turf/space,
-/area/space/nearstation)
 "esw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -33640,17 +33513,6 @@
 /obj/effect/mapping_helpers/airlock/windoor/autoname/desk,
 /turf/simulated/floor/plating,
 /area/station/supply/office)
-"euU" = (
-/obj/machinery/economy/vending/virodrobe,
-/obj/item/radio/intercom{
-	name = "east bump";
-	pixel_x = 28
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 6
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "euY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -33821,15 +33683,13 @@
 /turf/simulated/floor/plasteel,
 /area/station/security/defusal)
 "exI" = (
-/obj/structure/table/glass,
-/obj/item/hand_labeler,
-/obj/item/radio/headset/headset_med,
-/obj/item/radio/intercom{
-	name = "west bump";
-	pixel_x = -28
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 10
+/obj/effect/landmark/start/virologist,
+/obj/structure/chair/office,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
@@ -34331,7 +34191,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
-/obj/structure/sign/poster/contraband/random/directional/north,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
 "eGi" = (
@@ -34582,6 +34444,14 @@
 /obj/effect/turf_decal/tiles/department/engineering/side,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/engine_foyer)
+"eKU" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/structure/curtain/medical,
+/turf/simulated/floor/plating,
+/area/station/medical/virology)
 "eKW" = (
 /obj/machinery/door/airlock/security/glass{
 	name = "Brig"
@@ -34962,22 +34832,6 @@
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/starboard)
-"eRy" = (
-/obj/structure/table/glass,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/item/reagent_containers/glass/beaker,
-/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/dropper,
-/obj/machinery/camera{
-	c_tag = "Virology Isolation B"
-	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "eRG" = (
 /mob/living/simple_animal/pet/cat/var_cat,
 /obj/machinery/light{
@@ -35820,6 +35674,18 @@
 	},
 /turf/simulated/floor/wood,
 /area/station/command/office/captain/bedroom)
+"feL" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 10
+	},
+/obj/structure/closet/secure_closet/personal/patient,
+/obj/machinery/camera{
+	c_tag = "Virology Bedroom North";
+	dir = 4;
+	network = list("SS13","Medical","Bedroom")
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/station/medical/virology)
 "ffx" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -36308,6 +36174,16 @@
 /obj/effect/turf_decal/tiles/dark/checker,
 /turf/simulated/floor/plasteel/white,
 /area/station/service/kitchen)
+"foz" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id_tag = "viroshutters";
+	name = "Privacy Shutters";
+	dir = 8
+	},
+/obj/structure/cable,
+/turf/simulated/floor/plating,
+/area/station/medical/virology)
 "foE" = (
 /obj/structure/table,
 /obj/item/instrument/harmonica,
@@ -36704,8 +36580,6 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard)
 "fxD" = (
-/obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
-/obj/machinery/firealarm/directional/south,
 /obj/effect/turf_decal/tiles/department/virology/side,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
@@ -37217,9 +37091,12 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/solar_maintenance/aft_starboard)
 "fFX" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "fGb" = (
@@ -38509,6 +38386,27 @@
 /obj/effect/turf_decal/tiles/neutral,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/exit)
+"gdU" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id_tag = "viroshutters";
+	name = "Privacy Shutters";
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/station/medical/virology)
 "gej" = (
 /obj/effect/spawner/window/reinforced/grilled,
 /obj/structure/cable{
@@ -39342,6 +39240,13 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/fsmaint)
+"gui" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+	dir = 4
+	},
+/obj/machinery/atmospherics/meter,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "gut" = (
 /obj/effect/turf_decal/tiles/department/engineering/corner{
 	dir = 1
@@ -40128,6 +40033,24 @@
 /obj/effect/turf_decal/tiles/department/cargo/corner,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/supply)
+"gJP" = (
+/turf/simulated/wall,
+/area/station/medical/virology)
+"gKf" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 10
+	},
+/obj/structure/chair/sofa/corner{
+	color = "#6ae226";
+	dir = 1
+	},
+/obj/machinery/camera{
+	c_tag = "Virology Break Room";
+	dir = 1;
+	network = list("Medical","SS13")
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "gKl" = (
 /obj/effect/turf_decal/tiles/dark/side{
 	dir = 1
@@ -40285,6 +40208,18 @@
 	icon_state = "freezerfloor"
 	},
 /area/station/security/permabrig)
+"gMr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/purple,
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable,
+/turf/simulated/floor/plating,
+/area/station/medical/virology)
 "gMv" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
@@ -40565,6 +40500,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /turf/simulated/floor/plating,
 /area/station/engineering/atmos/control)
+"gRt" = (
+/obj/machinery/light/small,
+/obj/effect/turf_decal/tiles/department/virology/side,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/station/medical/virology)
 "gRu" = (
 /mob/living/basic/mouse/brown/tom,
 /obj/structure/sink/directional/north,
@@ -40685,6 +40628,17 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore2)
+"gSx" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet{
+	name = "north bump";
+	pixel_y = 30
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "gSM" = (
 /obj/machinery/light{
 	dir = 1
@@ -40927,6 +40881,15 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/aft2)
+"gWr" = (
+/obj/structure/disposaloutlet{
+	dir = 8
+	},
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
+/turf/simulated/floor/plating/airless,
+/area/space/nearstation)
 "gWT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 9
@@ -41054,6 +41017,21 @@
 "gYO" = (
 /turf/simulated/wall/r_wall,
 /area/station/maintenance/fore2)
+"gYY" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "gZe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/turf_decal/tiles/department/science/side{
@@ -41248,6 +41226,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/engineering/control)
+"hdN" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 9
+	},
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "hdR" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 10
@@ -41380,6 +41364,16 @@
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/medbay)
+"hgK" = (
+/obj/machinery/economy/vending/virodrobe,
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 9
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "hgN" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -41529,13 +41523,11 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint)
 "hkf" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 1
 	},
+/obj/structure/sign/poster/official/cleanliness/directional/north,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "hki" = (
@@ -41961,14 +41953,14 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/supply/aft)
 "htr" = (
-/obj/machinery/disposal,
-/obj/structure/sign/deathsposal{
-	pixel_y = -32
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/structure/disposalpipe/trunk{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment/corner{
+	dir = 1
 	},
-/obj/effect/turf_decal/tiles/department/virology/side,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "hts" = (
@@ -42434,7 +42426,19 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft2)
 "hCM" = (
-/obj/effect/landmark/lightsout,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
+/obj/structure/disposalpipe/segment/corner,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "hDr" = (
@@ -43421,6 +43425,19 @@
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel/dark,
 /area/station/engineering/equipmentstorage)
+"hWC" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 1
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/machinery/button/windowtint{
+	id = "virology_bedroom_1";
+	pixel_y = 24
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/station/medical/virology)
 "hXd" = (
 /obj/effect/spawner/window/reinforced/grilled,
 /turf/simulated/floor/engine,
@@ -44274,18 +44291,6 @@
 /obj/effect/turf_decal/tiles/department/medical/side,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/exam_room)
-"inq" = (
-/obj/structure/sink/directional/east,
-/obj/machinery/light_switch{
-	dir = 8;
-	name = "east bump";
-	pixel_x = 24
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 5
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "inv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -44377,6 +44382,25 @@
 /obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore2)
+"ipW" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 8
+	},
+/obj/structure/table/reinforced,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door_control{
+	id = "viroshutters";
+	name = "Privacy Shutters Control";
+	pixel_x = -6;
+	pixel_y = 8
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "iqc" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -45232,6 +45256,21 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/science/robotics/showroom)
+"iCS" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/station/medical/virology)
 "iCZ" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/greengrid,
@@ -45242,6 +45281,18 @@
 /obj/effect/spawner/random/maintenance,
 /turf/simulated/floor/grass/no_creep,
 /area/station/maintenance/abandoned_garden)
+"iDe" = (
+/obj/structure/closet/secure_closet/personal/patient,
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 9
+	},
+/obj/machinery/camera{
+	c_tag = "Virology Bedroom South";
+	dir = 5;
+	network = list("SS13","Medical","Bedroom")
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/station/medical/virology)
 "iDg" = (
 /obj/structure/table,
 /obj/item/stack/sheet/glass/fifty,
@@ -45280,6 +45331,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/port)
+"iDI" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 8
+	},
+/obj/machinery/pandemic,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "iDM" = (
 /obj/structure/chair{
 	dir = 4
@@ -45802,6 +45860,12 @@
 /obj/machinery/alarm/directional/north,
 /turf/simulated/floor/plasteel,
 /area/station/public/storage/tools)
+"iMt" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/station/medical/virology)
 "iMu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -45971,6 +46035,16 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/security/main)
+"iPa" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plating,
+/area/station/medical/virology)
 "iPq" = (
 /obj/machinery/navbeacon{
 	codes_txt = "patrol;next_patrol=9.3-Escape-3";
@@ -46816,6 +46890,12 @@
 "jgJ" = (
 /turf/simulated/floor/plasteel/dark,
 /area/station/turret_protected/ai)
+"jgL" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/turf/simulated/floor/grass/no_creep,
+/area/station/medical/virology)
 "jgO" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable{
@@ -47199,19 +47279,16 @@
 /area/station/medical/cloning)
 "joY" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/obj/structure/disposalpipe/segment/corner{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
@@ -47243,6 +47320,12 @@
 /obj/effect/turf_decal/tiles/department/medical,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/storage/secondary)
+"jrd" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 5
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/surgery/observation)
 "jrp" = (
 /obj/structure/bed,
 /obj/item/bedsheet,
@@ -47254,6 +47337,18 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/station/security/prison/cell_block/a)
+"jrD" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 5
+	},
+/obj/machinery/light_switch{
+	pixel_y = 24;
+	name = "north bump"
+	},
+/obj/structure/bed/dogbed,
+/mob/living/basic/mouse/white/brain,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "jse" = (
 /obj/effect/spawner/window/reinforced/grilled,
 /obj/structure/cable{
@@ -47580,6 +47675,18 @@
 /obj/effect/turf_decal/tiles/department/security/corner,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/ne)
+"jyt" = (
+/obj/structure/bed,
+/obj/item/bedsheet/green,
+/obj/item/radio/intercom{
+	name = "south bump";
+	pixel_y = -28
+	},
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 10
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/station/medical/virology)
 "jyL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate,
@@ -47782,6 +47889,18 @@
 /obj/item/surgicaldrill,
 /turf/simulated/floor/plasteel/white,
 /area/station/maintenance/aft)
+"jDb" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 9
+	},
+/obj/structure/bed,
+/obj/item/bedsheet/green,
+/obj/item/radio/intercom{
+	name = "north bump";
+	pixel_y = 28
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/station/medical/virology)
 "jDc" = (
 /obj/machinery/navbeacon{
 	codes_txt = "delivery";
@@ -47998,6 +48117,9 @@
 /obj/structure/cable/extra_insulated{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 10
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/surgery/observation)
 "jGk" = (
@@ -48582,6 +48704,21 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/fore/west)
+"jNY" = (
+/obj/structure/reagent_dispensers/virusfood{
+	pixel_x = -30
+	},
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 10
+	},
+/obj/structure/table/reinforced,
+/obj/item/storage/belt/medical,
+/obj/item/clothing/glasses/hud/health,
+/obj/item/healthanalyzer{
+	pixel_y = 14
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "jOj" = (
 /obj/effect/turf_decal/delivery,
 /obj/machinery/door/poddoor/preopen{
@@ -49192,6 +49329,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/surgery/observation)
 "jWt" = (
@@ -49384,6 +49524,16 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood,
 /area/station/service/library)
+"kak" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 1
+	},
+/obj/machinery/power/apc/directional/north,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "kau" = (
 /obj/machinery/economy/slot_machine,
 /obj/machinery/power/apc/reinforced/directional/north,
@@ -49544,10 +49694,25 @@
 /turf/simulated/floor/plasteel/dark,
 /area/station/hallway/supply/port)
 "kdh" = (
-/obj/structure/closet/l3closet/virology,
 /obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 1
 	},
+/obj/item/roller,
+/obj/item/soap/nanotrasen,
+/obj/item/storage/box/syringes,
+/obj/item/storage/box/beakers{
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/obj/item/storage/box/iv_bags{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/obj/item/storage/box/bodybags{
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/structure/shelf/medbay,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "kdl" = (
@@ -50436,7 +50601,7 @@
 	},
 /area/station/public/toilet/lockerroom)
 "kuc" = (
-/obj/structure/flora/ausbushes/fernybush,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/grass/no_creep,
 /area/station/medical/virology)
 "kuf" = (
@@ -51016,6 +51181,13 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/exam_room)
+"kEP" = (
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/effect/spawner/window/reinforced/grilled,
+/turf/simulated/floor/plating,
+/area/station/medical/virology)
 "kFk" = (
 /obj/machinery/alarm/directional/west,
 /obj/machinery/computer/card/minor/rd{
@@ -51442,14 +51614,14 @@
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/apmaint)
 "kMD" = (
-/obj/structure/table/glass,
+/obj/effect/turf_decal/tiles/department/virology/side,
+/obj/structure/table/reinforced,
 /obj/machinery/reagentgrinder{
 	pixel_y = 5
 	},
 /obj/item/toy/figure/crew/virologist{
 	pixel_x = -13
 	},
-/obj/effect/turf_decal/tiles/department/virology/side,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "kMI" = (
@@ -51476,13 +51648,10 @@
 /area/station/medical/medbay)
 "kMZ" = (
 /obj/machinery/shower/directional/north,
-/obj/item/radio/intercom{
-	name = "east bump";
-	pixel_x = 28
-	},
 /obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 5
 	},
+/obj/effect/turf_decal/delivery,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "kNk" = (
@@ -51783,22 +51952,6 @@
 /obj/machinery/atmospherics/pipe/manifold/visible/scrubbers,
 /turf/simulated/floor/engine,
 /area/station/engineering/engine/supermatter)
-"kRZ" = (
-/obj/structure/rack,
-/obj/item/reagent_containers/syringe/antiviral,
-/obj/item/book/manual/wiki/sop_medical,
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/dropper/precision,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/structure/extinguisher_cabinet{
-	name = "east bump";
-	pixel_x = 27
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 5
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "kSa" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /obj/effect/decal/cleanable/dirt,
@@ -53219,6 +53372,12 @@
 /obj/item/clothing/head/witchwig,
 /turf/simulated/floor/plating,
 /area/station/maintenance/theatre)
+"lpe" = (
+/obj/effect/spawner/window/reinforced/polarized{
+	id = "virology_bedroom_1"
+	},
+/turf/simulated/floor/plating,
+/area/station/medical/virology)
 "lph" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -53603,6 +53762,11 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/security/checkpoint/secondary)
+"lxr" = (
+/obj/structure/lattice,
+/obj/item/beach_ball,
+/turf/space,
+/area/space/nearstation)
 "lxt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/landmark/lightsout,
@@ -53810,6 +53974,16 @@
 	},
 /turf/simulated/floor/engine,
 /area/station/engineering/engine/supermatter)
+"lBf" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 8
+	},
+/obj/structure/table/reinforced,
+/obj/item/clothing/gloves/color/latex{
+	pixel_y = 6
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "lBp" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -54581,6 +54755,16 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/fore)
+"lPz" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 9
+	},
+/obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "lPI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
@@ -55541,6 +55725,13 @@
 /obj/effect/turf_decal/tiles/department/science,
 /turf/simulated/floor/plasteel/dark,
 /area/station/science/genetics)
+"mig" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/grass/no_creep,
+/area/station/medical/virology)
 "mik" = (
 /obj/structure/sign/goldenplaque/medical{
 	pixel_x = -32
@@ -56108,9 +56299,16 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft2)
 "msD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/purple,
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
+/obj/structure/table/glass,
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 6
+	},
+/obj/item/hand_labeler{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/item/radio/headset/headset_med,
+/turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "msY" = (
 /obj/machinery/driver_button{
@@ -57360,16 +57558,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard2)
-"mRr" = (
-/obj/machinery/alarm/directional/east,
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "mRy" = (
 /obj/item/storage/fancy/shell/tranquilizer,
 /obj/structure/cable{
@@ -58946,19 +59134,16 @@
 /turf/simulated/wall,
 /area/station/supply/sorting)
 "nsm" = (
-/obj/machinery/alarm/directional/west,
-/obj/machinery/light{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/camera{
-	c_tag = "Virology Central Hallway";
-	dir = 4
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 8
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
@@ -59794,16 +59979,18 @@
 /turf/simulated/floor/plasteel,
 /area/station/supply/miningdock)
 "nIG" = (
-/obj/machinery/light_switch{
-	dir = 8;
-	name = "east bump";
-	pixel_x = 24
+/obj/machinery/door/airlock/virology/glass{
+	name = "Workstation"
 	},
-/obj/machinery/camera{
-	c_tag = "Virology Lab";
-	dir = 8
+/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/tiles/department/virology/side{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel/white,
@@ -60758,17 +60945,17 @@
 /turf/space,
 /area/space/nearstation)
 "oaj" = (
-/obj/structure/table/glass,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "2-8"
 	},
-/obj/item/reagent_containers/glass/beaker,
-/obj/item/reagent_containers/syringe,
-/obj/item/reagent_containers/dropper,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 4
 	},
-/turf/simulated/floor/plasteel/white,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/chair/comfy/green{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/dark,
 /area/station/medical/virology)
 "oan" = (
 /obj/machinery/light_switch{
@@ -60801,14 +60988,6 @@
 /obj/effect/turf_decal/tiles/department/security/side,
 /turf/simulated/floor/plasteel,
 /area/station/security/main)
-"oaI" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/obj/structure/cable,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/plating,
-/area/station/medical/virology)
 "oaX" = (
 /obj/effect/turf_decal/tiles/department/security/side{
 	dir = 8
@@ -61635,15 +61814,19 @@
 /turf/simulated/floor/plasteel,
 /area/station/public/locker)
 "oro" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 6
 	},
-/obj/structure/disposalpipe/segment/corner{
-	dir = 2
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+	dir = 8
+	},
+/obj/structure/sign/deathsposal{
+	pixel_x = 32
+	},
+/obj/machinery/light{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/turf_decal/tiles/department/virology/side,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "orE" = (
@@ -61812,6 +61995,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
+"owE" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 4
+	},
+/obj/item/kirbyplants/large,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "owM" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -62870,6 +63060,25 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel,
 /area/station/public/construction)
+"oPE" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/virology/glass{
+	name = "Containment Cells"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "oPJ" = (
 /turf/simulated/floor/carpet/purple,
 /area/station/service/library)
@@ -63021,9 +63230,16 @@
 /turf/simulated/floor/plasteel,
 /area/station/security/warden)
 "oRL" = (
-/obj/structure/cable,
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "oSi" = (
 /obj/structure/disposalpipe/segment,
@@ -63146,6 +63362,18 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/exit)
+"oUz" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/grass/no_creep,
+/area/station/medical/virology)
 "oUI" = (
 /obj/machinery/economy/vending/wallmed/directional/north,
 /obj/structure/cable/extra_insulated{
@@ -64213,13 +64441,11 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/science/lobby)
 "pps" = (
-/obj/structure/rack,
-/obj/item/crowbar/red,
-/obj/item/restraints/handcuffs,
-/obj/item/wrench,
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 9
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "ppH" = (
@@ -65825,19 +66051,20 @@
 	},
 /area/station/legal/magistrate)
 "pTW" = (
-/obj/structure/rack,
-/obj/item/storage/box/beakers{
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/obj/item/storage/box/syringes,
-/obj/machinery/power/apc/directional/north,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/item/reagent_containers/dropper/precision,
+/obj/item/book/manual/wiki/sop_medical,
+/obj/item/reagent_containers/syringe/antiviral,
 /obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 1
+	dir = 5
 	},
+/obj/machinery/camera{
+	c_tag = "Virology Lab";
+	dir = 6
+	},
+/obj/structure/shelf/medbay,
+/obj/machinery/firealarm/directional/east,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "pUc" = (
@@ -66319,6 +66546,21 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/aisat)
+"qbG" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "qbU" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
@@ -67502,11 +67744,11 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/science/rnd)
 "qxZ" = (
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 9
 	},
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
+/obj/structure/sink/directional/west,
+/turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "qyb" = (
 /obj/effect/spawner/window/reinforced/grilled,
@@ -67612,10 +67854,15 @@
 /area/station/security/brig)
 "qAh" = (
 /obj/structure/sink/directional/north,
-/obj/structure/sign/poster/official/cleanliness/directional/west,
 /obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 9
 	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/sign/biohazard{
+	pixel_x = -32
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "qAr" = (
@@ -67801,16 +68048,6 @@
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel,
 /area/station/supply/break_room)
-"qEg" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/plating,
-/area/station/medical/virology)
 "qEh" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel/white,
@@ -67952,6 +68189,16 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
+"qGS" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/iv_drip,
+/turf/simulated/floor/plasteel/dark,
+/area/station/medical/virology)
 "qHd" = (
 /obj/machinery/status_display/supply_display,
 /turf/simulated/wall,
@@ -68048,6 +68295,22 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry/lounge)
+"qJl" = (
+/obj/structure/table/glass,
+/obj/machinery/computer/med_data/laptop{
+	pixel_x = 4;
+	pixel_y = 2
+	},
+/obj/item/ashtray/plastic{
+	pixel_x = -10;
+	pixel_y = -4
+	},
+/obj/item/storage/fancy/cigarettes/cigpack_robust{
+	pixel_x = -10;
+	pixel_y = 8
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "qJz" = (
 /obj/effect/turf_decal/tiles/department/engineering/side{
 	dir = 4
@@ -68489,25 +68752,12 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/break_room)
 "qQH" = (
-/obj/structure/table/glass,
-/obj/structure/reagent_dispensers/virusfood{
-	pixel_x = -30
-	},
-/obj/item/folder/white{
-	pixel_x = 4;
-	pixel_y = -3
-	},
-/obj/machinery/requests_console/directional/south,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/item/pen/red{
-	pixel_x = 7;
-	pixel_y = 10
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 10
+/obj/effect/turf_decal/tiles/department/virology/side,
+/obj/structure/table/reinforced,
+/obj/item/stack/sheet/mineral/plasma{
+	amount = 5
 	},
+/obj/item/clothing/glasses/science,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "qQO" = (
@@ -68541,6 +68791,11 @@
 /obj/effect/turf_decal/tiles/department/science,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/storage)
+"qRd" = (
+/obj/structure/table,
+/obj/effect/spawner/random/engineering/misc,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "qRm" = (
 /obj/effect/spawner/random/oil/maybe,
 /obj/structure/cable/extra_insulated{
@@ -68801,6 +69056,10 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/service/chapel)
+"qVI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "qVY" = (
 /obj/item/storage/secure/safe{
 	pixel_y = 32
@@ -69247,8 +69506,19 @@
 /turf/simulated/floor/plasteel,
 /area/station/science/xenobiology)
 "reS" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
+/obj/structure/table/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/effect/turf_decal/tiles/department/virology/side,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/item/folder/white{
+	pixel_y = 4
+	},
+/obj/item/folder/white{
+	pixel_x = 4
+	},
+/turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "rfn" = (
 /obj/structure/disposalpipe/segment{
@@ -69702,6 +69972,11 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/medbay)
+"roE" = (
+/obj/structure/table,
+/obj/effect/spawner/random/engineering/toolbox,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "roH" = (
 /obj/structure/closet/crate/internals,
 /obj/effect/turf_decal/delivery/hollow,
@@ -70019,6 +70294,18 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/medical/surgery/observation)
+"rtw" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id_tag = "viroshutters";
+	name = "Privacy Shutters";
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/simulated/floor/plating,
+/area/station/medical/virology)
 "rtF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -70312,20 +70599,6 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/lobby)
-"rzl" = (
-/obj/structure/table/glass,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/healthanalyzer{
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/obj/item/clothing/glasses/hud/health,
-/obj/item/clothing/glasses/science,
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "rzQ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
@@ -70821,6 +71094,12 @@
 /obj/machinery/atmospherics/unary/tank/air,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
+"rIG" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 5
+	},
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "rIT" = (
 /obj/structure/table,
 /obj/item/geiger_counter,
@@ -71783,6 +72062,18 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/supply/break_room)
+"rYA" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "rYO" = (
 /obj/machinery/status_display{
 	layer = 4;
@@ -71921,6 +72212,16 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/rnd)
+"sbv" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "sbG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
@@ -71990,10 +72291,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/fore2)
-"scP" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft)
 "sdJ" = (
 /obj/machinery/door/airlock/freezer,
 /obj/effect/mapping_helpers/airlock/access/all/service/kitchen,
@@ -72491,6 +72788,12 @@
 /obj/effect/turf_decal/tiles/department/science,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/rnd)
+"soQ" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "soT" = (
 /obj/structure/table,
 /obj/machinery/processor{
@@ -72740,6 +73043,18 @@
 /obj/effect/turf_decal/tiles/department/medical/corner,
 /turf/simulated/floor/plasteel,
 /area/station/security/checkpoint/secondary)
+"svB" = (
+/obj/structure/table/glass,
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 10
+	},
+/obj/item/paper_bin,
+/obj/item/pen/red,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "svH" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -72803,6 +73118,13 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/fsmaint)
+"swi" = (
+/obj/machinery/light,
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 6
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/surgery/observation)
 "swL" = (
 /obj/machinery/door/airlock/security/glass{
 	id_tag = "outerbrig"
@@ -72972,6 +73294,12 @@
 /obj/structure/fans/tiny,
 /turf/simulated/floor/plating,
 /area/station/maintenance/disposal)
+"sAH" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "sAP" = (
 /obj/effect/turf_decal/woodsiding{
 	dir = 8
@@ -73866,19 +74194,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/se)
-"sQA" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/simulated/floor/plating,
-/area/station/medical/virology)
 "sRf" = (
 /obj/item/radio/intercom{
 	name = "west bump";
@@ -74641,16 +74956,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
-"tdI" = (
-/obj/effect/spawner/window/reinforced/grilled,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/simulated/floor/plating,
-/area/station/medical/virology)
 "tdO" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -74929,10 +75234,10 @@
 /turf/simulated/floor/plating,
 /area/station/medical/virology)
 "tkb" = (
-/obj/structure/flora/junglebush,
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/grass/no_creep,
 /area/station/medical/virology)
 "tkg" = (
@@ -75172,6 +75477,18 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/station/supply/miningdock)
+"toq" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 6
+	},
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/station/medical/virology)
 "tov" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -76518,6 +76835,16 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/service/chapel/office)
+"tPF" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/extra_insulated{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "tPJ" = (
 /obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor/plating,
@@ -76673,6 +77000,14 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
+"tUo" = (
+/obj/effect/turf_decal/tiles/department/virology/side,
+/obj/structure/chair/sofa/right{
+	color = "#6ae226";
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "tUt" = (
 /obj/item/wrench,
 /obj/structure/cable/extra_insulated{
@@ -77268,6 +77603,17 @@
 	},
 /turf/simulated/floor/wood,
 /area/station/service/bar)
+"ueK" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/chair/comfy/green,
+/turf/simulated/floor/plasteel/dark,
+/area/station/medical/virology)
 "ueN" = (
 /obj/machinery/hologram/holopad,
 /obj/effect/decal/cleanable/dirt,
@@ -77516,6 +77862,13 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/fore/west)
+"uiY" = (
+/obj/machinery/atmospherics/unary/tank/air,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "ujg" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -78438,6 +78791,20 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/security/detective)
+"uCZ" = (
+/obj/item/radio/intercom{
+	name = "east bump";
+	pixel_x = 28
+	},
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 4
+	},
+/obj/machinery/kitchen_machine/microwave{
+	pixel_y = 6
+	},
+/obj/structure/table/reinforced,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "uDa" = (
 /obj/effect/turf_decal/loading_area,
 /turf/simulated/floor/plasteel,
@@ -78487,6 +78854,26 @@
 /obj/item/kirbyplants/large/plant14,
 /turf/simulated/floor/wood,
 /area/station/maintenance/asmaint)
+"uEr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/virology/glass{
+	name = "Virology Bedroom"
+	},
+/obj/effect/mapping_helpers/airlock/polarized{
+	id = "virology_bedroom_2"
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "uEz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -80429,13 +80816,13 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
+/obj/machinery/hologram/holopad,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
+	dir = 9
 	},
-/obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "vmA" = (
@@ -80606,6 +80993,10 @@
 	},
 /turf/simulated/floor/carpet/grimey,
 /area/station/security/detective)
+"vpd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "vpo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 6
@@ -82243,6 +82634,9 @@
 /area/station/public/fitness)
 "vVr" = (
 /obj/machinery/light,
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 10
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/surgery/observation)
 "vVE" = (
@@ -82664,6 +83058,24 @@
 	},
 /turf/simulated/floor/wood,
 /area/station/service/library)
+"wdy" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 6
+	},
+/obj/structure/table/reinforced,
+/obj/item/storage/box/donkpockets{
+	pixel_x = 6;
+	pixel_y = 16
+	},
+/obj/item/storage/fancy/donut_box{
+	pixel_x = -2;
+	pixel_y = 1
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "wdY" = (
 /obj/structure/sign/poster/official/random/directional/south,
 /obj/effect/decal/cleanable/dirt,
@@ -84101,6 +84513,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
+"wCR" = (
+/obj/machinery/atmospherics/unary/tank/air,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "wDG" = (
 /obj/machinery/power/apc/directional/east,
 /obj/structure/cable{
@@ -84612,6 +85028,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 9
+	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft)
 "wMy" = (
@@ -85132,6 +85551,10 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry/lounge)
+"wXo" = (
+/obj/machinery/atmospherics/binary/valve,
+/turf/simulated/floor/plating,
+/area/station/maintenance/aft)
 "wXp" = (
 /obj/effect/turf_decal/caution/stand_clear,
 /obj/effect/turf_decal/stripes/line,
@@ -85274,6 +85697,19 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/toxins/mixing)
+"wZv" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 8
+	},
+/obj/structure/chair/sofa/left{
+	color = "#6ae226";
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "wZw" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
 	dir = 8;
@@ -85328,6 +85764,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/hallway/secondary/exit)
+"xaB" = (
+/obj/effect/turf_decal/tiles/department/virology/side,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "xaI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -85473,22 +85916,13 @@
 /turf/simulated/floor/bluegrid/telecomms/server,
 /area/station/science/server/coldroom)
 "xcF" = (
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/virology/glass{
-	name = "Isolation B"
+/obj/machinery/computer/security/telescreen{
+	name = "Virologist Isolation";
+	network = list("Bedroom");
+	pixel_x = -30
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
@@ -86292,6 +86726,10 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
+"xpc" = (
+/obj/structure/flora/ausbushes/lavendergrass,
+/turf/simulated/floor/grass/no_creep,
+/area/station/medical/virology)
 "xpj" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -86736,6 +87174,11 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/legal/courtroom/gallery)
+"xxH" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "xxP" = (
 /obj/machinery/economy/vending/wallmed/directional/north,
 /obj/effect/decal/cleanable/dirt,
@@ -87766,6 +88209,12 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/controlroom)
 "xPC" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 9
+	},
+/obj/structure/sign/biohazard{
+	pixel_x = -32
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/surgery/observation)
 "xPR" = (
@@ -87905,6 +88354,10 @@
 /obj/effect/spawner/window/reinforced/tinted,
 /turf/simulated/floor/plating,
 /area/station/maintenance/starboard2)
+"xTM" = (
+/obj/structure/flora/junglebush,
+/turf/simulated/floor/grass/no_creep,
+/area/station/medical/virology)
 "xTX" = (
 /obj/structure/sign/poster/contraband/random/directional/south,
 /obj/effect/decal/cleanable/dirt,
@@ -88266,6 +88719,9 @@
 	locked = 1;
 	name = "Virology Lab External Airlock"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "xZX" = (
@@ -88353,6 +88809,13 @@
 /obj/effect/turf_decal/stripes/end,
 /turf/simulated/floor/plating,
 /area/station/public/construction)
+"ybv" = (
+/obj/effect/spawner/window/reinforced/grilled,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/plating,
+/area/station/medical/virology)
 "ybD" = (
 /obj/effect/turf_decal/delivery,
 /obj/machinery/door/window/classic/normal{
@@ -88552,11 +89015,11 @@
 /turf/simulated/wall,
 /area/station/public/construction)
 "yeR" = (
-/obj/item/kirbyplants/large,
-/obj/machinery/newscaster/directional/north,
 /obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 9
+	dir = 1
 	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/requests_console/directional/north,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "yeU" = (
@@ -88702,13 +89165,24 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/se)
 "yib" = (
-/obj/structure/flora/junglebush,
-/obj/structure/flora/ausbushes/ppflowers,
-/obj/machinery/light{
-	dir = 4
+/obj/machinery/camera{
+	c_tag = "Virology Test Subject Chamber";
+	dir = 9
 	},
 /turf/simulated/floor/grass/no_creep,
 /area/station/medical/virology)
+"yic" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 1
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/dark,
+/area/station/medical/virology)
 "yif" = (
 /obj/machinery/camera{
 	c_tag = "Atmospherics - Distro Loop";
@@ -101092,7 +101566,7 @@ aaa
 aaa
 aaa
 aaa
-cRe
+aaa
 aaa
 aaa
 aaa
@@ -101338,21 +101812,21 @@ aaa
 abq
 aef
 abq
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+abq
+abq
+abf
+abf
+abf
+gWr
+abf
+abf
+arB
+arB
+arB
+arB
+arB
+abf
+abf
 abf
 aaa
 coR
@@ -101597,20 +102071,20 @@ aef
 abq
 aaa
 aaa
+abq
+aaa
+aaa
+cIl
+aaa
+aaa
+lxr
 aaa
 aaa
 aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-abf
+abq
 aaa
 abq
 aaa
@@ -101854,20 +102328,20 @@ aef
 abq
 aaa
 aaa
+abq
+aaa
+aaa
+cIl
+aaa
+aaa
+abq
 aaa
 aaa
 aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-chS
-aaa
-aaa
-aaa
-abf
+abq
 aaa
 abq
 aaa
@@ -102109,23 +102583,23 @@ abq
 abq
 aef
 abq
+aaa
+aaa
 abq
-abq
-abf
-abf
-abf
-abf
-abf
-abf
-abf
-abf
-abf
+aaa
+aaa
 cIl
-abq
-abq
-abq
-abq
-abq
+aaa
+aaa
+dtE
+dtE
+eKU
+dtE
+dtE
+dtE
+eKU
+dtE
+dtE
 abq
 abq
 caJ
@@ -102368,21 +102842,21 @@ aef
 abq
 aaa
 aaa
-abq
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-cIl
-aaa
-aaa
-abq
-aaa
-aaa
+dtE
+dtE
+rtw
+gdU
+foz
+dtE
+dtE
+jDb
+qGS
+feL
+gJP
+iDe
+qGS
+jyt
+dtE
 aaa
 aaa
 abq
@@ -102626,22 +103100,22 @@ abq
 aaa
 aaa
 dtE
-dtE
-reS
-reS
-reS
-dtE
-dtE
-jXS
-tdI
+lPz
+iDI
+ipW
+lBf
+jNY
+gJP
+yic
+iMt
 cFi
-qEg
-wZL
+gJP
+hWC
+iMt
+gRt
 dtE
 aaa
 aaa
-aaa
-aaa
 abq
 aaa
 lio
@@ -102884,21 +103358,21 @@ aaa
 aaa
 dtE
 yeR
-kzx
+qVI
 ccp
-rzl
+xbA
 qQH
-dtE
+gJP
 dad
 oaj
-cFi
-eRy
+iCS
+gJP
 cCm
+ueK
+toq
 dtE
 aaa
 aaa
-aaa
-aaa
 abq
 nia
 lio
@@ -103141,21 +103615,21 @@ aaa
 aaa
 dtE
 cmI
-crc
+xbA
 bRn
-cad
+xbA
 kMD
-dtE
-cDS
+gJP
+gJP
 cnq
-cFi
-cIg
+uEr
+gJP
 dfU
+lpe
+gJP
 dtE
 abq
 abq
-abq
-abq
 caJ
 bSw
 ckL
@@ -103398,19 +103872,19 @@ abq
 abq
 dtE
 cty
-cvg
+xbA
 ccI
 xbA
 fxD
-dtE
+ybv
 qxZ
 cNA
-cFi
+rYA
 xcF
 oRL
-dtE
-dtE
-aaa
+kzx
+svB
+ybv
 aaa
 aaa
 abq
@@ -103655,20 +104129,20 @@ aaa
 aaa
 dtE
 kdh
-cvg
+xbA
 hCM
 fFX
 htr
-dtE
+oPE
 pps
-cuP
+dRY
 nsm
 cuP
 crb
 exI
 reS
-aaa
-aaa
+gMr
+cDm
 aaa
 abq
 aaa
@@ -103912,7 +104386,7 @@ bZP
 aaa
 dtE
 pTW
-cGp
+sAH
 cyI
 clL
 oro
@@ -103924,7 +104398,7 @@ cxm
 dan
 cFa
 msD
-cDm
+pdN
 aaa
 aaa
 abq
@@ -104168,20 +104642,20 @@ crG
 bZP
 aef
 dtE
-kRZ
-aww
-nIG
-mRr
-euU
+gJP
 cFv
-inq
-bZS
-ckJ
-bZm
-cFr
-crj
-reS
-abq
+nIG
+cFv
+gJP
+gJP
+gJP
+jXS
+cPT
+dwK
+wZL
+gJP
+dtE
+dtE
 abq
 abq
 caJ
@@ -104425,19 +104899,19 @@ crG
 bZP
 abq
 dtE
-dtE
-chP
-dtE
-dtE
-dtE
-dtE
-dtE
-jXS
-cPT
-dwK
-wZL
-dtE
-dtE
+hgK
+cHm
+gYY
+wZv
+gKf
+gJP
+crP
+clU
+oUz
+aNi
+mig
+dMG
+tjZ
 aaa
 aaa
 aaa
@@ -104681,20 +105155,20 @@ cyy
 uoQ
 bZP
 aaa
-aaa
-reS
-wjw
-reS
-aaa
-aaa
 dtE
-crP
-ewk
+gSx
+sbv
+xbA
+qJl
+tUo
+gJP
+cZw
+ctg
 cxz
-cAs
+ewk
 cNI
-cpW
-tjZ
+cYK
+sIL
 aaa
 aaa
 aaa
@@ -104938,20 +105412,20 @@ crG
 crG
 bZP
 aaa
-aaa
-reS
-wjw
-reS
-aaa
-aaa
 dtE
-cZw
+kak
+qbG
+xxH
+alQ
+xaB
+gJP
+xTM
 axH
 col
-ewk
-cfV
-cYK
-sIL
+cOG
+ctg
+dbu
+iPa
 aaa
 aaa
 aaa
@@ -105195,20 +105669,20 @@ crG
 crG
 bZP
 aaa
-aaa
-reS
-pko
-reS
-aaa
-aaa
 dtE
+jrD
+pko
+owE
+uCZ
+wdy
+gJP
 tkb
 kuc
+jgL
 clU
-cYK
-cOG
+xpc
 yib
-pdN
+kEP
 abq
 abq
 abq
@@ -105452,18 +105926,18 @@ ceu
 crG
 bZP
 bZP
-dtE
+cGo
 dtE
 wXW
 dtE
+cfc
+cfc
+cfc
+cfc
+cfc
+cfc
+cfc
 dtE
-abq
-dtE
-dtE
-jXS
-sQA
-oaI
-wZL
 dtE
 dtE
 aaa
@@ -105709,11 +106183,17 @@ dbA
 crG
 bZP
 xkD
-dtE
+cGo
 qAh
-cHm
+wjw
 cFF
-dtE
+cfc
+wCR
+rIG
+roE
+qRd
+cLS
+bZU
 aaa
 aaa
 abq
@@ -105721,12 +106201,6 @@ aaa
 aaa
 aaa
 aaa
-abq
-aaa
-aaa
-aaa
-aaa
-aaa
 aaa
 chx
 aaa
@@ -105966,21 +106440,21 @@ dbA
 crG
 bZP
 ckt
-dtE
+cGo
 hkf
 vmq
 cBC
-dtE
-aaa
-aaa
-abq
-abq
+cfc
+uiY
+gui
+wXo
+dkQ
 cTz
-esm
-abq
-abq
+bZU
 aaa
 aaa
+abq
+aaa
 aaa
 aaa
 aaa
@@ -106223,11 +106697,17 @@ dbA
 crG
 bZP
 bZP
-dtE
+cGo
 kMZ
 bUY
 dYX
-dtE
+cfc
+wCR
+vpd
+soQ
+bZk
+hdN
+bZU
 aaa
 aaa
 abq
@@ -106235,12 +106715,6 @@ aaa
 aaa
 aaa
 aaa
-abq
-aaa
-aaa
-aaa
-aaa
-aaa
 pBu
 cpd
 kgf
@@ -106484,14 +106958,14 @@ cGo
 dtE
 xZS
 dtE
-dtE
-abq
+cfc
+bZU
+bZU
+arN
+bZU
+bZU
 bZU
 bZU
-scP
-scP
-scP
-scP
 bZU
 bZU
 aaa
@@ -106742,8 +107216,8 @@ xPC
 jWr
 vVr
 cfc
-bZU
-bZU
+ced
+chy
 eGd
 ciP
 ciP
@@ -107000,7 +107474,7 @@ jFX
 cYX
 cGn
 cKD
-ciP
+tPF
 wMw
 chy
 chy
@@ -107252,9 +107726,9 @@ uoQ
 fNr
 fau
 cGo
-xPC
+jrd
 cLi
-vVr
+swi
 cfc
 ken
 czw