diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 0a05c6f8ea..f9b486dfb6 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -33,13 +33,6 @@
 	},
 /turf/open/floor/plasteel/bar,
 /area/crew_quarters/bar)
-"aad" = (
-/obj/structure/table,
-/obj/machinery/chem_dispenser/drinks/beer{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
 "aae" = (
 /obj/effect/landmark/carpspawn,
 /turf/open/space,
@@ -11085,18 +11078,9 @@
 /turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva)
 "aCd" = (
-/obj/structure/bed,
-/obj/item/bedsheet,
 /obj/machinery/airalarm{
 	pixel_y = 23
 	},
-/obj/machinery/button/door{
-	id = "Dorm1";
-	name = "Dorm Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = 25;
-	specialfunctions = 4
-	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 4
 	},
@@ -11718,11 +11702,7 @@
 /area/ai_monitored/storage/eva)
 "aDK" = (
 /obj/machinery/door/airlock{
-	id_tag = "Dorm1";
-	name = "Dorm 1"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
+	name = "Cryo airlock"
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/dorms)
@@ -16676,7 +16656,7 @@
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "aQU" = (
-/obj/machinery/vending/cigarette,
+/obj/machinery/vending/kink,
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "aQV" = (
@@ -21093,9 +21073,9 @@
 /turf/closed/wall,
 /area/quartermaster/warehouse)
 "bcU" = (
-/obj/item/stack/tile/plasteel,
-/turf/open/space,
-/area/space/nearstation)
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "bcV" = (
 /obj/machinery/airalarm{
 	dir = 8;
@@ -21486,10 +21466,6 @@
 /obj/structure/closet/crate/medical,
 /turf/open/floor/plasteel/floorgrime,
 /area/quartermaster/warehouse)
-"bdV" = (
-/obj/item/stack/sheet/metal,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
 "bdW" = (
 /obj/item/clothing/gloves/color/rainbow,
 /obj/item/clothing/head/soft/rainbow,
@@ -34902,8 +34878,8 @@
 /turf/open/floor/plasteel,
 /area/science/misc_lab)
 "bJP" = (
-/obj/machinery/vending/boozeomat/all_access,
-/turf/open/floor/plasteel/bar,
+/obj/effect/spawner/lootdrop/keg,
+/turf/open/floor/plating,
 /area/maintenance/port/aft)
 "bJQ" = (
 /obj/effect/spawner/structure/window/reinforced,
@@ -37438,18 +37414,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/tcommsat/computer)
-"bPR" = (
-/obj/effect/decal/cleanable/robot_debris/old,
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
-"bPS" = (
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
-"bPT" = (
-/turf/open/floor/wood{
-	icon_state = "wood-broken"
-	},
-/area/maintenance/port/aft)
 "bPU" = (
 /obj/item/shard,
 /turf/open/floor/plating,
@@ -37870,27 +37834,6 @@
 /obj/item/stack/sheet/metal/ten,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
-"bRc" = (
-/obj/structure/table/wood,
-/obj/item/soap/nanotrasen,
-/turf/open/floor/wood{
-	icon_state = "wood-broken7"
-	},
-/area/maintenance/port/aft)
-"bRe" = (
-/obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 4;
-	name = "4maintenance loot spawner"
-	},
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
-"bRf" = (
-/obj/structure/table/wood,
-/turf/open/floor/wood{
-	icon_state = "wood-broken5"
-	},
-/area/maintenance/port/aft)
 "bRg" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -38355,12 +38298,12 @@
 	},
 /area/maintenance/starboard/aft)
 "bSn" = (
-/obj/machinery/space_heater,
-/turf/open/floor/wood,
+/obj/effect/spawner/lootdrop/crate_spawner,
+/turf/open/floor/plating,
 /area/maintenance/port/aft)
 "bSo" = (
-/obj/structure/chair/stool,
-/turf/open/floor/wood,
+/obj/effect/spawner/lootdrop/grille_or_trash,
+/turf/open/floor/plating,
 /area/maintenance/port/aft)
 "bSp" = (
 /obj/structure/grille/broken,
@@ -38389,12 +38332,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
 /area/tcommsat/computer)
-"bSu" = (
-/obj/item/stack/cable_coil{
-	amount = 5
-	},
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
 "bSv" = (
 /obj/machinery/camera{
 	c_tag = "Construction Area";
@@ -38846,54 +38783,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
-"bTs" = (
-/turf/open/floor/wood{
-	icon_state = "wood-broken5"
-	},
-/area/maintenance/port/aft)
-"bTt" = (
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
-	dir = 4
-	},
-/turf/open/floor/wood{
-	icon_state = "wood-broken6"
-	},
-/area/maintenance/port/aft)
-"bTu" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/maintenance/port/aft)
-"bTv" = (
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"bTw" = (
-/obj/machinery/door/airlock/maintenance/abandoned{
-	req_access_txt = "12"
-	},
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"bTx" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 8
-	},
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"bTy" = (
-/obj/effect/spawner/structure/window,
-/obj/machinery/atmospherics/pipe/simple/general/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
 "bTz" = (
 /obj/machinery/door/airlock/maintenance{
 	req_access_txt = "12"
@@ -45066,9 +44955,12 @@
 /turf/open/floor/plasteel,
 /area/engine/engineering)
 "cjn" = (
-/obj/item/weldingtool,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/obj/structure/chair/wood/normal{
+	dir = 4
+	},
+/obj/effect/landmark/blobstart,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "cjo" = (
 /obj/structure/closet/toolcloset,
 /turf/open/floor/plasteel,
@@ -49848,6 +49740,10 @@
 /obj/effect/landmark/carpspawn,
 /turf/open/space,
 /area/space/nearstation)
+"cxo" = (
+/obj/structure/chair/wood/normal,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "cxA" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -51016,10 +50912,6 @@
 /obj/item/clothing/under/burial,
 /turf/open/floor/plasteel/grimy,
 /area/chapel/office)
-"cCa" = (
-/obj/item/clothing/head/hardhat,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
 "cCb" = (
 /obj/structure/table,
 /obj/item/stack/cable_coil{
@@ -53262,6 +53154,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
+"dfL" = (
+/obj/structure/reagent_dispensers/keg/gargle,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "dqu" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/closed/wall/r_wall,
@@ -53272,6 +53168,13 @@
 	},
 /turf/closed/wall,
 /area/science/circuit)
+"dKP" = (
+/turf/closed/wall,
+/area/maintenance/bar)
+"dKV" = (
+/obj/structure/chair/stool/bar,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "dMZ" = (
 /obj/structure/sign/poster/official/random{
 	pixel_y = 32
@@ -53287,6 +53190,9 @@
 /obj/item/stock_parts/cell/high,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"evR" = (
+/turf/open/floor/plating,
+/area/maintenance/bar)
 "eyM" = (
 /obj/machinery/mineral/ore_redemption{
 	input_dir = 2;
@@ -53344,6 +53250,15 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
+"fvY" = (
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
+"fxa" = (
+/obj/structure/chair/wood/normal,
+/turf/open/floor/wood{
+	icon_state = "wood-broken4"
+	},
+/area/maintenance/bar)
 "fGf" = (
 /obj/machinery/smartfridge/disks{
 	pixel_y = 2
@@ -53387,6 +53302,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
+"gBo" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "gLH" = (
 /obj/machinery/door/airlock/external{
 	name = "External Access";
@@ -53397,6 +53318,12 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
+"gMl" = (
+/obj/structure/chair/wood/normal{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "gWd" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -53441,11 +53368,18 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"iiW" = (
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "ijc" = (
 /obj/structure/table,
 /obj/item/stack/sheet/metal/fifty,
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
+"imH" = (
+/obj/structure/falsewall,
+/turf/open/floor/plating,
+/area/maintenance/bar)
 "ipA" = (
 /turf/open/floor/plating,
 /area/maintenance/department/medical/morgue)
@@ -53455,6 +53389,13 @@
 /obj/item/pen,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"izv" = (
+/obj/machinery/vending/clothing,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "iEJ" = (
 /obj/machinery/door/airlock/external{
 	name = "Escape Pod One"
@@ -53502,6 +53443,14 @@
 /obj/machinery/rnd/production/techfab/department/cargo,
 /turf/open/floor/plasteel,
 /area/quartermaster/office)
+"jqv" = (
+/obj/structure/chair/wood/normal{
+	dir = 1
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken7"
+	},
+/area/maintenance/bar)
 "jrE" = (
 /obj/structure/sign/poster/official/random{
 	pixel_x = 32
@@ -53537,6 +53486,13 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
+"jJF" = (
+/obj/machinery/door/airlock/maintenance,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
 "jMF" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 9
@@ -53607,6 +53563,10 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
+"kyF" = (
+/obj/effect/landmark/xeno_spawn,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "kzT" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 6
@@ -53643,6 +53603,14 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/quartermaster/miningdock)
+"lnu" = (
+/obj/structure/chair/wood/normal{
+	dir = 4
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken6"
+	},
+/area/maintenance/bar)
 "lAB" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall,
@@ -53667,6 +53635,21 @@
 /obj/machinery/vending/wardrobe/bar_wardrobe,
 /turf/open/floor/wood,
 /area/crew_quarters/bar)
+"mpI" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood{
+	icon_state = "wood-broken5"
+	},
+/area/maintenance/bar)
+"mqZ" = (
+/obj/structure/reagent_dispensers/keg/aphro/strong,
+/obj/item/reagent_containers/glass/beaker,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"mrR" = (
+/obj/effect/spawner/lootdrop/keg,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "mBv" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -53684,12 +53667,21 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"mPE" = (
+/obj/machinery/chem_dispenser/drinks,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "mRe" = (
 /obj/machinery/light{
 	dir = 8
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"nfm" = (
+/obj/machinery/vending/autodrobe,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "noK" = (
 /obj/structure/girder,
 /turf/open/floor/plasteel/dark,
@@ -53732,6 +53724,10 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/mixing)
+"odx" = (
+/obj/machinery/vending/kink,
+/turf/open/floor/plating,
+/area/maintenance/bar)
 "oDF" = (
 /obj/machinery/light,
 /turf/open/floor/plating,
@@ -53742,6 +53738,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/circuit)
+"oKh" = (
+/obj/structure/chair/wood/normal{
+	icon_state = "wooden_chair";
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "oUh" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 1
@@ -53799,6 +53802,15 @@
 /obj/structure/grille/broken,
 /turf/open/space/basic,
 /area/space/nearstation)
+"qIw" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/computer/cryopod{
+	pixel_y = -30
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
 "rcD" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -53814,12 +53826,26 @@
 /obj/item/reagent_containers/food/drinks/beer,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
+"rBq" = (
+/obj/item/clothing/head/kitty,
+/obj/item/clothing/under/maid,
+/obj/item/clothing/mask/muzzle,
+/turf/open/floor/plating,
+/area/maintenance/bar)
 "rKP" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 1
 	},
 /turf/open/floor/plating,
 /area/construction)
+"rMN" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/item/tank/internals/anesthetic,
+/obj/item/clothing/mask/breath,
+/obj/effect/decal/cleanable/semen,
+/turf/open/floor/plating,
+/area/maintenance/bar)
 "saK" = (
 /obj/structure/closet/crate,
 /obj/item/target/alien,
@@ -53850,6 +53876,16 @@
 /obj/item/shovel/spade,
 /turf/open/floor/plasteel/hydrofloor,
 /area/hallway/secondary/service)
+"sAM" = (
+/turf/open/floor/wood{
+	icon_state = "wood-broken6"
+	},
+/area/maintenance/bar)
+"sEt" = (
+/turf/open/floor/wood{
+	icon_state = "wood-broken7"
+	},
+/area/maintenance/bar)
 "sLv" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -53865,6 +53901,13 @@
 /obj/machinery/door/airlock/maintenance/abandoned,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
+"sQX" = (
+/turf/open/floor/plating,
+/area/space)
+"sRT" = (
+/obj/machinery/vending/cola/random,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "sSW" = (
 /obj/structure/chair/office/light,
 /turf/open/floor/plasteel/white,
@@ -53888,16 +53931,43 @@
 	},
 /turf/open/floor/plating,
 /area/security/main)
+"sXA" = (
+/obj/machinery/vending/boozeomat/all_access,
+/turf/closed/wall,
+/area/maintenance/bar)
 "tal" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall,
 /area/hallway/secondary/service)
+"tkU" = (
+/turf/open/floor/wood{
+	icon_state = "wood-broken5"
+	},
+/area/maintenance/bar)
+"tqg" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/machinery/cryopod{
+	icon_state = "cryopod-open";
+	dir = 1
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
 "trb" = (
 /obj/machinery/light{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/security/courtroom)
+"tur" = (
+/obj/item/restraints/handcuffs/fake,
+/turf/open/floor/plating,
+/area/maintenance/bar)
+"tyO" = (
+/obj/item/clothing/under/color/grey,
+/turf/open/floor/plating,
+/area/maintenance/bar)
 "tMl" = (
 /obj/effect/turf_decal/loading_area,
 /turf/open/floor/plasteel/showroomfloor,
@@ -53909,12 +53979,35 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/mixing)
+"tPT" = (
+/obj/machinery/chem_dispenser/drinks/beer,
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"tRF" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "tXL" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 9
 	},
 /turf/closed/wall/r_wall,
 /area/maintenance/disposal/incinerator)
+"uaw" = (
+/obj/machinery/power/apc{
+	areastring = "/area/storage/art";
+	dir = 1;
+	name = "Maint bar";
+	pixel_y = 24
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "udp" = (
 /obj/item/crowbar/large,
 /obj/structure/rack,
@@ -53931,6 +54024,16 @@
 /obj/structure/rack,
 /turf/open/floor/plasteel/dark,
 /area/engine/engineering)
+"ujF" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
+/obj/machinery/cryopod{
+	icon_state = "cryopod-open";
+	dir = 1
+	},
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
 "uoB" = (
 /obj/structure/table/reinforced,
 /obj/item/multitool,
@@ -53941,6 +54044,26 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"usO" = (
+/obj/machinery/vending/snack/random,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
+"uuG" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"uvZ" = (
+/obj/structure/mineral_door/wood,
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "uNu" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -53983,6 +54106,14 @@
 	},
 /turf/open/floor/plasteel,
 /area/ai_monitored/storage/eva)
+"vjm" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/glass/rag,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "vxh" = (
 /obj/structure/table,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -54000,6 +54131,12 @@
 /obj/item/stock_parts/cell/high,
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"vzO" = (
+/obj/structure/chair/wood/normal{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/maintenance/bar)
 "vCb" = (
 /obj/machinery/rnd/production/techfab/department/service,
 /turf/open/floor/plasteel/hydrofloor,
@@ -54014,6 +54151,11 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/circuit)
+"wfR" = (
+/obj/item/electropack/shockcollar,
+/obj/item/assembly/signaler,
+/turf/open/floor/plating,
+/area/maintenance/bar)
 "wkN" = (
 /turf/closed/wall,
 /area/science/circuit)
@@ -54063,6 +54205,12 @@
 /obj/item/reagent_containers/glass/bucket,
 /turf/open/floor/plasteel/hydrofloor,
 /area/hallway/secondary/service)
+"xgF" = (
+/obj/structure/chair/stool/bar,
+/turf/open/floor/wood{
+	icon_state = "wood-broken5"
+	},
+/area/maintenance/bar)
 "xhV" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -71742,7 +71890,7 @@ aoV
 bVz
 aaf
 aaf
-aoV
+sQX
 aaa
 aaS
 aaf
@@ -73533,10 +73681,10 @@ aaa
 aaa
 aaa
 bCq
-bPS
-aad
-bPS
-bPS
+bHE
+bJP
+bHE
+bJP
 bCq
 cbk
 bLv
@@ -73789,11 +73937,11 @@ aaa
 aaa
 aaa
 aaa
-bLv
-bPR
-bRc
-bSo
-bTs
+bCq
+bHE
+bHE
+bHE
+bHE
 bCq
 bVy
 bLv
@@ -74047,10 +74195,10 @@ aaa
 aaa
 aaa
 bCq
-bPS
-bRf
-bSo
-bTu
+bHE
+bPW
+bHE
+bHE
 bCq
 bVB
 bHE
@@ -74303,11 +74451,11 @@ aaa
 aaa
 aaa
 aaa
-bLv
-bPT
-bRe
+bCq
+bHE
+bHE
 bSo
-bTt
+bHE
 bCq
 bVA
 bWw
@@ -74564,7 +74712,7 @@ bCq
 bPV
 bCq
 bCq
-bTw
+cTF
 bCq
 bVD
 bWy
@@ -74821,7 +74969,7 @@ bCq
 bPU
 bHE
 bSp
-bTv
+bHE
 bCq
 bVC
 bWx
@@ -75078,7 +75226,7 @@ bCq
 bPW
 bCq
 bCq
-bTy
+cOw
 bCq
 bVF
 bWA
@@ -75335,7 +75483,7 @@ bCq
 bHE
 bHE
 bSq
-bTx
+cdb
 bCq
 bVE
 bWz
@@ -75596,16 +75744,16 @@ bCq
 bCq
 bCq
 bCq
-bCq
 bYy
 bCq
 bCq
-bLv
 bCq
 bCq
 bCq
 bCq
-bLv
+bCq
+bCq
+bCq
 bUs
 bLv
 aaa
@@ -75854,15 +76002,15 @@ bHE
 bVG
 bHE
 bHE
-bHE
-bLv
-aaf
-aoV
-aoV
-aoV
-aoV
-aoV
-bLv
+bCq
+tPT
+tRF
+mrR
+dKP
+odx
+rBq
+tur
+bCq
 bUs
 bLv
 aaa
@@ -76108,18 +76256,18 @@ bHE
 bHE
 bCq
 bHE
-bLv
-bLv
-bLv
-bLv
-bLv
-aoV
-aoV
-aoV
-aoV
-aoV
-aaf
-bLv
+bCq
+bCq
+bCq
+sXA
+mPE
+kyF
+sAM
+imH
+evR
+evR
+rMN
+bCq
 bUs
 bLv
 aaf
@@ -76365,18 +76513,18 @@ bHE
 bHE
 cTF
 bHE
-bLv
-aoV
-aoV
-aoV
-aoV
-aoV
-aoV
-aoV
-aoV
-aoV
-aoV
-bLv
+bCq
+iiW
+iiW
+iiW
+iiW
+iiW
+dfL
+dKP
+mqZ
+tyO
+wfR
+bCq
 bUs
 bLv
 aaa
@@ -76622,18 +76770,18 @@ bHE
 bSs
 bCq
 bHE
-bLv
-aoV
-aoV
-aoV
+bCq
+uvZ
+dKP
+vjm
 bcU
-aaf
-aaH
-cCa
-aoV
-aoV
-aoV
-bLv
+bcU
+bcU
+dKP
+dKP
+dKP
+dKP
+bCq
 bUs
 bLv
 aaa
@@ -76879,17 +77027,17 @@ bRh
 bLu
 bCq
 bHE
-bLv
-aaf
-aaf
-aoV
-aoV
-aaH
-bdV
-aaH
-aaf
-aaf
-aaf
+bCq
+iiW
+iiW
+dKV
+xgF
+dKV
+dKV
+iiW
+gMl
+gMl
+iiW
 bLv
 bUs
 bLv
@@ -77135,18 +77283,18 @@ bOK
 bCq
 bCq
 bCq
-bHE
-bLv
-aoV
-aoV
-aoV
-aoV
+bUt
+bCq
+uaw
+tkU
+iiW
+lnu
 cjn
-bSu
-aaH
-aoV
-aoV
-aoV
+iiW
+cxo
+bcU
+bcU
+vzO
 bLv
 bUs
 bLv
@@ -77392,18 +77540,18 @@ bHE
 bLv
 aaa
 bLv
-bHE
-bLv
-aoV
-aoV
-aoV
-aoV
-aoV
-aaH
-aaf
-aoV
-aoV
-aoV
+uuG
+jJF
+gBo
+sEt
+cxo
+bcU
+bcU
+jqv
+cxo
+bcU
+mpI
+vzO
 bLv
 bUs
 bLv
@@ -77649,18 +77797,18 @@ bHE
 bLv
 aaf
 bLv
-bUt
-bLv
-aaf
-aaf
-aoV
-aoV
-aoV
-aaH
-aoV
-aoV
-aaf
-aaf
+bUs
+bCq
+iiW
+iiW
+fxa
+bcU
+bcU
+vzO
+iiW
+oKh
+oKh
+iiW
 bLv
 bUs
 bLv
@@ -77907,17 +78055,17 @@ bCq
 aaa
 bLv
 bUs
-bLv
-aoV
-aoV
-aoV
-aoV
-aoV
-aaf
-aoV
-aoV
-aoV
-aoV
+bCq
+sRT
+usO
+iiW
+oKh
+oKh
+iiW
+iiW
+iiW
+izv
+nfm
 bCq
 bUs
 bCq
@@ -84277,8 +84425,8 @@ arf
 aqa
 atf
 arf
-aqa
-atf
+tqg
+ujF
 arf
 anF
 ahn
@@ -84534,8 +84682,8 @@ arf
 apY
 ath
 arf
-apY
-ate
+fvY
+ath
 arf
 anF
 ahn
@@ -84792,7 +84940,7 @@ ayV
 ath
 arf
 aCd
-ath
+qIw
 arf
 anF
 ahn
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 4d8cd88eb8..0540a2f1d8 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -59000,7 +59000,10 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/closet/wardrobe/mixed,
+/obj/machinery/computer/cryopod{
+	pixel_x = 30
+	},
+/obj/machinery/cryopod,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -59794,7 +59797,7 @@
 /obj/machinery/status_display{
 	pixel_x = 32
 	},
-/obj/structure/closet/wardrobe/mixed,
+/obj/machinery/cryopod,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -99639,6 +99642,10 @@
 	dir = 5
 	},
 /area/science/mixing)
+"fow" = (
+/obj/structure/falsewall,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
 "fpQ" = (
 /obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
 /obj/effect/mapping_helpers/airlock/locked,
@@ -99724,6 +99731,12 @@
 	dir = 1
 	},
 /area/science/circuit)
+"gVS" = (
+/obj/item/clothing/head/kitty,
+/obj/item/clothing/under/maid,
+/obj/item/clothing/mask/muzzle,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
 "gXn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line{
@@ -99811,10 +99824,19 @@
 	dir = 9
 	},
 /area/science/circuit)
+"hPM" = (
+/obj/item/restraints/handcuffs/fake,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
 "iaF" = (
 /obj/effect/turf_decal/bot,
 /turf/open/floor/plasteel,
 /area/science/research)
+"ijB" = (
+/obj/structure/reagent_dispensers/keg/aphro/strong,
+/obj/item/reagent_containers/glass/beaker,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
 "ixL" = (
 /obj/structure/sign/warning/vacuum{
 	pixel_x = 32
@@ -100109,6 +100131,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/circuit/green,
 /area/science/research/abandoned)
+"mIi" = (
+/obj/item/electropack/shockcollar,
+/obj/item/assembly/signaler,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
 "mQE" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -100131,6 +100158,10 @@
 	},
 /turf/open/floor/engine,
 /area/science/mixing)
+"nyN" = (
+/obj/machinery/vending/kink,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
 "nSh" = (
 /obj/machinery/atmospherics/pipe/simple/general/hidden,
 /turf/closed/wall/r_wall,
@@ -100218,6 +100249,13 @@
 	dir = 1
 	},
 /area/science/circuit)
+"poI" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/item/tank/internals/anesthetic,
+/obj/item/clothing/mask/breath,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
 "psi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/bodycontainer/morgue{
@@ -100259,6 +100297,10 @@
 	dir = 5
 	},
 /area/science/circuit)
+"qBG" = (
+/obj/effect/spawner/lootdrop/keg,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
 "rhO" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 1
@@ -100367,6 +100409,10 @@
 	},
 /turf/open/floor/engine,
 /area/engine/supermatter)
+"vhA" = (
+/obj/item/clothing/under/color/grey,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)
 "vqd" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/bodycontainer/morgue{
@@ -122792,7 +122838,7 @@ dvV
 dsW
 dsW
 dmj
-dod
+qBG
 dhD
 aaa
 aad
@@ -124076,11 +124122,11 @@ dui
 dvW
 dxG
 dzc
-dhD
-dhD
-dhD
-aaa
-aad
+dfY
+dfY
+dfY
+dfY
+dfY
 aaa
 aaa
 aaa
@@ -124334,10 +124380,10 @@ dvX
 dlc
 dzd
 dfY
-aad
-aaa
-aaa
-aad
+nyN
+gVS
+hPM
+dfY
 ajr
 aaa
 aaa
@@ -124590,11 +124636,11 @@ dlc
 dlc
 dmn
 djm
-dhD
-aad
-aad
-aad
-aad
+fow
+dod
+dod
+poI
+dfY
 ajr
 aad
 aad
@@ -124848,10 +124894,10 @@ dvY
 dod
 dmi
 dfY
-aad
-aaa
-aaa
-aad
+ijB
+vhA
+mIi
+dfY
 ajr
 aaa
 aaa
@@ -125108,7 +125154,7 @@ dhQ
 dhQ
 dhQ
 dhQ
-aad
+dfY
 ajr
 aaa
 aaa
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 354d3a3c1c..680bc711fc 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -5133,7 +5133,10 @@
 /turf/open/floor/plating,
 /area/maintenance/fore)
 "alf" = (
-/obj/structure/closet/firecloset,
+/obj/machinery/cryopod{
+	icon_state = "cryopod-open";
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/fitness/recreation)
 "alg" = (
@@ -5840,7 +5843,10 @@
 /turf/open/floor/plating,
 /area/maintenance/fore)
 "amv" = (
-/obj/structure/closet/emcloset,
+/obj/machinery/cryopod{
+	icon_state = "cryopod-open";
+	dir = 1
+	},
 /turf/open/floor/plasteel/vault,
 /area/crew_quarters/fitness/recreation)
 "amw" = (
@@ -21748,7 +21754,7 @@
 /turf/open/floor/plasteel/vault,
 /area/crew_quarters/locker)
 "aUR" = (
-/obj/structure/closet/wardrobe/green,
+/obj/machinery/vending/kink,
 /turf/open/floor/plasteel/vault,
 /area/crew_quarters/locker)
 "aUS" = (
@@ -52985,6 +52991,7 @@
 	name = "old sink";
 	pixel_y = 28
 	},
+/obj/effect/spawner/lootdrop/keg,
 /turf/open/floor/wood{
 	icon_state = "wood-broken3"
 	},
@@ -57952,10 +57959,7 @@
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "cto" = (
-/obj/machinery/vending/assist,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
+/obj/machinery/vending/kink,
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "ctq" = (
@@ -73501,8 +73505,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 6
 	},
-/obj/structure/sign/poster/official/random{
-	pixel_x = -32
+/obj/machinery/computer/cryopod{
+	pixel_x = -30
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness/recreation)
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 2935128d23..79c28f5947 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -11804,14 +11804,13 @@
 	pixel_y = 24
 	},
 /obj/effect/turf_decal/bot,
-/obj/structure/closet/wardrobe/grey,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
 /area/crew_quarters/dorms)
 "axG" = (
 /obj/effect/turf_decal/bot,
-/obj/structure/closet/wardrobe/black,
+/obj/machinery/cryopod,
 /turf/open/floor/plasteel/vault{
 	dir = 5
 	},
@@ -12108,18 +12107,6 @@
 	dir = 4
 	},
 /area/crew_quarters/dorms)
-"ayy" = (
-/obj/machinery/airalarm{
-	dir = 8;
-	pixel_x = 24
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/plasteel/neutral/side{
-	dir = 4
-	},
-/area/crew_quarters/dorms)
 "ayz" = (
 /turf/open/floor/plasteel/grimy,
 /area/crew_quarters/dorms)
@@ -12508,8 +12495,6 @@
 /turf/open/floor/plasteel/neutral,
 /area/crew_quarters/dorms)
 "azB" = (
-/obj/structure/table,
-/obj/item/camera,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/neutral,
 /area/crew_quarters/dorms)
@@ -30671,6 +30656,13 @@
 /area/engine/atmos)
 "bxJ" = (
 /obj/effect/landmark/event_spawn,
+/obj/machinery/computer/cryopod{
+	pixel_x = 30
+	},
+/obj/machinery/light{
+	dir = 4;
+	light_color = "#e8eaff"
+	},
 /turf/open/floor/plasteel/neutral/side{
 	dir = 4
 	},
@@ -73106,7 +73098,7 @@ auT
 avY
 awQ
 axG
-ayy
+axG
 bxJ
 aAH
 aBQ
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index e0b5015ca6..e00b845e55 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -7814,6 +7814,10 @@
 	dir = 4;
 	pixel_x = 28
 	},
+/obj/machinery/computer/cryopod{
+	pixel_y = 30
+	},
+/obj/machinery/cryopod,
 /turf/open/floor/plasteel,
 /area/crew_quarters/dorms)
 "avm" = (
@@ -8295,15 +8299,6 @@
 	},
 /turf/open/floor/plating,
 /area/crew_quarters/fitness/recreation)
-"awx" = (
-/obj/structure/closet/athletic_mixed,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/plasteel/arrival{
-	dir = 1
-	},
-/area/crew_quarters/fitness/recreation)
 "awy" = (
 /obj/structure/closet/lasertag/blue,
 /obj/structure/disposalpipe/segment{
@@ -11056,6 +11051,10 @@
 /turf/open/floor/plasteel/white/side,
 /area/crew_quarters/dorms)
 "aDk" = (
+/obj/machinery/vr_sleeper{
+	icon_state = "sleeper";
+	dir = 8
+	},
 /turf/open/floor/plasteel/white/corner{
 	icon_state = "whitecorner";
 	dir = 8
@@ -47360,7 +47359,10 @@
 /turf/open/floor/plating,
 /area/maintenance/disposal)
 "dbi" = (
-/obj/machinery/vr_sleeper,
+/obj/machinery/vr_sleeper{
+	icon_state = "sleeper";
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/dorms)
 "dci" = (
@@ -48248,7 +48250,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/vr_sleeper,
+/obj/machinery/cryopod,
 /turf/open/floor/plasteel,
 /area/crew_quarters/dorms)
 "fIN" = (
@@ -48323,6 +48325,12 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/kitchen)
+"gcj" = (
+/obj/machinery/vending/kink,
+/turf/open/floor/plasteel/arrival{
+	dir = 1
+	},
+/area/crew_quarters/fitness/recreation)
 "gdJ" = (
 /obj/structure/table/glass,
 /obj/item/folder/blue,
@@ -49226,7 +49234,7 @@
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
 "iEU" = (
-/obj/item/clothing/suit/apron/chef,
+/obj/effect/spawner/lootdrop/keg,
 /turf/open/floor/plating,
 /area/maintenance/department/crew_quarters/dorms)
 "iFI" = (
@@ -50698,6 +50706,10 @@
 /obj/item/stack/spacecash/c10,
 /turf/open/floor/plasteel/dark,
 /area/maintenance/department/crew_quarters/dorms)
+"noC" = (
+/obj/machinery/vending/kink,
+/turf/open/floor/wood,
+/area/maintenance/department/crew_quarters/dorms)
 "noM" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 1
@@ -52693,6 +52705,10 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/chapel/office)
+"tap" = (
+/obj/structure/reagent_dispensers/keg/aphro,
+/turf/open/floor/wood,
+/area/maintenance/department/crew_quarters/dorms)
 "taA" = (
 /obj/structure/chair/office/light,
 /turf/open/floor/plasteel/dark,
@@ -91514,7 +91530,7 @@ cBo
 alQ
 alb
 cBw
-alb
+noC
 aiS
 aiS
 aiS
@@ -91771,7 +91787,7 @@ ajt
 alQ
 mnG
 alb
-alb
+tap
 aiS
 anY
 apt
@@ -95127,7 +95143,7 @@ aiS
 atm
 aun
 atn
-awx
+awz
 axw
 ayu
 azC
@@ -95641,7 +95657,7 @@ asl
 aiS
 aup
 atn
-awz
+awA
 axx
 ayv
 azD
@@ -95898,7 +95914,7 @@ apu
 ale
 auq
 atn
-awA
+awB
 axw
 axw
 axw
@@ -96155,7 +96171,7 @@ akn
 ajv
 aqZ
 atn
-awB
+gcj
 axw
 axw
 axw