Fixes icons for lockers, guns and flare. (#2247)

* Pistols

* Fixes gun icons

* Fixes all locker sprites

* Moved cursed locker from fills

* Fixes flare icon

Resources/Prototypes/Catalog/Fills/lockers.yml

@@ -346,12 +346,3 @@
   id: WardrobeMixedFilled
   suffix: Filled
   parent: WardrobeMixed
-
-- type: entity
-  id: LockerCursed
-  parent: LockerGeneric
-  name: "closet"
-  suffix: "cursed"
-  description: "A standard-issue Nanotrasen storage unit."
-  components:
-    - type: CursedEntityStorage

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml

@@ -7,4 +7,5 @@
     visuals:
     - type: StorageVisualizer
       state: cabinet
-
+  - type: Icon
+    state: cabinet_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/cargo.yml

@@ -7,4 +7,5 @@
     visuals:
     - type: StorageVisualizer
       state: qm
-
+  - type: Icon
+    state: qm_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/command.yml

@@ -7,7 +7,8 @@
     visuals:
     - type: StorageVisualizer
       state: cap
-
+  - type: Icon
+    state: cap_icon
 
 - type: entity
   id: LockerHeadOfPersonnel
@@ -18,4 +19,5 @@
     visuals:
     - type: StorageVisualizer
       state: hop
-
+  - type: Icon
+    state: hop_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/engineering.yml

@@ -8,7 +8,8 @@
     visuals:
     - type: StorageVisualizer
       state: ce
-
+  - type: Icon
+    state: ce_icon
 
 # Electrical supplies
 - type: entity
@@ -21,7 +22,8 @@
     - type: StorageVisualizer
       state: eng
       state_closed: eng_elec_door
-
+  - type: Icon
+    state: eng_elec_icon
 
 # Welding supplies
 - type: entity
@@ -34,7 +36,8 @@
     - type: StorageVisualizer
       state: eng
       state_closed: eng_weld_door
-
+  - type: Icon
+    state: eng_weld_icon
 
 # Atmos tech
 - type: entity
@@ -46,7 +49,8 @@
     visuals:
     - type: StorageVisualizer
       state: atmos
-
+  - type: Icon
+    state: atmos_icon
 
 # Engineer
 - type: entity
@@ -58,4 +62,5 @@
     visuals:
     - type: StorageVisualizer
       state: eng_secure
-
+  - type: Icon
+    state: eng_secure_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/freezer.yml

@@ -7,4 +7,5 @@
     visuals:
     - type: StorageVisualizer
       state: freezer
-
+  - type: Icon
+    state: freezer_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/hydroponics.yml

@@ -7,4 +7,5 @@
     visuals:
     - type: StorageVisualizer
       state: hydro
-
+  - type: Icon
+    state: hydro_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/medical.yml

@@ -9,7 +9,8 @@
     visuals:
     - type: StorageVisualizer
       state: med
-
+  - type: Icon
+    state: med_icon
 
 # Medical doctor
 - type: entity
@@ -21,7 +22,8 @@
     visuals:
     - type: StorageVisualizer
       state: med_secure
-
+  - type: Icon
+    state: med_secure_icon
 
 # Chemical
 - type: entity
@@ -34,7 +36,8 @@
     - type: StorageVisualizer
       state: med
       state_closed: chemical_door
-
+  - type: Icon
+    state: chemical_icon
 
 # CMO
 - type: entity
@@ -46,4 +49,5 @@
     visuals:
     - type: StorageVisualizer
       state: cmo
-
+  - type: Icon
+    state: cmo_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/scientist.yml

@@ -7,4 +7,5 @@
     visuals:
     - type: StorageVisualizer
       state: rd
-
+  - type: Icon
+    state: rd_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/security.yml

@@ -8,7 +8,8 @@
     visuals:
     - type: StorageVisualizer
       state: hos
-
+  - type: Icon
+    state: hos_icon
 
 # Warden
 - type: entity
@@ -20,7 +21,8 @@
     visuals:
     - type: StorageVisualizer
       state: warden
-
+  - type: Icon
+    state: warden_icon
 
 # Security Officer
 - type: entity
@@ -32,7 +34,8 @@
     visuals:
     - type: StorageVisualizer
       state: sec
-
+  - type: Icon
+    state: sec_icon
 
 # Detective
 - type: entity
@@ -40,8 +43,9 @@
   parent: LockerSecureBase
   name: "detective's cabinet"
   components:
-    - type: Appearance
+  - type: Appearance
-      visuals:
+    visuals:
-        - type: StorageVisualizer
+    - type: StorageVisualizer
-          state: cabinet
+      state: cabinet
-
+  - type: Icon
+    state: cabinet_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml

@@ -13,7 +13,9 @@
     - state: welded
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
-
+  - type: Icon
+    sprite: Constructible/Structures/closet.rsi
+    state: generic_icon
   - type: Clickable
   - type: MovedByPressure
   - type: DamageOnHighSpeedImpact

Resources/Prototypes/Entities/Constructible/Storage/Closets/closet_secure.yml

@@ -18,3 +18,5 @@
     - state: welded
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
+  - type: Icon
+    sprite: Constructible/Structures/closet.rsi

Resources/Prototypes/Entities/Constructible/Storage/Closets/cursed.yml

@@ -0,0 +1,8 @@
+- type: entity
+  id: LockerCursed
+  parent: LockerGeneric
+  name: "closet"
+  suffix: "cursed"
+  description: "A standard-issue Nanotrasen storage unit."
+  components:
+  - type: CursedEntityStorage

Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml

@@ -9,7 +9,8 @@
     - type: StorageVisualizer
       state: generic
       state_closed: red_door
-
+  - type: Icon
+    state: red_icon
 
 # Atmospherics wardrobe
 - type: entity
@@ -22,4 +23,5 @@
     - type: StorageVisualizer
       state: generic
       state_closed: atmos_wardrobe_door
-
+  - type: Icon
+    state: atmos_wardrobe_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/l3closet.yml

@@ -9,7 +9,8 @@
     visuals:
     - type: StorageVisualizer
       state: bio
-
+  - type: Icon
+    state: bio_icon
 
 # Virology variant
 - type: entity
@@ -20,7 +21,8 @@
     visuals:
     - type: StorageVisualizer
       state: bio_viro
-
+  - type: Icon
+    state: bio_viro_icon
 
 # Security variant
 - type: entity
@@ -31,7 +33,8 @@
     visuals:
     - type: StorageVisualizer
       state: bio_sec
-
+  - type: Icon
+    state: bio_sec_icon
 
 # Janitor variant
 - type: entity
@@ -42,4 +45,5 @@
     visuals:
     - type: StorageVisualizer
       state: bio_jan
-
+  - type: Icon
+    state: bio_jan_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/syndicate.yml

@@ -9,4 +9,5 @@
     visuals:
     - type: StorageVisualizer
       state: syndicate
-
+  - type: Icon
+    state: syndicate_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/utility_closets.yml

@@ -10,7 +10,8 @@
     - type: StorageVisualizer
       state: eng
       state_closed: eng_tool_door
-
+  - type: Icon
+    state: eng_tool_icon
 
 # Radiation suit closet
 - type: entity
@@ -24,7 +25,8 @@
     - type: StorageVisualizer
       state: eng
       state_closed: eng_rad_door
-
+  - type: Icon
+    state: eng_rad_icon
 
 # Emergency closet
 - type: entity
@@ -37,7 +39,8 @@
     visuals:
     - type: StorageVisualizer
       state: emergency
-
+  - type: Icon
+    state: emergency_icon
 
 # Fire safety closet
 - type: entity
@@ -50,7 +53,8 @@
     visuals:
     - type: StorageVisualizer
       state: fire
-
+  - type: Icon
+    state: fire_icon
 
 # EOD closet
 - type: entity
@@ -63,4 +67,5 @@
     visuals:
     - type: StorageVisualizer
       state: bomb
-
+  - type: Icon
+    state: bomb_icon

Resources/Prototypes/Entities/Constructible/Storage/Closets/wardrobe.yml

@@ -15,7 +15,8 @@
     - type: StorageVisualizer
       state: generic
       state_closed: blue_door
-
+  - type: Icon
+    state: blue_icon
 
 # Pink wardrobe
 - type: entity
@@ -28,7 +29,8 @@
     - type: StorageVisualizer
       state: generic
       state_closed: pink_door
-
+  - type: Icon
+    state: pink_icon
 
 # Black wardrobe
 - type: entity
@@ -41,7 +43,8 @@
     - type: StorageVisualizer
       state: generic
       state_closed: black_door
-
+  - type: Icon
+    state: black_icon
 
 # Green wardrobe
 - type: entity
@@ -54,7 +57,8 @@
     - type: StorageVisualizer
       state: generic
       state_closed: green_door
-
+  - type: Icon
+    state: green_icon
 
 # Prison wardrobe
 - type: entity
@@ -67,7 +71,8 @@
     - type: StorageVisualizer
       state: generic
       state_closed: orange_door
-
+  - type: Icon
+    state: orange_icon
 
 # Yellow wardrobe
 - type: entity
@@ -80,7 +85,8 @@
     - type: StorageVisualizer
       state: generic
       state_closed: yellow_door
-
+  - type: Icon
+    state: yellow_icon
 
 # White wardrobe
 - type: entity
@@ -93,7 +99,8 @@
     - type: StorageVisualizer
       state: generic
       state_closed: white_door
-
+  - type: Icon
+    state: white_icon
 
 # Grey wardrobe
 - type: entity
@@ -106,7 +113,8 @@
     - type: StorageVisualizer
       state: generic
       state_closed: grey_door
-
+  - type: Icon
+    state: grey_icon
 
 # Mixed wardrobe
 - type: entity
@@ -119,4 +127,5 @@
     - type: StorageVisualizer
       state: generic
       state_closed: mixed_door
-
+  - type: Icon
+    state: mixed_icon

Resources/Prototypes/Entities/Objects/Tools/flare.yml

@@ -25,6 +25,9 @@
           shader: unshaded
         - state: flare_unlit
           color: "#FF0000"
+    - type: Icon
+      sprite: Objects/Misc/flare.rsi
+      state: icon
     - type: Item
       sprite: Objects/Misc/flare.rsi
       color: "#FF0000"

Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml

@@ -7,7 +7,8 @@
   components:
   - type: Sprite
     netsync: false
-
+  - type: Icon
+    state: icon
   - type: Item
     size: 24
     state: icon
@@ -48,7 +49,8 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-3
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/LMGs/l6.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/LMGs/l6.rsi
@@ -83,7 +85,8 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-5
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/LMGs/pk.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/LMGs/pk.rsi

Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml

@@ -14,7 +14,8 @@
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    state: icon
   - type: Item
     size: 12
     state: icon
@@ -54,7 +55,8 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
@@ -83,7 +85,8 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: bolt-closed
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Pistols/colt.rsi
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/colt.rsi
@@ -109,7 +112,8 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/giskard.rsi
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Pistols/giskard.rsi
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/giskard.rsi
@@ -126,7 +130,7 @@
 
 - type: entity
   name: handmade pistol
-  parent: BaseItem
+  parent: PistolBase
   id: PistolHMPistol
   description: Looks unreliable.
   components:
@@ -138,7 +142,8 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: bolt-closed
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi
@@ -181,7 +186,8 @@
       map: ["enum.RangedBarrelVisualLayers.Base"]
     - state: mag-0
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
@@ -224,7 +230,8 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-0
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Pistols/mandella.rsi
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/mandella.rsi
@@ -255,7 +262,8 @@
       map: ["enum.RangedBarrelVisualLayers.Base"]
     - state: bolt-closed
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
@@ -286,7 +294,8 @@
       map: ["enum.RangedBarrelVisualLayers.Base"]
     - state: bolt-closed
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Pistols/mk58_wood.rsi
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/mk58_wood.rsi
@@ -312,7 +321,8 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/molly.rsi
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Pistols/molly.rsi
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/molly.rsi
@@ -346,7 +356,8 @@
       map: ["enum.RangedBarrelVisualLayers.Base"]
     - state: bolt-closed
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Pistols/olivaw_civil.rsi
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/olivaw_civil.rsi
@@ -373,7 +384,8 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Pistols/paco.rsi
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Pistols/paco.rsi
   - type: Item
     size: 12
     sprite: Objects/Weapons/Guns/Pistols/paco.rsi

Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

@@ -9,7 +9,6 @@
     netsync: false
     state: icon
 
-
 - type: entity
   name: Deckard
   parent: RevolverBase
@@ -26,7 +25,6 @@
     - state: mag-unshaded-3
       map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
       shader: unshaded
-
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
@@ -58,7 +56,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
-
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
@@ -83,7 +80,6 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
-
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi

Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -7,7 +7,8 @@
   components:
   - type: Sprite
     netsync: false
-
+  - type: Icon
+    state: icon
   - type: Item
     size: 24
     state: icon
@@ -42,7 +43,8 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Rifles/ak.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/ak.rsi
@@ -80,7 +82,8 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Rifles/black_ak.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/black_ak.rsi
@@ -120,7 +123,8 @@
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Rifles/carbine.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/carbine.rsi
@@ -160,7 +164,8 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Rifles/dallas.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/dallas.rsi
@@ -201,7 +206,8 @@
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Rifles/sts.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/sts.rsi
@@ -242,7 +248,8 @@
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Rifles/vintorez.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/vintorez.rsi
@@ -280,7 +287,8 @@
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi
@@ -321,7 +329,8 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Rifles/calico.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/Rifles/calico.rsi

Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -7,7 +7,8 @@
   components:
   - type: Sprite
     netsync: false
-
+  - type: Icon
+    state: icon
   - type: Item
     size: 24
     state: icon
@@ -48,7 +49,8 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-0
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/SMGs/atreides.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/SMGs/atreides.rsi
@@ -88,7 +90,8 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-0
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
@@ -130,7 +133,8 @@
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
       - state: mag-0
         map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
@@ -175,7 +179,8 @@
     - state: mag-unshaded-0
       map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
       shader: unshaded
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
@@ -211,7 +216,8 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-0
       map: ["enum.RangedBarrelVisualLayers.Mag"]
-
+  - type: Icon
+    sprite: Objects/Weapons/Guns/SMGs/zoric.rsi
   - type: Item
     size: 24
     sprite: Objects/Weapons/Guns/SMGs/zoric.rsi

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -8,6 +8,8 @@
   - type: Sprite
     netsync: false
     state: icon
+  - type: Icon
+    state: icon
   - type: Item
     size: 24
   - type: PumpBarrel
@@ -28,7 +30,7 @@
 
 - type: entity
   name: Bojevic
-  parent: BaseItem
+  parent: ShotgunBase
   id: ShotgunBojevic
   description: It's a magazine-fed shotgun designed for close quarters combat, nicknamed 'Striker' by boarding parties. A robust and reliable design allows you to swap magazines on the go and dump as many shells at your foes as you want... if you can manage the recoil, of course.
   components:
@@ -42,6 +44,8 @@
       map: ["enum.RangedBarrelVisualLayers.Bolt"]
     - state: mag-0
       map: ["enum.RangedBarrelVisualLayers.Mag"]
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Shotguns/bojevic.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/bojevic.rsi
   - type: RangedWeapon
@@ -71,7 +75,7 @@
 
 - type: entity
   name: double-barreled shotgun
-  parent: BaseItem
+  parent: ShotgunBase
   id: ShotgunDB
   description: An immortal classic.
   components:
@@ -83,6 +87,8 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: bolt-closed
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
     state: icon
@@ -123,6 +129,8 @@
       - state: mag-unshaded-1
         map: ["enum.RangedBarrelVisualLayers.MagUnshaded"]
         shader: unshaded
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Shotguns/bull.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/bull.rsi
   - type: RangedWeapon
@@ -145,6 +153,8 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi
   - type: RangedWeapon
@@ -160,6 +170,8 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/regulator.rsi
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Shotguns/regulator.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/regulator.rsi
   - type: RangedWeapon
@@ -175,6 +187,8 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
   - type: RangedWeapon
@@ -184,7 +198,7 @@
 
 - type: entity
   name: sawn-off shotgun
-  parent: BaseItem
+  parent: ShotgunBase
   id: ShotgunSawn
   description: Omar's coming!
   components:
@@ -196,6 +210,8 @@
         map: ["enum.RangedBarrelVisualLayers.Base"]
       - state: bolt-closed
         map: ["enum.RangedBarrelVisualLayers.Bolt"]
+  - type: Icon
+    sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
   - type: Item
     sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
     state: icon

Resources/Textures/Objects/Misc/flare.rsi/meta.json

@@ -120,7 +120,15 @@
                     1.0
                 ]
             ]
+        },
+        {
+            "name": "icon",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
         }
     ]
 }
-