Colonist Faction fixes, Shuttle fixes, PaP sprite updates

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"

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