diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm
index 07c565565231..4a0b85973bbf 100644
--- a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm
+++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm
@@ -52,15 +52,13 @@
 	name = "Mass Driver";
 	req_access_txt = "22"
 	},
-/obj/machinery/mass_driver{
-	dir = 4;
-	id = "chapelgun";
-	name = "Holy Driver"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/turf/open/floor/plating,
+/obj/structure/sign/warning/vacuum/external{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/dark,
 /area/chapel/main)
 "du" = (
 /obj/structure/table/wood,
@@ -280,12 +278,10 @@
 /turf/open/floor/plasteel/grimy,
 /area/chapel/office)
 "nS" = (
-/obj/structure/sign/warning/vacuum/external{
-	pixel_y = 32
-	},
-/obj/effect/landmark/event_spawn,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
+/obj/machinery/mass_driver{
+	dir = 1;
+	id = "chapelgun";
+	name = "Holy Driver"
 	},
 /turf/open/floor/plating,
 /area/chapel/main)
@@ -616,6 +612,14 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/chapel/main)
+"OS" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/poddoor{
+	id = "chapelgun";
+	name = "Chapel Launcher Door"
+	},
+/turf/open/floor/plating,
+/area/space/nearstation)
 "PM" = (
 /obj/structure/chair/pew/right{
 	dir = 1
@@ -781,13 +785,12 @@
 /turf/open/floor/plasteel/dark,
 /area/chapel/main)
 "XX" = (
-/obj/machinery/door/poddoor{
-	id = "chapelgun";
-	name = "Chapel Launcher Door"
+/obj/effect/landmark/event_spawn,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
 	},
-/obj/structure/fans/tiny,
 /turf/open/floor/plating,
-/area/space/nearstation)
+/area/chapel/main)
 "Yh" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -1199,8 +1202,8 @@ ZG
 Ck
 "}
 (16,1,1) = {"
-Ck
-Ck
+OS
+XX
 nS
 Ck
 Fi
@@ -1223,7 +1226,7 @@ II
 (17,1,1) = {"
 Ck
 Ck
-XX
+Ck
 II
 II
 II
diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm
index 7351d51b927e..10cbe925b764 100644
--- a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm
+++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm
@@ -1,7 +1,12 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "an" = (
-/obj/machinery/vending/wardrobe/chap_wardrobe,
-/turf/open/floor/carpet/red,
+/obj/machinery/mass_driver{
+	dir = 1;
+	id = "chapelgun";
+	name = "Holy Driver"
+	},
+/obj/item/reagent_containers/food/snacks/grown/poppy,
+/turf/open/floor/plating,
 /area/chapel/office)
 "as" = (
 /obj/effect/turf_decal/ramp_middle,
@@ -66,6 +71,7 @@
 	dir = 8;
 	pixel_x = 26
 	},
+/obj/machinery/vending/wardrobe/chap_wardrobe,
 /turf/open/floor/carpet/red,
 /area/chapel/office)
 "dd" = (
@@ -234,16 +240,13 @@
 	name = "Mass Driver";
 	req_access_txt = "22"
 	},
-/obj/machinery/mass_driver{
-	dir = 4;
-	id = "chapelgun";
-	name = "Holy Driver"
-	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/item/reagent_containers/food/snacks/grown/poppy,
-/turf/open/floor/plating,
+/obj/structure/sign/warning/vacuum/external{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/dark,
 /area/chapel/office)
 "kU" = (
 /obj/effect/turf_decal/ramp_middle,
@@ -538,9 +541,6 @@
 /turf/open/floor/plasteel/dark,
 /area/chapel/main)
 "DX" = (
-/obj/structure/sign/warning/vacuum/external{
-	pixel_y = 32
-	},
 /obj/effect/landmark/event_spawn,
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -1442,10 +1442,10 @@ Cq
 xL
 "}
 (16,1,1) = {"
-zg
+FN
 DX
-zg
 an
+zg
 cC
 Kz
 XU
@@ -1465,7 +1465,7 @@ wA
 "}
 (17,1,1) = {"
 zg
-FN
+zg
 zg
 wA
 wA