diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index f02a4f4a31..cefc0eb1a5 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -114276,11 +114276,6 @@
 /obj/structure/cable/white{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/airlock/maintenance_hatch{
-	name = "Maintenance Hatch";
-	req_access_txt = "12"
-	},
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/turf_decal/stripes/line{
 	dir = 2
@@ -114288,6 +114283,10 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/door/airlock/maintenance_hatch{
+	name = "Chapel Maintenance";
+	req_access_txt = "27"
+	},
 /turf/open/floor/plasteel,
 /area/maintenance/port/aft)
 "dKE" = (
@@ -118987,7 +118986,6 @@
 /obj/structure/cable/white{
 	icon_state = "1-2"
 	},
-/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel,
@@ -119332,7 +119330,6 @@
 /turf/closed/wall,
 /area/chapel/office)
 "dTx" = (
-/obj/structure/bodycontainer/morgue,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -119343,6 +119340,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/structure/closet/crate/coffin,
 /turf/open/floor/plasteel/dark,
 /area/chapel/office)
 "dTy" = (
@@ -121768,7 +121766,6 @@
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "dYv" = (
-/obj/structure/bodycontainer/morgue,
 /obj/structure/sign/poster/official/ian{
 	pixel_y = -32
 	},
@@ -121782,6 +121779,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/structure/closet/crate/coffin,
 /turf/open/floor/plasteel/dark,
 /area/chapel/office)
 "dYw" = (
@@ -126476,6 +126474,7 @@
 	name = "Mass Driver"
 	},
 /obj/machinery/mass_driver{
+	id = "chapelgun";
 	name = "Holy Driver"
 	},
 /turf/open/floor/plating,
@@ -126706,7 +126705,7 @@
 /area/science/mixing)
 "iyd" = (
 /turf/open/space,
-/area/space/nearstation)
+/area/space)
 "iQh" = (
 /obj/structure/bodycontainer/morgue{
 	dir = 1
@@ -126946,19 +126945,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/maintenance/port)
-"kzR" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/door/airlock/maintenance_hatch{
-	name = "Chapel Maintenance";
-	req_access_txt = "27"
-	},
-/turf/open/floor/plasteel,
-/area/chapel/office)
 "kLu" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -160100,7 +160086,7 @@ dYu
 dZg
 jhK
 jhK
-kzR
+dZN
 owr
 mXJ
 gJj