diff --git a/_maps/shuttles/independent/independent_shepherd.dmm b/_maps/shuttles/independent/independent_shepherd.dmm
index 36430872f33c4..b3e9e88c6d2c0 100644
--- a/_maps/shuttles/independent/independent_shepherd.dmm
+++ b/_maps/shuttles/independent/independent_shepherd.dmm
@@ -12,11 +12,6 @@
 /obj/item/clothing/suit/hooded/chaplain_hoodie,
 /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit,
 /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit,
-/obj/item/clothing/suit/chaplainsuit/nun,
-/obj/item/clothing/suit/chaplainsuit/nun,
-/obj/item/clothing/suit/chaplainsuit/holidaypriest,
-/obj/item/clothing/suit/chaplainsuit/bishoprobe,
-/obj/item/clothing/head/bishopmitre,
 /obj/structure/closet/wall{
 	dir = 8;
 	pixel_x = 30
@@ -25,15 +20,6 @@
 /obj/item/clothing/suit/hooded/chaplain_hoodie,
 /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit,
 /obj/item/clothing/suit/hooded/chaplainsuit/monkhabit,
-/obj/item/clothing/suit/chaplainsuit/nun,
-/obj/item/clothing/suit/chaplainsuit/nun,
-/obj/item/clothing/suit/chaplainsuit/monkrobeeast,
-/obj/item/clothing/suit/chaplainsuit/monkrobeeast,
-/obj/effect/turf_decal/siding/wood/end,
-/obj/item/clothing/head/nun_hood,
-/obj/item/clothing/head/nun_hood,
-/obj/item/clothing/head/nun_hood,
-/obj/item/clothing/head/nun_hood,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "am" = (
@@ -545,8 +531,7 @@
 /obj/item/honey_frame,
 /obj/item/queen_bee/bought,
 /obj/effect/turf_decal/siding/wood{
-	color = "#332521";
-	layer = 70
+	color = "#332521"
 	},
 /turf/open/floor/grass/fairy,
 /area/ship/crew/hydroponics)
@@ -892,7 +877,8 @@
 /obj/structure/window/reinforced/spawner/east,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/window/northleft{
-	req_one_access_txt = list("12","22","37")
+	req_one_access_txt = null;
+	req_one_access = list(12,22,37)
 	},
 /turf/open/floor/wood/ebony,
 /area/ship/crew/hydroponics)
@@ -1209,7 +1195,6 @@
 /obj/structure/closet/secure_closet/personal/cabinet,
 /obj/item/gun/ballistic/shotgun/doublebarrel,
 /obj/item/key/displaycase,
-/obj/item/soulstone/anybody/chaplain,
 /obj/item/megaphone,
 /obj/item/storage/box/beanbag,
 /turf/open/floor/carpet/nanoweave/blue,
@@ -1223,7 +1208,6 @@
 /turf/closed/wall/r_wall,
 /area/ship/crew/dorm/dormtwo)
 "kE" = (
-/obj/structure/fluff/divine/nexus,
 /turf/open/floor/carpet/nanoweave/blue,
 /area/ship/crew/chapel/office)
 "kH" = (
@@ -1380,7 +1364,7 @@
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 8
 	},
-/obj/structure/altar_of_gods,
+/obj/structure/fluff/divine/convertaltar,
 /turf/open/floor/wood,
 /area/ship/crew/chapel)
 "md" = (
@@ -1864,7 +1848,8 @@
 "qj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/window/northleft{
-	req_one_access_txt = list("12","22","37")
+	req_one_access_txt = null;
+	req_one_access = list(12,22,37)
 	},
 /turf/open/floor/ship/dirt/dark,
 /area/ship/crew/hydroponics)
@@ -1961,6 +1946,10 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},
+/obj/machinery/light_switch{
+	pixel_y = 23;
+	pixel_x = 11
+	},
 /turf/open/floor/wood,
 /area/ship/hallway/port)
 "qV" = (
@@ -2430,7 +2419,9 @@
 	color = "#332521";
 	dir = 5
 	},
-/obj/item/toy/plush/hornet/gay,
+/obj/item/toy/plush/hornet/gay{
+	layer = 3.1
+	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
@@ -2805,6 +2796,15 @@
 /obj/effect/turf_decal/corner/opaque/lightgrey/mono,
 /turf/open/floor/engine/air,
 /area/ship/engineering/atmospherics)
+"yZ" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -6;
+	pixel_y = -25
+	},
+/turf/open/floor/wood,
+/area/ship/hallway/starboard)
 "zt" = (
 /obj/structure/table/wood,
 /obj/item/storage/firstaid/regular,
@@ -2914,6 +2914,7 @@
 	color = "#332521";
 	dir = 10
 	},
+/obj/machinery/hydroponics/soil,
 /turf/open/floor/grass/fairy,
 /area/ship/crew/hydroponics)
 "Aq" = (
@@ -3121,10 +3122,6 @@
 	},
 /turf/open/floor/ship/dirt/dark,
 /area/ship/crew/hydroponics)
-"Cx" = (
-/obj/machinery/mineral/ore_redemption,
-/turf/open/floor/ship/dirt/dark,
-/area/ship/crew/canteen)
 "CL" = (
 /obj/effect/turf_decal/corner/opaque/bottlegreen/diagonal,
 /obj/machinery/power/apc/auto_name/directional/west,
@@ -3532,9 +3529,9 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/siding/wood{
-	color = "#332521";
-	layer = 70
+	color = "#332521"
 	},
+/obj/machinery/hydroponics/soil,
 /turf/open/floor/grass/fairy,
 /area/ship/crew/hydroponics)
 "Ga" = (
@@ -3567,7 +3564,6 @@
 /obj/structure/window/reinforced/spawner,
 /obj/item/storage/belt/utility/full/engi,
 /obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
 /obj/item/clothing/head/welding,
 /obj/item/clothing/head/welding,
 /obj/item/multitool,
@@ -3911,6 +3907,7 @@
 	color = "#332521";
 	dir = 6
 	},
+/obj/machinery/hydroponics/soil,
 /turf/open/floor/grass/fairy,
 /area/ship/crew/hydroponics)
 "Jv" = (
@@ -4086,8 +4083,7 @@
 /obj/item/honey_frame,
 /obj/item/queen_bee/bought,
 /obj/effect/turf_decal/siding/wood{
-	color = "#332521";
-	layer = 70
+	color = "#332521"
 	},
 /turf/open/floor/grass/fairy,
 /area/ship/crew/hydroponics)
@@ -4412,9 +4408,9 @@
 	},
 /obj/structure/flora/ausbushes/brflowers,
 /obj/effect/turf_decal/siding/wood{
-	color = "#332521";
-	layer = 70
+	color = "#332521"
 	},
+/obj/machinery/hydroponics/soil,
 /turf/open/floor/grass/fairy,
 /area/ship/crew/hydroponics)
 "NN" = (
@@ -4435,16 +4431,15 @@
 /obj/item/honey_frame,
 /obj/item/queen_bee/bought,
 /obj/effect/turf_decal/siding/wood{
-	color = "#332521";
-	layer = 70
+	color = "#332521"
 	},
 /turf/open/floor/grass/fairy,
 /area/ship/crew/hydroponics)
 "NX" = (
 /obj/effect/turf_decal/siding/wood{
-	color = "#332521";
-	layer = 70
+	color = "#332521"
 	},
+/obj/machinery/hydroponics/soil,
 /turf/open/floor/grass/fairy,
 /area/ship/crew/hydroponics)
 "NZ" = (
@@ -4567,7 +4562,8 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/item/toy/plush/lizardplushie{
 	pixel_x = -2;
-	pixel_y = 7
+	pixel_y = 7;
+	layer = 3.1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
@@ -4602,7 +4598,9 @@
 	color = "#332521";
 	dir = 9
 	},
-/obj/item/toy/plush/snakeplushie,
+/obj/item/toy/plush/snakeplushie{
+	layer = 3.1
+	},
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm/dormtwo)
 "PE" = (
@@ -4740,8 +4738,7 @@
 /obj/item/honey_frame,
 /obj/item/queen_bee/bought,
 /obj/effect/turf_decal/siding/wood{
-	color = "#332521";
-	layer = 70
+	color = "#332521"
 	},
 /turf/open/floor/grass/fairy,
 /area/ship/crew/hydroponics)
@@ -5102,13 +5099,9 @@
 "Ss" = (
 /obj/structure/table/wood,
 /obj/item/areaeditor/shuttle,
-/obj/item/nullrod,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
 /obj/machinery/firealarm/directional/east,
 /obj/machinery/light/directional/east,
 /turf/open/floor/carpet/nanoweave/blue,
@@ -5446,13 +5439,6 @@
 	},
 /turf/open/floor/wood,
 /area/ship/crew/library)
-"Vr" = (
-/obj/machinery/light_switch{
-	pixel_x = 6;
-	pixel_y = 23
-	},
-/turf/closed/wall/r_wall,
-/area/ship/engineering/atmospherics)
 "Vu" = (
 /obj/structure/chair/pew/left,
 /obj/effect/turf_decal/siding/wood{
@@ -5496,8 +5482,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/siding/wood{
-	color = "#332521";
-	layer = 70
+	color = "#332521"
 	},
 /turf/open/floor/grass/fairy,
 /area/ship/crew/hydroponics)
@@ -5512,7 +5497,8 @@
 	},
 /obj/item/toy/plush/goatplushie{
 	pixel_x = 2;
-	pixel_y = 3
+	pixel_y = 3;
+	layer = 3.1
 	},
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm/dormtwo)
@@ -5532,7 +5518,8 @@
 	dir = 1
 	},
 /obj/item/toy/plush/moth{
-	pixel_y = 3
+	pixel_y = 3;
+	layer = 3.1
 	},
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm/dormtwo)
@@ -5734,9 +5721,9 @@
 "XH" = (
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/effect/turf_decal/siding/wood{
-	color = "#332521";
-	layer = 70
+	color = "#332521"
 	},
+/obj/machinery/hydroponics/soil,
 /turf/open/floor/grass/fairy,
 /area/ship/crew/hydroponics)
 "XL" = (
@@ -5760,8 +5747,7 @@
 "XY" = (
 /obj/machinery/light/floor,
 /obj/effect/turf_decal/siding/wood{
-	color = "#332521";
-	layer = 70
+	color = "#332521"
 	},
 /turf/open/floor/grass/fairy,
 /area/ship/crew/hydroponics)
@@ -6758,7 +6744,7 @@ xj
 (21,1,1) = {"
 xj
 xj
-Vr
+Uf
 Ez
 jS
 QI
@@ -6826,7 +6812,7 @@ JL
 UW
 hw
 Vh
-FL
+yZ
 mB
 Ga
 oQ
@@ -7163,7 +7149,7 @@ xj
 xj
 ZG
 Te
-Cx
+Tf
 Tf
 fP
 Tf