misc

- Removed a badge TL Goon armor sprite
- Minor dropship visual change
- Alt pistol holster sprite
- Less bulky looking holster onmob sprite
- Riot PAP officer

code/game/objects/items/storage/pouch.dm

@@ -298,6 +298,9 @@
 		underlays -= gun_underlay
 		gun_underlay = null
 
+/obj/item/storage/pouch/pistol/alt
+		icon_state = "pistol_alt"
+
 ///CO pouch. This pouch can hold only 1 of each type of item: 1 sidearm, 1 pair of binoculars, 1 CO tablet
 /obj/item/storage/pouch/pistol/command
 	name = "command pouch"

code/modules/gear_presets/upp.dm

@@ -1063,16 +1063,59 @@
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/pap, WEAR_BODY)
 	//jacket
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/jacket/pap, WEAR_JACKET)
-	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
 	//waist
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/UPP/full, WEAR_WAIST)
 	//limbs
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET)
 	//pockets
-	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol, WEAR_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/np92, WEAR_IN_L_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_R_STORE)
 
+/datum/equipment_preset/upp/police/riot
+	name = "UPP People's Armed Police Officer - Riot"
+	flags = EQUIPMENT_PRESET_EXTRA
+	assignment = "People's Armed Police Militsioner"
+	role_comm_title = "MILTSY"
+	paygrades = list(PAY_SHORT_UC1 = JOB_PLAYTIME_TIER_0)
+	skills = /datum/skills/cmb
+	access = list(ACCESS_UPP_GENERAL, ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND)
+	idtype = /obj/item/card/id/silver
+
+/datum/equipment_preset/upp/police/riot/load_gear(mob/living/carbon/human/new_human)
+
+	new_human.undershirt = "undershirt"
+	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/head/uppcap/peaked/police, WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/upp, WEAR_FACE)
+	//back
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_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)
+	new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/nerve_gas, WEAR_IN_BACK)
+	//uniform
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/pap, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest/brown_vest, WEAR_ACCESSORY)
+	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)
+	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)
+	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)
+	//waist
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/UPP/full, WEAR_WAIST)
+	//limbs
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET)
+	//pockets
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/np92, WEAR_IN_L_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_R_STORE)
+
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/type23, WEAR_R_HAND)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag, WEAR_L_HAND)
+
 /datum/equipment_preset/upp/prisoner
 	name = "UPP Prisoner"
 	flags = EQUIPMENT_PRESET_EXTRA

code/modules/gear_presets/uscm.dm

@@ -122,10 +122,18 @@
 	faction_group = list(FACTION_UPP)
 	faction = FACTION_UPP
 
+/datum/equipment_preset/uscm/pfc/upp/load_gear(mob/living/carbon/human/new_human)
+	new_human.undershirt = "Naval Infantry Telnyashka"
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD)
+
 /datum/equipment_preset/uscm/pfc/upp/lesser_rank
 	name = parent_type::name + " (Lesser Rank)"
 	paygrades = list(PAY_SHORT_UE1 = JOB_PLAYTIME_TIER_0)
 
+/datum/equipment_preset/uscm/pfc/upp/lesser_rank/load_gear(mob/living/carbon/human/new_human)
+	new_human.undershirt = "Naval Infantry Telnyashka"
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD)
+
 /datum/equipment_preset/uscm/pfc/forecon
 	name = "FORECON Squad Rifleman"
 	paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_1)
@@ -166,10 +174,18 @@
 	faction_group = list(FACTION_UPP)
 	faction = FACTION_UPP
 
+/datum/equipment_preset/uscm/sg/upp/load_gear(mob/living/carbon/human/new_human)
+	new_human.undershirt = "Naval Infantry Telnyashka"
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD)
+
 /datum/equipment_preset/uscm/sg/upp/lesser_rank
 	name = parent_type::name + " (Lesser Rank)"
 	paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0)
 
+/datum/equipment_preset/uscm/sg/upp/lesser_rank/load_gear(mob/living/carbon/human/new_human)
+	new_human.undershirt = "Naval Infantry Telnyashka"
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD)
+
 /datum/equipment_preset/uscm/sg/forecon
 	name = "FORECON Squad Smartgunner"
 	paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0)
@@ -387,10 +403,18 @@
 	faction_group = list(FACTION_UPP)
 	faction = FACTION_UPP
 
+/datum/equipment_preset/uscm/medic/upp/load_gear(mob/living/carbon/human/new_human)
+	new_human.undershirt = "Naval Infantry Telnyashka"
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD)
+
 /datum/equipment_preset/uscm/medic/upp/lesser_rank
 	name = parent_type::name + " (Lesser Rank)"
 	paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0)
 
+/datum/equipment_preset/uscm/medic/upp/lesser_rank/load_gear(mob/living/carbon/human/new_human)
+	new_human.undershirt = "Naval Infantry Telnyashka"
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD)
+
 /datum/equipment_preset/uscm/medic/forecon
 	name = "FORECON Squad Corpsman"
 	assignment = "Squad Corpsman"
@@ -423,6 +447,10 @@
 	faction_group = list(FACTION_UPP)
 	faction = FACTION_UPP
 
+/datum/equipment_preset/uscm/tl/upp/load_gear(mob/living/carbon/human/new_human)
+	new_human.undershirt = "Naval Infantry Telnyashka"
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD)
+
 /datum/equipment_preset/uscm/tl/forecon
 	name = "FORECON Assistant Squad Leader"
 	assignment = "Assistant Squad Leader"
@@ -491,10 +519,18 @@
 	faction_group = list(FACTION_UPP)
 	faction = FACTION_UPP
 
+/datum/equipment_preset/uscm/leader/upp/load_gear(mob/living/carbon/human/new_human)
+	new_human.undershirt = "Naval Infantry Telnyashka"
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD)
+
 /datum/equipment_preset/uscm/leader/upp/lesser_rank
 	name = parent_type::name + " (Lesser Rank)"
 	paygrades = list(PAY_SHORT_UE6 = JOB_PLAYTIME_TIER_0)
 
+/datum/equipment_preset/uscm/leader/upp/lesser_rank/load_gear(mob/living/carbon/human/new_human)
+	new_human.undershirt = "Naval Infantry Telnyashka"
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD)
+
 /datum/equipment_preset/uscm/leader/forecon
 	name = "FORECON Squad Leader"
 	assignment = "Squad Leader"

code/modules/gear_presets/uscm_ship.dm

@@ -677,6 +677,10 @@
 	name = parent_type::name + " (Lesser Rank)"
 	paygrades = list(PAY_SHORT_UO1 = JOB_PLAYTIME_TIER_0)
 
+/datum/equipment_preset/uscm_ship/so/upp/lesser_rank/load_gear(mob/living/carbon/human/new_human)
+	new_human.undershirt = "Naval Infantry Telnyashka"
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD)
+
 /datum/equipment_preset/uscm_ship/so/upp/equipped
 	name = "UPP Platoon Commander (Equipped)"
 	flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE

maps/shuttles/dropship_upp.dmm

@@ -33,22 +33,6 @@
 	},
 /turf/open/floor/strata/floor3/east,
 /area/shuttle/ds_upp)
-"fN" = (
-/obj/effect/decal/warning_stripes{
-	icon_state = "W";
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/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/floor3/east,
-/area/shuttle/ds_upp)
 "hg" = (
 /turf/closed/shuttle/ert{
 	icon_state = "upp9"
@@ -71,7 +55,7 @@
 	icon_state = "S";
 	pixel_y = -1
 	},
-/turf/open/floor/strata/floor2,
+/turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "kt" = (
 /obj/effect/decal/strata_decals/catwalk/prison,
@@ -80,7 +64,7 @@
 	pixel_x = 23;
 	network = list("Chapaev","Akademia Nauk")
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "ld" = (
 /obj/effect/attach_point/weapon/midway/left_wing{
@@ -107,7 +91,7 @@
 	dir = 1
 	},
 /obj/effect/decal/strata_decals/catwalk/prison,
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "nZ" = (
 /obj/effect/decal/strata_decals/catwalk/prison,
@@ -116,7 +100,7 @@
 	pixel_x = -23;
 	network = list("Chapaev","Akademia Nauk")
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "pv" = (
 /turf/closed/shuttle/ert{
@@ -161,7 +145,7 @@
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/upp{
 	id = "aft_door"
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "wO" = (
 /turf/closed/shuttle/ert{
@@ -179,7 +163,7 @@
 	dir = 8;
 	pixel_x = -14
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "xE" = (
 /turf/closed/shuttle/ert{
@@ -202,6 +186,9 @@
 	icon_state = "upp21"
 	},
 /area/shuttle/ds_upp)
+"BD" = (
+/turf/open/floor/strata/grey_multi_tiles,
+/area/shuttle/ds_upp)
 "BT" = (
 /turf/closed/shuttle/ert{
 	icon_state = "rightengine_2";
@@ -213,7 +200,7 @@
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
 	pixel_x = 30
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "DG" = (
 /turf/closed/shuttle/ert{
@@ -404,7 +391,7 @@
 	pixel_x = -6;
 	pixel_y = -16
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "Sn" = (
 /obj/effect/decal/warning_stripes{
@@ -424,7 +411,7 @@
 /area/shuttle/ds_upp)
 "Th" = (
 /obj/effect/decal/strata_decals/catwalk/prison,
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "TG" = (
 /turf/closed/shuttle/ert{
@@ -467,7 +454,7 @@
 	icon_state = "N";
 	pixel_y = 1
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "Xe" = (
 /obj/effect/attach_point/weapon/midway/left_fore,
@@ -503,15 +490,15 @@
 /obj/structure/machinery/cm_vending/sorted/medical/wall_med{
 	pixel_x = -30
 	},
-/turf/open/floor/strata/floor3/east,
+/turf/open/floor/strata/grey_multi_tiles,
 /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/floor3/east,
+/turf/open/floor/strata/grey_multi_tiles,
 /area/shuttle/ds_upp)
 "Zm" = (
 /turf/closed/shuttle/ert{
@@ -638,7 +625,7 @@ HB
 Js
 ey
 Yn
-fN
+hS
 hS
 hS
 hS
@@ -648,7 +635,7 @@ cS
 um
 TO
 si
-Yn
+BD
 "}
 (7,1,1) = {"
 Hk