[MIRROR] Adds new sprites for some guns, consolidates _vr file [IDB IGNORE] (#11671)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>

code/modules/mob/living/silicon/robot/dogborg/dog_weapons.dm

@@ -30,7 +30,6 @@
 	fire_delay = 6
 	force = 5
 	icon_state = "medbeam"
-	icon = 'icons/obj/gun_vr.dmi'
 	accuracy = 100
 	fire_sound = 'sound/weapons/eluger.ogg'
 	self_recharge = 1
@@ -66,7 +65,6 @@
 	name = "EW26 Artemis Mounted"
 	desc = "The RayZar EW26 Artemis, also known as the 'phase carbine', is a downsized energy-based weapon specifically designed for use against wildlife. This one has a safety interlock that prevents firing while in proximity to the facility."
 	description_fluff = "RayZar is Ward-Takahashi’s main consumer weapons brand, known for producing and licensing a wide variety of specialist energy weapons of various types and quality primarily for the civilian market."
-	icon = 'icons/obj/gun.dmi'
 	icon_state = "phasecarbine"
 	charge_cost = 160
 	recharge_time = 16

code/modules/projectiles/guns/energy.dm

@@ -1,8 +1,7 @@
 /obj/item/gun/energy
 	name = "energy gun"
 	desc = "A basic energy-based gun."
-	icon = 'icons/obj/gun_ch.dmi' // CHOMPEdit: Gun Sprites
-	icon_state = "energystun" // CHOMPEdit: Gun Sprites
+	icon_state = "energy"
 	fire_sound_text = "laser blast"
 
 	var/obj/item/cell/power_supply //What type of power cell this uses

code/modules/projectiles/guns/energy/bsharpoon_vr.dm

@@ -3,7 +3,7 @@
 	name = "bluespace harpoon"
 	desc = "For climbing on bluespace mountains!"
 
-	icon = 'icons/obj/gun_vr.dmi'
+	icon = 'icons/obj/gun.dmi'
 	icon_state = "harpoon-2"
 
 	w_class = ITEMSIZE_NORMAL

code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm

@@ -44,7 +44,6 @@
 /obj/item/gun/energy/kinetic_accelerator
 	name = "proto-kinetic accelerator"
 	desc = "A self recharging, ranged mining tool that does increased damage in low pressure."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "kineticgun"
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi',

code/modules/projectiles/guns/energy/laser.dm

@@ -374,8 +374,7 @@
 	name = "imperial energy pistol"
 	desc = "An elegant weapon developed by the Imperium Auream. Their weaponsmiths have cleverly found a way to make a gun that \
 	is only about the size of an average energy pistol, yet with the fire power of a laser carbine."
-	icon = 'icons/obj/gun_vr.dmi'
-	icon_override = 'icons/obj/gun_vr.dmi'
+	icon_override = 'icons/obj/gun.dmi'
 	icon_state = "ge_pistol"
 	item_state = "ge_pistol"
 	slot_flags = SLOT_BELT
@@ -392,7 +391,6 @@
 /obj/item/gun/energy/mininglaser
 	name = "mining-laser rifle"
 	desc = "An industrial grade mining laser. Comes with a built-in 'stun' mode for encounters with local wildlife."
-	icon = 'icons/obj/gun.dmi'
 	icon_state = "mininglaser"
 	item_state = "mininglaser"
 	fire_delay = 8

code/modules/projectiles/guns/energy/netgun_vr.dm

@@ -2,10 +2,11 @@
 
 /obj/item/gun/energy/netgun
 	name = "energy net gun"
-	desc = "A Hephaestus-designed, usually dubbed 'non-lethal capture device' energy net launcher, \
-			for when you wanna capture feracious predators." //YW edit - small change to description
-	catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus) //CHOMP Edit? Probably YW actually. Replaces Virgo lore.
-	icon = 'icons/obj/gun_vr.dmi'
+	desc = "Specially made-to-order by Xenonomix, the  \"Varmint Catcher\" is designed to trap even the most unruly of creatures for safe transport."
+	description_fluff = "The Xenonomix Brand XX-1 Energy Net Cannon is a marvel of technology that is used heavily by several departments within NanoTrasen. \
+	Whether by scientific departments when capturing specimens on alien worlds to study or by security forces to detain unruly crew, NanoTrasen is deeply \
+	appreciative of the \"Varmint Catcher\" Netgun System. WARNING!: Xenonomix and NanoTrasen are not responsible for any injuries caused by the device \
+	in any aspect, thank you for understanding."
 	icon_state = "netgun"
 	item_state = "gun" // Placeholder
 

code/modules/projectiles/guns/energy/netgun_yw.dm

@@ -4,7 +4,6 @@
 	desc = "A Hephaestus-designed hybrid of a taser and the energy net gun, usually dubbed 'Hunter' stunner and energy net launcher, \
 			for when you want criminals to stop acting like they're on a 20th century British comedy sketch show."
 	catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus)
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "hunter"
 	item_state = "gun" // Placeholder
 	mode_name = "stun"

code/modules/projectiles/guns/energy/particle.dm

@@ -158,7 +158,7 @@
 
 /obj/item/pressurelock
 	name = "Pressure interlock"
-	icon = 'icons/obj/gun_vr.dmi'
+	icon = 'icons/obj/gun.dmi'
 	icon_state = "pressurelock"
 	desc = "A safety interlock that can be installed in an antiparticle projector. It prevents the weapon from discharging in pressurised environments."
 	w_class = ITEMSIZE_TINY

code/modules/projectiles/guns/energy/pump_ch.dm

@@ -2,8 +2,6 @@
 /obj/item/gun/energy/imperial
 	name = "imperial energy pistol"
 	desc = "An elegant weapon developed by the Imperium Auream. Their weaponsmiths have cleverly found a way to make a gun that is only about the size of an average energy pistol, yet with the fire power of a laser carbine."
-	icon = 'icons/obj/gun_vr.dmi'
-	icon_override = 'icons/obj/gun_vr.dmi'
 	icon_state = "ge_pistol"
 	item_state = "ge_pistol"
 	slot_flags = SLOT_BELT
@@ -54,8 +52,7 @@
 /obj/item/gun/energy/gun/martin
 	name = "holdout energy gun"
 	desc = "The FS PDW E \"Martin\" is small holdout e-gun. Don't miss!"
-	icon = 'icons/obj/gun_vr.dmi'
-	icon_state = "PDW"
+	icon_state = "pdw"
 	item_state = "gun"
 	w_class = ITEMSIZE_SMALL
 	projectile_type = /obj/item/projectile/beam/stun
@@ -118,7 +115,6 @@
 	name = "frontier phaser"
 	desc = "An extraordinarily rugged laser weapon, built to last and requiring effectively no maintenance. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
 	description_fluff = "The NT Brand Model E2 Secured Phaser System, a specialty phaser that has an intergrated chip that prevents the user from opperating the weapon within the vicinity of any NanoTrasen opperated outposts/stations/bases. However, this chip can be disabled so the weapon CAN BE used in the vicinity of any NanoTrasen opperated outposts/stations/bases. The weapon doesn't use traditional weapon power cells and instead works via a pump action that recharges the internal cells. It is a staple amongst exploration personell who usually don't have the license to opperate a lethal weapon through NT and provides them with a weapon that can be recharged away from civilization."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "phaserkill"
 	item_state = "phaser"
 	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob.dmi')
@@ -184,7 +180,6 @@
 	name = "frontier carbine"
 	desc = "A larger and more efficient version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been produced in limited numbers so far.  Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
 	description_fluff = "The NT Brand Model AT2 Secured Phaser System, a specialty phaser that has an intergrated chip that prevents the user from opperating the weapon within the vicinity of any NanoTrasen opperated outposts/stations/bases. However, this chip can be disabled so the weapon CAN BE used in the vicinity of any NanoTrasen opperated outposts/stations/bases. The weapon doesn't use traditional weapon power cells and instead works via a pump action that recharges the internal cells. It is a staple amongst exploration personell who usually don't have the license to opperate a lethal weapon through NT and provides them with a weapon that can be recharged away from civilization."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "carbinekill"
 	item_state = "energykill"
 	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi')
@@ -218,7 +213,6 @@
 /obj/item/gun/energy/locked/frontier/holdout
 	name = "holdout frontier phaser"
 	desc = "An minaturized weapon designed for the purpose of expeditionary support to defend themselves on the field. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "holdoutkill"
 	item_state = null
 	phase_power = 15
@@ -244,7 +238,6 @@
 /obj/item/gun/energy/locked/frontier/rifle
 	name = "frontier marksman rifle"
 	desc = "A much larger, heavier weapon than the typical frontier-type weapons, this DMR can be fired both from the hip, and in scope. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "riflekill"
 	item_state = "sniper"
 	item_state_slots = list(slot_r_hand_str = "lsniper", slot_l_hand_str = "lsniper")
@@ -292,7 +285,6 @@
 /obj/item/gun/energy/locked/frontier/handbow
 	name = "phaser handbow"
 	desc = "An minaturized weapon that fires a bolt of energy. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "handbowkill"
 	item_state = null
 	phase_power = 20

code/modules/projectiles/guns/energy/special_vr.dm

@@ -12,7 +12,6 @@
 	force = 5
 	icon_state = "medbeam"
 	item_state = "medbeam"
-	icon = 'icons/obj/gun_vr.dmi'
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi',
@@ -31,7 +30,6 @@
 /obj/item/gun/energy/bfgtaser
 	name = "9000-series Ball Lightning Taser"
 	desc = "The brainchild of Hephaestus Industries Civil Pacification Division, the BLT-9000 was intended for riot control but despite enthusiastic interest from law-enforcement agencies across the Commonwealth and beyond, its indiscriminate nature led to it being banned from civilian use in virtually all jurisdictions. As a result, most pieces are found in the hands of collectors."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "BFG"
 	fire_sound = 'sound/effects/phasein.ogg'
 	item_state = "mhdhowitzer"

code/modules/projectiles/guns/projectile/automatic_ch.dm

@@ -16,7 +16,6 @@
 	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 9mm rounds."
 	description_fluff = "The leading civilian-sector high-quality small arms subsidiary of Hephaestus Industries, MarsTech has been the provider of choice for law enforcement and security forces for over 300 years."
 
-	icon = 'icons/obj/gun_ch.dmi'
 	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',
@@ -103,7 +102,6 @@
 /obj/item/gun/projectile/automatic/fal
 	name = "FN-FAL"
 	desc = "A 20th century Assault Rifle originally designed by Fabrique National. Famous for its use by mercs in grinding proxy wars in backwater nations. This reproduction was probably made for similar purposes."
-	icon = 'icons/obj/gun_ch.dmi'
 	icon_state = "fal"
 	item_state = "fal"
 	w_class = ITEMSIZE_LARGE

code/modules/projectiles/guns/projectile/automatic_vr.dm

@@ -1,9 +1,6 @@
 /obj/item/gun/projectile/automatic/wt550/lethal
 	magazine_type = /obj/item/ammo_magazine/m9mmt
 
-/obj/item/gun/projectile/automatic/tommygun
-	icon = 'icons/obj/gun_vr.dmi'
-
 ////////////////////////////////////////////////////////////
 //////////////////// Projectile Weapons ////////////////////
 ////////////////////////////////////////////////////////////
@@ -11,9 +8,8 @@
 /obj/item/gun/projectile/automatic/battlerifle
 	name = "\improper USDF service rifle"
 	desc = "You had your chance to be afraid before you joined my beloved Corps! But, to guide you back to the true path, I have brought this motivational device! Uses 9.5x40mm rounds."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "battlerifle"
-	icon_override = 'icons/obj/gun_vr.dmi'
+	icon_override = 'icons/obj/gun.dmi'
 	item_state = "battlerifle_i"
 	item_icons = null
 	w_class = ITEMSIZE_HUGE //CHOMP Edit.
@@ -31,8 +27,7 @@
 // For general use
 /obj/item/gun/projectile/automatic/stg
 	name = "\improper Sturmgewehr"
-	desc = "An STG-560 built by RauMauser. Experience the terror of the Siegfried line, redone for the 26th century! The Kaiser would be proud. Uses unique 7.92x33mm Kurz rounds."
-	icon = 'icons/obj/gun_vr.dmi'
+	desc = "An STG-560 built by RauMauser. Experience the terror of the Siegfried line, redone for the 26th century! The Kaiser would be proud. Uses unique 7.92x33mm Kurz rounds." //CHOMPEdit: 24th->26th
 	icon_state = "stg60"
 	item_state = "arifle"
 	w_class = ITEMSIZE_LARGE
@@ -54,7 +49,6 @@
 /obj/item/gun/projectile/automatic/sol
 	name = "\improper \"Sol\" SMG"
 	desc = "The FS 9x19mm \"Sol\" is a compact and reliable submachine gun. Uses 9mm rounds."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "SMG-IS"
 	item_state = "wt550"
 	w_class = ITEMSIZE_LARGE

code/modules/projectiles/guns/projectile/boltaction.dm

@@ -13,6 +13,7 @@
 	the Tajaran homeworld due to their excellent build quality, precision, and \
 	stopping power. Thier bolt-action rifles and brushguns are a staple amongst \
 	the rural communities that dot this infinite frontier."
+	icon = 'icons/obj/gun.dmi'
 	icon_state = "boltaction"
 	item_state = "boltaction"
 	fire_sound = 'sound/weapons/gunshot_generic_rifle.ogg'

code/modules/projectiles/guns/projectile/boltaction_ch.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/projectile/shotgun/pump/rifle/vox_hunting
 	name = "vox hunting rifle"
 	desc = "This ancient rifle bears traces of an assembly meant to house power cells, implying it used to fire energy beams. It has since been crudely modified to fire standard 7.62mm rounds."
-	icon_state = "vox_hunting"
+	icon_state = "vox_hunting" //Broken
 	item_state = "vox_hunting"
 	ammo_type = /obj/item/ammo_casing/a762
 	throwforce = 10

code/modules/projectiles/guns/projectile/pistol.dm

@@ -81,7 +81,6 @@
 	desc = "The MT Mk58 is a cheap, ubiquitous sidearm, produced by MarsTech. Found pretty much everywhere humans are. Uses .45 rounds."
 	description_fluff = "The leading civilian-sector high-quality small arms brand of Hephaestus Industries, \
 	MarsTech has been the provider of choice for law enforcement and security forces for over 300 years."
-	icon = 'icons/obj/gun_ch.dmi'
 	icon_state = "secguncomp"
 	magazine_type = /obj/item/ammo_magazine/m45/rubber
 	allowed_magazines = list(/obj/item/ammo_magazine/m45)

code/modules/projectiles/guns/projectile/pistol_vr.dm

@@ -16,7 +16,6 @@
 /obj/item/gun/projectile/lamia
 	name = "FS HG .44 \"Lamia\""
 	desc = "Uses .44 rounds."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "Headdeagle"
 	item_state = "revolver"
 	caliber = ".44"
@@ -40,7 +39,6 @@
 /obj/item/gun/projectile/giskard
 	name = "\improper \"Giskard\" holdout pistol"
 	desc = "The FS HG .380 \"Giskard\" can even fit into the pocket! Uses .380 rounds."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_override = 'icons/obj/gun_vr.dmi'
 	icon_state = "giskardcivil"
 	item_state = "giskardcivil"

code/modules/projectiles/guns/projectile/shotgun_ch.dm

@@ -1,7 +1,7 @@
 /obj/item/gun/projectile/shotgun/doublebarrel/quad
 	name = "quad-barreled shotgun"
 	desc = "A shotgun pattern designed to make the most out of the limited machining capability of the frontier. 4 Whole barrels of death, loads using 12 gauge rounds."
-	icon = 'icons/obj/gun_ch.dmi'
+	icon = 'icons/obj/gun.dmi'
 	icon_state = "shotgun_q"
 	item_state = "qshotgun"
 	recoil = 2
@@ -25,8 +25,8 @@
 		)
 
 /obj/item/gun/projectile/shotgun/doublebarrel/sawn/alt
+	icon = 'icons/obj/gun.dmi'
 	sawn_off = 1
-	icon = 'icons/obj/gun_ch.dmi'
 	icon_state = "shotpistol"
 	accuracy = 40
 

code/modules/projectiles/guns/projectile/shotgun_vr.dm

@@ -2,9 +2,8 @@
 /obj/item/gun/projectile/shotgun/pump/USDF
 	name = "\improper USDF tactical shotgun"
 	desc = "All you greenhorns who wanted to see Xenomorphs up close... this is your lucky day. Uses 12g rounds."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "haloshotgun"
-	icon_override = 'icons/obj/gun_vr.dmi'
+	icon_override = 'icons/obj/gun.dmi'
 	item_state = "haloshotgun_i"
 	item_icons = null
 	ammo_type = /obj/item/ammo_casing/a12g
@@ -22,7 +21,7 @@
 	name = "compact shotgun"
 	desc = "Built for <i>extremely</i>-close quarters combat, the Hephaestus Industries KS-55 \"semi-auto shorty\" is a relatively rare sight to see, usually in the hands of elite troops that specialize in boarding. Uses 12g rounds."
 	description_fluff = "The leading arms producer in the SCG, Hephaestus typically only uses its 'top level' branding for its military-grade equipment used by armed forces across human space."
-	icon = 'icons/obj/gun_vr.dmi'
+	icon = 'icons/obj/gun.dmi'
 	icon_state = "compshotc"
 	item_state = "cshotgun"
 	max_shells = 4 //short magazine tube means small capacity

code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm

@@ -9,7 +9,6 @@
 	magazine_type = /obj/item/ammo_magazine/a57
 	allowed_magazines = list(/obj/item/ammo_magazine/a57)
 	projectile_type = /obj/item/projectile/bullet/a57
-	icon = 'icons/obj/gun_ch.dmi'
 	icon_state = "fiveseven"
 	load_method = MAGAZINE
 	muzzle_velocity = 650
@@ -1104,7 +1103,6 @@
 	move_delay = 0
 
 /obj/item/gun/projectile/serdy_pistols
-	icon = 'icons/obj/gun_ch.dmi'
 	bolt_name="slide"
 	bolt_release = "slide release"
 	auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY
@@ -1185,7 +1183,6 @@
 /obj/item/gun/projectile/revolver/nagant
 	name = "nagant revolver"
 	desc = "A 7 shot, gas-seal revolver designed to have increased muzzle velocity by not allowing excess gasses to escape out of the sides of the cylinder. One of the few revolvers that can be suppressed. Good luck finding a suppressor for one, though. Chambered in .357."
-	icon = 'icons/obj/gun_ch.dmi'
 	icon_state = "nagant"
 	max_shells = 7
 	move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
@@ -1193,7 +1190,6 @@
 /obj/item/gun/projectile/revolver/saa
 	name = "Colt Single Action Army"
 	desc = "A Colt Single Action Army. The greatest handgun ever made. Six shots. More than enough to kill anything that moves... Chambered in .45 Long-Colt." //sue me -- Ocelot
-	icon = 'icons/obj/gun_ch.dmi'
 	caliber = ".45 LC"
 	icon_state = "saa"
 	fire_delay = 0 //fastest gun in the west
@@ -1371,7 +1367,6 @@
 	is64x32 = FALSE
 	icon_expected_height = 32
 	icon_expected_width = 32
-	icon = 'icons/obj/gun.dmi'
 
 //caseless.dm
 /obj/item/gun/projectile/caseless
@@ -1393,7 +1388,6 @@
 	bolt_release = "slide release"
 	auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY
 	muzzle_velocity = 253	//M1911
-	icon = 'icons/obj/gun_ch.dmi'
 	icon_state = "m1911"
 
 /obj/item/gun/projectile/colt/Initialize(mapload)
@@ -1662,14 +1656,12 @@
 	slot_flags |= (SLOT_BELT|SLOT_HOLSTER) //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not.
 	name = "sawn-off shotgun"
 	desc += " The barrel seems to be crudely sawn in half."
-	icon = 'icons/obj/gun_ch.dmi'
 	icon_state = "sawnshotgun[shotgun_variant]"
 	icon_expected_width = 32
 	update_icon()
 	update_transform()
 
 /obj/item/gun/projectile/shotgun/doublebarrel/sawn //Default sawn shotgun needs it's old icon path back
-	icon = 'icons/obj/gun.dmi'
 
 /obj/item/gun/projectile/shotgun/doublebarrel/Initialize(mapload)
 	. = ..()

code/modules/vore/resizing/sizegun_slow_vr.dm

@@ -4,7 +4,7 @@
 /obj/item/slow_sizegun
 	name = "gradual size gun"
 	desc = "A highly advanced ray gun, designed for progressive and gradual changing of size. Size trading can be toggled on via alt-clicking."
-	icon = 'icons/obj/gun_vr.dmi'
+	icon = 'icons/obj/gun.dmi'
 	icon_state = "sizegun-old-0"
 	var/base_icon_state = "sizegun-old"
 	w_class = ITEMSIZE_NORMAL

code/modules/vore/resizing/sizegun_vr.dm

@@ -4,7 +4,6 @@
 /obj/item/gun/energy/sizegun
 	name = "size gun" //I have no idea why this was called shrink ray when this increased and decreased size.
 	desc = "A highly advanced ray gun with a knob on the side to adjust the size you desire. Warning: Do not insert into mouth."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "sizegun-shrink100"
 	item_state = "sizegun"
 	var/initial_icon_state = "sizegun"

code/modules/xenobio/items/weapons_vr.dm

@@ -1,7 +1,7 @@
 /obj/item/xenobio
 	name = "xenobio gun"
 	desc = "You shouldn't see this!"
-	icon = 'icons/obj/gun_vr.dmi'
+	icon = 'icons/obj/gun.dmi'
 	icon_state = "harpoon-2"
 	var/loadable_item = null
 	var/loaded_item = null

maps/redgate/fantasy_items.dm

@@ -406,7 +406,7 @@
 	name = "teleportation wand"
 	desc = "An odd wand that weighs more than it looks like it should. It has a wire protruding from it and a glass-like tip, suggesting there may be more tech behind this than magic."
 
-	icon = 'icons/obj/gun_vr.dmi'
+	icon = 'icons/obj/gun.dmi'
 	icon_state = "harpoonwand-2"
 
 /obj/item/bluespace_harpoon/wand/update_icon()
@@ -534,7 +534,7 @@ This device records all warnings given and teleport events for admin review in c
 /obj/item/slow_sizegun/magic
 	name = "wand of growth and shrinking"
 	desc = "A wand said to be able to shrink or grow it's targets, it's encrusted with glowing gems and a... trigger?"
-	icon = 'icons/obj/gun_vr.dmi'
+	icon = 'icons/obj/gun.dmi'
 	icon_state = "sizegun-magic-0"
 	base_icon_state = "sizegun-magic"
 

modular_chomp/code/modules/projectiles/guns/pump.dm

@@ -4,7 +4,6 @@
 /obj/item/gun/energy/locked/frontier/shotgun
 	name = "frontier shotgun"
 	desc = "A much larger, heavier weapon than the typical frontier-type weapons. This one has a safety interlock that prevents firing while in proximity to the facility."
-	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "oldphaser" //note to self, make a unquie more fitting sprite at some point.
 	item_state = "sniper"
 	item_state_slots = list(slot_r_hand_str = "lsniper", slot_l_hand_str = "lsniper")

modular_chomp/code/modules/projectiles/guns/zBallisticPort/bullet.dm

@@ -1001,7 +1001,6 @@
 	move_delay = 0
 
 /obj/item/gun/projectile/serdy_pistols
-	icon = 'icons/obj/gun_ch.dmi'
 	bolt_name="slide"
 	bolt_release = "slide release"
 	auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY
@@ -1076,7 +1075,6 @@
 /obj/item/gun/projectile/revolver/nagant
 	name = "nagant revolver"
 	desc = "A 7 shot, gas-seal revolver designed to have increased muzzle velocity by not allowing excess gasses to escape out of the sides of the cylinder. One of the few revolvers that can be suppressed. Good luck finding a suppressor for one, though. Chambered in .357."
-	icon = 'icons/obj/gun_ch.dmi'
 	icon_state = "nagant"
 	max_shells = 7
 	move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
@@ -1084,7 +1082,6 @@
 /obj/item/gun/projectile/revolver/saa
 	name = "Colt Single Action Army"
 	desc = "A Colt Single Action Army. The greatest handgun ever made. Six shots. More than enough to kill anything that moves... Chambered in .45 Long-Colt." //sue me -- Ocelot
-	icon = 'icons/obj/gun_ch.dmi'
 	caliber = ".45"
 	icon_state = "saa"
 	fire_delay = 0 //fastest gun in the west
@@ -1221,7 +1218,6 @@
 	is64x32 = FALSE
 	icon_expected_height = 32
 	icon_expected_width = 32
-	icon = 'icons/obj/gun.dmi'
 
 //caseless.dm
 /obj/item/gun/projectile/caseless
@@ -1240,7 +1236,6 @@
 	bolt_name="slide"
 	bolt_release = "slide release"
 	auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY
-	icon = 'icons/obj/gun_ch.dmi'
 	icon_state = "m1911"
 
 /obj/item/gun/projectile/colt/Initialize(mapload)
@@ -1466,14 +1461,12 @@
 	slot_flags |= (SLOT_BELT|SLOT_HOLSTER) //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not.
 	name = "sawn-off shotgun"
 	desc += " The barrel seems to be crudely sawn in half."
-	icon = 'icons/obj/gun_ch.dmi'
 	icon_state = "sawnshotgun[shotgun_variant]"
 	icon_expected_width = 32
 	update_icon()
 	update_transform()
 
 /obj/item/gun/projectile/shotgun/doublebarrel/sawn //Default sawn shotgun needs it's old icon path back
-	icon = 'icons/obj/gun.dmi'
 
 /obj/item/gun/projectile/shotgun/doublebarrel/Initialize(mapload)
 	. = ..()