diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm
index a6b066c6b5..94aec4f750 100644
--- a/code/datums/supply_packs/black_market.dm
+++ b/code/datums/supply_packs/black_market.dm
@@ -151,7 +151,7 @@ Non-USCM items, from CLF, UPP, colonies, etc. Mostly combat-related.
 					new /obj/item/ammo_magazine/smg/mac15(src)
 					new /obj/item/ammo_magazine/smg/mac15(src)
 		if(4) //upp
-			new /obj/item/weapon/gun/shotgun/type23/riot(src)
+			new /obj/item/weapon/gun/shotgun/pump/type23(src)
 			new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag(src)
 			new /obj/item/ammo_magazine/handful/shotgun/heavy/beanbag(src)
 			new /obj/item/ammo_magazine/handful/shotgun/heavy/flechette(src)
diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm
index 98da1d1ed7..fd37d58926 100644
--- a/code/modules/gear_presets/upp.dm
+++ b/code/modules/gear_presets/upp.dm
@@ -863,10 +863,11 @@ var/random_name
 	skills = /datum/skills/cmb
 	assignment = "People's Police Militsiya"
 	role_comm_title = "MILTSY"
+	access = list(ACCESS_UPP_SECURITY, ACCESS_UPP_GENERAL)
 	paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0)
 	idtype = /obj/item/card/id/silver
 
-/datum/equipment_preset/upp/security/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/upp/police/load_gear(mob/living/carbon/human/new_human)
 
 	new_human.undershirt = "undershirt"
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/peaked/police, WEAR_HEAD)
diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm
index bb45d7f34a..3000606d42 100644
--- a/code/modules/projectiles/guns/shotguns.dm
+++ b/code/modules/projectiles/guns/shotguns.dm
@@ -400,17 +400,37 @@ can cause issues with ammo types getting mixed up during the burst.
 	recoil_unwielded = RECOIL_AMOUNT_TIER_1
 
 
-/obj/item/weapon/gun/shotgun/type23/riot
+/obj/item/weapon/gun/shotgun/pump/type23
 	name = "\improper KS-29 riot shotgun"
 	desc = "A contemporary semi-automatic design based off of the KS-23, a Soviet-era riot shotgun chambered in 6 gauge shells. Like its Naval Infantry sibling, it is downgraded to 8 gauge chambering in order to make it more controllable without much loss to overall firepower and allow for easier storage of large quantities of shells on the individual user. Its internal tube magazine can store 4 shells."
 	icon = 'icons/obj/items/weapons/guns/guns_by_faction/upp.dmi'
 	icon_state = "type23_wood"
 	item_state = "type23_wood"
+	fire_sound = 'sound/weapons/gun_type23.ogg'
+	current_mag = /obj/item/ammo_magazine/internal/shotgun/type23
+	attachable_allowed = list(
+		/obj/item/attachable/stock/type23/wood,
+		)
+	flags_gun_features = GUN_CAN_POINTBLANK|GUN_INTERNAL_MAG
+	flags_equip_slot = SLOT_BACK
+	gauge = "8g"
 	starting_attachment_types = list(/obj/item/attachable/stock/type23/wood)
 
-/obj/item/weapon/gun/shotgun/type23/riot/set_gun_attachment_offsets()
+/obj/item/weapon/gun/shotgun/pump/type23/set_gun_attachment_offsets()
 	attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19,"rail_x" = 13, "rail_y" = 21, "under_x" = 24, "under_y" = 15, "stock_x" = 16, "stock_y" = 15)
 
+/obj/item/weapon/gun/shotgun/pump/type23/set_gun_config_values()
+	..()
+	set_fire_delay(FIRE_DELAY_TIER_8)
+	accuracy_mult = BASE_ACCURACY_MULT
+	accuracy_mult_unwielded = BASE_ACCURACY_MULT
+	scatter = SCATTER_AMOUNT_TIER_4
+	scatter_unwielded = SCATTER_AMOUNT_TIER_1
+	damage_mult = BASE_BULLET_DAMAGE_MULT
+	recoil = RECOIL_AMOUNT_TIER_1
+	recoil_unwielded = RECOIL_AMOUNT_TIER_1
+
+
 //-------------------------------------------------------
 //DOUBLE SHOTTY
 
diff --git a/code/modules/projectiles/magazines/shotguns.dm b/code/modules/projectiles/magazines/shotguns.dm
index 064df8688f..a2e26808a9 100644
--- a/code/modules/projectiles/magazines/shotguns.dm
+++ b/code/modules/projectiles/magazines/shotguns.dm
@@ -125,6 +125,17 @@ GLOBAL_LIST_INIT(shotgun_boxes_12g, list(
 	transfer_handful_amount = 4
 	max_rounds = 24
 	caliber = "8g"
+
+/obj/item/ammo_magazine/shotgun/beanbag/heavy
+	name = "box of heavy beanbag shells"
+	desc = "A box filled with beanbag slug shotgun shells. 8 Gauge."
+	icon = 'icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi'
+	icon_state = "heavy_beanbag"
+	default_ammo = /datum/ammo/bullet/shotgun/heavy/beanbag
+	transfer_handful_amount = 4
+	max_rounds = 24
+	caliber = "8g"
+
 //-------------------------------------------------------
 
 /*