diff --git a/_maps/map_files/nova/nova.dmm b/_maps/map_files/nova/nova.dmm
index 048638bd1df..ca552eebf97 100644
--- a/_maps/map_files/nova/nova.dmm
+++ b/_maps/map_files/nova/nova.dmm
@@ -6202,6 +6202,11 @@
 	dir = 8;
 	pixel_x = 24
 	},
+/obj/machinery/camera{
+	c_tag = "Research West Hallway 2";
+	network = list("Research","SS13");
+	dir = 9
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "whitepurple";
@@ -9469,7 +9474,8 @@
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/effect/decal/warning_stripes/east,
 /turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
+	icon_state = "redfull";
+	tag = "icon-redfull (NORTHWEST)"
 	},
 /area/atmos)
 "bso" = (
@@ -11848,8 +11854,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/maintcentral)
 "bIu" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+	icon_state = "yellowcorner"
+	},
 /area/maintenance/apmaint)
 "bIw" = (
 /obj/machinery/door/airlock/public/glass{
@@ -20184,11 +20193,6 @@
 /obj/structure/sign/xenobio{
 	pixel_x = 32
 	},
-/obj/machinery/camera{
-	c_tag = "Research East Hallway";
-	dir = 8;
-	network = list("Research","SS13")
-	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "whitepurple"
@@ -27518,6 +27522,9 @@
 	name = "Труба дыхательной смеси"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "yellow"
@@ -28423,6 +28430,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/maintenance/fore)
+"efz" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/random{
+	pixel_x = 32
+	},
+/turf/simulated/floor/plating,
+/area/maintenance/tourist)
 "efA" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -32915,16 +32929,13 @@
 	name = "Труба дыхательной смеси"
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc{
-	dir = 4;
-	name = "east bump";
-	pixel_x = 26
-	},
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/machinery/power/apc/worn_out{
+	cell_type = 0;
+	dir = 4;
+	pixel_x = 26
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/atmospherics)
@@ -36849,10 +36860,9 @@
 /turf/simulated/floor/plating,
 /area/maintenance/gambling_den)
 "fqA" = (
-/obj/machinery/door/airlock/maintenance,
-/obj/structure/barricade/wooden,
+/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
-/area/maintenance/apmaint)
+/area/maintenance/atmospherics)
 "fqI" = (
 /obj/item/radio/intercom{
 	pixel_x = -28
@@ -38948,6 +38958,7 @@
 /area/hallway/secondary/entry/lounge)
 "fFA" = (
 /obj/structure/table/reinforced,
+/obj/item/storage/firstaid/adv,
 /obj/item/reagent_containers/spray/cleaner/medical,
 /turf/simulated/floor/plasteel{
 	icon_state = "whitebluefull"
@@ -51733,12 +51744,8 @@
 /turf/simulated/floor/carpet,
 /area/maintenance/library)
 "hBY" = (
-/obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 1;
-	name = "standard air scrubber";
-	on = 1;
-	scrub_N2O = 1;
-	scrub_Toxins = 1
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -56948,10 +56955,10 @@
 /turf/simulated/floor/plating,
 /area/maintenance/cafeteria)
 "iqw" = (
-/obj/structure/rack,
 /obj/effect/decal/cleanable/cobweb2,
-/obj/effect/spawner/lootdrop/maintenance,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet,
+/obj/effect/spawner/lootdrop/maintenance/tripple,
 /turf/simulated/floor/plating,
 /area/maintenance/apmaint)
 "iqC" = (
@@ -67368,7 +67375,6 @@
 "jTS" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/firstaid/o2,
-/obj/item/reagent_containers/spray/cleaner/medical,
 /obj/structure/extinguisher_cabinet{
 	name = "west extinguisher cabinet";
 	pixel_x = -27
@@ -67378,6 +67384,7 @@
 	dir = 4;
 	network = list("SS13","Medical")
 	},
+/obj/item/reagent_containers/spray/cleaner/medical,
 /turf/simulated/floor/plasteel{
 	icon_state = "whitebluefull"
 	},
@@ -87537,6 +87544,11 @@
 	dir = 4;
 	pixel_x = 28
 	},
+/obj/machinery/camera{
+	c_tag = "Research East Hallway";
+	dir = 8;
+	network = list("Research","SS13")
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "whitepurple"
@@ -98563,6 +98575,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/structure/barricade/wooden,
 /turf/simulated/floor/plating,
 /area/maintenance/atmospherics)
 "oFD" = (
@@ -103108,6 +103121,13 @@
 /obj/item/reagent_containers/iv_bag/blood/BMinus,
 /obj/item/reagent_containers/iv_bag/blood/BPlus,
 /obj/item/reagent_containers/iv_bag/blood/AMinus,
+/obj/machinery/door/window/eastright{
+	base_state = "left";
+	icon_state = "left";
+	name = "Blood Bag Storage";
+	req_access = list(5);
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "whiteblue"
@@ -104984,6 +105004,9 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/atmosia_independence{
+	pixel_x = 32
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "yellowfull"
 	},
@@ -105581,7 +105604,13 @@
 	},
 /area/security/customs)
 "pFQ" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 2;
+	name = "standard air scrubber";
+	on = 1;
+	scrub_N2O = 1;
+	scrub_Toxins = 1
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
@@ -107219,10 +107248,9 @@
 	},
 /area/engineering/hardsuitstorage)
 "pSb" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/tripple,
+/obj/machinery/pipedispenser,
 /turf/simulated/floor/plating,
-/area/maintenance/apmaint)
+/area/maintenance/atmospherics)
 "pSd" = (
 /turf/simulated/floor/plasteel,
 /area/storage/primary)
@@ -107633,6 +107661,13 @@
 /obj/item/reagent_containers/iv_bag/blood/vulpkanin,
 /obj/item/reagent_containers/iv_bag/blood/wryn,
 /obj/effect/decal/warning_stripes/blue/hollow,
+/obj/machinery/door/window/eastright{
+	base_state = "left";
+	icon_state = "left";
+	name = "Blood Bag Storage";
+	req_access = list(5);
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "whiteblue"
@@ -119281,20 +119316,23 @@
 /area/maintenance/casino)
 "rFQ" = (
 /obj/structure/table,
-/obj/item/storage/box/pillbottles{
-	pixel_x = 8;
-	pixel_y = 4
+/obj/item/storage/box/syringes{
+	pixel_x = -6
+	},
+/obj/machinery/light{
+	dir = 1
 	},
 /obj/item/storage/box/pillbottles{
 	pixel_x = 8
 	},
-/obj/item/storage/box/syringes{
-	pixel_x = -6
-	},
 /obj/item/storage/box/syringes{
 	pixel_x = -6;
 	pixel_y = 4
 	},
+/obj/item/storage/box/pillbottles{
+	pixel_x = 8;
+	pixel_y = 4
+	},
 /obj/item/storage/box/autoinjectors{
 	pixel_x = -6;
 	pixel_y = 8
@@ -119303,9 +119341,6 @@
 	pixel_x = 8;
 	pixel_y = 8
 	},
-/obj/machinery/light{
-	dir = 1
-	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "whiteblue"
@@ -128607,11 +128642,6 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/camera{
-	c_tag = "Research West Hallway 2";
-	network = list("Research","SS13");
-	dir = 8
-	},
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 26
 	},
@@ -129167,10 +129197,10 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
+	dir = 6
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+	dir = 5
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -133644,6 +133674,14 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/structure/window/reinforced,
+/obj/machinery/door/window/eastright{
+	base_state = "left";
+	icon_state = "left";
+	name = "Blood Bag Storage";
+	req_access = list(5);
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "whiteblue"
@@ -139754,9 +139792,16 @@
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint2)
 "uBa" = (
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/maintenance/tourist)
+/obj/machinery/camera{
+	c_tag = "Research East Central Hallway";
+	network = list("Research","SS13");
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "whitepurple";
+	tag = "icon-whitepurple (WEST)"
+	},
+/area/medical/research)
 "uBh" = (
 /obj/structure/bookcase,
 /turf/simulated/floor/wood,
@@ -144989,6 +145034,7 @@
 /obj/structure/closet/secure_closet/hos,
 /obj/effect/decal/warning_stripes/southeast,
 /obj/item/clothing/under/fluff/soviet_casual_uniform,
+/obj/item/clothing/suit/armor/hos/alt,
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "dark"
@@ -145292,6 +145338,11 @@
 	dir = 8;
 	pixel_x = 22
 	},
+/obj/machinery/camera{
+	c_tag = "Virology";
+	dir = 8;
+	network = list("Medical","SS13")
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -152202,6 +152253,18 @@
 	dir = 1
 	},
 /area/hallway/primary/starboard/east)
+"wtA" = (
+/obj/machinery/camera{
+	c_tag = "Research West Central Hallway";
+	network = list("Research","SS13");
+	dir = 6
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitepurple";
+	tag = "icon-whitepurple (NORTH)"
+	},
+/area/medical/research/nhallway)
 "wtD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/grille/broken,
@@ -155543,7 +155606,7 @@
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/effect/decal/warning_stripes/east,
 /turf/simulated/floor/plasteel{
-	icon_state = "neutralfull"
+	icon_state = "bluefull"
 	},
 /area/atmos)
 "wVm" = (
@@ -159541,11 +159604,6 @@
 	name = "Virology Requests Console";
 	pixel_x = -30
 	},
-/obj/machinery/camera{
-	c_tag = "Virology";
-	dir = 4;
-	network = list("Medical","SS13")
-	},
 /turf/simulated/floor/plasteel,
 /area/medical/virology/lab)
 "xAc" = (
@@ -160332,11 +160390,13 @@
 /turf/simulated/floor/plasteel,
 /area/engineering/controlroom)
 "xGC" = (
-/obj/machinery/light/small{
-	dir = 8
+/obj/structure/barricade/wooden,
+/obj/machinery/door/airlock/atmos{
+	name = "Atmospherics Maintenance";
+	req_access = list(12,24)
 	},
 /turf/simulated/floor/plating,
-/area/maintenance/apmaint)
+/area/maintenance/atmospherics)
 "xGH" = (
 /obj/machinery/camera{
 	c_tag = "Perma Library";
@@ -192729,9 +192789,9 @@ qzc
 bYW
 kbA
 ttn
-psM
 ttn
-eXZ
+ttn
+ttn
 ttn
 pUn
 ttn
@@ -192986,7 +193046,7 @@ bYW
 lgX
 kbA
 ttn
-uBa
+psM
 ttn
 jNq
 ttn
@@ -193244,7 +193304,7 @@ cSJ
 kbA
 ttn
 ttn
-ttn
+efz
 ttn
 ttn
 jhB
@@ -199340,7 +199400,7 @@ nRL
 ier
 ier
 ier
-lVq
+wtA
 fTD
 cGX
 jlb
@@ -205510,7 +205570,7 @@ cPC
 ofz
 qcE
 lyx
-lfG
+uBa
 dcq
 dcq
 dcq
@@ -261362,12 +261422,12 @@ imS
 lPj
 fyh
 nxD
-bIu
+hVn
 fyh
 fMX
 mze
 hgq
-fyh
+bIu
 dgs
 brJ
 xsB
@@ -262902,7 +262962,7 @@ xMH
 mze
 cZV
 mNa
-mNa
+pSb
 fqA
 mNa
 mNa
@@ -263158,10 +263218,10 @@ xKT
 eKz
 sBh
 qYz
-sBh
-pSb
-mze
-sBh
+mNa
+qDy
+xGC
+mNa
 jNK
 bzv
 jBe
@@ -263415,9 +263475,9 @@ ipS
 eKz
 jsl
 soQ
-xGC
 mze
-hVn
+mze
+mze
 sBh
 wAN
 xrL