diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm
index 6247c6ce1347..e84ed8c00976 100644
--- a/maps/predship/huntership.dmm
+++ b/maps/predship/huntership.dmm
@@ -151,7 +151,11 @@
 /area/yautja)
 "ap" = (
 /obj/structure/stairs/perspective{
-	color = "#b29082"
+	color = "#b29082";
+	icon_state = "p_stair_full"
+	},
+/obj/structure/platform/kutjevo{
+	dir = 8
 	},
 /turf/open/shuttle/predship,
 /area/yautja)
@@ -279,6 +283,9 @@
 /obj/item/hunting_trap,
 /obj/item/hunting_trap,
 /obj/item/hunting_trap,
+/obj/structure/platform/kutjevo{
+	dir = 8
+	},
 /turf/open/floor/corsat/squareswood/north,
 /area/yautja)
 "aD" = (
@@ -455,6 +462,16 @@
 /obj/item/stack/sheet/mineral/sandstone/large_stack,
 /turf/open/floor/corsat/squareswood/north,
 /area/yautja)
+"bh" = (
+/obj/structure/platform/kutjevo{
+	dir = 4
+	},
+/obj/structure/stairs/perspective{
+	color = "#b29082";
+	icon_state = "p_stair_full"
+	},
+/turf/open/shuttle/predship,
+/area/yautja)
 "bj" = (
 /turf/closed/wall/huntership,
 /area/yautja)
@@ -713,14 +730,17 @@
 /turf/open/floor/corsat/squareswood/north,
 /area/yautja)
 "bZ" = (
-/obj/item/storage/fancy/candle_box,
-/turf/open/floor/corsat/squareswood/north,
+/obj/structure/platform_decoration/kutjevo{
+	dir = 4
+	},
+/turf/open/shuttle/predship,
 /area/yautja)
 "ca" = (
-/obj/structure/barricade/handrail/strata{
-	dir = 1
+/obj/structure/stairs/perspective{
+	color = "#b29082";
+	icon_state = "p_stair_full"
 	},
-/turf/open/gm/dirtgrassborder/weedable/grass1,
+/turf/open/shuttle/predship,
 /area/yautja)
 "cb" = (
 /obj/structure/machinery/door_control{
@@ -736,9 +756,6 @@
 /obj/structure/barricade/handrail/strata{
 	dir = 8
 	},
-/obj/structure/barricade/handrail/strata{
-	dir = 1
-	},
 /turf/open/gm/dirtgrassborder/grassdirt_corner/north_west,
 /area/yautja)
 "cd" = (
@@ -1405,16 +1422,15 @@
 /turf/open/space/basic,
 /area/space)
 "dS" = (
-/obj/structure/prop/brazier/torch{
-	pixel_y = -2
+/obj/structure/platform/kutjevo{
+	dir = 1
 	},
-/turf/closed/wall/mineral/sandstone/runed/decor,
+/turf/open/shuttle/predship,
 /area/yautja)
 "eg" = (
 /obj/structure/barricade/handrail/strata{
 	dir = 4
 	},
-/obj/structure/barricade/handrail/strata,
 /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
 /area/yautja)
 "er" = (
@@ -1534,7 +1550,6 @@
 /turf/open/floor/corsat/squareswood/north,
 /area/yautja)
 "fS" = (
-/obj/structure/barricade/handrail/strata,
 /turf/open/gm/dirtgrassborder/weedable/grass1,
 /area/yautja)
 "gb" = (
@@ -1622,22 +1637,18 @@
 /turf/open/floor/corsat/squareswood/north,
 /area/yautja)
 "ha" = (
-/obj/structure/barricade/handrail/strata,
 /obj/structure/barricade/handrail/strata{
 	dir = 8
 	},
 /turf/open/gm/dirtgrassborder/weedable/grass1,
 /area/yautja)
 "hI" = (
-/obj/structure/shuttle/window{
-	color = "#6b675e"
+/obj/structure/window/framed/colony/reinforced/hull{
+	color = "#aba9a9"
 	},
 /turf/open/floor/grey_dark2,
 /area/yautja)
 "hJ" = (
-/obj/structure/barricade/handrail/strata{
-	dir = 1
-	},
 /obj/structure/barricade/handrail/strata{
 	dir = 4
 	},
@@ -1662,6 +1673,16 @@
 /obj/item/reagent_container/food/snacks/sliceable/xenomeatbread,
 /turf/open/floor/darkred2/west,
 /area/yautja)
+"iL" = (
+/obj/structure/stairs/perspective{
+	color = "#b29082";
+	icon_state = "p_stair_full"
+	},
+/obj/structure/platform/kutjevo{
+	dir = 4
+	},
+/turf/open/shuttle/predship,
+/area/yautja)
 "iV" = (
 /obj/structure/surface/table/reinforced/prison{
 	color = "#6b675e"
@@ -1844,6 +1865,16 @@
 	},
 /turf/open/floor/strata/grey_multi_tiles,
 /area/yautja)
+"og" = (
+/obj/structure/platform/kutjevo{
+	dir = 8
+	},
+/obj/structure/stairs/perspective{
+	color = "#b29082";
+	icon_state = "p_stair_full"
+	},
+/turf/open/shuttle/predship,
+/area/yautja)
 "ov" = (
 /obj/structure/surface/rack{
 	color = "#6b675e";
@@ -1896,10 +1927,8 @@
 /turf/open/floor/corsat/squareswood/north,
 /area/yautja)
 "rH" = (
-/obj/structure/shuttle/window{
-	color = "#6b675e"
-	},
-/turf/open/floor/corsat/squareswood/north,
+/obj/structure/barricade/handrail/strata,
+/turf/open/shuttle/predship,
 /area/yautja)
 "rY" = (
 /obj/structure/surface/rack{
@@ -2154,7 +2183,6 @@
 /obj/structure/barricade/handrail/strata{
 	dir = 8
 	},
-/obj/structure/barricade/handrail/strata,
 /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
 /area/yautja)
 "xn" = (
@@ -2573,11 +2601,10 @@
 /turf/open/shuttle/predship,
 /area/yautja)
 "Ip" = (
-/obj/structure/barricade/handrail/strata,
 /obj/structure/barricade/handrail/strata{
-	dir = 4
+	dir = 1
 	},
-/turf/open/gm/dirtgrassborder/weedable/grass1,
+/turf/open/shuttle/predship,
 /area/yautja)
 "Iw" = (
 /obj/structure/machinery/door/airlock/yautja/secure{
@@ -2789,13 +2816,10 @@
 /turf/open/floor/corsat/squareswood/north,
 /area/yautja)
 "QK" = (
-/obj/structure/barricade/handrail/strata{
-	dir = 1
-	},
-/obj/structure/barricade/handrail/strata{
+/obj/structure/platform_decoration/kutjevo{
 	dir = 8
 	},
-/turf/open/gm/dirtgrassborder/weedable/grass1,
+/turf/open/shuttle/predship,
 /area/yautja)
 "Rq" = (
 /obj/structure/machinery/prop/almayer/CICmap/yautja,
@@ -2817,6 +2841,24 @@
 	},
 /turf/open/shuttle/predship,
 /area/yautja)
+"SM" = (
+/obj/structure/surface/rack{
+	color = "#6b675e";
+	layer = 2.79
+	},
+/obj/item/hunting_trap,
+/obj/item/hunting_trap,
+/obj/item/hunting_trap,
+/obj/item/hunting_trap,
+/obj/item/hunting_trap,
+/obj/item/hunting_trap,
+/obj/item/hunting_trap,
+/obj/item/hunting_trap,
+/obj/structure/platform/kutjevo{
+	dir = 4
+	},
+/turf/open/floor/corsat/squareswood/north,
+/area/yautja)
 "Ut" = (
 /obj/structure/surface/rack{
 	color = "#6b675e";
@@ -2963,9 +3005,6 @@
 /turf/open/shuttle/predship,
 /area/yautja)
 "Xs" = (
-/obj/structure/barricade/handrail/strata{
-	dir = 1
-	},
 /obj/structure/barricade/handrail/strata{
 	dir = 4
 	},
@@ -4990,8 +5029,8 @@ aa
 ae
 bj
 bN
-aC
-cP
+SM
+QK
 bL
 bj
 bL
@@ -5006,9 +5045,9 @@ wQ
 cP
 bL
 wQ
-rH
+Fy
 bd
-rH
+Fy
 wQ
 bL
 cP
@@ -5063,7 +5102,7 @@ ad
 bj
 ag
 GP
-cP
+dS
 bL
 bj
 bL
@@ -5134,8 +5173,8 @@ bj
 bj
 bj
 ay
-ap
-cP
+og
+bZ
 bL
 bj
 eS
@@ -5206,8 +5245,8 @@ aa
 ac
 bj
 aA
-ap
-cP
+bh
+QK
 bL
 bj
 nT
@@ -5227,7 +5266,7 @@ cP
 bL
 bL
 bL
-bZ
+bL
 JH
 yr
 bj
@@ -5277,9 +5316,9 @@ aa
 aa
 ad
 bj
+ag
 YM
-ap
-cP
+dS
 bL
 bj
 fg
@@ -5291,7 +5330,7 @@ cP
 bL
 bj
 JH
-ab
+bL
 cI
 bL
 bL
@@ -5299,7 +5338,7 @@ cP
 bL
 bL
 mv
-xO
+bL
 JH
 yr
 bj
@@ -5351,7 +5390,7 @@ bj
 bj
 ah
 ap
-cP
+bZ
 bL
 bj
 bj
@@ -5364,13 +5403,13 @@ bj
 bj
 JH
 bQ
+ab
 cP
 cP
 cP
 cP
 cP
-cP
-cP
+xO
 Dk
 JH
 yr
@@ -5422,7 +5461,7 @@ aa
 ac
 bj
 ai
-ap
+ca
 cP
 bL
 bL
@@ -5437,11 +5476,11 @@ JH
 JH
 bL
 cP
+cP
 bL
 bL
 bL
-bL
-bL
+cP
 cP
 bL
 JH
@@ -5459,13 +5498,13 @@ bj
 cP
 bL
 bL
-cP
+rH
 cc
 uf
 uf
 uf
 wW
-cP
+Ip
 bL
 bL
 bj
@@ -5494,8 +5533,8 @@ aa
 ae
 bj
 aj
-ap
-cP
+iL
+QK
 cP
 cP
 ar
@@ -5530,15 +5569,15 @@ cP
 Wg
 bL
 bL
-cP
-QK
+rH
+ha
 RS
 ZI
 Ok
 Br
 dw
 ha
-cP
+Ip
 bL
 bL
 ct
@@ -5565,9 +5604,9 @@ aa
 aa
 ae
 bj
+ag
+GP
 dS
-ap
-cP
 bL
 bL
 ti
@@ -5602,22 +5641,22 @@ bL
 bj
 cK
 cP
-cP
-ca
+rH
+fS
 RS
 Ok
 GM
 Ok
 dw
 fS
+Ip
 cP
 cP
-cP
-ti
+sx
 JH
 Rq
 JH
-ti
+sx
 cP
 bL
 bj
@@ -5639,7 +5678,7 @@ ae
 bj
 ak
 ap
-cP
+bZ
 cP
 cP
 ar
@@ -5674,15 +5713,15 @@ cP
 Wg
 bL
 bL
-cP
+rH
 hJ
 RS
 lw
 Ok
 nd
 dw
+hJ
 Ip
-cP
 bL
 bL
 ct
@@ -5710,7 +5749,7 @@ aa
 ad
 bj
 al
-ap
+ca
 cP
 bL
 bL
@@ -5725,11 +5764,11 @@ JH
 JH
 bL
 cP
+cP
 bL
 bL
 bL
-bL
-bL
+cP
 cP
 bL
 JH
@@ -5747,13 +5786,13 @@ bj
 cP
 bL
 bL
-cP
+rH
 Xs
 zg
 zg
 zg
 eg
-cP
+Ip
 bL
 bL
 bj
@@ -5782,8 +5821,8 @@ bj
 bj
 bj
 am
-ap
-cP
+iL
+QK
 bL
 bj
 bj
@@ -5796,13 +5835,13 @@ bj
 bj
 JH
 cd
+cz
 cP
 cP
 cP
 cP
 cP
-cP
-cP
+Mb
 Gk
 JH
 bL
@@ -5853,9 +5892,9 @@ aa
 aa
 ac
 bj
+ag
 YM
-ap
-cP
+dS
 bL
 bj
 fg
@@ -5867,7 +5906,7 @@ cP
 bL
 bj
 JH
-cz
+bL
 kA
 bL
 bL
@@ -5875,7 +5914,7 @@ cP
 bL
 bL
 uZ
-Mb
+bL
 JH
 bL
 bj
@@ -5927,7 +5966,7 @@ ad
 bj
 ay
 ap
-cP
+bZ
 bL
 bj
 nT
@@ -5998,8 +6037,8 @@ bj
 bj
 bj
 aA
-ap
-cP
+iL
+QK
 bL
 bj
 ww
@@ -6071,7 +6110,7 @@ ac
 bj
 ag
 GP
-cP
+dS
 bL
 bj
 bL
@@ -6143,7 +6182,7 @@ ae
 bj
 bN
 aC
-cP
+bZ
 bL
 bj
 bL
@@ -6158,9 +6197,9 @@ cQ
 cP
 bL
 cH
-ti
+sx
 bd
-ti
+sx
 uj
 bL
 cP