diff --git a/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm b/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm
index baefda5db5e1..2fafbc768cac 100644
--- a/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm
+++ b/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm
@@ -24,7 +24,6 @@
 /area/ruin/space/djstation)
 "n" = (
 /obj/structure/closet/secure_closet/freezer/fridge/all_access,
-/obj/machinery/light/directional/south,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/iron,
diff --git a/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm b/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
index 34946eb3888f..01765c2aaff0 100644
--- a/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
+++ b/_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
@@ -15,16 +15,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/lava/plasma/ice_moon,
 /area/misc/anomaly_research)
-"aP" = (
-/obj/effect/turf_decal/trimline/purple/line{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
 "aX" = (
 /obj/machinery/light/broken/directional/north,
 /obj/effect/turf_decal/tile/purple/opposingcorners,
@@ -32,16 +22,18 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
+"ba" = (
+/obj/structure/reagent_dispensers/plumbed,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/plating,
+/area/misc/anomaly_research)
 "bB" = (
 /obj/effect/spawner/structure/window,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/misc/anomaly_research)
-"bG" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood,
-/area/misc/anomaly_research)
 "bP" = (
 /obj/structure/table/wood,
 /obj/item/toy/plush/slimeplushie,
@@ -62,20 +54,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
-"cA" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
 "cD" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
-"cF" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/window/plasma/spawner/directional/south,
-/turf/open/floor/iron/smooth,
-/area/misc/anomaly_research)
 "cK" = (
 /obj/structure/table/wood,
 /obj/machinery/microwave,
@@ -88,9 +71,16 @@
 /turf/open/floor/grass,
 /area/misc/anomaly_research)
 "dr" = (
-/obj/effect/spawner/random/environmentally_safe_anomaly,
+/obj/effect/spawner/random/environmentally_safe_anomaly/bioscramblerless,
 /turf/open/lava/plasma/ice_moon,
 /area/misc/anomaly_research)
+"ds" = (
+/obj/machinery/duct,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/freezer,
+/area/misc/anomaly_research)
 "dy" = (
 /obj/effect/turf_decal/tile/purple/half/contrasted,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -100,21 +90,22 @@
 /area/misc/anomaly_research)
 "dD" = (
 /obj/structure/lattice/catwalk,
-/obj/effect/spawner/random/environmentally_safe_anomaly,
+/obj/effect/spawner/random/environmentally_safe_anomaly/bioscramblerless,
 /turf/open/lava/plasma/ice_moon,
 /area/misc/anomaly_research)
-"dU" = (
-/obj/structure/rack,
-/obj/item/clothing/head/collectable/welding,
-/obj/item/weldingtool/largetank,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
 "eq" = (
 /obj/structure/window/reinforced/spawner/directional/south,
 /obj/structure/table,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
+"ev" = (
+/obj/machinery/light/small/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/misc/anomaly_research)
 "eA" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -125,10 +116,14 @@
 /obj/structure/flora/tree/stump,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/misc/anomaly_research)
-"eO" = (
-/obj/effect/spawner/random/structure/closet_private,
+"eT" = (
+/obj/effect/turf_decal/siding/purple{
+	dir = 6
+	},
+/obj/structure/table/reinforced,
+/obj/item/reactive_armor_shell,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood,
+/turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
 "eU" = (
 /obj/effect/turf_decal/siding/wood{
@@ -138,15 +133,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/wood,
 /area/misc/anomaly_research)
-"eZ" = (
-/obj/structure/fireplace{
-	pixel_x = -32
-	},
-/obj/item/kirbyplants/random/fullysynthetic{
-	pixel_x = 10;
-	pixel_y = 19
-	},
-/turf/open/floor/wood,
+"eW" = (
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/turf/open/floor/iron/white,
 /area/misc/anomaly_research)
 "fc" = (
 /obj/effect/turf_decal/stripes/corner{
@@ -163,48 +154,32 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
-"fm" = (
-/obj/effect/turf_decal/siding/purple{
-	dir = 5
-	},
-/obj/structure/table/reinforced,
-/obj/item/anomaly_neutralizer,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/misc/anomaly_research)
-"ft" = (
+"fe" = (
 /obj/effect/turf_decal/trimline/purple/line,
-/obj/effect/decal/cleanable/oil/slippery,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
-"fw" = (
-/obj/machinery/suit_storage_unit,
-/turf/open/floor/iron/smooth,
-/area/misc/anomaly_research)
-"fO" = (
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
-"gg" = (
-/obj/effect/spawner/random/trash/botanical_waste,
+"fv" = (
+/obj/machinery/duct,
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/iron{
+	pixel_x = -5;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/cup/bottle/multiver{
+	pixel_x = 1
+	},
+/obj/item/reagent_containers/cup/bottle/acidic_buffer{
+	pixel_x = 7;
+	pixel_y = 3
+	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/misc/anomaly_research)
-"gr" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted{
-	dir = 1
-	},
-/obj/structure/table/reinforced,
-/obj/item/anomaly_neutralizer,
-/obj/item/anomaly_neutralizer,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+"fw" = (
+/obj/machinery/suit_storage_unit,
+/turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
 "gs" = (
 /obj/structure/lattice/catwalk,
@@ -213,12 +188,21 @@
 	},
 /turf/open/lava/plasma/ice_moon,
 /area/misc/anomaly_research)
-"gA" = (
-/obj/effect/decal/cleanable/oil/slippery,
+"gB" = (
+/obj/effect/turf_decal/trimline/purple/line{
+	dir = 8
+	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
+"gF" = (
+/obj/effect/spawner/random/trash/box,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/misc/anomaly_research)
 "gN" = (
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 1
@@ -247,6 +231,21 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
+"hK" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/structure/window/plasma/spawner/directional/south,
+/turf/open/floor/iron/smooth,
+/area/misc/anomaly_research)
+"hU" = (
+/obj/effect/turf_decal/siding/purple{
+	dir = 1
+	},
+/obj/structure/chair/office,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/misc/anomaly_research)
 "hV" = (
 /obj/structure/flora/grass/green/style_random,
 /obj/structure/flora/grass/green/style_random,
@@ -258,6 +257,10 @@
 	},
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
+"ii" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/misc/anomaly_research)
 "ip" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -269,6 +272,14 @@
 /obj/item/computer_disk/ordnance,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
+"iq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
 "it" = (
 /obj/machinery/shower/directional/east,
 /obj/effect/spawner/random/trash/soap,
@@ -283,20 +294,18 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/wood,
 /area/misc/anomaly_research)
-"iw" = (
-/obj/effect/turf_decal/trimline/purple/line{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
 "iC" = (
 /obj/machinery/door/airlock/external,
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
+"iK" = (
+/obj/effect/turf_decal/siding/purple{
+	dir = 9
+	},
+/obj/machinery/monkey_recycler,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/misc/anomaly_research)
 "iP" = (
 /obj/effect/turf_decal/tile/purple/anticorner/contrasted,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -308,36 +317,12 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/closed/wall,
 /area/misc/anomaly_research)
-"jl" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
 "jt" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
-"jE" = (
-/obj/machinery/duct,
-/obj/structure/rack,
-/obj/item/reagent_containers/cup/bottle/ethanol{
-	pixel_x = -5;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/cup/bottle/chlorine{
-	pixel_x = 1
-	},
-/obj/item/reagent_containers/cup/bottle/carbon{
-	pixel_x = 7;
-	pixel_y = 3
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
 "jN" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -347,6 +332,15 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
+"ki" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
+	dir = 8
+	},
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/plating,
+/area/misc/anomaly_research)
 "kj" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/railing{
@@ -354,10 +348,18 @@
 	},
 /turf/open/lava/plasma/ice_moon,
 /area/misc/anomaly_research)
-"kp" = (
-/obj/effect/spawner/random/environmentally_safe_anomaly/immobile,
-/turf/template_noop,
-/area/space)
+"kt" = (
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+	dir = 1
+	},
+/obj/structure/table/reinforced,
+/obj/item/anomaly_neutralizer,
+/obj/item/anomaly_neutralizer,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
 "kw" = (
 /obj/effect/turf_decal/siding/purple{
 	dir = 1
@@ -365,18 +367,20 @@
 /obj/machinery/light/warm/no_nightlight/directional/north,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
+"kY" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/misc/anomaly_research)
 "lo" = (
 /obj/machinery/duct,
 /turf/open/floor/iron/freezer,
 /area/misc/anomaly_research)
-"lx" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 4
-	},
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
 "lz" = (
 /obj/effect/turf_decal/tile/purple/anticorner/contrasted,
 /obj/item/kirbyplants/random,
@@ -412,19 +416,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
-"mb" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/machinery/computer/rdconsole{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/misc/anomaly_research)
 "mk" = (
 /obj/structure/table/wood,
 /obj/item/paper/fluff/ruins/anomaly_research/intro,
@@ -435,18 +426,13 @@
 /obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
-"my" = (
-/obj/effect/turf_decal/tile/neutral{
+"mC" = (
+/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
 	dir = 8
 	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/office,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
+/turf/open/floor/iron/white,
 /area/misc/anomaly_research)
 "mE" = (
 /obj/effect/turf_decal/stripes/line{
@@ -462,16 +448,14 @@
 /obj/machinery/light/warm/no_nightlight/directional/north,
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
-"mY" = (
-/obj/machinery/light/warm/no_nightlight/directional/north,
-/obj/effect/turf_decal/tile/purple/half/contrasted{
-	dir = 1
+"mZ" = (
+/obj/effect/turf_decal/siding/purple{
+	dir = 5
 	},
+/obj/structure/table/reinforced,
+/obj/item/anomaly_neutralizer,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
-	},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
 "nh" = (
 /obj/effect/turf_decal/tile/neutral{
@@ -508,20 +492,6 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
-"nI" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
-"nS" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/obj/structure/window/plasma/spawner/directional/south,
-/turf/open/floor/iron/smooth,
-/area/misc/anomaly_research)
 "nU" = (
 /obj/effect/turf_decal/siding/purple{
 	dir = 5
@@ -549,22 +519,12 @@
 /obj/effect/turf_decal/box,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
-"ow" = (
-/obj/machinery/door/airlock{
-	name = "Unisex Restrooms"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/freezer,
-/area/misc/anomaly_research)
-"oF" = (
-/obj/effect/turf_decal/trimline/purple/corner,
+"oq" = (
+/obj/effect/turf_decal/siding/purple,
+/obj/structure/table/reinforced,
+/obj/item/melee/baton/security/cattleprod,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
 "oI" = (
 /obj/effect/turf_decal/tile/purple/half/contrasted{
@@ -574,6 +534,24 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
+"oK" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/machinery/computer/rdconsole{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/misc/anomaly_research)
+"pb" = (
+/obj/item/storage/box/lights/mixed,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/misc/anomaly_research)
 "pk" = (
 /obj/machinery/jukebox,
 /turf/open/floor/iron/dark/textured,
@@ -583,81 +561,54 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/wood,
 /area/misc/anomaly_research)
-"pn" = (
-/obj/effect/decal/cleanable/dirt,
+"ps" = (
+/obj/effect/spawner/random/trash/grime,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
+/turf/open/floor/plating,
 /area/misc/anomaly_research)
 "pu" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/engine,
 /area/misc/anomaly_research)
-"pE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
+"qr" = (
+/obj/structure/tank_dispenser/oxygen{
+	pixel_x = -1;
+	pixel_y = 2
 	},
-/turf/open/floor/iron/white,
+/turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
-"qa" = (
-/obj/effect/turf_decal/trimline/purple/corner{
-	dir = 8
+"qx" = (
+/obj/machinery/light/warm/no_nightlight/directional/north,
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
-"qj" = (
+"qH" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/sheet/glass/fifty,
 /obj/effect/turf_decal/tile/purple/anticorner/contrasted{
-	dir = 1
+	dir = 8
 	},
-/obj/machinery/recharge_station,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
-"qr" = (
-/obj/structure/tank_dispenser/oxygen{
-	pixel_x = -1;
-	pixel_y = 2
-	},
-/turf/open/floor/iron/smooth,
-/area/misc/anomaly_research)
-"qt" = (
-/obj/effect/spawner/random/trash/box,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
 "qM" = (
-/obj/effect/spawner/random/environmentally_safe_anomaly,
+/obj/effect/spawner/random/environmentally_safe_anomaly/bioscramblerless,
 /obj/effect/turf_decal/trimline/purple,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
-"rk" = (
-/obj/structure/table/reinforced,
-/obj/item/stack/sheet/glass/fifty,
-/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
-	dir = 8
-	},
+"rA" = (
+/obj/machinery/power/port_gen/pacman/pre_loaded,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
-"rD" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/obj/structure/window/plasma/spawner/directional/south,
-/turf/open/floor/iron/smooth,
+/turf/open/floor/plating,
 /area/misc/anomaly_research)
 "rX" = (
 /obj/machinery/duct,
@@ -674,13 +625,6 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
-"sp" = (
-/obj/item/kirbyplants/random,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
 "st" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -703,18 +647,50 @@
 	},
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
+"sE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
+"sF" = (
+/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
+	dir = 1
+	},
+/obj/machinery/recharge_station,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
+"sN" = (
+/obj/item/kirbyplants/random/fullysynthetic{
+	pixel_x = -8;
+	pixel_y = 21
+	},
+/turf/open/floor/wood,
+/area/misc/anomaly_research)
 "sU" = (
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
-"tp" = (
-/obj/machinery/light/small/built/directional/east,
-/obj/effect/spawner/random/trash/garbage,
-/obj/effect/spawner/random/trash/mopbucket,
+"sX" = (
+/obj/machinery/light/small/built/directional/north,
+/obj/effect/spawner/random/environmentally_safe_anomaly/bioscramblerless,
+/obj/item/reagent_containers/cup/bottle/wittel,
+/obj/effect/spawner/random/trash/grime,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/misc/anomaly_research)
+"tf" = (
+/obj/structure/bed/double,
+/obj/item/bedsheet/rd/double,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/misc/anomaly_research)
 "tw" = (
 /obj/structure/table/reinforced,
 /obj/item/taperecorder{
@@ -741,6 +717,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
+"tG" = (
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
 "tK" = (
 /obj/structure/chair/office{
 	dir = 1
@@ -779,6 +760,13 @@
 /obj/item/anomaly_releaser,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
+"uB" = (
+/obj/effect/turf_decal/siding/purple{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/misc/anomaly_research)
 "uG" = (
 /obj/structure/rack,
 /obj/item/clothing/shoes/winterboots,
@@ -790,6 +778,17 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
+"uL" = (
+/obj/structure/chair/office{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/purple/half/contrasted,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
 "uN" = (
 /obj/effect/turf_decal/tile/purple/anticorner/contrasted{
 	dir = 4
@@ -839,26 +838,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
-"vJ" = (
-/obj/effect/turf_decal/siding/purple{
-	dir = 1
-	},
-/obj/structure/chair/office,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/misc/anomaly_research)
-"vK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
-/area/misc/anomaly_research)
-"vS" = (
-/obj/effect/turf_decal/siding/purple,
-/obj/structure/table/reinforced,
-/obj/item/melee/baton/security/cattleprod,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/misc/anomaly_research)
 "vT" = (
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -866,22 +845,11 @@
 	},
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
-"vY" = (
-/obj/machinery/power/port_gen/pacman/pre_loaded,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
 "wb" = (
 /obj/effect/turf_decal/tile/yellow/half,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
-"wf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/moisture_trap,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
 "wg" = (
 /obj/effect/turf_decal/siding/purple{
 	dir = 10
@@ -890,28 +858,16 @@
 /obj/item/storage/box/monkeycubes,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
+"ww" = (
+/obj/machinery/light/warm/no_nightlight/directional/east,
+/turf/open/floor/wood,
+/area/misc/anomaly_research)
 "wz" = (
 /obj/structure/table/reinforced,
 /obj/item/anomaly_neutralizer,
 /obj/effect/turf_decal/stripes/white/line,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
-"wB" = (
-/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
-	dir = 8
-	},
-/obj/structure/chair/office,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
-"wW" = (
-/obj/machinery/autolathe,
-/obj/effect/turf_decal/tile/purple/half/contrasted{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
 "xa" = (
 /obj/structure/table/reinforced,
 /obj/structure/chem_separator,
@@ -925,33 +881,10 @@
 	},
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
-"xh" = (
-/obj/machinery/light/broken/directional/north,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
-"xj" = (
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/misc/anomaly_research)
 "xo" = (
 /obj/machinery/duct,
 /turf/closed/wall,
 /area/misc/anomaly_research)
-"xs" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
 "xE" = (
 /turf/open/lava/plasma/ice_moon,
 /area/misc/anomaly_research)
@@ -968,6 +901,11 @@
 /obj/effect/turf_decal/tile/yellow/half,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
+"xY" = (
+/obj/effect/spawner/random/trash/botanical_waste,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/misc/anomaly_research)
 "ya" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Mining Station Maintenance"
@@ -980,16 +918,12 @@
 /obj/structure/flora/grass/green/style_random,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/misc/anomaly_research)
-"yG" = (
-/obj/structure/chair/office{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/purple/half/contrasted,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 4
+"yv" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
 	},
-/turf/open/floor/iron/white,
+/obj/structure/window/plasma/spawner/directional/south,
+/turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
 "yJ" = (
 /obj/machinery/door/airlock/research/glass{
@@ -997,13 +931,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
-"yK" = (
-/obj/effect/turf_decal/siding/purple{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/misc/anomaly_research)
 "yR" = (
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
@@ -1030,31 +957,6 @@
 /obj/structure/statue/snow/snowman,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/misc/anomaly_research)
-"AF" = (
-/obj/machinery/duct,
-/obj/structure/rack,
-/obj/item/reagent_containers/cup/bottle/nitrogen{
-	pixel_x = 7;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/cup/bottle/oxygen{
-	pixel_x = 1
-	},
-/obj/item/reagent_containers/cup/bottle/mercury{
-	pixel_x = -5;
-	pixel_y = 3
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
-"AL" = (
-/obj/machinery/light/small/built/directional/north,
-/obj/effect/spawner/random/environmentally_safe_anomaly,
-/obj/item/reagent_containers/cup/bottle/wittel,
-/obj/effect/spawner/random/trash/grime,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
 "AO" = (
 /obj/structure/sign/warning/test_chamber,
 /turf/closed/wall,
@@ -1062,6 +964,25 @@
 "AV" = (
 /turf/closed/wall,
 /area/misc/anomaly_research)
+"Bq" = (
+/obj/effect/turf_decal/tile/purple/fourcorners,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
+"Bu" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/misc/anomaly_research)
 "BD" = (
 /obj/structure/rack,
 /obj/item/clothing/shoes/winterboots,
@@ -1076,23 +997,6 @@
 /obj/machinery/light/floor,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/misc/anomaly_research)
-"Cc" = (
-/obj/machinery/duct,
-/obj/structure/rack,
-/obj/item/reagent_containers/cup/bottle/iron{
-	pixel_x = -5;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/cup/bottle/multiver{
-	pixel_x = 1
-	},
-/obj/item/reagent_containers/cup/bottle/acidic_buffer{
-	pixel_x = 7;
-	pixel_y = 3
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
 "Ce" = (
 /obj/effect/turf_decal/tile/purple/half/contrasted{
 	dir = 8
@@ -1112,14 +1016,6 @@
 /obj/effect/spawner/structure/window/plasma,
 /turf/open/floor/plating,
 /area/misc/anomaly_research)
-"Cy" = (
-/obj/effect/turf_decal/siding/purple{
-	dir = 9
-	},
-/obj/machinery/monkey_recycler,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/misc/anomaly_research)
 "CI" = (
 /turf/open/floor/engine,
 /area/misc/anomaly_research)
@@ -1128,16 +1024,55 @@
 /obj/effect/spawner/random/clothing,
 /turf/open/floor/wood,
 /area/misc/anomaly_research)
+"CZ" = (
+/obj/effect/turf_decal/trimline/purple/line{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
+"Ds" = (
+/obj/effect/turf_decal/trimline/purple/corner{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
+"Dt" = (
+/obj/structure/rack,
+/obj/item/clothing/head/collectable/welding,
+/obj/item/weldingtool/largetank,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/misc/anomaly_research)
 "DV" = (
 /obj/effect/turf_decal/siding/purple{
 	dir = 8
 	},
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
+"Eb" = (
+/obj/machinery/autolathe,
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
 "Ek" = (
 /obj/structure/lattice,
 /turf/open/lava/plasma/ice_moon,
 /area/misc/anomaly_research)
+"En" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
 "Eo" = (
 /obj/structure/lattice,
 /obj/item/anomaly_releaser,
@@ -1151,15 +1086,54 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
+"Ew" = (
+/obj/machinery/duct,
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/ethanol{
+	pixel_x = -5;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/cup/bottle/chlorine{
+	pixel_x = 1
+	},
+/obj/item/reagent_containers/cup/bottle/carbon{
+	pixel_x = 7;
+	pixel_y = 3
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/misc/anomaly_research)
 "EE" = (
 /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
 	dir = 4
 	},
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
+"Fa" = (
+/obj/effect/spawner/random/environmentally_safe_anomaly/immobile,
+/turf/template_noop,
+/area/space/nearstation)
+"Ff" = (
+/obj/effect/turf_decal/trimline/purple/line,
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
 "Fg" = (
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
+"Fj" = (
+/obj/machinery/light/warm/no_nightlight/directional/north,
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
 "Fm" = (
 /obj/structure/window/reinforced/spawner/directional/south,
 /obj/structure/table,
@@ -1197,6 +1171,11 @@
 /obj/item/kirbyplants/random,
 /turf/open/floor/iron/dark/textured,
 /area/misc/anomaly_research)
+"FX" = (
+/obj/structure/sink/directional,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/freezer,
+/area/misc/anomaly_research)
 "Gc" = (
 /obj/structure/chair/office,
 /obj/effect/turf_decal/siding/purple{
@@ -1215,16 +1194,16 @@
 /obj/item/paperwork/research,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
-"Gi" = (
-/obj/item/kirbyplants/random/fullysynthetic{
-	pixel_x = -8;
-	pixel_y = 21
-	},
-/turf/open/floor/wood,
-/area/misc/anomaly_research)
 "Gj" = (
 /turf/open/floor/iron/dark/textured,
 /area/misc/anomaly_research)
+"Gr" = (
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
 "GG" = (
 /obj/effect/spawner/structure/window,
 /obj/machinery/duct,
@@ -1238,14 +1217,7 @@
 "GR" = (
 /obj/machinery/door/airlock/research,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
-"Hb" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
 "Hs" = (
@@ -1271,6 +1243,14 @@
 /obj/effect/turf_decal/siding/white,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
+"HN" = (
+/obj/structure/toilet{
+	pixel_y = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/iron/freezer,
+/area/misc/anomaly_research)
 "HO" = (
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/cup/beaker,
@@ -1290,12 +1270,13 @@
 	},
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
-"HY" = (
-/obj/item/stack/cable_coil,
+"HT" = (
+/obj/effect/turf_decal/trimline/purple/corner,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
+/turf/open/floor/iron/white,
 /area/misc/anomaly_research)
 "Ia" = (
 /obj/effect/turf_decal/siding/purple,
@@ -1303,48 +1284,32 @@
 /obj/item/anomaly_releaser,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
-"Ii" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
 "Is" = (
 /obj/machinery/duct,
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/iron/freezer,
 /area/misc/anomaly_research)
-"It" = (
-/obj/machinery/light/small/directional/east,
+"Iw" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
-	},
-/turf/open/floor/wood,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
+"IC" = (
+/obj/effect/spawner/structure/window/reinforced/plasma,
+/turf/open/floor/plating,
 /area/misc/anomaly_research)
 "IH" = (
 /obj/effect/spawner/random/big_anomaly,
 /turf/open/floor/engine,
 /area/misc/anomaly_research)
-"II" = (
-/obj/effect/turf_decal/siding/purple{
-	dir = 6
-	},
-/obj/structure/table/reinforced,
-/obj/item/reactive_armour_shell,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/misc/anomaly_research)
-"Jb" = (
+"IL" = (
+/obj/effect/turf_decal/tile/purple/half/contrasted,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
-"Jp" = (
-/obj/structure/window/spawner/directional/north,
-/obj/structure/flora/bush/flowers_br/style_random,
-/obj/machinery/light/broken/directional/south,
-/turf/open/floor/grass,
+/turf/open/floor/iron/white,
 /area/misc/anomaly_research)
 "Jw" = (
 /obj/effect/turf_decal/arrows/red,
@@ -1362,6 +1327,14 @@
 /obj/item/anomaly_neutralizer,
 /turf/open/floor/engine,
 /area/misc/anomaly_research)
+"JN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/iron/freezer,
+/area/misc/anomaly_research)
 "Kc" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Mining Station Maintenance"
@@ -1403,24 +1376,6 @@
 	},
 /turf/open/floor/wood,
 /area/misc/anomaly_research)
-"Lc" = (
-/obj/structure/toilet{
-	pixel_y = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/iron/freezer,
-/area/misc/anomaly_research)
-"Le" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical,
-/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
 "Lo" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -1440,6 +1395,11 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
+"LH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/trash/moisture_trap,
+/turf/open/floor/plating,
+/area/misc/anomaly_research)
 "LL" = (
 /obj/structure/flora/grass/brown/style_random,
 /turf/open/misc/asteroid/snow/icemoon,
@@ -1453,6 +1413,21 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
+"LW" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/mechanical,
+/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
+"LZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/misc/anomaly_research)
 "Mg" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/railing{
@@ -1476,10 +1451,11 @@
 /obj/machinery/light/floor,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/misc/anomaly_research)
-"Nc" = (
-/obj/structure/sink/directional,
+"MX" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/freezer,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
 /area/misc/anomaly_research)
 "Ng" = (
 /obj/effect/turf_decal/trimline/purple/line,
@@ -1490,14 +1466,6 @@
 /obj/structure/sign/warning/cold_temp,
 /turf/closed/wall,
 /area/misc/anomaly_research)
-"NM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 4
-	},
-/turf/open/floor/iron/freezer,
-/area/misc/anomaly_research)
 "NP" = (
 /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
 	dir = 8
@@ -1505,12 +1473,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
-"NR" = (
-/obj/structure/reagent_dispensers/plumbed,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
 "Oa" = (
 /obj/effect/decal/cleanable/oil/slippery,
 /obj/effect/turf_decal/tile/purple/opposingcorners,
@@ -1538,13 +1500,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
-"Op" = (
-/obj/machinery/duct,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/freezer,
-/area/misc/anomaly_research)
 "Oq" = (
 /obj/structure/table/glass,
 /obj/item/paper_bin,
@@ -1552,6 +1507,25 @@
 /obj/effect/turf_decal/siding/white,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
+"Ov" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
+"Ox" = (
+/obj/structure/window/spawner/directional/north,
+/obj/structure/flora/bush/flowers_br/style_random,
+/obj/machinery/light/broken/directional/south,
+/turf/open/floor/grass,
+/area/misc/anomaly_research)
+"OL" = (
+/obj/item/stack/cable_coil,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/misc/anomaly_research)
 "PQ" = (
 /obj/machinery/atmospherics/components/unary/passive_vent/layer2{
 	dir = 1
@@ -1562,21 +1536,19 @@
 "PY" = (
 /turf/open/floor/wood,
 /area/misc/anomaly_research)
-"Qh" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
-	dir = 8
-	},
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
 "Qp" = (
 /obj/machinery/door/airlock/wood,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/wood,
 /area/misc/anomaly_research)
+"Qq" = (
+/obj/effect/turf_decal/tile/purple/half/contrasted{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
 "Qr" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -1584,6 +1556,12 @@
 /obj/item/anomaly_releaser,
 /turf/open/floor/engine,
 /area/misc/anomaly_research)
+"Qu" = (
+/obj/machinery/light/broken/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
 "Qw" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/railing{
@@ -1598,6 +1576,23 @@
 /obj/structure/closet/radiation,
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
+"QI" = (
+/obj/machinery/duct,
+/obj/structure/rack,
+/obj/item/reagent_containers/cup/bottle/nitrogen{
+	pixel_x = 7;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/cup/bottle/oxygen{
+	pixel_x = 1
+	},
+/obj/item/reagent_containers/cup/bottle/mercury{
+	pixel_x = -5;
+	pixel_y = 3
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/misc/anomaly_research)
 "QP" = (
 /obj/effect/turf_decal/tile/purple/opposingcorners,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1610,6 +1605,16 @@
 	},
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
+"RC" = (
+/obj/structure/fireplace{
+	pixel_x = -32
+	},
+/obj/item/kirbyplants/random/fullysynthetic{
+	pixel_x = 10;
+	pixel_y = 19
+	},
+/turf/open/floor/wood,
+/area/misc/anomaly_research)
 "RN" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 6
@@ -1625,12 +1630,6 @@
 	},
 /turf/open/floor/engine,
 /area/misc/anomaly_research)
-"Sj" = (
-/obj/structure/table/reinforced,
-/obj/machinery/chem_mass_spec,
-/obj/effect/turf_decal/siding/white,
-/turf/open/floor/iron/dark,
-/area/misc/anomaly_research)
 "Sm" = (
 /obj/effect/turf_decal/tile/yellow/half,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -1648,14 +1647,6 @@
 /obj/effect/turf_decal/siding/white,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
-"Ss" = (
-/obj/effect/spawner/structure/window/reinforced/plasma,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
-"Sv" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
 "SQ" = (
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/stripes/white/line,
@@ -1672,14 +1663,6 @@
 /obj/item/pickaxe,
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
-"SX" = (
-/obj/effect/spawner/random/environmentally_safe_anomaly,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
 "Tp" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin,
@@ -1690,18 +1673,24 @@
 /obj/item/flashlight/lamp,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
-"Ts" = (
-/obj/machinery/light/warm/no_nightlight/directional/north,
-/obj/effect/turf_decal/tile/purple/half/contrasted{
-	dir = 1
-	},
+"Tt" = (
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
+/turf/open/floor/wood,
 /area/misc/anomaly_research)
 "TE" = (
 /obj/structure/fluff/fokoff_sign,
 /turf/open/misc/asteroid/snow/airless,
 /area/misc/anomaly_research)
+"TF" = (
+/obj/effect/spawner/random/structure/closet_private,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/wood,
+/area/misc/anomaly_research)
+"TN" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/window/plasma/spawner/directional/south,
+/turf/open/floor/iron/smooth,
+/area/misc/anomaly_research)
 "TU" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/iron/smooth,
@@ -1735,13 +1724,6 @@
 /obj/effect/turf_decal/siding/white,
 /turf/open/floor/iron/dark,
 /area/misc/anomaly_research)
-"Vy" = (
-/obj/effect/spawner/random/trash/grime,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/misc/anomaly_research)
 "VL" = (
 /obj/structure/table/wood,
 /turf/open/floor/wood,
@@ -1756,9 +1738,13 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
-"Wg" = (
-/obj/machinery/light/warm/no_nightlight/directional/east,
-/turf/open/floor/wood,
+"Wi" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/iron/white,
 /area/misc/anomaly_research)
 "Wy" = (
 /obj/structure/chair/comfy/brown{
@@ -1770,6 +1756,13 @@
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
+"WB" = (
+/obj/item/kirbyplants/random,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/iron/white,
+/area/misc/anomaly_research)
 "WD" = (
 /obj/effect/turf_decal/siding/purple,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1784,10 +1777,14 @@
 	},
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
-"WO" = (
-/obj/item/storage/box/lights/mixed,
+"Xo" = (
+/obj/machinery/door/airlock{
+	name = "Unisex Restrooms"
+	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/freezer,
 /area/misc/anomaly_research)
 "Xp" = (
 /obj/structure/fence{
@@ -1802,12 +1799,6 @@
 /obj/structure/tank_holder/oxygen/yellow,
 /turf/open/floor/iron/smooth,
 /area/misc/anomaly_research)
-"Xv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/oil/slippery,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/turf/open/floor/iron/white,
-/area/misc/anomaly_research)
 "XH" = (
 /obj/item/shovel/spade,
 /turf/open/misc/asteroid/snow/icemoon,
@@ -1815,18 +1806,19 @@
 "Ya" = (
 /turf/closed/mineral/snowmountain/cavern,
 /area/misc/anomaly_research)
+"Yo" = (
+/obj/machinery/light/small/built/directional/east,
+/obj/effect/spawner/random/trash/garbage,
+/obj/effect/spawner/random/trash/mopbucket,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/misc/anomaly_research)
 "YA" = (
 /obj/structure/window/spawner/directional/north,
 /obj/structure/window/spawner/directional/west,
 /obj/structure/flora/bush/flowers_br/style_random,
 /turf/open/floor/grass,
 /area/misc/anomaly_research)
-"YB" = (
-/obj/structure/bed/double,
-/obj/item/bedsheet/rd/double,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood,
-/area/misc/anomaly_research)
 "YU" = (
 /obj/structure/fence/door,
 /turf/open/misc/asteroid/snow/icemoon,
@@ -1862,15 +1854,23 @@
 "ZJ" = (
 /turf/open/misc/asteroid/snow/icemoon,
 /area/misc/anomaly_research)
-"ZM" = (
-/turf/open/misc/asteroid/snow/airless,
-/area/misc/anomaly_research)
-"ZQ" = (
-/obj/effect/turf_decal/trimline/purple/line,
+"ZL" = (
+/obj/effect/spawner/random/environmentally_safe_anomaly/bioscramblerless,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/purple/opposingcorners,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/white,
 /area/misc/anomaly_research)
+"ZM" = (
+/turf/open/misc/asteroid/snow/airless,
+/area/misc/anomaly_research)
+"ZO" = (
+/obj/structure/table/reinforced,
+/obj/machinery/chem_mass_spec,
+/obj/effect/turf_decal/siding/white,
+/turf/open/floor/iron/dark,
+/area/misc/anomaly_research)
 "ZX" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -1898,7 +1898,7 @@ RT
 RT
 RT
 RT
-kp
+Fa
 RT
 RT
 RT
@@ -1917,10 +1917,10 @@ RT
 RT
 RT
 RT
-kp
+Fa
 "}
 (2,1,1) = {"
-kp
+Fa
 RT
 RT
 Ya
@@ -2160,11 +2160,11 @@ dr
 xE
 xE
 AV
-Ss
-Ss
-Ss
-Ss
-Ss
+IC
+IC
+IC
+IC
+IC
 AV
 AV
 AV
@@ -2231,10 +2231,10 @@ Ya
 Ya
 Ya
 xE
-Ss
-Ss
-Ss
-Ss
+IC
+IC
+IC
+IC
 AV
 Lb
 eU
@@ -2269,7 +2269,7 @@ Ya
 Ya
 Ya
 xE
-Ss
+IC
 UD
 UD
 UD
@@ -2307,10 +2307,10 @@ Ya
 Ya
 Ya
 xE
-Ss
+IC
 UD
-Ss
-Ss
+IC
+IC
 AV
 VL
 VL
@@ -2345,22 +2345,22 @@ Ya
 Ya
 xE
 xE
-Ss
+IC
 UD
-Ss
+IC
 dr
 AV
-Gi
+sN
 Wy
 VL
 As
 Gj
 AV
-Vy
-Jb
-HY
-WO
-wf
+ps
+MX
+OL
+pb
+LH
 AV
 xE
 xE
@@ -2388,17 +2388,17 @@ cy
 AV
 xE
 AV
-eZ
-Wg
+RC
+ww
 PY
 As
 pk
 AV
-vY
-dU
-Qh
-tp
-qt
+rA
+Dt
+ki
+Yo
+gF
 AV
 AV
 AV
@@ -2418,8 +2418,8 @@ RT
 Ya
 Ya
 AV
-Le
-rk
+LW
+qH
 yR
 sU
 QP
@@ -2442,7 +2442,7 @@ xE
 AV
 qr
 ZX
-nS
+hK
 xE
 xE
 xE
@@ -2456,8 +2456,8 @@ RT
 Ya
 Ya
 AV
-wW
-yG
+Eb
+uL
 yR
 Kh
 QP
@@ -2480,7 +2480,7 @@ xE
 AV
 fw
 Hs
-cF
+TN
 xE
 xE
 Ya
@@ -2494,8 +2494,8 @@ RT
 Ya
 Ya
 AV
-Ts
-jl
+qx
+IL
 bB
 QP
 QP
@@ -2518,7 +2518,7 @@ xE
 AV
 mS
 Hs
-cF
+TN
 xE
 xE
 Ya
@@ -2538,7 +2538,7 @@ yR
 Ls
 QP
 MG
-mY
+Fj
 Fg
 eq
 eA
@@ -2556,7 +2556,7 @@ xE
 AV
 Uo
 zu
-rD
+yv
 xE
 xE
 Ya
@@ -2576,9 +2576,9 @@ yR
 Ls
 QP
 AV
-fO
-Hb
-Hb
+Bq
+Qq
+Qq
 Uz
 Qr
 RN
@@ -2669,7 +2669,7 @@ xE
 Ya
 Ya
 ZM
-kp
+Fa
 RT
 RT
 RT
@@ -2712,7 +2712,7 @@ RT
 RT
 RT
 RT
-kp
+Fa
 RT
 RT
 RT
@@ -2760,7 +2760,7 @@ RT
 RT
 Ya
 AV
-Sj
+ZO
 nZ
 LU
 NP
@@ -2795,7 +2795,7 @@ RT
 "}
 (25,1,1) = {"
 RT
-kp
+Fa
 Ya
 AV
 So
@@ -2899,7 +2899,7 @@ ZM
 RT
 RT
 RT
-kp
+Fa
 RT
 RT
 RT
@@ -2956,7 +2956,7 @@ rX
 xo
 xo
 aX
-Ii
+tG
 Cl
 xE
 xE
@@ -2989,12 +2989,12 @@ Ya
 Ya
 Ya
 AV
-gg
-jE
+xY
+Ew
 AV
 lL
 QP
-Ii
+tG
 Cl
 xE
 xE
@@ -3027,12 +3027,12 @@ Ya
 Ya
 Ya
 AV
-AL
-AF
+sX
+QI
 AV
 SQ
-nI
-Ii
+Iw
+tG
 Cl
 Cl
 AV
@@ -3065,14 +3065,14 @@ Ya
 Ya
 Ya
 AV
-NR
-Cc
+ba
+fv
 AV
 wz
-nI
-Xv
-Ii
-Ii
+Iw
+Ov
+tG
+tG
 AV
 Ya
 xE
@@ -3107,10 +3107,10 @@ AV
 xo
 AV
 GI
-nI
-Cy
+Iw
+iK
 wg
-Ii
+tG
 AV
 Ya
 xE
@@ -3145,10 +3145,10 @@ it
 lo
 AV
 ok
-nI
-yK
-vS
-Ii
+Iw
+uB
+oq
+tG
 AV
 Ya
 xE
@@ -3183,10 +3183,10 @@ Is
 sv
 AV
 sg
-nI
-vJ
+Iw
+hU
 Ia
-Ii
+tG
 AV
 Ya
 Ya
@@ -3217,14 +3217,14 @@ RT
 Ya
 Ya
 AV
-Nc
-Op
+FX
+ds
 AV
-xh
-nI
-fm
-II
-lx
+Qu
+Iw
+mZ
+eT
+Wi
 AV
 AV
 AV
@@ -3255,15 +3255,15 @@ RT
 Ya
 Ya
 AV
-Lc
-NM
+HN
+JN
 AV
-sp
-nI
-nI
-pn
-nI
-Ii
+WB
+Iw
+Iw
+iq
+Iw
+tG
 xQ
 AV
 nA
@@ -3294,15 +3294,15 @@ Ya
 Ya
 AV
 AV
-ow
+Xo
 AV
-cA
-cA
-cA
-gA
+ii
+ii
+ii
+eW
 QP
-oF
-aP
+HT
+CZ
 cy
 Jw
 KP
@@ -3332,14 +3332,14 @@ Ya
 Ya
 Ya
 AV
-my
-xj
-mb
+Bu
+kY
+oK
 ip
-cA
-Ii
-nI
-ZQ
+ii
+tG
+Iw
+fe
 YA
 AV
 Qz
@@ -3370,15 +3370,15 @@ RT
 Ya
 Ya
 AV
-qj
-xs
-wB
+sF
+Gr
+mC
 nh
-cA
-Ii
-SX
+ii
+tG
+ZL
 Ng
-Jp
+Ox
 AV
 AV
 AV
@@ -3404,18 +3404,18 @@ Ya
 (41,1,1) = {"
 RT
 RT
-kp
+Fa
 Ya
 Ya
 AV
-gr
-Sv
+kt
+En
 dy
 Gg
-cA
+ii
 Ls
-nI
-ft
+Iw
+Ff
 dj
 AV
 un
@@ -3452,9 +3452,9 @@ Ft
 lX
 GR
 QP
-nI
-qa
-iw
+Iw
+Ds
+gB
 cy
 HE
 Zh
@@ -3488,10 +3488,10 @@ uN
 vG
 lz
 ut
-cA
+ii
 Cf
-pE
-Ii
+sE
+tG
 xQ
 AV
 jN
@@ -3599,8 +3599,8 @@ Ya
 Ya
 AV
 UC
-vK
-bG
+LZ
+Tt
 PY
 Cl
 xE
@@ -3636,10 +3636,10 @@ Ya
 Ya
 Ya
 AV
-eO
-It
-bG
-YB
+TF
+ev
+Tt
+tf
 Cl
 xE
 xE
@@ -3777,7 +3777,7 @@ Ya
 Ya
 Ya
 RT
-kp
+Fa
 RT
 RT
 "}
@@ -3820,7 +3820,7 @@ RT
 RT
 "}
 (52,1,1) = {"
-kp
+Fa
 RT
 RT
 RT
@@ -3835,7 +3835,7 @@ RT
 RT
 RT
 RT
-kp
+Fa
 RT
 RT
 RT
diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm
index c2f9358826dd..b89034d1e3b3 100644
--- a/_maps/RandomRuins/SpaceRuins/bus.dmm
+++ b/_maps/RandomRuins/SpaceRuins/bus.dmm
@@ -9,50 +9,6 @@
 /obj/item/trash/sosjerky,
 /turf/template_noop,
 /area/template_noop)
-"ad" = (
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"ae" = (
-/mob/living/basic/lizard,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"af" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"ag" = (
-/obj/item/stack/rods/fifty,
-/obj/item/stock_parts/servo/femto,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"ah" = (
-/obj/item/stack/cable_coil{
-	amount = 5
-	},
-/obj/item/shard{
-	icon_state = "small"
-	},
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"ai" = (
-/obj/item/book/random,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"aj" = (
-/obj/structure/fluff/bus/dense,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"ak" = (
-/obj/structure/fluff/bus/passable{
-	icon_state = "wheredahoodat"
-	},
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"al" = (
-/obj/effect/decal/cleanable/food/salt,
-/obj/item/reagent_containers/condiment/saltshaker,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
 "am" = (
 /obj/structure/fluff/bus/passable/seat,
 /obj/effect/decal/cleanable/dirt,
@@ -60,110 +16,6 @@
 	icon_state = "bus"
 	},
 /area/ruin/space)
-"an" = (
-/obj/structure/fluff/bus/passable/seat,
-/obj/item/toy/plush/pkplush{
-	pixel_z = 17
-	},
-/turf/open/floor/iron/dark/airless{
-	icon_state = "bus"
-	},
-/area/ruin/space)
-"ao" = (
-/obj/structure/fluff/bus/passable/seat,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/food/grown/tomato{
-	offset_at_init = 0;
-	pixel_z = 23;
-	pixel_y = 2
-	},
-/obj/item/food/donut/plain{
-	pixel_z = 15;
-	pixel_y = 1;
-	pixel_x = 1
-	},
-/obj/effect/decal/cleanable/ants{
-	pixel_z = 8;
-	pixel_x = 9
-	},
-/turf/open/floor/iron/dark/airless{
-	icon_state = "bus"
-	},
-/area/ruin/space)
-"ap" = (
-/obj/structure/fluff/bus/passable/seat{
-	pixel_y = 15
-	},
-/obj/item/toy/plush/lizard_plushie/green{
-	pixel_z = 17
-	},
-/turf/open/floor/iron/dark/airless{
-	icon_state = "bus"
-	},
-/area/ruin/space)
-"aq" = (
-/obj/structure/fluff/bus/passable/seat,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/head/helmet/knight{
-	pixel_z = 16
-	},
-/turf/open/floor/iron/dark/airless{
-	icon_state = "bus"
-	},
-/area/ruin/space)
-"ar" = (
-/obj/structure/fluff/bus/passable/seat,
-/obj/item/grown/novaflower{
-	offset_at_init = 0;
-	pixel_z = 24;
-	pixel_y = 1
-	},
-/obj/item/food/grown/watermelon{
-	offset_at_init = 0;
-	pixel_z = 17
-	},
-/turf/open/floor/iron/dark/airless{
-	icon_state = "bus"
-	},
-/area/ruin/space)
-"as" = (
-/obj/structure/fluff/bus/passable/seat/driver,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/toy/plush/moth{
-	pixel_z = 26;
-	pixel_y = 2
-	},
-/obj/item/food/grown/citrus/orange{
-	offset_at_init = 0;
-	pixel_z = 18;
-	pixel_y = 1
-	},
-/obj/item/toy/talking/ai{
-	pixel_z = 16
-	},
-/turf/open/floor/iron/dark/airless{
-	icon_state = "bus"
-	},
-/area/ruin/space)
-"at" = (
-/obj/structure/fluff/bus/dense{
-	icon_state = "hoodtop"
-	},
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"au" = (
-/obj/item/clothing/head/cone,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"av" = (
-/obj/structure/table,
-/obj/item/pai_card,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"aw" = (
-/obj/effect/decal/cleanable/oil,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
 "ax" = (
 /obj/structure/fluff/bus/passable,
 /obj/effect/decal/cleanable/dirt,
@@ -171,13 +23,6 @@
 	icon_state = "bus"
 	},
 /area/ruin/space)
-"ay" = (
-/obj/structure/fluff/bus/passable,
-/obj/item/storage/medkit/regular,
-/turf/open/floor/iron/dark/airless{
-	icon_state = "bus"
-	},
-/area/ruin/space)
 "az" = (
 /obj/structure/fluff/bus/passable,
 /turf/open/floor/iron/dark/airless{
@@ -225,112 +70,131 @@
 	icon_state = "bus"
 	},
 /area/ruin/space)
-"aF" = (
-/obj/structure/fluff/bus/dense{
-	icon_state = "hoodbottom"
-	},
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"aG" = (
+"aV" = (
 /obj/structure/fluff/bus/passable/seat,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"aH" = (
-/obj/structure/table,
-/obj/item/reagent_containers/cup/glass/coffee,
-/turf/open/misc/asteroid/airless,
+/obj/effect/decal/remains/human,
+/turf/open/floor/iron/dark/airless{
+	icon_state = "bus"
+	},
 /area/ruin/space)
-"aI" = (
-/obj/structure/fluff/bus/dense{
-	icon_state = "frontwallbottomrear"
+"aW" = (
+/obj/structure/fluff/bus/passable/seat/driver,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/banhammer{
+	pixel_z = 22
+	},
+/turf/open/floor/iron/dark/airless{
+	icon_state = "bus"
 	},
-/turf/open/misc/asteroid/airless,
 /area/ruin/space)
-"aJ" = (
-/obj/structure/fluff/bus/dense{
-	icon_state = "frontwallbottom"
+"aZ" = (
+/obj/structure/fluff/bus/passable,
+/obj/structure/sacrificealtar,
+/turf/open/floor/iron/dark/airless{
+	icon_state = "bus"
 	},
-/turf/open/misc/asteroid/airless,
 /area/ruin/space)
-"aK" = (
-/obj/structure/fluff/bus/dense{
-	icon_state = "reartire"
+"ip" = (
+/obj/structure/fluff/bus/passable/seat,
+/obj/item/toy/plush/pkplush{
+	pixel_z = 17
 	},
+/turf/open/floor/iron/dark/airless{
+	icon_state = "bus"
+	},
+/area/ruin/space)
+"iE" = (
+/obj/structure/table,
+/obj/item/pai_card,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
-"aL" = (
-/obj/structure/fluff/bus/dense{
-	icon_state = "frontwallbottom"
+"iM" = (
+/obj/structure/fluff/bus/passable/seat,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/toy/singlecard{
+	pixel_z = 24;
+	pixel_y = 1;
+	pixel_x = 0
+	},
+/obj/item/food/grown/potato{
+	offset_at_init = 0;
+	pixel_z = 15
+	},
+/turf/open/floor/iron/dark/airless{
+	icon_state = "bus"
 	},
-/obj/effect/decal/cleanable/oil,
-/turf/open/misc/asteroid/airless,
 /area/ruin/space)
-"aM" = (
+"iW" = (
 /obj/structure/fluff/bus/passable{
 	icon_state = "bottomdoor";
 	layer = 3
 	},
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
-"aN" = (
-/obj/structure/fluff/bus/dense{
-	icon_state = "fronttire"
-	},
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"aO" = (
-/obj/effect/decal/cleanable/robot_debris/old,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"aQ" = (
-/obj/item/reagent_containers/cup/rag,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"aR" = (
+"jH" = (
 /obj/item/storage/toolbox/mechanical,
 /obj/effect/decal/cleanable/oil,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
-"aS" = (
-/obj/item/clothing/head/helmet/space,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
-"aT" = (
-/obj/effect/decal/remains/human,
+"kn" = (
 /obj/item/clothing/head/helmet/space,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
-"aV" = (
+"mN" = (
 /obj/structure/fluff/bus/passable/seat,
-/obj/effect/decal/remains/human,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/clothing/head/helmet/knight{
+	pixel_z = 16
+	},
 /turf/open/floor/iron/dark/airless{
 	icon_state = "bus"
 	},
 /area/ruin/space)
-"aW" = (
-/obj/structure/fluff/bus/passable/seat/driver,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/banhammer{
-	pixel_z = 22
+"oL" = (
+/obj/structure/fluff/bus/passable/seat{
+	pixel_y = 15
+	},
+/obj/item/toy/plush/lizard_plushie/green{
+	pixel_z = 17
 	},
 /turf/open/floor/iron/dark/airless{
 	icon_state = "bus"
 	},
 /area/ruin/space)
-"aX" = (
-/obj/effect/decal/cleanable/shreds,
+"sl" = (
+/obj/effect/decal/remains/human,
+/obj/item/clothing/head/helmet/space,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
-"aY" = (
-/obj/effect/decal/remains/human,
-/obj/item/clothing/suit/space,
+"sI" = (
+/obj/structure/fluff/bus/passable/seat,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
-"bb" = (
-/obj/item/stack/sheet/iron/fifty,
+"uO" = (
+/obj/item/reagent_containers/cup/rag,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
-"iG" = (
+"uW" = (
+/obj/structure/fluff/bus/passable/seat,
+/obj/item/grown/novaflower{
+	offset_at_init = 0;
+	pixel_z = 24;
+	pixel_y = 1
+	},
+/obj/item/food/grown/watermelon{
+	offset_at_init = 0;
+	pixel_z = 17
+	},
+/turf/open/floor/iron/dark/airless{
+	icon_state = "bus"
+	},
+/area/ruin/space)
+"wc" = (
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/coffee,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"wd" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/toy/plush/awakenedplushie{
 	pixel_z = 26;
@@ -346,14 +210,26 @@
 	icon_state = "bus"
 	},
 /area/ruin/space)
-"zB" = (
-/obj/structure/fluff/bus/passable,
-/obj/structure/sacrificealtar,
+"wD" = (
+/obj/item/stack/sheet/iron/fifty,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"xf" = (
+/obj/structure/fluff/bus/passable/seat,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/bodypart/arm/right{
+	pixel_z = 25;
+	pixel_y = 1;
+	pixel_x = -4
+	},
+/obj/item/food/meat/slab/penguin{
+	pixel_z = 13
+	},
 /turf/open/floor/iron/dark/airless{
 	icon_state = "bus"
 	},
 /area/ruin/space)
-"Qh" = (
+"xr" = (
 /obj/machinery/telecomms/server{
 	pixel_z = 12;
 	layer = 2.91;
@@ -362,40 +238,164 @@
 	},
 /turf/closed/mineral/ash_rock,
 /area/ruin/space)
-"TG" = (
+"yC" = (
 /obj/structure/fluff/bus/passable/seat,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/bodypart/arm/right{
-	pixel_z = 25;
+/obj/item/food/grown/tomato{
+	offset_at_init = 0;
+	pixel_z = 23;
+	pixel_y = 2
+	},
+/obj/item/food/donut/plain{
+	pixel_z = 15;
 	pixel_y = 1;
-	pixel_x = -4
+	pixel_x = 1
 	},
-/obj/item/food/meat/slab/penguin{
-	pixel_z = 13
+/obj/effect/decal/cleanable/ants{
+	pixel_z = 8;
+	pixel_x = 9
 	},
 /turf/open/floor/iron/dark/airless{
 	icon_state = "bus"
 	},
 /area/ruin/space)
-"XA" = (
-/obj/structure/fluff/bus/passable/seat,
+"yY" = (
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Bw" = (
+/obj/effect/decal/cleanable/oil,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"CO" = (
+/obj/item/book/random,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"CP" = (
+/obj/structure/fluff/bus/dense{
+	icon_state = "fronttire"
+	},
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Ds" = (
+/obj/item/stack/rods/fifty,
+/obj/item/stock_parts/servo/femto,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"ER" = (
+/obj/structure/fluff/bus/dense{
+	icon_state = "frontwallbottomrear"
+	},
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Fo" = (
+/obj/item/stack/cable_coil{
+	amount = 5
+	},
+/obj/item/shard{
+	icon_state = "small"
+	},
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Gf" = (
+/obj/effect/decal/remains/human,
+/obj/item/clothing/suit/space,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Gt" = (
+/obj/structure/closet/crate/grave,
+/obj/item/clothing/head/collectable/swat,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Hb" = (
+/obj/item/clothing/head/cone,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"HN" = (
+/obj/structure/fluff/bus/passable/seat/driver,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/toy/singlecard{
-	pixel_z = 24;
-	pixel_y = 1;
-	pixel_x = 0
+/obj/item/toy/plush/moth{
+	pixel_z = 26;
+	pixel_y = 2
 	},
-/obj/item/food/grown/potato{
+/obj/item/food/grown/citrus/orange{
 	offset_at_init = 0;
-	pixel_z = 15
+	pixel_z = 18;
+	pixel_y = 1
+	},
+/obj/item/toy/talking/ai{
+	pixel_z = 16
 	},
 /turf/open/floor/iron/dark/airless{
 	icon_state = "bus"
 	},
 /area/ruin/space)
-"XK" = (
-/obj/structure/closet/crate/grave,
-/obj/item/clothing/head/collectable/swat,
+"IQ" = (
+/obj/structure/fluff/bus/dense{
+	icon_state = "frontwallbottom"
+	},
+/obj/effect/decal/cleanable/oil,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"KK" = (
+/obj/structure/fluff/bus/dense{
+	icon_state = "frontwallbottom"
+	},
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Ne" = (
+/obj/structure/fluff/bus/dense,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Nm" = (
+/obj/effect/decal/cleanable/food/salt,
+/obj/item/reagent_containers/condiment/saltshaker,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Nx" = (
+/mob/living/basic/lizard/space,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Qd" = (
+/obj/effect/decal/cleanable/shreds,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"UD" = (
+/obj/structure/fluff/bus/dense{
+	icon_state = "hoodtop"
+	},
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Vw" = (
+/obj/structure/fluff/bus/passable{
+	icon_state = "wheredahoodat"
+	},
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Wn" = (
+/obj/effect/decal/cleanable/robot_debris/old,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"WQ" = (
+/obj/structure/fluff/bus/dense{
+	icon_state = "hoodbottom"
+	},
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Xj" = (
+/obj/structure/fluff/bus/dense{
+	icon_state = "reartire"
+	},
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
+"Xl" = (
+/obj/structure/fluff/bus/passable,
+/obj/item/storage/medkit/regular,
+/turf/open/floor/iron/dark/airless{
+	icon_state = "bus"
+	},
+/area/ruin/space)
+"Za" = (
+/obj/structure/reagent_dispensers/fueltank,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
 
@@ -408,14 +408,14 @@ aa
 ab
 ab
 ab
-ad
-ad
-ad
-au
+yY
+yY
+yY
+Hb
 aa
-ad
-ad
-ad
+yY
+yY
+yY
 aa
 aa
 "}
@@ -428,15 +428,15 @@ ab
 ab
 ab
 ab
-ad
-ad
-aw
-ad
-ad
-ad
-ad
-ad
-ad
+yY
+yY
+Bw
+yY
+yY
+yY
+yY
+yY
+yY
 aa
 "}
 (3,1,1) = {"
@@ -448,16 +448,16 @@ ab
 ab
 ab
 ab
-ad
-aw
-ad
-ad
-aj
+yY
+Bw
+yY
+yY
+Ne
 am
-zB
-aI
-ad
-ad
+aZ
+ER
+yY
+yY
 "}
 (4,1,1) = {"
 aa
@@ -467,17 +467,17 @@ ab
 ab
 ab
 ab
-ad
-al
-ad
-ad
-ad
-aj
+yY
+Nm
+yY
+yY
+yY
+Ne
 am
 ax
-aK
-ad
-ad
+Xj
+yY
+yY
 "}
 (5,1,1) = {"
 aa
@@ -486,18 +486,18 @@ ab
 ab
 ab
 ab
-ad
-ad
-ad
-ad
-aw
-ad
-aj
+yY
+yY
+yY
+yY
+Bw
+yY
+Ne
 aV
 az
-aL
-ad
-ad
+IQ
+yY
+yY
 "}
 (6,1,1) = {"
 aa
@@ -505,19 +505,19 @@ aa
 ab
 ab
 ab
-XK
-ad
-aj
-iG
+Gt
+yY
+Ne
+wd
 ax
-aI
-ad
-aj
+ER
+yY
+Ne
 am
 az
-aJ
-ad
-ad
+KK
+yY
+yY
 "}
 (7,1,1) = {"
 aa
@@ -525,19 +525,19 @@ ab
 ab
 ab
 ab
-ad
-ad
-aj
-an
-ay
-aJ
-ad
-aj
+yY
+yY
+Ne
+ip
+Xl
+KK
+yY
+Ne
 aW
 aE
-aM
-ad
-ad
+iW
+yY
+yY
 "}
 (8,1,1) = {"
 aa
@@ -545,19 +545,19 @@ ab
 ab
 ab
 ab
-ae
-ad
-aj
-XA
+Nx
+yY
+Ne
+iM
 az
-aK
-ad
-ak
-at
-aF
-aN
-ad
-ad
+Xj
+yY
+Vw
+UD
+WQ
+CP
+yY
+yY
 "}
 (9,1,1) = {"
 ab
@@ -566,17 +566,17 @@ ab
 ab
 ab
 ab
-ad
-aj
-ao
+yY
+Ne
+yC
 aA
-aJ
-aQ
-ad
-aX
-ad
-ad
-ad
+KK
+uO
+yY
+Qd
+yY
+yY
+yY
 aa
 "}
 (10,1,1) = {"
@@ -586,17 +586,17 @@ ab
 ab
 ab
 ab
-ad
-aj
-ap
+yY
+Ne
+oL
 aB
-aJ
-ad
-aR
-ad
-ad
-au
-ad
+KK
+yY
+jH
+yY
+yY
+Hb
+yY
 aa
 "}
 (11,1,1) = {"
@@ -606,16 +606,16 @@ ab
 ab
 ab
 ab
-ad
-aj
-aq
+yY
+Ne
+mN
 aC
-aL
-ad
-ad
-aY
-ad
-ad
+IQ
+yY
+yY
+Gf
+yY
+yY
 aa
 aa
 "}
@@ -625,17 +625,17 @@ ab
 ab
 ab
 ab
-af
-ad
-aj
-ar
+Za
+yY
+Ne
+uW
 ax
-aJ
-ad
-aS
-ad
-bb
-ad
+KK
+yY
+kn
+yY
+wD
+yY
 aa
 aa
 "}
@@ -645,17 +645,17 @@ ab
 ab
 ab
 ab
-ag
-ad
-aj
-TG
+Ds
+yY
+Ne
+xf
 aD
-aJ
-ad
-aO
-ad
-ad
-ad
+KK
+yY
+Wn
+yY
+yY
+yY
 aa
 aa
 "}
@@ -665,16 +665,16 @@ ab
 ab
 ab
 ab
-ah
-ad
-aj
-as
+Fo
+yY
+Ne
+HN
 aE
-aM
-ad
-ad
-ad
-ad
+iW
+yY
+yY
+yY
+yY
 aa
 aa
 aa
@@ -686,15 +686,15 @@ ab
 ab
 ab
 ab
-ai
-ak
-at
-aF
-aN
-ad
-ad
-ad
-ad
+CO
+Vw
+UD
+WQ
+CP
+yY
+yY
+yY
+yY
 aa
 aa
 aa
@@ -707,14 +707,14 @@ ab
 ab
 ab
 ab
-ad
-au
-ad
-ad
-au
-ad
-ad
-ad
+yY
+Hb
+yY
+yY
+Hb
+yY
+yY
+yY
 aa
 aa
 aa
@@ -728,13 +728,13 @@ ab
 ab
 ab
 ab
-ad
-ad
-aO
-ad
-ad
-ad
-ad
+yY
+yY
+Wn
+yY
+yY
+yY
+yY
 aa
 aa
 aa
@@ -749,12 +749,12 @@ ab
 ab
 ab
 ab
-ad
-ad
-ad
-aT
-ad
-ad
+yY
+yY
+yY
+sl
+yY
+yY
 aa
 aa
 aa
@@ -769,11 +769,11 @@ ab
 ab
 ab
 ab
-Qh
-ad
-ad
-ad
-ad
+xr
+yY
+yY
+yY
+yY
 aa
 aa
 aa
@@ -788,12 +788,12 @@ aa
 ab
 ab
 ab
-ad
-aG
-ad
-ad
-ad
-ad
+yY
+sI
+yY
+yY
+yY
+yY
 aa
 aa
 aa
@@ -807,11 +807,11 @@ aa
 aa
 aa
 aa
-ad
-av
-aH
-ad
-ad
+yY
+iE
+wc
+yY
+yY
 aa
 aa
 aa
diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm
index f9b010330500..6217a9292350 100644
--- a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm
+++ b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm
@@ -78,7 +78,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "hH" = (
-/obj/structure/spider/solid,
+/obj/structure/spider/stickyweb/sealed/tough,
 /obj/item/book/manual/wiki/cytology,
 /obj/effect/decal/cleanable/plastic,
 /turf/open/floor/plating,
@@ -122,7 +122,6 @@
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "lm" = (
 /obj/structure/spider/stickyweb,
-/obj/structure/spider/sticky,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "mf" = (
@@ -182,7 +181,6 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "qX" = (
-/obj/structure/spider/sticky,
 /obj/item/food/badrecipe/moldy,
 /obj/structure/spider/stickyweb,
 /obj/item/food/spidereggs{
@@ -255,7 +253,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "ts" = (
-/obj/structure/spider/solid,
+/obj/structure/spider/stickyweb/sealed/tough,
 /obj/structure/spider/stickyweb,
 /obj/structure/closet/crate/trashcart/filled,
 /turf/open/floor/plating,
@@ -840,7 +838,7 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
 "XI" = (
-/obj/structure/spider/solid,
+/obj/structure/spider/stickyweb/sealed/tough,
 /obj/item/food/badrecipe/moldy/bacteria,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
diff --git a/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm b/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm
index 93bf4474285b..33a70da72e70 100644
--- a/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm
+++ b/_maps/RandomRuins/SpaceRuins/prison_shuttle.dmm
@@ -138,8 +138,8 @@
 /turf/open/floor/iron/dark/airless,
 /area/ruin/space/prison_shuttle)
 "O" = (
-/mob/living/basic/cockroach,
 /obj/effect/turf_decal/tile/brown/fourcorners,
+/obj/effect/decal/cleanable/xenoblood/xsplatter,
 /turf/open/floor/iron/dark/airless,
 /area/ruin/space/prison_shuttle)
 "P" = (
diff --git a/_maps/shuttles/whiteship_birdshot.dmm b/_maps/shuttles/whiteship_birdshot.dmm
index f01f7f7c9448..f3f33a5fd59e 100644
--- a/_maps/shuttles/whiteship_birdshot.dmm
+++ b/_maps/shuttles/whiteship_birdshot.dmm
@@ -1,37 +1,24 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"ar" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron/smooth_large,
-/area/shuttle/abandoned/cargo)
-"aW" = (
-/obj/structure/table/greyscale,
-/obj/machinery/recharger{
-	pixel_x = -13;
-	pixel_y = 11
-	},
-/obj/machinery/cell_charger{
-	pixel_x = 4;
-	pixel_y = 11
-	},
-/obj/item/stock_parts/power_store/cell/high{
-	pixel_x = 4;
-	pixel_y = 11
-	},
-/obj/item/storage/toolbox/emergency{
-	pixel_y = 2
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer/security/telescreen/entertainment/directional/north,
-/turf/open/floor/iron/dark/small,
-/area/shuttle/abandoned/bridge)
-"bi" = (
+"ai" = (
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/grimy,
 /area/shuttle/abandoned/crew)
+"aF" = (
+/obj/machinery/griddle,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/official/random/directional/north,
+/turf/open/floor/iron/cafeteria,
+/area/shuttle/abandoned/bar)
+"aX" = (
+/obj/effect/turf_decal/tile/red/half/contrasted{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/shuttle/abandoned/pod)
 "bk" = (
 /obj/machinery/atmospherics/pipe/smart/simple/general/visible{
 	dir = 6
@@ -39,16 +26,6 @@
 /obj/machinery/meter,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"bo" = (
-/obj/effect/turf_decal/box/white/corners,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/preopen,
-/obj/effect/spawner/random/maintenance/three,
-/turf/open/floor/iron/dark/textured_large,
-/area/shuttle/abandoned/cargo)
-"bp" = (
-/turf/closed/wall/mineral/titanium/overspace,
-/area/shuttle/abandoned/engine)
 "bq" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
@@ -86,29 +63,28 @@
 	},
 /turf/open/floor/iron/small,
 /area/shuttle/abandoned/crew)
-"cq" = (
+"cB" = (
+/obj/structure/chair/stool/directional/west,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/three,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/smooth_large,
-/area/shuttle/abandoned/cargo)
-"cK" = (
-/obj/structure/cable,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/catwalk_floor,
+/turf/open/floor/iron/grimy,
 /area/shuttle/abandoned/crew)
-"dk" = (
+"cJ" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/turretid{
-	icon_state = "control_kill";
-	lethal = 1;
-	locked = 0;
-	pixel_y = 28;
-	req_access = null
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
 	},
-/turf/open/floor/iron/dark/small,
-/area/shuttle/abandoned/bridge)
+/turf/open/floor/carpet/green,
+/area/shuttle/abandoned/bar)
+"cT" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/carpet/green,
+/area/shuttle/abandoned/bar)
 "dw" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
@@ -116,11 +92,6 @@
 /obj/machinery/firealarm/directional/west,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/crew)
-"dy" = (
-/obj/effect/turf_decal/box/white/corners,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured_large,
-/area/shuttle/abandoned/cargo)
 "dH" = (
 /obj/effect/turf_decal/stripes/line,
 /obj/effect/turf_decal/stripes/line{
@@ -138,45 +109,85 @@
 	},
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/crew)
-"eK" = (
+"er" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/built/directional/east,
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/iron/textured,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron/smooth_large,
 /area/shuttle/abandoned/cargo)
-"eU" = (
+"eC" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/cold/directional/north,
 /obj/structure/cable,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron/smooth_large,
-/area/shuttle/abandoned/cargo)
-"fD" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron/freezer,
+/area/shuttle/abandoned/medbay)
+"eH" = (
+/obj/structure/cable,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/catwalk_floor,
+/area/shuttle/abandoned/crew)
+"fa" = (
+/obj/effect/turf_decal/tile/red/anticorner/contrasted,
+/obj/structure/chair{
+	dir = 4
+	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron,
+/area/shuttle/abandoned/pod)
+"fl" = (
+/obj/structure/table,
+/obj/item/reagent_containers/blood/o_minus{
+	pixel_x = 5;
+	pixel_y = 3
 	},
-/turf/open/floor/iron/cafeteria,
-/area/shuttle/abandoned/bar)
+/obj/item/reagent_containers/blood,
+/obj/item/surgery_tray/full{
+	pixel_x = 2;
+	pixel_y = 9
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/turf/open/floor/iron/freezer,
+/area/shuttle/abandoned/medbay)
+"fC" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/textured,
+/area/shuttle/abandoned/cargo)
 "fT" = (
 /turf/open/floor/plating/airless,
 /area/shuttle/abandoned/crew)
+"fU" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/shuttle/abandoned/bar)
 "fW" = (
 /obj/machinery/porta_turret/centcom_shuttle/weak{
 	dir = 4
 	},
-/turf/closed/wall/mineral/titanium/overspace,
+/turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/crew)
-"fX" = (
-/obj/structure/chair{
-	dir = 1
+"gj" = (
+/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
+	dir = 1;
+	x_offset = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/directional/south,
-/obj/effect/mapping_helpers/airalarm/all_access,
-/turf/open/floor/carpet/green,
-/area/shuttle/abandoned/bar)
+/turf/open/floor/iron/dark/small,
+/area/shuttle/abandoned/bridge)
 "gs" = (
 /obj/machinery/power/terminal{
 	dir = 4
@@ -193,48 +204,33 @@
 /obj/machinery/light/small/built/directional/south,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"gz" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
+"gv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/built/directional/east,
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/iron/textured,
+/area/shuttle/abandoned/cargo)
+"gV" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 4
 	},
-/obj/machinery/door/airlock/external/ruin,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/small,
-/area/shuttle/abandoned/crew)
-"hl" = (
-/obj/structure/cable,
-/obj/machinery/light/small/broken/directional/east,
-/turf/open/floor/catwalk_floor,
-/area/shuttle/abandoned/crew)
+/turf/open/floor/iron/dark/textured_large,
+/area/shuttle/abandoned/cargo)
+"gX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron/smooth_large,
+/area/shuttle/abandoned/cargo)
 "hq" = (
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/crew)
-"hr" = (
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/structure/table,
-/obj/item/plate{
-	pixel_x = 5;
-	pixel_y = -2
-	},
-/obj/item/plate{
-	pixel_x = 5
-	},
-/obj/item/plate{
-	pixel_x = 5;
-	pixel_y = 2
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/broken/directional/east,
-/turf/open/floor/iron,
-/area/shuttle/abandoned/bar)
 "hT" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
 /obj/machinery/door/firedoor,
@@ -247,36 +243,21 @@
 /obj/machinery/light/small/built/directional/south,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"in" = (
-/obj/structure/closet/secure_closet/freezer/fridge/open,
-/obj/item/reagent_containers/condiment/enzyme{
-	layer = 5
-	},
-/obj/item/food/meat/slab/synthmeat{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/food/meat/slab/synthmeat{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/food/meat/slab/synthmeat{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/condiment/flour{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/condiment/flour{
-	pixel_x = -3;
-	pixel_y = 3
+"iB" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/cold/directional/north,
+/obj/structure/cable,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/smooth_large,
+/area/shuttle/abandoned/cargo)
+"iH" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8
 	},
-/obj/item/reagent_containers/condiment/milk,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/cafeteria,
-/area/shuttle/abandoned/bar)
-"iy" = (
+/turf/open/floor/iron/dark/textured_large,
+/area/shuttle/abandoned/cargo)
+"iS" = (
 /obj/structure/bed{
 	dir = 4
 	},
@@ -287,35 +268,40 @@
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/iron/grimy,
 /area/shuttle/abandoned/crew)
-"jp" = (
+"jd" = (
+/obj/structure/sink/directional/east,
+/obj/structure/mirror/directional/west,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/iron/white/small,
+/area/shuttle/abandoned/crew)
+"jv" = (
 /obj/structure/chair/comfy/shuttle,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/iron/dark/small,
 /area/shuttle/abandoned/bridge)
-"jB" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/machinery/door/airlock/titanium{
-	name = "Infirmary"
-	},
+"jY" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
+/obj/machinery/suit_storage_unit/standard_unit,
+/obj/machinery/light/small/built/directional/east,
+/turf/open/floor/iron/smooth,
+/area/shuttle/abandoned/crew)
+"ku" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/structure/table,
+/obj/item/storage/fancy/donut_box{
+	pixel_y = 14
 	},
-/turf/open/floor/iron/small,
-/area/shuttle/abandoned/medbay)
-"jQ" = (
-/obj/structure/table/reinforced,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/button/door/directional/north{
-	id = "whiteship_port";
-	name = "Port Doors Control"
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 8
 	},
-/turf/open/floor/iron/textured,
-/area/shuttle/abandoned/cargo)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/security/telescreen/entertainment/directional/north,
+/turf/open/floor/iron,
+/area/shuttle/abandoned/bar)
 "kw" = (
 /obj/machinery/computer/monitor{
 	name = "Bridge Power Monitoring Console"
@@ -323,26 +309,20 @@
 /obj/structure/cable,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"kz" = (
-/obj/structure/chair/stool/bar/directional/east,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/carpet/green,
-/area/shuttle/abandoned/bar)
-"kN" = (
+"kC" = (
+/obj/machinery/computer/operating,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron/dark/small,
-/area/shuttle/abandoned/bridge)
+/turf/open/floor/iron/freezer,
+/area/shuttle/abandoned/medbay)
 "kQ" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/abandoned/cargo)
+"ll" = (
+/obj/structure/table/wood,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/official/random/directional/north,
+/turf/open/floor/iron/grimy,
+/area/shuttle/abandoned/crew)
 "lq" = (
 /obj/machinery/power/shuttle_engine/propulsion/left{
 	dir = 8
@@ -352,83 +332,48 @@
 "lt" = (
 /turf/template_noop,
 /area/template_noop)
-"lE" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
-	},
+"lu" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/titanium{
-	name = "Port Cargo Bay"
-	},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron/small,
-/area/shuttle/abandoned/cargo)
-"ma" = (
-/turf/closed/wall/mineral/titanium/overspace,
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/iron/smooth_large,
 /area/shuttle/abandoned/cargo)
-"mJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/carpet/green,
-/area/shuttle/abandoned/bar)
-"ne" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
+"mU" = (
+/obj/structure/toilet{
+	pixel_y = 8
 	},
-/obj/effect/turf_decal/siding/thinplating/dark,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/titanium/glass{
-	name = "Port Cargo Control"
+/obj/machinery/door/window/right/directional/east{
+	name = "Shower"
 	},
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/white/small,
+/area/shuttle/abandoned/crew)
+"nc" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/iron/small,
-/area/shuttle/abandoned/cargo)
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/catwalk_floor,
+/area/shuttle/abandoned/crew)
 "nm" = (
 /obj/structure/cable,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/crew)
-"ny" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
+"nL" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
 	},
-/turf/open/floor/iron/cafeteria,
-/area/shuttle/abandoned/bar)
-"nI" = (
-/obj/machinery/shower/directional/south,
-/obj/item/soap,
-/obj/structure/curtain,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white/small,
+/turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/crew)
-"nQ" = (
-/obj/structure/toilet{
-	pixel_y = 8
-	},
+"nO" = (
+/obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/window/right/directional/east{
-	name = "Shower"
+/obj/machinery/button/door/directional/north{
+	id = "whiteship_port";
+	name = "Port Doors Control"
 	},
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/white/small,
-/area/shuttle/abandoned/crew)
+/turf/open/floor/iron/textured,
+/area/shuttle/abandoned/cargo)
 "oe" = (
 /obj/structure/window/reinforced/spawner/directional/east,
 /obj/machinery/power/shuttle_engine/heater{
@@ -436,41 +381,74 @@
 	},
 /turf/open/floor/plating/airless,
 /area/shuttle/abandoned/engine)
-"ol" = (
+"pg" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/drinkingglass{
+	pixel_x = 9;
+	pixel_y = 15
+	},
+/obj/item/reagent_containers/cup/glass/drinkingglass{
+	pixel_x = 5;
+	pixel_y = 8
+	},
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 8
+	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/three,
-/turf/open/floor/iron/smooth_large,
-/area/shuttle/abandoned/cargo)
-"pr" = (
-/obj/machinery/computer/operating,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/shuttle/abandoned/bar)
+"pt" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external/ruin,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/freezer,
-/area/shuttle/abandoned/medbay)
+/turf/open/floor/iron/small,
+/area/shuttle/abandoned/crew)
 "pv" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/abandoned/pod)
 "pC" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/abandoned/medbay)
-"pO" = (
-/obj/structure/dresser,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/grimy,
-/area/shuttle/abandoned/crew)
-"pP" = (
+"pZ" = (
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/structure/chair{
+	pixel_y = 10
+	},
+/obj/machinery/door/window/brigdoor/security/cell/right/directional/south{
+	name = "Brig Cell"
+	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/tank_dispenser,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron/smooth,
-/area/shuttle/abandoned/crew)
-"qa" = (
-/obj/effect/turf_decal/tile/bar/opposingcorners,
+/turf/open/floor/iron,
+/area/shuttle/abandoned/pod)
+"qg" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/maintenance/three,
+/turf/open/floor/iron/smooth_large,
+/area/shuttle/abandoned/cargo)
+"qk" = (
+/obj/structure/table,
+/obj/machinery/microwave{
+	pixel_y = 3
 	},
-/turf/open/floor/iron,
+/obj/item/storage/box/donkpockets,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/cafeteria,
 /area/shuttle/abandoned/bar)
 "qn" = (
 /obj/structure/rack,
@@ -484,64 +462,88 @@
 	},
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"qq" = (
-/obj/effect/turf_decal/tile/bar/opposingcorners,
+"qp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/carpet/green,
+/area/shuttle/abandoned/bar)
+"qO" = (
 /obj/structure/table,
-/obj/machinery/reagentgrinder{
-	pixel_x = 5;
-	pixel_y = -8
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/machinery/recharger{
+	pixel_x = 6;
+	pixel_y = 11
+	},
+/obj/item/book/manual/wiki/security_space_law{
+	pixel_x = -6;
+	pixel_y = 3
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/spray/pepper{
+	pixel_x = 9;
+	pixel_y = 4
+	},
 /turf/open/floor/iron,
-/area/shuttle/abandoned/bar)
-"qz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer/shuttle/white_ship/bridge{
+/area/shuttle/abandoned/pod)
+"rl" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
-/turf/open/floor/iron/dark/small,
-/area/shuttle/abandoned/bridge)
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/door/airlock/titanium{
+	name = "Infirmary"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron/small,
+/area/shuttle/abandoned/medbay)
 "ry" = (
-/turf/closed/wall/mineral/titanium/overspace,
+/turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/bar)
-"rF" = (
+"rO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/iron/smooth,
-/area/shuttle/abandoned/crew)
-"sl" = (
-/obj/structure/table,
-/obj/item/reagent_containers/blood/o_minus{
-	pixel_x = 5;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/blood,
-/obj/item/surgery_tray/full{
-	pixel_x = 2;
-	pixel_y = 9
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/directional/north,
-/obj/effect/mapping_helpers/airalarm/all_access,
 /turf/open/floor/iron/freezer,
 /area/shuttle/abandoned/medbay)
-"sr" = (
-/obj/structure/bed{
+"rZ" = (
+/obj/structure/chair/stool/bar/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
-/obj/item/bedsheet/brown{
-	dir = 4
+/turf/open/floor/carpet/green,
+/area/shuttle/abandoned/bar)
+"si" = (
+/obj/effect/turf_decal/box/white/corners,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/textured_large,
+/area/shuttle/abandoned/cargo)
+"tg" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external/ruin,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/broken/directional/west,
-/turf/open/floor/iron/grimy,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron/small,
 /area/shuttle/abandoned/crew)
-"sC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron/smooth_large,
-/area/shuttle/abandoned/cargo)
-"te" = (
+"tz" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
 	},
@@ -549,151 +551,220 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/command{
-	name = "Cockpit"
+/obj/machinery/door/airlock/grunge{
+	name = "Cabin"
 	},
-/obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/iron/small,
-/area/shuttle/abandoned/bridge)
-"tW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/smooth_large,
-/area/shuttle/abandoned/cargo)
+/area/shuttle/abandoned/crew)
 "uj" = (
 /obj/structure/closet/emcloset/anchored,
 /obj/structure/sign/poster/official/random/directional/north,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"uk" = (
-/turf/closed/wall/mineral/titanium/overspace,
-/area/shuttle/abandoned/pod)
-"uo" = (
+"ur" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/directional/south,
-/obj/effect/mapping_helpers/airalarm/all_access,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
 	},
 /turf/open/floor/iron/smooth_large,
 /area/shuttle/abandoned/cargo)
-"uT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/machinery/light/small/built/directional/east,
-/turf/open/floor/iron/smooth,
-/area/shuttle/abandoned/crew)
-"vc" = (
-/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
-	dir = 1
+"uu" = (
+/obj/structure/table,
+/obj/structure/sink/kitchen/directional/west,
+/obj/item/reagent_containers/condiment/sugar{
+	pixel_x = 4;
+	pixel_y = 14
+	},
+/obj/item/kitchen/rollingpin{
+	pixel_x = -1
+	},
+/obj/item/knife/kitchen{
+	pixel_x = -8
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/small,
-/area/shuttle/abandoned/bridge)
-"vo" = (
+/turf/open/floor/iron/cafeteria,
+/area/shuttle/abandoned/bar)
+"uF" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
-/turf/open/floor/carpet/green,
-/area/shuttle/abandoned/bar)
-"vD" = (
-/obj/structure/chair/stool/directional/west,
+/turf/open/floor/iron/smooth_large,
+/area/shuttle/abandoned/cargo)
+"uZ" = (
+/obj/structure/closet/secure_closet/freezer/fridge/open,
+/obj/item/reagent_containers/condiment/enzyme{
+	layer = 5
+	},
+/obj/item/food/meat/slab/synthmeat{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/food/meat/slab/synthmeat{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/food/meat/slab/synthmeat{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/condiment/flour{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/condiment/flour{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/condiment/milk,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/grimy,
-/area/shuttle/abandoned/crew)
-"wh" = (
+/turf/open/floor/iron/cafeteria,
+/area/shuttle/abandoned/bar)
+"ve" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/east,
+/obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 1
 	},
-/turf/open/floor/iron/textured,
-/area/shuttle/abandoned/cargo)
-"wp" = (
-/obj/structure/closet/secure_closet/personal,
+/turf/open/floor/iron/dark/small,
+/area/shuttle/abandoned/bridge)
+"vp" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/structure/table,
+/obj/machinery/reagentgrinder{
+	pixel_x = 5;
+	pixel_y = -8
+	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/grimy,
-/area/shuttle/abandoned/crew)
-"xn" = (
+/turf/open/floor/iron,
+/area/shuttle/abandoned/bar)
+"vZ" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/south,
+/obj/structure/sign/poster/official/random/directional/north,
+/obj/structure/cable,
 /turf/open/floor/iron/smooth_large,
 /area/shuttle/abandoned/cargo)
-"xv" = (
+"wd" = (
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/official/random/directional/north,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/turf/open/floor/iron/textured,
+/area/shuttle/abandoned/cargo)
+"wo" = (
+/obj/structure/cable,
+/obj/machinery/light/small/broken/directional/east,
+/turf/open/floor/catwalk_floor,
+/area/shuttle/abandoned/crew)
+"wq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/east,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
 /turf/open/floor/iron/textured,
 /area/shuttle/abandoned/cargo)
-"xH" = (
+"wE" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/three,
 /turf/open/floor/iron/smooth_large,
 /area/shuttle/abandoned/cargo)
-"xI" = (
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/effect/turf_decal/siding/wideplating/dark{
-	dir = 8
-	},
+"wP" = (
+/obj/structure/chair/stool/directional/south,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
+/obj/machinery/light/small/broken/directional/west,
+/turf/open/floor/iron/freezer,
+/area/shuttle/abandoned/medbay)
+"wY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/west,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
 	},
-/turf/open/floor/iron,
+/turf/open/floor/iron/cafeteria,
 /area/shuttle/abandoned/bar)
-"yN" = (
+"xr" = (
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/structure/closet/secure_closet/personal{
+	name = "Security Closet"
+	},
+/obj/item/gun/energy/laser/retro,
+/obj/item/restraints/handcuffs/cable,
+/obj/item/restraints/handcuffs/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/north,
+/obj/structure/reagent_dispensers/wall/peppertank/directional/north,
+/obj/item/inspector,
+/obj/item/flashlight/seclite,
+/turf/open/floor/iron,
+/area/shuttle/abandoned/pod)
+"xG" = (
 /obj/structure/closet/secure_closet/personal,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/official/random/directional/north,
 /turf/open/floor/iron/grimy,
 /area/shuttle/abandoned/crew)
-"yP" = (
-/obj/effect/turf_decal/tile/bar/opposingcorners,
+"xT" = (
+/obj/structure/table/optable,
+/obj/machinery/defibrillator_mount/directional/north,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/shuttle/abandoned/bar)
-"yT" = (
-/obj/effect/turf_decal/tile/red/half/contrasted{
-	dir = 8
+/turf/open/floor/iron/freezer,
+/area/shuttle/abandoned/medbay)
+"xZ" = (
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/structure/chair{
+	pixel_y = 10
+	},
+/obj/machinery/door/window/brigdoor/security/cell/left/directional/south{
+	name = "Brig Cell"
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
 /turf/open/floor/iron,
 /area/shuttle/abandoned/pod)
-"yV" = (
-/obj/effect/turf_decal/box/white/corners{
-	dir = 8
+"yp" = (
+/obj/structure/bed{
+	dir = 4
+	},
+/obj/item/bedsheet/brown{
+	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured_large,
+/obj/machinery/light/small/broken/directional/west,
+/turf/open/floor/iron/grimy,
+/area/shuttle/abandoned/crew)
+"yZ" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/smooth_large,
 /area/shuttle/abandoned/cargo)
-"zh" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
+"zo" = (
+/obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
 	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/grunge{
-	name = "Cabin"
+/obj/machinery/door/airlock/titanium{
+	name = "Port Cargo Bay"
 	},
+/obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/iron/small,
-/area/shuttle/abandoned/crew)
+/area/shuttle/abandoned/cargo)
 "Av" = (
 /obj/machinery/atmospherics/components/trinary/filter{
 	dir = 1
@@ -706,27 +777,55 @@
 "AV" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/crew)
-"Bb" = (
-/obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 3
+"AX" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
 	},
-/obj/item/storage/box/donkpockets,
+/obj/effect/turf_decal/siding/thinplating/dark,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/cafeteria,
-/area/shuttle/abandoned/bar)
-"Bx" = (
-/obj/machinery/griddle,
+/obj/machinery/door/airlock/titanium/glass{
+	name = "Starboard Cargo Control"
+	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron/small,
+/area/shuttle/abandoned/cargo)
+"Bs" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/broken/directional/south,
+/obj/machinery/button/door/directional/south{
+	id = "whiteship_windows";
+	name = "Windows Blast Door Control";
+	pixel_x = -8
+	},
+/obj/machinery/button/door/directional/south{
+	id = "whiteship_bridge";
+	name = "Bridge Blast Door Control";
+	pixel_x = 6
+	},
+/obj/structure/table/greyscale,
+/turf/open/floor/iron/dark/small,
+/area/shuttle/abandoned/bridge)
+"Bt" = (
 /obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/iron/cafeteria,
-/area/shuttle/abandoned/bar)
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/turf/open/floor/catwalk_floor,
+/area/shuttle/abandoned/crew)
 "BH" = (
 /obj/machinery/power/shuttle_engine/propulsion/left{
 	dir = 8
 	},
 /turf/open/floor/plating/airless,
 /area/shuttle/abandoned/engine)
+"BR" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/smooth_large,
+/area/shuttle/abandoned/cargo)
 "BZ" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
 /obj/machinery/door/poddoor{
@@ -734,13 +833,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/abandoned/pod)
-"Cf" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/smooth_large,
-/area/shuttle/abandoned/cargo)
 "Cw" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
 /obj/machinery/door/firedoor,
@@ -760,20 +852,25 @@
 /obj/machinery/light/small/broken/directional/north,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"Db" = (
-/obj/structure/table,
-/obj/item/reagent_containers/condiment/saltshaker{
-	pixel_x = -8;
-	pixel_y = 10
+"Dr" = (
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+	dir = 8
 	},
-/obj/item/reagent_containers/condiment/peppermill{
-	pixel_x = -8;
-	pixel_y = 4
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/south,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
 	},
+/turf/open/floor/iron,
+/area/shuttle/abandoned/pod)
+"Dt" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/built/directional/west,
-/turf/open/floor/carpet/green,
-/area/shuttle/abandoned/bar)
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/structure/cable,
+/turf/open/floor/iron/smooth_large,
+/area/shuttle/abandoned/cargo)
 "Dw" = (
 /obj/machinery/atmospherics/components/binary/pump/on{
 	dir = 4;
@@ -781,20 +878,13 @@
 	},
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"DF" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/machinery/door/airlock/titanium{
-	name = "Kitchen"
-	},
+"DK" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron/small,
-/area/shuttle/abandoned/bar)
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/maintenance/three,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron/smooth_large,
+/area/shuttle/abandoned/cargo)
 "DN" = (
 /obj/machinery/door/airlock/atmos{
 	name = "Atmospherics"
@@ -812,20 +902,18 @@
 "DT" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/abandoned/bar)
-"Eo" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 8
-	},
+"EN" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/textured,
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/maintenance/three,
+/turf/open/floor/iron/smooth_large,
 /area/shuttle/abandoned/cargo)
-"EC" = (
+"EX" = (
+/obj/effect/turf_decal/box/white/corners,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/iron/smooth_large,
+/obj/structure/closet/crate/preopen,
+/obj/effect/spawner/random/maintenance/three,
+/turf/open/floor/iron/dark/textured_large,
 /area/shuttle/abandoned/cargo)
 "Fa" = (
 /obj/machinery/atmospherics/components/tank/air{
@@ -833,126 +921,49 @@
 	},
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"Fm" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron/textured,
-/area/shuttle/abandoned/cargo)
-"Fn" = (
-/obj/machinery/light/cold/directional/south,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/broken/directional/south,
-/obj/machinery/firealarm/directional/east,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron/smooth_large,
-/area/shuttle/abandoned/cargo)
-"Ft" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/machinery/recharger{
-	pixel_x = 6;
-	pixel_y = 11
-	},
-/obj/item/book/manual/wiki/security_space_law{
-	pixel_x = -6;
-	pixel_y = 3
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/spray/pepper{
-	pixel_x = 9;
-	pixel_y = 4
-	},
-/turf/open/floor/iron,
-/area/shuttle/abandoned/pod)
-"Fu" = (
-/obj/effect/decal/cleanable/dirt,
+"Fr" = (
 /obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/carpet/green,
-/area/shuttle/abandoned/bar)
-"FH" = (
-/obj/effect/turf_decal/tile/red/anticorner/contrasted,
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/directional/south,
-/obj/effect/mapping_helpers/airalarm/all_access,
-/turf/open/floor/iron,
-/area/shuttle/abandoned/pod)
-"FL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
+/obj/structure/sign/poster/official/random/directional/north,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/crew)
-"FP" = (
-/obj/effect/turf_decal/box/white/corners{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured_large,
-/area/shuttle/abandoned/cargo)
-"FQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron/freezer,
-/area/shuttle/abandoned/medbay)
-"FX" = (
+"FK" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
+/obj/machinery/computer/shuttle/white_ship/bridge{
+	dir = 1
 	},
-/turf/open/floor/iron/grimy,
-/area/shuttle/abandoned/crew)
-"FY" = (
+/turf/open/floor/iron/dark/small,
+/area/shuttle/abandoned/bridge)
+"FL" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/light/small/directional/west,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/crew)
-"FZ" = (
-/obj/structure/chair/stool/bar/directional/east,
+"FT" = (
+/obj/effect/turf_decal/tile/red/half/contrasted,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
+/obj/machinery/light/small/broken/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
 	},
-/turf/open/floor/carpet/green,
-/area/shuttle/abandoned/bar)
-"Gb" = (
+/turf/open/floor/iron,
+/area/shuttle/abandoned/pod)
+"Ga" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /obj/structure/table,
-/obj/machinery/coffeemaker{
-	pixel_y = 12
-	},
-/obj/item/reagent_containers/cup/glass/mug{
-	pixel_x = 10;
-	pixel_y = 1
+/obj/item/plate{
+	pixel_x = 5;
+	pixel_y = -2
 	},
-/obj/item/reagent_containers/cup/glass/mug{
-	pixel_x = 2;
-	pixel_y = -1
+/obj/item/plate{
+	pixel_x = 5
 	},
-/obj/item/reagent_containers/cup/glass/mug{
-	pixel_x = 7;
-	pixel_y = -5
+/obj/item/plate{
+	pixel_x = 5;
+	pixel_y = 2
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/east,
-/obj/structure/sign/poster/official/random/directional/north,
+/obj/machinery/light/small/broken/directional/east,
 /turf/open/floor/iron,
 /area/shuttle/abandoned/bar)
 "Ge" = (
@@ -960,72 +971,93 @@
 /obj/structure/cable,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"Gi" = (
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/abandoned/engine)
-"Gk" = (
-/obj/structure/chair/comfy/shuttle,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/dark/small,
-/area/shuttle/abandoned/bridge)
-"Gy" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/broken/directional/south,
-/obj/machinery/button/door/directional/south{
-	id = "whiteship_windows";
-	name = "Windows Blast Door Control";
-	pixel_x = -8
+"Gg" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
 	},
-/obj/machinery/button/door/directional/south{
-	id = "whiteship_bridge";
-	name = "Bridge Blast Door Control";
-	pixel_x = 6
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/door/airlock/titanium{
+	name = "Kitchen"
 	},
-/obj/structure/table/greyscale,
-/turf/open/floor/iron/dark/small,
-/area/shuttle/abandoned/bridge)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron/small,
+/area/shuttle/abandoned/bar)
+"Gi" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/abandoned/engine)
 "Gz" = (
 /obj/structure/cable,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"GE" = (
+"GP" = (
 /obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/structure/table,
-/obj/item/storage/fancy/donut_box{
-	pixel_y = 14
-	},
-/obj/effect/turf_decal/siding/wideplating/dark{
-	dir = 8
-	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer/security/telescreen/entertainment/directional/north,
 /turf/open/floor/iron,
 /area/shuttle/abandoned/bar)
-"GV" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/smooth_large,
-/area/shuttle/abandoned/cargo)
-"HD" = (
+"GS" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron/cafeteria,
+/area/shuttle/abandoned/bar)
+"Hk" = (
+/obj/structure/table/greyscale,
+/obj/machinery/recharger{
+	pixel_x = -13;
+	pixel_y = 11
+	},
+/obj/machinery/cell_charger{
+	pixel_x = 4;
+	pixel_y = 11
+	},
+/obj/item/stock_parts/power_store/cell/high{
+	pixel_x = 4;
+	pixel_y = 11
+	},
+/obj/item/storage/toolbox/emergency{
+	pixel_y = 2
 	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/security/telescreen/entertainment/directional/north,
 /turf/open/floor/iron/dark/small,
 /area/shuttle/abandoned/bridge)
-"HH" = (
-/obj/effect/turf_decal/box/white/corners{
-	dir = 4
+"Ht" = (
+/obj/structure/rack,
+/obj/item/tank/internals/anesthetic{
+	pixel_x = -3
+	},
+/obj/item/stack/sticky_tape/surgical,
+/obj/item/clothing/mask/breath/medical{
+	pixel_y = 3
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured_large,
-/area/shuttle/abandoned/cargo)
-"In" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/iron/smooth_large,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron/freezer,
+/area/shuttle/abandoned/medbay)
+"Is" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/door/poddoor{
+	id = "whiteship_port"
+	},
+/obj/docking_port/mobile{
+	callTime = 200;
+	can_move_docking_ports = 1;
+	dir = 2;
+	launch_status = 0;
+	movement_force = list("KNOCKDOWN"=0,"THROW"=0);
+	name = "Patrol Bee";
+	port_direction = 8;
+	preferred_direction = 4;
+	shuttle_id = "whiteship"
+	},
+/turf/open/floor/plating,
 /area/shuttle/abandoned/cargo)
 "Je" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -1043,28 +1075,49 @@
 	},
 /turf/open/floor/iron/small,
 /area/shuttle/abandoned/pod)
+"Jn" = (
+/obj/structure/dresser,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/grimy,
+/area/shuttle/abandoned/crew)
 "Jt" = (
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"JL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/iron/freezer,
-/area/shuttle/abandoned/medbay)
 "JP" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/abandoned/bridge)
-"JU" = (
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/structure/chair{
-	pixel_y = 10
+"JR" = (
+/obj/structure/table/reinforced,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/official/random/directional/north,
+/turf/open/floor/iron/textured,
+/area/shuttle/abandoned/cargo)
+"Kf" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/official/random/directional/north,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
 	},
-/obj/machinery/door/window/brigdoor/security/cell/right/directional/south{
-	name = "Brig Cell"
+/turf/open/floor/iron/dark/small,
+/area/shuttle/abandoned/bridge)
+"KR" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/shuttle/abandoned/pod)
+/obj/machinery/door/airlock/command{
+	name = "Cockpit"
+	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron/small,
+/area/shuttle/abandoned/bridge)
 "KV" = (
 /obj/structure/cable,
 /obj/machinery/door/airlock/engineering{
@@ -1072,11 +1125,24 @@
 	},
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
+"KW" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/shuttle/abandoned/bar)
 "Lj" = (
 /obj/machinery/porta_turret/centcom_shuttle/weak{
 	dir = 4
 	},
-/turf/closed/wall/mineral/titanium/overspace,
+/turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/pod)
 "Ll" = (
 /obj/structure/cable,
@@ -1092,21 +1158,6 @@
 /obj/structure/cable,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"MJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron/smooth_large,
-/area/shuttle/abandoned/cargo)
-"MO" = (
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/open/floor/catwalk_floor,
-/area/shuttle/abandoned/crew)
 "Na" = (
 /obj/machinery/airalarm/directional/north,
 /obj/effect/mapping_helpers/airalarm/all_access,
@@ -1133,64 +1184,49 @@
 "NK" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/abandoned/crew)
-"NP" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/turf/open/floor/catwalk_floor,
-/area/shuttle/abandoned/crew)
-"Oe" = (
-/obj/effect/turf_decal/box/white/corners{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/glass{
-	amount = 10
-	},
-/obj/item/stack/sheet/iron/twenty,
-/obj/item/stack/rods/twentyfive,
-/obj/item/weldingtool,
-/turf/open/floor/iron/dark/textured_large,
-/area/shuttle/abandoned/cargo)
 "Om" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/abandoned/engine)
-"Ot" = (
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/structure/closet/secure_closet/personal{
-	name = "Security Closet"
+"OE" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
 	},
-/obj/item/gun/energy/laser/retro,
-/obj/item/restraints/handcuffs/cable,
-/obj/item/restraints/handcuffs/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/north,
-/obj/structure/reagent_dispensers/wall/peppertank/directional/north,
-/obj/item/inspector,
-/obj/item/flashlight/seclite,
-/turf/open/floor/iron,
-/area/shuttle/abandoned/pod)
-"OC" = (
-/obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
+/obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron/textured,
 /area/shuttle/abandoned/cargo)
-"Pm" = (
-/obj/structure/cable,
+"OG" = (
+/obj/effect/turf_decal/tile/bar/opposingcorners,
+/obj/structure/table,
+/obj/machinery/coffeemaker{
+	pixel_y = 12
+	},
+/obj/item/reagent_containers/cup/glass/mug{
+	pixel_x = 10;
+	pixel_y = 1
+	},
+/obj/item/reagent_containers/cup/glass/mug{
+	pixel_x = 2;
+	pixel_y = -1
+	},
+/obj/item/reagent_containers/cup/glass/mug{
+	pixel_x = 7;
+	pixel_y = -5
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/east,
 /obj/structure/sign/poster/official/random/directional/north,
+/turf/open/floor/iron,
+/area/shuttle/abandoned/bar)
+"OH" = (
+/obj/structure/cable,
+/obj/machinery/light/small/directional/north,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/crew)
-"Pz" = (
-/obj/structure/sink/directional/east,
-/obj/structure/mirror/directional/west,
+"ON" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/iron/white/small,
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/iron/smooth,
 /area/shuttle/abandoned/crew)
 "PC" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
@@ -1202,54 +1238,62 @@
 "PN" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/pod)
-"Qb" = (
+"PP" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/north,
-/obj/machinery/airalarm/directional/north,
-/obj/effect/mapping_helpers/airalarm/all_access,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
 	},
-/turf/open/floor/iron/dark/small,
-/area/shuttle/abandoned/bridge)
+/turf/open/floor/iron/grimy,
+/area/shuttle/abandoned/crew)
 "Qf" = (
 /obj/machinery/porta_turret/centcom_shuttle/weak{
 	dir = 4
 	},
-/turf/closed/wall/mineral/titanium/overspace,
+/turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/bridge)
-"Qr" = (
-/obj/structure/chair,
+"Ql" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/carpet/green,
-/area/shuttle/abandoned/bar)
-"QT" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
+/mob/living/simple_animal/hostile/ooze/gelatinous{
+	desc = "Father of Cubie";
+	melee_damage_upper = 30;
+	name = "Squarsire"
 	},
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/siding/thinplating/dark,
+/turf/open/floor/iron,
+/area/shuttle/abandoned/pod)
+"Qo" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/grimy,
+/area/shuttle/abandoned/crew)
+"Qq" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
-/obj/machinery/door/airlock/external/ruin,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 1
-	},
+/obj/effect/turf_decal/siding/thinplating/dark,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/titanium/glass{
+	name = "Port Cargo Control"
+	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/iron/small,
-/area/shuttle/abandoned/crew)
-"QU" = (
-/obj/structure/chair/stool/directional/south,
+/area/shuttle/abandoned/cargo)
+"Qs" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/broken/directional/west,
-/turf/open/floor/iron/freezer,
-/area/shuttle/abandoned/medbay)
+/obj/structure/cable,
+/turf/open/floor/carpet/green,
+/area/shuttle/abandoned/bar)
+"QR" = (
+/obj/structure/chair/stool/bar/directional/east,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/carpet/green,
+/area/shuttle/abandoned/bar)
 "QY" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -1278,59 +1322,60 @@
 	},
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"RI" = (
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/structure/chair{
-	pixel_y = 10
-	},
-/obj/machinery/door/window/brigdoor/security/cell/left/directional/south{
-	name = "Brig Cell"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/shuttle/abandoned/pod)
-"RN" = (
-/obj/structure/table/optable,
-/obj/machinery/defibrillator_mount/directional/north,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/freezer,
-/area/shuttle/abandoned/medbay)
-"RY" = (
-/obj/effect/turf_decal/stripes/line,
+"RX" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/smooth_large,
 /area/shuttle/abandoned/cargo)
+"SZ" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/glass{
+	amount = 10
+	},
+/obj/item/stack/sheet/iron/twenty,
+/obj/item/stack/rods/twentyfive,
+/obj/item/weldingtool,
+/turf/open/floor/iron/dark/textured_large,
+/area/shuttle/abandoned/cargo)
 "Tg" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/cargo)
-"Uy" = (
+"Tq" = (
+/obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/official/random/directional/north,
-/mob/living/simple_animal/hostile/ooze/gelatinous{
-	desc = "Father of Cubie";
-	melee_damage_upper = 30;
-	name = "Squarsire"
+/obj/machinery/button/door/directional/south{
+	id = "whiteship_starboard";
+	name = "Starboard Doors Control"
 	},
-/turf/open/floor/iron,
-/area/shuttle/abandoned/pod)
-"UB" = (
+/turf/open/floor/iron/textured,
+/area/shuttle/abandoned/cargo)
+"Ui" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
 /turf/open/floor/iron/smooth_large,
 /area/shuttle/abandoned/cargo)
-"UG" = (
-/obj/effect/turf_decal/tile/red/half/contrasted,
+"Uu" = (
+/obj/structure/chair/comfy/shuttle,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/broken/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
+/turf/open/floor/iron/dark/small,
+/area/shuttle/abandoned/bridge)
+"UK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/turretid{
+	icon_state = "control_kill";
+	lethal = 1;
+	locked = 0;
+	pixel_y = 28;
+	req_access = null
 	},
-/turf/open/floor/iron,
-/area/shuttle/abandoned/pod)
+/turf/open/floor/iron/dark/small,
+/area/shuttle/abandoned/bridge)
 "Vp" = (
 /obj/structure/window/reinforced/spawner/directional/east,
 /obj/machinery/power/shuttle_engine/heater{
@@ -1338,94 +1383,74 @@
 	},
 /turf/open/floor/plating/airless,
 /area/shuttle/abandoned/crew)
-"Vx" = (
+"VL" = (
+/obj/machinery/shower/directional/south,
+/obj/item/soap,
+/obj/structure/curtain,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/white/small,
+/area/shuttle/abandoned/crew)
+"VU" = (
 /obj/structure/cable,
-/obj/machinery/light/small/directional/south,
+/obj/machinery/power/apc/auto_name/directional/east,
 /turf/open/floor/catwalk_floor,
-/area/shuttle/abandoned/crew)
-"VB" = (
+/area/shuttle/abandoned/engine)
+"Wn" = (
+/obj/structure/bed/pod,
+/obj/machinery/iv_drip,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/iron/freezer,
+/area/shuttle/abandoned/medbay)
+"Wu" = (
+/obj/machinery/space_heater,
+/turf/open/floor/catwalk_floor,
+/area/shuttle/abandoned/engine)
+"Wv" = (
 /obj/structure/table,
-/obj/structure/sink/kitchen/directional/west,
-/obj/item/reagent_containers/condiment/sugar{
-	pixel_x = 4;
-	pixel_y = 14
-	},
-/obj/item/kitchen/rollingpin{
-	pixel_x = -1
+/obj/item/reagent_containers/condiment/saltshaker{
+	pixel_x = -8;
+	pixel_y = 10
 	},
-/obj/item/knife/kitchen{
-	pixel_x = -8
+/obj/item/reagent_containers/condiment/peppermill{
+	pixel_x = -8;
+	pixel_y = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/cafeteria,
+/obj/machinery/light/built/directional/west,
+/turf/open/floor/carpet/green,
 /area/shuttle/abandoned/bar)
-"VO" = (
-/obj/structure/table/wood,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/iron/grimy,
-/area/shuttle/abandoned/crew)
-"VP" = (
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
-	dir = 8
-	},
+"WH" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/south,
+/obj/machinery/light/broken/directional/south,
+/obj/machinery/firealarm/directional/east,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/iron,
-/area/shuttle/abandoned/pod)
-"VS" = (
-/obj/structure/table,
-/obj/item/defibrillator/loaded,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/turf/open/floor/iron/freezer,
-/area/shuttle/abandoned/medbay)
-"VU" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east,
-/turf/open/floor/catwalk_floor,
-/area/shuttle/abandoned/engine)
-"We" = (
+/turf/open/floor/iron/smooth_large,
+/area/shuttle/abandoned/cargo)
+"WW" = (
 /obj/effect/turf_decal/tile/red/half/contrasted{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/shuttle/abandoned/pod)
-"Wu" = (
-/obj/machinery/space_heater,
-/turf/open/floor/catwalk_floor,
-/area/shuttle/abandoned/engine)
-"WG" = (
-/turf/closed/wall/mineral/titanium/overspace,
-/area/shuttle/abandoned/bridge)
-"WL" = (
-/obj/structure/rack,
-/obj/item/tank/internals/anesthetic{
-	pixel_x = -3
-	},
-/obj/item/stack/sticky_tape/surgical,
-/obj/item/clothing/mask/breath/medical{
-	pixel_y = 3
-	},
+"Xk" = (
+/obj/structure/table,
+/obj/item/defibrillator/loaded,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/east,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
 /turf/open/floor/iron/freezer,
 /area/shuttle/abandoned/medbay)
-"WU" = (
-/obj/structure/table/reinforced,
+"Xu" = (
+/obj/structure/chair,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/button/door/directional/south{
-	id = "whiteship_starboard";
-	name = "Starboard Doors Control"
-	},
-/turf/open/floor/iron/textured,
-/area/shuttle/abandoned/cargo)
+/obj/structure/sign/poster/official/random/directional/north,
+/turf/open/floor/carpet/green,
+/area/shuttle/abandoned/bar)
 "XB" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/bridge)
@@ -1443,28 +1468,12 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/abandoned/crew)
-"Yg" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/airlock/titanium/glass{
-	name = "Starboard Cargo Control"
-	},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron/small,
-/area/shuttle/abandoned/cargo)
-"Yn" = (
+"Yd" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/directional/north,
-/obj/effect/mapping_helpers/airalarm/all_access,
-/obj/structure/cable,
-/turf/open/floor/iron/smooth_large,
-/area/shuttle/abandoned/cargo)
+/obj/structure/tank_dispenser,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/smooth,
+/area/shuttle/abandoned/crew)
 "YJ" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
 /obj/machinery/door/poddoor{
@@ -1472,26 +1481,12 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/abandoned/bridge)
-"YZ" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
+"YV" = (
+/obj/effect/turf_decal/box/white/corners{
 	dir = 1
 	},
-/obj/machinery/door/poddoor{
-	id = "whiteship_port"
-	},
-/obj/docking_port/mobile{
-	callTime = 200;
-	can_move_docking_ports = 1;
-	dir = 2;
-	launch_status = 0;
-	movement_force = list("KNOCKDOWN"=0,"THROW"=0);
-	name = "Patrol Bee";
-	port_direction = 8;
-	preferred_direction = 4;
-	shuttle_id = "whiteship"
-	},
-/turf/open/floor/plating,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark/textured_large,
 /area/shuttle/abandoned/cargo)
 "Zn" = (
 /obj/structure/chair/stool/directional/north,
@@ -1499,26 +1494,6 @@
 /obj/effect/mapping_helpers/airalarm/all_access,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/engine)
-"Zp" = (
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/structure/table,
-/obj/item/reagent_containers/cup/glass/drinkingglass{
-	pixel_x = 9;
-	pixel_y = 15
-	},
-/obj/item/reagent_containers/cup/glass/drinkingglass{
-	pixel_x = 5;
-	pixel_y = 8
-	},
-/obj/effect/turf_decal/siding/wideplating/dark{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/shuttle/abandoned/bar)
 "Zy" = (
 /obj/machinery/airalarm/directional/south,
 /obj/effect/mapping_helpers/airalarm/all_access,
@@ -1527,20 +1502,24 @@
 	},
 /turf/open/floor/catwalk_floor,
 /area/shuttle/abandoned/crew)
-"ZT" = (
-/obj/structure/bed/pod,
-/obj/machinery/iv_drip,
+"ZN" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/freezer,
-/area/shuttle/abandoned/medbay)
+/obj/machinery/light/small/directional/north,
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/iron/dark/small,
+/area/shuttle/abandoned/bridge)
 
 (1,1,1) = {"
 lt
 lt
-bp
+Gi
 BH
-bp
+Gi
 lt
 lt
 lt
@@ -1552,15 +1531,15 @@ lt
 lt
 lt
 lt
-bp
+Gi
 BH
-bp
+Gi
 lt
 lt
 "}
 (2,1,1) = {"
 lt
-bp
+Gi
 Om
 oe
 Gi
@@ -1578,7 +1557,7 @@ BH
 Gi
 oe
 Om
-bp
+Gi
 lt
 "}
 (3,1,1) = {"
@@ -1588,7 +1567,7 @@ Wu
 RH
 Gi
 oe
-bp
+Gi
 lt
 lt
 lt
@@ -1596,7 +1575,7 @@ lt
 lt
 lt
 lt
-bp
+Gi
 oe
 Gi
 qn
@@ -1674,12 +1653,12 @@ Gi
 lt
 "}
 (7,1,1) = {"
-ma
+Tg
 kQ
-cq
-ar
-ar
-ar
+DK
+er
+er
+er
 kQ
 Vp
 AV
@@ -1689,20 +1668,20 @@ fT
 AV
 Vp
 kQ
-sC
-sC
-sC
-xn
+uF
+uF
+uF
+BR
 kQ
-ma
+Tg
 "}
 (8,1,1) = {"
 kQ
 Tg
-GV
-FP
-yV
-uo
+RX
+YV
+iH
+gX
 kQ
 NK
 NK
@@ -1712,57 +1691,57 @@ XX
 NK
 NK
 kQ
-Yn
-FP
-Oe
-GV
+Dt
+YV
+SZ
+RX
 Tg
 kQ
 "}
 (9,1,1) = {"
 bw
-Cf
-GV
-HH
-bo
-UB
+wE
+RX
+gV
+EX
+Ui
 kQ
-pO
-iy
-bi
+Jn
+iS
+ai
 NK
-VO
-sr
-pO
+ll
+yp
+Jn
 kQ
-tW
-HH
-dy
-GV
-RY
+vZ
+gV
+si
+RX
+yZ
 dH
 "}
 (10,1,1) = {"
-YZ
-xH
-GV
-In
-MJ
-Fn
+Is
+qg
+RX
+lu
+Ui
+WH
 kQ
-yN
-FX
-vD
+xG
+PP
+cB
 NK
-vD
-FX
-wp
+cB
+PP
+Qo
 kQ
-eU
-MJ
-EC
-ol
-RY
+iB
+Ui
+ur
+EN
+yZ
 dH
 "}
 (11,1,1) = {"
@@ -1770,15 +1749,15 @@ kQ
 hT
 hT
 kQ
-lE
+zo
 kQ
 kQ
 NK
-zh
+tz
 NK
 NK
 NK
-zh
+tz
 NK
 kQ
 kQ
@@ -1790,13 +1769,13 @@ kQ
 "}
 (12,1,1) = {"
 Tg
-jQ
-Eo
+nO
+fC
 kQ
 eb
 FL
 dw
-FY
+nc
 FL
 Cz
 FL
@@ -1807,15 +1786,15 @@ dw
 FL
 eb
 kQ
-Fm
-WU
+OE
+Tq
 Tg
 "}
 (13,1,1) = {"
 Tg
-xv
-eK
-ne
+JR
+gv
+Qq
 eb
 nm
 nm
@@ -1824,14 +1803,14 @@ hq
 nm
 Ll
 nm
-hl
+wo
 nm
 nm
 nm
 eb
-Yg
-wh
-OC
+AX
+wq
+wd
 Tg
 "}
 (14,1,1) = {"
@@ -1850,7 +1829,7 @@ Cw
 pC
 Cw
 pC
-Pm
+Fr
 Zy
 NK
 NK
@@ -1860,114 +1839,114 @@ fW
 (15,1,1) = {"
 lt
 NK
-pP
+Yd
 NK
 FL
-Vx
+eH
 DT
-Qr
-Db
-fX
+Xu
+Wv
+cT
 pC
-pr
-QU
-VS
+kC
+wP
+Xk
 pC
-cK
+OH
 FL
 bH
-Pz
+jd
 NK
 lt
 "}
 (16,1,1) = {"
 lt
-gz
-rF
-QT
+pt
+ON
+tg
 FL
 eb
 bq
-Fu
-mJ
-vo
+cJ
+qp
+Qs
 pC
-RN
-JL
-FQ
-jB
+xT
+rO
+eC
+rl
 eb
 FL
 NK
-nQ
+mU
 NK
 lt
 "}
 (17,1,1) = {"
 lt
 NK
-uT
+jY
 NK
-MO
+Bt
 eb
 DT
-FZ
-kz
-vo
+QR
+rZ
+Qs
 pC
-sl
-WL
-ZT
+fl
+Ht
+Wn
 pC
 eb
-NP
+nL
 NK
-nI
+VL
 NK
 lt
 "}
 (18,1,1) = {"
 lt
-uk
+PN
 pv
 pv
 pv
 Je
 DT
-GE
-Zp
-xI
+ku
+pg
+KW
 pC
 pC
 pC
 pC
 JP
-te
+KR
 JP
 JP
 JP
-WG
+XB
 lt
 "}
 (19,1,1) = {"
 lt
 lt
 PN
-JU
-yT
-VP
+pZ
+aX
+Dr
 DT
-yP
-yP
-qa
-DF
-ny
-fD
-in
+GP
+GP
+fU
+Gg
+GS
+wY
+uZ
 JP
-kN
-Gk
-qz
+Kf
+jv
+FK
 XB
 lt
 lt
@@ -1977,19 +1956,19 @@ lt
 lt
 PN
 pv
-Uy
-UG
+Ql
+FT
 DT
-Gb
-qq
-hr
+OG
+vp
+Ga
 DT
-Bx
-VB
-Bb
+aF
+uu
+qk
 JP
-Qb
-HD
+ZN
+ve
 JP
 XB
 lt
@@ -1999,9 +1978,9 @@ lt
 lt
 lt
 PN
-RI
-We
-FH
+xZ
+WW
+fa
 DT
 DT
 PC
@@ -2011,9 +1990,9 @@ DT
 PC
 JP
 JP
-dk
-jp
-vc
+UK
+Uu
+gj
 XB
 lt
 lt
@@ -2021,10 +2000,10 @@ lt
 (22,1,1) = {"
 lt
 lt
-uk
+PN
 pv
-Ot
-Ft
+xr
+qO
 pv
 ry
 lt
@@ -2032,12 +2011,12 @@ lt
 lt
 lt
 lt
-WG
+XB
 JP
-aW
-Gy
+Hk
+Bs
 JP
-WG
+XB
 lt
 lt
 "}
@@ -2045,7 +2024,7 @@ lt
 lt
 lt
 lt
-uk
+PN
 BZ
 BZ
 Lj
@@ -2059,7 +2038,7 @@ lt
 Qf
 YJ
 YJ
-WG
+XB
 lt
 lt
 lt
diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm
index c41e483a6451..3cf13b1e8f7c 100644
--- a/_maps/shuttles/whiteship_cere.dmm
+++ b/_maps/shuttles/whiteship_cere.dmm
@@ -395,13 +395,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/shuttle/abandoned/bridge)
-"eq" = (
-/obj/machinery/vending/boozeomat,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/directional/east,
-/obj/effect/mapping_helpers/airalarm/unlocked,
-/turf/open/floor/wood,
-/area/shuttle/abandoned/bar)
 "eU" = (
 /obj/item/gun/energy/laser/retro,
 /obj/structure/closet/crate/secure/weapon,
@@ -717,6 +710,13 @@
 /obj/machinery/firealarm/directional/west,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/abandoned/bar)
+"Dv" = (
+/obj/machinery/vending/boozeomat,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/unlocked,
+/turf/open/floor/wood,
+/area/shuttle/abandoned/bar)
 "Dy" = (
 /obj/structure/cable,
 /turf/open/floor/plating,
@@ -887,6 +887,16 @@
 "QY" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/cargo)
+"Rw" = (
+/obj/machinery/light/small/directional/east,
+/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
+	dir = 1;
+	x_offset = 0;
+	y_offset = 10
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/shuttle/abandoned/bridge)
 "Rx" = (
 /obj/structure/cable,
 /obj/structure/cable/layer1,
@@ -978,14 +988,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
 /turf/open/floor/iron/dark,
 /area/shuttle/abandoned/bridge)
-"Zc" = (
-/obj/machinery/light/small/directional/east,
-/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/shuttle/abandoned/bridge)
 "ZC" = (
 /obj/machinery/power/shuttle_engine/heater{
 	dir = 1
@@ -1238,14 +1240,14 @@ ad
 ar
 TA
 aE
-eq
+Dv
 aS
 au
 aO
 WY
 aQ
 Aq
-Zc
+Rw
 su
 "}
 (12,1,1) = {"
diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm
index 0c4d2dbe8ab8..7c0cd396a689 100644
--- a/_maps/shuttles/whiteship_donut.dmm
+++ b/_maps/shuttles/whiteship_donut.dmm
@@ -426,7 +426,9 @@
 /area/shuttle/abandoned)
 "br" = (
 /obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
-	dir = 1
+	dir = 1;
+	x_offset = 0;
+	y_offset = 9
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/item/disk/holodisk/donutstation/whiteship,
diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm
index 3947ac9301dc..fa9fefa0dcb2 100644
--- a/_maps/shuttles/whiteship_kilo.dmm
+++ b/_maps/shuttles/whiteship_kilo.dmm
@@ -27,6 +27,25 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/abandoned/cargo)
+"cm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/closet/crate/bin,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/obj/item/organ/stomach,
+/obj/item/trash/syndi_cakes,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/turf/open/floor/iron/white/corner{
+	dir = 4
+	},
+/area/shuttle/abandoned/bar)
 "cD" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
 /obj/machinery/door/poddoor{
@@ -90,25 +109,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/abandoned/engine)
-"fL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/structure/closet/crate/bin,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/item/organ/stomach,
-/obj/item/trash/syndi_cakes,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/iron/white/corner{
-	dir = 4
-	},
-/area/shuttle/abandoned/bar)
 "gk" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/abandoned/bar)
@@ -200,15 +200,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/abandoned/bridge)
-"jr" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/power/shuttle_engine/propulsion/left{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/shuttle/abandoned/engine)
 "jM" = (
 /obj/structure/table,
 /obj/machinery/microwave{
@@ -231,29 +222,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/shuttle/abandoned/cargo)
-"ku" = (
-/obj/machinery/door/airlock/external/ruin{
-	name = "External Freight Airlock"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
-/obj/docking_port/mobile{
-	callTime = 250;
-	can_move_docking_ports = 1;
-	dir = 2;
-	shuttle_id = "whiteship";
-	launch_status = 0;
-	movement_force = list("KNOCKDOWN"=0,"THROW"=0);
-	name = "Mining Shuttle";
-	port_direction = 4;
-	preferred_direction = 8
-	},
-/turf/open/floor/plating,
-/area/shuttle/abandoned/cargo)
 "kG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/bot,
@@ -320,14 +288,14 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/abandoned/bridge)
-"mX" = (
+"mP" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/machinery/power/shuttle_engine/propulsion{
+/obj/machinery/power/shuttle_engine/propulsion/left{
 	dir = 8
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
 /area/shuttle/abandoned/engine)
 "nt" = (
 /obj/effect/turf_decal/stripes/line{
@@ -348,15 +316,15 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/titanium/tiled/white,
 /area/shuttle/abandoned/bridge)
-"oQ" = (
+"pA" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/machinery/power/shuttle_engine/propulsion/right{
+/obj/machinery/power/shuttle_engine/propulsion{
 	dir = 8
 	},
-/turf/open/floor/plating,
-/area/shuttle/abandoned/bar)
+/turf/open/floor/plating/airless,
+/area/shuttle/abandoned/engine)
 "pI" = (
 /obj/effect/turf_decal/delivery,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
@@ -409,15 +377,6 @@
 	},
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/bar)
-"rC" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/power/shuttle_engine/propulsion/right{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/shuttle/abandoned/engine)
 "rX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
@@ -447,6 +406,25 @@
 /obj/machinery/power/apc/auto_name/directional/south,
 /turf/open/floor/plating,
 /area/shuttle/abandoned/cargo)
+"sR" = (
+/obj/machinery/power/shuttle_engine/heater{
+	dir = 8
+	},
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/abandoned/engine)
+"sT" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/power/shuttle_engine/propulsion/left{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/abandoned/bar)
 "tf" = (
 /obj/machinery/atmospherics/components/tank/air,
 /obj/effect/turf_decal/stripes/line{
@@ -499,6 +477,15 @@
 	},
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/crew)
+"vd" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/power/shuttle_engine/propulsion/right{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/abandoned/engine)
 "vk" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/cargo)
@@ -719,6 +706,15 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/titanium/tiled/yellow,
 /area/shuttle/abandoned/engine)
+"Ix" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/power/shuttle_engine/propulsion/right{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/abandoned/bar)
 "IX" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -780,6 +776,35 @@
 /obj/machinery/power/smes/engineering,
 /turf/open/floor/plating,
 /area/shuttle/abandoned/engine)
+"Kl" = (
+/obj/effect/turf_decal/trimline/white/line,
+/obj/effect/turf_decal/trimline/white/filled/warning{
+	dir = 1
+	},
+/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
+	dir = 4;
+	view_range = 14;
+	y_offset = 5;
+	x_offset = 0
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/button/door{
+	id = "whiteship_windows";
+	name = "NTMS-037 Windows Blast Door Control";
+	pixel_x = -24;
+	pixel_y = 6
+	},
+/obj/machinery/button/door{
+	id = "whiteship_bridge";
+	name = "NTMS-037 Bridge Blast Door Control";
+	pixel_x = -24;
+	pixel_y = -6
+	},
+/turf/open/floor/pod/light,
+/area/shuttle/abandoned/bridge)
 "Kx" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
 /obj/machinery/door/poddoor{
@@ -860,16 +885,6 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/titanium/tiled/yellow,
 /area/shuttle/abandoned/engine)
-"MI" = (
-/obj/machinery/power/shuttle_engine/heater{
-	dir = 8
-	},
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/shuttle/abandoned/engine)
 "Nh" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/abandoned/engine)
@@ -901,16 +916,6 @@
 /obj/item/storage/box/donkpockets,
 /turf/open/floor/bamboo,
 /area/shuttle/abandoned/bar)
-"OZ" = (
-/obj/machinery/power/shuttle_engine/heater{
-	dir = 8
-	},
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/shuttle/abandoned/bar)
 "Pe" = (
 /obj/machinery/button/door/directional/north{
 	id = "whiteship_port";
@@ -924,15 +929,6 @@
 /obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/plating,
 /area/shuttle/abandoned/cargo)
-"Pz" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/power/shuttle_engine/propulsion/left{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/shuttle/abandoned/bar)
 "PR" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
@@ -1004,6 +1000,29 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/abandoned/crew)
+"Sk" = (
+/obj/machinery/door/airlock/external/ruin{
+	name = "External Freight Airlock"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible,
+/obj/docking_port/mobile{
+	callTime = 250;
+	can_move_docking_ports = 1;
+	dir = 2;
+	shuttle_id = "whiteship";
+	launch_status = 0;
+	movement_force = list("KNOCKDOWN"=0,"THROW"=0);
+	name = "Mining Shuttle";
+	port_direction = 8;
+	preferred_direction = 4
+	},
+/turf/open/floor/plating,
+/area/shuttle/abandoned/cargo)
 "Ss" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/fueltank,
@@ -1024,33 +1043,6 @@
 	},
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/cargo)
-"Ta" = (
-/obj/effect/turf_decal/trimline/white/line,
-/obj/effect/turf_decal/trimline/white/filled/warning{
-	dir = 1
-	},
-/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
-	dir = 4;
-	view_range = 14
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/button/door{
-	id = "whiteship_windows";
-	name = "NTMS-037 Windows Blast Door Control";
-	pixel_x = -24;
-	pixel_y = 6
-	},
-/obj/machinery/button/door{
-	id = "whiteship_bridge";
-	name = "NTMS-037 Bridge Blast Door Control";
-	pixel_x = -24;
-	pixel_y = -6
-	},
-/turf/open/floor/pod/light,
-/area/shuttle/abandoned/bridge)
 "Tf" = (
 /obj/structure/table,
 /obj/effect/turf_decal/trimline/brown/filled/shrink_ccw{
@@ -1098,6 +1090,16 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/titanium/tiled/yellow,
 /area/shuttle/abandoned/engine)
+"Wc" = (
+/obj/machinery/power/shuttle_engine/heater{
+	dir = 8
+	},
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/abandoned/bar)
 "Wj" = (
 /obj/effect/decal/cleanable/dirt,
 /mob/living/basic/creature{
@@ -1209,9 +1211,9 @@
 
 (1,1,1) = {"
 Nh
-jr
-mX
-rC
+mP
+pA
+vd
 Nh
 Gu
 Gu
@@ -1224,13 +1226,13 @@ Gu
 "}
 (2,1,1) = {"
 Nh
-MI
-MI
-MI
+sR
+sR
+sR
 CG
-jr
-mX
-rC
+mP
+pA
+vd
 gL
 Gu
 Gu
@@ -1243,9 +1245,9 @@ Ss
 bl
 eT
 CG
-MI
-MI
-MI
+sR
+sR
+sR
 CG
 Gu
 Gu
@@ -1322,8 +1324,8 @@ NV
 NV
 nN
 NV
-Pz
-oQ
+sT
+Ix
 BS
 Gu
 "}
@@ -1334,16 +1336,16 @@ bF
 eD
 Nt
 iI
-Ta
+Kl
 mH
 NV
-OZ
-OZ
+Wc
+Wc
 Of
 Gu
 "}
 (10,1,1) = {"
-ku
+Sk
 Bk
 vM
 Wj
@@ -1367,7 +1369,7 @@ iI
 uf
 zl
 NV
-fL
+cm
 zJ
 sz
 Kx
diff --git a/_maps/shuttles/whiteship_obelisk.dmm b/_maps/shuttles/whiteship_obelisk.dmm
index 7d12d3251ba4..3667b7b8c9af 100644
--- a/_maps/shuttles/whiteship_obelisk.dmm
+++ b/_maps/shuttles/whiteship_obelisk.dmm
@@ -76,19 +76,6 @@
 	},
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/abandoned/crew)
-"fe" = (
-/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
-	dir = 4;
-	view_range = 14;
-	x_offset = -3;
-	y_offset = -3
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/dark_blue/anticorner{
-	dir = 8
-	},
-/turf/open/floor/mineral/titanium,
-/area/shuttle/abandoned/bridge)
 "fF" = (
 /obj/machinery/door/airlock/shuttle{
 	name = "Refreshment Room"
@@ -205,12 +192,6 @@
 	},
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/abandoned/medbay)
-"mA" = (
-/obj/machinery/power/shuttle_engine/propulsion/left{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/shuttle/abandoned/engine)
 "mQ" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/crayon{
@@ -274,13 +255,6 @@
 	},
 /turf/open/floor/mineral/titanium,
 /area/shuttle/abandoned/bridge)
-"nQ" = (
-/obj/machinery/power/shuttle_engine/heater{
-	dir = 4
-	},
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/plating,
-/area/shuttle/abandoned/engine)
 "oU" = (
 /obj/structure/table/wood,
 /obj/machinery/chem_dispenser/drinks{
@@ -353,6 +327,13 @@
 	},
 /turf/open/floor/iron/large,
 /area/shuttle/abandoned)
+"tX" = (
+/obj/machinery/power/shuttle_engine/heater{
+	dir = 4
+	},
+/obj/structure/window/reinforced/spawner/directional/west,
+/turf/open/floor/plating/airless,
+/area/shuttle/abandoned/engine)
 "us" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/blood/splatter,
@@ -403,12 +384,6 @@
 	},
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/shuttle/abandoned/engine)
-"yB" = (
-/obj/effect/turf_decal/stripes{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/shuttle/abandoned/engine)
 "yY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
@@ -505,6 +480,10 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/abandoned)
+"ES" = (
+/obj/machinery/vending/medical,
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/abandoned/medbay)
 "Fr" = (
 /obj/structure/cable,
 /obj/effect/mob_spawn/corpse/human/assistant,
@@ -598,6 +577,12 @@
 	},
 /turf/open/floor/mineral/titanium/tiled/yellow,
 /area/shuttle/abandoned)
+"JQ" = (
+/obj/machinery/power/shuttle_engine/propulsion/left{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/abandoned/engine)
 "Kb" = (
 /obj/structure/cable,
 /obj/machinery/door/airlock/external/ruin{
@@ -705,12 +690,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/large,
 /area/shuttle/abandoned/crew)
-"Pl" = (
-/obj/machinery/power/shuttle_engine/propulsion/right{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/shuttle/abandoned/engine)
 "PR" = (
 /obj/structure/table/wood,
 /obj/effect/spawner/random/food_or_drink/dinner,
@@ -741,10 +720,6 @@
 /obj/effect/spawner/random/medical/minor_healing,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/abandoned/medbay)
-"Qp" = (
-/obj/machinery/vending/medical,
-/turf/open/floor/mineral/titanium/white,
-/area/shuttle/abandoned/medbay)
 "RG" = (
 /obj/structure/cable,
 /obj/structure/table/wood,
@@ -789,6 +764,12 @@
 	},
 /turf/open/floor/mineral/titanium/purple,
 /area/shuttle/abandoned/bar)
+"SV" = (
+/obj/effect/turf_decal/stripes{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/abandoned/engine)
 "SW" = (
 /obj/machinery/airalarm/directional/west,
 /obj/effect/mapping_helpers/airalarm/all_access,
@@ -812,6 +793,19 @@
 	},
 /turf/open/floor/catwalk_floor/iron_smooth,
 /area/shuttle/abandoned/engine)
+"Um" = (
+/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
+	dir = 4;
+	view_range = 14;
+	x_offset = -2;
+	y_offset = -7
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/dark_blue/anticorner{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/abandoned/bridge)
 "VI" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned/bar)
@@ -881,6 +875,12 @@
 /obj/effect/spawner/random/vending/snackvend,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/abandoned)
+"Yg" = (
+/obj/machinery/power/shuttle_engine/propulsion/right{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/abandoned/engine)
 "YA" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/blood/footprints{
@@ -972,7 +972,7 @@ Bf
 (5,1,1) = {"
 Bf
 ck
-Qp
+ES
 lP
 NM
 us
@@ -1012,7 +1012,7 @@ NG
 cV
 RU
 rV
-fe
+Um
 cV
 jC
 qh
@@ -1126,15 +1126,15 @@ Bf
 Bf
 qA
 qA
-nQ
-nQ
-nQ
-nQ
+tX
+tX
+tX
+tX
 qA
-nQ
-nQ
-nQ
-nQ
+tX
+tX
+tX
+tX
 qA
 qA
 Bf
@@ -1143,15 +1143,15 @@ Bf
 Bf
 qA
 qA
-Pl
-Pl
-Pl
-Pl
+Yg
+Yg
+Yg
+Yg
 qA
-mA
-mA
-mA
-mA
+JQ
+JQ
+JQ
+JQ
 qA
 qA
 Bf
@@ -1160,15 +1160,15 @@ Bf
 Bf
 Bf
 qA
-yB
-yB
-yB
-yB
+SV
+SV
+SV
+SV
 qA
-yB
-yB
-yB
-yB
+SV
+SV
+SV
+SV
 qA
 Bf
 Bf
diff --git a/_maps/shuttles/whiteship_personalshuttle.dmm b/_maps/shuttles/whiteship_personalshuttle.dmm
index dfb4396ad240..afcd9ddc62bd 100644
--- a/_maps/shuttles/whiteship_personalshuttle.dmm
+++ b/_maps/shuttles/whiteship_personalshuttle.dmm
@@ -164,7 +164,7 @@
 /obj/machinery/power/shuttle_engine/propulsion/right{
 	dir = 1
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
 /area/shuttle/abandoned/engine)
 "cM" = (
 /turf/template_noop,
@@ -174,7 +174,7 @@
 	dir = 1
 	},
 /obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
 /area/shuttle/abandoned/engine)
 "cY" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -328,9 +328,8 @@
 "mj" = (
 /obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
 	dir = 1;
-	view_range = 14;
-	x_offset = -3;
-	y_offset = -3
+	x_offset = 0;
+	y_offset = -5
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/plastitanium,
@@ -514,7 +513,7 @@
 /obj/machinery/power/shuttle_engine/propulsion/left{
 	dir = 1
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
 /area/shuttle/abandoned/engine)
 "UC" = (
 /obj/effect/decal/cleanable/dirt,
diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm
index 56f85fcd8021..db7f00e5149c 100644
--- a/_maps/shuttles/whiteship_pubby.dmm
+++ b/_maps/shuttles/whiteship_pubby.dmm
@@ -271,7 +271,7 @@
 "lV" = (
 /obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
 	y_offset = 2;
-	x_offset = -7
+	x_offset = -8
 	},
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/effect/decal/cleanable/dirt,
@@ -550,7 +550,7 @@
 	shuttle_id = "whiteship";
 	launch_status = 0;
 	name = "White Ship";
-	port_direction = 2
+	port_direction = 4
 	},
 /turf/open/floor/plating,
 /area/shuttle/abandoned)
diff --git a/_maps/shuttles/whiteship_tram.dmm b/_maps/shuttles/whiteship_tram.dmm
index 87e00f577a7d..0246bf3c8920 100644
--- a/_maps/shuttles/whiteship_tram.dmm
+++ b/_maps/shuttles/whiteship_tram.dmm
@@ -1121,7 +1121,9 @@
 /area/shuttle/abandoned/bridge)
 "sw" = (
 /obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
-	dir = 8
+	dir = 8;
+	x_offset = 0;
+	y_offset = 13
 	},
 /obj/effect/turf_decal/stripes/white/corner{
 	dir = 1
diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm
index 4d309d07e8fc..8003b9966db0 100644
--- a/code/__DEFINES/icon_smoothing.dm
+++ b/code/__DEFINES/icon_smoothing.dm
@@ -190,8 +190,13 @@ DEFINE_BITFIELD(smoothing_junction, list(
 
 #define SMOOTH_GROUP_CLEANABLE_DIRT S_OBJ(68) ///obj/effect/decal/cleanable/dirt
 
-#define SMOOTH_GROUP_GAS_TANK S_OBJ(72)
+#define SMOOTH_GROUP_GAS_TANK S_OBJ(69)
 
+#define SMOOTH_GROUP_SPIDER_WEB S_OBJ(70) // /obj/structure/spider/stickyweb
+#define SMOOTH_GROUP_SPIDER_WEB_WALL S_OBJ(71) // /obj/structure/spider/stickyweb/sealed
+#define SMOOTH_GROUP_SPIDER_WEB_ROOF S_OBJ(72) // /obj/structure/spider/passage
+#define SMOOTH_GROUP_SPIDER_WEB_WALL_TOUGH S_OBJ(73) // /obj/structure/spider/stickyweb/sealed/thick
+#define SMOOTH_GROUP_SPIDER_WEB_WALL_MIRROR S_OBJ(74) // /obj/structure/spider/stickyweb/sealed/reflector
 
 #define SMOOTH_GROUP_GRAV_FIELD S_OBJ(69)
 
diff --git a/code/__DEFINES/supermatter.dm b/code/__DEFINES/supermatter.dm
index 61be539749e1..6820993c17e1 100644
--- a/code/__DEFINES/supermatter.dm
+++ b/code/__DEFINES/supermatter.dm
@@ -34,8 +34,9 @@
 /// The base zap power transmission of the supermatter crystal in W/MeV.
 #define BASE_POWER_TRANSMISSION_RATE 1040
 
-//These would be what you would get at point blank, decreases with distance
-#define DETONATION_HALLUCINATION (20 MINUTES)
+//These would be what you would get at point blank, decreases with distance up to a minimum
+#define DETONATION_HALLUCINATION_MAX (20 MINUTES)
+#define DETONATION_HALLUCINATION_MIN (100 SECONDS)
 
 /// All humans within this range will be irradiated
 #define DETONATION_RADIATION_RANGE 20
diff --git a/code/datums/shuttles/whiteship.dm b/code/datums/shuttles/whiteship.dm
index 0b48575e057c..b8dbcfd4bd76 100644
--- a/code/datums/shuttles/whiteship.dm
+++ b/code/datums/shuttles/whiteship.dm
@@ -24,7 +24,7 @@
 /datum/map_template/shuttle/whiteship/birdshot
 	suffix = "birdshot"
 	name = "NT Patrol Bee"
-	description = "A small patrol vessel with a central corridor connecting all rooms. Features 2 small cargo bays and a brig. Spawns with an agressive and deadly Gelatinous Cube"
+	description = "A small patrol vessel with a central corridor connecting all rooms. Features 2 small cargo bays and a brig. Spawns with an aggressive and deadly Gelatinous Cube"
 
 /datum/map_template/shuttle/whiteship/kilo
 	suffix = "kilo"
diff --git a/code/game/objects/effects/anomalies/anomalies_hallucination.dm b/code/game/objects/effects/anomalies/anomalies_hallucination.dm
index a6696070df1c..0de7e218bf0f 100644
--- a/code/game/objects/effects/anomalies/anomalies_hallucination.dm
+++ b/code/game/objects/effects/anomalies/anomalies_hallucination.dm
@@ -11,7 +11,7 @@
 	var/static/list/messages = list(
 		span_warning("You feel your conscious mind fall apart!"),
 		span_warning("Reality warps around you!"),
-		span_warning("Something's wispering around you!"),
+		span_warning("Something's whispering around you!"),
 		span_warning("You are going insane!"),
 	)
 
diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm
index 011bc142f232..42c83b804685 100644
--- a/code/game/objects/effects/decals/cleanable/misc.dm
+++ b/code/game/objects/effects/decals/cleanable/misc.dm
@@ -129,6 +129,7 @@
 	desc = "Somebody should remove that."
 	gender = NEUTER
 	layer = WALL_OBJ_LAYER
+	icon = 'icons/effects/web.dmi'
 	icon_state = "cobweb1"
 	resistance_flags = FLAMMABLE
 	beauty = -100
diff --git a/code/game/objects/effects/spiderwebs.dm b/code/game/objects/effects/spiderwebs.dm
index 5023f9bd8254..2d0f1b9b14de 100644
--- a/code/game/objects/effects/spiderwebs.dm
+++ b/code/game/objects/effects/spiderwebs.dm
@@ -1,7 +1,8 @@
-//generic procs copied from obj/effect/alien
+#define SPIDER_WEB_TINT	"web_colour_tint"
+
 /obj/structure/spider
 	name = "web"
-	icon = 'icons/effects/effects.dmi'
+	icon = 'icons/effects/web.dmi'
 	desc = "It's stringy and sticky."
 	anchored = TRUE
 	density = FALSE
@@ -22,7 +23,7 @@
 				damage_amount *= 1.25
 			if(BRUTE)
 				damage_amount *= 0.25
-	. = ..()
+	return ..()
 
 /obj/structure/spider/should_atmos_process(datum/gas_mixture/air, exposed_temperature)
 	return exposed_temperature > 350
@@ -31,17 +32,37 @@
 	take_damage(5, BURN, 0, 0)
 
 /obj/structure/spider/stickyweb
+	plane = FLOOR_PLANE
+	layer = MID_TURF_LAYER
+	icon = 'icons/obj/smooth_structures/stickyweb.dmi'
+	base_icon_state = "stickyweb"
+	icon_state = "stickyweb-0"
+	smoothing_flags = SMOOTH_BITMASK
+	smoothing_groups = SMOOTH_GROUP_SPIDER_WEB
+	canSmoothWith = SMOOTH_GROUP_SPIDER_WEB + SMOOTH_GROUP_WALLS
 	///Whether or not the web is from the genetics power
 	var/genetic = FALSE
 	///Whether or not the web is a sealed web
 	var/sealed = FALSE
-	icon_state = "stickyweb1"
+	///Do we need to offset this based on a sprite frill?
+	var/has_frill = TRUE
+	/// Chance that someone will get stuck when trying to cross this tile
+	var/stuck_chance = 50
+	/// Chance that a bullet will hit this instead of flying through it
+	var/projectile_stuck_chance = 30
+
+/obj/structure/spider/stickyweb/Initialize(mapload)
+	// Offset on init so that they look nice in the map editor
+	if (has_frill)
+		pixel_x = -9
+		pixel_y = -9
+	return ..()
 
 /obj/structure/spider/stickyweb/attack_hand(mob/user, list/modifiers)
 	.= ..()
 	if(.)
 		return
-	if(!HAS_TRAIT(user,TRAIT_WEB_WEAVER))
+	if(!HAS_TRAIT(user, TRAIT_WEB_WEAVER))
 		return
 	loc.balloon_alert_to_viewers("weaving...")
 	if(!do_after(user, 2 SECONDS))
@@ -51,11 +72,6 @@
 	var/obj/item/stack/sheet/cloth/woven_cloth = new /obj/item/stack/sheet/cloth
 	user.put_in_hands(woven_cloth)
 
-/obj/structure/spider/stickyweb/Initialize(mapload)
-	if(!sealed && prob(50))
-		icon_state = "stickyweb2"
-	. = ..()
-
 /obj/structure/spider/stickyweb/CanAllowThrough(atom/movable/mover, border_dir)
 	. = ..()
 	if(genetic)
@@ -67,65 +83,125 @@
 			return TRUE
 		if(mover.pulledby && HAS_TRAIT(mover.pulledby, TRAIT_WEB_SURFER))
 			return TRUE
-		if(prob(50))
-			loc.balloon_alert(mover, "stuck in web!")
+		if(prob(stuck_chance))
+			stuck_react(mover)
 			return FALSE
-	else if(isprojectile(mover))
-		return prob(30)
-
-/obj/structure/spider/stickyweb/sealed
-	name = "sealed web"
-	desc = "A solid thick wall of web, airtight enough to block air flow."
-	icon_state = "sealedweb"
-	sealed = TRUE
-	can_atmos_pass = ATMOS_PASS_NO
+		return .
+	if(isprojectile(mover))
+		return prob(projectile_stuck_chance)
+	return .
 
-/obj/structure/spider/stickyweb/sealed/Initialize(mapload)
-	. = ..()
-	air_update_turf(TRUE, TRUE)
+/// Show some feedback when you can't pass through something
+/obj/structure/spider/stickyweb/proc/stuck_react(atom/movable/stuck_guy)
+	loc.balloon_alert(stuck_guy, "stuck in web!")
+	stuck_guy.Shake(duration = 0.1 SECONDS)
 
-/obj/structure/spider/stickyweb/genetic //for the spider genes in genetics
+/// Web made by geneticists, needs special handling to allow them to pass through their own webs
+/obj/structure/spider/stickyweb/genetic
 	genetic = TRUE
+	desc = "It's stringy, sticky, and came out of your coworker."
+	/// Mob with special permission to cross this web
 	var/mob/living/allowed_mob
 
 /obj/structure/spider/stickyweb/genetic/Initialize(mapload, allowedmob)
-	allowed_mob = allowedmob
 	. = ..()
+	// Tint it purple so that spiders don't get confused about why they can't cross this one
+	add_filter(SPIDER_WEB_TINT, 10, list("type" = "outline", "color" = "#ffaaf8ff", "size" = 0.1))
+
+/obj/structure/spider/stickyweb/genetic/Initialize(mapload, allowedmob)
+	allowed_mob = allowedmob
+	return ..()
 
 /obj/structure/spider/stickyweb/genetic/CanAllowThrough(atom/movable/mover, border_dir)
-	. = ..() //this is the normal spider web return aka a spider would make this TRUE
+	. = ..()
 	if(mover == allowed_mob)
 		return TRUE
 	else if(isliving(mover)) //we change the spider to not be able to go through here
 		if(mover.pulledby == allowed_mob)
 			return TRUE
 		if(prob(50))
-			loc.balloon_alert(mover, "stuck in web!")
+			stuck_react(mover)
 			return FALSE
 	else if(isprojectile(mover))
 		return prob(30)
+	return .
 
-/obj/structure/spider/solid
-	name = "solid web"
-	icon = 'icons/effects/effects.dmi'
-	desc = "A solid wall of web, thick enough to block air flow."
-	icon_state = "solidweb"
+/// Web with a 100% chance to intercept movement
+/obj/structure/spider/stickyweb/very_sticky
+	max_integrity = 20
+	desc = "Extremely sticky silk, you're not easily getting through there."
+	stuck_chance = 100
+	projectile_stuck_chance = 100
+
+/obj/structure/spider/stickyweb/very_sticky/Initialize(mapload)
+	. = ..()
+	add_filter(SPIDER_WEB_TINT, 10, list("type" = "outline", "color" = "#ffffaaff", "size" = 0.1))
+
+/obj/structure/spider/stickyweb/very_sticky/update_overlays()
+	. = ..()
+	var/mutable_appearance/web_overlay = mutable_appearance(icon = 'icons/effects/web.dmi', icon_state = "sticky_overlay", layer = layer + 1)
+	web_overlay.pixel_x -= pixel_x
+	web_overlay.pixel_y -= pixel_y
+	. += web_overlay
+
+
+/// Web 'wall'
+/obj/structure/spider/stickyweb/sealed
+	name = "sealed web"
+	desc = "A solid wall of web, dense enough to block air flow."
+	icon = 'icons/obj/smooth_structures/webwall.dmi'
+	base_icon_state = "webwall"
+	icon_state = "webwall-0"
+	smoothing_groups = SMOOTH_GROUP_SPIDER_WEB_WALL
+	canSmoothWith = SMOOTH_GROUP_SPIDER_WEB_WALL
+	plane = GAME_PLANE
+	layer = OBJ_LAYER
+	sealed = TRUE
+	has_frill = FALSE
 	can_atmos_pass = ATMOS_PASS_NO
+
+/obj/structure/spider/stickyweb/sealed/Initialize(mapload)
+	. = ..()
+	air_update_turf(TRUE, TRUE)
+
+/// Walls which reflects lasers
+/obj/structure/spider/stickyweb/sealed/reflector
+	name = "reflective silk screen"
+	desc = "Hardened webbing treated with special chemicals which cause it to repel projectiles."
+	icon = 'icons/obj/smooth_structures/webwall_reflector.dmi'
+	base_icon_state = "webwall_reflector"
+	icon_state = "webwall_reflector-0"
+	smoothing_groups = SMOOTH_GROUP_SPIDER_WEB_WALL_MIRROR
+	canSmoothWith = SMOOTH_GROUP_SPIDER_WEB_WALL_MIRROR
+	max_integrity = 30
+	opacity = TRUE
+	flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD
+	receive_ricochet_chance_mod = INFINITY
+
+/// Opaque and durable web 'wall'
+/obj/structure/spider/stickyweb/sealed/tough
+	name = "hardened web"
+	desc = "Webbing hardened through a chemical process into a durable barrier."
+	icon = 'icons/obj/smooth_structures/webwall_dark.dmi'
+	base_icon_state = "webwall_dark"
+	icon_state = "webwall_dark-0"
+	smoothing_groups = SMOOTH_GROUP_SPIDER_WEB_WALL_TOUGH
+	canSmoothWith = SMOOTH_GROUP_SPIDER_WEB_WALL_TOUGH
 	opacity = TRUE
-	density = TRUE
 	max_integrity = 90
 	layer = ABOVE_MOB_LAYER
 	resistance_flags = FIRE_PROOF | FREEZE_PROOF
 
-/obj/structure/spider/solid/Initialize(mapload)
-	. = ..()
-	air_update_turf(TRUE, TRUE)
-
+/// Web 'door', blocks atmos but not movement
 /obj/structure/spider/passage
 	name = "web passage"
-	icon = 'icons/effects/effects.dmi'
-	desc = "A messy connection of webs blocking the other side, but not solid enough to prevent passage."
-	icon_state = "webpassage"
+	desc = "An opaque curtain of web which seals in air but doesn't impede passage."
+	icon = 'icons/obj/smooth_structures/stickyweb_rotated.dmi'
+	base_icon_state = "stickyweb_rotated"
+	icon_state = "stickyweb_rotated-0"
+	smoothing_flags = SMOOTH_BITMASK
+	smoothing_groups = SMOOTH_GROUP_SPIDER_WEB_ROOF
+	canSmoothWith = SMOOTH_GROUP_SPIDER_WEB_ROOF + SMOOTH_GROUP_WALLS
 	can_atmos_pass = ATMOS_PASS_NO
 	opacity = TRUE
 	max_integrity = 60
@@ -135,7 +211,10 @@
 
 /obj/structure/spider/passage/Initialize(mapload)
 	. = ..()
+	pixel_x = -9
+	pixel_y = -9
 	air_update_turf(TRUE, TRUE)
+	add_filter(SPIDER_WEB_TINT, 10, list("type" = "outline", "color" = "#ffffffff", "alpha" = 0.8, "size" = 0.1))
 
 /obj/structure/spider/cocoon
 	name = "cocoon"
@@ -165,56 +244,31 @@
 		A.forceMove(T)
 	return ..()
 
-/obj/structure/spider/sticky
-	name = "sticky web"
-	icon = 'icons/effects/effects.dmi'
-	desc = "Extremely soft and sticky silk."
-	icon_state = "verystickyweb"
-	max_integrity = 20
-
-/obj/structure/spider/sticky/CanAllowThrough(atom/movable/mover, border_dir)
-	. = ..()
-	if(HAS_TRAIT(mover, TRAIT_WEB_SURFER))
-		return TRUE
-	if(!isliving(mover))
-		return
-	if(!isnull(mover.pulledby) && HAS_TRAIT(mover.pulledby, TRAIT_WEB_SURFER))
-		return TRUE
-	loc.balloon_alert(mover, "stuck in web!")
-	return FALSE
-
+/// Web caltrops
 /obj/structure/spider/spikes
 	name = "web spikes"
-	icon = 'icons/effects/effects.dmi'
 	desc = "Silk hardened into small yet deadly spikes."
-	icon_state = "webspikes1"
+	plane = FLOOR_PLANE
+	layer = MID_TURF_LAYER
+	icon = 'icons/obj/smooth_structures/stickyweb_spikes.dmi'
+	base_icon_state = "stickyweb_spikes"
+	icon_state = "stickyweb_spikes-0"
+	smoothing_flags = SMOOTH_BITMASK
+	smoothing_groups = SMOOTH_GROUP_SPIDER_WEB
+	canSmoothWith = SMOOTH_GROUP_SPIDER_WEB + SMOOTH_GROUP_WALLS
 	max_integrity = 40
 
 /obj/structure/spider/spikes/Initialize(mapload)
 	. = ..()
+	pixel_x = -9
+	pixel_y = -9
+	add_filter(SPIDER_WEB_TINT, 10, list("type" = "outline", "color" = "#ac0000ff", "size" = 0.1))
 	AddComponent(/datum/component/caltrop, min_damage = 20, max_damage = 30, flags = CALTROP_NOSTUN | CALTROP_BYPASS_SHOES)
 
-/obj/structure/spider/reflector
-	name = "Reflective silk screen"
-	icon = 'icons/effects/effects.dmi'
-	desc = "Made up of an extremly reflective silk material looking at it hurts."
-	icon_state = "reflector"
-	max_integrity = 30
-	density = TRUE
-	opacity = TRUE
-	anchored = TRUE
-	flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD
-	receive_ricochet_chance_mod = INFINITY
-
-/obj/structure/spider/reflector/Initialize(mapload)
-	. = ..()
-	air_update_turf(TRUE, TRUE)
-
 /obj/structure/spider/effigy
 	name = "web effigy"
-	icon = 'icons/effects/effects.dmi'
 	desc = "A giant spider! Fortunately, this one is just a statue of hardened webbing."
-	icon_state = "webcarcass"
+	icon_state = "effigy"
 	max_integrity = 125
 	density = TRUE
 	anchored = FALSE
@@ -222,3 +276,5 @@
 /obj/structure/spider/effigy/Initialize(mapload)
 	. = ..()
 	AddElement(/datum/element/temporary_atom, 1 MINUTES)
+
+#undef SPIDER_WEB_TINT
diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm
index cd49cc473184..66e9df75b035 100644
--- a/code/modules/clothing/suits/reactive_armour.dm
+++ b/code/modules/clothing/suits/reactive_armour.dm
@@ -1,11 +1,11 @@
-/obj/item/reactive_armour_shell
-	name = "reactive armour shell"
-	desc = "An experimental suit of armour, awaiting installation of an anomaly core."
+/obj/item/reactive_armor_shell
+	name = "reactive armor shell"
+	desc = "An experimental suit of armor, awaiting installation of an anomaly core."
 	icon_state = "reactiveoff"
 	icon = 'icons/obj/clothing/suits/armor.dmi'
 	w_class = WEIGHT_CLASS_BULKY
 
-/obj/item/reactive_armour_shell/attackby(obj/item/weapon, mob/user, params)
+/obj/item/reactive_armor_shell/attackby(obj/item/weapon, mob/user, params)
 	..()
 	var/static/list/anomaly_armour_types = list(
 		/obj/effect/anomaly/grav = /obj/item/clothing/suit/armor/reactive/repulse,
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/anomalyresearch.dm b/code/modules/mapfluff/ruins/spaceruin_code/anomalyresearch.dm
index f290c06d78f1..43393b28d344 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/anomalyresearch.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/anomalyresearch.dm
@@ -6,7 +6,7 @@
 		/obj/effect/anomaly/pyro/big,
 		/obj/effect/anomaly/flux/big,
 		/obj/effect/anomaly/bluespace/big,
-		/obj/effect/anomaly/grav/high/big
+		/obj/effect/anomaly/grav/high/big,
 	)
 
 ///Spawns a stable anomally that doesnt drop cores and doesn't destroy or alter the environment
@@ -17,7 +17,7 @@
 		/obj/effect/anomaly/flux,
 		/obj/effect/anomaly/bluespace,
 		/obj/effect/anomaly/hallucination,
-		/obj/effect/anomaly/bioscrambler/docile
+		/obj/effect/anomaly/bioscrambler/docile,
 	)
 
 	///Do we anchor the anomaly? Set to true if you don't want anomalies drifting away (like if theyre in space or something)
@@ -29,6 +29,14 @@
 	var/obj/effect/anomaly/anomaly = .
 	anomaly.stabilize(anchor = anchor_anomaly, has_core = FALSE)
 
+/obj/effect/spawner/random/environmentally_safe_anomaly/bioscramblerless
+	name = "safe anomaly spawner without bioscramblers"
+	loot = list(
+		/obj/effect/anomaly/flux,
+		/obj/effect/anomaly/bluespace,
+		/obj/effect/anomaly/hallucination,
+	)
+
 /obj/effect/spawner/random/environmentally_safe_anomaly/immobile
 	name = "stationary safe anomaly spawner"
 	icon_state = "anomaly_stationary"
diff --git a/code/modules/mapping/ruins.dm b/code/modules/mapping/ruins.dm
index a7b9480a34e4..2fcfd570e74c 100644
--- a/code/modules/mapping/ruins.dm
+++ b/code/modules/mapping/ruins.dm
@@ -100,7 +100,7 @@
 		if(R.unpickable)
 			continue
 		ruins_available[R] = R.placement_weight
-	while(budget > 0 && (ruins_available.len || forced_ruins.len))
+	while((budget > 0 && ruins_available.len) || forced_ruins.len)
 		var/datum/map_template/ruin/current_pick
 		var/forced = FALSE
 		var/forced_z //If set we won't pick z level and use this one instead.
diff --git a/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spider_subtrees.dm b/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spider_subtrees.dm
index e31146d2bd57..20f6ce4baf08 100644
--- a/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spider_subtrees.dm
+++ b/code/modules/mob/living/basic/space_fauna/spider/giant_spider/giant_spider_subtrees.dm
@@ -21,7 +21,7 @@
 
 	controller.clear_blackboard_key(target_key)
 	var/turf/our_turf = get_turf(spider)
-	if (is_valid_web_turf(our_turf))
+	if (is_valid_web_turf(our_turf, spider))
 		controller.set_blackboard_key(target_key, our_turf)
 		return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
 
@@ -29,7 +29,7 @@
 	for (var/i in 1 to scan_range)
 		turfs_by_range["[i]"] = list()
 	for (var/turf/turf_in_view in oview(scan_range, our_turf))
-		if (!is_valid_web_turf(turf_in_view))
+		if (!is_valid_web_turf(turf_in_view, spider))
 			continue
 		turfs_by_range["[get_dist(our_turf, turf_in_view)]"] += turf_in_view
 
diff --git a/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/web.dm b/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/web.dm
index fa44cb35b2d1..5bb27b5109cb 100644
--- a/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/web.dm
+++ b/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/web.dm
@@ -3,7 +3,7 @@
 	name = "Spin Web"
 	desc = "Spin a web to slow down potential prey."
 	button_icon = 'icons/mob/actions/actions_animal.dmi'
-	button_icon_state = "lay_web"
+	button_icon_state = "spider_web"
 	background_icon_state = "bg_alien"
 	overlay_icon_state = "bg_alien_border"
 	cooldown_time = 0 SECONDS
@@ -17,10 +17,12 @@
 	. = ..()
 	if (!owner)
 		return
+	ADD_TRAIT(owner, TRAIT_WEB_WEAVER, REF(src))
 	RegisterSignals(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_DO_AFTER_BEGAN, COMSIG_DO_AFTER_ENDED), PROC_REF(update_status_on_signal))
 
 /datum/action/cooldown/mob_cooldown/lay_web/Remove(mob/removed_from)
 	. = ..()
+	REMOVE_TRAIT(removed_from, TRAIT_WEB_WEAVER, REF(src))
 	UnregisterSignal(removed_from, list(COMSIG_MOVABLE_MOVED, COMSIG_DO_AFTER_BEGAN, COMSIG_DO_AFTER_ENDED))
 
 /datum/action/cooldown/mob_cooldown/lay_web/IsAvailable(feedback = FALSE)
@@ -72,7 +74,7 @@
 /// Variant for genetics, created webs only allow the creator passage
 /datum/action/cooldown/mob_cooldown/lay_web/genetic
 	desc = "Spin a web. Only you will be able to traverse your web easily."
-	cooldown_time = 4 SECONDS //the same time to lay a web
+	cooldown_time = 4 SECONDS
 
 /datum/action/cooldown/mob_cooldown/lay_web/genetic/plant_web(turf/target_turf, obj/structure/spider/stickyweb/existing_web)
 	new /obj/structure/spider/stickyweb/genetic(target_turf, owner)
@@ -94,20 +96,20 @@
 /datum/action/cooldown/mob_cooldown/lay_web/solid_web
 	name = "Spin Solid Web"
 	desc = "Spin a web to obstruct potential prey."
-	button_icon_state = "lay_solid_web"
+	button_icon_state = "spider_wall"
 	cooldown_time = 0 SECONDS
 	webbing_time = 5 SECONDS
 
 /datum/action/cooldown/mob_cooldown/lay_web/solid_web/obstructed_by_other_web()
-	return !!(locate(/obj/structure/spider/solid) in get_turf(owner))
+	return !!(locate(/obj/structure/spider/stickyweb/sealed/tough) in get_turf(owner))
 
 /datum/action/cooldown/mob_cooldown/lay_web/solid_web/plant_web(turf/target_turf, obj/structure/spider/stickyweb/existing_web)
-	new /obj/structure/spider/solid(target_turf)
+	new /obj/structure/spider/stickyweb/sealed/tough(target_turf)
 
 /datum/action/cooldown/mob_cooldown/lay_web/web_passage
 	name = "Spin Web Passage"
 	desc = "Spin a web passage to hide the nest from prey view."
-	button_icon_state = "lay_web_passage"
+	button_icon_state = "spider_roof"
 	cooldown_time = 0 SECONDS
 	webbing_time = 4 SECONDS
 
@@ -120,20 +122,20 @@
 /datum/action/cooldown/mob_cooldown/lay_web/sticky_web
 	name = "Spin Sticky Web"
 	desc = "Spin a sticky web to trap intruders."
-	button_icon_state = "lay_sticky_web"
+	button_icon_state = "spider_ropes"
 	cooldown_time = 20 SECONDS
 	webbing_time = 3 SECONDS
 
 /datum/action/cooldown/mob_cooldown/lay_web/sticky_web/obstructed_by_other_web()
-	return !!(locate(/obj/structure/spider/sticky) in get_turf(owner))
+	return !!(locate(/obj/structure/spider/stickyweb/very_sticky) in get_turf(owner))
 
 /datum/action/cooldown/mob_cooldown/lay_web/sticky_web/plant_web(turf/target_turf, obj/structure/spider/stickyweb/existing_web)
-	new /obj/structure/spider/sticky(target_turf)
+	new /obj/structure/spider/stickyweb/very_sticky(target_turf)
 
 /datum/action/cooldown/mob_cooldown/lay_web/web_spikes
 	name = "Spin Web Spikes"
 	desc = "Extrude silk spikes to dissuade invaders."
-	button_icon_state = "lay_web_spikes"
+	button_icon_state = "spider_spikes"
 	cooldown_time = 40 SECONDS
 	webbing_time = 3 SECONDS
 
@@ -174,12 +176,12 @@
 /datum/action/cooldown/mob_cooldown/lay_web/web_reflector
 	name = "Spin reflective silk screen"
 	desc = "Spin a web to reflect missiles from the nest."
-	button_icon_state = "lay_web_reflector"
+	button_icon_state = "spider_mirror"
 	cooldown_time = 30 SECONDS
 	webbing_time = 4 SECONDS
 
 /datum/action/cooldown/mob_cooldown/lay_web/web_reflector/obstructed_by_other_web()
-	return !!(locate(/obj/structure/spider/reflector) in get_turf(owner))
+	return !!(locate(/obj/structure/spider/stickyweb/sealed/reflector) in get_turf(owner))
 
 /datum/action/cooldown/mob_cooldown/lay_web/web_reflector/plant_web(turf/target_turf, obj/structure/spider/stickyweb/existing_web)
-	new /obj/structure/spider/reflector(target_turf)
+	new /obj/structure/spider/stickyweb/sealed/reflector(target_turf)
diff --git a/code/modules/mob_spawn/ghost_roles/spider_roles.dm b/code/modules/mob_spawn/ghost_roles/spider_roles.dm
index f50d31d75cd3..aa7a597bc4ab 100644
--- a/code/modules/mob_spawn/ghost_roles/spider_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/spider_roles.dm
@@ -1,5 +1,6 @@
 /obj/structure/spider/eggcluster
 	name = "egg cluster"
+	icon = 'icons/effects/effects.dmi'
 	desc = "There's something alive in there, and sooner or later it's going to find its way out."
 	icon_state = "eggs"
 	/// Mob spawner handling the actual spawn of the spider
diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm
index 53e8700a93f6..0d7518462662 100644
--- a/code/modules/power/lighting/light.dm
+++ b/code/modules/power/lighting/light.dm
@@ -99,7 +99,7 @@
 				continue
 			if(on_turf.dir != dir)
 				continue
-			stack_trace("Conflicting double stacked light [on_turf.type] found at ([our_location.x],[our_location.y],[our_location.z])")
+			stack_trace("Conflicting double stacked light [on_turf.type] found at [get_area(our_location)] ([our_location.x],[our_location.y],[our_location.z])")
 			qdel(on_turf)
 
 	if(!mapload) //sync up nightshift lighting for player made lights
diff --git a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm
index a6c3f171b61a..635bb637df6c 100644
--- a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm
+++ b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm
@@ -1,3 +1,5 @@
+#define DELAM_MAX_DEVASTATION 17.5
+
 // These are supposed to be discrete effects so we can tell at a glance what does each override
 // of [/datum/sm_delam/proc/delaminate] does.
 // Please keep them discrete and give them proper, descriptive function names.
@@ -25,7 +27,8 @@
 			continue
 
 		//Hilariously enough, running into a closet should make you get hit the hardest.
-		var/hallucination_amount = max(100 SECONDS, min(600 SECONDS, DETONATION_HALLUCINATION * sqrt(1 / (get_dist(victim, src) + 1))))
+		//duration between min and max, calculated by distance from the supermatter and size of the delam explosion
+		var/hallucination_amount = LERP(DETONATION_HALLUCINATION_MIN, DETONATION_HALLUCINATION_MAX, 1 - get_dist(victim, sm) / 128) * LERP(0.75, 1.25, calculate_explosion(sm) * 0.5 / DELAM_MAX_DEVASTATION)
 		victim.adjust_hallucinations(hallucination_amount)
 
 	for(var/mob/victim as anything in GLOB.player_list)
@@ -75,20 +78,20 @@
 
 /// Explodes
 /datum/sm_delam/proc/effect_explosion(obj/machinery/power/supermatter_crystal/sm)
-	var/explosion_power = sm.explosion_power
-	var/power_scaling = sm.gas_heat_power_generation
 	var/turf/sm_turf = get_turf(sm)
-	//Dear mappers, balance the sm max explosion radius to 17.5, 37, 39, 41
 	explosion(origin = sm_turf,
-		devastation_range = explosion_power * max(power_scaling, 0.205) * 0.5,
-		heavy_impact_range = explosion_power * max(power_scaling, 0.205) + 2,
-		light_impact_range = explosion_power * max(power_scaling, 0.205) + 4,
-		flash_range = explosion_power * max(power_scaling, 0.205) + 6,
+		devastation_range = calculate_explosion(sm) * 0.5, // max 17.5
+		heavy_impact_range = calculate_explosion(sm) + 2, // max 37
+		light_impact_range = calculate_explosion(sm) + 4, // max 39
+		flash_range = calculate_explosion(sm) + 6, //max 41
 		adminlog = TRUE,
 		ignorecap = TRUE
 	)
 	return TRUE
 
+/datum/sm_delam/proc/calculate_explosion(obj/machinery/power/supermatter_crystal/sm)
+	return sm.explosion_power * max(sm.gas_heat_power_generation, 0.205)
+
 /// Spawns a scrung and eat the SM.
 /datum/sm_delam/proc/effect_singulo(obj/machinery/power/supermatter_crystal/sm)
 	var/turf/sm_turf = get_turf(sm)
@@ -228,3 +231,5 @@
 			spawn_location = pick_n_take(possible_spawns)
 		while(get_dist(spawn_location, avoid) < 30)
 		new /obj/crystal_mass(get_turf(spawn_location))
+
+#undef DELAM_MAX_DEVASTATION
diff --git a/code/modules/power/supermatter/supermatter_extra_effects.dm b/code/modules/power/supermatter/supermatter_extra_effects.dm
index ec40b8020240..965d97a53d7f 100644
--- a/code/modules/power/supermatter/supermatter_extra_effects.dm
+++ b/code/modules/power/supermatter/supermatter_extra_effects.dm
@@ -138,13 +138,13 @@
 				supermatter_zap(src, range = range, zap_str = discharged_energy, zap_flags = flags, zap_cutoff = src.zap_cutoff, power_level = internal_energy, zap_icon = src.zap_icon)
 		last_high_energy_accumulation_perspective_machines = SSmachines.times_fired
 	if(prob(5))
-		supermatter_anomaly_gen(src, FLUX_ANOMALY, rand(5, 10))
+		supermatter_anomaly_gen(get_ranged_target_turf(src, pick(GLOB.cardinals), rand(5, 10)), FLUX_ANOMALY, 3)
 	if(prob(5))
-		supermatter_anomaly_gen(src, HALLUCINATION_ANOMALY, rand(5, 10))
+		supermatter_anomaly_gen(get_ranged_target_turf(src, pick(GLOB.cardinals), rand(5, 10)), HALLUCINATION_ANOMALY, 3)
 	if(internal_energy > SEVERE_POWER_PENALTY_THRESHOLD && prob(5) || prob(1))
-		supermatter_anomaly_gen(src, GRAVITATIONAL_ANOMALY, rand(5, 10))
+		supermatter_anomaly_gen(get_ranged_target_turf(src, pick(GLOB.cardinals), rand(5, 10)), GRAVITATIONAL_ANOMALY, 3)
 	if((internal_energy > SEVERE_POWER_PENALTY_THRESHOLD && prob(2)) || (prob(0.3) && internal_energy > POWER_PENALTY_THRESHOLD))
-		supermatter_anomaly_gen(src, PYRO_ANOMALY, rand(5, 10))
+		supermatter_anomaly_gen(get_ranged_target_turf(src, pick(GLOB.cardinals), rand(5, 10)), PYRO_ANOMALY, 3)
 
 /obj/machinery/power/supermatter_crystal/proc/supermatter_pull(turf/center, pull_range = 3)
 	playsound(center, 'sound/weapons/marauder.ogg', 100, TRUE, extrarange = pull_range - world.view)
@@ -161,23 +161,25 @@
 		step_towards(movable_atom,center)
 
 /proc/supermatter_anomaly_gen(turf/anomalycenter, type = FLUX_ANOMALY, anomalyrange = 5, has_changed_lifespan = TRUE)
-	var/turf/local_turf = pick(orange(anomalyrange, anomalycenter))
+	var/turf/local_turf = pick(RANGE_TURFS(anomalyrange, anomalycenter))
 	if(!local_turf)
 		return
 	switch(type)
 		if(FLUX_ANOMALY)
 			var/explosive = has_changed_lifespan ? FLUX_NO_EXPLOSION : FLUX_LOW_EXPLOSIVE
-			new /obj/effect/anomaly/flux(local_turf, has_changed_lifespan ? rand(250, 350) : null, FALSE, explosive)
+			new /obj/effect/anomaly/flux(local_turf, has_changed_lifespan ? rand(25 SECONDS, 35 SECONDS) : null, FALSE, explosive)
 		if(GRAVITATIONAL_ANOMALY)
-			new /obj/effect/anomaly/grav(local_turf, has_changed_lifespan ? rand(200, 300) : null, FALSE)
+			new /obj/effect/anomaly/grav(local_turf, has_changed_lifespan ? rand(20 SECONDS, 30 SECONDS) : null, FALSE)
 		if(PYRO_ANOMALY)
-			new /obj/effect/anomaly/pyro(local_turf, has_changed_lifespan ? rand(150, 250) : null, FALSE)
+			new /obj/effect/anomaly/pyro(local_turf, has_changed_lifespan ? rand(15 SECONDS, 25 SECONDS) : null, FALSE)
 		if(HALLUCINATION_ANOMALY)
-			new /obj/effect/anomaly/hallucination(local_turf, has_changed_lifespan ? rand(150, 250) : null, FALSE)
+			new /obj/effect/anomaly/hallucination(local_turf, has_changed_lifespan ? rand(15 SECONDS, 25 SECONDS) : null, FALSE)
 		if(VORTEX_ANOMALY)
-			new /obj/effect/anomaly/bhole(local_turf, 20, FALSE)
+			new /obj/effect/anomaly/bhole(local_turf, 2 SECONDS, FALSE)
 		if(BIOSCRAMBLER_ANOMALY)
-			new /obj/effect/anomaly/bioscrambler(local_turf, null, FALSE)
+			new /obj/effect/anomaly/bioscrambler/docile(local_turf, null, FALSE)
+		if(DIMENSIONAL_ANOMALY)
+			new /obj/effect/anomaly/dimensional(local_turf, null, FALSE)
 
 #undef CHANCE_EQUATION_SLOPE
 #undef INTEGRITY_EXPONENTIAL_DEGREE
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 2c2a49efe9f4..fb9a5b30db37 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -708,7 +708,7 @@
 // Armour
 
 /datum/design/reactive_armour
-	name = "Reactive Armour Shell"
+	name = "Reactive Armor Shell"
 	desc = "An experimental suit of armour capable of utilizing an implanted anomaly core to protect the user."
 	id = "reactive_armour"
 	build_type = PROTOLATHE | AWAY_LATHE
@@ -719,7 +719,7 @@
 		/datum/material/silver = SHEET_MATERIAL_AMOUNT*2.5,
 		/datum/material/gold = SHEET_MATERIAL_AMOUNT * 2.5,
 	)
-	build_path = /obj/item/reactive_armour_shell
+	build_path = /obj/item/reactive_armor_shell
 	category = list(
 		RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
 	)
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index 15221bfe2061..d88cc258f3db 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -22,7 +22,9 @@
 	// Traits forbided for custom docking
 	var/list/locked_traits = list(ZTRAIT_RESERVED, ZTRAIT_CENTCOM, ZTRAIT_AWAY)
 	var/view_range = 0
+	///x offset for where the camera eye will spawn. Starts from shuttle's docking port
 	var/x_offset = 0
+	///y offset for where the camera eye will spawn. Starts from the shuttle's docking port
 	var/y_offset = 0
 	var/list/whitelist_turfs = list(/turf/open/space, /turf/open/floor/plating, /turf/open/lava, /turf/open/openspace)
 	var/see_hidden = FALSE
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 2088e8f3234c..2520328fb68e 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -379,6 +379,7 @@
 		"whiteship_tram",
 		"whiteship_personalshuttle",
 		"whiteship_obelisk",
+		"whiteship_birdshot",
 	)
 
 /// Helper proc that tests to ensure all whiteship templates can spawn at their docking port, and logs their sizes
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index f068a14f39e8..c3a693be416d 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/web.dmi b/icons/effects/web.dmi
new file mode 100644
index 000000000000..e21eb4d6ec34
Binary files /dev/null and b/icons/effects/web.dmi differ
diff --git a/icons/mob/actions/actions_animal.dmi b/icons/mob/actions/actions_animal.dmi
index 64b1c700f414..c13290716b75 100644
Binary files a/icons/mob/actions/actions_animal.dmi and b/icons/mob/actions/actions_animal.dmi differ
diff --git a/icons/obj/smooth_structures/stickyweb.dmi b/icons/obj/smooth_structures/stickyweb.dmi
new file mode 100644
index 000000000000..2c445260bd26
Binary files /dev/null and b/icons/obj/smooth_structures/stickyweb.dmi differ
diff --git a/icons/obj/smooth_structures/stickyweb.png b/icons/obj/smooth_structures/stickyweb.png
new file mode 100644
index 000000000000..ae53aaa53b2b
Binary files /dev/null and b/icons/obj/smooth_structures/stickyweb.png differ
diff --git a/icons/obj/smooth_structures/stickyweb.png.toml b/icons/obj/smooth_structures/stickyweb.png.toml
new file mode 100644
index 000000000000..cf7f5ce339f0
--- /dev/null
+++ b/icons/obj/smooth_structures/stickyweb.png.toml
@@ -0,0 +1,14 @@
+output_name = "stickyweb"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 50
+y = 50
+
+[output_icon_size]
+x = 50
+y = 50
+
+[cut_pos]
+x = 25
+y = 25
diff --git a/icons/obj/smooth_structures/stickyweb_rotated.dmi b/icons/obj/smooth_structures/stickyweb_rotated.dmi
new file mode 100644
index 000000000000..11d3e5546ae3
Binary files /dev/null and b/icons/obj/smooth_structures/stickyweb_rotated.dmi differ
diff --git a/icons/obj/smooth_structures/stickyweb_rotated.png b/icons/obj/smooth_structures/stickyweb_rotated.png
new file mode 100644
index 000000000000..6c5413ab792e
Binary files /dev/null and b/icons/obj/smooth_structures/stickyweb_rotated.png differ
diff --git a/icons/obj/smooth_structures/stickyweb_rotated.png.toml b/icons/obj/smooth_structures/stickyweb_rotated.png.toml
new file mode 100644
index 000000000000..61c615585e1c
--- /dev/null
+++ b/icons/obj/smooth_structures/stickyweb_rotated.png.toml
@@ -0,0 +1,14 @@
+output_name = "stickyweb_rotated"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 50
+y = 50
+
+[output_icon_size]
+x = 50
+y = 50
+
+[cut_pos]
+x = 25
+y = 25
diff --git a/icons/obj/smooth_structures/stickyweb_spikes.dmi b/icons/obj/smooth_structures/stickyweb_spikes.dmi
new file mode 100644
index 000000000000..b3dcfcc83f94
Binary files /dev/null and b/icons/obj/smooth_structures/stickyweb_spikes.dmi differ
diff --git a/icons/obj/smooth_structures/stickyweb_spikes.png b/icons/obj/smooth_structures/stickyweb_spikes.png
new file mode 100644
index 000000000000..98832695f67f
Binary files /dev/null and b/icons/obj/smooth_structures/stickyweb_spikes.png differ
diff --git a/icons/obj/smooth_structures/stickyweb_spikes.png.toml b/icons/obj/smooth_structures/stickyweb_spikes.png.toml
new file mode 100644
index 000000000000..ebd1260cfcf6
--- /dev/null
+++ b/icons/obj/smooth_structures/stickyweb_spikes.png.toml
@@ -0,0 +1,14 @@
+output_name = "stickyweb_spikes"
+template = "bitmask/diagonal_32x32.toml"
+
+[icon_size]
+x = 50
+y = 50
+
+[output_icon_size]
+x = 50
+y = 50
+
+[cut_pos]
+x = 25
+y = 25
diff --git a/icons/obj/smooth_structures/webwall.dmi b/icons/obj/smooth_structures/webwall.dmi
new file mode 100644
index 000000000000..e2308526cc96
Binary files /dev/null and b/icons/obj/smooth_structures/webwall.dmi differ
diff --git a/icons/obj/smooth_structures/webwall.png b/icons/obj/smooth_structures/webwall.png
new file mode 100644
index 000000000000..207978b8aaf4
Binary files /dev/null and b/icons/obj/smooth_structures/webwall.png differ
diff --git a/icons/obj/smooth_structures/webwall.png.toml b/icons/obj/smooth_structures/webwall.png.toml
new file mode 100644
index 000000000000..3f91f5f62e73
--- /dev/null
+++ b/icons/obj/smooth_structures/webwall.png.toml
@@ -0,0 +1,2 @@
+output_name = "webwall"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/webwall_dark.dmi b/icons/obj/smooth_structures/webwall_dark.dmi
new file mode 100644
index 000000000000..d3863a818144
Binary files /dev/null and b/icons/obj/smooth_structures/webwall_dark.dmi differ
diff --git a/icons/obj/smooth_structures/webwall_dark.png b/icons/obj/smooth_structures/webwall_dark.png
new file mode 100644
index 000000000000..df36c5108bda
Binary files /dev/null and b/icons/obj/smooth_structures/webwall_dark.png differ
diff --git a/icons/obj/smooth_structures/webwall_dark.png.toml b/icons/obj/smooth_structures/webwall_dark.png.toml
new file mode 100644
index 000000000000..4b3b155f1261
--- /dev/null
+++ b/icons/obj/smooth_structures/webwall_dark.png.toml
@@ -0,0 +1,2 @@
+output_name = "webwall_dark"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/icons/obj/smooth_structures/webwall_reflector.dmi b/icons/obj/smooth_structures/webwall_reflector.dmi
new file mode 100644
index 000000000000..04547349d53c
Binary files /dev/null and b/icons/obj/smooth_structures/webwall_reflector.dmi differ
diff --git a/icons/obj/smooth_structures/webwall_reflector.png b/icons/obj/smooth_structures/webwall_reflector.png
new file mode 100644
index 000000000000..881cb24fc0da
Binary files /dev/null and b/icons/obj/smooth_structures/webwall_reflector.png differ
diff --git a/icons/obj/smooth_structures/webwall_reflector.png.toml b/icons/obj/smooth_structures/webwall_reflector.png.toml
new file mode 100644
index 000000000000..c47c554f8dab
--- /dev/null
+++ b/icons/obj/smooth_structures/webwall_reflector.png.toml
@@ -0,0 +1,2 @@
+output_name = "webwall_reflector"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/tools/UpdatePaths/Scripts/81839_webs.txt b/tools/UpdatePaths/Scripts/81839_webs.txt
new file mode 100644
index 000000000000..10341bc2321b
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/81839_webs.txt
@@ -0,0 +1,3 @@
+/obj/structure/spider/solid : /obj/structure/spider/stickyweb/sealed/tough{@OLD}
+/obj/structure/spider/sticky : /obj/structure/spider/stickyweb/very_sticky{@OLD}
+/obj/structure/spider/reflector : /obj/structure/spider/stickyweb/sealed/reflector{@OLD}