diff --git a/_maps/shuttles/skyrat/ferry_skyrat.dmm b/_maps/shuttles/skyrat/ferry_skyrat.dmm
index 0748d48afda..a4a9ccb4a54 100644
--- a/_maps/shuttles/skyrat/ferry_skyrat.dmm
+++ b/_maps/shuttles/skyrat/ferry_skyrat.dmm
@@ -309,10 +309,9 @@
 	},
 /area/shuttle/transport)
 "AB" = (
-/obj/structure/closet/shuttle{
+/obj/machinery/computer/security/shuttle{
 	dir = 4
 	},
-/obj/item/mod/control/pre_equipped/responsory/security,
 /turf/open/floor/iron/shuttle/ferry{
 	dir = 8
 	},
@@ -336,16 +335,12 @@
 	},
 /area/shuttle/transport)
 "Co" = (
-/obj/structure/closet/shuttle{
-	dir = 8
-	},
-/obj/item/clothing/head/helmet/alt,
-/obj/item/clothing/head/helmet/alt,
-/obj/item/clothing/suit/armor/bulletproof,
-/obj/item/clothing/suit/armor/bulletproof,
 /obj/machinery/light/no_nightlight{
 	dir = 4
 	},
+/obj/structure/closet/shuttle/medical{
+	dir = 8
+	},
 /turf/open/floor/iron/shuttle/ferry{
 	dir = 8
 	},
@@ -482,6 +477,14 @@
 	icon_state = "17,3"
 	},
 /area/shuttle/transport)
+"Im" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/open/floor/iron/shuttle/ferry{
+	dir = 8
+	},
+/area/shuttle/transport)
 "Io" = (
 /turf/closed/wall/mineral/titanium/shuttle_wall/ferry{
 	dir = 8;
@@ -562,12 +565,9 @@
 	},
 /area/shuttle/transport)
 "Pz" = (
-/obj/structure/closet/shuttle{
+/obj/structure/closet/shuttle/emergency{
 	dir = 8
 	},
-/obj/item/gun/energy/e_gun/nuclear,
-/obj/item/gun/energy/e_gun/stun,
-/obj/item/gun/energy/e_gun/old,
 /turf/open/floor/iron/shuttle/ferry{
 	dir = 8
 	},
@@ -665,7 +665,7 @@
 	},
 /area/shuttle/transport)
 "Ud" = (
-/obj/structure/closet/shuttle/medical{
+/obj/machinery/computer/crew/shuttle{
 	dir = 4
 	},
 /turf/open/floor/iron/shuttle/ferry{
@@ -781,8 +781,8 @@ ON
 ur
 cK
 Ev
-oR
-oR
+Im
+hw
 AW
 Ew
 Vc