diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm
index d52cd73ea2a..178b97cfeb7 100644
--- a/_maps/map_files/NSVBlueshift/Blueshift.dmm
+++ b/_maps/map_files/NSVBlueshift/Blueshift.dmm
@@ -6234,6 +6234,11 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
+/obj/machinery/status_display/door_timer{
+	id = "IsolationCell_2";
+	name = "Isolation Cell 2";
+	pixel_y = -32
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison/safe)
 "blS" = (
@@ -12831,10 +12836,8 @@
 /turf/open/floor/carpet,
 /area/station/service/chapel)
 "cvj" = (
-/obj/machinery/mecha_part_fabricator/maint{
-	name = "forgotten exosuit fabricator"
-	},
-/obj/effect/turf_decal/bot,
+/obj/machinery/recharge_station,
+/obj/item/robot_suit,
 /turf/open/floor/plating,
 /area/station/science/research/abandoned)
 "cvk" = (
@@ -14881,6 +14884,9 @@
 "cMP" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/table/glass,
+/obj/item/mod/module/plasma_stabilizer,
+/obj/item/mod/module/signlang_radio,
+/obj/item/mod/module/thermal_regulator,
 /turf/open/floor/iron,
 /area/station/medical/storage)
 "cMX" = (
@@ -18158,7 +18164,7 @@
 /obj/structure/railing,
 /obj/machinery/elevator_control_panel/directional/south{
 	linked_elevator_id = "publicElevator";
-	preset_destination_names = list("2"="Lower Deck","3"="Upper Deck")
+	preset_destination_names = list("2"="Lower  Deck","3"="Upper  Deck")
 	},
 /turf/open/floor/plating/elevatorshaft,
 /area/station/hallway/primary/central)
@@ -30754,6 +30760,7 @@
 	pixel_y = 8
 	},
 /obj/item/storage/box/prisoner,
+/obj/item/paper/fluff/genpop_instructions,
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
@@ -43270,7 +43277,7 @@
 "imR" = (
 /obj/structure/bed/maint,
 /obj/machinery/flasher{
-	id = "IsolationFlash2";
+	id = "IsolationCell_1";
 	pixel_x = -22;
 	pixel_y = 28
 	},
@@ -50509,7 +50516,8 @@
 /area/station/maintenance/fore/upper)
 "jHd" = (
 /obj/machinery/door/airlock/security{
-	name = "Isolation Cell 1"
+	name = "Isolation Cell 1";
+	id_tag = "IsolationCell_1"
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/mapping_helpers/airlock/access/all/security/brig,
@@ -70783,6 +70791,7 @@
 	icon_state = "dirt-flat-1"
 	},
 /obj/machinery/drone_dispenser,
+/obj/effect/turf_decal/bot,
 /turf/open/floor/iron,
 /area/station/science/research/abandoned)
 "nBu" = (
@@ -78990,8 +78999,9 @@
 /turf/open/floor/iron/cafeteria,
 /area/station/engineering/atmos)
 "pcs" = (
-/obj/machinery/recharge_station,
-/obj/item/robot_suit,
+/obj/machinery/mecha_part_fabricator/maint{
+	name = "forgotten exosuit fabricator"
+	},
 /turf/open/floor/iron,
 /area/station/science/research/abandoned)
 "pcv" = (
@@ -89819,7 +89829,13 @@
 /area/station/command/bridge)
 "reA" = (
 /obj/structure/table/reinforced,
-/obj/item/taperecorder,
+/obj/item/taperecorder{
+	pixel_x = 6;
+	pixel_y = 10
+	},
+/obj/item/book/manual/wiki/security_space_law{
+	pixel_y = 3
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/office)
 "reB" = (
@@ -92720,7 +92736,7 @@
 /obj/structure/bed/maint,
 /obj/item/toy/plush/rouny,
 /obj/machinery/flasher{
-	id = "IsolationFlash";
+	id = "IsolationCell_2";
 	pixel_x = 22;
 	pixel_y = 28
 	},
@@ -95210,10 +95226,10 @@
 /area/station/commons/dorms)
 "sgW" = (
 /obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/security_space_law{
-	pixel_y = 3
-	},
 /obj/effect/turf_decal/tile/red/anticorner/contrasted,
+/obj/item/mod/module/plasma_stabilizer,
+/obj/item/mod/module/signlang_radio,
+/obj/item/mod/module/thermal_regulator,
 /turf/open/floor/iron/dark,
 /area/station/security/office)
 "sgZ" = (
@@ -95407,8 +95423,9 @@
 /area/station/security/range)
 "sjf" = (
 /obj/structure/table/reinforced,
-/obj/effect/spawner/random/engineering/material_cheap,
-/obj/item/clothing/gloves/color/yellow,
+/obj/item/mod/module/plasma_stabilizer,
+/obj/item/mod/module/signlang_radio,
+/obj/item/mod/module/thermal_regulator,
 /turf/open/floor/iron/dark,
 /area/station/engineering/storage_shared)
 "sjh" = (
@@ -95811,6 +95828,11 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
+/obj/machinery/status_display/door_timer{
+	id = "IsolationCell_1";
+	name = "Isolation Cell 1";
+	pixel_y = -32
+	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison/safe)
 "snl" = (
@@ -101639,16 +101661,6 @@
 /turf/open/floor/plating,
 /area/station/maintenance/disposal)
 "trz" = (
-/obj/machinery/button/flasher{
-	id = "IsolationFlash2";
-	pixel_x = 10;
-	pixel_y = -24
-	},
-/obj/machinery/button/flasher{
-	id = "IsolationFlash";
-	pixel_x = -10;
-	pixel_y = -24
-	},
 /obj/structure/closet/crate/bin,
 /obj/effect/spawner/random/trash/garbage,
 /obj/effect/spawner/random/trash/garbage,
@@ -117669,7 +117681,8 @@
 /area/station/command/heads_quarters/captain)
 "wru" = (
 /obj/machinery/door/airlock/security{
-	name = "Isolation Cell 2"
+	name = "Isolation Cell 2";
+	id_tag = "IsolationCell_2"
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/mapping_helpers/airlock/access/all/security/brig,
diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
index 54a7cc3e09e..d20bf56ba1a 100644
--- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm
+++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
@@ -8372,7 +8372,6 @@
 /area/station/medical/surgery)
 "cAR" = (
 /obj/item/mod/module/plasma_stabilizer,
-/obj/item/mod/module/thermal_regulator,
 /obj/structure/table,
 /obj/structure/window/reinforced/spawner/directional/north,
 /obj/machinery/door/window/right/directional/west{
@@ -8390,6 +8389,8 @@
 /obj/effect/turf_decal/trimline/dark_red/filled/mid_joiner{
 	dir = 1
 	},
+/obj/item/mod/module/signlang_radio,
+/obj/item/mod/module/thermal_regulator,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/medical/storage)
 "cBb" = (
@@ -15711,6 +15712,7 @@
 /obj/item/restraints/handcuffs,
 /obj/effect/turf_decal/tile/dark_red/diagonal_centre,
 /obj/effect/turf_decal/tile/neutral/diagonal_centre,
+/obj/item/paper/fluff/genpop_instructions,
 /turf/open/floor/iron/dark/diagonal,
 /area/station/security/execution/transfer)
 "eBa" = (
@@ -39511,7 +39513,8 @@
 /area/station/maintenance/department/medical/central)
 "lgZ" = (
 /obj/machinery/door/airlock/security{
-	name = "Isolation Cell"
+	name = "Isolation Cell";
+	id_tag = "IsolationCell"
 	},
 /obj/effect/mapping_helpers/airlock/access/all/security/brig,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -58469,7 +58472,7 @@
 /area/station/ai_monitored/turret_protected/ai)
 "qmI" = (
 /obj/machinery/flasher/directional/south{
-	id = "Cell 6"
+	id = "IsolationCell"
 	},
 /obj/machinery/light/small/broken/directional/south,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -68536,9 +68539,9 @@
 "tbw" = (
 /obj/structure/table,
 /obj/effect/turf_decal/bot,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/flashlight,
-/obj/item/clothing/glasses/meson/engine,
+/obj/item/mod/module/plasma_stabilizer,
+/obj/item/mod/module/signlang_radio,
+/obj/item/mod/module/thermal_regulator,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/engineering/main)
 "tbD" = (
@@ -70851,6 +70854,15 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/research)
+"tFq" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/status_display/door_timer{
+	id = "IsolationCell";
+	name = "Isolation Cell";
+	pixel_y = 32
+	},
+/turf/open/floor/iron/dark/smooth_large,
+/area/station/security/execution/transfer)
 "tFt" = (
 /turf/closed/wall/r_wall,
 /area/station/maintenance/department/engine/atmos)
@@ -86226,6 +86238,9 @@
 	pixel_y = 16
 	},
 /obj/item/inspector,
+/obj/item/mod/module/signlang_radio{
+	pixel_y = 12
+	},
 /obj/item/mod/module/thermal_regulator{
 	pixel_y = 16
 	},
@@ -131324,7 +131339,7 @@ pbe
 okn
 okn
 cDj
-lFM
+tFq
 rPq
 gPQ
 bsr