diff --git a/_maps/shuttles/shiptest/nanotrasen_heron.dmm b/_maps/shuttles/shiptest/nanotrasen_heron.dmm
index c54dcd55702d..e2674fd090c4 100644
--- a/_maps/shuttles/shiptest/nanotrasen_heron.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_heron.dmm
@@ -660,6 +660,7 @@
 /obj/structure/plaque/static_plaque/golden/captain{
 	pixel_y = 32
 	},
+/obj/machinery/light/directional/west,
 /turf/open/floor/wood{
 	icon_state = "wood-broken"
 	},
@@ -1581,7 +1582,9 @@
 /obj/structure/sign/departments/medbay/alt{
 	pixel_y = 32
 	},
-/obj/machinery/door/airlock/security/glass,
+/obj/machinery/door/airlock/security/glass{
+	dir = 4
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
@@ -1899,7 +1902,9 @@
 "hO" = (
 /obj/effect/turf_decal/siding/thinplating,
 /obj/effect/turf_decal/trimline/opaque/blue/line,
-/obj/machinery/door/airlock/security/glass,
+/obj/machinery/door/airlock/security/glass{
+	dir = 4
+	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -2091,8 +2096,10 @@
 /turf/open/floor/circuit/green,
 /area/ship/engineering/communications)
 "io" = (
-/obj/machinery/door/airlock/hatch,
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/machinery/door/airlock/hatch{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/science/robotics)
 "iq" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -2294,7 +2301,6 @@
 /obj/effect/turf_decal/arrows{
 	dir = 8
 	},
-/obj/machinery/airalarm/directional/west,
 /obj/structure/closet/crate/large,
 /obj/item/storage/box/donkpockets{
 	pixel_x = 2;
@@ -2323,6 +2329,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/central)
 "ja" = (
@@ -3796,10 +3803,10 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},
-/obj/machinery/light/directional/north,
 /obj/structure/sign/plaques/kiddie/perfect_man{
 	pixel_y = 32
 	},
+/obj/machinery/light/directional/east,
 /turf/open/floor/wood,
 /area/ship/crew/law_office)
 "nX" = (
@@ -4084,8 +4091,8 @@
 	dir = 8;
 	layer = 3.1
 	},
-/obj/structure/extinguisher_cabinet/directional/east,
 /obj/item/clothing/suit/space/hardsuit/ert/lp/med,
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "pb" = (
@@ -4675,6 +4682,16 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
+"rN" = (
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/blue/full,
+/obj/machinery/camera{
+	dir = 5
+	},
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
 "rO" = (
 /obj/effect/turf_decal/siding/wideplating/dark{
 	dir = 9
@@ -5231,13 +5248,6 @@
 /obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/security/dock)
-"tl" = (
-/obj/machinery/door/airlock/grunge{
-	name = "Bathroom";
-	dir = 4
-	},
-/turf/open/floor/plasteel/showroomfloor,
-/area/ship/crew/toilet)
 "tn" = (
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 1
@@ -5356,12 +5366,6 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
-/obj/machinery/button/door{
-	id = "heron_kitchen";
-	name = "Kitchen Lockdown";
-	pixel_x = -10;
-	pixel_y = 24
-	},
 /obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen/kitchen)
@@ -5440,6 +5444,13 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
+"tO" = (
+/obj/machinery/door/airlock/grunge{
+	name = "Bathroom";
+	dir = 4
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "tP" = (
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "heron_sm_1";
@@ -5905,11 +5916,9 @@
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 1
 	},
-/obj/item/radio/intercom/directional/north{
-	pixel_y = 23
-	},
 /obj/effect/turf_decal/corner/transparent/blue/full,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/radio/intercom/directional/north,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "vC" = (
@@ -6021,7 +6030,7 @@
 	pixel_x = -32
 	},
 /obj/machinery/camera{
-	dir = 10
+	dir = 5
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
@@ -6512,11 +6521,11 @@
 "yd" = (
 /obj/structure/railing{
 	dir = 1;
-	layer = 4.1
+	layer = 2.9
 	},
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/reagent_dispensers/fueltank,
 /obj/machinery/airalarm/directional/west,
+/obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "yg" = (
@@ -6650,6 +6659,7 @@
 /obj/structure/cable{
 	icon_state = "0-1"
 	},
+/obj/machinery/light/directional/west,
 /turf/open/floor/carpet/nanoweave,
 /area/ship/crew/law_office)
 "yR" = (
@@ -6680,9 +6690,7 @@
 	},
 /obj/machinery/sleeper,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/radio/intercom/directional/north{
-	pixel_y = 23
-	},
+/obj/item/radio/intercom/directional/north,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "yV" = (
@@ -7703,10 +7711,6 @@
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
 /obj/item/reagent_containers/food/snacks/pie/cream,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "heron_kitchen";
-	name = "Blast Shutters"
-	},
 /turf/open/floor/plating,
 /area/ship/crew/canteen)
 "Dk" = (
@@ -8621,9 +8625,6 @@
 /area/ship/hallway/central)
 "Gf" = (
 /obj/effect/decal/cleanable/cobweb,
-/obj/item/radio/intercom/directional/north{
-	pixel_y = 23
-	},
 /obj/machinery/atmospherics/pipe/simple/purple/hidden{
 	dir = 6
 	},
@@ -8639,6 +8640,10 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/camera{
+	dir = 9
+	},
+/obj/item/radio/intercom/directional/north,
 /obj/machinery/camera{
 	dir = 9
 	},
@@ -9036,10 +9041,6 @@
 	pixel_y = 12
 	},
 /obj/item/toy/figure/chef,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "heron_kitchen";
-	name = "Blast Shutters"
-	},
 /turf/open/floor/plating,
 /area/ship/crew/canteen)
 "HV" = (
@@ -9665,6 +9666,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
+/obj/machinery/camera{
+	dir = 9
+	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/maintenance/central)
 "KG" = (
@@ -10703,7 +10707,7 @@
 /obj/effect/turf_decal/siding/thinplating,
 /obj/effect/turf_decal/trimline/opaque/blue/line,
 /obj/machinery/camera{
-	dir = 5
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/fore)
@@ -10825,7 +10829,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/holofloor/wood,
+/turf/open/floor/wood,
 /area/ship/crew/dorm)
 "Pe" = (
 /obj/effect/turf_decal/techfloor/orange,
@@ -11866,7 +11870,6 @@
 /area/ship/crew/dorm)
 "To" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/directional/west,
 /obj/structure/sign/poster/official/fruit_bowl{
 	pixel_x = -32
 	},
@@ -12713,6 +12716,9 @@
 /obj/machinery/suit_storage_unit/inherit,
 /obj/item/clothing/suit/space/hardsuit/swat/captain,
 /obj/machinery/newscaster/directional/north,
+/obj/structure/sign/poster/official/no_erp{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/dorm/dormtwo)
 "WM" = (
@@ -13010,7 +13016,7 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
-/turf/open/floor/holofloor/wood,
+/turf/open/floor/wood,
 /area/ship/crew/law_office)
 "Xv" = (
 /obj/machinery/power/shuttle/engine/fueled/plasma{
@@ -13065,16 +13071,6 @@
 /obj/effect/turf_decal/siding/thinplating/dark,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/security/dock)
-"XG" = (
-/obj/effect/turf_decal/siding/thinplating{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/blue/full,
-/obj/machinery/camera{
-	dir = 5
-	},
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
 "XH" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/door/airlock{
@@ -13294,9 +13290,6 @@
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 1
 	},
-/obj/structure/sign/poster/official/no_erp{
-	pixel_x = -32
-	},
 /turf/open/floor/wood,
 /area/ship/crew/dorm/dormtwo)
 "YA" = (
@@ -14542,7 +14535,7 @@ Bv
 Bv
 ju
 kv
-tl
+tO
 kv
 kv
 kv
@@ -15480,7 +15473,7 @@ qx
 Wg
 OJ
 WM
-XG
+rN
 Zd
 dr
 Bn