diff --git a/_maps/shuttles/nanotrasen/nanotrasen_cheyenne.dmm b/_maps/shuttles/nanotrasen/nanotrasen_cheyenne.dmm
index a0ae24a7d2ba..cefc8175f46d 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_cheyenne.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_cheyenne.dmm
@@ -891,6 +891,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
+/obj/machinery/computer/helm/viewscreen/directional/south,
 /turf/open/floor/carpet/green,
 /area/ship/crew)
 "ei" = (
@@ -1824,15 +1825,6 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
-"jq" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/opaque/brown/half,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_y = -18
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
 "jr" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
@@ -3104,9 +3096,6 @@
 	dir = 8
 	},
 /obj/item/radio/intercom/directional/south,
-/obj/structure/closet/secure_closet/head_of_personnel{
-	name = "XO's locker"
-	},
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/crewtwo)
 "pT" = (
@@ -4089,6 +4078,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
+"tU" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/corner/opaque/brown/half,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_y = -18
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "tV" = (
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
@@ -4268,6 +4266,14 @@
 /obj/machinery/door/morgue,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/medical)
+"uN" = (
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/green/arrow_ccw,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "uO" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/railing,
@@ -4513,14 +4519,6 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
-"wh" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 4
-	},
-/obj/effect/turf_decal/trimline/opaque/green/arrow_ccw,
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating,
-/area/ship/engineering/engine)
 "wj" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
@@ -5195,6 +5193,7 @@
 /obj/structure/bed,
 /obj/item/bedsheet/captain,
 /obj/structure/curtain/cloth/fancy,
+/obj/item/toy/figure/captain,
 /turf/open/floor/carpet/green,
 /area/ship/crew)
 "zp" = (
@@ -8177,6 +8176,7 @@
 /turf/open/floor/plating,
 /area/ship/hangar)
 "MH" = (
+/obj/structure/displaycase/captain,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "MI" = (
@@ -9240,14 +9240,16 @@
 	name = "XO's beret"
 	},
 /obj/item/cartridge/head_of_personnel,
-/obj/item/storage/box/silver_ids,
 /obj/item/storage/box/ids,
 /obj/item/megaphone/command,
 /obj/item/assembly/flash,
 /obj/item/clothing/glasses/sunglasses,
 /obj/item/clothing/neck/petcollar,
 /obj/item/pet_carrier,
-/obj/item/storage/photo_album/HoP,
+/obj/item/gun/energy/e_gun/mini,
+/obj/item/storage/photo_album/HoP{
+	name = "photo album (XO)"
+	},
 /turf/open/floor/carpet/royalblue,
 /area/ship/crew/crewtwo)
 "Rq" = (
@@ -9709,31 +9711,17 @@
 /area/ship/security)
 "Tu" = (
 /obj/machinery/light/directional/west,
-/obj/structure/closet/secure_closet{
-	icon_state = "cap";
-	name = "\proper captain's locker";
-	req_access_txt = "20"
+/obj/machinery/light_switch{
+	pixel_y = 23
 	},
-/obj/item/clothing/gloves/color/captain/nt,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/head/centcom_cap,
+/obj/item/gun/energy/e_gun/adv_stopping,
 /obj/item/stock_parts/cell/gun/upgraded,
+/obj/item/clothing/gloves/combat,
 /obj/item/clothing/head/beret/centcom_formal,
-/obj/item/clothing/suit/hooded/wintercoat/centcom,
-/obj/item/clothing/under/rank/centcom/centcom_skirt,
-/obj/item/clothing/under/rank/centcom/commander,
-/obj/item/clothing/suit/toggle/armor/vest/centcom_formal,
+/obj/item/clothing/gloves/color/captain/nt,
 /obj/item/megaphone/command,
-/obj/item/door_remote/captain,
-/obj/item/gun/energy/e_gun/adv_stopping,
-/obj/item/storage/belt/sabre,
-/obj/item/clothing/under/rank/centcom/officer,
-/obj/item/storage/backpack/captain,
-/obj/item/clothing/neck/cloak/cap,
-/obj/item/radio/headset/heads/captain/alt,
-/obj/machinery/light_switch{
-	pixel_y = 23
-	},
+/obj/structure/closet/secure_closet/captains,
+/obj/item/pen/fountain/captain,
 /turf/open/floor/carpet/green,
 /area/ship/crew)
 "Tv" = (
@@ -10022,7 +10010,9 @@
 "Uq" = (
 /obj/item/clothing/suit/space/hardsuit/swat/captain,
 /obj/machinery/suit_storage_unit/inherit,
-/obj/machinery/computer/helm/viewscreen/directional/north,
+/obj/structure/plaque/static_plaque/golden/captain{
+	pixel_y = 32
+	},
 /turf/open/floor/carpet/green,
 /area/ship/crew)
 "Ur" = (
@@ -11332,7 +11322,7 @@ rL
 Rh
 rL
 DH
-wh
+uN
 DC
 QS
 hm
@@ -12347,7 +12337,7 @@ bd
 bO
 kd
 OV
-jq
+tU
 st
 lE
 FO