New UPP guns (#3865)

# About the pull request

Adds a bunch of new UPP guns to replace ill-fitting ones, respites
others, removes others, also does some balance changes that I feel would
be good for the game, nothing too outrageous I believe.

**All sprites by wei/esselnek** 

[lore and
stuff](https://docs.google.com/document/d/11eKNeVflsxy57fFg1GcwNZk9llqRnnlJolEU36MBEh0/edit?usp=sharing)

Look at changelog and code for specific changes unless i get asked by a
dev to list them here

# Explain why it's good for the game

New UPP guns to replace old things that don't make sense, better
sprites, IMO needed balance changes.


# Testing Photographs and Procedure

![image](https://github.com/cmss13-devs/cmss13/assets/103988604/89227b16-94b1-4632-b223-0e5eee6d6547)
Slightly outdated and I forgot Type 23, but mostly correct. Look at
imagediff for type 23 sprite

# Changelog
I might have forgotten a thing or two since I've been working on this on
and off since April, but from what I can tell mostly there

:cl: 
add: Adds 6(8 if you're pedantic) new guns for the UPP, details for each
in following lines.
add: Type 19, Replacement for PPsh on colonies and black market.
add: Type 64, replacement for scorpion, full sized SMG, 2 versions, 1
for upp, 1 for not upp
add: HJRA-12, RPG for UPP.
add: Type 73, pistol for higher ranked UPP troops, UPP COs get a Type 74
which has high-impact rounds, replaces PK9 in non-UPP use.
add: NP92, pistol, replaces PK9 in UPP use(mostly), integrally
suppressed version called NPZ92 for UPP Commandos.
add: QYJ-72, UPP GPMG, replaces minigun with UPP Minigunners
add: Technically resprites but due to changes closer to replaces N-Y
revolver with ZHNK-72
add: Adds a character custom loadout Type 73, 2 mags spare.
add: UPP helmets now work as ear protection, intended use with HJRA-12
RPG
add: UPP officers now have regular UM4 helmets instead of UH7 helmets in
their vendors as UH7 looked ugly with their combat gear
del: Removes the PK9 entirely
del: Removes tranqs from UPP Commando loadout
del: Removes HEAP ammo from UPP officers and commandos, replaced with
normal and AP mags when applicable
balance: UPP jackets no longer have massive armor, in exchange they no
longer slow and in clothing vendors a light version of UPP armor is
vendable
balance: UPP MPs are now armed with a ZHNK-72 belt on their jacket, with
an additional shrapnelshot loader in their belt.
balance: Rebalances Type 71 damage/firerate/AP to be a sidegrade of
M41A, about equal DPS, higher damage per shot and AP, lower fire rate,
carbine is round-about the exact same as M41A however.
balance: Fixes UPP support armor, given to medics on their person and
officers in their vendor, lighter version of UPP armor, exchanges
protection for speed.
balance: Seperates SVD bullet damage from crude rifle bullet and buffs
it as a hard-hitting AP bullet.
balance: Rebalances UPP revolver(now ZHNK-72), much harder hitting and
has higher AP, but rarer, shrapnelshot extremely rare and good.
balance: Due to ammo changes, SVD no longer has burst.
balance: Removes ceramic plates from UPP loadouts
fix: UPP Major now has the correct UPP Commander skillset
fix: UPP Commander skillset can BE
fix: Fixes typepath for UPP support/light armor, actually works now.
spellcheck: Renames SVD to Type 88
spellcheck: Renames UPP Minigunner to UPP Machinegunner
spellcheck: Renames UPP jackets to UL4 all around
soundadd: Adds firing sounds for Type 73 and SVD/UPP MG
imageadd: Resprites the SVD, Type 71, and Type 23, all sprites by
wei/esselnek
imageadd: Adds sprites for all above guns, all sprites by wei/esselnek
maptweak: Changes instances of skorpion to non-upp type 64, also changes
instances of ppsh to type 19
/:cl:

code/datums/agents/tools/tranq_gun.dm

@@ -1,7 +1,7 @@
 /obj/item/weapon/gun/pistol/tranquilizer
 	name = "Tranquilizer gun"
 	desc = "Contains horse tranquilizer darts. Useful at knocking people out."
-	icon = 'icons/obj/items/weapons/guns/guns_by_faction/upp.dmi'
+	icon = 'icons/obj/items/weapons/guns/guns_by_faction/event.dmi'
 	icon_state = "pk9r"
 	item_state = "pk9r"
 	current_mag = /obj/item/ammo_magazine/pistol/tranq
@@ -28,7 +28,7 @@
 	name = "\improper Tranquilizer magazine (Horse Tranquilizer)"
 	default_ammo = /datum/ammo/bullet/pistol/tranq
 	caliber = ".22"
-	icon = 'icons/obj/items/weapons/guns/ammo_by_faction/upp.dmi'
+	icon = 'icons/obj/items/weapons/guns/ammo_by_faction/event.dmi'
 	icon_state = "pk-9_tranq"
 	max_rounds = 5
 	gun_type = /obj/item/weapon/gun/pistol/tranquilizer

code/datums/emergency_calls/upp.dm

@@ -77,14 +77,14 @@
 		var/equipment_path = /datum/equipment_preset/upp/specialist
 		if(heavy_pick)
 			if(HAS_FLAG(H.client.prefs.toggles_ert, PLAY_HEAVY) && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER))
-				equipment_path = pick(/datum/equipment_preset/upp/specialist, /datum/equipment_preset/upp/minigunner)
+				equipment_path = pick(/datum/equipment_preset/upp/specialist, /datum/equipment_preset/upp/machinegunner)
 			else if(HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && !HAS_FLAG(H.client.prefs.toggles_ert, PLAY_HEAVY))
-				equipment_path = /datum/equipment_preset/upp/minigunner
+				equipment_path = /datum/equipment_preset/upp/machinegunner
 		arm_equipment(H, equipment_path, TRUE, TRUE)
 	else if(smartgunners < max_smartgunners && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(H.client, JOB_SQUAD_SMARTGUN, time_required_for_job))
 		smartgunners++
 		to_chat(H, SPAN_ROLE_HEADER("You are a sergeant of the Union of Progressive People, a powerful socialist state that rivals the United Americas!"))
-		arm_equipment(H, /datum/equipment_preset/upp/minigunner, TRUE, TRUE)
+		arm_equipment(H, /datum/equipment_preset/upp/machinegunner, TRUE, TRUE)
 	else
 		to_chat(H, SPAN_ROLE_HEADER("You are a soldier of the Union of Progressive People, a powerful socialist state that rivals the United Americas!"))
 		arm_equipment(H, /datum/equipment_preset/upp/soldier, TRUE, TRUE)

code/datums/factions/clf.dm

@@ -31,12 +31,12 @@
 		list("PRIMARY FIREARMS", 0, null, null, null),
 		list("ABR-40 Hunting Rifle", 30, /obj/item/weapon/gun/rifle/l42a/abr40, null, VENDOR_ITEM_REGULAR),
 		list("Basira-Armstrong Bolt-Action", 15, /obj/item/weapon/gun/boltaction, null, VENDOR_ITEM_REGULAR),
-		list("CZ-81 Machine Pistol", 20, /obj/item/ammo_magazine/pistol/skorpion, null, VENDOR_ITEM_REGULAR),
 		list("Double Barrel Shotgun", 30, /obj/item/weapon/gun/shotgun/double, null, VENDOR_ITEM_REGULAR),
 		list("HG 37-12 Pump Shotgun", 30, /obj/item/weapon/gun/shotgun/double/sawn, null, VENDOR_ITEM_REGULAR),
 		list("M16 Rifle", 30, /obj/item/weapon/gun/rifle/m16, null, VENDOR_ITEM_REGULAR),
 		list("MAR-30 Battle Carbine", 30, /obj/item/weapon/gun/rifle/mar40/carbine, null, VENDOR_ITEM_REGULAR),
 		list("MAR-40 Battle Rifle", 30, /obj/item/weapon/gun/rifle/mar40, null, VENDOR_ITEM_REGULAR),
+		list("Type-64 Submachinegun", 20, /obj/item/weapon/gun/smg/bizon, null, VENDOR_ITEM_REGULAR),
 		list("MAC-15 Submachinegun", 20, /obj/item/weapon/gun/smg/mac15, null, VENDOR_ITEM_REGULAR),
 		list("MP27 Submachinegun", 20, /obj/item/weapon/gun/smg/mp27, null, VENDOR_ITEM_REGULAR),
 		list("MP5 Submachinegun", 20, /obj/item/weapon/gun/smg/mp5, null, VENDOR_ITEM_REGULAR),
@@ -48,12 +48,12 @@
 		list("Box Of Buckshot Shells", 10, /obj/item/ammo_magazine/shotgun/buckshot, null, VENDOR_ITEM_REGULAR),
 		list("Box Of Flechette Shells", 10, /obj/item/ammo_magazine/shotgun/flechette, null, VENDOR_ITEM_REGULAR),
 		list("Box Of Shotgun Slugs", 10, /obj/item/ammo_magazine/shotgun, null, VENDOR_ITEM_REGULAR),
-		list("CZ-81 Magazine (.32ACP)", 5, /obj/item/ammo_magazine/pistol/skorpion, null, VENDOR_ITEM_REGULAR),
 		list("M16 AP Magazine (5.56x45mm)", 15, /obj/item/ammo_magazine/rifle/m16/ap, null, VENDOR_ITEM_REGULAR),
 		list("M16 Magazine (5.56x45mm)", 5, /obj/item/ammo_magazine/rifle/m16, null, VENDOR_ITEM_REGULAR),
 		list("MAC-15 Magazine (9mm)", 5, /obj/item/ammo_magazine/smg/mac15, null, VENDOR_ITEM_REGULAR),
 		list("MAR Magazine (7.62x39mm)", 5, /obj/item/ammo_magazine/rifle/mar40, null, VENDOR_ITEM_REGULAR),
 		list("MAR Extended Magazine (7.62x39mm)", 15, /obj/item/ammo_magazine/rifle/mar40/extended, null, VENDOR_ITEM_REGULAR),
+		list("Type-64 Helical Magazine (.7.62x19mm)", 5, /obj/item/ammo_magazine/smg/bizon, null, VENDOR_ITEM_REGULAR),
 		list("MP27 Magazine (4.6x30mm)", 5, /obj/item/ammo_magazine/smg/mp27, null, VENDOR_ITEM_REGULAR),
 		list("MP5 Magazine (9mm)", 5, /obj/item/ammo_magazine/smg/mp5, null, VENDOR_ITEM_REGULAR),
 
@@ -99,13 +99,13 @@
 		list("PRIMARY FIREARMS", -1, null, null),
 		list("ABR-40 Hunting Rifle", 30, /obj/item/weapon/gun/rifle/l42a/abr40, null, VENDOR_ITEM_REGULAR),
 		list("Basira-Armstrong Bolt-Action", 15, /obj/item/weapon/gun/boltaction, null, VENDOR_ITEM_REGULAR),
-		list("CZ-81 Machine Pistol", 20, /obj/item/ammo_magazine/pistol/skorpion, VENDOR_ITEM_REGULAR),
 		list("Double Barrel Shotgun", 20, /obj/item/weapon/gun/shotgun/double, VENDOR_ITEM_REGULAR),
 		list("HG 37-12 Pump Shotgun", 20, /obj/item/weapon/gun/shotgun/double/sawn, VENDOR_ITEM_REGULAR),
 		list("M16 Rifle", 20, /obj/item/weapon/gun/rifle/m16, VENDOR_ITEM_REGULAR),
 		list("MAC-15 Submachinegun", 20, /obj/item/weapon/gun/smg/mac15, VENDOR_ITEM_REGULAR),
 		list("MAR-30 Battle Carbine", 20, /obj/item/weapon/gun/rifle/mar40/carbine, VENDOR_ITEM_REGULAR),
 		list("MAR-40 Battle Rifle", 20, /obj/item/weapon/gun/rifle/mar40, VENDOR_ITEM_REGULAR),
+		list("Type 64 Submachinegun", 20, /obj/item/weapon/gun/smg/bizon, VENDOR_ITEM_REGULAR),
 		list("MP27 Submachinegun", 20, /obj/item/weapon/gun/smg/mp27, VENDOR_ITEM_REGULAR),
 		list("MP5 Submachinegun", 20, /obj/item/weapon/gun/smg/mp5, VENDOR_ITEM_REGULAR),
 		list("Sawn-Off Shotgun", 20, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, VENDOR_ITEM_REGULAR),
@@ -116,12 +116,12 @@
 		list("Box Of Buckshot Shells", 15, /obj/item/ammo_magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
 		list("Box Of Flechette Shells", 15, /obj/item/ammo_magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
 		list("Box Of Shotgun Slugs", 15, /obj/item/ammo_magazine/shotgun, VENDOR_ITEM_REGULAR),
-		list("CZ-81 Magazine (.32ACP)", 60, /obj/item/ammo_magazine/pistol/skorpion, VENDOR_ITEM_REGULAR),
 		list("M16 AP Magazine (5.56x45mm)", 10, /obj/item/ammo_magazine/rifle/m16/ap, VENDOR_ITEM_REGULAR),
 		list("M16 Magazine (5.56x45mm)", 60, /obj/item/ammo_magazine/rifle/m16, VENDOR_ITEM_REGULAR),
 		list("MAC-15 Magazine (9mm)", 60, /obj/item/ammo_magazine/smg/mac15, VENDOR_ITEM_REGULAR),
 		list("MAR Magazine (7.62x39mm)", 60, /obj/item/ammo_magazine/rifle/mar40, VENDOR_ITEM_REGULAR),
 		list("MAR Extended Magazine (7.62x39mm)", 10, /obj/item/ammo_magazine/rifle/mar40/extended, VENDOR_ITEM_REGULAR),
+		list("Type 64 Helical Magazine (7.62x19mm)", 60, /obj/item/ammo_magazine/smg/bizon, VENDOR_ITEM_REGULAR),
 		list("MP27 Magazine (4.6x30mm)", 60, /obj/item/ammo_magazine/smg/mp27, VENDOR_ITEM_REGULAR),
 		list("MP5 Magazine (9mm)", 60, /obj/item/ammo_magazine/smg/mp5, VENDOR_ITEM_REGULAR),
 

code/datums/factions/upp.dm

@@ -47,24 +47,24 @@
 /datum/faction/upp/get_antag_guns_snowflake_equipment()
 	return list(
 		list("PRIMARY FIREARMS", 0, null, null, null),
-		list("CZ-81 Machine Pistol", 20, /obj/item/weapon/gun/pistol/skorpion/upp, null, VENDOR_ITEM_REGULAR),
+		list("Type 64 Submachinegun", 20, /obj/item/weapon/gun/smg/bizon/upp, null, VENDOR_ITEM_REGULAR),
 		list("Type 71 Pulse Rifle", 30, /obj/item/weapon/gun/rifle/type71, null, VENDOR_ITEM_REGULAR),
 		list("Type 71 Pulse Rifle Carbine", 30, /obj/item/weapon/gun/rifle/type71/carbine, null, VENDOR_ITEM_REGULAR),
 
 		list("PRIMARY AMMUNITION", 0, null, null, null),
-		list("CZ-81 Magazine (.32ACP)", 5, /obj/item/ammo_magazine/pistol/skorpion, null, VENDOR_ITEM_REGULAR),
+		list("Type 64 Helical Magazine (7.62x19mm)", 5, /obj/item/ammo_magazine/smg/bizon, null, VENDOR_ITEM_REGULAR),
 		list("Type 71 AP Magazine (5.45x39mm)", 15, /obj/item/ammo_magazine/rifle/type71/ap, null, VENDOR_ITEM_REGULAR),
 		list("Type 71 Magazine (5.45x39mm)", 5, /obj/item/ammo_magazine/rifle/type71, null, VENDOR_ITEM_REGULAR),
 
 		list("SIDEARMS", 0, null, null, null),
-		list("Highpower Automag", 15, /obj/item/weapon/gun/pistol/highpower, null, VENDOR_ITEM_REGULAR),
-		list("Korovin PK-9 Pistol", 15, /obj/item/weapon/gun/pistol/c99/upp, null, VENDOR_ITEM_REGULAR),
-		list("N-Y 7.62mm Revolver", 15, /obj/item/weapon/gun/revolver/nagant, null, VENDOR_ITEM_REGULAR),
+		list("Type 73 Pistol", 25, /obj/item/weapon/gun/pistol/t73, null, VENDOR_ITEM_REGULAR),
+		list("NP92 Pistol", 15, /obj/item/weapon/gun/pistol/np92, null, VENDOR_ITEM_REGULAR),
+		list("ZHNK-72 Revolver", 15, /obj/item/weapon/gun/revolver/upp, null, VENDOR_ITEM_REGULAR),
 
 		list("SIDEARM AMMUNITION", 0, null, null, null),
-		list("Highpower Magazine (9mm)", 5, /obj/item/ammo_magazine/pistol/highpower, null, VENDOR_ITEM_REGULAR),
-		list("N-Y Speed Loader (7.62x38mmR)", 5, /obj/item/ammo_magazine/revolver/upp, null, VENDOR_ITEM_REGULAR),
-		list("PK-9 Magazine (.22 Hollowpoint)", 5, /obj/item/ammo_magazine/pistol/c99, null, VENDOR_ITEM_REGULAR),
+		list("Type 73 Magazine (7.62x25mm Tokarev)", 5, /obj/item/ammo_magazine/pistol/t73, null, VENDOR_ITEM_REGULAR),
+		list("ZHNK-72 Speed Loader (7.62x38mmR)", 5, /obj/item/ammo_magazine/revolver/upp, null, VENDOR_ITEM_REGULAR),
+		list("NP92 Magazine (9x18mm Makarov)", 40, /obj/item/ammo_magazine/pistol/np92, null, VENDOR_ITEM_REGULAR),
 
 		list("ATTACHMENTS", 0, null, null, null),
 		list("Angled Grip", 15, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR),
@@ -86,24 +86,24 @@
 /datum/faction/upp/get_antag_guns_sorted_equipment()
 	return list(
 		list("PRIMARY FIREARMS", -1, null, null),
-		list("CZ-81 Machine Pistol", 20, /obj/item/weapon/gun/pistol/skorpion/upp, VENDOR_ITEM_REGULAR),
+		list("Type 64 Submachinegun", 20, /obj/item/weapon/gun/smg/bizon/upp, VENDOR_ITEM_REGULAR),
 		list("Type 71 Pulse Rifle", 20, /obj/item/weapon/gun/rifle/type71, VENDOR_ITEM_REGULAR),
 		list("Type 71 Pulse Rifle Carbine", 20, /obj/item/weapon/gun/rifle/type71/carbine, VENDOR_ITEM_REGULAR),
 
 		list("PRIMARY AMMUNITION", -1, null, null),
-		list("CZ-81 Magazine (.32ACP)", 60, /obj/item/ammo_magazine/pistol/skorpion, VENDOR_ITEM_REGULAR),
+		list("Type 64 Helical Magazine (7.62x19mm)", 60, /obj/item/ammo_magazine/smg/bizon, VENDOR_ITEM_REGULAR),
 		list("Type 71 AP Magazine (5.45x39mm)", 60, /obj/item/ammo_magazine/rifle/type71/ap, VENDOR_ITEM_REGULAR),
 		list("Type 71 Magazine (5.45x39mm)", 60, /obj/item/ammo_magazine/rifle/type71, VENDOR_ITEM_REGULAR),
 
 		list("SIDEARMS", -1, null, null),
-		list("Highpower Automag", 20, /obj/item/weapon/gun/pistol/highpower, VENDOR_ITEM_REGULAR),
-		list("Korovin PK-9 Pistol", 20, /obj/item/weapon/gun/pistol/c99/upp, VENDOR_ITEM_REGULAR),
-		list("N-Y 7.62mm Revolver", 20, /obj/item/weapon/gun/revolver/nagant, VENDOR_ITEM_REGULAR),
+		list("Type 73 Pistol", 20, /obj/item/weapon/gun/pistol/t73, VENDOR_ITEM_REGULAR),
+		list("NP02 Pistol", 20, /obj/item/weapon/gun/pistol/np92, VENDOR_ITEM_REGULAR),
+		list("ZHNK-72 Revolver", 20, /obj/item/weapon/gun/revolver/upp, VENDOR_ITEM_REGULAR),
 
 		list("SIDEARM AMMUNITION", -1, null, null),
-		list("Highpower Magazine (9mm)", 40, /obj/item/ammo_magazine/pistol/highpower, VENDOR_ITEM_REGULAR),
-		list("N-Y Speed Loader (7.62x38mmR)", 40, /obj/item/ammo_magazine/revolver/upp, VENDOR_ITEM_REGULAR),
-		list("PK-9 Magazine (.22 Hollowpoint)", 40, /obj/item/ammo_magazine/pistol/c99, VENDOR_ITEM_REGULAR),
+		list("Type 73 Magazine (7.62x25mm Tokarev)", 40, /obj/item/ammo_magazine/pistol/t73, VENDOR_ITEM_REGULAR),
+		list("ZHNK-72 Speed Loader (7.62x38mmR)", 40, /obj/item/ammo_magazine/revolver/upp, VENDOR_ITEM_REGULAR),
+		list("NP92 Magazine (9x18mm Makarov)", 40, /obj/item/ammo_magazine/pistol/np92, VENDOR_ITEM_REGULAR),
 
 		list("UTILITIES", -1, null, null),
 		list("M94 Marking Flare Pack", 20, /obj/item/storage/box/m94, VENDOR_ITEM_RECOMMENDED),

code/datums/skills.dm

@@ -1290,6 +1290,7 @@ UNITED PROGRESSIVE PEOPLES
 		SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_JTAC = SKILL_JTAC_EXPERT,
+		SKILL_EXECUTION = SKILL_EXECUTION_TRAINED,
 	)
 /datum/skills/upp/conscript
 	name = "UPP Conscript"

code/datums/supply_packs/black_market.dm

@@ -332,15 +332,15 @@ Additionally, weapons that are way too good to put in the basically-flavor black
 	dollar_cost = 5
 	containertype = /obj/structure/largecrate/black_market
 
-/datum/supply_packs/contraband/seized/ppsh
-	name = "PPSh-17b submachinegun crate (x5 magazines included)"
+/datum/supply_packs/contraband/seized/pps43
+	name = "Type-19 submachinegun crate (x5 magazines included)"
 	contains = list(
-		/obj/item/weapon/gun/smg/ppsh,
-		/obj/item/ammo_magazine/smg/ppsh/extended,
-		/obj/item/ammo_magazine/smg/ppsh/extended,
-		/obj/item/ammo_magazine/smg/ppsh,
-		/obj/item/ammo_magazine/smg/ppsh,
-		/obj/item/ammo_magazine/smg/ppsh,
+		/obj/item/weapon/gun/smg/pps43,
+		/obj/item/ammo_magazine/smg/pps43/extended,
+		/obj/item/ammo_magazine/smg/pps43/extended,
+		/obj/item/ammo_magazine/smg/pps43,
+		/obj/item/ammo_magazine/smg/pps43,
+		/obj/item/ammo_magazine/smg/pps43,
 	)
 	dollar_cost = 15
 	containertype = /obj/structure/largecrate/black_market
@@ -373,18 +373,18 @@ Additionally, weapons that are way too good to put in the basically-flavor black
 	dollar_cost = 45
 	containertype = /obj/structure/largecrate/black_market
 
-/datum/supply_packs/contraband/seized/c99
-	name = "Korovin PK-9 pistol crate (x6 magazines included)"
+/datum/supply_packs/contraband/seized/t73
+	name = "Type 73 pistol crate (x6 magazines included)"
 	contains = list(
-		/obj/item/weapon/gun/pistol/c99,
-		/obj/item/ammo_magazine/pistol/c99,
-		/obj/item/ammo_magazine/pistol/c99,
-		/obj/item/ammo_magazine/pistol/c99,
-		/obj/item/ammo_magazine/pistol/c99,
-		/obj/item/ammo_magazine/pistol/c99,
-		/obj/item/ammo_magazine/pistol/c99,
+		/obj/item/weapon/gun/pistol/t73,
+		/obj/item/ammo_magazine/pistol/t73,
+		/obj/item/ammo_magazine/pistol/t73,
+		/obj/item/ammo_magazine/pistol/t73,
+		/obj/item/ammo_magazine/pistol/t73,
+		/obj/item/ammo_magazine/pistol/t73,
+		/obj/item/ammo_magazine/pistol/t73,
 	)
-	dollar_cost = 5
+	dollar_cost = 15
 	containertype = /obj/structure/largecrate/black_market
 
 /datum/supply_packs/contraband/seized/kt42
@@ -415,14 +415,14 @@ Additionally, weapons that are way too good to put in the basically-flavor black
 	dollar_cost = 5
 	containertype = /obj/structure/largecrate/black_market
 
-/datum/supply_packs/contraband/seized/skorpion
-	name = "CZ-81 machine pistol (x4 magazines included)"
+/datum/supply_packs/contraband/seized/bizon
+	name = "Type 64 Submachinegun (x4 magazines included)"
 	contains = list(
-		/obj/item/weapon/gun/pistol/skorpion,
-		/obj/item/ammo_magazine/pistol/skorpion,
-		/obj/item/ammo_magazine/pistol/skorpion,
-		/obj/item/ammo_magazine/pistol/skorpion,
-		/obj/item/ammo_magazine/pistol/skorpion,
+		/obj/item/weapon/gun/smg/bizon,
+		/obj/item/ammo_magazine/smg/bizon,
+		/obj/item/ammo_magazine/smg/bizon,
+		/obj/item/ammo_magazine/smg/bizon,
+		/obj/item/ammo_magazine/smg/bizon,
 	)
 	dollar_cost = 15
 	containertype = /obj/structure/largecrate/black_market
@@ -456,18 +456,18 @@ Additionally, weapons that are way too good to put in the basically-flavor black
 	dollar_cost = 15
 	containertype = /obj/structure/largecrate/black_market
 
-/datum/supply_packs/contraband/seized/nagant
-	name = "N-Y 7.62mm revolver (x6 magazines included)"
+/datum/supply_packs/contraband/seized/upprevolver
+	name = "ZHNK-72 revolver (x6 magazines included)"
 	contains = list(
-		/obj/item/weapon/gun/revolver/nagant,
+		/obj/item/weapon/gun/revolver/upp,
 		/obj/item/ammo_magazine/revolver/upp,
 		/obj/item/ammo_magazine/revolver/upp,
 		/obj/item/ammo_magazine/revolver/upp,
 		/obj/item/ammo_magazine/revolver/upp,
 		/obj/item/ammo_magazine/revolver/upp,
 		/obj/item/ammo_magazine/revolver/upp,
 	)
-	dollar_cost = 10
+	dollar_cost = 15
 	containertype = /obj/structure/largecrate/black_market
 
 /datum/supply_packs/contraband/seized/r4t
@@ -1067,23 +1067,23 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro
 				new picked_type(loc)
 			loot_message = SPAN_NOTICE("It's some strange elite gear...?")
 		if(11 to 15)
-			//Skorpion
-			new /obj/item/weapon/gun/pistol/skorpion(loc)
-			new /obj/item/ammo_magazine/pistol/skorpion(loc)
-			new /obj/item/ammo_magazine/pistol/skorpion(loc)
-			new /obj/item/ammo_magazine/pistol/skorpion(loc)
+			//Type 64
+			new /obj/item/weapon/gun/smg/bizon(loc)
+			new /obj/item/ammo_magazine/smg/bizon(loc)
+			new /obj/item/ammo_magazine/smg/bizon(loc)
+			new /obj/item/ammo_magazine/smg/bizon(loc)
 			// Somehow they found a Webley.
 			new /obj/item/weapon/gun/revolver/m44/custom/webley(loc)
 			new /obj/item/ammo_magazine/revolver/webley(loc)
 			new /obj/item/ammo_magazine/revolver/webley(loc)
 			new /obj/item/ammo_magazine/revolver/webley(loc)
 			loot_message = SPAN_NOTICE("It's some CLF pistol armaments!")
 		if(16 to 20)
-			// PPSH
-			new /obj/item/weapon/gun/smg/ppsh/with_drum_mag(loc)
-			new /obj/item/ammo_magazine/smg/ppsh/extended(loc)
-			new /obj/item/ammo_magazine/smg/ppsh/extended(loc)
-			new /obj/item/ammo_magazine/smg/ppsh/extended(loc)
+			// Type 19
+			new /obj/item/weapon/gun/smg/pps43/extended_mag(loc)
+			new /obj/item/ammo_magazine/smg/pps43/extended(loc)
+			new /obj/item/ammo_magazine/smg/pps43/extended(loc)
+			new /obj/item/ammo_magazine/smg/pps43/extended(loc)
 			// MAC-15
 			new /obj/item/weapon/gun/smg/mac15/extended(loc)
 			new /obj/item/ammo_magazine/smg/mac15/extended(loc)

code/game/machinery/vending/vendor_types/antag/antag_gear.dm

@@ -49,9 +49,9 @@
 
 /obj/effect/essentials_set/upp_heavy
 	spawned_gear_list = list(
-		/obj/item/weapon/gun/minigun/upp,
-		/obj/item/ammo_magazine/minigun,
-		/obj/item/ammo_magazine/minigun,
+		/obj/item/weapon/gun/pkp,
+		/obj/item/ammo_magazine/pkp,
+		/obj/item/ammo_magazine/pkp,
 	)
 
 /obj/effect/essentials_set/leader/upp

code/game/objects/effects/spawners/random.dm

@@ -400,7 +400,6 @@
 		/obj/item/weapon/gun/revolver/small = /obj/item/ammo_magazine/revolver/small,
 		/obj/item/weapon/gun/pistol/heavy = /obj/item/ammo_magazine/pistol/heavy,
 		/obj/item/weapon/gun/pistol/skorpion = /obj/item/ammo_magazine/pistol/skorpion,
-		/obj/item/weapon/gun/pistol/skorpion/upp = /obj/item/ammo_magazine/pistol/skorpion,
 		)
 
 /obj/effect/spawner/random/gun/pistol/lowchance
@@ -494,7 +493,7 @@
 		/obj/item/weapon/gun/smg/mp27 = /obj/item/ammo_magazine/smg/mp27,
 		/obj/item/weapon/gun/smg/mp27 = /obj/item/ammo_magazine/smg/mp27,
 		/obj/item/weapon/gun/smg/mp27 = /obj/item/ammo_magazine/smg/mp27,
-		/obj/item/weapon/gun/smg/ppsh = /obj/item/ammo_magazine/smg/ppsh,
+		/obj/item/weapon/gun/smg/pps43 = /obj/item/ammo_magazine/smg/pps43,
 		/obj/item/weapon/gun/smg/mac15 = /obj/item/ammo_magazine/smg/mac15,
 		/obj/item/weapon/gun/smg/mac15 = /obj/item/ammo_magazine/smg/mac15,
 		/obj/item/weapon/gun/smg/uzi = /obj/item/ammo_magazine/smg/uzi,

code/game/objects/items/shards.dm

@@ -232,13 +232,13 @@
 		organ.take_damage(damage_on_move * count, 0, 0, no_limb_loss = TRUE)
 		embedded_mob.pain.apply_pain(damage_on_move * count)
 
-/obj/item/shard/shrapnel/nagant
+/obj/item/shard/shrapnel/upp
 	name = "small shrapnel"
 	desc = "Some shrapnel that used to be embedded underneath someone's skin."
 	icon_state = "small"
 	damage_on_move = 2
 
-/obj/item/shard/shrapnel/nagant/bits
+/obj/item/shard/shrapnel/upp/bits
 	name = "tiny shrapnel"
 	desc = "A tiny piece of shrapnel that used to be embedded underneath someone's skin."
 	icon_state = "tiny"