diff --git a/archive/icons/obj/gun.dmi b/archive/icons/obj/gun.dmi new file mode 100644 index 00000000000..fc591df5e9f Binary files /dev/null and b/archive/icons/obj/gun.dmi differ diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_weapons.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_weapons.dm index d2edf3757df..74c4db7c5aa 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_weapons.dm +++ b/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 diff --git a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm index 70ab841e58c..4677c938191 100644 --- a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm +++ b/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 diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm index 6946f3c8f64..b9ec5d36af3 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm +++ b/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', diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index f584d5ee56b..ece4dbb132c 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -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 diff --git a/code/modules/projectiles/guns/energy/netgun_vr.dm b/code/modules/projectiles/guns/energy/netgun_vr.dm index fd40e400277..3b7db0c8f6e 100644 --- a/code/modules/projectiles/guns/energy/netgun_vr.dm +++ b/code/modules/projectiles/guns/energy/netgun_vr.dm @@ -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 diff --git a/code/modules/projectiles/guns/energy/particle.dm b/code/modules/projectiles/guns/energy/particle.dm index f5dbde6f48d..b51f1ac6bb3 100644 --- a/code/modules/projectiles/guns/energy/particle.dm +++ b/code/modules/projectiles/guns/energy/particle.dm @@ -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 diff --git a/code/modules/projectiles/guns/energy/special_vr.dm b/code/modules/projectiles/guns/energy/special_vr.dm index 5660e9b4164..26aeaf70f38 100644 --- a/code/modules/projectiles/guns/energy/special_vr.dm +++ b/code/modules/projectiles/guns/energy/special_vr.dm @@ -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" diff --git a/code/modules/projectiles/guns/projectile/automatic_vr.dm b/code/modules/projectiles/guns/projectile/automatic_vr.dm index 7b762fbe68c..8b9fb4f792c 100644 --- a/code/modules/projectiles/guns/projectile/automatic_vr.dm +++ b/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_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 diff --git a/code/modules/projectiles/guns/projectile/shotgun_vr.dm b/code/modules/projectiles/guns/projectile/shotgun_vr.dm index 17948831870..5797c1a4c7e 100644 --- a/code/modules/projectiles/guns/projectile/shotgun_vr.dm +++ b/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 extremely-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 diff --git a/code/modules/vore/resizing/sizegun_slow_vr.dm b/code/modules/vore/resizing/sizegun_slow_vr.dm index c9d73952f3d..a046dafaef8 100644 --- a/code/modules/vore/resizing/sizegun_slow_vr.dm +++ b/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 diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index 26a9b942a81..f79db7a82cf 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/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" diff --git a/code/modules/xenobio/items/weapons_vr.dm b/code/modules/xenobio/items/weapons_vr.dm index 40828395e27..ca4cb59780e 100644 --- a/code/modules/xenobio/items/weapons_vr.dm +++ b/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 diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index d83bf81aedf..f8e17f51a2c 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ diff --git a/icons/obj/gun_vr.dmi b/icons/obj/gun_vr.dmi deleted file mode 100644 index 3e5e1665f60..00000000000 Binary files a/icons/obj/gun_vr.dmi and /dev/null differ diff --git a/maps/redgate/fantasy_items.dm b/maps/redgate/fantasy_items.dm index 6520b2cb271..0792a7b036c 100644 --- a/maps/redgate/fantasy_items.dm +++ b/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"