diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index b83b2407902..2761c19b71f 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -850,6 +850,7 @@
 	},
 /obj/structure/window/reinforced/spawner/directional/west,
 /obj/machinery/status_display/ai/directional/south,
+/obj/machinery/photocopier,
 /turf/open/floor/iron/dark/side{
 	dir = 8
 	},
@@ -1476,7 +1477,16 @@
 /turf/open/floor/circuit/green,
 /area/station/ai_monitored/turret_protected/ai)
 "arO" = (
-/obj/machinery/vending/coffee,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/airalarm/directional/south,
+/obj/structure/table/wood/fancy/blue,
+/obj/item/toy/figure/captain{
+	pixel_x = -1;
+	pixel_y = 3
+	},
+/obj/item/lighter{
+	pixel_x = 8
+	},
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/captain)
 "asb" = (
@@ -5555,7 +5565,7 @@
 /area/station/cargo/miningdock)
 "bpZ" = (
 /obj/machinery/button/door/directional/south{
-	id = "miningdorm1";
+	id = "nsminingdorm1";
 	normaldoorcontrol = 1;
 	specialfunctions = 4
 	},
@@ -5900,6 +5910,9 @@
 /obj/structure/chair/sofa/corp/right{
 	dir = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
 /turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain/private)
 "bto" = (
@@ -7274,6 +7287,7 @@
 "bLa" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp/green,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/captain)
 "bLd" = (
@@ -10925,7 +10939,6 @@
 /turf/open/floor/iron,
 /area/station/hallway/floor2/aft)
 "cJJ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/structure/cable,
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/captain)
@@ -12790,7 +12803,7 @@
 /obj/structure/disposalpipe/junction/yjunction{
 	dir = 1
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain)
 "dkP" = (
 /obj/structure/bodycontainer/morgue{
@@ -13955,6 +13968,7 @@
 /area/station/command/heads_quarters/rd)
 "dDn" = (
 /obj/effect/landmark/generic_maintenance_landmark,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
 /area/station/service/kitchen/coldroom)
 "dDs" = (
@@ -15690,6 +15704,7 @@
 "ead" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/kitchen,
 /area/station/service/kitchen)
 "eae" = (
@@ -16048,6 +16063,7 @@
 /obj/machinery/door/airlock/silver/glass{
 	name = "Kitchen"
 	},
+/obj/effect/mapping_helpers/airlock/abandoned,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/service/kitchen/abandoned)
 "egx" = (
@@ -21150,6 +21166,7 @@
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/neutral/full,
+/obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance/testlab)
 "fDv" = (
@@ -22922,6 +22939,15 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/science/xenobiology)
+"gbC" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/table/wood/fancy/blue,
+/obj/item/storage/fancy/cigarettes/cigars/havana,
+/obj/item/storage/fancy/cigarettes/cigars/cohiba{
+	pixel_y = 3
+	},
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/captain)
 "gbG" = (
 /obj/effect/spawner/random/maintenance,
 /turf/open/floor/pod/light,
@@ -23922,7 +23948,7 @@
 /area/station/engineering/supermatter/room)
 "gqz" = (
 /obj/machinery/door/airlock{
-	id_tag = "miningdorm1";
+	id_tag = "nsminingdorm1";
 	name = "Room 1"
 	},
 /obj/effect/turf_decal/siding/wood,
@@ -25772,8 +25798,8 @@
 /turf/open/floor/pod/dark,
 /area/station/maintenance/floor4/starboard)
 "gRH" = (
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/machinery/camera/directional/west,
+/obj/structure/chair/sofa/corp/right,
+/obj/machinery/light/directional/north,
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/captain)
 "gRI" = (
@@ -32018,7 +32044,7 @@
 /area/station/engineering/atmos)
 "iFs" = (
 /obj/machinery/door/airlock{
-	id_tag = "miningdorm2";
+	id_tag = "nsminingdorm2";
 	name = "Room 2"
 	},
 /obj/effect/turf_decal/siding/wood,
@@ -34092,6 +34118,10 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/brig)
+"jiT" = (
+/obj/machinery/light/red/dim/directional/north,
+/turf/open/floor/pod/light,
+/area/station/maintenance/floor4/starboard/fore)
 "jja" = (
 /obj/machinery/holopad,
 /turf/open/floor/iron/white,
@@ -36903,8 +36933,7 @@
 /turf/open/floor/iron/dark,
 /area/station/security/execution/transfer)
 "jSu" = (
-/obj/machinery/vending/snack/orange,
-/obj/machinery/airalarm/directional/north,
+/obj/structure/chair/sofa/corp/left,
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/captain)
 "jSw" = (
@@ -41374,6 +41403,13 @@
 /obj/item/radio/intercom/directional/north,
 /turf/open/floor/pod/light,
 /area/station/maintenance/solars/port/aft)
+"lbB" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/kitchen,
+/area/station/service/kitchen)
 "lbK" = (
 /obj/structure/chair/stool/bar/directional/south,
 /obj/effect/decal/cleanable/confetti,
@@ -41864,6 +41900,7 @@
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/tile/neutral/full,
 /obj/effect/turf_decal/bot,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/science/ordnance/testlab)
 "lhO" = (
@@ -44907,6 +44944,13 @@
 	},
 /turf/open/floor/pod/light,
 /area/station/maintenance/floor3/starboard)
+"lWd" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/machinery/photocopier,
+/turf/open/floor/wood/tile,
+/area/station/command/heads_quarters/captain)
 "lWl" = (
 /obj/machinery/light/directional/west,
 /turf/open/floor/iron,
@@ -45249,6 +45293,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/start/captain,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/carpet,
 /area/station/command/heads_quarters/captain)
 "maW" = (
@@ -47962,7 +48007,7 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
-/turf/open/floor/carpet,
+/turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain)
 "mJc" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -50245,6 +50290,9 @@
 /obj/structure/chair/sofa/corp/left{
 	dir = 4
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
 /turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain/private)
 "nla" = (
@@ -53180,6 +53228,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
 /area/station/service/kitchen/coldroom)
 "nVB" = (
@@ -54305,7 +54354,7 @@
 /area/station/commons/dorms/room2)
 "olh" = (
 /obj/machinery/button/door/directional/south{
-	id = "miningdorm2";
+	id = "nsminingdorm2";
 	normaldoorcontrol = 1;
 	specialfunctions = 4
 	},
@@ -54948,11 +54997,11 @@
 /turf/open/floor/iron/kitchen/herringbone,
 /area/station/service/kitchen/diner)
 "ouE" = (
-/obj/machinery/light_switch/directional/south,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
+/obj/machinery/light/small/directional/south,
 /turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain/private)
 "ouF" = (
@@ -55939,7 +55988,7 @@
 /area/station/science/lab)
 "oIi" = (
 /obj/machinery/door/airlock{
-	id_tag = "miningdorm3";
+	id_tag = "nsminingdorm3";
 	name = "Room 3"
 	},
 /obj/effect/turf_decal/siding/wood,
@@ -57907,6 +57956,7 @@
 "pmQ" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
 /area/station/service/kitchen/coldroom)
 "pmS" = (
@@ -63549,6 +63599,13 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/catwalk_floor,
 /area/station/maintenance/floor2/starboard)
+"qKT" = (
+/obj/machinery/vending/snack/orange,
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/turf/open/floor/wood/tile,
+/area/station/command/heads_quarters/captain)
 "qLg" = (
 /obj/structure/flora/bush/sparsegrass/style_random,
 /obj/item/radio/intercom/directional/south,
@@ -67001,6 +67058,14 @@
 /obj/effect/spawner/random/vending/colavend,
 /turf/open/floor/iron/dark,
 /area/station/hallway/floor4/aft)
+"rIR" = (
+/obj/machinery/camera/directional/west,
+/obj/structure/extinguisher_cabinet/directional/west,
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/turf/open/floor/wood/tile,
+/area/station/command/heads_quarters/captain)
 "rIS" = (
 /turf/closed/wall/r_wall,
 /area/station/maintenance/disposal/incinerator)
@@ -69898,7 +69963,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/structure/disposalpipe/segment,
-/turf/open/floor/carpet,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain)
 "sCQ" = (
 /turf/open/floor/iron/dark,
@@ -72127,6 +72195,13 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/pod/light,
 /area/station/maintenance/floor4/starboard/aft)
+"thZ" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/machinery/vending/coffee,
+/turf/open/floor/wood/tile,
+/area/station/command/heads_quarters/captain)
 "tic" = (
 /turf/open/floor/wood,
 /area/station/commons/dorms/apartment2)
@@ -76059,6 +76134,10 @@
 	},
 /turf/open/floor/iron/dark,
 /area/station/science/ordnance/testlab)
+"unS" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/carpet,
+/area/station/command/heads_quarters/captain)
 "unV" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/effect/turf_decal/siding/wideplating,
@@ -76696,8 +76775,9 @@
 /area/station/engineering/supermatter)
 "uyI" = (
 /obj/structure/table/glass,
-/obj/item/beacon,
-/obj/item/beacon,
+/obj/item/beacon{
+	enabled = 0
+	},
 /turf/open/floor/iron/dark,
 /area/station/command/teleporter)
 "uyK" = (
@@ -76855,7 +76935,10 @@
 /area/station/maintenance/floor2/port/aft)
 "uAY" = (
 /obj/machinery/computer/security/telescreen/entertainment/directional/west,
-/turf/open/floor/carpet,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain)
 "uBp" = (
 /obj/effect/turf_decal/siding/wood{
@@ -76882,6 +76965,7 @@
 	},
 /obj/effect/turf_decal/bot/right,
 /obj/effect/turf_decal/tile/neutral/full,
+/obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/science/ordnance/testlab)
 "uBN" = (
@@ -82295,6 +82379,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/duct,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
 /area/station/service/kitchen/coldroom)
 "vXG" = (
@@ -85374,6 +85459,12 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/hallway/floor4/fore)
+"wJX" = (
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/maintenance/three,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/pod/light,
+/area/station/maintenance/floor4/starboard/fore)
 "wKa" = (
 /obj/machinery/atmospherics/pipe/smart/simple/green/visible{
 	dir = 4
@@ -86638,6 +86729,9 @@
 /obj/item/wrench,
 /obj/item/cultivator,
 /obj/item/shovel/spade,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
 /turf/open/floor/iron,
 /area/station/service/hydroponics)
 "xbj" = (
@@ -87157,7 +87251,7 @@
 /area/station/maintenance/floor3/starboard/aft)
 "xhH" = (
 /obj/machinery/button/door/directional/south{
-	id = "miningdorm3";
+	id = "nsminingdorm3";
 	normaldoorcontrol = 1;
 	specialfunctions = 4
 	},
@@ -90625,6 +90719,7 @@
 /area/station/security/prison/garden)
 "yfb" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
+/obj/item/beacon,
 /obj/effect/landmark/navigate_destination/teleporter,
 /turf/open/floor/iron/dark,
 /area/station/command/teleporter)
@@ -248776,7 +248871,7 @@ gyr
 gyr
 pbr
 sFt
-jNv
+lbB
 pDk
 mhO
 tGn
@@ -307087,14 +307182,14 @@ xHe
 gBs
 xHe
 sHq
-aNs
-aNs
-aNs
-aNs
-aNs
-aNs
-aNs
-sHq
+vLW
+vLW
+vLW
+vLW
+vLW
+vLW
+jiT
+lJp
 gGB
 aNs
 sRO
@@ -307344,13 +307439,13 @@ xHe
 vXM
 rPA
 abP
-aNs
-glw
-glw
-glw
-glw
-glw
-aNs
+vLW
+qKT
+rIR
+lWd
+thZ
+vLW
+wJX
 lJp
 gho
 aNs
@@ -307601,12 +307696,12 @@ xHe
 xHe
 xHe
 abP
-aNs
-aNs
-aNs
-aNs
-aNs
-aNs
+vLW
+gRH
+wYs
+unS
+gbC
+vLW
 aNs
 cxH
 aNs
@@ -307858,9 +307953,9 @@ lJp
 lJp
 lJp
 abP
-aNs
+vLW
 jSu
-gRH
+wnO
 wnO
 arO
 vLW
@@ -308115,7 +308210,7 @@ lJp
 xHe
 olV
 abP
-aNs
+vLW
 oYL
 wYR
 cJJ
@@ -308372,10 +308467,10 @@ aNs
 aNs
 aNs
 rNN
-oKq
+vLW
 qoI
 rbK
-wYs
+wnO
 keg
 vLW
 geA