diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index bc0580b99ca..7cdd680b531 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -33188,9 +33188,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/effect/turf_decal/tiles/department/medical/side,
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/surgery/secondary)
@@ -52797,7 +52794,6 @@
 /obj/structure/chair/sofa/corp{
 	dir = 1
 	},
-/obj/machinery/light,
 /obj/effect/turf_decal/tiles/department/command/side,
 /turf/simulated/floor/plasteel/dark,
 /area/station/medical/surgery/observation)
@@ -54931,7 +54927,6 @@
 /obj/structure/chair/sofa/corp/left{
 	dir = 1
 	},
-/obj/structure/closet/walllocker/emerglocker/directional/south,
 /obj/effect/turf_decal/tiles/department/command/side,
 /turf/simulated/floor/plasteel/dark,
 /area/station/medical/surgery/observation)
@@ -55167,14 +55162,11 @@
 /area/station/engineering/control)
 "izR" = (
 /obj/structure/reagent_dispensers/water_cooler,
-/obj/item/radio/intercom{
-	name = "east bump";
-	pixel_x = 28
-	},
 /obj/machinery/alarm/directional/north,
 /obj/effect/turf_decal/tiles/department/command/side{
 	dir = 1
 	},
+/obj/machinery/newscaster/directional/east,
 /turf/simulated/floor/plasteel/dark,
 /area/station/medical/surgery/observation)
 "iAE" = (
@@ -56752,10 +56744,10 @@
 /area/station/maintenance/asmaint2)
 "joe" = (
 /obj/machinery/door/firedoor,
-/obj/structure/sign/poster/official/random/directional/east,
 /obj/effect/turf_decal/tiles/department/command/side{
 	dir = 4
 	},
+/obj/machinery/firealarm/directional/east,
 /turf/simulated/floor/plasteel/dark,
 /area/station/medical/surgery/observation)
 "jok" = (
@@ -60125,13 +60117,14 @@
 /area/station/maintenance/apmaint)
 "kTh" = (
 /obj/machinery/door/firedoor,
-/obj/item/radio/intercom{
-	name = "west bump";
-	pixel_x = -28
-	},
 /obj/effect/turf_decal/tiles/department/command/side{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	name = "west bump";
+	pixel_x = -24
+	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/medical/surgery/observation)
 "kTw" = (
@@ -63349,7 +63342,6 @@
 /obj/structure/chair/sofa/corp/right{
 	dir = 1
 	},
-/obj/machinery/firealarm/directional/south,
 /obj/effect/turf_decal/tiles/department/command/side,
 /turf/simulated/floor/plasteel/dark,
 /area/station/medical/surgery/observation)
@@ -66393,18 +66385,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/command/office/hop)
-"oaY" = (
-/obj/structure/chair/sofa/corp{
-	dir = 1
-	},
-/obj/machinery/light_switch{
-	dir = 1;
-	name = "south bump";
-	pixel_y = -24
-	},
-/obj/effect/turf_decal/tiles/department/command/side,
-/turf/simulated/floor/plasteel/dark,
-/area/station/medical/surgery/observation)
 "obP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -66678,6 +66658,9 @@
 /obj/effect/turf_decal/tiles/department/medical/side{
 	dir = 4
 	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/surgery/secondary)
 "oiD" = (
@@ -68033,9 +68016,6 @@
 /area/station/engineering/atmos)
 "oLC" = (
 /obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical{
-	name = "Operating Theatre 2"
-	},
 /obj/effect/mapping_helpers/airlock/access/all/medical/surgery,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable{
@@ -68047,6 +68027,12 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/effect/turf_decal/tiles/department/command,
+/obj/machinery/door/airlock/medical/glass{
+	name = "Operating Theatre 2"
+	},
+/obj/effect/mapping_helpers/airlock/polarized{
+	id = "Surgery 2"
+	},
 /turf/simulated/floor/plasteel/dark,
 /area/station/medical/surgery/secondary)
 "oLJ" = (
@@ -75679,18 +75665,24 @@
 /obj/machinery/holosign_switch{
 	id = "surgery2";
 	pixel_x = -24;
-	pixel_y = 4;
 	dir = 4
 	},
 /obj/machinery/light_switch{
 	pixel_x = -24;
 	dir = 4;
 	name = "custom placement";
-	pixel_y = -4
+	pixel_y = -8
 	},
 /obj/effect/turf_decal/tiles/department/medical/side{
 	dir = 4
 	},
+/obj/machinery/button/windowtint{
+	dir = 4;
+	id = "Surgery 2";
+	pixel_x = -24;
+	pixel_y = 8;
+	req_access = list(45)
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/surgery/secondary)
 "suM" = (
@@ -76306,13 +76298,13 @@
 /area/station/hallway/secondary/exit)
 "sMJ" = (
 /obj/structure/chair,
-/obj/machinery/power/apc/directional/north,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
 /obj/effect/turf_decal/tiles/department/command/side{
 	dir = 1
 	},
+/obj/machinery/power/apc/directional/north,
 /turf/simulated/floor/plasteel/dark,
 /area/station/medical/surgery/observation)
 "sMZ" = (
@@ -79353,8 +79345,8 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
 "uno" = (
-/obj/machinery/newscaster/directional/east,
 /obj/effect/turf_decal/tiles/department/command/side,
+/obj/structure/closet/walllocker/emerglocker/directional/east,
 /turf/simulated/floor/plasteel/dark,
 /area/station/medical/surgery/observation)
 "unu" = (
@@ -83888,6 +83880,12 @@
 	},
 /turf/simulated/floor/plating/airless,
 /area/station/maintenance/asmaint)
+"wHJ" = (
+/obj/effect/spawner/window/reinforced/polarized{
+	id = "Surgery 2"
+	},
+/turf/simulated/floor/plating,
+/area/station/medical/surgery/secondary)
 "wHK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -84061,7 +84059,6 @@
 /turf/simulated/floor/plating,
 /area/station/engineering/tech_storage)
 "wLp" = (
-/obj/machinery/light,
 /obj/structure/disposalpipe/segment/corner{
 	dir = 1
 	},
@@ -85642,6 +85639,9 @@
 /obj/effect/turf_decal/tiles/department/medical/side{
 	dir = 8
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel/white,
 /area/station/medical/surgery/secondary)
 "xBl" = (
@@ -123050,7 +123050,7 @@ cuh
 csY
 cuh
 hpR
-cDf
+wHJ
 dRz
 oiA
 suJ
@@ -123307,7 +123307,7 @@ crt
 kJW
 cum
 iuF
-cDf
+wHJ
 cxt
 cGw
 cyV
@@ -123821,7 +123821,7 @@ crv
 ctd
 cup
 myq
-cDf
+wHJ
 cFz
 cxP
 cyX
@@ -124077,8 +124077,8 @@ cum
 cuh
 ctc
 cuh
-oaY
-cDf
+hpR
+wHJ
 cxu
 cxL
 cyW