diff --git a/_maps/map_files220/generic/Lavaland.dmm b/_maps/map_files220/generic/Lavaland.dmm
index 4e3835ea9bd3..232c0c6290fd 100644
--- a/_maps/map_files220/generic/Lavaland.dmm
+++ b/_maps/map_files220/generic/Lavaland.dmm
@@ -127,11 +127,12 @@
 	},
 /area/mine/laborcamp)
 "aw" = (
-/obj/machinery/computer/shuttle/labor{
-	dir = 4
+/obj/structure/platform/reinforced{
+	dir = 4;
+	anchored = 1
 	},
-/turf/simulated/floor/mineral/plastitanium/red,
-/area/shuttle/siberia)
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "ax" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -266,6 +267,7 @@
 	},
 /area/mine/outpost/hallway/east)
 "aP" = (
+/obj/item/cigbutt,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "darkred"
@@ -643,9 +645,8 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors/outpost/catwalk)
 "bF" = (
-/obj/structure/shuttle/engine/propulsion/burst,
 /turf/simulated/floor/plating/lavaland_air,
-/area/shuttle/mining)
+/area/lavaland/surface/outdoors/outpost/catwalk)
 "bG" = (
 /obj/structure/closet/crate/freezer,
 /obj/item/reagent_containers/drinks/cans/beer,
@@ -726,24 +727,16 @@
 /turf/simulated/wall,
 /area/mine/outpost/cafeteria)
 "bO" = (
-/obj/machinery/door/airlock/titanium{
-	id_tag = "s_docking_airlock";
-	name = "Labor Shuttle Airlock"
+/obj/effect/turf_decal/caution/stand_clear{
+	dir = 4
 	},
-/obj/docking_port/mobile/labour,
-/obj/structure/fans/tiny,
-/obj/docking_port/stationary{
-	area_type = /area/lavaland/surface/outdoors;
-	dir = 8;
-	dwidth = 2;
-	height = 5;
-	id = "laborcamp_away";
-	name = "labor camp";
-	turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface;
-	width = 9
+/obj/effect/turf_decal/box,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/north,
+/turf/simulated/floor/plasteel{
+	icon_state = "floor_large"
 	},
-/turf/simulated/floor/plating,
-/area/shuttle/siberia)
+/area/mine/laborcamp)
 "bP" = (
 /obj/structure/fans/tiny,
 /obj/machinery/door/airlock/maintenance/external,
@@ -2587,15 +2580,11 @@
 /turf/simulated/wall,
 /area/mine/outpost/maintenance/south)
 "fu" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
+/obj/structure/platform/reinforced/corner{
+	anchored = 1
 	},
-/obj/effect/turf_decal/caution,
-/turf/simulated/floor/mineral/titanium/blue,
-/area/shuttle/mining)
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "fv" = (
 /obj/effect/baseturf_helper/lava_land,
 /turf/simulated/floor/plasteel{
@@ -2889,10 +2878,14 @@
 	},
 /area/mine/outpost/hallway/west)
 "gb" = (
-/obj/machinery/light/small/directional/east,
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/mineral/titanium,
-/area/shuttle/mining)
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/lavaland_air{
+	icon_state = "darkyellowaltstrip"
+	},
+/area/lavaland/surface/outdoors)
 "gd" = (
 /turf/simulated/wall,
 /area/mine/outpost/mechbay)
@@ -3098,6 +3091,10 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/machinery/flasher_button{
+	id = "labor";
+	pixel_y = -24
+	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "darkred"
@@ -3378,14 +3375,17 @@
 	},
 /area/mine/outpost/medbay)
 "hf" = (
-/obj/machinery/flasher_button{
-	id = "gulagshuttleflasher";
-	name = "Flash Control";
-	pixel_y = -26;
-	req_access_txt = "1"
+/obj/machinery/door/airlock/external{
+	id_tag = "laborcamp_away"
 	},
-/turf/simulated/floor/mineral/plastitanium/red,
-/area/shuttle/siberia)
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/access/any/security/brig,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark_large"
+	},
+/area/mine/laborcamp/security)
 "hg" = (
 /obj/structure/stone_tile/surrounding,
 /obj/structure/stone_tile/center/cracked,
@@ -3404,17 +3404,12 @@
 /turf/simulated/floor/indestructible/boss,
 /area/lavaland/surface/outdoors/legion)
 "hj" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/structure/chair/comfy/shuttle{
-	dir = 8
-	},
-/obj/effect/turf_decal{
-	dir = 10
+/obj/structure/platform/reinforced{
+	dir = 8;
+	anchored = 1
 	},
-/turf/simulated/floor/mineral/plastitanium/red,
-/area/shuttle/siberia)
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "hl" = (
 /obj/structure/stone_tile/block{
 	dir = 4
@@ -3718,15 +3713,6 @@
 	icon_state = "dark"
 	},
 /area/mine/outpost/lockers)
-"iB" = (
-/obj/effect/turf_decal/stripes/red/corner{
-	dir = 1
-	},
-/obj/machinery/mineral/labor_prisoner_shuttle_console{
-	pixel_y = 32
-	},
-/turf/simulated/floor/mineral/titanium,
-/area/shuttle/siberia)
 "iC" = (
 /obj/structure/stone_tile/block{
 	dir = 1
@@ -3912,6 +3898,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/item/cigbutt,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkredyellowfull"
 	},
@@ -4250,9 +4237,6 @@
 /obj/effect/mapping_helpers/no_lava,
 /turf/simulated/floor/lava/mapping_lava,
 /area/lavaland/surface/outdoors/legion)
-"kI" = (
-/turf/simulated/wall/mineral/titanium,
-/area/shuttle/siberia)
 "kJ" = (
 /obj/structure/stone_tile/surrounding_tile{
 	dir = 4
@@ -5375,14 +5359,24 @@
 /turf/simulated/floor/indestructible/boss,
 /area/lavaland/surface/outdoors/legion)
 "pn" = (
-/obj/effect/turf_decal/stripes/red/line{
-	dir = 1
+/obj/machinery/computer/shuttle/labor/one_way{
+	dir = 4
 	},
-/turf/simulated/floor/mineral/titanium,
-/area/shuttle/siberia)
+/turf/simulated/floor/plasteel,
+/area/mine/laborcamp)
 "pq" = (
-/turf/simulated/floor/mineral/titanium,
-/area/shuttle/siberia)
+/obj/docking_port/stationary{
+	area_type = /area/lavaland/surface/outdoors;
+	dir = 8;
+	dwidth = 2;
+	height = 5;
+	id = "laborcamp_away";
+	name = "labor camp";
+	turf_type = /turf/simulated/floor/plating/lavaland_air;
+	width = 9
+	},
+/turf/simulated/floor/plating/lavaland_air,
+/area/lavaland/surface/outdoors)
 "pt" = (
 /obj/item/radio/intercom/locked/prison{
 	pixel_y = -22;
@@ -5615,9 +5609,12 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "rM" = (
-/obj/effect/baseturf_helper/lava_land,
-/turf/simulated/floor/mineral/titanium,
-/area/shuttle/mining)
+/obj/structure/platform/reinforced/corner{
+	dir = 4;
+	anchored = 1
+	},
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "rO" = (
 /obj/structure/lattice/catwalk/mining,
 /obj/structure/railing/corner{
@@ -5715,10 +5712,12 @@
 /turf/simulated/floor/plating,
 /area/mine/outpost/maintenance/south)
 "sv" = (
-/obj/machinery/light/directional/east,
-/obj/structure/closet/secure_closet/brig/gulag,
-/turf/simulated/floor/plasteel,
-/area/mine/laborcamp)
+/obj/structure/platform/reinforced/corner{
+	dir = 8;
+	anchored = 1
+	},
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "sw" = (
 /obj/structure/chair{
 	dir = 1
@@ -5816,10 +5815,6 @@
 	dir = 4
 	},
 /area/mine/outpost/hallway/east)
-"tb" = (
-/obj/effect/spawner/window/shuttle,
-/turf/simulated/floor/plating,
-/area/shuttle/mining)
 "td" = (
 /obj/structure/stone_tile/block/cracked{
 	dir = 8
@@ -6144,7 +6139,8 @@
 "uL" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/flasher{
-	id = "labor"
+	id = "labor";
+	layer = 4
 	},
 /turf/simulated/floor/plating,
 /area/mine/laborcamp)
@@ -6258,12 +6254,8 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "vk" = (
-/obj/machinery/door/airlock/titanium{
-	name = "Labor Shuttle Airlock"
-	},
-/obj/effect/mapping_helpers/airlock/access/all/security/brig,
-/turf/simulated/floor/mineral/plastitanium/red,
-/area/shuttle/siberia)
+/turf/simulated/floor/plating/lavaland_air,
+/area/lavaland/surface/outdoors)
 "vm" = (
 /obj/structure/stone_tile/block{
 	dir = 1
@@ -6470,9 +6462,15 @@
 /turf/simulated/floor/indestructible/boss,
 /area/lavaland/surface/outdoors/legion)
 "wt" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/plating/lavaland_air,
-/area/shuttle/siberia)
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/lavaland_air{
+	icon_state = "darkyellowaltstrip";
+	dir = 8
+	},
+/area/lavaland/surface/outdoors)
 "wC" = (
 /obj/structure/stone_tile/block{
 	dir = 1
@@ -6529,12 +6527,11 @@
 /turf/simulated/floor/plating,
 /area/mine/outpost/medbay)
 "wP" = (
-/obj/structure/shuttle/engine/heater,
-/obj/structure/window/plasmareinforced{
-	dir = 1
+/obj/structure/sign/securearea{
+	name = "\improper KEEP CLEAR: DOCKING AREA"
 	},
-/turf/simulated/floor/plating/lavaland_air,
-/area/shuttle/siberia)
+/turf/simulated/wall/r_wall,
+/area/mine/laborcamp)
 "wS" = (
 /obj/structure/stone_tile/surrounding_tile/burnt,
 /obj/structure/stone_tile/surrounding_tile/cracked{
@@ -6637,8 +6634,9 @@
 	},
 /area/mine/outpost/airlock)
 "xC" = (
-/turf/simulated/wall/mineral/titanium,
-/area/shuttle/mining)
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel,
+/area/mine/laborcamp)
 "xD" = (
 /obj/effect/mapping_helpers/no_lava,
 /turf/simulated/mineral/random/high_chance/volcanic,
@@ -6808,6 +6806,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
+/obj/machinery/camera{
+	c_tag = "Labor Camp Lockers";
+	network = list("Labor Camp");
+	dir = 1
+	},
 /turf/simulated/floor/plasteel,
 /area/mine/laborcamp)
 "yx" = (
@@ -7023,15 +7026,8 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors/unexplored)
 "zY" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/machinery/camera{
-	c_tag = "Labor Camp Lockers";
-	network = list("Labor Camp");
-	dir = 4
-	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/directional/west,
 /turf/simulated/floor/plasteel,
 /area/mine/laborcamp)
 "Ab" = (
@@ -7230,12 +7226,6 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors/outpost/catwalk)
 "AN" = (
-/obj/machinery/door/airlock/titanium{
-	id_tag = "s_docking_airlock"
-	},
-/obj/effect/mapping_helpers/airlock/autoname,
-/obj/docking_port/mobile/mining,
-/obj/structure/fans/tiny,
 /obj/docking_port/stationary{
 	area_type = /area/lavaland/surface/outdoors;
 	dir = 8;
@@ -7243,12 +7233,11 @@
 	height = 5;
 	id = "mining_away";
 	name = "lavaland mine";
-	turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface;
+	turf_type = /turf/simulated/floor/plating/lavaland_air;
 	width = 7
 	},
-/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
-/turf/simulated/floor/plating,
-/area/shuttle/mining)
+/turf/simulated/floor/plating/lavaland_air,
+/area/lavaland/surface/outdoors/outpost/catwalk)
 "AP" = (
 /obj/structure/stone_tile/block{
 	dir = 1
@@ -7289,8 +7278,15 @@
 	},
 /area/mine/outpost/cafeteria)
 "Bg" = (
-/turf/simulated/floor/mineral/plastitanium/red,
-/area/shuttle/siberia)
+/obj/structure/railing{
+	dir = 9
+	},
+/obj/structure/marker_beacon/dock_marker,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/lavaland_air{
+	icon_state = "darkyellowcornersalt"
+	},
+/area/lavaland/surface/outdoors)
 "Bj" = (
 /obj/structure/rack,
 /obj/item/storage/bag/ore,
@@ -7363,6 +7359,18 @@
 /obj/structure/clockwork/wall_gear,
 /turf/simulated/wall/indestructible/boss,
 /area/lavaland/surface/outdoors/legion)
+"By" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/item/restraints/handcuffs{
+	pixel_y = 4
+	},
+/obj/item/restraints/handcuffs,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "darkred"
+	},
+/area/mine/laborcamp/security)
 "BB" = (
 /obj/effect/mapping_helpers/no_lava,
 /turf/simulated/mineral/random/volcanic,
@@ -7395,12 +7403,6 @@
 /obj/effect/spawner/random_spawners/wall_rusted_maybe,
 /turf/simulated/wall,
 /area/mine/outpost/hallway/east)
-"BP" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 8
-	},
-/turf/simulated/floor/mineral/plastitanium/red,
-/area/shuttle/siberia)
 "BT" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -7429,7 +7431,7 @@
 	},
 /area/mine/outpost/cafeteria)
 "Ca" = (
-/obj/machinery/economy/vending/cola/free,
+/obj/machinery/economy/vending/sovietsoda,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
@@ -7444,8 +7446,16 @@
 /turf/simulated/floor/indestructible/boss,
 /area/lavaland/surface/outdoors/legion)
 "Cf" = (
-/turf/simulated/floor/mineral/titanium,
-/area/shuttle/mining)
+/obj/structure/railing{
+	dir = 10
+	},
+/obj/structure/marker_beacon/dock_marker,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/lavaland_air{
+	icon_state = "darkyellowcornersalt";
+	dir = 4
+	},
+/area/lavaland/surface/outdoors)
 "Ch" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
@@ -7573,20 +7583,6 @@
 	icon_state = "dark"
 	},
 /area/mine/laborcamp/security)
-"CK" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
-	},
-/obj/effect/turf_decal{
-	dir = 6
-	},
-/obj/machinery/camera{
-	c_tag = "Labor Camp Shuttle";
-	network = list("Labor Camp");
-	dir = 4
-	},
-/turf/simulated/floor/mineral/plastitanium/red,
-/area/shuttle/siberia)
 "CL" = (
 /obj/structure/girder,
 /turf/simulated/floor/plating,
@@ -7628,24 +7624,6 @@
 	icon_state = "barber"
 	},
 /area/mine/laborcamp)
-"CX" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/item/radio/intercom/directional/west,
-/obj/machinery/camera{
-	c_tag = "Mining Outpost - Shuttle";
-	dir = 5;
-	network = list("Mining Outpost")
-	},
-/turf/simulated/floor/mineral/titanium,
-/area/shuttle/mining)
-"CY" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1
-	},
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/simulated/floor/mineral/titanium/blue,
-/area/shuttle/mining)
 "Dc" = (
 /obj/structure/stone_tile/block{
 	dir = 8
@@ -7797,8 +7775,9 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "DT" = (
-/obj/machinery/computer/shuttle/labor/one_way,
-/obj/effect/decal/cleanable/cobweb,
+/obj/structure/chair{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel,
 /area/mine/laborcamp)
 "DU" = (
@@ -7909,7 +7888,7 @@
 /area/lavaland/surface/outdoors/legion)
 "EF" = (
 /obj/effect/baseturf_helper/lava_land,
-/obj/item/cigbutt,
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "dark"
@@ -8090,14 +8069,16 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "FW" = (
-/obj/machinery/door/airlock/titanium{
-	id_tag = "s_docking_airlock";
-	name = "Labor Shuttle Airlock"
+/obj/effect/turf_decal/caution/stand_clear{
+	dir = 4
 	},
-/obj/effect/mapping_helpers/airlock/access/all/security/brig,
-/obj/structure/fans/tiny,
-/turf/simulated/floor/plating,
-/area/shuttle/siberia)
+/obj/effect/turf_decal/box,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/north,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark_large"
+	},
+/area/mine/laborcamp/security)
 "FX" = (
 /obj/structure/ore_box,
 /obj/effect/mapping_helpers/no_lava,
@@ -8142,13 +8123,6 @@
 	icon_state = "barber"
 	},
 /area/mine/laborcamp)
-"Gn" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1
-	},
-/obj/structure/sign/poster/official/random/south,
-/turf/simulated/floor/mineral/titanium/blue,
-/area/shuttle/mining)
 "Gp" = (
 /obj/structure/sign/poster/contraband/clown,
 /obj/effect/spawner/random_spawners/wall_rusted_always,
@@ -8247,13 +8221,13 @@
 /turf/simulated/floor/indestructible/boss,
 /area/lavaland/surface/outdoors/legion)
 "Hc" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "laborcamp_away"
-	},
+/obj/machinery/door/airlock/external,
 /obj/effect/mapping_helpers/airlock/autoname,
-/obj/structure/fans/tiny,
 /obj/effect/mapping_helpers/airlock/access/any/security/brig,
-/turf/simulated/floor/plating,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark_large"
+	},
 /area/mine/laborcamp/security)
 "Hd" = (
 /obj/structure/stone_tile/surrounding_tile{
@@ -8502,6 +8476,13 @@
 	icon_state = "darkredyellowfull"
 	},
 /area/mine/laborcamp)
+"Ip" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel{
+	icon_state = "barber"
+	},
+/area/mine/laborcamp)
 "Iv" = (
 /obj/effect/turf_decal/delivery,
 /obj/effect/spawner/random_spawners/cobweb_right_rare,
@@ -8590,10 +8571,15 @@
 /turf/simulated/floor/indestructible/boss,
 /area/lavaland/surface/outdoors/legion)
 "IN" = (
-/obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/light/small/directional/west,
-/turf/simulated/floor/mineral/titanium,
-/area/shuttle/mining)
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/lavaland_air{
+	icon_state = "darkyellowaltstrip";
+	dir = 4
+	},
+/area/lavaland/surface/outdoors)
 "IP" = (
 /obj/structure/stone_tile/block/cracked{
 	dir = 8
@@ -8656,6 +8642,13 @@
 /obj/structure/stone_tile/center,
 /turf/simulated/floor/lava/lava_land_surface,
 /area/lavaland/surface/outdoors/legion)
+"Ji" = (
+/obj/structure/platform/reinforced/corner{
+	dir = 1;
+	anchored = 1
+	},
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "Jl" = (
 /obj/structure/table,
 /obj/item/storage/firstaid/machine,
@@ -8688,15 +8681,16 @@
 /turf/simulated/floor/lava/lava_land_surface,
 /area/lavaland/surface/outdoors/legion)
 "Jx" = (
-/obj/structure/shuttle/engine/heater,
-/obj/structure/window/plasmareinforced{
-	dir = 1
+/obj/structure/marker_beacon/dock_marker,
+/obj/structure/railing{
+	dir = 5
 	},
-/obj/structure/window/plasmareinforced{
-	dir = 1
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/lavaland_air{
+	icon_state = "darkyellowcornersalt";
+	dir = 8
 	},
-/turf/simulated/floor/plating/lavaland_air,
-/area/shuttle/siberia)
+/area/lavaland/surface/outdoors)
 "JC" = (
 /obj/structure/lattice/catwalk/mining,
 /obj/effect/decal/cleanable/dirt,
@@ -8752,7 +8746,7 @@
 /area/mine/laborcamp)
 "JV" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/cigbutt,
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkredyellowfull"
 	},
@@ -8941,18 +8935,18 @@
 /turf/simulated/floor/lava/mapping_lava,
 /area/lavaland/surface/outdoors)
 "KR" = (
-/obj/machinery/flasher{
-	id = "gulagshuttleflasher";
-	pixel_x = 25
-	},
-/obj/structure/chair/comfy/shuttle{
-	dir = 8
-	},
-/obj/effect/turf_decal{
-	dir = 9
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera{
+	c_tag = "Labor Camp Landing Pad";
+	network = list("Labor Camp");
+	dir = 8
 	},
-/turf/simulated/floor/mineral/plastitanium/red,
-/area/shuttle/siberia)
+/obj/machinery/floodlight/anchored,
+/turf/simulated/floor/plasteel/lavaland_air{
+	icon_state = "darkyellowaltstrip";
+	dir = 8
+	},
+/area/lavaland/surface/outdoors)
 "KS" = (
 /turf/simulated/wall/boss,
 /area/lavaland/surface/outdoors/unexplored/danger)
@@ -9316,12 +9310,11 @@
 /turf/simulated/floor/indestructible/boss,
 /area/lavaland/surface/outdoors/legion)
 "Nc" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1
+/obj/structure/platform/reinforced{
+	anchored = 1
 	},
-/obj/machinery/light/directional/south,
-/turf/simulated/floor/mineral/titanium/blue,
-/area/shuttle/mining)
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "Ne" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -9429,9 +9422,16 @@
 /turf/simulated/wall/mineral/iron,
 /area/lavaland/surface/outdoors)
 "NP" = (
-/obj/machinery/computer/shuttle/mining,
-/turf/simulated/floor/mineral/titanium/blue,
-/area/shuttle/mining)
+/obj/structure/railing{
+	dir = 6
+	},
+/obj/structure/marker_beacon/dock_marker,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/lavaland_air{
+	icon_state = "darkyellowcornersalt";
+	dir = 1
+	},
+/area/lavaland/surface/outdoors)
 "NR" = (
 /obj/structure/mopbucket/full,
 /obj/item/mop,
@@ -9454,9 +9454,12 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors/outpost/catwalk)
 "NW" = (
-/obj/effect/spawner/window/shuttle,
-/turf/simulated/floor/plating,
-/area/shuttle/siberia)
+/obj/structure/platform/reinforced{
+	dir = 1;
+	anchored = 1
+	},
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "NZ" = (
 /obj/structure/toilet,
 /obj/effect/decal/cleanable/cobweb,
@@ -9587,10 +9590,6 @@
 	name = "Labor Camp Lockdown";
 	req_access_txt = "2"
 	},
-/obj/machinery/flasher_button{
-	id = "labor";
-	pixel_y = -34
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -9671,7 +9670,7 @@
 /obj/structure/closet/secure_closet/brig/gulag,
 /obj/machinery/flasher{
 	id = "labor";
-	pixel_y = 32
+	pixel_y = 24
 	},
 /turf/simulated/floor/plasteel,
 /area/mine/laborcamp)
@@ -9869,18 +9868,10 @@
 /turf/simulated/floor/indestructible/boss,
 /area/lavaland/surface/outdoors/legion)
 "QZ" = (
-/obj/structure/shuttle/engine/heater,
-/obj/structure/window/plasmareinforced{
-	dir = 1
-	},
-/obj/structure/window/plasmareinforced{
-	dir = 4
-	},
-/obj/structure/window/plasmareinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plating/lavaland_air,
-/area/shuttle/mining)
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/hologram/holopad,
+/turf/simulated/floor/plasteel,
+/area/mine/laborcamp)
 "Rb" = (
 /obj/structure/grille/broken,
 /obj/structure/grille/broken,
@@ -10288,12 +10279,12 @@
 	},
 /area/mine/outpost/hallway/east)
 "TU" = (
-/obj/machinery/door/airlock/external{
-	id_tag = "laborcamp_away"
-	},
+/obj/machinery/door/airlock/external,
 /obj/effect/mapping_helpers/airlock/autoname,
-/obj/structure/fans/tiny,
-/turf/simulated/floor/plating,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+	icon_state = "floor_large"
+	},
 /area/mine/laborcamp)
 "TV" = (
 /obj/structure/grille/broken,
@@ -10405,14 +10396,13 @@
 /turf/simulated/floor/indestructible/boss,
 /area/lavaland/surface/outdoors/legion)
 "Uy" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
-	},
-/obj/effect/turf_decal{
-	dir = 5
+/obj/structure/railing,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel/lavaland_air{
+	icon_state = "darkyellowaltstrip";
+	dir = 1
 	},
-/turf/simulated/floor/mineral/plastitanium/red,
-/area/shuttle/siberia)
+/area/lavaland/surface/outdoors)
 "UA" = (
 /obj/structure/stone_tile/block,
 /obj/structure/stone_tile{
@@ -10647,9 +10637,16 @@
 	},
 /area/mine/outpost/cafeteria)
 "VI" = (
-/obj/effect/baseturf_helper/asteroid/basalt,
-/turf/simulated/floor/mineral/titanium,
-/area/shuttle/siberia)
+/obj/machinery/door/airlock/external{
+	id_tag = "laborcamp_away"
+	},
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/structure/fans/tiny,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+	icon_state = "floor_large"
+	},
+/area/mine/laborcamp)
 "VJ" = (
 /obj/effect/spawner/random_spawners/wall_rusted_always,
 /turf/simulated/wall/r_wall,
@@ -10786,11 +10783,10 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "Wo" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1
-	},
-/turf/simulated/floor/mineral/titanium,
-/area/shuttle/mining)
+/obj/structure/closet/secure_closet/brig/gulag,
+/obj/effect/decal/cleanable/cobweb2,
+/turf/simulated/floor/plasteel,
+/area/mine/laborcamp)
 "Wt" = (
 /obj/structure/window/reinforced/clockwork{
 	dir = 4;
@@ -10813,19 +10809,11 @@
 	},
 /area/mine/outpost/hallway/east)
 "Wx" = (
-/obj/structure/table,
-/obj/item/folder/red,
-/obj/item/restraints/handcuffs,
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/machinery/flasher_button{
-	id = "gulagshuttleflasher";
-	name = "Flash Control";
-	req_access_txt = "1"
+/obj/structure/sign/securearea{
+	name = "\improper KEEP CLEAR: DOCKING AREA"
 	},
-/turf/simulated/floor/mineral/plastitanium/red,
-/area/shuttle/siberia)
+/turf/simulated/wall/r_wall,
+/area/mine/laborcamp/security)
 "WC" = (
 /obj/effect/mapping_helpers/no_lava,
 /obj/structure/sign/nanotrasen{
@@ -11217,6 +11205,9 @@
 "YW" = (
 /obj/machinery/light/directional/west,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/shuttle/labor/one_way{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "darkred"
@@ -12156,7 +12147,7 @@ aj
 aj
 aj
 aj
-aj
+ab
 aj
 aj
 aj
@@ -12399,12 +12390,19 @@ aj
 aj
 aj
 aj
+ab
+ab
+ab
 aj
 aj
 aj
+ab
+ab
 aj
 aj
 aj
+ab
+ab
 aj
 aj
 aj
@@ -12413,13 +12411,6 @@ aj
 aj
 aj
 aj
-ab
-aj
-aj
-aj
-aj
-aj
-aj
 aj
 aj
 aj
@@ -12656,19 +12647,19 @@ aj
 aj
 aj
 aj
+ab
+Ll
+ab
+ab
+ab
+ab
+Xu
+ab
+dT
+ab
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+ab
+ab
 aj
 aj
 aj
@@ -12912,21 +12903,21 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+ab
+fu
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+aw
+sv
+ab
 aj
 aj
 aj
@@ -13168,23 +13159,23 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
-aj
+ab
+ab
+Nc
+Bg
+IN
+IN
+IN
+IN
+IN
+IN
+IN
+IN
+IN
+Cf
+NW
+ab
+ab
 aj
 aj
 ai
@@ -13425,23 +13416,23 @@ aj
 aj
 aj
 aj
-aj
-aj
-aj
-aj
-aj
 ab
-dT
-aj
-aj
-aj
 ab
-Xu
-aj
-aj
-aj
+Nc
+gb
+vk
+vk
+vk
+vk
+vk
+vk
+vk
+vk
+vk
+Uy
+NW
+ab
 ab
-aj
 aj
 aj
 ab
@@ -13683,18 +13674,20 @@ aj
 aj
 aj
 aj
-aj
-aj
-ab
-ab
-Ll
-ab
-ab
-ab
 dT
-ab
-ab
-ab
+Nc
+gb
+vk
+vk
+vk
+vk
+vk
+vk
+vk
+vk
+vk
+Uy
+NW
 ab
 aj
 aj
@@ -13702,8 +13695,6 @@ aj
 aj
 aj
 aj
-aj
-aj
 ai
 aj
 aj
@@ -13939,19 +13930,21 @@ ab
 ab
 aj
 aj
-aj
-aj
 ab
 ab
-kI
-kI
-NW
-kI
-kI
+Nc
+gb
+vk
+vk
+vk
+vk
+vk
+vk
+vk
+vk
+vk
+Uy
 NW
-kI
-kI
-kI
 ab
 aj
 aj
@@ -13959,8 +13952,6 @@ aj
 aj
 aj
 aj
-aj
-aj
 ab
 aj
 aj
@@ -14197,22 +14188,22 @@ aj
 aj
 aj
 aj
-ab
-ab
-ab
-NW
-aw
-Bg
+ai
+Nc
+gb
+vk
+vk
+vk
+vk
+vk
+vk
+vk
+vk
 vk
-pn
 Uy
-CK
-wP
-wt
-ab
-ab
-aj
-aj
+NW
+ai
+ai
 aj
 aj
 ab
@@ -14454,22 +14445,22 @@ aj
 aj
 aj
 aj
-aj
-ab
 ai
-NW
-BP
-Bg
-kI
-iB
-VI
+Nc
+gb
+vk
+vk
+vk
+vk
+vk
+vk
 pq
-Jx
-wt
-ab
-ai
+vk
+vk
+Uy
+NW
 ai
-aj
+ab
 aj
 aj
 aj
@@ -14712,21 +14703,21 @@ aj
 aD
 aj
 aj
-aj
-ai
-NW
+Nc
+Jx
+wt
 Wx
 hf
-kI
+PX
 KR
-hj
-pq
+Hs
+VI
 wP
 wt
+NP
+NW
+VK
 ab
-ai
-aj
-aj
 aj
 aj
 aj
@@ -14969,21 +14960,21 @@ tj
 wY
 aj
 aj
-aj
-ab
-kI
-kI
+Ji
+hj
+hj
+PX
 FW
-kI
-kI
-kI
+PX
+Hs
+Hs
 bO
-kI
-kI
+VJ
+hj
+hj
+rM
+ab
 ab
-VK
-aj
-aj
 aj
 aj
 ab
@@ -15228,18 +15219,18 @@ aj
 aj
 cG
 cG
-PX
+cG
 PX
 Hc
 PX
-Hs
+pn
 Hs
 TU
-VJ
-ai
-ab
+Hs
 aj
 aj
+ab
+ab
 aj
 aj
 aj
@@ -16004,7 +15995,7 @@ CI
 gu
 PX
 PK
-JZ
+QZ
 hQ
 Hs
 Lz
@@ -16514,11 +16505,11 @@ hv
 ZZ
 sP
 aQ
-OE
+By
 OU
 PX
+Wo
 op
-sv
 jn
 Hs
 bZ
@@ -17036,7 +17027,7 @@ vK
 tJ
 aq
 cb
-bh
+Ip
 bh
 ap
 aj
@@ -17543,7 +17534,7 @@ JZ
 uL
 JZ
 IF
-bk
+xC
 cy
 bn
 Oh
@@ -19877,11 +19868,11 @@ aj
 fo
 GO
 fd
-xC
-tb
-xC
-tb
-QZ
+bF
+bF
+bF
+bF
+bF
 bF
 kQ
 ch
@@ -20133,13 +20124,13 @@ aj
 aj
 fo
 Qd
-xC
-xC
-IN
-CX
-fu
-Gn
-xC
+bF
+bF
+bF
+bF
+bF
+bF
+bF
 Eg
 XL
 Hf
@@ -20390,13 +20381,13 @@ aj
 FO
 fo
 tE
-tb
-NP
-Wo
-rM
-fu
-Nc
-xC
+bF
+bF
+bF
+bF
+bF
+bF
+bF
 Eg
 XL
 Hf
@@ -20647,13 +20638,13 @@ aj
 ab
 fo
 Sa
-xC
-xC
-gb
-Cf
-fu
-CY
-xC
+bF
+bF
+bF
+bF
+bF
+bF
+bF
 Eg
 ch
 vh
@@ -20905,11 +20896,11 @@ ab
 uN
 Ur
 fA
-xC
-tb
+bF
+bF
 AN
-tb
-QZ
+bF
+bF
 bF
 kQ
 ch
diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm
index f4bef4961efc..27652de5ee20 100644
--- a/_maps/map_files220/generic/centcomm.dmm
+++ b/_maps/map_files220/generic/centcomm.dmm
@@ -760,7 +760,7 @@
 /turf/simulated/floor/wood/oak,
 /area/syndicate_mothership/infteam)
 "aAE" = (
-/obj/machinery/economy/vending/chinese,
+/obj/machinery/economy/vending/nt_food/free,
 /turf/simulated/floor/mineral/plastitanium,
 /area/centcom/ss220/general)
 "aBb" = (
@@ -1286,17 +1286,6 @@
 	water_overlay_image = null
 	},
 /area/syndicate_mothership/outside)
-"aRU" = (
-/obj/docking_port/stationary/transit{
-	dir = 8;
-	dwidth = 3;
-	height = 5;
-	id = "mining_transit";
-	name = "mining in transit";
-	width = 7
-	},
-/turf/space/transit,
-/area/space/centcomm)
 "aRZ" = (
 /obj/structure/light_fake/small{
 	dir = 8
@@ -1741,9 +1730,7 @@
 /turf/simulated/floor/indestructible/transparent_floor,
 /area/shuttle/syndicate)
 "bgR" = (
-/obj/structure/closet/crate/secure/bin{
-	color = "36373a"
-	},
+/obj/structure/closet/crate/secure/bin,
 /turf/simulated/floor/plasteel/dark{
 	icon_state = "darkyellowalt"
 	},
@@ -2109,7 +2096,7 @@
 /obj/effect/turf_decal/tile/neutral/full{
 	color = "#000000"
 	},
-/turf/simulated/floor/wood/fancy/cherry,
+/turf/simulated/floor/wood/parquet,
 /area/centcom/ss220/admin2)
 "bpw" = (
 /obj/machinery/computer/shuttle/syndicate{
@@ -2350,6 +2337,16 @@
 	icon_state = "rampbottom"
 	},
 /area/centcom/ss220/admin3)
+"bxM" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/caution,
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/mining)
 "bxN" = (
 /obj/structure/chair/comfy/black,
 /turf/simulated/floor/carpet/green,
@@ -2360,6 +2357,19 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/centcom/ss220/supply)
+"byg" = (
+/obj/machinery/flasher{
+	id = "gulagshuttleflasher";
+	pixel_x = 24
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/obj/effect/turf_decal{
+	dir = 9
+	},
+/turf/simulated/floor/mineral/plastitanium/red,
+/area/shuttle/siberia)
 "byz" = (
 /obj/effect/turf_decal/tile/neutral/full{
 	color = "#000000"
@@ -3429,6 +3439,16 @@
 	},
 /turf/simulated/floor/grass/no_creep,
 /area/centcom/ss220/admin2)
+"cbA" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/plasmareinforced{
+	dir = 1
+	},
+/obj/structure/window/plasmareinforced{
+	dir = 1
+	},
+/turf/simulated/floor/plating/lavaland_air,
+/area/shuttle/siberia)
 "cbK" = (
 /obj/machinery/computer/communications,
 /turf/simulated/floor/plasteel/dark,
@@ -3485,6 +3505,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/centcom/ss220/supply)
+"cdG" = (
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
+/area/shuttle/mining)
 "cdI" = (
 /obj/structure/light_fake{
 	dir = 8
@@ -3706,6 +3730,14 @@
 	icon_state = "darkbrown"
 	},
 /area/centcom/ss220/admin3)
+"ckK" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/mining)
 "ckX" = (
 /obj/structure/closet/secure_closet/guncabinet,
 /obj/machinery/light/spot{
@@ -4087,6 +4119,10 @@
 	},
 /turf/simulated/floor/mineral/plastitanium,
 /area/shuttle/syndicate)
+"cwF" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/plating/lavaland_air,
+/area/shuttle/siberia)
 "cxe" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 4
@@ -4712,7 +4748,7 @@
 "cXK" = (
 /obj/structure/lattice,
 /obj/effect/light_emitter/colored{
-	light_color = "#FFFFF";
+	light_color = "#FFFFFF";
 	light_power = 10;
 	light_range = 5
 	},
@@ -4775,7 +4811,7 @@
 "cYX" = (
 /obj/structure/marker_beacon/spotlight/jade,
 /obj/effect/light_emitter/colored{
-	light_color = "#FFFFF";
+	light_color = "#FFFFFF";
 	light_power = 10;
 	light_range = 5
 	},
@@ -5791,7 +5827,7 @@
 /turf/simulated/floor/wood/parquet/tile,
 /area/centcom/ss220/bar)
 "dBb" = (
-/obj/machinery/economy/vending/cigarette/free,
+/obj/machinery/economy/vending/nt_food/free,
 /turf/simulated/floor/plasteel/dark{
 	icon_state = "darkbluealt"
 	},
@@ -6272,8 +6308,19 @@
 	icon_state = "barber"
 	},
 /area/shuttle/administration)
+"dOf" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/obj/effect/turf_decal{
+	dir = 10
+	},
+/obj/machinery/light/directional/east,
+/turf/simulated/floor/mineral/plastitanium/red,
+/area/shuttle/siberia)
 "dOx" = (
 /obj/structure/marker_beacon/spotlight/jade,
+/obj/structure/light_fake/spot,
 /turf/simulated/floor/plasteel/dark,
 /area/centcom/ss220/command)
 "dON" = (
@@ -7189,6 +7236,15 @@
 	icon_state = "dark"
 	},
 /area/syndicate_mothership/jail)
+"eti" = (
+/obj/effect/turf_decal/stripes/red/corner{
+	dir = 1
+	},
+/obj/machinery/mineral/labor_prisoner_shuttle_console{
+	pixel_y = 32
+	},
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/siberia)
 "etr" = (
 /obj/structure/table,
 /obj/item/storage/fancy/cigarettes/dromedaryco{
@@ -7410,6 +7466,9 @@
 	},
 /turf/simulated/floor/carpet/black,
 /area/syndicate_mothership/control)
+"ezO" = (
+/turf/simulated/wall/mineral/titanium,
+/area/shuttle/mining)
 "ezR" = (
 /obj/structure/light_fake{
 	dir = 4
@@ -7844,6 +7903,19 @@
 /obj/item/food/limecakeslice,
 /turf/simulated/floor/mineral/plastitanium,
 /area/centcom/ss220/general)
+"eLp" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/plasmareinforced{
+	dir = 1
+	},
+/obj/structure/window/plasmareinforced{
+	dir = 4
+	},
+/obj/structure/window/plasmareinforced{
+	dir = 8
+	},
+/turf/simulated/floor/plating/lavaland_air,
+/area/shuttle/mining)
 "eLW" = (
 /obj/machinery/computer/operating{
 	dir = 8
@@ -10154,7 +10226,7 @@
 /area/centcom/ss220/admin2)
 "gcj" = (
 /obj/effect/light_emitter/colored{
-	light_color = "#FFFFF";
+	light_color = "#FFFFFF";
 	light_power = 10;
 	light_range = 5
 	},
@@ -10853,6 +10925,16 @@
 	icon_state = "darkredcornersalt"
 	},
 /area/syndicate_mothership/jail)
+"gDx" = (
+/obj/effect/turf_decal/delivery/hollow,
+/obj/item/radio/intercom/directional/west,
+/obj/machinery/camera{
+	c_tag = "Mining Outpost - Shuttle";
+	dir = 5;
+	network = list("Mining Outpost")
+	},
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/mining)
 "gDW" = (
 /turf/simulated/floor/carpet/green,
 /area/centcom/ss220/general)
@@ -11198,6 +11280,12 @@
 	icon_state = "darkbrowncorners"
 	},
 /area/centcom/ss220/supply)
+"gNx" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/floor/mineral/plastitanium/red,
+/area/shuttle/siberia)
 "gNy" = (
 /obj/structure/table/wood/fancy/black,
 /obj/item/ashtray/bronze{
@@ -11234,6 +11322,26 @@
 	icon_state = "darkbrown"
 	},
 /area/syndicate_mothership/jail)
+"gOF" = (
+/obj/machinery/door/airlock/titanium{
+	id_tag = "s_docking_airlock"
+	},
+/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/docking_port/stationary/transit{
+	dir = 8;
+	dwidth = 2;
+	height = 5;
+	id = "laborcamp_transit";
+	name = "labor in transit";
+	width = 9;
+	pixel_x = 32
+	},
+/obj/docking_port/mobile/labour{
+	roundstart_move = "laborcamp_away"
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/siberia)
 "gOQ" = (
 /turf/simulated/floor/plasteel{
 	icon_state = "darkneutralfull"
@@ -12102,6 +12210,15 @@
 /obj/machinery/economy/vending/wallmed/syndicate/directional/north,
 /turf/simulated/floor/carpet/black,
 /area/syndicate_mothership/infteam)
+"hoc" = (
+/obj/machinery/flasher_button{
+	id = "gulagshuttleflasher";
+	name = "Flash Control";
+	pixel_y = -24;
+	req_access_txt = "1"
+	},
+/turf/simulated/floor/mineral/plastitanium/red,
+/area/shuttle/siberia)
 "hom" = (
 /obj/structure/light_fake{
 	dir = 4
@@ -12336,6 +12453,15 @@
 	icon_state = "dark_large"
 	},
 /area/centcom/ss220/command)
+"htc" = (
+/obj/machinery/door/airlock/titanium{
+	id_tag = "s_docking_airlock"
+	},
+/obj/effect/mapping_helpers/airlock/access/all/security/brig,
+/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/autoname,
+/turf/simulated/floor/plating,
+/area/shuttle/siberia)
 "htl" = (
 /obj/machinery/computer/card/minor{
 	layer = 4
@@ -12649,9 +12775,7 @@
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/shuttle/syndicate)
 "hFD" = (
-/obj/structure/closet/crate/secure/bin{
-	color = "36373a"
-	},
+/obj/structure/closet/crate/secure/bin,
 /turf/simulated/floor/plasteel/dark,
 /area/centcom/ss220/admin3)
 "hFE" = (
@@ -13602,6 +13726,20 @@
 	},
 /turf/simulated/floor/carpet,
 /area/centcom/ss220/general)
+"ieY" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/effect/turf_decal{
+	dir = 6
+	},
+/obj/machinery/camera{
+	c_tag = "Labor Camp Shuttle";
+	network = list("Labor Camp");
+	dir = 4
+	},
+/turf/simulated/floor/mineral/plastitanium/red,
+/area/shuttle/siberia)
 "ifc" = (
 /obj/structure/light_fake/small{
 	dir = 1
@@ -14379,6 +14517,10 @@
 	},
 /turf/simulated/floor/wood/parquet/tile,
 /area/centcom/ss220/admin1)
+"iwt" = (
+/obj/effect/baseturf_helper/lava_land,
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/mining)
 "iwE" = (
 /obj/machinery/computer/nonfunctional,
 /turf/simulated/floor/plasteel{
@@ -14933,7 +15075,7 @@
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/syndicate)
 "iRb" = (
-/obj/machinery/economy/vending/chinese/free,
+/obj/machinery/economy/vending/nt_food/free,
 /obj/structure/sign/poster/official/high_class_martini{
 	pixel_y = 32
 	},
@@ -16599,8 +16741,8 @@
 "jXb" = (
 /obj/structure/light_fake/spot,
 /obj/structure/closet/crate/secure/bin{
-	anchored = 1;
-	color = "#996633"
+	color = "#36373a";
+	anchored = 1
 	},
 /turf/simulated/floor/plasteel/dark{
 	dir = 6;
@@ -17343,7 +17485,7 @@
 /turf/simulated/floor/wood/fancy/cherry,
 /area/centcom/ss220/admin2)
 "kwP" = (
-/obj/machinery/economy/vending/chinese/free,
+/obj/machinery/economy/vending/cigarette/free,
 /turf/simulated/floor/plasteel/dark{
 	dir = 6;
 	icon_state = "darkbluealt"
@@ -17552,6 +17694,9 @@
 	icon_state = "darkyellowalt"
 	},
 /area/syndicate_mothership/cargo)
+"kDv" = (
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/mining)
 "kDx" = (
 /obj/machinery/door/airlock/titanium{
 	id_tag = "s_docking_airlock"
@@ -17644,6 +17789,13 @@
 /obj/structure/table/wood,
 /turf/simulated/floor/wood/oak,
 /area/centcom/ss220/park)
+"kEM" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/plasmareinforced{
+	dir = 1
+	},
+/turf/simulated/floor/plating/lavaland_air,
+/area/shuttle/siberia)
 "kEN" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/structure/flora/ausbushes/ppflowers,
@@ -18147,7 +18299,7 @@
 "kQG" = (
 /obj/structure/marker_beacon/spotlight/jade,
 /obj/effect/light_emitter/colored{
-	light_color = "#FFFFF";
+	light_color = "#FFFFFF";
 	light_power = 10;
 	light_range = 5
 	},
@@ -18530,6 +18682,20 @@
 	icon_state = "darkredaltstrip"
 	},
 /area/syndicate_mothership/jail)
+"lbh" = (
+/obj/structure/table,
+/obj/item/folder/red,
+/obj/item/restraints/handcuffs,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/flasher_button{
+	id = "gulagshuttleflasher";
+	name = "Flash Control";
+	req_access_txt = "1"
+	},
+/turf/simulated/floor/mineral/plastitanium/red,
+/area/shuttle/siberia)
 "lbm" = (
 /obj/structure/chair/comfy/brown,
 /obj/effect/landmark/spawner/aroomwarp,
@@ -18930,6 +19096,11 @@
 	icon_state = "dark"
 	},
 /area/syndicate_mothership/jail)
+"loY" = (
+/obj/effect/turf_decal/delivery/hollow,
+/obj/machinery/light/small/directional/west,
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/mining)
 "lpw" = (
 /obj/structure/flora/ausbushes/brflowers,
 /obj/effect/spawner/window,
@@ -19459,6 +19630,9 @@
 "lAC" = (
 /turf/simulated/floor/indestructible/grass/no_creep,
 /area/syndicate_mothership/outside)
+"lAX" = (
+/turf/simulated/floor/mineral/plastitanium/red,
+/area/shuttle/siberia)
 "lAY" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 1
@@ -20283,6 +20457,13 @@
 	icon_state = "dark"
 	},
 /area/syndicate_mothership)
+"mbV" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/machinery/light/directional/south,
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/mining)
 "mcm" = (
 /obj/structure/closet/crate/secure/bin{
 	color = "#36373a";
@@ -22462,6 +22643,10 @@
 	},
 /turf/simulated/floor/mineral/plastitanium,
 /area/syndicate_mothership/infteam)
+"nvs" = (
+/obj/structure/shuttle/engine/propulsion/burst,
+/turf/simulated/floor/plating/lavaland_air,
+/area/shuttle/mining)
 "nvF" = (
 /turf/simulated/floor/plasteel/dark{
 	icon_state = "darkbluealtstrip"
@@ -22713,6 +22898,16 @@
 	icon_state = "darkredalt"
 	},
 /area/centcom/ss220/jail)
+"nEQ" = (
+/obj/effect/light_emitter/colored{
+	light_color = "#FFFFFF";
+	light_power = 10;
+	light_range = 5
+	},
+/turf/simulated/floor/plasteel/dark{
+	icon_state = "dark_large"
+	},
+/area/centcom/ss220/command)
 "nEU" = (
 /obj/structure/sink/directional/west,
 /turf/simulated/floor/carpet/black,
@@ -23291,7 +23486,7 @@
 /turf/simulated/floor/carpet/black,
 /area/syndicate_mothership/jail)
 "nVy" = (
-/obj/machinery/economy/vending/snack/free,
+/obj/machinery/economy/vending/nt_food/free,
 /obj/structure/light_fake/spot{
 	dir = 8
 	},
@@ -23315,7 +23510,7 @@
 "nWa" = (
 /obj/structure/marker_beacon/spotlight/jade,
 /obj/effect/light_emitter/colored{
-	light_color = "#FFFFF";
+	light_color = "#FFFFFF";
 	light_power = 10;
 	light_range = 5
 	},
@@ -23700,7 +23895,9 @@
 	},
 /obj/effect/turf_decal/stripes/red/box,
 /obj/effect/light_emitter/colored{
-	light_color = "white"
+	light_color = "#FFFFFF";
+	light_power = 10;
+	light_range = 5
 	},
 /turf/simulated/floor/plasteel/dark{
 	dir = 8;
@@ -24052,6 +24249,10 @@
 	icon_state = "dark"
 	},
 /area/syndicate_mothership/jail)
+"owk" = (
+/obj/effect/baseturf_helper/asteroid/basalt,
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/siberia)
 "own" = (
 /obj/structure/table/reinforced,
 /obj/structure/window/reinforced,
@@ -25165,7 +25366,7 @@
 /obj/effect/turf_decal/tile/neutral/full{
 	color = "#000000"
 	},
-/turf/simulated/floor/wood/fancy/cherry,
+/turf/simulated/floor/wood/parquet,
 /area/centcom/ss220/admin2)
 "pcg" = (
 /obj/structure/chair/sofa,
@@ -30843,6 +31044,19 @@
 	icon_state = "darkbluecornersalt"
 	},
 /area/centcom/ss220/admin3)
+"stf" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/effect/turf_decal{
+	dir = 5
+	},
+/turf/simulated/floor/mineral/plastitanium/red,
+/area/shuttle/siberia)
+"sto" = (
+/obj/machinery/computer/shuttle/mining,
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/mining)
 "stR" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Конференц Зал";
@@ -32124,7 +32338,7 @@
 	},
 /area/syndicate_mothership/elite_squad)
 "tiF" = (
-/obj/machinery/economy/vending/snack/free,
+/obj/machinery/economy/vending/nt_food/free,
 /turf/simulated/floor/plasteel/dark,
 /area/centcom/ss220/admin3)
 "tjz" = (
@@ -32920,6 +33134,9 @@
 /obj/structure/flora/ausbushes/ywflowers,
 /turf/simulated/floor/indestructible/grass,
 /area/syndicate_mothership/outside)
+"tIw" = (
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/siberia)
 "tIy" = (
 /obj/structure/chair/stool{
 	dir = 8
@@ -34928,6 +35145,12 @@
 	icon_state = "dark"
 	},
 /area/syndicate_mothership/jail)
+"uXQ" = (
+/obj/machinery/computer/shuttle/labor{
+	dir = 4
+	},
+/turf/simulated/floor/mineral/plastitanium/red,
+/area/shuttle/siberia)
 "uXT" = (
 /obj/structure/light_fake/small,
 /obj/effect/decal/cleanable/dirt,
@@ -35131,6 +35354,12 @@
 	},
 /turf/simulated/floor/wood/oak,
 /area/syndicate_mothership)
+"vfi" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/mining)
 "vfs" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -35568,6 +35797,10 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/centcom/ss220/court)
+"vqY" = (
+/obj/effect/spawner/window/shuttle,
+/turf/simulated/floor/plating,
+/area/shuttle/siberia)
 "vrd" = (
 /obj/structure/flora/tree/jungle,
 /turf/simulated/floor/indestructible/grass/no_creep,
@@ -36152,6 +36385,11 @@
 "vCF" = (
 /turf/simulated/wall/indestructible/fakeglass,
 /area/centcom/ss220/park)
+"vCJ" = (
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/delivery,
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/mining)
 "vCS" = (
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/shuttle/assault_pod)
@@ -36364,7 +36602,9 @@
 	},
 /obj/effect/turf_decal/stripes/red/box,
 /obj/effect/light_emitter/colored{
-	light_color = "white"
+	light_color = "#FFFFFF";
+	light_power = 10;
+	light_range = 5
 	},
 /turf/simulated/floor/plasteel/dark{
 	dir = 8;
@@ -37325,6 +37565,12 @@
 	icon_state = "dark"
 	},
 /area/syndicate_mothership/cargo)
+"wmt" = (
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 1
+	},
+/turf/simulated/floor/mineral/titanium,
+/area/shuttle/siberia)
 "wmB" = (
 /obj/structure/table/glass/reinforced/titanium{
 	color = "#dbc921";
@@ -37993,6 +38239,27 @@
 	},
 /turf/simulated/floor/wood/fancy/cherry,
 /area/centcom/ss220/bar)
+"wDK" = (
+/obj/machinery/door/airlock/titanium{
+	id_tag = "s_docking_airlock"
+	},
+/obj/effect/mapping_helpers/airlock/autoname,
+/obj/structure/fans/tiny,
+/obj/effect/mapping_helpers/airlock/access/any/supply/mining,
+/obj/docking_port/stationary/transit{
+	dir = 8;
+	dwidth = 3;
+	height = 5;
+	id = "mining_transit";
+	name = "mining in transit";
+	width = 7;
+	pixel_x = 32
+	},
+/obj/docking_port/mobile/mining{
+	roundstart_move = "mining_away"
+	},
+/turf/simulated/floor/plating,
+/area/shuttle/mining)
 "wDR" = (
 /turf/simulated/floor/plasteel/dark{
 	icon_state = "darkgreen"
@@ -38253,6 +38520,12 @@
 	icon_state = "dark"
 	},
 /area/syndicate_mothership/cargo)
+"wMc" = (
+/obj/machinery/door/airlock/titanium,
+/obj/effect/mapping_helpers/airlock/access/all/security/brig,
+/obj/effect/mapping_helpers/airlock/autoname,
+/turf/simulated/floor/mineral/plastitanium/red,
+/area/shuttle/siberia)
 "wMx" = (
 /turf/simulated/floor/plasteel/dark{
 	dir = 5;
@@ -38650,17 +38923,6 @@
 	},
 /turf/simulated/floor/wood/oak,
 /area/syndicate_mothership)
-"xau" = (
-/obj/docking_port/stationary/transit{
-	dir = 8;
-	dwidth = 2;
-	height = 5;
-	id = "laborcamp_transit";
-	name = "labor in transit";
-	width = 9
-	},
-/turf/space/transit,
-/area/space/centcomm)
 "xaH" = (
 /obj/effect/decal/nanotrasen_logo_circle{
 	icon_state = "ntlogo_sec";
@@ -40029,6 +40291,13 @@
 	icon_state = "darkbrown"
 	},
 /area/centcom/ss220/supply)
+"xLm" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/structure/sign/poster/official/random/south,
+/turf/simulated/floor/mineral/titanium/blue,
+/area/shuttle/mining)
 "xLG" = (
 /obj/structure/flora/ausbushes,
 /turf/simulated/floor/indestructible/grass/no_creep,
@@ -40406,6 +40675,9 @@
 /obj/structure/table/wood/fancy/red,
 /turf/simulated/floor/carpet/red,
 /area/centcom/ss220/bar)
+"xZs" = (
+/turf/simulated/wall/mineral/titanium,
+/area/shuttle/siberia)
 "xZz" = (
 /obj/machinery/door/airlock/external{
 	id_tag = "s_docking_airlock";
@@ -58941,7 +59213,7 @@ siO
 xwO
 shq
 rmd
-shq
+nEQ
 shq
 shq
 shq
@@ -79061,12 +79333,12 @@ lgH
 lgH
 lgH
 lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
+ezO
+cdG
+ezO
+cdG
+eLp
+nvs
 lgH
 lgH
 lgH
@@ -79317,13 +79589,13 @@ lgH
 lgH
 lgH
 lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
+ezO
+ezO
+loY
+gDx
+bxM
+xLm
+ezO
 lgH
 lgH
 lgH
@@ -79574,13 +79846,13 @@ lgH
 lgH
 lgH
 lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
+cdG
+sto
+vfi
+iwt
+bxM
+mbV
+ezO
 lgH
 lgH
 lgH
@@ -79831,13 +80103,13 @@ lgH
 lgH
 lgH
 lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
+ezO
+ezO
+vCJ
+kDv
+bxM
+ckK
+ezO
 lgH
 lgH
 lgH
@@ -80089,12 +80361,12 @@ lgH
 lgH
 lgH
 lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
+ezO
+cdG
+wDK
+cdG
+eLp
+nvs
 lgH
 lgH
 lgH
@@ -80348,7 +80620,7 @@ lgH
 lgH
 lgH
 lgH
-aRU
+lgH
 lgH
 lgH
 lgH
@@ -85998,15 +86270,15 @@ lgH
 lgH
 lgH
 lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
+xZs
+xZs
+vqY
+xZs
+xZs
+vqY
+xZs
+xZs
+xZs
 lgH
 lgH
 lgH
@@ -86255,15 +86527,15 @@ lgH
 lgH
 lgH
 lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
+vqY
+uXQ
+lAX
+wMc
+wmt
+stf
+ieY
+kEM
+cwF
 lgH
 lgH
 lgH
@@ -86512,15 +86784,15 @@ lgH
 lgH
 lgH
 lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
+vqY
+gNx
+lAX
+xZs
+eti
+owk
+tIw
+cbA
+cwF
 lgH
 lgH
 lgH
@@ -86769,15 +87041,15 @@ lgH
 lgH
 lgH
 lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
+vqY
+lbh
+hoc
+xZs
+byg
+dOf
+tIw
+kEM
+cwF
 lgH
 lgH
 lgH
@@ -87026,15 +87298,15 @@ lgH
 lgH
 lgH
 lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
-lgH
+xZs
+xZs
+htc
+xZs
+xZs
+xZs
+gOF
+xZs
+xZs
 lgH
 lgH
 lgH
@@ -87289,7 +87561,7 @@ lgH
 lgH
 lgH
 lgH
-xau
+lgH
 lgH
 lgH
 lgH
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 48aa84d44af6..b220ebbf9e07 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -94,18 +94,21 @@ menu "menu"
 		can-check = true
 		is-checked = true
 		group = "scale"
+		saved-params = "is-checked"
 	elem "PS"
 		name = "&Точечный отбор"
 		command = ".winset \"paramapwindow.map.zoom-mode=normal\""
 		category = "&Масштабирование"
 		can-check = true
 		group = "scale"
+		saved-params = "is-checked"
 	elem "BL"
 		name = "&Билинейное"
 		command = ".winset \"paramapwindow.map.zoom-mode=blur\""
 		category = "&Масштабирование"
 		can-check = true
 		group = "scale"
+		saved-params = "is-checked"
 	elem "textmode"
 		name = "&Текстовый режим"
 		command = ".winset \"menu.textmode.is-checked=true?paramapwindow.map.text-mode=true:paramapwindow.map.text-mode=false\""
diff --git a/modular_ss220/_defines220/code/gamemode.dm b/modular_ss220/_defines220/code/gamemode.dm
index 239da29ff7b3..85e57c57aa58 100644
--- a/modular_ss220/_defines220/code/gamemode.dm
+++ b/modular_ss220/_defines220/code/gamemode.dm
@@ -2,3 +2,5 @@
 #define SPECIAL_ROLE_VOX_RAIDER "Vox Raider"
 
 #define isvoxcash(W) (istype(W, /obj/item/stack/vox_cash))
+
+#define TARGET_INVALID_SAME_TEAM (-1)
diff --git a/modular_ss220/antagonists/code/objectives.dm b/modular_ss220/antagonists/code/objectives.dm
index 8eb3bc18ac00..ef8d445429dc 100644
--- a/modular_ss220/antagonists/code/objectives.dm
+++ b/modular_ss220/antagonists/code/objectives.dm
@@ -1,3 +1,12 @@
+/datum/objective/is_invalid_target(datum/mind/possible_target)
+	. = ..()
+	if(.)
+		return
+	if(team)
+		for(var/datum/antagonist/target_datum in possible_target.antag_datums)
+			if(team == target_datum.get_team())
+				return TARGET_INVALID_SAME_TEAM
+
 /datum/objective/raider_steal
 	name = "Raider theft"
 	needs_target = FALSE
diff --git a/modular_ss220/balance/code/items/weapons.dm b/modular_ss220/balance/code/items/weapons.dm
index e896b7139fbd..50e1dd9074a9 100644
--- a/modular_ss220/balance/code/items/weapons.dm
+++ b/modular_ss220/balance/code/items/weapons.dm
@@ -30,5 +30,8 @@
 /obj/item/gun/energy/laser/tag
 	w_class = WEIGHT_CLASS_NORMAL
 
+/obj/item/gun/energy/laser/practice
+	w_class = WEIGHT_CLASS_NORMAL
+
 /obj/item/gun/energy/laser/awaymission_aeg/rnd
 	w_class = WEIGHT_CLASS_NORMAL
diff --git a/modular_ss220/food_and_drinks/code/drinks.dm b/modular_ss220/food_and_drinks/code/drinks.dm
index 3e3468845689..ebef5d9efd95 100644
--- a/modular_ss220/food_and_drinks/code/drinks.dm
+++ b/modular_ss220/food_and_drinks/code/drinks.dm
@@ -792,3 +792,36 @@
 	drink_name = "Citrus Beer"
 	drink_desc = "Обычное пиво оранжевого оттенка, пахнет апельсинами."
 	taste_description = "кисленькое пиво"
+
+// MARK: NT Food Drinks
+/obj/item/reagent_containers/drinks/cans/nt_iced_black_tea
+	name = "iced black tea"
+	desc = "Холодный чёрный чай, натуральный и полезный."
+	icon = 'modular_ss220/food_and_drinks/icons/drinks.dmi'
+	icon_state = "tea_bottle_grey"
+	item_state = "beer"
+	list_reagents = list("icetea" = 30)
+
+/obj/item/reagent_containers/drinks/cans/nt_iced_green_tea
+	name = "iced green tea"
+	desc = "Холодный зелёный чай, натуральный и полезный."
+	icon = 'modular_ss220/food_and_drinks/icons/drinks.dmi'
+	icon_state = "tea_bottle"
+	item_state = "beer"
+	list_reagents = list("icetea" = 30)
+
+/obj/item/reagent_containers/drinks/cans/nt_iced_mint_tea
+	name = "iced mint tea"
+	desc = "Освежающий холодный чай с листьями мяты."
+	icon = 'modular_ss220/food_and_drinks/icons/drinks.dmi'
+	icon_state = "tea_bottle_blue"
+	item_state = "beer"
+	list_reagents = list("icetea" = 30)
+
+/obj/item/reagent_containers/drinks/cans/nt_iced_berry_tea
+	name = "iced berry tea"
+	desc = "Холодный чай с натуральными ягодами без сахара."
+	icon = 'modular_ss220/food_and_drinks/icons/drinks.dmi'
+	icon_state = "tea_bottle_pink"
+	item_state = "beer"
+	list_reagents = list("icetea" = 30)
diff --git a/modular_ss220/food_and_drinks/code/food/fancy_food.dm b/modular_ss220/food_and_drinks/code/food/fancy_food.dm
index e1d9d3614f14..206d2a11b006 100644
--- a/modular_ss220/food_and_drinks/code/food/fancy_food.dm
+++ b/modular_ss220/food_and_drinks/code/food/fancy_food.dm
@@ -1,29 +1,40 @@
-/* Fancy food need to be opened first. */
+/**
+ * MARK: | Fancy Food
+ * Fancy food need to be opened first.
+ */
 /obj/item/food/fancy
 	/// Description when opened.
 	var/desc_open
 	/// Is it ready to be eaten?
 	var/opened = FALSE
+	/// Does it need to be taken out of the box?
+	var/need_takeout = FALSE
 	/// The sound that will be played when you open a food.
 	var/open_sound = 'modular_ss220/aesthetics_sounds/sound/food_open.ogg'
 	COOLDOWN_DECLARE(try_open)
 
 /obj/item/food/fancy/update_icon_state()
-	if(!opened)
-		return
-
-	icon_state = "[initial(icon_state)]_open"
+	if(opened)
+		icon_state = "[initial(icon_state)]_open"
 
 /obj/item/food/fancy/attack(mob/M, mob/user, def_zone)
 	if(!opened)
 		to_chat(user, span_warning("[src] сначала нужно открыть!"))
 		return FALSE
+	if(opened && need_takeout)
+		to_chat(user, span_warning("Сначала вытащите еду из упаковки!"))
+		return FALSE
 	return ..()
 
+/obj/item/food/fancy/attack_self(mob/user)
+	AltClick(user)
+
 /obj/item/food/fancy/examine(mob/user)
 	. = ..()
 	if(!opened)
-		. += span_notice("Нажмите <b>Alt-Click</b> чтобы открыть.")
+		. += span_notice("Нажмите <b>Alt-Click</b>, чтобы открыть.")
+	if(opened && need_takeout)
+		. += span_notice("Нажмите <b>Alt-Click</b>, чтобы достать еду из упаковки.")
 
 /obj/item/food/fancy/AltClick(mob/user)
 	if(!try_open(user))
@@ -67,7 +78,7 @@
 		desc = desc_open
 
 /**
- * Second action on Alt+Click
+ * Second action on Alt+Click.
  * Called only when food is opened
  */
 /obj/item/food/fancy/proc/opened_act(mob/user)
@@ -97,7 +108,7 @@
 	tastes = list("говядина" = 1, "лапша" = 1)
 
 /obj/item/trash/doshik
-	name = "\improper упаковка из под дошика"
+	name = "\improper упаковка из-под дошика"
 	icon = 'modular_ss220/food_and_drinks/icons/trash.dmi'
 	icon_state = "doshik-empty"
 	desc = "Всё ещё вкусно пахнет."
@@ -128,46 +139,54 @@
 	tastes = list("напоминающего курицу" = 2, "сыр" = 6)
 
 /obj/item/trash/macvulpix
-	name = "\improper упаковка из под MacVulpix"
+	name = "\improper упаковка из-под MacVulpix"
 	icon = 'modular_ss220/food_and_drinks/icons/trash.dmi'
 	icon_state = "MV-vulpixs"
 	desc = "Всё ещё вкусно пахнет."
 
-// MARK: MacVulpBurger
-/obj/item/food/fancy/macvulpburger
-	name = "\improper MacVulpBurger Gourmet"
-	desc = "Особый бургер из линейки “Большой Укус” с трюфельно-ягодным соусом, только для ценителей необычного!"
-	icon = 'modular_ss220/food_and_drinks/icons/food.dmi'
-	icon_state = "MV-burgerbox"
-	open_sound = 'sound/machines/cardboard_box.ogg'
-	var/obj/item/food/burger
+/**
+ * MARK: | Packed Fancy Food
+ * This type of food should be double opened
+ */
+/obj/item/food/fancy/packed
+	need_takeout = TRUE
+	var/list/possible_food
 
-/obj/item/food/fancy/macvulpburger/New()
+/obj/item/food/fancy/packed/Initialize(mapload)
 	. = ..()
-	burger = new /obj/item/food/burger/macvulp(src)
-
-// Just template, we can't eat it
-/obj/item/food/fancy/macvulpburger/attack(mob/M, mob/user, def_zone)
-	if(opened)
-		return FALSE
-	return ..()
+	LAZYINITLIST(possible_food)
+	return INITIALIZE_HINT_LATELOAD
 
-/obj/item/food/fancy/macvulpburger/examine(mob/user)
-	. = ..()
-	if(opened)
-		. += span_notice("Нажмите <b>Alt-Click</b> чтобы достать бургер.")
+/obj/item/food/fancy/packed/LateInitialize()
+	if(!LAZYLEN(possible_food))
+		stack_trace("List 'possible_food' is empty or not initialized in [src.type] subtype! Deleting...")
+		qdel(src)
+		return
+	// Picks random from the list, works also if one item is in the list
+	var/item = pick(possible_food)
+	new item(src)
 
-// But we can eject it from the box and eat it
-/obj/item/food/fancy/macvulpburger/opened_act(mob/user)
+/obj/item/food/fancy/packed/opened_act(mob/user)
 	user.drop_item()
-	if(!user.get_active_hand() && Adjacent(user))
-		user.put_in_hands(burger)
-	else
-		burger.forceMove(get_turf(user))
+
+	for(var/obj/item/food/internal_food in contents)
+		if(!user.get_active_hand() && Adjacent(user))
+			user.put_in_hands(internal_food)
+		else
+			internal_food.forceMove(get_turf(user))
 
 	qdel(src)
 	return TRUE
 
+// MARK: MacVulpBurger
+/obj/item/food/fancy/packed/macvulpburger
+	name = "\improper MacVulpBurger Gourmet"
+	desc = "Особый бургер из линейки “Большой Укус” с трюфельно-ягодным соусом, только для ценителей необычного!"
+	icon = 'modular_ss220/food_and_drinks/icons/food.dmi'
+	icon_state = "MV-burgerbox"
+	open_sound = 'sound/machines/cardboard_box.ogg'
+	possible_food = list(/obj/item/food/burger/macvulp)
+
 /obj/item/food/burger/macvulp
 	name = "\improper MacVulpBurger Gourmet"
 	desc = "Огромный аппетитный и сочащийся соками бургер с двойной говяжьей котлетой и трюфельно-ягодным соусом."
@@ -176,3 +195,107 @@
 	bitesize = 2
 	list_reagents = list("nutriment" = 6, "protein" = 6, "vitamin" = 1)
 	tastes = list("булка" = 1, "говядина" = 4, "трюфельный соус" = 1, "ягодный соус" = 1)
+
+// MARK: NT Food
+/obj/item/food/fancy/packed/foodpack_nt
+	name = "\improper Nanotrasen Foodpack"
+	desc = "Большой набор еды с различным содержимым."
+	icon = 'modular_ss220/food_and_drinks/icons/food.dmi'
+	icon_state = "foodpack_nt"
+	open_sound = 'sound/machines/cardboard_box.ogg'
+	possible_food = list(
+		/obj/item/food/foodtray_sad_steak,
+		/obj/item/food/foodtray_chicken_sandwich,
+		/obj/item/food/foodtray_noodle,
+		/obj/item/food/foodtray_sushi,
+		/obj/item/food/foodtray_beef_and_rice,
+		/obj/item/food/foodtray_pesto_pizza,
+		/obj/item/food/foodtray_rice_and_grilled_cheese,
+		/obj/item/food/foodtray_fried_shrooms
+	)
+
+/obj/item/food/foodtray_sad_steak
+	name = "\improper mashed potatoes and steak"
+	desc = "Суховатое пюре с таким себе стейком, скорее всего это даже не мясо."
+	icon = 'modular_ss220/food_and_drinks/icons/food.dmi'
+	icon_state = "foodtray_sad_steak"
+	trash = /obj/item/trash/foodtray
+	bitesize = 2
+	list_reagents = list("nutriment" = 8, "protein" = 4, "vitamin" = 8)
+	tastes = list("соус" = 1, "картофель" = 1, "напоминающего мяса" = 4)
+
+/obj/item/food/foodtray_chicken_sandwich
+	name = "\improper chicken sandwich"
+	desc = "Сэндвич с безвкусной курицей."
+	icon = 'modular_ss220/food_and_drinks/icons/food.dmi'
+	icon_state = "foodtray_chicken_sandwich"
+	trash = /obj/item/trash/foodtray
+	bitesize = 2
+	list_reagents = list("nutriment" = 8, "protein" = 4, "vitamin" = 5)
+	tastes = list("соус" = 1, "булка" = 1, "курица" = 1)
+
+/obj/item/food/foodtray_noodle
+	name = "\improper noodles"
+	desc = "Спагетти Болоньезе, или нет... Но очень похоже."
+	icon = 'modular_ss220/food_and_drinks/icons/food.dmi'
+	icon_state = "foodtray_noodle"
+	trash = /obj/item/trash/foodtray
+	bitesize = 2
+	list_reagents = list("nutriment" = 5, "vitamin" = 3)
+	tastes = list("соус болоньезе" = 4, "спагетти" = 1)
+
+/obj/item/food/foodtray_sushi
+	name = "\improper sushi"
+	desc = "Свежие суши с неплохим балансом между рисом и рыбой."
+	icon = 'modular_ss220/food_and_drinks/icons/food.dmi'
+	icon_state = "foodtray_sushi"
+	trash = /obj/item/trash/foodtray
+	bitesize = 2
+	list_reagents = list("nutriment" = 10, "protein" = 2, "vitamin" = 5)
+	tastes = list("рыба" = 4, "рис" = 2, "водоросли" = 1)
+
+/obj/item/food/foodtray_beef_and_rice
+	name = "\improper beef and rice"
+	desc = "Питательная порция говядины с рисом."
+	icon = 'modular_ss220/food_and_drinks/icons/food.dmi'
+	icon_state = "foodtray_beef_and_rice"
+	trash = /obj/item/trash/foodtray
+	bitesize = 2
+	list_reagents = list("nutriment" = 10, "protein" = 20, "vitamin" = 5)
+	tastes = list("говядина" = 4, "рис" = 2, "специи" = 1)
+
+/obj/item/food/foodtray_pesto_pizza
+	name = "\improper pesto pizza"
+	desc = "Пицца с песто. В меру питательная и слегка пресная. Хороший выбор для тех, кто не ждет многого от обеда."
+	icon = 'modular_ss220/food_and_drinks/icons/food.dmi'
+	icon_state = "foodtray_pesto_pizza"
+	trash = /obj/item/trash/foodtray
+	bitesize = 2
+	list_reagents = list("nutriment" = 10, "vitamin" = 2)
+	tastes = list("песто" = 3, "сыр" = 2, "тесто" = 1)
+
+/obj/item/food/foodtray_rice_and_grilled_cheese
+	name = "\improper rice and grilled cheese"
+	desc = "Странное сочетание риса и жареного сыра."
+	icon = 'modular_ss220/food_and_drinks/icons/food.dmi'
+	icon_state = "foodtray_rice_and_grilled_cheese"
+	trash = /obj/item/trash/foodtray
+	bitesize = 2
+	list_reagents = list("nutriment" = 10, "vitamin" = 2)
+	tastes = list("рис" = 2, "жареный сыр" = 3)
+
+/obj/item/food/foodtray_fried_shrooms
+	name = "\improper fried shrooms"
+	desc = "Простая порция жареных грибов, хрустящих снаружи и мягких внутри. Непритязательное, но питательное блюдо."
+	icon = 'modular_ss220/food_and_drinks/icons/food.dmi'
+	icon_state = "foodtray_fried_shrooms"
+	trash = /obj/item/trash/foodtray
+	bitesize = 2
+	list_reagents = list("nutriment" = 10, "vitamin" = 5)
+	tastes = list("грибы" = 4, "масло" = 2)
+
+/obj/item/trash/foodtray
+	name = "\improper food tray"
+	desc = "Пустой лоток из-под еды."
+	icon = 'modular_ss220/food_and_drinks/icons/trash.dmi'
+	icon_state = "foodtray"
diff --git a/modular_ss220/food_and_drinks/icons/drinks.dmi b/modular_ss220/food_and_drinks/icons/drinks.dmi
index 9d0bd87eba5b..69b452c4bab9 100644
Binary files a/modular_ss220/food_and_drinks/icons/drinks.dmi and b/modular_ss220/food_and_drinks/icons/drinks.dmi differ
diff --git a/modular_ss220/food_and_drinks/icons/food.dmi b/modular_ss220/food_and_drinks/icons/food.dmi
index befc38b07def..e7b987931d22 100644
Binary files a/modular_ss220/food_and_drinks/icons/food.dmi and b/modular_ss220/food_and_drinks/icons/food.dmi differ
diff --git a/modular_ss220/food_and_drinks/icons/trash.dmi b/modular_ss220/food_and_drinks/icons/trash.dmi
index 2c717d6df941..50cdf4a77706 100644
Binary files a/modular_ss220/food_and_drinks/icons/trash.dmi and b/modular_ss220/food_and_drinks/icons/trash.dmi differ
diff --git a/modular_ss220/maps220/code/objects.dm b/modular_ss220/maps220/code/objects.dm
index 4c358b602c92..3a4c22d47cfc 100644
--- a/modular_ss220/maps220/code/objects.dm
+++ b/modular_ss220/maps220/code/objects.dm
@@ -88,11 +88,27 @@
 // Structure
 /obj/structure/shuttle/engine
 	icon = 'modular_ss220/maps220/icons/shuttle.dmi'
-	resistance_flags = INDESTRUCTIBLE // То что у нас двигатели ломаются от пары пуль - бред
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	var/arbitraryatmosblockingvar = 1
 
+// Engines provide atmos blocking, for they move to locations with different atmos
 /obj/structure/shuttle/engine/Initialize(mapload)
 	. = ..()
 	set_light(2)
+	recalculate_atmos_connectivity()
+
+/obj/structure/shuttle/engine/Destroy()
+	arbitraryatmosblockingvar = 0
+	recalculate_atmos_connectivity()
+	return ..()
+
+// Copy-pastes tiny fans
+/obj/structure/shuttle/engine/CanAtmosPass(direction)
+	return !arbitraryatmosblockingvar
+
+/obj/structure/shuttle/engine/get_superconductivity(direction)
+	// Mostly for stuff on Lavaland.
+	return ZERO_HEAT_TRANSFER_COEFFICIENT
 
 /obj/structure/shuttle/engine/huge
 	icon = 'modular_ss220/maps220/icons/3x3.dmi'
diff --git a/modular_ss220/maps220/code/spawners.dm b/modular_ss220/maps220/code/spawners.dm
index a78027c595ea..94b6559d96ab 100644
--- a/modular_ss220/maps220/code/spawners.dm
+++ b/modular_ss220/maps220/code/spawners.dm
@@ -98,7 +98,9 @@
 			/obj/item/trash/tapetrash,
 			/obj/item/trash/tastybread,
 			/obj/item/trash/tray,
-			/obj/item/trash/waffles
+			/obj/item/trash/waffles,
+			/obj/item/trash/vulpix_chips,
+			/obj/item/trash/foodtray,
 		) = 5,
 	)
 
diff --git a/modular_ss220/vending/code/vending_food.dm b/modular_ss220/vending/code/vending_food.dm
index 253a564c4df9..758128c02a94 100644
--- a/modular_ss220/vending/code/vending_food.dm
+++ b/modular_ss220/vending/code/vending_food.dm
@@ -1,6 +1,7 @@
 /obj/item/circuitboard/vendor
 	var/static/list/ss220_vendors = list("MacVulpix Deluxe Food" = /obj/machinery/economy/vending/vulpix)
 
+// MARK: MacVulpix
 /obj/machinery/economy/vending/vulpix
 	name = "\improper MacVulpix Deluxe Food"
 	desc = "Торговый автомат сети ресторанов быстрого питания МакВульпикс с забавным лисом на логотипе."
@@ -15,12 +16,12 @@
 		"Если вам понравились вульпиксы - ингредиенты погибли не зря!",
 		"МакВульпикс! То что я люблю!",
 		"МакВульпикс - выбор настоящего гурмана, одобрено девятью из десяти диетологами!",
-		"Если чревоугодие — это грех, то добро пожаловать в ад!"
+		"Если чревоугодие — это грех, то добро пожаловать в Ад!"
 	)
 	products = list(
 		/obj/item/food/fancy/macvulpix_original = 5,
 		/obj/item/food/fancy/macvulpix_cheese = 5,
-		/obj/item/food/fancy/macvulpburger = 5,
+		/obj/item/food/fancy/packed/macvulpburger = 5,
 		/obj/item/pizzabox/vulpix = 3,
 		/obj/item/food/vulpix_chips = 5,
 		/obj/item/reagent_containers/drinks/bottle/vulpix_milk/berry = 5,
@@ -31,7 +32,7 @@
 	prices = list(
 		/obj/item/food/fancy/macvulpix_original = 100,
 		/obj/item/food/fancy/macvulpix_cheese = 100,
-		/obj/item/food/fancy/macvulpburger = 125,
+		/obj/item/food/fancy/packed/macvulpburger = 125,
 		/obj/item/pizzabox/vulpix = 150,
 		/obj/item/food/vulpix_chips = 60,
 		/obj/item/reagent_containers/drinks/bottle/vulpix_milk/berry = 50,
@@ -43,3 +44,38 @@
 		/obj/item/toy/plushie/macvulpix = 3,
 		/obj/item/poster/mac_vulpix = 3,
 	)
+
+// MARK: Nanotrasen Food
+/obj/machinery/economy/vending/nt_food
+	name = "\improper Nanotrasen Food"
+	desc = "Торговый автомат, поставляемый напрямую компанией Nanotrasen на свои объекты. Содержит сбалансированные наборы еды для сотрудников."
+	icon = 'modular_ss220/vending/icons/vending.dmi'
+	icon_state = "nt_food"
+	icon_lightmask = "nt_food"
+	category = VENDOR_TYPE_FOOD
+	refill_canister = /obj/item/vending_refill/nt_food
+	vend_reply = "Продуктивного рабочего дня!"
+	slogan_list = list(
+		"Во славу корпорации!",
+		"Хорошо поели? Хорошо поработайте!",
+		"Без излишеств.",
+		"Готовая еда — Рай для корпората!",
+		"Бесперебойная работа, даже если вокруг будет царить хаос!"
+	)
+	products = list(
+		/obj/item/food/fancy/packed/foodpack_nt = 10,
+		/obj/item/reagent_containers/drinks/cans/nt_iced_black_tea = 10,
+		/obj/item/reagent_containers/drinks/cans/nt_iced_green_tea = 10,
+		/obj/item/reagent_containers/drinks/cans/nt_iced_mint_tea = 10,
+		/obj/item/reagent_containers/drinks/cans/nt_iced_berry_tea = 10,
+	)
+	prices = list(
+		/obj/item/food/fancy/packed/foodpack_nt = 50,
+		/obj/item/reagent_containers/drinks/cans/nt_iced_black_tea = 15,
+		/obj/item/reagent_containers/drinks/cans/nt_iced_green_tea = 15,
+		/obj/item/reagent_containers/drinks/cans/nt_iced_mint_tea = 15,
+		/obj/item/reagent_containers/drinks/cans/nt_iced_berry_tea = 15,
+	)
+
+/obj/machinery/economy/vending/nt_food/free
+	prices = list()
diff --git a/modular_ss220/vending/code/vending_items.dm b/modular_ss220/vending/code/vending_items.dm
index 0e9275b9881a..ebf9f2fb5e3b 100644
--- a/modular_ss220/vending/code/vending_items.dm
+++ b/modular_ss220/vending/code/vending_items.dm
@@ -3,6 +3,11 @@
 	icon = 'modular_ss220/vending/icons/vending_restock.dmi'
 	icon_state = "refill_nta"
 
+/obj/item/vending_refill/nt_food
+	machine_name = "NT Food"
+	icon = 'modular_ss220/vending/icons/vending_restock.dmi'
+	icon_state = "refill_nta"
+
 /obj/item/vending_refill/adv_ntmed
 	machine_name = "Advanced Nanomed"
 	icon_state = "refill_medical"
diff --git a/modular_ss220/vending/icons/vending.dmi b/modular_ss220/vending/icons/vending.dmi
index e97e9786d337..10e3bc6c30d5 100644
Binary files a/modular_ss220/vending/icons/vending.dmi and b/modular_ss220/vending/icons/vending.dmi differ