diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
index f3cd8dbc..49020b3d 100644
--- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -524,11 +524,11 @@
 	},
 /obj/effect/turf_decal/stripes/line,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/storage/box/lights/bulbs,
 /obj/item/stack/sheet/mineral/plasma{
 	amount = 30
 	},
-/obj/item/stock_parts/cell/high/plus,
+/obj/item/storage/box/lights/bulbs,
+/obj/item/storage/box/stockparts/deluxe,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/listeningstation)
 "aP" = (
@@ -1157,6 +1157,15 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/closed/wall,
 /area/ruin/space/has_grav/listeningstation)
+"fp" = (
+/obj/structure/sign/poster/contraband/random{
+	pixel_y = -32
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/machinery/microwave,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/listeningstation)
 "fs" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
@@ -1164,12 +1173,8 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/listeningstation)
 "fJ" = (
-/obj/structure/chair/stool,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small{
-	brightness = 3;
-	dir = 8
-	},
+/obj/machinery/biogenerator,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/listeningstation)
 "hJ" = (
@@ -1216,17 +1221,14 @@
 	req_access = null;
 	req_access_txt = "150"
 	},
+/obj/item/storage/box/beakers/bluespace,
 /turf/open/floor/plasteel/white/side{
 	dir = 6
 	},
 /area/ruin/space/has_grav/listeningstation)
 "tU" = (
-/obj/structure/sign/poster/contraband/random{
-	pixel_y = -32
-	},
+/obj/machinery/seed_extractor,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/machinery/microwave,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/listeningstation)
 "ux" = (
@@ -1272,44 +1274,28 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/listeningstation)
 "Bd" = (
-/obj/machinery/vending/hydroseeds{
-	slogan_delay = 700
-	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/machinery/smartfridge/disks{
+	pixel_x = -4;
+	pixel_y = 11
+	},
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/listeningstation)
 "Bs" = (
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/listeningstation)
 "DC" = (
-/obj/machinery/airalarm/syndicate{
-	dir = 1;
-	pixel_y = -25
+/obj/structure/chair/stool,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	brightness = 3;
+	dir = 8
 	},
-/obj/structure/table,
-/obj/item/kitchen/rollingpin{
-	pixel_x = -6;
-	pixel_y = 8
-	},
-/obj/machinery/reagentgrinder/constructed,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/listeningstation)
 "DL" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer{
-	pixel_x = -4;
-	pixel_y = 14
-	},
-/obj/item/storage/fancy/cigarettes/cigpack_syndicate{
-	pixel_x = -3
-	},
-/obj/item/reagent_containers/food/drinks/beer{
-	pixel_x = 3;
-	pixel_y = 11
-	},
-/obj/item/lighter/slime{
-	pixel_x = 6
-	},
+/obj/structure/chair/stool,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/listeningstation)
 "Et" = (
@@ -1334,7 +1320,13 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/computer/arcade/orion_trail,
+/obj/machinery/vending/hydroseeds{
+	slogan_delay = 700
+	},
+/obj/machinery/light/small{
+	brightness = 3;
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/listeningstation)
 "Lx" = (
@@ -1345,6 +1337,53 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/listeningstation)
 "Mh" = (
+/obj/machinery/airalarm/syndicate{
+	dir = 1;
+	pixel_y = -25
+	},
+/obj/structure/table,
+/obj/item/kitchen/rollingpin{
+	pixel_x = -6;
+	pixel_y = 8
+	},
+/obj/machinery/reagentgrinder/constructed,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/listeningstation)
+"Ns" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/machinery/plantgenes{
+	pixel_y = 6
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/listeningstation)
+"NQ" = (
+/obj/item/mop/advanced{
+	pixel_x = -11
+	},
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/listeningstation)
+"OI" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/beer{
+	pixel_x = -4;
+	pixel_y = 14
+	},
+/obj/item/storage/fancy/cigarettes/cigpack_syndicate{
+	pixel_x = -3
+	},
+/obj/item/reagent_containers/food/drinks/beer{
+	pixel_x = 3;
+	pixel_y = 11
+	},
+/obj/item/lighter/slime{
+	pixel_x = 6
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/listeningstation)
+"Qp" = (
 /obj/structure/table,
 /obj/item/storage/box/donkpockets{
 	pixel_x = -2;
@@ -1362,23 +1401,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/listeningstation)
-"Ns" = (
-/obj/machinery/biogenerator,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/listeningstation)
-"NQ" = (
-/obj/item/mop/advanced{
-	pixel_x = -11
-	},
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/listeningstation)
-"Qp" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/seed_extractor,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/listeningstation)
 "QM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -1387,9 +1409,12 @@
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj/structure/chair/stool,
+/obj/machinery/computer/arcade/orion_trail,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/listeningstation)
+"Sk" = (
+/turf/closed/wall,
+/area/ruin/unpowered/no_grav)
 "TK" = (
 /obj/machinery/chem_master/condimaster,
 /turf/open/floor/plasteel,
@@ -1937,7 +1962,7 @@ ac
 ac
 ac
 ac
-ab
+Sk
 ab
 ab
 ab
@@ -1976,6 +2001,7 @@ Bd
 Ns
 fJ
 DC
+Mh
 ac
 ab
 ab
@@ -1996,7 +2022,6 @@ ab
 ab
 ab
 ab
-ab
 aa
 "}
 (16,1,1) = {"
@@ -2013,9 +2038,10 @@ ac
 zq
 Gb
 XM
-Qp
 Bs
-Mh
+tU
+Bs
+Qp
 ac
 ab
 ab
@@ -2036,7 +2062,6 @@ ab
 ab
 ab
 ab
-ab
 aa
 "}
 (17,1,1) = {"
@@ -2055,7 +2080,8 @@ XM
 Bs
 fs
 za
-tU
+Bs
+fp
 ac
 ab
 ab
@@ -2076,7 +2102,6 @@ ab
 ab
 ab
 ab
-ab
 aa
 "}
 (18,1,1) = {"
@@ -2096,6 +2121,7 @@ Bs
 IH
 QM
 DL
+OI
 ac
 ab
 ab
@@ -2116,7 +2142,6 @@ ab
 ab
 ab
 ab
-ab
 aa
 "}
 (19,1,1) = {"
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 5a5826cb..2c4ae316 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -4602,7 +4602,7 @@
 /turf/open/space,
 /area/solar/port/fore)
 "ajf" = (
-/obj/machinery/prisoner/gulag_teleporter,
+/obj/machinery/gulag_teleporter,
 /turf/open/floor/plasteel,
 /area/security/processing)
 "ajg" = (