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

* Adds new sprites for some guns, consolidates _vr file CHANGED: Captains laser new sprite: https://i.imgur.com/LbelowO.png Energy gun new sprite: https://i.imgur.com/0KSAIEW.png Nagant new sprite: https://i.imgur.com/6BtQdO6.png Makarov new sprite: https://i.imgur.com/ojBjcwb.png SecGun new sprite: https://i.imgur.com/snhIhB7.png StunRevolver new sprite: https://i.imgur.com/2Iy29CH.png (The vintage stun revolver still exists, so the old sprite is still accessible) * Shrink netgun
2026-08-22 03:27:46 +01:00 · 2025-09-17 21:34:14 -04:00
parent 7d2f7652d5
commit dc34a164b2
16 changed files with 10 additions and 26 deletions
@@ -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
@@ -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
@@ -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',
@@ -359,8 +359,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
@@ -377,7 +376,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
@@ -7,7 +7,6 @@
 	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 = 'icons/obj/gun_vr.dmi'
 	icon_state = "netgun"
 	item_state = "gun" // Placeholder

@@ -157,7 +157,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
@@ -10,7 +10,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',
@@ -29,7 +28,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"
@@ -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_LARGE
@@ -32,7 +28,6 @@
 /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 24th century! The Kaiser would be proud. Uses unique 7.92x33mm Kurz rounds."
-	icon = 'icons/obj/gun_vr.dmi'
 	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
@@ -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
@@ -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
@@ -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"
@@ -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