diff --git a/_maps/configs/pgf_crying_sun.json b/_maps/configs/pgf_crying_sun.json
index d4eb67b1fb50..23114c8aa274 100644
--- a/_maps/configs/pgf_crying_sun.json
+++ b/_maps/configs/pgf_crying_sun.json
@@ -21,7 +21,7 @@
 			"officer": true,
 			"slots": 1
 		},
-		"Bridge Crew": {
+		"Helmsman": {
 			"outfit": "/datum/outfit/job/gezena/assistant/bridge",
 			"slots": 1
 		},
@@ -37,7 +37,7 @@
 			"outfit": "/datum/outfit/job/gezena/assistant",
 			"slots": 2
 		},
-		"Marine Sergeant": {
+		"Marine Lieutenant": {
 			"outfit": "/datum/outfit/job/gezena/hos",
 			"slots": 1
 		},
diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm
index e016ef725525..c0584df1e945 100644
--- a/_maps/shuttles/pgf/pgf_crying_sun.dmm
+++ b/_maps/shuttles/pgf/pgf_crying_sun.dmm
@@ -1,4 +1,18 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ae" = (
+/obj/structure/cable/blue{
+	icon_state = "0-4"
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "lib_engine_blast"
+	},
+/obj/machinery/power/shuttle/engine/fire{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
 "ai" = (
 /obj/structure/railing,
 /obj/structure/cable/yellow{
@@ -129,6 +143,13 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
+"bi" = (
+/obj/machinery/computer/crew{
+	dir = 8
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
 "bl" = (
 /obj/effect/turf_decal/industrial/traffic,
 /obj/machinery/power/apc/auto_name/directional/north,
@@ -215,10 +236,6 @@
 /obj/item/storage/box/flashes{
 	pixel_y = -1
 	},
-/obj/item/screwdriver{
-	pixel_x = -8;
-	pixel_y = -5
-	},
 /obj/item/screwdriver{
 	pixel_x = -5;
 	pixel_y = -5
@@ -235,10 +252,6 @@
 	pixel_x = 4;
 	pixel_y = -5
 	},
-/obj/item/screwdriver{
-	pixel_x = 7;
-	pixel_y = -5
-	},
 /obj/structure/closet/secure_closet/wall/directional/west{
 	icon_state = "sec_wall";
 	name = "equipment locker"
@@ -406,9 +419,6 @@
 	dir = 6
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -416,13 +426,28 @@
 /area/ship/engineering/engines/starboard)
 "du" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 6
+	dir = 6;
+	mode = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
 /turf/open/floor/engine/hull,
 /area/ship/external/dark)
+"dv" = (
+/obj/structure/cable/blue{
+	icon_state = "0-4"
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "lib_engine_blast"
+	},
+/obj/machinery/power/shuttle/engine/fire{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
 "dz" = (
 /obj/effect/turf_decal/corner_steel_grid{
 	dir = 10
@@ -464,10 +489,10 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/hallway/port)
 "dK" = (
-/obj/machinery/computer/cargo{
-	dir = 8
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
 	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/effect/turf_decal/floordetail/tiled,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -523,9 +548,6 @@
 	dir = 8;
 	name = "engine fuel pump"
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/machinery/camera/autoname{
 	dir = 2;
 	network = list("GEC")
@@ -1010,12 +1032,27 @@
 /obj/machinery/light/directional/north,
 /turf/open/floor/plating,
 /area/ship/engineering)
+"hX" = (
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "lib_bridge_shut"
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
 "if" = (
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
 /obj/machinery/porta_turret/ship/weak{
-	dir = 4
+	dir = 4;
+	mode = 1
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating/airless,
@@ -1166,12 +1203,12 @@
 /area/ship/hangar/starboard)
 "jm" = (
 /obj/machinery/holopad/emergency,
-/obj/effect/turf_decal/spline/fancy/opaque/lime{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/lime{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "jt" = (
@@ -1253,7 +1290,7 @@
 	},
 /obj/machinery/button/door{
 	id = "lib_armory_1";
-	name = "Sergeant Access";
+	name = "Lieutenant Access";
 	dir = 4;
 	pixel_x = -20;
 	pixel_y = -5;
@@ -1421,7 +1458,7 @@
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/corner/opaque/lime/mono,
 /obj/machinery/camera/autoname{
-	dir = 1
+	dir = 10
 	},
 /obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/mono/dark,
@@ -1457,14 +1494,13 @@
 	pixel_x = 4;
 	pixel_y = 4
 	},
+/obj/machinery/light/directional/north,
 /obj/item/reagent_containers/food/drinks/bottle/whiskey{
 	pixel_x = -10;
 	pixel_y = 3;
-	name = "'Anastheasia'";
+	name = "'Anesthesia'";
 	desc = "A bottle of Git's with the word 'Anastheasia' written over it in marker."
 	},
-/obj/machinery/light/directional/north,
-/obj/item/clothing/neck/stethoscope,
 /turf/open/floor/mineral/titanium,
 /area/ship/medical)
 "mL" = (
@@ -1473,7 +1509,7 @@
 	},
 /obj/structure/closet/crate{
 	icon_state = "wooden";
-	name = "myning geer";
+	name = "mining gear";
 	desc = "A rectangular steel crate with 'myning geer' spelled out in crayon on top."
 	},
 /obj/item/storage/bag/ore{
@@ -1608,9 +1644,12 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "no" = (
-/obj/structure/bed,
-/obj/item/bedsheet/cosmos,
 /obj/structure/curtain/cloth/grey,
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/bed,
+/obj/item/bedsheet/brown,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/dorm)
 "nv" = (
@@ -1665,6 +1704,26 @@
 	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/crew/cryo)
+"om" = (
+/obj/effect/turf_decal/corner/opaque/lime/mono,
+/obj/structure/table/reinforced,
+/obj/item/clipboard{
+	pixel_x = -9;
+	pixel_y = -1
+	},
+/obj/item/pen{
+	pixel_x = -10;
+	pixel_y = 1
+	},
+/obj/item/gps{
+	pixel_x = 8;
+	pixel_y = -2
+	},
+/obj/item/binoculars{
+	pixel_y = 9
+	},
+/turf/open/floor/plasteel/mono/dark,
+/area/ship/bridge)
 "ou" = (
 /obj/structure/railing{
 	dir = 8
@@ -1784,22 +1843,22 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/obj/structure/table,
 /obj/item/toy/plush/knight{
-	pixel_y = 10;
+	pixel_y = 11;
 	pixel_x = -10
 	},
 /obj/item/toy/plush/hornet{
-	pixel_y = 8;
-	pixel_x = -3
+	pixel_y = 10;
+	pixel_x = -2
 	},
 /obj/item/toy/plush/mora{
-	pixel_y = 4;
-	pixel_x = 5
+	pixel_y = 6;
+	pixel_x = 6
 	},
 /obj/effect/turf_decal/corner_steel_grid{
 	dir = 10
 	},
+/obj/structure/dresser,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/dorm)
 "oX" = (
@@ -1848,6 +1907,22 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
+"pK" = (
+/obj/structure/cable/blue{
+	icon_state = "0-8"
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/starboard)
 "pW" = (
 /obj/machinery/computer/helm/viewscreen/directional/west,
 /obj/effect/turf_decal/siding/wood{
@@ -1883,15 +1958,8 @@
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm/dormthree)
 "qj" = (
-/obj/structure/table/reinforced,
-/obj/item/desk_flag/gezena{
-	pixel_x = 9;
-	pixel_y = 1
-	},
-/obj/machinery/recharger{
-	pixel_y = 1;
-	pixel_x = -6
-	},
+/obj/structure/chair/comfy/shuttle,
+/obj/effect/turf_decal/floordetail/tiled,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "qm" = (
@@ -1904,7 +1972,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "qp" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
 /obj/structure/cable{
 	icon_state = "1-10"
 	},
@@ -1915,6 +1982,9 @@
 	dir = 1
 	},
 /obj/item/paper/guides/jobs/engi/combustion_thruster,
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/starboard)
 "qy" = (
@@ -2104,11 +2174,6 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/engineering/engines/starboard)
 "sF" = (
-/obj/machinery/door/airlock/security/glass{
-	req_one_access_txt = "1";
-	req_access = list(1);
-	name = "Checkpoint"
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -2117,6 +2182,10 @@
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/security/glass{
+	req_one_access_txt = "1";
+	name = "Checkpoint"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "sJ" = (
@@ -2241,7 +2310,6 @@
 	pixel_y = 3
 	},
 /obj/effect/turf_decal/corner/opaque/lime/mono,
-/obj/machinery/light/directional/south,
 /obj/machinery/light_switch{
 	dir = 4;
 	pixel_x = -19;
@@ -2260,26 +2328,31 @@
 /turf/closed/wall/mineral/titanium/exterior,
 /area/ship/crew/cryo)
 "tQ" = (
-/obj/structure/chair/comfy/shuttle,
 /obj/effect/turf_decal/corner_steel_grid{
 	dir = 9
 	},
+/obj/structure/chair/comfy/shuttle,
+/obj/effect/turf_decal/floordetail/tiled,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "tU" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 5
+	dir = 5;
+	mode = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
 /turf/open/floor/engine/hull,
 /area/ship/external/dark)
-"uh" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
+"tY" = (
+/obj/machinery/modular_computer/console/preset/command{
+	dir = 1
 	},
-/obj/effect/turf_decal/floordetail/tiled,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
+"uh" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -2585,12 +2658,12 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "wz" = (
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 9
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 9
+	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "wK" = (
@@ -2812,6 +2885,19 @@
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/port)
+"yy" = (
+/obj/structure/table/reinforced,
+/obj/item/desk_flag/gezena{
+	pixel_x = 9;
+	pixel_y = 1
+	},
+/obj/machinery/recharger{
+	pixel_y = 1;
+	pixel_x = -6
+	},
+/obj/effect/turf_decal/floordetail/tiled,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
 "yF" = (
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 1
@@ -2932,9 +3018,6 @@
 	icon_state = "1-4"
 	},
 /obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/table/reinforced{
-	color = "#c1b6a5"
-	},
 /obj/machinery/cell_charger,
 /obj/item/stock_parts/cell/high,
 /obj/structure/cable,
@@ -2945,6 +3028,7 @@
 	dir = 5
 	},
 /obj/machinery/airalarm/directional/west,
+/obj/structure/table/reinforced,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "zL" = (
@@ -2970,7 +3054,7 @@
 	},
 /obj/machinery/door/airlock/security{
 	req_access = list(3);
-	name = "Sergeant's Quarters"
+	name = "Lieutenant's Quarters"
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
@@ -3092,6 +3176,22 @@
 /obj/machinery/vending/toyliberationstation,
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
+"AM" = (
+/obj/structure/cable/blue{
+	icon_state = "0-8"
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/structure/window/plasma/reinforced{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/shuttle/fire_heater{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engines/port)
 "AN" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -3353,7 +3453,8 @@
 /area/ship/crew/canteen)
 "CF" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 10
+	dir = 10;
+	mode = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -3583,10 +3684,7 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/external/dark)
 "El" = (
-/obj/structure/railing{
-	dir = 8
-	},
-/obj/machinery/modular_computer/console/preset/command{
+/obj/machinery/computer/security{
 	dir = 1
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
@@ -3635,7 +3733,8 @@
 /area/ship/hallway/central)
 "Eu" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 5
+	dir = 5;
+	mode = 1
 	},
 /obj/structure/cable,
 /turf/open/floor/engine/hull,
@@ -3898,7 +3997,8 @@
 /area/ship/hallway/central)
 "FJ" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 5
+	dir = 5;
+	mode = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -3918,7 +4018,8 @@
 /area/ship/engineering/engines/starboard)
 "FO" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 8
+	dir = 8;
+	mode = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -3946,10 +4047,10 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/hallway/central)
 "Gb" = (
-/obj/machinery/computer/crew{
-	dir = 8
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
 	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/effect/turf_decal/floordetail/tiled,
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -4104,8 +4205,8 @@
 "GW" = (
 /obj/structure/rack,
 /obj/item/stock_parts/cell/gun/pgf{
-	pixel_y = 12;
-	pixel_x = -3
+	pixel_x = -6;
+	pixel_y = -2
 	},
 /obj/item/stock_parts/cell/gun/pgf{
 	pixel_y = 10;
@@ -4128,6 +4229,13 @@
 	pixel_x = 3
 	},
 /obj/effect/turf_decal/corner/opaque/neutral/full,
+/obj/item/stock_parts/cell/gun/pgf{
+	pixel_x = -12
+	},
+/obj/item/stock_parts/cell/gun/pgf{
+	pixel_x = -8;
+	pixel_y = -2
+	},
 /turf/open/floor/vault,
 /area/ship/security/armory)
 "Ha" = (
@@ -4146,7 +4254,8 @@
 /area/ship/security/armory)
 "Hb" = (
 /obj/machinery/porta_turret/ship/weak{
-	dir = 4
+	dir = 4;
+	mode = 1
 	},
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -4300,10 +4409,6 @@
 /area/ship/crew/canteen)
 "Ig" = (
 /obj/machinery/computer/helm/viewscreen/directional/north,
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
-	},
-/obj/effect/turf_decal/floordetail/tiled,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "Ir" = (
@@ -4466,6 +4571,20 @@
 	},
 /turf/open/floor/engine/hull,
 /area/ship/external/dark)
+"KH" = (
+/obj/structure/window/reinforced/fulltile/shuttle,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+	id = "lib_bridge_shut"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
 "KM" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/hallway/port)
@@ -4516,9 +4635,6 @@
 	dir = 8;
 	name = "engine fuel pump"
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /obj/machinery/camera/autoname{
 	dir = 1;
 	network = list("GEC")
@@ -4677,7 +4793,7 @@
 "Mw" = (
 /obj/structure/bed,
 /obj/item/bedsheet/hos{
-	name = "Sergeant's Bedsheet";
+	name = "Lieutenant's Bedsheet";
 	desc = "It is decorated with a shield emblem."
 	},
 /obj/effect/turf_decal/borderfloorblack,
@@ -4713,9 +4829,6 @@
 	pixel_x = -9;
 	pixel_y = 3
 	},
-/obj/item/clothing/head/gezena/medic/flap{
-	pixel_x = 12
-	},
 /obj/item/clothing/head/gezena/medic{
 	pixel_y = 4;
 	pixel_x = 7
@@ -4743,6 +4856,11 @@
 	pixel_x = -13;
 	pixel_y = -19
 	},
+/obj/item/clothing/neck/stethoscope,
+/obj/item/clothing/head/gezena/flap/medic{
+	pixel_y = 1;
+	pixel_x = 12
+	},
 /turf/open/floor/mineral/titanium,
 /area/ship/medical)
 "MF" = (
@@ -4801,6 +4919,9 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
+/obj/structure/railing/corner{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "MZ" = (
@@ -4877,7 +4998,7 @@
 	dir = 8
 	},
 /obj/structure/closet/crate{
-	name = "Mishun Acomplshed"
+	name = "Mission Accomplished"
 	},
 /obj/item/poster/mission_accomplished_7,
 /obj/item/poster/mission_accomplished_6,
@@ -4917,8 +5038,13 @@
 /area/ship/external/dark)
 "NF" = (
 /obj/structure/closet/crate/radiation,
-/obj/effect/turf_decal/borderfloorblack{
-	dir = 4
+/obj/item/clothing/suit/radiation,
+/obj/item/clothing/suit/radiation,
+/obj/item/clothing/head/radiation{
+	pixel_x = -7
+	},
+/obj/item/clothing/head/radiation{
+	pixel_x = -7
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/construction)
@@ -5119,6 +5245,9 @@
 /turf/open/floor/vault,
 /area/ship/security/armory)
 "Pb" = (
+/obj/structure/railing{
+	dir = 4
+	},
 /turf/open/floor/plasteel/stairs{
 	icon = 'icons/obj/stairs.dmi';
 	dir = 2
@@ -5145,7 +5274,6 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Ph" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
 /obj/structure/cable{
 	icon_state = "2-9"
 	},
@@ -5155,6 +5283,9 @@
 /obj/machinery/atmospherics/components/trinary/mixer/layer2{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/manifold/orange/visible{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engines/port)
 "Pi" = (
@@ -5360,6 +5491,13 @@
 /obj/effect/turf_decal/corner/opaque/neutral/full,
 /turf/open/floor/vault,
 /area/ship/security/armory)
+"Qi" = (
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/computer/cargo{
+	dir = 8
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/bridge)
 "Qq" = (
 /obj/structure/rack,
 /obj/item/kitchen/knife/combat/survival{
@@ -5867,6 +6005,7 @@
 /obj/item/gun/energy/kalix/pistol{
 	pixel_y = -16
 	},
+/obj/item/screwdriver,
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm/dormthree)
 "UH" = (
@@ -5915,13 +6054,6 @@
 	pixel_x = -10;
 	pixel_y = -7
 	},
-/obj/item/clothing/under/gezena/marine{
-	pixel_x = -10;
-	pixel_y = -7
-	},
-/obj/item/clothing/gloves/gezena/marine{
-	pixel_y = 11
-	},
 /obj/item/clothing/gloves/gezena/marine{
 	pixel_y = 11
 	},
@@ -5931,22 +6063,6 @@
 /obj/item/clothing/gloves/gezena/marine{
 	pixel_y = 11
 	},
-/obj/item/clothing/head/gezena/marine/flap{
-	pixel_x = -10
-	},
-/obj/item/clothing/head/gezena/marine/flap{
-	pixel_x = -10
-	},
-/obj/item/clothing/head/gezena/marine/flap{
-	pixel_x = -10
-	},
-/obj/item/clothing/head/gezena/marine/flap{
-	pixel_x = -10
-	},
-/obj/item/clothing/head/gezena/marine{
-	pixel_y = 10;
-	pixel_x = -10
-	},
 /obj/item/clothing/head/gezena/marine{
 	pixel_y = 10;
 	pixel_x = -10
@@ -5975,13 +6091,6 @@
 /obj/item/storage/backpack/duffelbag/sec{
 	pixel_y = -13
 	},
-/obj/item/storage/backpack/duffelbag/sec{
-	pixel_y = -13
-	},
-/obj/item/storage/backpack/satchel/sec{
-	pixel_x = -8;
-	pixel_y = -17
-	},
 /obj/item/storage/backpack/satchel/sec{
 	pixel_x = -8;
 	pixel_y = -17
@@ -6006,11 +6115,19 @@
 	pixel_x = 3;
 	pixel_y = 0
 	},
-/obj/item/clothing/shoes/combat/gezena{
-	pixel_x = 3;
-	pixel_y = 0
-	},
 /obj/effect/turf_decal/corner/opaque/neutral/full,
+/obj/item/clothing/head/gezena/flap/marine{
+	pixel_y = 1;
+	pixel_x = -10
+	},
+/obj/item/clothing/head/gezena/flap/marine{
+	pixel_y = 1;
+	pixel_x = -10
+	},
+/obj/item/clothing/head/gezena/flap/marine{
+	pixel_y = 1;
+	pixel_x = -10
+	},
 /turf/open/floor/vault,
 /area/ship/security/armory)
 "Vp" = (
@@ -6059,11 +6176,11 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/hangar/starboard)
 "VM" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/structure/cable,
 /obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "engine fuel pump"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engines/starboard)
 "VY" = (
@@ -6075,7 +6192,7 @@
 	anchored = 1;
 	can_be_unanchored = 1;
 	icon_state = "warden";
-	name = "sergeant's locker";
+	name = "Lieutenant's locker";
 	req_access_txt = "3";
 	req_access = list(3)
 	},
@@ -6106,10 +6223,6 @@
 	pixel_y = 1;
 	pixel_x = -11
 	},
-/obj/item/clothing/head/gezena/marine/lead/flap{
-	pixel_y = 9;
-	pixel_x = -11
-	},
 /obj/item/clothing/suit/armor/gezena/marinecoat{
 	pixel_y = 8
 	},
@@ -6117,14 +6230,6 @@
 	pixel_y = 11;
 	pixel_x = 5
 	},
-/obj/item/radio/headset/pgf/captain{
-	pixel_x = -4;
-	pixel_y = 9
-	},
-/obj/item/kitchen/knife/combat/survival{
-	pixel_y = 0;
-	pixel_x = 1
-	},
 /obj/item/storage/belt/military/gezena{
 	pixel_y = 1
 	},
@@ -6132,6 +6237,10 @@
 	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
 	},
@@ -6140,7 +6249,14 @@
 	pixel_x = -3
 	},
 /obj/item/clothing/head/helmet/gezena{
-	pixel_y = -11
+	pixel_x = -11
+	},
+/obj/item/clothing/suit/armor/gezena/marine{
+	pixel_y = 8
+	},
+/obj/item/clothing/head/gezena/flap/marine/lead{
+	pixel_y = 10;
+	pixel_x = -10
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm/dormtwo)
@@ -6171,6 +6287,16 @@
 	},
 /turf/open/floor/plasteel/sepia,
 /area/ship/crew/dorm)
+"Wg" = (
+/obj/effect/turf_decal/spline/fancy/opaque/lime{
+	dir = 1
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/lime,
+/obj/structure/railing{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
 "Wk" = (
 /obj/machinery/power/smes/shuttle/precharged{
 	dir = 4
@@ -6229,9 +6355,6 @@
 	dir = 5
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -6384,13 +6507,11 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/construction)
 "Yd" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 8;
+	name = "engine fuel pump"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engines/port)
 "Yo" = (
@@ -6707,14 +6828,14 @@ xz
 xz
 lc
 hJ
-hJ
+ae
 is
 lc
 xz
 xz
 TV
 FN
-fN
+dv
 fN
 TV
 xz
@@ -6735,14 +6856,14 @@ xz
 lc
 lc
 CB
-CB
+AM
 UM
 lc
 FO
 LD
 TV
 bB
-Wk
+pK
 Wk
 TV
 TV
@@ -7914,8 +8035,8 @@ bb
 wz
 tQ
 El
-Ms
-MF
+Wg
+om
 MF
 eO
 Ly
@@ -7941,10 +8062,10 @@ MF
 Ig
 uh
 qj
-Ms
-CZ
-xz
-Mk
+tY
+hX
+MF
+MF
 Bc
 KS
 Sp
@@ -7968,10 +8089,10 @@ Hb
 vr
 dK
 Gb
-Ms
+yy
+KH
 CZ
 xz
-xz
 Mk
 iK
 sQ
@@ -7993,13 +8114,13 @@ xz
 xz
 xz
 cR
-Rx
-bD
-bD
+Sd
+Qi
+bi
+Ms
 CZ
 xz
 xz
-xz
 Mk
 Er
 Mk
@@ -8021,10 +8142,10 @@ xz
 xz
 xz
 xz
-xz
-xz
-xz
-xz
+Rx
+bD
+bD
+CZ
 xz
 xz
 xz
diff --git a/_maps/shuttles/subshuttles/pgf_nail.dmm b/_maps/shuttles/subshuttles/pgf_nail.dmm
index 9a5224dc4573..02255b90a5c0 100644
--- a/_maps/shuttles/subshuttles/pgf_nail.dmm
+++ b/_maps/shuttles/subshuttles/pgf_nail.dmm
@@ -391,7 +391,8 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/porta_turret/ship/weak{
-	dir = 8
+	dir = 8;
+	mode = 1
 	},
 /turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/external/dark)
diff --git a/code/game/MapData/shuttles/pgf_crying_sun.dm b/code/game/MapData/shuttles/pgf_crying_sun.dm
index 6df40aa0efdd..2851518e669a 100644
--- a/code/game/MapData/shuttles/pgf_crying_sun.dm
+++ b/code/game/MapData/shuttles/pgf_crying_sun.dm
@@ -2,7 +2,7 @@
 	name = "The UCWLWM"
 	desc = "It's looks old and worn out."
 	icon_state = "book3"
-	author = "Welds-the-Steel"
+	author = "Senior Engineer Wihlz-Saai"
 	title = "The Universal Colossal Warship Linear Weapon Mount"
 	dat = {"<html>
 			<head>
diff --git a/code/modules/clothing/factions/gezena.dm b/code/modules/clothing/factions/gezena.dm
index 96c6eee3c734..eabc0fe752c4 100644
--- a/code/modules/clothing/factions/gezena.dm
+++ b/code/modules/clothing/factions/gezena.dm
@@ -36,10 +36,12 @@
 	item_state = "bluecloth"
 	blood_overlay_type = "coat"
 	togglename = "zipper"
-	body_parts_covered = CHEST
+	body_parts_covered = CHEST|GROIN|ARMS
+	cold_protection = CHEST|GROIN|ARMS
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
-	armor = list("melee" = 20, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
 
 //Armored suit
 
@@ -130,6 +132,9 @@
 	desc = "The standard cap of the PGF military, in Navy colors. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects."
 	icon_state = "navalflap"
 	item_state = "bluecloth"
+	cold_protection = HEAD
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 
 /obj/item/clothing/head/gezena/marine
 	name = "\improper PGFMC Cap"
@@ -137,7 +142,7 @@
 	icon_state = "marinehat"
 	item_state = "marinecloth"
 
-/obj/item/clothing/head/gezena/marine/flap
+/obj/item/clothing/head/gezena/flap/marine
 	name = "\improper PGFMC Betzu-il cap"
 	desc = "The standard cap of the PGF military, in Marine Corps colors. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects."
 	icon_state = "marineflap"
@@ -149,7 +154,7 @@
 	icon_state = "squadhat"
 	item_state = "marinecloth"
 
-/obj/item/clothing/head/gezena/marine/lead/flap
+/obj/item/clothing/head/gezena/flap/marine/lead
 	name = "\improper PGFMC Commander's' Betzu-il cap"
 	desc = "The standard cap of the PGF military, in Marine Corps colors. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. The silver markings denote it as a commander's cap."
 	icon_state = "squadflap"
@@ -161,7 +166,7 @@
 	icon_state = "medichat"
 	item_state = "whitecloth"
 
-/obj/item/clothing/head/gezena/medic/flap
+/obj/item/clothing/head/gezena/flap/medic
 	name = "\improper PGF medic Betzu-il cap"
 	desc = "The standard cap of the PGF military. “betzu-il”, translating to “sun-blocker”, refers to the flap at the back for protection against natural hazards such as sunburns, sandstorms, and biting insects. The coloring indicates the wearer as a medical officer."
 	icon_state = "medicflap"
@@ -260,8 +265,8 @@
 	item_state = "blackcloth"
 
 /obj/item/clothing/neck/cloak/gezena/lead
-	name = "sergeant's Azuilhauz"
-	desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as a squad commander."
+	name = "marine officer's Azuilhauz"
+	desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as a squad leader."
 	icon_state = "squadcape"
 	item_state = "blackcloth"
 
@@ -278,7 +283,7 @@
 	item_state = "whitecloth"
 
 /obj/item/clothing/neck/cloak/gezena/command
-	name = "officer's Azuilhauz"
+	name = "navy officer's Azuilhauz"
 	desc = "The “Aziulhauz”, or “rank-cape”, is the method with which PGF military members display their rank to others. Wearing one while on duty is required by uniform code. This variant displays the wearer's rank as an officer."
 	icon_state = "commandcape"
 	item_state = "whitecloth"