diff --git a/code/modules/clothing/suits/marine_armor/ert.dm b/code/modules/clothing/suits/marine_armor/ert.dm
index 0dc270c905..6423c07856 100644
--- a/code/modules/clothing/suits/marine_armor/ert.dm
+++ b/code/modules/clothing/suits/marine_armor/ert.dm
@@ -288,7 +288,7 @@
 
 /obj/item/clothing/suit/storage/marine/faction/UPP/light
 	name = "\improper 6B72-03 pattern UPP armor"
-	desc = "Vintage UPP armor system Vadasz. Provides basic ballistic/shrapnel protection for armor crew or rear line forces with wraparound soft armor and ceramic composite chestplate. Lightweight, but lacking protection class and coverage. Still issued to territorial forces, and used by some spetznaz."
+	desc = "Vintage UPP armor system Vadasz. Provides basic ballistic/shrapnel protection for armor crew or rear line forces with wraparound soft armor and ceramic composite chestplate. Lightweight, but lacking protection class and coverage. Still issued to the Territorial Guard and People's Armed Police tactical teams, and utilized by some spetznaz."
 	icon_state = "upp_armor_light"
 	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS
 	slowdown = SLOWDOWN_ARMOR_LIGHT
@@ -303,6 +303,12 @@
 	storage_slots = 2
 	flags_inventory = null
 
+/obj/item/clothing/suit/storage/marine/faction/UPP/light/pap
+	name = "\improper 6B72-03 pattern UPP armor"
+	desc = "Vintage UPP armor system Vadasz. Provides basic ballistic/shrapnel protection for armor crew or rear line forces with wraparound soft armor and ceramic composite chestplate. Lightweight, but lacking protection class and coverage. Still issued to the Territorial Guard and People's Armed Police tactical teams, and utilized by some spetznaz. This set lacks additional leg guards."
+	icon_state = "upp_armor_pap"
+	flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN
+
 /obj/item/clothing/suit/storage/marine/faction/UPP/jacket
 	name = "\improper UH4 camouflaged jacket"
 	icon_state = "upp_coat"
diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm
index bb337a2dc6..edfc0a4316 100644
--- a/code/modules/gear_presets/upp.dm
+++ b/code/modules/gear_presets/upp.dm
@@ -1002,6 +1002,7 @@
 /datum/equipment_preset/upp/admin
 	name = "UPP Civilian Administrator"
 	flags = EQUIPMENT_PRESET_EXTRA
+	faction = list(FACTION_COLONIST, FACTION_UPP)
 	assignment = "Administrator"
 	role_comm_title = "ADMIN"
 	paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0)
@@ -1123,6 +1124,7 @@
 /datum/equipment_preset/upp/police
 	name = "UPP People's Armed Police Officer"
 	flags = EQUIPMENT_PRESET_EXTRA
+	faction = list(FACTION_COLONIST, FACTION_UPP)
 	assignment = "People's Armed Police Militsioner"
 	role_comm_title = "MILTSY"
 	paygrades = list(PAY_SHORT_UC1 = JOB_PLAYTIME_TIER_0)
@@ -1154,6 +1156,7 @@
 /datum/equipment_preset/upp/police/riot
 	name = "UPP People's Armed Police Officer - Riot"
 	flags = EQUIPMENT_PRESET_EXTRA
+	faction = list(FACTION_COLONIST, FACTION_UPP)
 	assignment = "People's Armed Police Militsioner"
 	role_comm_title = "MILTSY"
 	paygrades = list(PAY_SHORT_UC1 = JOB_PLAYTIME_TIER_0)
@@ -1169,7 +1172,6 @@
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/nerve_gas, WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/nerve_gas, WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/nerve_gas, WEAR_IN_BACK)
-	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/nerve_gas, WEAR_IN_BACK)
 	//face
 	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress, WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/upp, WEAR_FACE)
@@ -1184,7 +1186,7 @@
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag, WEAR_IN_ACCESSORY)
 	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag, WEAR_IN_ACCESSORY)
 	//jacket
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/light/pap, WEAR_JACKET)
 	//waist
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/UPP/full, WEAR_WAIST)
 	//limbs
diff --git a/icons/mob/humans/onmob/belt.dmi b/icons/mob/humans/onmob/belt.dmi
index 0156f0eb64..5fc460a51e 100644
Binary files a/icons/mob/humans/onmob/belt.dmi and b/icons/mob/humans/onmob/belt.dmi differ
diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi
index 47f320467b..3aa062cb22 100644
Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ
diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi
index 2e11b3f205..3ece294b8f 100644
Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ
diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi
index 77670c02ab..9c92ee69a3 100644
Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ
diff --git a/icons/obj/items/clothing/cm_suits.dmi b/icons/obj/items/clothing/cm_suits.dmi
index 6f66348beb..a84f93289c 100644
Binary files a/icons/obj/items/clothing/cm_suits.dmi and b/icons/obj/items/clothing/cm_suits.dmi differ
diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi
index f72e7b1c52..0cf3258c0e 100644
Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ
diff --git a/maps/shuttles/dropship_upp.dmm b/maps/shuttles/dropship_upp.dmm
index 0e83b4a0b7..ecb5e4ba49 100644
--- a/maps/shuttles/dropship_upp.dmm
+++ b/maps/shuttles/dropship_upp.dmm
@@ -1,9 +1,20 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aA" = (
+/obj/structure/bed/chair/vehicle{
+	dir = 4;
+	pixel_x = -9
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = -12
+	},
+/turf/open/floor/strata/multi_tiles/west,
+/area/shuttle/ds_upp)
 "cO" = (
 /obj/structure/machinery/door/airlock/dropship_hatch/upp{
 	id = "port_door"
 	},
-/turf/open/floor/strata/floor2,
+/turf/open/floor/strata/floor3/east,
 /area/shuttle/ds_upp)
 "cS" = (
 /obj/structure/platform/mineral{
@@ -18,7 +29,7 @@
 	pixel_x = 12;
 	pixel_y = 29
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/multi_tiles/west,
 /area/shuttle/ds_upp)
 "di" = (
 /turf/closed/shuttle/ert{
@@ -33,6 +44,24 @@
 	},
 /turf/open/floor/strata/floor3/east,
 /area/shuttle/ds_upp)
+"eE" = (
+/obj/structure/barricade/handrail/strata{
+	dir = 8;
+	can_buckle = 1
+	},
+/turf/open/floor/plating/plating_catwalk/strata,
+/area/shuttle/ds_upp)
+"ft" = (
+/obj/structure/bed/chair/vehicle{
+	pixel_x = 9;
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "E";
+	pixel_x = -15
+	},
+/turf/open/floor/strata/multi_tiles/west,
+/area/shuttle/ds_upp)
 "hg" = (
 /turf/closed/shuttle/ert{
 	icon_state = "upp9"
@@ -44,27 +73,35 @@
 	pixel_x = -9
 	},
 /obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = -12
+	icon_state = "E"
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ds_upp)
 "iN" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/effect/decal/warning_stripes{
 	icon_state = "S";
 	pixel_y = -1
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/turf/open/floor/plating/plating_catwalk/strata,
+/area/shuttle/ds_upp)
+"jZ" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S";
+	pixel_x = -1
+	},
+/turf/open/floor/strata/multi_tiles/west,
 /area/shuttle/ds_upp)
 "kt" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/structure/machinery/camera/autoname/golden_arrow/midway{
 	dir = 8;
 	pixel_x = 23;
 	network = list("Chapaev","Akademia Nauk")
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/obj/structure/barricade/handrail/strata{
+	dir = 4;
+	can_buckle = 1
+	},
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ds_upp)
 "ld" = (
 /obj/effect/attach_point/weapon/midway/left_wing{
@@ -79,7 +116,11 @@
 	dir = 1;
 	pixel_y = 11
 	},
-/turf/open/floor/strata/floor2,
+/obj/structure/barricade/handrail/strata{
+	dir = 8;
+	can_buckle = 1
+	},
+/turf/open/floor/strata/multi_tiles/west,
 /area/shuttle/ds_upp)
 "lm" = (
 /turf/closed/shuttle/ert{
@@ -90,17 +131,19 @@
 /obj/structure/bed/chair/dropship/pilot{
 	dir = 1
 	},
-/obj/effect/decal/strata_decals/catwalk/prison,
 /turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "nZ" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/structure/machinery/camera/autoname/golden_arrow/midway{
 	dir = 4;
 	pixel_x = -23;
 	network = list("Chapaev","Akademia Nauk")
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/obj/structure/barricade/handrail/strata{
+	dir = 8;
+	can_buckle = 1
+	},
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ds_upp)
 "pv" = (
 /turf/closed/shuttle/ert{
@@ -129,10 +172,9 @@
 	dir = 8
 	},
 /obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = -15
+	icon_state = "W"
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ds_upp)
 "um" = (
 /obj/effect/decal/warning_stripes{
@@ -142,10 +184,15 @@
 /turf/open/floor/strata/floor3/east,
 /area/shuttle/ds_upp)
 "wi" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1;
+	pixel_x = -1
+	},
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/upp{
 	id = "aft_door"
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/turf/open/floor/strata/floor3/east,
 /area/shuttle/ds_upp)
 "wO" = (
 /turf/closed/shuttle/ert{
@@ -158,12 +205,15 @@
 	},
 /area/shuttle/ds_upp)
 "xv" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/structure/machinery/light{
 	dir = 8;
 	pixel_x = -14
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/obj/structure/barricade/handrail/strata{
+	dir = 8;
+	can_buckle = 1
+	},
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ds_upp)
 "xE" = (
 /turf/closed/shuttle/ert{
@@ -175,11 +225,14 @@
 	attach_id = 7;
 	ship_tag = "dropship_upp"
 	},
-/obj/structure/barricade/handrail/strata,
+/obj/structure/barricade/handrail/strata{
+	can_buckle = 1
+	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
 	},
-/turf/open/floor/strata/floor3/east,
+/obj/effect/decal/strata_decals/catwalk/prison,
+/turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "AK" = (
 /turf/closed/shuttle/ert{
@@ -187,7 +240,11 @@
 	},
 /area/shuttle/ds_upp)
 "BD" = (
-/turf/open/floor/strata/grey_multi_tiles,
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/strata/floor3/east,
 /area/shuttle/ds_upp)
 "BT" = (
 /turf/closed/shuttle/ert{
@@ -196,11 +253,14 @@
 	},
 /area/shuttle/ds_upp)
 "CV" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
 	pixel_x = 30
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/obj/structure/barricade/handrail/strata{
+	dir = 4;
+	can_buckle = 1
+	},
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ds_upp)
 "DG" = (
 /turf/closed/shuttle/ert{
@@ -208,12 +268,12 @@
 	opacity = 0
 	},
 /area/shuttle/ds_upp)
-"DR" = (
-/obj/structure/machinery/door/airlock/dropship_hatch/upp{
-	dir = 8;
-	id = "starboard_door"
+"Fc" = (
+/obj/structure/barricade/handrail/strata{
+	dir = 4;
+	can_buckle = 1
 	},
-/turf/open/floor/strata/floor2,
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ds_upp)
 "Fz" = (
 /turf/closed/shuttle/ert{
@@ -226,7 +286,14 @@
 	icon_state = "E";
 	pixel_x = 1
 	},
-/turf/open/floor/strata/floor2,
+/turf/open/floor/strata/multi_tiles/west,
+/area/shuttle/ds_upp)
+"FG" = (
+/obj/structure/machinery/light{
+	dir = 8;
+	pixel_x = -14
+	},
+/turf/open/floor/strata/multi_tiles/southwest,
 /area/shuttle/ds_upp)
 "FY" = (
 /obj/structure/stairs{
@@ -275,6 +342,12 @@
 	icon_state = "upp3"
 	},
 /area/shuttle/ds_upp)
+"IK" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/strata/multi_tiles/west,
+/area/shuttle/ds_upp)
 "Jo" = (
 /obj/effect/attach_point/weapon/midway/left_fore,
 /obj/effect/attach_point/weapon/midway/right_fore{
@@ -282,9 +355,6 @@
 	},
 /turf/template_noop,
 /area/template_noop)
-"Js" = (
-/turf/open/floor/strata/floor2,
-/area/shuttle/ds_upp)
 "Jy" = (
 /turf/template_noop,
 /area/template_noop)
@@ -294,7 +364,18 @@
 	pixel_x = -13;
 	pixel_y = 29
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/multi_tiles/west,
+/area/shuttle/ds_upp)
+"Ko" = (
+/obj/structure/machinery/light{
+	dir = 1;
+	pixel_y = 11
+	},
+/obj/structure/barricade/handrail/strata{
+	dir = 4;
+	can_buckle = 1
+	},
+/turf/open/floor/strata/multi_tiles/west,
 /area/shuttle/ds_upp)
 "Kv" = (
 /obj/structure/bed/chair/vehicle{
@@ -312,16 +393,7 @@
 	icon_state = "W";
 	pixel_x = -1
 	},
-/turf/open/floor/strata/floor2,
-/area/shuttle/ds_upp)
-"LP" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	pixel_x = 19
-	},
-/turf/closed/shuttle/ert{
-	icon_state = "upp8"
-	},
+/turf/open/floor/strata/multi_tiles/west,
 /area/shuttle/ds_upp)
 "LW" = (
 /obj/structure/machinery/light{
@@ -333,10 +405,9 @@
 	pixel_x = -9
 	},
 /obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = -12
+	icon_state = "E"
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ds_upp)
 "MF" = (
 /turf/closed/shuttle/ert{
@@ -350,14 +421,14 @@
 /area/shuttle/ds_upp)
 "Ou" = (
 /obj/structure/machinery/door/airlock/hatch/cockpit/upp,
-/turf/open/floor/strata/floor2,
+/turf/open/floor/strata/floor3/east,
 /area/shuttle/ds_upp)
 "OE" = (
 /obj/effect/attach_point/crew_weapon/midway{
 	attach_id = 8;
 	ship_tag = "dropship_upp"
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/multi_tiles/southwest,
 /area/shuttle/ds_upp)
 "PQ" = (
 /obj/effect/attach_point/weapon/midway/right_wing{
@@ -382,7 +453,6 @@
 /turf/open/floor/strata/floor3/east,
 /area/shuttle/ds_upp)
 "RX" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/structure/machinery/light{
 	dir = 4;
 	pixel_x = 14
@@ -391,7 +461,7 @@
 	pixel_x = -6;
 	pixel_y = -16
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/turf/open/floor/strata/multi_tiles/southwest,
 /area/shuttle/ds_upp)
 "Sn" = (
 /obj/effect/decal/warning_stripes{
@@ -402,7 +472,8 @@
 /obj/structure/machinery/camera/autoname/golden_arrow/midway{
 	network = list("Chapaev","Akademia Nauk")
 	},
-/turf/open/floor/strata/floor3/east,
+/obj/effect/decal/strata_decals/catwalk/prison,
+/turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "Sx" = (
 /turf/closed/shuttle/ert{
@@ -410,8 +481,10 @@
 	},
 /area/shuttle/ds_upp)
 "Th" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
-/turf/open/floor/strata/grey_multi_tiles,
+/turf/open/floor/strata/multi_tiles/west,
+/area/shuttle/ds_upp)
+"Tq" = (
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ds_upp)
 "TG" = (
 /turf/closed/shuttle/ert{
@@ -428,17 +501,16 @@
 	dir = 8
 	},
 /obj/effect/decal/warning_stripes{
-	icon_state = "E";
-	pixel_x = -15
+	icon_state = "W"
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ds_upp)
 "Wy" = (
 /obj/effect/attach_point/crew_weapon/midway{
 	attach_id = 9;
 	ship_tag = "dropship_upp"
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/multi_tiles/southwest,
 /area/shuttle/ds_upp)
 "Xb" = (
 /obj/effect/decal/warning_stripes{
@@ -449,12 +521,11 @@
 	icon_state = "S";
 	pixel_x = -5
 	},
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
 	pixel_y = 1
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ds_upp)
 "Xe" = (
 /obj/effect/attach_point/weapon/midway/left_fore,
@@ -469,11 +540,13 @@
 	},
 /area/shuttle/ds_upp)
 "XE" = (
-/obj/structure/barricade/handrail/strata,
+/obj/structure/barricade/handrail/strata{
+	can_buckle = 1
+	},
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/multi_tiles/west,
 /area/shuttle/ds_upp)
 "Ya" = (
 /obj/effect/decal/warning_stripes{
@@ -486,19 +559,25 @@
 /turf/open/floor/strata/floor3/east,
 /area/shuttle/ds_upp)
 "YJ" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
 	pixel_x = -30
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/obj/structure/barricade/handrail/strata{
+	dir = 8;
+	can_buckle = 1
+	},
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ds_upp)
 "Zh" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/structure/machinery/light{
 	dir = 4;
 	pixel_x = 14
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/obj/structure/barricade/handrail/strata{
+	dir = 4;
+	can_buckle = 1
+	},
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ds_upp)
 "Zm" = (
 /turf/closed/shuttle/ert{
@@ -565,14 +644,14 @@ AK
 lf
 OE
 Yn
-Th
+Tq
 nZ
 xv
 YJ
-Th
+eE
 Gn
 FY
-LP
+Zm
 xE
 xE
 lm
@@ -580,19 +659,19 @@ lm
 (4,1,1) = {"
 AK
 Qk
-xv
+FG
 HB
-Js
+Th
 Ya
 um
-si
-si
-si
-si
+ft
+ft
+ft
+ft
 cU
 XE
 cS
-Yn
+jZ
 LW
 hS
 wi
@@ -615,24 +694,24 @@ cS
 Th
 Th
 Th
-Th
+Yn
 "}
 (6,1,1) = {"
 AK
 rr
 RX
 HB
-Js
+Th
 ey
 Yn
-hS
-hS
-hS
-hS
+aA
+aA
+aA
+aA
 JN
 XE
 cS
-um
+IK
 TO
 si
 BD
@@ -642,14 +721,14 @@ Hk
 Sx
 Sx
 AK
-lf
+Ko
 Wy
 Yn
-Th
+Tq
 kt
 Zh
 CV
-Th
+Fc
 Gn
 FY
 hg
@@ -683,8 +762,8 @@ Jy
 Jy
 Jy
 PQ
-DR
-DR
+cO
+cO
 xc
 Fz
 di
diff --git a/maps/shuttles/ert_upp_shuttle.dmm b/maps/shuttles/ert_upp_shuttle.dmm
index ae1abcdaed..5700a166c3 100644
--- a/maps/shuttles/ert_upp_shuttle.dmm
+++ b/maps/shuttles/ert_upp_shuttle.dmm
@@ -8,17 +8,21 @@
 /obj/structure/barricade/handrail/strata{
 	dir = 4
 	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NW-out";
+	pixel_y = 2
+	},
 /turf/open/floor/strata/multi_tiles/west,
 /area/shuttle/ert)
 "c" = (
 /obj/structure/barricade/handrail/strata{
 	dir = 4
 	},
-/turf/open/floor/strata/floor3/east,
-/area/shuttle/ert)
-"d" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
-/turf/open/floor/strata/grey_multi_tiles,
+/obj/effect/decal/warning_stripes{
+	icon_state = "W";
+	layer = 3.3
+	},
+/turf/open/floor/strata/multi_tiles/southwest,
 /area/shuttle/ert)
 "e" = (
 /obj/docking_port/mobile/emergency_response/ert3,
@@ -27,6 +31,16 @@
 	opacity = 0
 	},
 /area/shuttle/ert)
+"f" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/obj/structure/barricade/handrail/strata{
+	dir = 4;
+	can_buckle = 1
+	},
+/turf/open/floor/plating/plating_catwalk/strata,
+/area/shuttle/ert)
 "g" = (
 /turf/closed/shuttle/ert{
 	icon_state = "upp5"
@@ -45,7 +59,7 @@
 	attach_id = 9;
 	ship_tag = "dropship_upp"
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/multi_tiles/southwest,
 /area/shuttle/ert)
 "l" = (
 /turf/closed/shuttle/ert{
@@ -63,12 +77,11 @@
 	icon_state = "W";
 	layer = 3.3
 	},
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/structure/bed/chair/vehicle{
 	pixel_x = 9;
 	dir = 8
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ert)
 "p" = (
 /turf/closed/shuttle/ert{
@@ -90,7 +103,16 @@
 /obj/structure/barricade/handrail/strata{
 	dir = 8
 	},
-/turf/open/floor/strata/floor3/east,
+/obj/effect/decal/warning_stripes{
+	icon_state = "E"
+	},
+/turf/open/floor/strata/multi_tiles/southwest,
+/area/shuttle/ert)
+"t" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "S"
+	},
+/turf/open/floor/strata/multi_tiles/west,
 /area/shuttle/ert)
 "u" = (
 /turf/closed/shuttle/ert{
@@ -126,20 +148,25 @@
 	},
 /area/shuttle/ert)
 "B" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/structure/barricade/handrail/strata{
 	layer = 3.5
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ert)
 "C" = (
 /obj/effect/decal/warning_stripes{
 	icon_state = "W";
 	layer = 3.3
 	},
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/structure/gun_rack/type71,
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/plating/plating_catwalk/strata,
+/area/shuttle/ert)
+"D" = (
+/obj/effect/decal/warning_stripes{
+	icon_state = "N";
+	pixel_y = 1
+	},
+/turf/open/floor/strata/multi_tiles/southwest,
 /area/shuttle/ert)
 "E" = (
 /turf/closed/shuttle/ert{
@@ -153,12 +180,11 @@
 	},
 /area/shuttle/ert)
 "H" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/structure/largecrate/random/barrel/red{
 	stuff = list(/obj/item/clothing/under/marine/veteran/UPP,/obj/item/clothing/gloves/marine,/obj/item/clothing/gloves/marine/brown,/obj/item/clothing/gloves/marine/joe,/obj/item/clothing/shoes/marine/joe,/obj/item/clothing/shoes/marine/upp/guard,/obj/item/clothing/shoes/marine/upp);
 	anchored = 1
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ert)
 "I" = (
 /turf/closed/shuttle/ert{
@@ -166,7 +192,6 @@
 	},
 /area/shuttle/ert)
 "J" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/structure/largecrate/supply/ammo/type71{
 	parts_type = /obj/item/stack/sheet/metal;
 	pixel_x = 1;
@@ -179,15 +204,33 @@
 	pixel_x = 3;
 	anchored = 1
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ert)
 "K" = (
 /turf/template_noop,
 /area/template_noop)
+"L" = (
+/obj/structure/barricade/handrail/strata{
+	dir = 8;
+	can_buckle = 1
+	},
+/turf/open/floor/plating/plating_catwalk/strata,
+/area/shuttle/ert)
+"M" = (
+/obj/structure/barricade/handrail/strata{
+	dir = 4;
+	can_buckle = 1
+	},
+/turf/open/floor/plating/plating_catwalk/strata,
+/area/shuttle/ert)
 "O" = (
 /obj/structure/barricade/handrail/strata{
 	dir = 8
 	},
+/obj/effect/decal/warning_stripes{
+	icon_state = "NE-out";
+	pixel_y = 1
+	},
 /turf/open/floor/strata/multi_tiles/west,
 /area/shuttle/ert)
 "P" = (
@@ -201,26 +244,22 @@
 	icon_state = "upp16"
 	},
 /area/shuttle/ert)
-"S" = (
-/turf/closed/shuttle/ert{
-	icon_state = "uppwall"
-	},
-/area/shuttle/ert)
 "T" = (
 /obj/effect/decal/warning_stripes{
-	icon_state = "S";
-	pixel_y = 1
+	icon_state = "S"
 	},
-/obj/effect/decal/strata_decals/catwalk/prison,
-/turf/open/floor/strata/grey_multi_tiles,
+/obj/structure/barricade/handrail/strata{
+	dir = 8;
+	can_buckle = 1
+	},
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ert)
 "U" = (
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/effect/decal/warning_stripes{
 	icon_state = "N";
 	pixel_y = 1
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ert)
 "V" = (
 /turf/closed/shuttle/ert{
@@ -249,12 +288,11 @@
 /obj/effect/decal/warning_stripes{
 	icon_state = "E"
 	},
-/obj/effect/decal/strata_decals/catwalk/prison,
 /obj/structure/bed/chair/vehicle{
 	dir = 4;
 	pixel_x = -9
 	},
-/turf/open/floor/strata/grey_multi_tiles,
+/turf/open/floor/plating/plating_catwalk/strata,
 /area/shuttle/ert)
 
 (1,1,1) = {"
@@ -297,8 +335,8 @@ i
 i
 i
 i
-d
-w
+L
+L
 T
 Y
 "}
@@ -306,15 +344,15 @@ Y
 I
 X
 W
+D
 w
-w
-S
-S
-S
 k
-d
 w
-T
+w
+k
+i
+i
+t
 w
 "}
 (5,1,1) = {"
@@ -327,9 +365,9 @@ i
 i
 i
 i
-d
-w
-T
+M
+M
+f
 w
 "}
 (6,1,1) = {"