C-20R rework, new wielded gun sprites

2025-12-10 10:12:45 +00:00 · 2023-07-14 17:33:51 +10:00
parent 58bce63a6c
commit 690596cbf8
10 changed files with 252 additions and 6 deletions
--- a/code/modules/projectiles/ammunition/zz_autolathe_ch.dm
+++ b/code/modules/projectiles/ammunition/zz_autolathe_ch.dm
@@ -57,6 +57,16 @@
 	path = /obj/item/ammo_magazine/a57p90/hp
 	hidden = 1

+/datum/category_item/autolathe/arms/c20r/ap
+	name = "C-20R Magazine (10mm Armor-Piercing)"
+	path = /obj/item/ammo_magazine/m10mm/ap
+	hidden = 1
+
+/datum/category_item/autolathe/arms/c20r/hp
+	name = "C-20R Magazine (10mm Hollow-Point)"
+	path = /obj/item/ammo_magazine/m10mm/hp
+	hidden = 1
+
 /datum/category_item/autolathe/arms/svd_762
 	name = "SVD magazine (7.62x54mmR)"
 	path = /obj/item/ammo_magazine/m762svd
--- a/code/modules/projectiles/ammunition/zz_magazines_ch.dm
+++ b/code/modules/projectiles/ammunition/zz_magazines_ch.dm
@@ -36,6 +36,54 @@
 /obj/item/ammo_magazine/a57p90/empty
 	initial_ammo = 0

+/*
+ * C-20R MAGAZINES
+*/
+
+/obj/item/ammo_magazine/m10mm
+	name = "\improper C-20R Magazine (10mm Standard)"
+	desc = "A 20-round magazine for the C-20R, loaded with caseless ammunition."
+	icon_state = "10mm"
+	mag_type = MAGAZINE
+	ammo_type = /obj/item/ammo_casing/a10mm
+	matter = list(MAT_STEEL = 3000)
+	caliber = "10mm"
+	max_ammo = 20
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/m10mm/ap
+	name = "\improper C-20R Magazine (10mm Armor-Piercing)"
+	desc = "A 20-round magazine for the C-20R, loaded with caseless armor-piercing ammunition."
+	matter = list(MAT_STEEL = 3500)
+	ammo_type = /obj/item/ammo_casing/a10mm/ap
+
+/obj/item/ammo_magazine/m10mm/hp
+	name = "\improper C-20R Magazine (10mm Hollow-Point)"
+	desc = "A 20-round magazine for the C-20R, loaded with caseless hollow-point ammunition."
+	matter = list(MAT_STEEL = 3500)
+	ammo_type = /obj/item/ammo_casing/a10mm/hp
+
+/obj/item/ammo_magazine/m10mm/practice
+	name = "\improper C-20R Magazine (10mm Practice)"
+	desc = "A 20-round magazine for the C-20R, loaded with caseless practice rounds."
+	matter = list(MAT_STEEL = 1500)
+	ammo_type = /obj/item/ammo_casing/a10mm/practice
+
+/obj/item/ammo_magazine/m10mm/rubber
+	name = "\improper C-20R Magazine (10mm Rubber)"
+	desc = "A 20-round magazine for the C-20R, loaded with caseless rubber ammunition."
+	matter = list(MAT_STEEL = 2500)
+	ammo_type = /obj/item/ammo_casing/a10mm/rubber
+
+/obj/item/ammo_magazine/m10mm/emp
+	name = "\improper C-20R Magazine (10mm Haywire EMP)"
+	desc = "A 20-round magazine for the C-20R, loaded with caseless electromagnetic ammunition."
+	matter = list(MAT_STEEL = 3000, MAT_URANIUM = 1000)
+	ammo_type = /obj/item/ammo_casing/a10mm/emp
+
+/obj/item/ammo_magazine/m10mm/empty
+	initial_ammo = 0
+
 /*
 * PLACEHOLDER
 */
--- a/code/modules/projectiles/ammunition/zz_rounds_ch.dm
+++ b/code/modules/projectiles/ammunition/zz_rounds_ch.dm
@@ -1,7 +1,4 @@
 //Overrides
-/obj/item/ammo_casing/a10mm
-	projectile_type = /obj/item/projectile/bullet/a10mm
-
 /obj/item/ammo_casing/a38
 	projectile_type = /obj/item/projectile/bullet/a38

@@ -42,9 +39,45 @@
 	projectile_type = /obj/item/projectile/bullet/pistol/rubber

 /*
- * PLACEHOLDER
+ * C-20R ROUNDS
 */

+/obj/item/ammo_casing/a10mm
+	name = "\improper 10mm cartridge"
+	desc = "A standard caseless 10mm round."
+	caliber = "10mm"
+	projectile_type = /obj/item/projectile/bullet/a10mm
+	matter = list(MAT_STEEL = 60)
+	caseless = 1
+
+/obj/item/ammo_casing/a10mm/ap
+	desc = "A caseless armor-piercing 10mm round."
+	projectile_type = /obj/item/projectile/bullet/a10mm/ap
+
+/obj/item/ammo_casing/a10mm/hp
+	desc = "A caseless hollow-point 10mm round."
+	projectile_type = /obj/item/projectile/bullet/a10mm/hp
+
+/obj/item/ammo_casing/a10mm/practice
+	desc = "A caseless practice 10mm round."
+	icon_state = "r-casing"
+	projectile_type = /obj/item/projectile/bullet/practice
+
+/obj/item/ammo_casing/a10mm/rubber
+	desc = "A caseless rubber 10mm round."
+	projectile_type = /obj/item/projectile/bullet/pistol/rubber
+	icon_state = "r-casing"
+
+/obj/item/ammo_casing/a10mm/emp
+	name = "\improper 10mm EMP cartridge"
+	desc = "A caseless, technologically advanced 10mm round with an electromagnetic payload."
+	projectile_type = /obj/item/projectile/ion/small
+	icon_state = "empcasing"
+	matter = list(MAT_STEEL = 60, MAT_URANIUM = 50)
+
+/*
+ * PLACEHOLDER
+*/
 /obj/item/ammo_casing/a762x25
 	desc = "A standard 7.62x25mm Tokarev round"
 	caliber = "7.62x25mm"
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -19,6 +19,7 @@
 /*
 * Advanced SMG
 */
+
 /obj/item/weapon/gun/projectile/automatic/advanced_smg
 	name = "advanced SMG"
 	desc = "An advanced submachine gun with a reflective laser optic that makes burst fire less inaccurate than other SMGs. Uses 9mm rounds."
@@ -50,6 +51,9 @@
 /*
 * C-20r
 */
+
+ /* CHOMPedit remove: Moved to automatic_ch.dm. *
+
 /obj/item/weapon/gun/projectile/automatic/c20r
 	name = "submachine gun"
 	desc = "The C-20r is a lightweight and rapid firing SMG, for when you REALLY need someone dead. It has 'Scarborough Arms - Per falcis, per pravitas', inscribed on the stock. Uses 10mm rounds."
@@ -84,6 +88,8 @@
 		icon_state = "c20r"
 	return

+ * CHOMPedit remove: Moved to automatic_ch.dm. */
+
 /*
 * Assault Carbine (STS-35)
 */
--- a/code/modules/projectiles/guns/projectile/automatic_ch.dm
+++ b/code/modules/projectiles/guns/projectile/automatic_ch.dm
@@ -9,6 +9,8 @@
 * SUBMACHINE GUNS
 */

+// P90K
+
 /obj/item/weapon/gun/projectile/automatic/p90
 	name = "\improper P90K PDW"
 	desc = "The P90K Personal Defense Weapon is a MarsTech-assembled modernized variation of the ancient FN P90, a compact, high-capacity submachine gun of human origin. Its fierce reputation owes to its minimal recoil and ergonomic design. Chambered in 5.7x28mm caseless rounds."
@@ -40,12 +42,58 @@

 	firemodes = list(
 		list(mode_name="semi-automatic", burst=1, fire_delay=0, move_delay=0),
-		list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_delay=1, move_delay=0, burst_accuracy=list(0,-15,-20), dispersion=list(0.0, 1.0, 1.5))
+		list(mode_name="three-round burst", burst=3, fire_delay=null, burst_delay=1, move_delay=0, burst_accuracy=list(0,-15,-20), dispersion=list(0.0, 1.0, 1.5))
 		)

 /obj/item/weapon/gun/projectile/automatic/p90/update_icon() // Code for visually updating the item depending on current magazine capacity.
 	icon_state = "p90smgnew-[ammo_magazine ? round(ammo_magazine.stored_ammo.len, 6) : "empty"]"

+// C-20R
+
+/obj/item/weapon/gun/projectile/automatic/c20r
+	name = "\improper C-20R"
+	desc = "The C-20R is a lightweight, heavy-hitting submachine gun with an infamous reputation for being the weapon of choice among mercenary outfits and insurgent cabals. It has 'Scarborough Arms - Per Falcis, Per Pravitas' inscribed on the stock. Chambered in 10mm caseless rounds."
+	description_fluff = "The C-20R is produced by Scarborough Arms, a specialist high-end weapons manufacturer based out of Titan, Sol. Scarborough has resisted numerous efforts by Trans-Stellars to acquire the brand since its founding in 2511, and has gained a dedicated following among a certain flavor of private operative."
+
+	icon = 'icons/obj/64x32guns_ch.dmi'
+	icon_expected_width = 64
+	item_icons = list(
+		slot_l_hand_str = 'modular_chomp/icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'modular_chomp/icons/mob/items/righthand_guns_ch.dmi',
+		)
+	icon_state = "c20r"
+	item_state = "c20rnew"
+	wielded_item_state = "c20rnew-wielded"
+	slot_flags = SLOT_BELT|SLOT_BACK
+
+	w_class = ITEMSIZE_LARGE
+	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2, TECH_ILLEGAL = 8)
+
+	recoil = 0
+	one_handed_penalty = 30
+	auto_eject = 1
+	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
+
+	caliber = "10mm"
+	ammo_type = /obj/item/ammo_casing/a10mm
+	load_method = MAGAZINE
+	magazine_type = /obj/item/ammo_magazine/m10mm
+	allowed_magazines = list(/obj/item/ammo_magazine/m10mm)
+
+	firemodes = list(
+		list(mode_name="semi-automatic", burst=1, fire_delay=0, move_delay=0),
+		list(mode_name="two-shot rapidfire", burst=2, fire_delay=null, burst_delay=1, move_delay=0, burst_accuracy=list(-5,-10), dispersion=list(0.5, 1.0)),
+		)
+
+/obj/item/weapon/gun/projectile/automatic/c20r/update_icon()
+	icon_state = "c20r-[ammo_magazine ? round(ammo_magazine.stored_ammo.len,4) : "empty"]"
+
+/obj/item/weapon/gun/projectile/automatic/c20r/rubber
+	magazine_type = /obj/item/ammo_magazine/m10mm/rubber
+
+/obj/item/weapon/gun/projectile/automatic/c20r/empty
+	magazine_type = null
+
 /*
 * RIFLES
 */
--- a/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
+++ b/code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
@@ -130,6 +130,12 @@
 	name = "Krinkov"
 	desc = "A professionally cut down AKM made to be easily concealable. With a 12 inch barrel, this is a very loud short barrel rifle. Illegal pretty much everywhere, and easy to get a hold of, these classic russian firearms are a mainstay amidst the various criminal organizations across the galaxy."
 	caliber = "7.62x39mm"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "krink"
+	wielded_item_state = "krink-wielded"
 	magazine_type = /obj/item/ammo_magazine/akm
 	allowed_magazines = list(/obj/item/ammo_magazine/akm)
 	icon_state = "krinkov"
@@ -148,6 +154,12 @@
 	name = "AKM"
 	desc = "The tried and true, old fashioned chatterbox. Ivan's favorite. Best used while at least somewhat inebriated. Chambered in 7.62x39mm."
 	caliber = "7.62x39mm"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "akm"
+	wielded_item_state = "akm-wielded"
 	magazine_type = /obj/item/ammo_magazine/akm
 	allowed_magazines = list(/obj/item/ammo_magazine/akm)
 	icon_state = "akm"
@@ -167,6 +179,12 @@
 	name = "AKM"
 	desc = "The 'Stalingrad Special'. This rickety old AKM has seen better days. Better bring some vodka, because every shot this gun manages to squeeze off without blowing up in your face is worthy of celebration. Chambered in 7.62x39mm"
 	caliber = "7.62x39mm"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "akm"
+	wielded_item_state = "akm-wielded"
 	magazine_type = /obj/item/ammo_magazine/akm
 	allowed_magazines = list(/obj/item/ammo_magazine/akm)
 	icon_state = "scrapak"
@@ -186,6 +204,12 @@
 	name = "AK-74"
 	desc = "The tried and true, old fashioned chatterbox. Ivan's favorite. Best used while at least somewhat inebriated. Chambered in 5.45x39mm."
 	caliber = "5.45mm"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "akm"
+	wielded_item_state = "akm-wielded"
 	magazine_type = /obj/item/ammo_magazine/ak74
 	allowed_magazines = list(/obj/item/ammo_magazine/ak74)
 	icon_state = "ak74"
@@ -234,6 +258,12 @@
 	name = "SOK-94"
 	desc = "Otherwise known as a Vepr Super. An AK pattern rifle, based on the beefier RPK chassis, to handle larger caliber rounds. Like an SVD but cooler. Chambered in 7.62x54mmR."
 	caliber = "7.62x54mmR"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "akm"
+	wielded_item_state = "akm-wielded"
 	magazine_type = /obj/item/ammo_magazine/m762svd
 	allowed_magazines = list(/obj/item/ammo_magazine/m762svd)
 	icon_state = "hunter"
@@ -264,7 +294,12 @@
 	name = "M16A2"
 	desc = "A favorite service rifle everywhere, even today. It might be a reproduction, but Eugene Stoner smiles upon every man or woman who wields this beautiful democracy dispensing machine, even if it's never seen the soil of Terra, and never will. Chambered in 5.56x45mm."
 	caliber = "5.56x45mm"
-
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "m16"
+	wielded_item_state = "m16-wielded"
 	magazine_type = /obj/item/ammo_magazine/m16
 	allowed_magazines = list(/obj/item/ammo_magazine/m16)
 	icon_state="m16"
@@ -282,6 +317,12 @@
 	name = "M4A1"
 	desc = "The M16's shorter, more lightweight little brother. An old terran flag is stamped into the receiver. These guns can be found just about everywhere. A favorite on the rimworlds due to its simplicity to produce, and reliability. Chambered in 5.56x45mm."
 	caliber = "5.56x45mm"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "m4"
+	wielded_item_state = "m4-wielded"
 	magazine_type = /obj/item/ammo_magazine/m16
 	allowed_magazines = list(/obj/item/ammo_magazine/m16)
 	icon_state="m4"
@@ -300,6 +341,12 @@
 	name = "Patriot"
 	desc = "I raised you, and loved you, I've given you weapons, taught you techniques, endowed you with knowledge. There's nothing more for me to give you. All that's left for you to take is my life. 'Still in a dream' is stamped into the receiver, and it has no serial number. Chambered in 5.56x45mm."
 	caliber = "5.56x45mm"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "m16"
+	wielded_item_state = "m16-wielded"
 	magazine_type = /obj/item/ammo_magazine/m16/patriot
 	allowed_magazines = list(/obj/item/ammo_magazine/m16)
 	icon_state="patriot"
@@ -335,6 +382,12 @@
 	name = "M41A/2"
 	desc = "The Armat M41A Pulse Rifle is a pulse-action assault rifle chambered for 10×24mm Caseless ammunition. This one is a rare, and fairly competent replica of the original by Scarborough Arms, with some minor design improvements over the original. The aluminium chassis is painted steel blue, and it has 'Scarborough Arms - Per falcis, per pravitas' inscribed on the stock."
 	caliber = "10x24mm"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "m41ab"
+	wielded_item_state = "m41ab-wielded"
 	magazine_type = /obj/item/ammo_magazine/m41
 	allowed_magazines = list(/obj/item/ammo_magazine/m41)
 	icon_state="m41b"
@@ -353,6 +406,12 @@
 	name = "M41A"
 	desc = "A tried and true original. The Armat M41A Pulse Rifle is a pulse-action assault rifle chambered for 10×24mm Caseless ammunition. 'PEACE THROUGH SUPERIOR FIREPOWER' is stamped into the side of the aluminium chassis."
 	caliber = "10x24mm"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "m41a"
+	wielded_item_state = "m41a-wielded"
 	magazine_type = /obj/item/ammo_magazine/m41
 	allowed_magazines = list(/obj/item/ammo_magazine/m41)
 	icon_state="m41a"
@@ -487,6 +546,12 @@
 	name = "Type 901 Assault rifle"
 	desc = "A heavy bullpup assault rifle of unknown make, with a very high muzzle velocity and fair accuracy. A favorite of scum and villainy everywhere due to its complete lack of identification markings. Popularized by the 2541 movie, 'Boarding Party'. Chambered in 7.62x51mm."
 	caliber = "7.62mm"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "t901"
+	wielded_item_state = "t901-wielded"
 	auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY | LOCK_SLAPPABLE
 	magazine_type = /obj/item/ammo_magazine/type901
 	allowed_magazines = list(/obj/item/ammo_magazine/type901)
@@ -514,6 +579,12 @@
 	name = "AWP"
 	desc = "A galaxy-wide favorite for hunting, target shooting, and rushing B. Legend has it, this rifle originated from three guys in a garage. This one is a reproduction. It has 'Scarborough Arms - Per falcis, per pravitas' inscribed on the stock. Chambered in .338 Lapua."
 	caliber = ".338"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "awp"
+	wielded_item_state = "awp-wielded"
 	auto_loading_type = NO_AUTO_LOAD
 	magazine_type = /obj/item/ammo_magazine/awp
 	allowed_magazines = list(/obj/item/ammo_magazine/awp)
@@ -544,6 +615,12 @@
 	name = "Hectate II"
 	desc = "An old world anti material rifle. Ideal for dealing with mechs, armored personnel, and space dragons. Chambered in .50 BMG."
 	caliber = ".50 BMG"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "hectate"
+	wielded_item_state = "hectate-wielded"
 	auto_loading_type = NO_AUTO_LOAD
 	magazine_type = /obj/item/ammo_magazine/hectate
 	allowed_magazines = list(/obj/item/ammo_magazine/hectate)
@@ -575,6 +652,12 @@
 	name = "Hardbass Special"
 	desc = "Три полоски, три по три полоски Три полоски, три по три полоски Три полоски, три по три полоски Три полоски, три по три полоски Три полоски, три по три полоски Три полоски, три по три полоски. Chambered in 7.62x39mm"
 	caliber = "7.62x39mm"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "akm"
+	wielded_item_state = "akm-wielded"
 	magazine_type = /obj/item/ammo_magazine/akm
 	allowed_magazines = list(/obj/item/ammo_magazine/akm)
 	icon_state = "memegun"
@@ -690,6 +773,12 @@
 	name = "Spas-35"
 	desc = "A complex pump shotgun, modelled after the classic Spas-12. Upgraded with durable parts to fix the flaws of the classic. Also sometimes called the T-35, if you're with the SGC or the USDF. The absolute king of CQC encounters. 8 round capacity, chambered in 12 gauge."
 	caliber = "12g"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "spas12"
+	wielded_item_state = "spas12-wielded"
 	icon_state = "spas12"
 	ammo_type = /obj/item/ammo_casing/a12g/pellet
 	projectile_type = /obj/item/projectile/bullet/shotgun
@@ -710,6 +799,12 @@
 	name = "PPSh-17b"
 	desc = "A cheap remake of the venerable russian PPSh-41. Empties a 71 round magazine in less than 10 seconds. Compensates for poor accuracy with volume of bullet. Every inscription on this thing is in pan-slavic. Chambered in 7.62x25mm Tokarev."
 	caliber = "7.62x25mm"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "ppsh"
+	wielded_item_state = "ppsh-wielded"
 	magazine_type = /obj/item/ammo_magazine/ppsh
 	allowed_magazines = list(/obj/item/ammo_magazine/ppsh)
 	icon_state="ppsh"
@@ -726,6 +821,12 @@
 	name = "MP5"
 	desc = "A favorite of law enforcement and corporate security across the galaxy for centuries. This old H&K design has survived the test of time. And while in many places it has been replaced long ago, it still stands as a reliable weapon platform. No need to fix what isn't broken. Chambered in 9mm."
 	caliber = "9mm"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_guns_ch.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_guns_ch.dmi',
+		)
+	item_state = "mp5"
+	wielded_item_state = "mp5-wielded"
 	magazine_type = /obj/item/ammo_magazine/mp5mag
 	allowed_magazines = list(/obj/item/ammo_magazine/mp5mag)
 	icon_state="mp5"