Глобальный респрайт оружия (#387)

* resprite: part 1

* total brainfucken

* fixes

* uplink icons + ammunition resprite

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -39,6 +39,7 @@
   id: UplinkRifleMosin
   name: uplink-rifle-mosin-name
   description: uplink-rifle-mosin-desc
+  icon: { sprite: /Textures/White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi, state: icon }
   productEntity: WeaponSniperMosin
   cost:
     Telecrystal: 1
@@ -135,7 +136,7 @@
   id: UplinkSniperBundle
   name: uplink-sniper-bundle-name
   description: uplink-sniper-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base }
+  icon: { sprite: /Textures/White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi, state: icon }
   productEntity: BriefcaseSyndieSniperBundleFilled
   cost:
     Telecrystal: 20 # WD EDIT
@@ -147,7 +148,7 @@
   id: UplinkC20RBundle
   name: uplink-c20r-bundle-name
   description: uplink-c20r-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon }
+  icon: { sprite: /Textures/White/Objects/Weapons/Guns/SMG/c20r-icons.rsi, state: icon }
   productEntity: ClothingBackpackDuffelSyndicateFilledSMG
   cost:
     Telecrystal: 15 # WD EDIT
@@ -159,7 +160,7 @@
   id: UplinkBulldogBundle
   name: uplink-buldog-bundle-name
   description: uplink-buldog-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi, state: icon }
+  icon: { sprite: /Textures/White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi, state: icon }
   productEntity: ClothingBackpackDuffelSyndicateFilledShotgun
   cost:
     Telecrystal: 17
@@ -171,7 +172,7 @@
   id: UplinkGrenadeLauncherBundle
   name: uplink-grenade-launcher-bundle-name
   description: uplink-grenade-launcher-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon }
+  icon: { sprite: /Textures/White/Objects/Weapons/Guns/Launchers/china_lake-icons.rsi, state: icon }
   productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
   cost:
     Telecrystal: 25
@@ -183,7 +184,7 @@
   id: UplinkL6SawBundle
   name: uplink-l6-saw-bundle-name
   description: uplink-l6-saw-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/LMGs/l6.rsi, state: icon }
+  icon: { sprite: /Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi, state: icon }
   productEntity: ClothingBackpackDuffelSyndicateFilledLMG
   cost:
     Telecrystal: 25

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml

@@ -21,7 +21,7 @@
     containers:
       ballistic-ammo: !type:Container
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi
+    sprite: White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
@@ -47,10 +47,10 @@
     capacity: 100
   - type: Item
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi
+    sprite: White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi
   - type: MagazineVisuals
     magState: mag
-    steps: 8
+    steps: 6
     zeroVisible: false
   - type: Appearance
 

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml

@@ -85,7 +85,7 @@
     containers:
       ballistic-ammo: !type:Container
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi
+    sprite: White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
@@ -112,7 +112,7 @@
       tags:
       - CartridgePistol
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi
+    sprite: White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi
     layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
@@ -121,7 +121,7 @@
         shader: unshaded
   - type: MagazineVisuals
     magState: mag
-    steps: 6
+    steps: 5
     zeroVisible: false
   - type: Appearance
   - type: ContainerContainer

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml

@@ -20,7 +20,7 @@
     containers:
       ballistic-ammo: !type:Container
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi
+    sprite: White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]

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

@@ -9,7 +9,7 @@
   - type: Item
     size: Huge
   - type: Clothing
-    sprite: Objects/Weapons/Guns/LMGs/l6.rsi
+    sprite: White/Objects/Weapons/Guns/LMGs/l6.rsi
     quickEquip: false
     slots:
     - Back
@@ -77,15 +77,20 @@
   description: A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses .30 rifle ammo.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/LMGs/l6.rsi
+    sprite: White/Objects/Weapons/Guns/LMGs/l6-icons.rsi
     layers:
     - state: base
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-3
-      map: ["enum.GunVisualLayers.Mag"]
+      map: [ "enum.GunVisualLayers.Base" ]
+    - state: mag-4
+      map: [ "enum.GunVisualLayers.Mag" ]
+  - type: Item
+    sprite: White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi
+    size: Huge
+  - type: Clothing
+    sprite: White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi
   - type: MagazineVisuals
     magState: mag
-    steps: 4
+    steps: 5
     zeroVisible: true
   - type: Appearance
 
@@ -109,14 +114,19 @@
       soundEmpty:
         path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg
     - type: Sprite
-      sprite: Objects/Weapons/Guns/LMGs/l6.rsi
+      sprite: White/Objects/Weapons/Guns/LMGs/l6-icons.rsi
       layers:
         - state: base
           map: [ "enum.GunVisualLayers.Base" ]
-        - state: mag-3
+        - state: mag-4
           map: [ "enum.GunVisualLayers.Mag" ]
     - type: Item
+      sprite: White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi
       size: Huge
+    - type: Clothing
+      sprite: White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi
+      slots:
+      - Back
     - type: ContainerContainer
       containers:
         ballistic-ammo: !type:Container
@@ -130,3 +140,8 @@
       autoRecharge: true
       autoRechargeRate: 25
     - type: AmmoCounter
+    - type: MagazineVisuals
+      magState: mag
+      steps: 5
+      zeroVisible: true
+    - type: Appearance

Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml

@@ -38,12 +38,14 @@
   description: PLOOP
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
+    sprite: White/Objects/Weapons/Guns/Launchers/china_lake-icons.rsi
     layers:
       - state: icon
         map: ["enum.GunVisualLayers.Base"]
+  - type: Item
+    sprite: White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
+    sprite: White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi
     slots:
     - Back
     - suitStorage
@@ -72,14 +74,16 @@
   description: A modified ancient rocket-propelled grenade launcher.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Launchers/rocket.rsi
+    sprite: White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi
     layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
       - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    sprite: White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Launchers/rocket.rsi
+    sprite: White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi
   - type: Gun
     fireRate: 0.5
     soundGunshot:
@@ -105,14 +109,16 @@
   description: A modified ancient rocket-propelled grenade launcher.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Launchers/rocket.rsi
+    sprite: White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi
     layers:
-      - state: base
-        map: ["enum.GunVisualLayers.Base"]
-      - state: mag-0
-        map: ["enum.GunVisualLayers.Mag"]
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    sprite: White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Launchers/rocket.rsi
+    sprite: White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi
   - type: Gun
     fireRate: 6
     selectedMode: FullAuto
@@ -129,7 +135,7 @@
       path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
   - type: MagazineVisuals
     magState: mag
-    steps: 1
+    steps: 2
     zeroVisible: true
   - type: Appearance
 

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

@@ -68,7 +68,7 @@
   description: An iconic weapon of war. Uses .30 rifle ammo.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Rifles/ak.rsi
+    sprite: White/Objects/Weapons/Guns/Rifles/ak-icons.rsi
     layers:
     - state: base
       map: [ "enum.GunVisualLayers.Base" ]
@@ -86,6 +86,10 @@
       visible: false
       sprite: White/Objects/Weapons/modulesOnWeapon.rsi
       map: [ "enum.ModuleVisualState.AimModule" ]
+  - type: Item
+    sprite: White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi
+  - type: Clothing
+    sprite: White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi
   - type: Gun
     fireRate: 5
     soundGunshot:
@@ -202,7 +206,7 @@
   description: A high end military grade assault rifle. Uses .20 rifle ammo.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
+    sprite: White/Objects/Weapons/Guns/Rifles/lecter-icons.rsi
     layers:
     - state: base
       map: [ "enum.GunVisualLayers.Base" ]
@@ -220,8 +224,10 @@
       visible: false
       sprite: White/Objects/Weapons/modulesOnWeapon.rsi
       map: [ "enum.ModuleVisualState.AimModule" ]
+  - type: Item
+    sprite: White/Objects/Weapons/Guns/Rifles/lecter-inhands.rsi
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
+    sprite: White/Objects/Weapons/Guns/Rifles/lecter-inhands.rsi
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg

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

@@ -71,12 +71,16 @@
   description: Pla-ket-ket-ket-ket! Uses .35 auto ammo.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/SMGs/atreides.rsi
+    sprite: White/Objects/Weapons/Guns/SMG/atreides-icons.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    sprite: White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi
+  - type: Clothing
+    sprite: White/Objects/Weapons/Guns/SMG/atreides-inhands.rsi
   - type: Gun
     fireRate: 10
     soundGunshot:
@@ -94,7 +98,7 @@
   description: A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
+    sprite: White/Objects/Weapons/Guns/SMG/c20r-icons.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
@@ -113,7 +117,9 @@
       sprite: White/Objects/Weapons/modulesOnSMGs.rsi
       map: [ "enum.ModuleVisualState.AimModule" ]
   - type: Clothing
-    sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
+    sprite: White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi
+  - type: Item
+    sprite: White/Objects/Weapons/Guns/SMG/c20r-inhands.rsi
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg
@@ -171,7 +177,7 @@
       aim_module: !type:ContainerSlot
   - type: MagazineVisuals
     magState: mag
-    steps: 6
+    steps: 4
     zeroVisible: true
   - type: Appearance
   - type: PointLight
@@ -185,7 +191,7 @@
   description: An excellent fully automatic Heavy SMG.
   components:
     - type: Sprite
-      sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
+      sprite: White/Objects/Weapons/Guns/SMG/drozd-icons.rsi
       layers:
         - state: base
           map: ["enum.GunVisualLayers.Base"]
@@ -204,7 +210,9 @@
           sprite: White/Objects/Weapons/modulesOnWeapon.rsi
           map: [ "enum.ModuleVisualState.AimModule" ]
     - type: Clothing
-      sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
+      sprite: White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi
+    - type: Item
+      sprite: White/Objects/Weapons/Guns/SMG/drozd-inhands.rsi
     - type: Gun
       fireRate: 6
       selectedMode: FullAuto
@@ -325,7 +333,7 @@
   description: An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
+    sprite: White/Objects/Weapons/Guns/SMG/wt550-icons.rsi
     layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
@@ -350,7 +358,9 @@
         sprite: White/Objects/Weapons/modulesOnWeapon.rsi
         map: [ "enum.ModuleVisualState.AimModule" ]
   - type: Clothing
-    sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
+    sprite: White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi
+  - type: Item
+    sprite: White/Objects/Weapons/Guns/SMG/wt550-inhands.rsi
   - type: ChamberMagazineAmmoProvider
     boltClosed: null
   - type: Gun
@@ -410,7 +420,7 @@
       aim_module: !type:ContainerSlot
   - type: MagazineVisuals
     magState: mag
-    steps: 6
+    steps: 5
     zeroVisible: true
   - type: PointLight
     enabled: false

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

@@ -62,16 +62,17 @@
   description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
+    sprite: White/Objects/Weapons/Guns/Shotguns/bulldog-icons.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-0
       map: ["enum.GunVisualLayers.Mag"]
   - type: Item
+    sprite: White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi
     size: Large
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
+    sprite: White/Objects/Weapons/Guns/Shotguns/bulldog-inhands.rsi
     quickEquip: false
     slots:
     - Back
@@ -104,7 +105,7 @@
   - type: MagazineAmmoProvider
   - type: MagazineVisuals
     magState: mag
-    steps: 1
+    steps: 4
     zeroVisible: true
   - type: Appearance
   - type: StaticPrice
@@ -117,12 +118,14 @@
   description: An immortal classic. Uses .50 shotgun shells.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
+    sprite: White/Objects/Weapons/Guns/Shotguns/db_shotgun-icons.rsi
+  - type: Clothing
+    sprite: White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi
   - type: Item
     size: Normal
     shape:
     - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
+    sprite: White/Objects/Weapons/Guns/Shotguns/db_shotgun-inhands.rsi
     heldPrefix: db
   - type: Gun
     fireRate: 2
@@ -151,11 +154,11 @@
   description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
+    sprite: White/Objects/Weapons/Guns/Shotguns/enforcer-icons.rsi
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
+    sprite: White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi
   - type: Item
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
+    sprite: White/Objects/Weapons/Guns/Shotguns/enforcer-inhands.rsi
     heldPrefix: enforcer
   - type: BallisticAmmoProvider
 
@@ -177,12 +180,12 @@
     size: Normal
     shape:
     - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
+    sprite: White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi
     heldPrefix: pump
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+    sprite: White/Objects/Weapons/Guns/Shotguns/pump-icons.rsi
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+    sprite: White/Objects/Weapons/Guns/Shotguns/pump-inhands.rsi
   - type: BallisticAmmoProvider
     capacity: 4
   - type: Tag
@@ -278,14 +281,14 @@
   description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
+    sprite: White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-icons.rsi
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi
+    sprite: White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-icons.rsi
   - type: Item
     size: Normal
     shape:
     - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
+    sprite: White/Objects/Weapons/Guns/Shotguns/improvised_shotgun-inhands.rsi
     heldPrefix: improvised
   - type: Gun
     fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -57,7 +57,14 @@
   description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
+    layers:
+    - state: icon
+      map: [ "enum.GunVisualLayers.Base" ]
+    sprite: White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-icons.rsi
+  - type: Clothing
+    sprite: White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi
+  - type: Item
+    sprite: White/Objects/Weapons/Guns/Snipers/bolt_gun_wood-inhands.rsi
 
 - type: entity
   name: Hristov
@@ -66,9 +73,16 @@
   description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo.
   components:
   - type: Sprite
-    sprite: Objects/Weapons/Guns/Snipers/hristov.rsi
+    sprite: White/Objects/Weapons/Guns/Snipers/hristov-icons.rsi
+    layers:
+    - state: base
+      map: [ "enum.GunVisualLayers.Base" ]
+    - state: mag-0
+      map: [ "enum.GunVisualLayers.Mag" ]
   - type: Clothing
-    sprite: Objects/Weapons/Guns/Snipers/hristov.rsi
+    sprite: White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi
+  - type: Item
+    sprite: White/Objects/Weapons/Guns/Snipers/hristov-inhands.rsi
   - type: BallisticAmmoProvider
     soundInsert: /Audio/White/Gun/insert.ogg
     whitelist:
@@ -81,6 +95,11 @@
   - type: Wieldable
     forceTwoHanded: True
   - type: Telescope
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
 
 - type: entity
   name: musket

Resources/Prototypes/_White/Catalog/Cargo/cargo.yml

@@ -37,7 +37,7 @@
   description: ящик с магазинами для Лектора, заполненными патронами.
   id: cargoLecterMagazines
   icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi
+    sprite: White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi
     state: base
   product: CrateLecterMagazines
   cost: 2500
@@ -61,7 +61,7 @@
   description: ящик с магазинами для CV-47, заполненными патронами.
   id: cargoAKmagazines
   icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi
+    sprite: White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi
     state: base
   product: CrateAKmagazines
   cost: 2500
@@ -184,7 +184,7 @@
   description: проверенная временем автоматическая винтовка.
   id: cargoCV47
   icon:
-    sprite: Objects/Weapons/Guns/Rifles/ak.rsi
+    sprite: White/Objects/Weapons/Guns/Rifles/ak.rsi
     state: icon
   product: CrateCV47
   cost: 10000
@@ -234,7 +234,7 @@
   description: Ящик с тремя обоймами нелетальных магазинов для лектора.
   id: CargoLecterRubberMagazines
   icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi
+    sprite: White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi
     state: rubber
   product: CrateLecterRubberMagazines
   cost: 500
@@ -258,7 +258,7 @@
   description: Ящик с с тремя нелетальными магазинами для CV-47.
   id: cargoRifleRubberMagazines
   icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi
+    sprite: White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi
     state: rubber
   product: CrateRifleRubberMagazines
   cost: 600

Resources/Prototypes/_White/Catalog/uplink.yml

@@ -46,6 +46,7 @@
   id: UplinkRifleAk
   name: uplink-rifle-ak-name
   description: uplink-rifle-ak-description
+  icon: { sprite: /Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi, state: icon }
   productEntity: WeaponRifleAk
   cost:
     Telecrystal: 16
@@ -189,7 +190,7 @@
   id: UplinkMagazineLightRifleBox
   name: uplink-magazine-l6-name
   description: uplink-magazine-l6-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: base }
+  icon: { sprite: /Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi, state: base }
   productEntity: MagazineLightRifleBox
   cost:
     Telecrystal: 3

Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "practice"
+        },
+        {
+            "name": "red"
+        },
+        {
+            "name": "rubber"
+        },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "mag-1"
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json

@@ -0,0 +1,44 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "practice"
+        },
+        {
+            "name": "red"
+        },
+        {
+            "name": "red-icon"
+        },
+        {
+            "name": "rubber"
+        },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f, https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "practice"
+        },
+        {
+            "name": "red"
+        },
+        {
+            "name": "rubber"
+        },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "mag-1"
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-icons.rsi/meta.json

@@ -0,0 +1,35 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+  "size": {
+    "x": 48,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Guns/LMGs/l6-inhands.rsi/meta.json

@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-icons.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 48,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "bolt-open"
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-icons.rsi/meta.json

@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/21818/commits/8959238828600d01ee7c8165a0dd29007570a454, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 48,
+        "y": 32
+    },
+    "states": [
+	{
+		"name": "base"
+	},
+    {
+		"name": "icon"
+	},
+	{
+		"name": "mag-0"
+	},
+	{
+		"name": "mag-1"
+	}
+    ]
+}

Resources/Textures/White/Objects/Weapons/Guns/Launchers/rocket-inhands.rsi/meta.json

@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/21818/commits/8959238828600d01ee7c8165a0dd29007570a454, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+	{
+		"name": "inhand-left",
+		"directions": 4
+	},
+	{
+		"name": "inhand-right",
+		"directions": 4
+	},
+	{
+		"name": "rocket0-inhand-left",
+		"directions": 4
+	},
+	{
+		"name": "rocket0-inhand-right",
+		"directions": 4
+	},
+    {
+		"name": "equipped-BACKPACK",
+		"directions": 4
+    }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-icons.rsi/meta.json

@@ -0,0 +1,23 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 48,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        }
+    ]
+}

Resources/Textures/White/Objects/Weapons/Guns/Rifles/ak-inhands.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+		},
+		{
+			"name": "equipped-SUITSTORAGE",
+			"directions": 4
+        }
+    ]
+}