diff --git a/_maps/configs/pgf_crying_sun.json b/_maps/configs/pgf_crying_sun.json
index 7115072cb9fa..fd8bfa3347b4 100644
--- a/_maps/configs/pgf_crying_sun.json
+++ b/_maps/configs/pgf_crying_sun.json
@@ -40,6 +40,7 @@
 		},
 		"Marine Lieutenant": {
 			"outfit": "/datum/outfit/job/gezena/hos",
+			"officer": true,
 			"slots": 1
 		},
 		"Marine": {
diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm
index ca6e86f10345..c8842c88e569 100644
--- a/_maps/shuttles/pgf/pgf_crying_sun.dmm
+++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm
@@ -1114,9 +1114,6 @@
 /obj/item/trash/sosjerky{
 	pixel_x = 4
 	},
-/obj/item/trash/popcorn{
-	pixel_y = -7
-	},
 /obj/item/trash/raisins{
 	pixel_x = 5;
 	pixel_y = 3
@@ -1496,16 +1493,20 @@
 /area/ship/external/dark)
 "mk" = (
 /obj/structure/table/wood,
-/obj/item/toy/plush/sharai{
-	pixel_y = 3;
-	pixel_x = -7
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/obj/item/megaphone/command{
+	pixel_x = -5;
+	pixel_y = 7
 	},
 /obj/item/flashlight/lamp/green{
 	pixel_y = 3;
 	pixel_x = 7
 	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 5
+/obj/item/toy/plush/sharai{
+	pixel_x = -3;
+	pixel_y = 1
 	},
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm/dormthree)
@@ -2661,6 +2662,10 @@
 "wu" = (
 /obj/effect/turf_decal/corner/opaque/lime/mono,
 /obj/machinery/telecomms/relay/preset/pgf,
+/obj/machinery/door/window/survival_pod{
+	dir = 1
+	},
+/obj/structure/window/reinforced/survival_pod/spawner/west,
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/office)
 "ww" = (
@@ -3015,6 +3020,9 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/chair/handrail{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "zz" = (
@@ -3426,6 +3434,9 @@
 	dir = 6
 	},
 /obj/machinery/light/directional/west,
+/obj/structure/chair/handrail{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Cz" = (
@@ -4755,7 +4766,11 @@
 /area/ship/bridge)
 "Mu" = (
 /obj/effect/turf_decal/corner/opaque/lime/mono,
-/obj/machinery/vending/modularpc,
+/obj/machinery/blackbox_recorder,
+/obj/machinery/door/window/survival_pod{
+	dir = 1
+	},
+/obj/structure/window/reinforced/survival_pod/spawner/west,
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/office)
 "Mw" = (
@@ -4990,11 +5005,12 @@
 "Ny" = (
 /obj/machinery/autolathe,
 /obj/machinery/light/directional/east,
+/obj/item/radio/intercom/directional/south,
 /obj/item/stack/sheet/glass/twenty{
 	pixel_x = 6;
 	pixel_y = 2
 	},
-/obj/item/radio/intercom/directional/south,
+/obj/item/stack/sheet/metal/ten,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "Nz" = (
@@ -5183,18 +5199,6 @@
 	pixel_y = 1;
 	pixel_x = 1
 	},
-/obj/item/storage/belt/military/gezena{
-	pixel_y = -1;
-	pixel_x = 1
-	},
-/obj/item/storage/belt/military/gezena{
-	pixel_y = -1;
-	pixel_x = 1
-	},
-/obj/item/storage/belt/military/gezena{
-	pixel_y = -1;
-	pixel_x = 1
-	},
 /obj/item/clothing/head/helmet/gezena{
 	pixel_y = -11
 	},
@@ -5204,6 +5208,18 @@
 /obj/item/clothing/head/helmet/gezena{
 	pixel_y = -11
 	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 1;
+	pixel_y = -1
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 1;
+	pixel_y = -1
+	},
+/obj/item/storage/belt/military/gezena{
+	pixel_x = 1;
+	pixel_y = -1
+	},
 /turf/open/floor/vault,
 /area/ship/security/armory)
 "OY" = (
@@ -5630,9 +5646,11 @@
 /turf/open/floor/mineral/titanium,
 /area/ship/medical)
 "RN" = (
-/obj/machinery/vending/cigarette,
 /obj/effect/turf_decal/corner/opaque/lime/mono,
 /obj/machinery/light/directional/north,
+/obj/machinery/vending/modularpc{
+	pixel_x = -1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "RP" = (
@@ -5946,45 +5964,58 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/item/clothing/neck/cloak/gezena/captain{
-	pixel_y = -5;
-	pixel_x = 1
+/obj/structure/closet/secure_closet{
+	icon_state = "blueshield";
+	req_access = list(20);
+	name = "captain's locker"
 	},
-/obj/item/clothing/gloves/gezena/captain{
-	pixel_y = 4
+/obj/item/storage/lockbox/medal{
+	pixel_y = -20;
+	pixel_x = null
 	},
-/obj/item/clothing/under/gezena/captain{
+/obj/item/storage/backpack/satchel/cap{
+	pixel_y = -18;
+	pixel_x = -8
+	},
+/obj/item/storage/backpack/duffelbag/captain{
+	pixel_x = 6;
+	pixel_y = -17
+	},
+/obj/item/storage/guncase/pistol/kalixpistol{
+	pixel_y = -13;
+	pixel_x = -1
+	},
+/obj/item/clothing/neck/cloak/gezena/captain{
 	pixel_y = -4;
-	pixel_x = -10
+	pixel_x = -8
 	},
 /obj/item/clothing/suit/armor/gezena/captain{
-	pixel_y = -3;
-	pixel_x = 9
+	pixel_y = -2;
+	pixel_x = 8
 	},
-/obj/item/clothing/head/gezena/captain{
-	pixel_y = 6
+/obj/item/storage/belt/sabre{
+	pixel_y = -9;
+	pixel_x = -4
 	},
-/obj/item/storage/backpack/duffelbag/captain{
-	pixel_x = 6;
-	pixel_y = -14
+/obj/item/screwdriver{
+	pixel_y = -12
 	},
-/obj/item/storage/backpack/satchel/cap{
-	pixel_y = -18;
-	pixel_x = -8
+/obj/item/clothing/under/gezena/captain{
+	pixel_y = 3
 	},
-/obj/item/storage/belt/sabre,
-/obj/item/storage/lockbox/medal,
-/obj/item/radio/headset/pgf/captain,
-/obj/item/radio/headset/pgf/alt/captain,
-/obj/structure/closet/secure_closet{
-	icon_state = "blueshield";
-	req_access = list(20);
-	name = "captain's locker"
+/obj/item/radio/headset/pgf/alt/captain{
+	pixel_x = 10;
+	pixel_y = 4
+	},
+/obj/item/radio/headset/pgf/captain{
+	pixel_x = -10
 	},
-/obj/item/gun/energy/kalix/pistol{
-	pixel_y = -16
+/obj/item/clothing/gloves/gezena/captain{
+	pixel_y = 11
+	},
+/obj/item/clothing/head/gezena/captain{
+	pixel_y = 12
 	},
-/obj/item/screwdriver,
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm/dormthree)
 "UH" = (
@@ -6182,10 +6213,17 @@
 	dir = 1
 	},
 /obj/machinery/light/directional/north,
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_y = -2;
+/obj/item/storage/backpack/satchel/sec{
+	pixel_x = -8;
+	pixel_y = -17
+	},
+/obj/item/storage/backpack/duffelbag/sec{
+	pixel_y = -16;
 	pixel_x = 3
 	},
+/obj/item/storage/guncase/pistol/kalixpistol{
+	pixel_y = -13
+	},
 /obj/item/clothing/shoes/combat/gezena{
 	pixel_x = 3;
 	pixel_y = -7
@@ -6205,37 +6243,31 @@
 /obj/item/clothing/suit/armor/gezena/marinecoat{
 	pixel_y = 8
 	},
+/obj/item/radio/headset/pgf/captain{
+	pixel_x = -5;
+	pixel_y = 7
+	},
 /obj/item/radio/headset/pgf/alt/captain{
 	pixel_y = 11;
 	pixel_x = 5
 	},
-/obj/item/storage/belt/military/gezena{
-	pixel_y = 1
-	},
-/obj/item/storage/backpack/satchel/sec{
-	pixel_x = -8;
-	pixel_y = -17
-	},
-/obj/item/radio/headset/pgf/captain{
-	pixel_x = -2;
-	pixel_y = 9
-	},
-/obj/item/storage/backpack/duffelbag/sec{
-	pixel_y = -13
+/obj/item/clothing/suit/armor/gezena/marine{
+	pixel_y = 8
 	},
-/obj/item/gun/energy/kalix/pistol{
-	pixel_y = -9;
-	pixel_x = -3
+/obj/item/storage/belt/military/gezena{
+	pixel_y = 6
 	},
 /obj/item/clothing/head/helmet/gezena{
-	pixel_x = -11
-	},
-/obj/item/clothing/suit/armor/gezena/marine{
-	pixel_y = 8
+	pixel_y = 14;
+	pixel_x = -1
 	},
 /obj/item/clothing/head/gezena/flap/marine/lead{
-	pixel_y = 10;
-	pixel_x = -10
+	pixel_y = 1;
+	pixel_x = 10
+	},
+/obj/item/clothing/gloves/gezena/marine{
+	pixel_x = 3;
+	pixel_y = -6
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm/dormtwo)
@@ -6334,7 +6366,12 @@
 /obj/effect/spawner/random/food_or_drink/ration,
 /obj/effect/spawner/random/food_or_drink/ration,
 /obj/effect/spawner/random/food_or_drink/ration,
-/obj/item/storage/cans/sixbeer,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "WQ" = (
diff --git a/code/modules/clothing/outfits/factions/gezena.dm b/code/modules/clothing/outfits/factions/gezena.dm
index e3dd80457305..efadbece4bab 100644
--- a/code/modules/clothing/outfits/factions/gezena.dm
+++ b/code/modules/clothing/outfits/factions/gezena.dm
@@ -22,7 +22,7 @@
 
 /datum/outfit/job/gezena/assistant/bridge
 	name = "PGF - Bridge Crew"
-	id_assignment = "Bridge Crew"
+	id_assignment = "Helmsman"
 	jobtype = /datum/job/head_of_personnel
 
 /datum/outfit/job/gezena/engineer