diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index 3b879a49621..db991b4e6ea 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -41224,6 +41224,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/closet/secure_closet/xenobiologist,
 /turf/simulated/floor/plasteel,
 /area/station/science/xenobiology)
 "ddG" = (
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index 624d4f52009..0a849464e2d 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -26122,8 +26122,8 @@
 /obj/structure/sign/electricshock{
 	pixel_y = -32
 	},
-/obj/structure/reagent_dispensers/watertank/high,
 /obj/effect/turf_decal/tiles/department/science,
+/obj/structure/closet/secure_closet/xenobiologist,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
 "ewC" = (
@@ -53342,6 +53342,7 @@
 "kvs" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/effect/turf_decal/tiles/department/science/corner,
+/obj/structure/reagent_dispensers/watertank/high,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
 "kvu" = (
@@ -79536,6 +79537,7 @@
 	network = list("SS13","RD")
 	},
 /obj/effect/turf_decal/tiles/department/science,
+/obj/structure/closet/secure_closet/xenobiologist,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
 "qqb" = (
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 7185ede2de0..1e0ce6f7146 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -4918,17 +4918,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/fore2)
-"axa" = (
-/obj/structure/chair/sofa/left{
-	color = "#6ae226";
-	dir = 8
-	},
-/obj/effect/landmark/start/virologist,
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "axb" = (
 /obj/effect/spawner/random/fungus/frequent,
 /turf/simulated/wall,
@@ -17994,6 +17983,15 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/fore/east)
+"bwl" = (
+/obj/structure/chair/sofa/corner{
+	color = "#6ae226"
+	},
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 5
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "bwm" = (
 /obj/effect/turf_decal/tiles/neutral/corner{
 	dir = 8
@@ -21452,31 +21450,6 @@
 /obj/machinery/firealarm/directional/north,
 /turf/simulated/floor/plasteel/dark,
 /area/station/command/office/ce)
-"bIw" = (
-/obj/structure/table/glass,
-/obj/item/storage/box/iv_bags{
-	pixel_x = 4;
-	pixel_y = 4
-	},
-/obj/item/storage/box/beakers{
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/obj/item/storage/box/syringes,
-/obj/structure/sign/vacuum{
-	pixel_y = -32
-	},
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/camera{
-	c_tag = "Virology Lab";
-	network = list("SS13","Medical");
-	dir = 1
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 6
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "bIx" = (
 /obj/machinery/drone_fabricator,
 /obj/effect/turf_decal/tiles/department/engineering/side{
@@ -37306,22 +37279,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/science/xenobiology)
-"cNl" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/extinguisher_cabinet{
-	name = "custom placement";
-	pixel_x = 25;
-	pixel_y = 30
-	},
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 1
-	},
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel/white,
-/area/station/science/xenobiology)
 "cNm" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -37775,11 +37732,6 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/structure/extinguisher_cabinet{
-	name = "custom placement";
-	pixel_x = -25;
-	pixel_y = 30
-	},
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
@@ -38226,16 +38178,6 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
-"cQO" = (
-/obj/item/kirbyplants/large,
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/effect/turf_decal/tiles/department/science/side{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/science/xenobiology)
 "cQP" = (
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 1
@@ -38861,11 +38803,6 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
-"cTy" = (
-/obj/machinery/light,
-/obj/effect/turf_decal/tiles/department/science/side,
-/turf/simulated/floor/plasteel/white,
-/area/station/science/xenobiology)
 "cTz" = (
 /obj/effect/turf_decal/tiles/department/science/side,
 /turf/simulated/floor/plasteel/white,
@@ -46389,6 +46326,10 @@
 /obj/structure/chair,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft/south)
+"dFF" = (
+/obj/structure/sign/biohazard,
+/turf/simulated/wall/r_wall,
+/area/station/medical/medbay)
 "dFG" = (
 /turf/simulated/wall/r_wall,
 /area/station/medical/virology)
@@ -47175,7 +47116,6 @@
 /obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 8
 	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "dLf" = (
@@ -47514,6 +47454,12 @@
 /obj/effect/turf_decal/tiles/department/science/side,
 /turf/simulated/floor/plasteel/dark,
 /area/station/science/robotics)
+"dOd" = (
+/obj/effect/turf_decal/tiles/department/virology/corner{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "dOq" = (
 /obj/machinery/newscaster/directional/south,
 /turf/simulated/floor/plasteel/dark,
@@ -48836,25 +48782,6 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/structure/extinguisher_cabinet{
-	name = "custom placement";
-	pixel_x = 25;
-	pixel_y = -30
-	},
-/obj/effect/turf_decal/delivery/hollow,
-/turf/simulated/floor/plasteel/white,
-/area/station/science/xenobiology)
-"dWs" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/extinguisher_cabinet{
-	name = "custom placement";
-	pixel_x = -25;
-	pixel_y = -30
-	},
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
@@ -49354,10 +49281,6 @@
 	},
 /turf/space,
 /area/space)
-"dZw" = (
-/obj/structure/sign/biohazard,
-/turf/simulated/wall/r_wall,
-/area/station/medical/medbay)
 "dZE" = (
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plasteel{
@@ -51017,12 +50940,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
-"eEY" = (
-/obj/structure/bed/dogbed,
-/mob/living/basic/mouse/white/brain,
-/obj/effect/turf_decal/tiles/department/virology/side,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "eFp" = (
 /obj/machinery/computer/atmoscontrol{
 	dir = 4
@@ -51641,6 +51558,29 @@
 /obj/effect/spawner/window/reinforced/grilled,
 /turf/simulated/floor/plating,
 /area/station/hallway/primary/aft/south)
+"eQz" = (
+/obj/machinery/access_button{
+	autolink_id = "virolab_btn_ext";
+	layer = 3.6;
+	name = "Virology Lab Access Button";
+	pixel_x = -24;
+	req_access = list(39)
+	},
+/obj/machinery/door/airlock/virology{
+	autoclose = 0;
+	id_tag = "virolab_door_ext";
+	locked = 1;
+	name = "Virology Lab External Airlock"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/medbay)
 "eQB" = (
 /obj/structure/cable/extra_insulated{
 	icon_state = "1-2"
@@ -53222,6 +53162,10 @@
 /obj/effect/turf_decal/tiles/department/engineering/corner,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/port/north)
+"fBW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "fCA" = (
 /obj/structure/sign/securearea{
 	desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
@@ -53360,6 +53304,13 @@
 /obj/effect/turf_decal/delivery/red/hollow,
 /turf/simulated/floor/plasteel/dark,
 /area/station/security/armory/secure)
+"fEG" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 8
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "fEY" = (
 /obj/machinery/alarm/directional/north,
 /turf/simulated/floor/wood,
@@ -53960,6 +53911,14 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
+"fPb" = (
+/obj/structure/table,
+/obj/item/clothing/mask/gas,
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 9
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "fPx" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -54521,6 +54480,14 @@
 /obj/effect/turf_decal/tiles/department/medical/side,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/surgery/primary)
+"gaP" = (
+/obj/effect/turf_decal/tiles/department/science,
+/obj/structure/closet/firecloset,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/science/xenobiology)
 "gaZ" = (
 /obj/item/radio/intercom{
 	name = "north bump";
@@ -54843,15 +54810,6 @@
 /obj/effect/turf_decal/tiles/neutral/side,
 /turf/simulated/floor/plasteel,
 /area/station/public/fitness)
-"giV" = (
-/obj/structure/chair/sofa/corner{
-	color = "#6ae226"
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 5
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "gjk" = (
 /obj/machinery/door/firedoor,
 /obj/effect/mapping_helpers/airlock/autoname,
@@ -55142,6 +55100,12 @@
 	},
 /turf/simulated/floor/engine,
 /area/station/engineering/controlroom)
+"gqG" = (
+/obj/effect/turf_decal/tiles/department/science,
+/obj/structure/closet/secure_closet/xenobiologist,
+/obj/machinery/light,
+/turf/simulated/floor/plasteel/white,
+/area/station/science/xenobiology)
 "gqP" = (
 /obj/machinery/economy/slot_machine,
 /turf/simulated/floor/plating,
@@ -56755,6 +56719,21 @@
 /obj/machinery/alarm/directional/west,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
+"hfU" = (
+/obj/structure/table/glass,
+/obj/item/clothing/gloves/color/latex{
+	pixel_y = 6
+	},
+/obj/item/clothing/glasses/hud/health{
+	pixel_y = 3
+	},
+/obj/item/healthanalyzer,
+/obj/item/storage/belt/medical,
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "hgo" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -59186,6 +59165,13 @@
 /obj/machinery/newscaster/directional/north,
 /turf/simulated/floor/carpet/grimey,
 /area/station/public/vacant_office)
+"imG" = (
+/obj/structure/table/glass,
+/obj/machinery/computer/med_data/laptop{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "imL" = (
 /obj/structure/chair/sofa/corp/left{
 	dir = 8
@@ -61809,13 +61795,6 @@
 /obj/effect/turf_decal/tiles/department/security,
 /turf/simulated/floor/plasteel,
 /area/station/security/processing)
-"jrW" = (
-/obj/item/kirbyplants/large,
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 10
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "jsh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -62759,6 +62738,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/security/permabrig)
+"jQA" = (
+/obj/item/kirbyplants/large,
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 10
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "jQN" = (
 /obj/machinery/door/poddoor{
 	density = 0;
@@ -63584,11 +63570,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/electrical/aft_starboard)
-"kiU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/turf_decal/tiles/department/virology/side,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "kiW" = (
 /obj/structure/extinguisher_cabinet{
 	name = "east bump";
@@ -64512,16 +64493,6 @@
 /obj/structure/cable,
 /turf/simulated/floor/wood,
 /area/station/legal/courtroom)
-"kFG" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/syringe/antiviral,
-/obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/dropper/precision,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tiles/department/virology/side,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "kFS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -66570,20 +66541,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fore2)
-"lyR" = (
-/obj/machinery/door/airlock/virology/glass{
-	name = "Workstation"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "lzN" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/cable/yellow{
@@ -67077,17 +67034,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
-"lKY" = (
-/obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
-/obj/structure/reagent_dispensers/virusfood{
-	pixel_x = -30
-	},
-/obj/machinery/requests_console/directional/south,
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 10
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "lLN" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -67534,15 +67480,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/south)
-"lXn" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "lXp" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -68052,12 +67989,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/engineering/transmission_laser)
-"mjG" = (
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "mjS" = (
 /obj/structure/weightmachine/stacklifter,
 /obj/machinery/camera{
@@ -68363,13 +68294,6 @@
 "mpZ" = (
 /turf/simulated/floor/carpet/purple,
 /area/station/medical/psych)
-"mqc" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/tiles/department/virology/side,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "mqk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -68622,13 +68546,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/apmaint)
-"mtU" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/effect/turf_decal/tiles/department/virology/side,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "mtV" = (
 /obj/structure/shelf/service,
 /obj/item/storage/box/lights/mixed,
@@ -69105,6 +69022,15 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/port)
+"mJw" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 8
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "mJU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable{
@@ -70181,6 +70107,15 @@
 /obj/effect/spawner/random/fungus/frequent,
 /turf/simulated/wall,
 /area/station/maintenance/abandoned_garden)
+"ncB" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "ncZ" = (
 /obj/effect/turf_decal/tiles/department/security/corner{
 	dir = 1
@@ -70468,6 +70403,17 @@
 /obj/effect/turf_decal/tiles/department/security,
 /turf/simulated/floor/plasteel/dark,
 /area/station/security/prisonershuttle)
+"njF" = (
+/obj/structure/chair/sofa/left{
+	color = "#6ae226";
+	dir = 8
+	},
+/obj/effect/landmark/start/virologist,
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "njU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -71527,15 +71473,6 @@
 	},
 /turf/simulated/floor/engine,
 /area/station/engineering/controlroom)
-"nIf" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "nIr" = (
 /obj/item/clothing/glasses/sunglasses,
 /obj/structure/table/wood,
@@ -71832,12 +71769,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel/dark,
 /area/station/maintenance/apmaint)
-"nQW" = (
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "nQX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -71911,6 +71842,13 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/service/bar)
+"nSq" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/effect/turf_decal/tiles/department/virology/side,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "nSv" = (
 /obj/machinery/economy/vending/cola,
 /obj/effect/turf_decal/delivery,
@@ -73671,12 +73609,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/station/medical/coldroom)
-"oBT" = (
-/obj/effect/turf_decal/tiles/department/virology/corner{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "oCh" = (
 /obj/structure/sign/securearea{
 	desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
@@ -73684,6 +73616,13 @@
 	},
 /turf/simulated/wall,
 /area/station/hallway/secondary/entry/east)
+"oCp" = (
+/obj/machinery/economy/vending/virodrobe,
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 9
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "oCK" = (
 /obj/item/radio/intercom{
 	name = "north bump";
@@ -74367,13 +74306,6 @@
 	temperature = 80
 	},
 /area/station/science/xenobiology)
-"oSp" = (
-/obj/structure/table/glass,
-/obj/machinery/computer/med_data/laptop{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "oSN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -75554,11 +75486,13 @@
 /obj/effect/turf_decal/tiles/neutral,
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft/south)
-"psE" = (
-/obj/structure/table,
-/obj/item/clothing/mask/gas,
+"psH" = (
+/obj/structure/closet/crate/freezer/iv_storage,
+/obj/machinery/light{
+	dir = 1
+	},
 /obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 9
+	dir = 5
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
@@ -75770,21 +75704,6 @@
 /obj/effect/turf_decal/tiles/department/security/corner,
 /turf/simulated/floor/plasteel/dark,
 /area/station/security/prisonershuttle)
-"pzu" = (
-/obj/structure/table/glass,
-/obj/item/storage/fancy/donut_box{
-	pixel_x = -3;
-	pixel_y = 5
-	},
-/obj/item/storage/box/donkpockets,
-/obj/machinery/camera{
-	c_tag = "Virology Break Room";
-	dir = 10;
-	network = list("Medical","SS13")
-	},
-/obj/effect/turf_decal/tiles/department/virology/side,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "pzy" = (
 /obj/machinery/door/firedoor,
 /obj/structure/table/reinforced,
@@ -76270,10 +76189,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/solar_maintenance/fore_starboard)
-"pIP" = (
-/obj/effect/turf_decal/tiles/department/virology/side,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "pIS" = (
 /obj/structure/table/wood,
 /obj/item/storage/fancy/cigarettes/cigpack_random{
@@ -77009,15 +76924,6 @@
 	},
 /turf/simulated/floor/mineral/titanium/blue,
 /area/shuttle/pod_2)
-"pZA" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "pZI" = (
 /obj/structure/safe{
 	known_by = list("captain")
@@ -77234,6 +77140,13 @@
 	icon_state = "showroomfloor"
 	},
 /area/station/medical/surgery)
+"qfH" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/tiles/department/virology/side,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "qgd" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -77469,16 +77382,26 @@
 /area/station/science/research)
 "qkN" = (
 /obj/structure/table/glass,
-/obj/item/clothing/gloves/color/latex{
-	pixel_y = 6
+/obj/item/storage/box/iv_bags{
+	pixel_x = 4;
+	pixel_y = 4
 	},
-/obj/item/clothing/glasses/hud/health{
-	pixel_y = 3
+/obj/item/storage/box/beakers{
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/obj/item/storage/box/syringes,
+/obj/structure/sign/vacuum{
+	pixel_y = -32
+	},
+/obj/machinery/firealarm/directional/east,
+/obj/machinery/camera{
+	c_tag = "Virology Lab";
+	network = list("SS13","Medical");
+	dir = 1
 	},
-/obj/item/healthanalyzer,
-/obj/item/storage/belt/medical,
 /obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 4
+	dir = 6
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
@@ -77974,6 +77897,13 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/storage)
+"qyb" = (
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 4
+	},
+/mob/living/carbon/human/monkey,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "qyi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
@@ -78314,6 +78244,7 @@
 /area/station/service/chapel/office)
 "qGc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/turf_decal/tiles/department/virology/side,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "qGf" = (
@@ -78723,7 +78654,6 @@
 /obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 4
 	},
-/mob/living/carbon/human/monkey,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "qPT" = (
@@ -79193,6 +79123,11 @@
 /obj/effect/turf_decal/tiles/neutral,
 /turf/simulated/floor/plasteel,
 /area/station/supply/qm)
+"qYo" = (
+/obj/machinery/light,
+/obj/effect/turf_decal/tiles/department/virology/side,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "qYL" = (
 /obj/effect/spawner/window/reinforced/grilled,
 /obj/structure/transit_tube/horizontal,
@@ -79353,6 +79288,12 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/security/prisonershuttle)
+"rbC" = (
+/obj/structure/bed/dogbed,
+/mob/living/basic/mouse/white/brain,
+/obj/effect/turf_decal/tiles/department/virology/side,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "rbD" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -79443,6 +79384,21 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/command/office/ntrep)
+"rdA" = (
+/obj/structure/table/glass,
+/obj/item/storage/fancy/donut_box{
+	pixel_x = -3;
+	pixel_y = 5
+	},
+/obj/item/storage/box/donkpockets,
+/obj/machinery/camera{
+	c_tag = "Virology Break Room";
+	dir = 10;
+	network = list("Medical","SS13")
+	},
+/obj/effect/turf_decal/tiles/department/virology/side,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "rdF" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -83143,6 +83099,16 @@
 	icon_state = "freezerfloor"
 	},
 /area/station/security/permabrig)
+"sAa" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/syringe/antiviral,
+/obj/item/reagent_containers/dropper,
+/obj/item/reagent_containers/dropper/precision,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/tiles/department/virology/side,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "sAq" = (
 /obj/structure/table,
 /obj/item/storage/fancy/cigarettes/cigpack_our_brand{
@@ -87908,29 +87874,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry/south)
-"urz" = (
-/obj/machinery/access_button{
-	autolink_id = "virolab_btn_ext";
-	layer = 3.6;
-	name = "Virology Lab Access Button";
-	pixel_x = -24;
-	req_access = list(39)
-	},
-/obj/machinery/door/airlock/virology{
-	autoclose = 0;
-	id_tag = "virolab_door_ext";
-	locked = 1;
-	name = "Virology Lab External Airlock"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/medbay)
 "urW" = (
 /obj/structure/cable/extra_insulated{
 	icon_state = "4-8"
@@ -87985,6 +87928,15 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/medbay)
+"uuh" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "uvp" = (
 /obj/structure/sink/kitchen/directional/north,
 /turf/simulated/floor/plasteel{
@@ -89353,6 +89305,26 @@
 /obj/effect/turf_decal/tiles/neutral,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/atmos)
+"uZh" = (
+/obj/machinery/door_control{
+	id = "viroshutters";
+	name = "Privacy Shutters Control";
+	pixel_x = -6;
+	pixel_y = 8
+	},
+/obj/item/hand_labeler{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 8
+	},
+/obj/structure/table/reinforced,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "uZj" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Tech Storage"
@@ -89582,6 +89554,12 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/fore)
+"veV" = (
+/obj/machinery/atmospherics/binary/valve{
+	dir = 4
+	},
+/turf/simulated/floor/plating,
+/area/station/medical/virology)
 "vfh" = (
 /obj/effect/turf_decal,
 /obj/machinery/atmospherics/portable/scrubber/huge,
@@ -90361,13 +90339,6 @@
 /obj/machinery/light/floor,
 /turf/simulated/floor/plating,
 /area/station/hallway/secondary/entry/north)
-"vwR" = (
-/obj/machinery/economy/vending/virodrobe,
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 9
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "vxk" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -90440,6 +90411,12 @@
 /obj/effect/mapping_helpers/airlock/access/all/engineering/general,
 /turf/simulated/floor/plating,
 /area/station/maintenance/solar_maintenance/fore_starboard)
+"vzp" = (
+/obj/effect/turf_decal/tiles/department/science,
+/obj/machinery/light,
+/obj/structure/closet/secure_closet/xenobiologist,
+/turf/simulated/floor/plasteel/white,
+/area/station/science/xenobiology)
 "vzs" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 4
@@ -91488,6 +91465,20 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/hallway/secondary/exit)
+"vTs" = (
+/obj/machinery/door/airlock/virology/glass{
+	name = "Workstation"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "vTw" = (
 /obj/structure/chair/sofa/bench/left,
 /obj/effect/turf_decal/tiles/department/medical/checker,
@@ -91610,6 +91601,14 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
+"vWs" = (
+/obj/effect/turf_decal/tiles/department/science,
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/item/kirbyplants/large,
+/turf/simulated/floor/plasteel/white,
+/area/station/science/xenobiology)
 "vWy" = (
 /obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 9
@@ -91899,6 +91898,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/fsmaint)
+"wdL" = (
+/obj/effect/turf_decal/tiles/department/virology/side,
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "wdS" = (
 /obj/machinery/firealarm/directional/south,
 /obj/structure/cable{
@@ -91973,12 +91976,6 @@
 /obj/item/hand_labeler,
 /turf/simulated/floor/plasteel/dark,
 /area/station/security/evidence)
-"wfK" = (
-/obj/machinery/atmospherics/binary/valve{
-	dir = 4
-	},
-/turf/simulated/floor/plating,
-/area/station/medical/virology)
 "wfO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
@@ -94186,23 +94183,11 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "wWX" = (
-/obj/machinery/door_control{
-	id = "viroshutters";
-	name = "Privacy Shutters Control";
-	pixel_x = -6;
-	pixel_y = 8
-	},
-/obj/item/hand_labeler{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
+/obj/machinery/pandemic,
+/obj/effect/turf_decal/delivery/green,
 /obj/effect/turf_decal/tiles/department/virology/side{
 	dir = 8
 	},
-/obj/structure/table/reinforced,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
 "wXn" = (
@@ -94981,11 +94966,6 @@
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/starboard)
-"xlX" = (
-/obj/machinery/light,
-/obj/effect/turf_decal/tiles/department/virology/side,
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "xme" = (
 /obj/structure/chair/sofa/corp/left{
 	dir = 4
@@ -95801,10 +95781,13 @@
 /turf/simulated/floor/plasteel,
 /area/station/maintenance/port)
 "xES" = (
-/obj/machinery/pandemic,
-/obj/effect/turf_decal/delivery/green,
+/obj/machinery/smartfridge/secure/chemistry/virology/preloaded,
+/obj/structure/reagent_dispensers/virusfood{
+	pixel_x = -30
+	},
+/obj/machinery/requests_console/directional/south,
 /obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 8
+	dir = 10
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
@@ -96521,6 +96504,19 @@
 	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/virology)
+"xUg" = (
+/obj/structure/table,
+/obj/item/storage/box/syringes,
+/obj/item/storage/box/monkeycubes,
+/obj/machinery/camera{
+	c_tag = "Virology Pen";
+	network = list("SS13","Medical")
+	},
+/obj/effect/turf_decal/tiles/department/virology/side{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/medical/virology)
 "xUl" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -96592,16 +96588,6 @@
 /obj/structure/flora/ausbushes/ppflowers,
 /turf/simulated/floor/grass,
 /area/station/service/kitchen)
-"xVV" = (
-/obj/structure/closet/crate/freezer/iv_storage,
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 5
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "xVX" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -96693,19 +96679,6 @@
 	},
 /turf/simulated/floor/engine/plasma,
 /area/station/engineering/atmos)
-"xZc" = (
-/obj/structure/table,
-/obj/item/storage/box/syringes,
-/obj/item/storage/box/monkeycubes,
-/obj/machinery/camera{
-	c_tag = "Virology Pen";
-	network = list("SS13","Medical")
-	},
-/obj/effect/turf_decal/tiles/department/virology/side{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel/white,
-/area/station/medical/virology)
 "xZj" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -126835,14 +126808,14 @@ dmq
 cIL
 cIL
 cIL
-cIL
 cOT
+gaP
 cQP
 cRX
-cTy
+cTz
+vzp
 cOW
 cIL
-cIL
 daD
 cIL
 qul
@@ -127097,7 +127070,7 @@ cQL
 cQP
 cSd
 cTz
-dWs
+dWp
 vgp
 cYi
 cIM
@@ -127607,7 +127580,7 @@ cIM
 cIM
 cLR
 jVR
-cNl
+cQI
 cQP
 cSd
 cTz
@@ -127863,16 +127836,16 @@ dmq
 cIL
 cIL
 cIL
-cIL
 cOW
-cQO
+vWs
+cQP
 cRX
 cTz
+gqG
 cOT
 cIL
 cIL
 cIL
-cIL
 qul
 tGY
 juA
@@ -144091,7 +144064,7 @@ aKE
 tzg
 aKE
 auO
-urz
+eQz
 dNu
 nZk
 gLq
@@ -144348,7 +144321,7 @@ unq
 rfa
 oRe
 fXw
-dZw
+dFF
 tpR
 cBf
 pax
@@ -144865,7 +144838,7 @@ yeb
 rZl
 kTY
 cBf
-jrW
+jQA
 dGw
 dJJ
 hDw
@@ -145379,7 +145352,7 @@ suJ
 rZl
 kGo
 dPU
-eEY
+rbC
 dGw
 dGw
 oKO
@@ -145636,7 +145609,7 @@ mNF
 rZl
 mkH
 dPU
-pIP
+wdL
 dGw
 eeq
 pgP
@@ -145893,20 +145866,20 @@ sds
 rZl
 qBj
 dPU
-xlX
+qYo
 dGw
 vDR
 dWX
 pcJ
 oaI
 xJo
-pIP
+wdL
 vWy
 jDT
 ebB
+uZh
 wWX
 xES
-lKY
 dFG
 abj
 abj
@@ -146150,7 +146123,7 @@ tAC
 rZl
 rEg
 dPU
-mtU
+nSq
 dGw
 sia
 myW
@@ -146162,8 +146135,8 @@ dNn
 wYx
 mXf
 tOS
+fBW
 qGc
-kiU
 oWo
 rEn
 oTr
@@ -146407,7 +146380,7 @@ abj
 dFG
 dvR
 dPU
-pIP
+wdL
 dGw
 dGw
 dNr
@@ -146420,7 +146393,7 @@ kMN
 dWX
 ezr
 wWW
-mqc
+qfH
 sRk
 uNq
 acF
@@ -146664,10 +146637,10 @@ aaa
 dFG
 mvd
 dPU
-oBT
+dOd
 uBB
-pZA
-mjG
+mJw
+dLe
 mYt
 jjB
 jhr
@@ -146677,7 +146650,7 @@ lVl
 tqY
 mrs
 cEB
-kFG
+sAa
 wkW
 pqY
 pDw
@@ -146923,18 +146896,18 @@ xOG
 adX
 qTE
 jGI
-lXn
+ncB
 mcy
 xTt
 qsg
 mJU
-lyR
+vTs
 gfJ
 miC
 ipg
 sMn
+hfU
 qkN
-bIw
 dFG
 abj
 abj
@@ -147180,10 +147153,10 @@ hDq
 sKx
 gBx
 qiP
-nQW
-nQW
+qPN
+qPN
 pcJ
-nQW
+qPN
 oJi
 fdp
 dGw
@@ -147443,8 +147416,8 @@ scc
 dNr
 dGw
 dGw
-psE
-dLe
+fPb
+fEG
 gbQ
 pAB
 dFG
@@ -147694,13 +147667,13 @@ mpL
 fYc
 hPN
 dGw
-vwR
-mjG
+oCp
+dLe
 pcJ
-mjG
+dLe
 svD
 dGw
-xZc
+xUg
 vqa
 dPU
 vVX
@@ -147948,7 +147921,7 @@ abj
 abj
 dFG
 vQS
-wfK
+veV
 qmB
 dGw
 wro
@@ -147957,7 +147930,7 @@ liE
 dWX
 mJY
 dGw
-nIf
+uuh
 eoJ
 pGL
 rYa
@@ -148209,13 +148182,13 @@ reh
 opY
 dGw
 uZp
-oSp
+imG
 tig
 mXf
-pzu
+rdA
 dGw
-xVV
-qPN
+psH
+qyb
 rHX
 hDu
 dFG
@@ -148465,8 +148438,8 @@ pUL
 pUL
 ssx
 dGw
-giV
-axa
+bwl
+njF
 dMx
 sYf
 rOl
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
index 62cf339a7d6..8343dbf3551 100644
--- a/_maps/map_files/stations/emeraldstation.dmm
+++ b/_maps/map_files/stations/emeraldstation.dmm
@@ -22922,6 +22922,7 @@
 /obj/item/clothing/glasses/science,
 /obj/item/clothing/glasses/science,
 /obj/effect/turf_decal/tiles/department/science/corner,
+/obj/item/storage/belt/medical/surgery,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
 "eGv" = (
@@ -23858,6 +23859,13 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/station/command/bridge)
+"eRa" = (
+/obj/effect/turf_decal/tiles/department/science/side,
+/obj/machinery/processor{
+	name = "Slime Processor"
+	},
+/turf/simulated/floor/plasteel/white,
+/area/station/science/xenobiology)
 "eRc" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -59929,12 +59937,10 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/central/sw)
 "mhu" = (
-/obj/machinery/processor{
-	name = "Slime Processor"
-	},
 /obj/effect/turf_decal/tiles/department/science/corner{
 	dir = 1
 	},
+/obj/structure/closet/secure_closet/xenobiologist,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
 "mhv" = (
@@ -76176,10 +76182,6 @@
 /turf/simulated/floor/plasteel/white,
 /area/station/science/robotics)
 "pps" = (
-/obj/structure/table,
-/obj/machinery/reagentgrinder{
-	pixel_y = 5
-	},
 /obj/machinery/light{
 	dir = 4
 	},
@@ -76189,6 +76191,7 @@
 /obj/effect/turf_decal/tiles/department/science/corner{
 	dir = 4
 	},
+/obj/structure/closet/secure_closet/xenobiologist,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
 "ppt" = (
@@ -107588,12 +107591,13 @@
 	pixel_y = 24;
 	pixel_x = 10
 	},
-/obj/structure/table,
-/obj/item/storage/belt/medical/surgery,
-/obj/item/reagent_containers/glass/bottle/reagent/morphine,
 /obj/effect/turf_decal/tiles/department/science/corner{
 	dir = 4
 	},
+/obj/structure/table,
+/obj/machinery/reagentgrinder{
+	pixel_y = 5
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
 "vFm" = (
@@ -116077,6 +116081,10 @@
 /obj/effect/turf_decal/tiles/department/science/corner{
 	dir = 1
 	},
+/obj/item/reagent_containers/glass/bottle/reagent/morphine{
+	pixel_x = -6;
+	pixel_y = 6
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
 "xrO" = (
@@ -168893,7 +168901,7 @@ mzC
 cte
 mzC
 nlT
-mzC
+eRa
 lpZ
 yfA
 lDv
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index c50df5d3e4f..b246aaaf47a 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -25191,12 +25191,12 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/aft/south)
 "cEn" = (
-/obj/structure/closet/secure_closet/scientist,
 /obj/machinery/newscaster/directional/south,
 /obj/effect/turf_decal/stripes/line,
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 8
 	},
+/obj/structure/closet/secure_closet/xenobiologist,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
 "cEt" = (
@@ -35606,7 +35606,7 @@
 /area/station/engineering/break_room)
 "fbq" = (
 /obj/effect/turf_decal/stripes/line,
-/obj/machinery/smithing/scientific_assembler,
+/obj/structure/closet/secure_closet/xenobiologist,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
 "fbr" = (
@@ -58676,6 +58676,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
+/obj/structure/closet/bombcloset,
 /turf/simulated/floor/plasteel/white,
 /area/station/science/xenobiology)
 "nlt" = (
@@ -83369,10 +83370,10 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/structure/closet/bombcloset,
 /obj/effect/turf_decal/tiles/department/science/side{
 	dir = 1
 	},
+/obj/machinery/smithing/scientific_assembler,
 /turf/simulated/floor/plasteel,
 /area/station/science/xenobiology)
 "wsn" = (
diff --git a/code/game/jobs/job/science_jobs.dm b/code/game/jobs/job/science_jobs.dm
index 76b282f2684..74d33b28fd7 100644
--- a/code/game/jobs/job/science_jobs.dm
+++ b/code/game/jobs/job/science_jobs.dm
@@ -159,7 +159,7 @@
 	shoes = /obj/item/clothing/shoes/white
 	gloves = /obj/item/clothing/gloves/color/latex/nitrile
 	glasses = /obj/item/clothing/glasses/science
-	l_ear = /obj/item/radio/headset/headset_sci
+	l_ear = /obj/item/radio/headset/headset_xenobio
 	id = /obj/item/card/id/xenobiology
 	pda = /obj/item/pda/toxins
 
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 190b63c83e4..dc399cc24fb 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -85,6 +85,11 @@
 	icon_state = "sci_cypherkey"
 	channels = list("Science" = 1)
 
+/obj/item/encryptionkey/headset_xenobio
+	name = "Xenobiology Radio Encryption Key"
+	icon_state = "xenobio_cypherkey"
+	channels = list("Science" = 1, "Supply" = 0)
+
 /obj/item/encryptionkey/headset_medsci
 	name = "Medical Research Radio Encryption Key"
 	icon_state = "medsci_cypherkey"
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 488d2fb0e22..cd3cd5310ca 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -198,6 +198,12 @@
 	icon_state = "sci_headset"
 	ks2type = /obj/item/encryptionkey/headset_sci
 
+/obj/item/radio/headset/headset_xenobio
+	name = "xenobiology radio headset"
+	desc = "A science headset, now with weather updates."
+	icon_state = "xenobio_headset"
+	ks2type = /obj/item/encryptionkey/headset_xenobio
+
 /obj/item/radio/headset/headset_medsci
 	name = "medical research radio headset"
 	desc = "A headset that is a result of the mating between medical and science."
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index d1b934b210f..0fd05a5385c 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -18,6 +18,25 @@
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/clothing/shoes/sandal/white(src)
 
+/obj/structure/closet/secure_closet/xenobiologist
+	name = "xenobiologists's locker"
+	req_access = list(ACCESS_XENOBIOLOGY)
+	icon_state = "xenobiology"
+	opened_door_sprite = "white_secure"
+
+/obj/structure/closet/secure_closet/xenobiologist/populate_contents()
+	new /obj/item/storage/backpack/science(src)
+	new /obj/item/storage/backpack/satchel_tox(src)
+	new /obj/item/clothing/under/rank/rnd/scientist(src)
+	new /obj/item/clothing/under/rank/rnd/scientist/skirt(src)
+	new /obj/item/clothing/suit/storage/labcoat/science(src)
+	new /obj/item/radio/headset/headset_xenobio(src)
+	new /obj/item/tank/internals/air(src)
+	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/shoes/sandal/white(src)
+
+
 /obj/structure/closet/secure_closet/roboticist
 	name = "roboticist's locker"
 	req_access = list(ACCESS_ROBOTICS)
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index 6a6817d8b25..7b23a5c496f 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi
index e393fe1e31a..396edc175a2 100644
Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ