diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm
index fbbb2d049cd..68f56463a37 100644
--- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm
+++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm
@@ -419,9 +419,6 @@
 /obj/item/trash/can,
 /turf/open/floor/iron,
 /area/centcom/interlink)
-"ahF" = (
-/turf/open/floor/plating/abductor,
-/area/bluespace_locker)
 "ahG" = (
 /obj/structure/rack,
 /obj/item/clothing/mask/breath,
@@ -857,12 +854,6 @@
 "alp" = (
 /turf/open/indestructible/hotelwood,
 /area/centcom/holding/cafe)
-"alv" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien8";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aly" = (
 /obj/structure/table/wood/poker,
 /obj/item/toy/cards/deck,
@@ -1023,10 +1014,6 @@
 	icon_state = "white"
 	},
 /area/centcom/holding/cafepark)
-"amA" = (
-/obj/effect/landmark/bluespace_locker_origin,
-/turf/open/floor/plating/abductor,
-/area/bluespace_locker)
 "amB" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin{
@@ -1638,12 +1625,6 @@
 	icon_state = "grass"
 	},
 /area/centcom/holding/cafepark)
-"aqW" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien11";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aqX" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
@@ -1658,12 +1639,6 @@
 	icon_state = "white"
 	},
 /area/centcom/holding/cafepark)
-"arc" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien24";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "are" = (
 /obj/structure/reagent_dispensers/water_cooler{
 	desc = "A machine that dispenses liquid to drink. This one has cucumbers floating in the water."
@@ -2921,12 +2896,6 @@
 /obj/structure/table/wood,
 /turf/open/indestructible/hotelwood,
 /area/centcom/holding/cafe)
-"aCE" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien21";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aCF" = (
 /obj/structure/chair/sofa/corp/right{
 	dir = 8
@@ -3056,12 +3025,6 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/centcom/interlink)
-"aDh" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien6";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aDj" = (
 /obj/structure/table/wood,
 /obj/item/storage/fancy/donut_box{
@@ -3147,12 +3110,6 @@
 	icon_state = "darkfull"
 	},
 /area/centcom/holding/cafepark)
-"aDR" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien18";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aDY" = (
 /obj/machinery/processor,
 /obj/machinery/light{
@@ -3296,12 +3253,6 @@
 	dir = 4
 	},
 /area/centcom/holding/cafepark)
-"aFw" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien15";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aFy" = (
 /turf/closed/indestructible/wood,
 /area/centcom/holding/cafepark)
@@ -3393,12 +3344,6 @@
 	icon_state = "floor"
 	},
 /area/centcom/holding/cafe)
-"aGr" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien12";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aGs" = (
 /obj/structure/chair/comfy/brown{
 	dir = 4
@@ -3686,12 +3631,6 @@
 	dir = 9
 	},
 /area/centcom/interlink)
-"aIT" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien20";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aIU" = (
 /obj/structure/bodycontainer/crematorium{
 	dir = 4;
@@ -3716,12 +3655,6 @@
 /obj/structure/flora/ausbushes/brflowers,
 /turf/open/floor/grass,
 /area/centcom/interlink)
-"aJd" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien2";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aJh" = (
 /turf/open/floor/plating/beach/coastline_t{
 	dir = 5
@@ -3870,12 +3803,6 @@
 /obj/structure/flora/junglebush/b,
 /turf/open/floor/plating/grass/planet,
 /area/centcom/holding/cafepark)
-"aKw" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien7";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aKA" = (
 /obj/structure/chair/sofa/corp/right,
 /turf/open/floor/carpet/purple,
@@ -4086,12 +4013,6 @@
 	baseturfs = /turf/open/floor/plating
 	},
 /area/centcom/holding/cafepark)
-"aMS" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien14";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aMV" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
@@ -4229,12 +4150,6 @@
 /obj/effect/spawner/randomcolavend,
 /turf/open/floor/iron,
 /area/centcom/interlink)
-"aNw" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien4";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aNy" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 8
@@ -4359,9 +4274,6 @@
 	icon_state = "floor"
 	},
 /area/centcom/holding/cafe)
-"aOq" = (
-/turf/open/space/bluespace_locker_mirage,
-/area/bluespace_locker)
 "aOr" = (
 /obj/item/reagent_containers/food/drinks/bottle/wine{
 	pixel_x = 9;
@@ -4863,12 +4775,6 @@
 	icon_state = "darkfull"
 	},
 /area/centcom/holding/cafepark)
-"aRA" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien9";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aRC" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
@@ -5069,12 +4975,6 @@
 	icon_state = "white"
 	},
 /area/centcom/holding/cafepark)
-"aSQ" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien17";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aSU" = (
 /obj/structure/sink{
 	dir = 8;
@@ -5185,12 +5085,6 @@
 /obj/item/stack/sheet/plastic/fifty,
 /turf/open/indestructible/hotelwood,
 /area/centcom/holding/cafe)
-"aTx" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien23";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aTB" = (
 /obj/structure/flora/ausbushes/fullgrass{
 	icon_state = "brflowers_3"
@@ -5241,12 +5135,6 @@
 	},
 /turf/open/floor/iron,
 /area/centcom/interlink)
-"aTT" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien3";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aTV" = (
 /obj/structure/showcase/fakeid{
 	name = "console"
@@ -5534,12 +5422,6 @@
 	},
 /turf/open/indestructible/hotelwood,
 /area/centcom/holding/cafedorms)
-"aWF" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien13";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aWL" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
@@ -5706,13 +5588,6 @@
 "aXG" = (
 /turf/open/floor/iron/dark,
 /area/centcom/interlink)
-"aXH" = (
-/obj/structure/closet/bluespace/internal,
-/turf/open/indestructible{
-	icon = 'icons/turf/walls.dmi';
-	icon_state = "alien22"
-	},
-/area/bluespace_locker)
 "aXI" = (
 /obj/effect/turf_decal/trimline/darkblue/warning{
 	dir = 4
@@ -5751,12 +5626,6 @@
 	},
 /turf/open/indestructible/hotelwood,
 /area/centcom/holding/cafedorms)
-"aXT" = (
-/turf/closed/indestructible/abductor{
-	icon_state = "alien10";
-	opacity = 0
-	},
-/area/bluespace_locker)
 "aXV" = (
 /obj/structure/table,
 /turf/open/indestructible/hotelwood,
@@ -65708,32 +65577,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -65965,32 +65834,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -66222,32 +66091,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -66479,32 +66348,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -66736,32 +66605,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -66993,32 +66862,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -67250,32 +67119,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -67507,32 +67376,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -67764,32 +67633,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -68021,32 +67890,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -68278,32 +68147,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aIT
-aMS
-aGr
-aXT
-aDh
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -68535,32 +68404,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aIT
-aSQ
-ahF
-ahF
-ahF
-aKw
-aDh
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -68792,32 +68661,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aCE
-ahF
-ahF
-ahF
-ahF
-ahF
-aJd
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -69049,32 +68918,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aXH
-ahF
-ahF
-amA
-ahF
-ahF
-aTT
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -69306,32 +69175,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aTx
-ahF
-ahF
-ahF
-ahF
-ahF
-aNw
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -69563,32 +69432,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-arc
-aDR
-ahF
-ahF
-ahF
-alv
-aRA
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -69820,32 +69689,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-arc
-aFw
-aWF
-aqW
-aRA
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -70077,32 +69946,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -70334,32 +70203,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -70591,32 +70460,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -70848,32 +70717,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -71105,32 +70974,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -71362,32 +71231,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -71619,32 +71488,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -71876,32 +71745,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -72133,32 +72002,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
@@ -72390,32 +72259,32 @@ aaa
 aaa
 aaa
 aaa
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
-aOq
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaa
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index e6d72d8a32a..65a4125dfa2 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -32,8 +32,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
 		/obj/item/hilbertshotel,
 		/obj/machinery/camera,
 		/obj/item/gps,
-		/obj/structure/checkoutmachine,
-		/obj/structure/closet/bluespace // SKYRAT EDIT ADDTION -- Bluespace Locker
+		/obj/structure/checkoutmachine
 	)))
 
 /// How many goody orders we can fit in a lockbox before we upgrade to a crate
diff --git a/modular_skyrat/modules/bluespace_locker/code/__HELPERS/unsorted.dm b/modular_skyrat/modules/bluespace_locker/code/__HELPERS/unsorted.dm
deleted file mode 100644
index 7956d523cb9..00000000000
--- a/modular_skyrat/modules/bluespace_locker/code/__HELPERS/unsorted.dm
+++ /dev/null
@@ -1,12 +0,0 @@
-// Like get_turf, but if inside a bluespace locker it returns the turf the bluespace locker is on
-// possibly could be adapted for other stuff, i dunno
-// ported from yogs along with the BS locker 
-/proc/get_turf_global(atom/A, recursion_limit = 5)
-	var/turf/T = get_turf(A)
-	if(recursion_limit <= 0)
-		return T
-	if(T.loc)
-		var/area/R = T.loc
-		if(R.global_turf_object)
-			return get_turf_global(R.global_turf_object, recursion_limit - 1)
-	return T
diff --git a/modular_skyrat/modules/bluespace_locker/code/controllers/subsystem/bluespace_locker.dm b/modular_skyrat/modules/bluespace_locker/code/controllers/subsystem/bluespace_locker.dm
deleted file mode 100644
index 49d18a83603..00000000000
--- a/modular_skyrat/modules/bluespace_locker/code/controllers/subsystem/bluespace_locker.dm
+++ /dev/null
@@ -1,69 +0,0 @@
-SUBSYSTEM_DEF(bluespace_locker) 
-	name = "Bluespace Locker"
-	flags = SS_NO_FIRE
-	var/obj/structure/closet/bluespace/internal/internal_locker = null
-	var/obj/structure/closet/bluespace/external/external_locker = null
-
-/datum/controller/subsystem/bluespace_locker/Initialize()
-	bluespaceify_random_locker()
-	if(external_locker)
-		external_locker.take_contents()
-	return ..()
-
-/datum/controller/subsystem/bluespace_locker/proc/bluespaceify_random_locker()
-	if(external_locker)
-		return
-	// basically any normal-looking locker that isn't a secure one
-	var/list/valid_lockers = typecacheof(typesof(/obj/structure/closet) - typesof(/obj/structure/closet/body_bag)\
-	- typesof(/obj/structure/closet/secure_closet) - typesof(/obj/structure/closet/cabinet)\
-	- typesof(/obj/structure/closet/cardboard) - typesof(/obj/structure/closet/crate)\
-	- typesof(/obj/structure/closet/supplypod) - typesof(/obj/structure/closet/stasis)\
-	- typesof(/obj/structure/closet/abductor) - typesof(/obj/structure/closet/bluespace), only_root_path = TRUE)
-
-	var/list/lockers_list = list()
-	for(var/obj/structure/closet/L in world)
-		if(is_station_level(L.z) && is_type_in_typecache(L, valid_lockers))
-			lockers_list += L
-	if(!lockers_list.len)
-		// Congratulations, you managed to destroy all the lockers somehow.
-		// Now let's make a new one.
-		var/targetturf = find_safe_turf()
-		if(!targetturf)
-			if(GLOB.blobstart.len > 0)
-				targetturf = get_turf(pick(GLOB.blobstart))
-			else
-				CRASH("Unable to find a blobstart landmark")
-		lockers_list += new /obj/structure/closet(targetturf)
-	var/obj/structure/closet/L = pick(lockers_list)
-
-	var/obj/structure/closet/bluespace/external/E = new(L.loc)
-	E.contents = L.contents
-	E.name = L.name
-	E.desc = L.desc
-	if(L.opened)
-		E.open()
-	E.icon = L.icon
-	E.icon_state = L.icon_state
-	E.icon_door = L.icon_door
-	E.icon_door_override = L.icon_door_override
-	E.icon_welded = L.icon_welded
-	qdel(L)
-
-	relink_lockers()
-
-/datum/controller/subsystem/bluespace_locker/proc/relink_lockers()
-	if(!internal_locker)
-		return
-	var/area/A = get_area(internal_locker)
-	A.global_turf_object = external_locker
-	internal_locker.update_mirage()
-	if(!external_locker)
-		return
-	if(external_locker.opened)
-		internal_locker.close()
-	else
-		internal_locker.contents += external_locker.contents
-		internal_locker.open()
-		internal_locker.dump_contents()
-	internal_locker.update_icon()
-	external_locker.update_icon()
diff --git a/modular_skyrat/modules/bluespace_locker/code/game/area/Space_Station_13_areas.dm b/modular_skyrat/modules/bluespace_locker/code/game/area/Space_Station_13_areas.dm
deleted file mode 100644
index 658b4570980..00000000000
--- a/modular_skyrat/modules/bluespace_locker/code/game/area/Space_Station_13_areas.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-/area
-    var/atom/global_turf_object = null // For BS lockers
-
-/area/bluespace_locker
-	name = "Bluespace Locker"
-	icon_state = "away"
-	requires_power = FALSE
-	has_gravity = STANDARD_GRAVITY
-	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
-	area_flags = NOTELEPORT
diff --git a/modular_skyrat/modules/bluespace_locker/code/game/objects/structures/crates_lockers/bluespace_locker.dm b/modular_skyrat/modules/bluespace_locker/code/game/objects/structures/crates_lockers/bluespace_locker.dm
deleted file mode 100644
index 5686ff1a1ac..00000000000
--- a/modular_skyrat/modules/bluespace_locker/code/game/objects/structures/crates_lockers/bluespace_locker.dm
+++ /dev/null
@@ -1,285 +0,0 @@
-/obj/structure/closet/bluespace
-	name = "bluespace locker"
-
-/obj/structure/closet/bluespace/proc/get_other_locker()
-	return SSbluespace_locker.internal_locker
-
-/obj/structure/closet/bluespace/open(mob/living/user, force = FALSE)
-	var/obj/structure/closet/other = get_other_locker()
-	if(!other)
-		return ..()
-	if(!opened)
-		. = ..()
-		other.close()
-		dump_contents()
-
-/obj/structure/closet/bluespace/close(mob/living/user, force = FALSE)
-	var/obj/structure/closet/other = get_other_locker()
-	if(!other)
-		return ..()
-	if(opened)
-		. = ..()
-		other.contents += contents
-		other.open()
-
-/obj/structure/closet/bluespace/internal
-	name = "bluespace locker portal"
-	icon_state = null
-	desc = ""
-	cutting_tool = null
-	has_opened_overlay = FALSE
-	has_closed_overlay = FALSE
-	can_weld_shut = FALSE
-	anchored = TRUE
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-	var/list/mirage_whitelist = list()
-
-/obj/structure/closet/bluespace/internal/Initialize()
-	. = ..()
-	if(SSbluespace_locker.internal_locker && SSbluespace_locker.internal_locker != src)
-		return INITIALIZE_HINT_QDEL_FORCE
-	SSbluespace_locker.internal_locker = src
-
-/obj/structure/closet/bluespace/internal/get_other_locker()
-	return SSbluespace_locker.external_locker
-
-/obj/structure/closet/bluespace/internal/can_open(user)
-	var/obj/structure/closet/other = get_other_locker()
-	if(!other)
-		return FALSE
-	if(!other.opened)
-		return TRUE
-	return other.can_close(user)
-/obj/structure/closet/bluespace/internal/can_close(user)
-	var/obj/structure/closet/other = get_other_locker()
-	if(!other || other.opened)
-		return TRUE
-	return other.can_open(user)
-
-/obj/structure/closet/bluespace/internal/tool_interact(obj/item/W, mob/user)
-	return
-
-/obj/structure/closet/bluespace/internal/attack_hand(mob/living/user)
-	var/obj/structure/closet/other = get_other_locker()
-	if(!other)
-		return ..()
-	if(!other.opened && (other.welded || other.locked))
-		if(ismovable(other.loc))
-			user.changeNext_move(CLICK_CD_BREAKOUT)
-			user.last_special = world.time + CLICK_CD_BREAKOUT
-			var/atom/movable/AM = other.loc
-			AM.relay_container_resist_act(user, other)
-			return
-
-		//okay, so the closet is either welded or locked... resist!!!
-		user.changeNext_move(CLICK_CD_BREAKOUT)
-		user.last_special = world.time + CLICK_CD_BREAKOUT
-		other.visible_message("<span class='warning'>[other] begins to shake violently!</span>")
-		to_chat(user, "<span class='notice'>You start pushing the door open... (this will take about [DisplayTimeText(other.breakout_time)].)</span>")
-		if(do_after(user,(other.breakout_time), target = src))
-			if(!user || user.stat != CONSCIOUS || other.opened || (!other.locked && !other.welded))
-				return
-			//we check after a while whether there is a point of resisting anymore and whether the user is capable of resisting
-			other.bust_open()
-			user.visible_message("<span class='danger'>[user] successfully broke out of [other]!</span>",
-								"<span class='notice'>You successfully break out of [other]!</span>")
-		else
-			if(!other.opened) //so we don't get the message if we resisted multiple times and succeeded.
-				to_chat(user, "<span class='warning'>You fail to break out of [other]!</span>")
-	else
-		return ..()
-
-/obj/structure/closet/bluespace/internal/update_icon()
-	. = ..()
-	cut_overlays()
-	var/obj/structure/closet/other = get_other_locker()
-	if(!other)
-		other = src
-	var/mutable_appearance/masked_icon = mutable_appearance('modular_skyrat/master_files/icons/obj/closet.dmi', "bluespace_locker_mask")
-	masked_icon.appearance_flags = KEEP_TOGETHER
-	var/mutable_appearance/masking_icon = mutable_appearance(other.icon, other.icon_state)
-	masking_icon.blend_mode = BLEND_MULTIPLY
-	masked_icon.add_overlay(masking_icon)
-	add_overlay(masked_icon)
-	if(!opened)
-		layer = OBJ_LAYER
-		if(other.icon_door)
-			add_overlay(image(other.icon, "[other.icon_door]_door"))
-		else
-			add_overlay(image(other.icon, "[other.icon_state]_door"))
-	else
-		layer = BELOW_OBJ_LAYER
-		if(other.icon_door_override)
-			add_overlay(image(other.icon, "[other.icon_door]_open"))
-		else
-			add_overlay(image(other.icon, "[other.icon_state]_open"))
-
-/obj/structure/closet/bluespace/external/onTransitZ(old_z,new_z)
-	var/obj/structure/closet/O = get_other_locker()
-	if(O)
-		var/area/A = get_area(O)
-		if(A)
-			for(var/atom/movable/M in A)
-				M.onTransitZ(old_z,new_z)
-	return ..()
-
-/obj/structure/closet/bluespace/internal/proc/update_mirage()
-	var/area/A = get_area(src)
-	for(var/atom/movable/M in A)
-		if(M == src) // in case someone somehow manages to teleport the bluespace locker inside of itself
-			continue
-		M.update_parallax_contents()
-	var/turf/internal_origin
-	var/turf/external_origin = get_turf(get_other_locker())
-	for(var/obj/effect/landmark/bluespace_locker_origin/L in A)
-		internal_origin = get_turf(L)
-		break
-	mirage_whitelist.len = 0
-	for(var/turf/T in view(12, external_origin))
-		mirage_whitelist[T] = TRUE
-	for(var/turf/open/space/bluespace_locker_mirage/T in A)
-		T.internal_origin = internal_origin
-		T.external_origin = external_origin
-		T.turf_whitelist = mirage_whitelist
-		T.update_mirage()
-
-/obj/structure/closet/bluespace/external/Initialize()
-	. = ..()
-	if(SSbluespace_locker.external_locker && SSbluespace_locker.external_locker != src)
-		qdel(src)
-		return
-	SSbluespace_locker.external_locker = src
-
-/obj/structure/closet/bluespace/external/Destroy()
-	SSbluespace_locker.external_locker = null
-	SSbluespace_locker.bluespaceify_random_locker()
-	return ..()
-
-/obj/structure/closet/bluespace/external/can_open()
-	if(welded || locked)
-		return FALSE
-	return TRUE
-
-/obj/structure/closet/bluespace/external/can_close()
-	if(welded || locked)
-		return FALSE
-	return TRUE
-
-
-/obj/structure/closet/bluespace/external/Moved()
-	var/obj/structure/closet/bluespace/internal/C = get_other_locker()
-	if(C)
-		C.update_mirage()
-	return ..()
-
-/obj/structure/closet/bluespace/external/afterShuttleMove()
-	var/obj/structure/closet/bluespace/internal/C = get_other_locker()
-	if(C)
-		C.update_mirage()
-	return ..()
-
-/obj/effect/landmark/bluespace_locker_origin
-	name = "bluespace locker origin"
-
-/turf/open/space/bluespace_locker_mirage
-	density = 1
-	icon_state = "black"
-	blocks_air = 1
-	name = "holographic projection"
-	desc = "A holographic projection of the area surrounding the bluespace locker"
-	turf_flags = NOJAUNT
-	plane = FLOOR_PLANE // this makes it work don't ask why, none of this code was commented. Without this it only shows overlays.
-	var/turf/internal_origin
-	var/turf/external_origin
-	var/turf/external_origin_prev
-	var/turf/external_origin_prev_prev
-	var/turf/external_origin_prev_time = -1
-	var/list/turf_whitelist
-	var/reset_timer_id
-
-/turf/open/space/bluespace_locker_mirage/CanBuildHere()
-	return FALSE
-
-/turf/open/space/bluespace_locker_mirage/proc/update_mirage()
-	if(!internal_origin || !external_origin)
-		vis_contents = list()
-		return
-	if(external_origin == external_origin_prev)
-		return
-	if(world.time == external_origin_prev_time)
-		external_origin_prev = external_origin_prev_prev
-	cut_overlays()
-	var/glide_dir = 0
-	if(external_origin_prev && external_origin_prev.z != external_origin && abs(external_origin.x - external_origin_prev.x) <= 1 && abs(external_origin.y - external_origin_prev.y) <= 1)
-		glide_dir = get_dir(external_origin_prev, external_origin)
-	var/turf/target_turf = locate(external_origin.x + x - internal_origin.x, external_origin.y + y - internal_origin.y, external_origin.z)
-	if(!target_turf || (turf_whitelist && !turf_whitelist[target_turf]))
-		vis_contents = list()
-		//var/mutable_appearance/M = mutable_appearance('icons/turf/space.dmi', "black")
-		//M.layer = TURF_LAYER
-		//M.plane = FLOOR_PLANE
-		//add_overlay(M)
-	else
-		vis_contents = list(target_turf)
-		if(glide_dir)
-			var/dx = 0
-			var/dy = 0
-			var/px = 0
-			var/py = 0
-			var/add_reset_timer
-			if(glide_dir & 1)
-				dy++
-			if(glide_dir & 2)
-				dy--
-			if(glide_dir & 4)
-				dx++
-			if(glide_dir & 8)
-				dx--
-			var/list/fullbrights = list()
-			var/area/A = target_turf.loc
-			if(!IS_DYNAMIC_LIGHTING(A))
-				fullbrights += new /obj/effect/fullbright()
-			for(var/cdir in GLOB.cardinals)
-				if(!(glide_dir & cdir))
-					continue
-				var/odir = turn(cdir, 180)
-				var/turf/T = get_step(src, odir)
-				if(T && T.type != /turf/open/space/bluespace_locker_mirage)
-					vis_contents += get_step(target_turf, odir)
-					add_reset_timer = TRUE
-					if(odir == 8)
-						px = -32
-					if(odir == 2)
-						py = -32
-					A = target_turf.loc
-					if(!IS_DYNAMIC_LIGHTING(A))
-						var/obj/effect/fullbright/F = new()
-						switch(odir)
-							if(1)
-								F.pixel_y = 32
-							if(2)
-								F.pixel_y = -32
-							if(4)
-								F.pixel_x = 32
-							if(8)
-								F.pixel_x = -32
-						fullbrights += F
-			for(var/V in fullbrights)
-				var/obj/F = V
-				F.pixel_x -= px // cancel out the pixel_x/y in the parent
-				F.pixel_y -= py
-			add_overlay(fullbrights)
-			if(add_reset_timer)
-				reset_timer_id = addtimer(CALLBACK(src, /turf/open/space/bluespace_locker_mirage.proc/reset_to_self), world.tick_lag * 4, TIMER_UNIQUE | TIMER_NO_HASH_WAIT | TIMER_OVERRIDE | TIMER_STOPPABLE)
-			else if(reset_timer_id)
-				deltimer(reset_timer_id)
-			pixel_x = px + dx*32
-			pixel_y = py + dy*32
-			animate(src, pixel_x = px, pixel_y = py, time = world.tick_lag * 4, flags = ANIMATION_END_NOW)
-	external_origin_prev_time = world.time
-	external_origin_prev_prev = external_origin_prev
-	external_origin_prev = external_origin
-
-/turf/open/space/bluespace_locker_mirage/proc/reset_to_self()
-	reset_timer_id = null
-	update_mirage()
diff --git a/tgstation.dme b/tgstation.dme
index 0d6d91e923c..4c1396925bb 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4044,10 +4044,6 @@
 #include "modular_skyrat\modules\blueshield\code\modules\clothing\under\jobs\Plasmaman\security.dm"
 #include "modular_skyrat\modules\blueshield\code\modules\jobs\job_types\blueshield.dm"
 #include "modular_skyrat\modules\blueshield\code\modules\projectiles\guns\energy\special.dm"
-#include "modular_skyrat\modules\bluespace_locker\code\__HELPERS\unsorted.dm"
-#include "modular_skyrat\modules\bluespace_locker\code\controllers\subsystem\bluespace_locker.dm"
-#include "modular_skyrat\modules\bluespace_locker\code\game\area\Space_Station_13_areas.dm"
-#include "modular_skyrat\modules\bluespace_locker\code\game\objects\structures\crates_lockers\bluespace_locker.dm"
 #include "modular_skyrat\modules\bongs\items\bong.dm"
 #include "modular_skyrat\modules\brigoff\code\game\area\Space_Station_13_areas.dm"
 #include "modular_skyrat\modules\brigoff\code\game\objects\effects\landmarks.dm"