diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/vector.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/vector.ftl index 27d9a8bc57a..c22c02d8cff 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/vector.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/vector.ftl @@ -1,10 +1,18 @@ ent-MagazineBoxVector22 = коробка патронов (.22 LR) .desc = { ent-BaseItem.desc } -ent-MagazineBoxVector45 = коробка патронов (.45 APC) +ent-MagazineBoxVector22Incendiary = коробка патронов (.22 LR зажигательные) .desc = { ent-BaseItem.desc } -ent-MagazineBoxVector45Incendiary = коробка патронов (.45 APC зажигательные) +ent-MagazineBoxVector22Practice = коробка патронов (.22 LR учебные) .desc = { ent-BaseItem.desc } -ent-MagazineBoxVector45Practice = коробка патронов (.45 APC учебные) +ent-MagazineBoxVector22Uranium = коробка патронов (.22 LR урановые) .desc = { ent-BaseItem.desc } -ent-MagazineBoxVector45Uranium = коробка патронов (.45 APC урановые) +ent-MagazineBoxVector45 = коробка патронов (.45 ACP) + .desc = { ent-BaseItem.desc } +ent-MagazineBoxVector45Incendiary = коробка патронов (.45 ACP зажигательные) + .desc = { ent-BaseItem.desc } +ent-MagazineBoxVector45Practice = коробка патронов (.45 ACP учебные) + .desc = { ent-BaseItem.desc } +ent-MagazineBoxVector45Uranium = коробка патронов (.45 ACP урановые) + .desc = { ent-BaseItem.desc } +ent-MagazineBoxVector45AP = коробка патронов (.45 ACP AP) .desc = { ent-BaseItem.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/vector.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/vector.ftl index 7e197f97f21..bb026be34b0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/vector.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/vector.ftl @@ -1,5 +1,11 @@ ent-CartridgeVector22 = патрон (.22 LR) .desc = { ent-BaseCartridgePistol.desc } +ent-CartridgeVector22Incendiary = патрон (.22 LR зажигательный) + .desc = { ent-BaseCartridgePistol.desc } +ent-CartridgeVector22Practice = патрон (.22 LR учебный) + .desc = { ent-BaseCartridgePistol.desc } +ent-CartridgeVector22Uranium = патрон (.22 LR урановый) + .desc = { ent-BaseCartridgePistol.desc } ent-CartridgeVector45 = патрон (.45 ACP) .desc = { ent-BaseCartridgePistol.desc } ent-CartridgeVector45Incendiary = патрон (.45 ACP зажигательный) @@ -7,4 +13,6 @@ ent-CartridgeVector45Incendiary = патрон (.45 ACP зажигательны ent-CartridgeVector45Practice = патрон (.45 ACP учебный) .desc = { ent-BaseCartridgePistol.desc } ent-CartridgeVector45Uranium = патрон (.45 ACP урановый) + .desc = { ent-BaseCartridgePistol.desc } +ent-CartridgeVector45AP = патрон (.45 ACP AP) .desc = { ent-BaseCartridgePistol.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/vector.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/vector.ftl index fbba82f878b..099085d441f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/vector.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/vector.ftl @@ -1,5 +1,11 @@ ent-MagazineVector22 = магазин (.22 LR) .desc = До смешного большой магазин с до смешного маленькими и нелепыми патронами калибра .22 LR. +ent-MagazineVector22Incendiary = магазин (.22 LR зажигательные) + .desc = { ent-MagazineVector22 .desc } +ent-MagazineVector22Practice = магазин (.22 LR учебные) + .desc = { ent-MagazineVector22 .desc } +ent-MagazineVector22Uranium = магазин (.22 LR урановые) + .desc = { ent-MagazineVector22 .desc } ent-MagazineVector22Empty = { ent-MagazineVector22 } .desc = { ent-BaseItem.desc } .suffix = Пустой @@ -14,3 +20,5 @@ ent-MagazineVector45Practice = магазин (.45 ACP учебные) .desc = { ent-MagazineVector45 .desc } ent-MagazineVector45Uranium = магазин (.45 ACP урановые) .desc = { ent-MagazineVector45 .desc } +ent-MagazineVector45AP = магазин (.45 ACP AP) + .desc = { ent-MagazineVector45 .desc } diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Boxes/Vector/vector.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Boxes/Vector/vector.yml index 525d2364609..3c986928004 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Boxes/Vector/vector.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Boxes/Vector/vector.yml @@ -73,6 +73,21 @@ map: ["enum.GunVisualLayers.Mag"] - state: uranium +- type: entity #FrontierCorvax + parent: MagazineBoxVector45 + id: MagazineBoxVector45AP + name: ammunition box (.45 ACP AP) + components: + - type: BallisticAmmoProvider + proto: CartridgeVector45AP + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: piercing + - type: entity #FrontierCorvax parent: BaseItem id: MagazineBoxVector22 @@ -84,7 +99,7 @@ tags: - CartridgeVector22 proto: CartridgeVector22 - capacity: 60 + capacity: 70 - type: Item size: Small - type: ContainerContainer @@ -93,7 +108,7 @@ - type: Sprite sprite: Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi layers: - - state: 22LR + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -102,3 +117,48 @@ steps: 2 zeroVisible: false - type: Appearance + +- type: entity #FrontierCorvax + parent: MagazineBoxVector22 + id: MagazineBoxVector22Incendiary + name: ammunition box (.22 LR incendiary) + components: + - type: BallisticAmmoProvider + proto: CartridgeVector22Incendiary + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: incendiary + +- type: entity #FrontierCorvax + parent: MagazineBoxVector22 + id: MagazineBoxVector22Practice + name: ammunition box (.22 LR practice) + components: + - type: BallisticAmmoProvider + proto: CartridgeVector22Practice + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: practice + +- type: entity #FrontierCorvax + parent: MagazineBoxVector22 + id: MagazineBoxVector22Uranium + name: ammunition box (.22 LR uranium) + components: + - type: BallisticAmmoProvider + proto: CartridgeVector22Uranium + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: uranium diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/SMGs/SMGsAmmo.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/SMGs/SMGsAmmo.yml index c10389f2693..b03ac80c96b 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/SMGs/SMGsAmmo.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/SMGs/SMGsAmmo.yml @@ -9,6 +9,51 @@ - type: CartridgeAmmo proto: BulletVector22 +- type: entity #FrontierCorvax + id: CartridgeVector22Incendiary + name: cartridge (.22 LR incendiary) + parent: CartridgeVector22 + components: + - type: CartridgeAmmo + proto: BulletVector22Incendiary + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#ff6e52" + +- type: entity #FrontierCorvax + id: CartridgeVector22Practice + name: cartridge (.22 LR practice) + parent: CartridgeVector22 + components: + - type: CartridgeAmmo + proto: BulletVector22Practice + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#dbdbdb" + +- type: entity #FrontierCorvax + id: CartridgeVector22Uranium + name: cartridge (.22 LR uranium) + parent: CartridgeVector22 + components: + - type: CartridgeAmmo + proto: BulletVector22Uranium + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#65fe08" + - type: entity #FrontierCorvax id: CartridgeVector45 name: cartridge (.45 ACP) @@ -64,3 +109,18 @@ - state: tip map: [ "enum.AmmoVisualLayers.Tip" ] color: "#65fe08" + +- type: entity #FrontierCorvax + id: CartridgeVector45AP + name: cartridge (.45 ACP AP) + parent: CartridgeVector45 + components: + - type: CartridgeAmmo + proto: BulletVector45AP + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#330707" diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Magazines/VectorMags/VectorMags.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Magazines/VectorMags/VectorMags.yml index a41e4f828bc..a8e4276d0cb 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Magazines/VectorMags/VectorMags.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Magazines/VectorMags/VectorMags.yml @@ -13,7 +13,7 @@ whitelist: tags: - CartridgeVector22 - capacity: 25 + capacity: 33 - type: Item size: Small - type: ContainerContainer @@ -44,6 +44,48 @@ - state: base map: ["enum.GunVisualLayers.Base"] +- type: entity #FrontierCorvax + id: MagazineVector22Incendiary + name: magazine (.22 LR incendiary) + parent: MagazineVector22 + components: + - type: BallisticAmmoProvider + proto: CartridgeVector22Incendiary + - type: Sprite + layers: + - state: incendiary + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity #FrontierCorvax + id: MagazineVector22Practice + name: magazine (.22 LR practice) + parent: MagazineVector22 + components: + - type: BallisticAmmoProvider + proto: CartridgeVector22Practice + - type: Sprite + layers: + - state: practice + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity #FrontierCorvax + id: MagazineVector22Uranium + name: magazine (.22 LR uranium) + parent: MagazineVector22 + components: + - type: BallisticAmmoProvider + proto: CartridgeVector22Uranium + - type: Sprite + layers: + - state: uranium + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: entity #FrontierCorvax id: MagazineVector45 name: magazine (.45 ACP) @@ -95,6 +137,8 @@ name: magazine (.45 ACP incendiary) parent: MagazineVector45 components: + - type: BallisticAmmoProvider + proto: CartridgeVector45Incendiary - type: Sprite layers: - state: incendiary @@ -107,6 +151,8 @@ name: magazine (.45 ACP practice) parent: MagazineVector45 components: + - type: BallisticAmmoProvider + proto: CartridgeVector45Practice - type: Sprite layers: - state: practice @@ -119,9 +165,25 @@ name: magazine (.45 ACP uranium) parent: MagazineVector45 components: + - type: BallisticAmmoProvider + proto: CartridgeVector45Uranium - type: Sprite layers: - state: uranium map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + +- type: entity #FrontierCorvax + id: MagazineVector45AP + name: magazine (.45 ACP AP) + parent: MagazineVector45 + components: + - type: BallisticAmmoProvider + proto: CartridgeVector45AP + - type: Sprite + layers: + - state: piercing + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml index 24bd9929973..87ae73a84dc 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml @@ -1,59 +1,109 @@ - type: entity #FrontierCorvax id: BulletVector22 - name: Пуля (.22 LR) + name: bullet (.22 LR) parent: BaseBullet noSpawn: true components: - type: Projectile damage: types: - Piercing: 7 + Piercing: 5 + Blunt: 4 + +- type: entity #FrontierCorvax + id: BulletVector22Incendiary + parent: BaseBulletIncendiary + name: bullet .22 LR (incendiary) + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 3 + Heat: 6 + +- type: entity #FrontierCorvax + id: BulletVector22Practice + name: bullet .22 LR (practice) + parent: BaseBulletPractice + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 1 + +- type: entity #FrontierCorvax + id: BulletVector22Uranium + name: bullet .22 LR (uranium) + parent: BaseBulletUranium + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 3 Blunt: 3 + Radiation: 9 - type: entity #FrontierCorvax id: BulletVector45 - name: Пуля (.45 ACP) + name: bullet (.45 ACP) parent: BaseBullet noSpawn: true components: - type: Projectile damage: types: - Piercing: 15 - Blunt: 5 + Piercing: 17 + Blunt: 6 - type: entity #FrontierCorvax id: BulletVector45Incendiary parent: BaseBulletIncendiary - name: Пуля .45 ACP (Зажигательная) + name: bullet .45 ACP (incendiary) noSpawn: true components: - type: Projectile damage: types: Blunt: 3 - Heat: 16 + Heat: 14 - type: entity #FrontierCorvax id: BulletVector45Practice - name: Пуля .45 ACP (Учебная) + name: bullet .45 ACP (practice) parent: BaseBulletPractice noSpawn: true components: - type: Projectile damage: types: - Blunt: 1 + Blunt: 3 - type: entity #FrontierCorvax id: BulletVector45Uranium - name: Пуля .45 ACP (Урановая) + name: bullet .45 ACP (uranium) parent: BaseBulletUranium noSpawn: true components: - type: Projectile damage: types: - Piercing: 10 + Piercing: 6 Blunt: 3 - Radiation: 10 + Radiation: 14 + +- type: entity + id: BulletVector45AP + name: bullet (.45 ACP AP) + parent: BaseBulletAP + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 12 + Blunt: 3 # 20% decrease + penetrationScore: 2 + ignoreResistances: true diff --git a/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml b/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml deleted file mode 100644 index 970bd239fc7..00000000000 --- a/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml +++ /dev/null @@ -1,101 +0,0 @@ -- type: latheRecipe #Vector - id: MagazineVector45 - result: MagazineVector45 - category: Ammo - completetime: 5 - materials: - Steel: 260 - -- type: latheRecipe #Vector - id: MagazineVector45Empty - result: MagazineVector45Empty - category: Ammo - completetime: 5 - materials: - Steel: 110 - -- type: latheRecipe #Vector - id: MagazineVector22 - result: MagazineVector22 - category: Ammo - completetime: 5 - materials: - Steel: 240 - -- type: latheRecipe #Vector - id: MagazineVector22Empty - result: MagazineVector22Empty - category: Ammo - completetime: 5 - materials: - Steel: 150 - -- type: latheRecipe #Vector - id: MagazineBoxVector22 - result: MagazineBoxVector22 - category: Ammo - completetime: 5 - materials: - Steel: 240 - -- type: latheRecipe #Vector - id: MagazineBoxVector45 - result: MagazineBoxVector45 - category: Ammo - completetime: 5 - materials: - Steel: 450 - -- type: latheRecipe #Vector - id: MagazineBoxVector45Uranium - result: MagazineBoxVector45Uranium - category: Ammo - completetime: 5 - materials: - Steel: 580 - Uranium: 580 - -- type: latheRecipe #Vector - id: MagazineBoxVector45Incendiary - result: MagazineBoxVector45Incendiary - category: Ammo - completetime: 5 - materials: - Steel: 340 - Plastic: 800 - -- type: latheRecipe #Vector - id: MagazineBoxVector45Practice - result: MagazineBoxVector45Practice - category: Ammo - completetime: 5 - materials: - Steel: 410 - Plastic: 310 - -- type: latheRecipe #Vector - id: MagazineVector45Practice - result: MagazineVector45Practice - category: Ammo - completetime: 5 - materials: - Steel: 160 - Plastic: 160 - -- type: latheRecipe #Vector - id: MagazineVector45Incendiary - result: MagazineVector45Incendiary - category: Ammo - completetime: 5 - materials: - Steel: 180 - Plastic: 450 - -- type: latheRecipe #Vector - id: MagazineVector45Uranium - result: MagazineVector45Uranium - category: Ammo - completetime: 5 - materials: - Steel: 300 - Uranium: 300 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e9f984f7e46..2e08ffeda12 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -914,6 +914,12 @@ - Zipties dynamicRecipes: #CorvaxFrontier Start + - MagazineBoxVector22Practice + - MagazineBoxVector22Incendiary + - MagazineBoxVector22Uranium + - MagazineVector22Practice + - MagazineVector22Incendiary + - MagazineVector22Uranium - MagazineBoxVector45Practice - MagazineBoxVector45Incendiary - MagazineBoxVector45Uranium @@ -1018,6 +1024,12 @@ - MagazineBoxVector45Practice - MagazineBoxVector45Uranium - MagazineBoxVector22 + - MagazineBoxVector22Incendiary + - MagazineBoxVector22Practice + - MagazineBoxVector22Uranium + - MagazineVector22Incendiary + - MagazineVector22Practice + - MagazineVector22Uranium - BoxLethalshot - BoxShotgunFlare - BoxShotgunSlug diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 5b89e5d2fda..e681edde32c 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -28,6 +28,8 @@ tier: 1 cost: 10000 recipeUnlocks: + - MagazineVector22Incendiary #CorvaxFrontier + - MagazineBoxVector22Incendiary #CorvaxFrontier - MagazineVector45Incendiary #CorvaxFrontier - MagazineBoxVector45Incendiary #CorvaxFrontier - BoxShotgunIncendiary @@ -63,6 +65,8 @@ tier: 1 cost: 5000 recipeUnlocks: + - MagazineBoxVector22Practice #CorvaxFrontier + - MagazineVector22Practice #CorvaxFrontier - MagazineBoxVector45Practice #CorvaxFrontier - MagazineVector45Practice #CorvaxFrontier - MagazineShotgunBeanbag @@ -80,6 +84,8 @@ tier: 1 cost: 7500 recipeUnlocks: + - MagazineBoxVector22Uranium #CorvaxFrontier + - MagazineVector22Uranium #CorvaxFrontier - MagazineBoxVector45Uranium #CorvaxFrontier - MagazineVector45Uranium #CorvaxFrontier - MagazineRifleUranium diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_rng_items_armory.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_rng_items_armory.yml index f50a7036135..db8be0d43c8 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_rng_items_armory.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_rng_items_armory.yml @@ -100,7 +100,6 @@ - type: RandomSpawner prototypes: - WeaponCaseWeaponSubMachineGunVector22Expedition #CorvaxFrontier - - WeaponCaseWeaponSubMachineGunVector22Expedition #CorvaxFrontier - WeaponCaseShortMk58Expedition - WeaponCaseShortMk58Expedition - WeaponCaseShortDeckardExpedition diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/22LR.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/22LR.png deleted file mode 100644 index a11d3aee7e7..00000000000 Binary files a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/22LR.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/base.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/base.png index ac7de8b43bd..a11d3aee7e7 100644 Binary files a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/base.png and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/base.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/emp.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/emp.png deleted file mode 100644 index f317d03c212..00000000000 Binary files a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/emp.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/incendiary.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/incendiary.png index 226711c301a..124dd2a46b4 100644 Binary files a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/incendiary.png and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/incendiary.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/incendiarydisplay.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/incendiarydisplay.png deleted file mode 100644 index 1d8de97957e..00000000000 Binary files a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/incendiarydisplay.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/meta.json b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/meta.json index dfcd7b47a92..37f02c78505 100644 --- a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/meta.json +++ b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/meta.json @@ -10,27 +10,15 @@ { "name": "base" }, - { - "name": "22LR" - }, { "name": "mag-1" }, - { - "name": "incendiarydisplay" - }, { "name": "incendiary" }, { "name": "practice" }, - { - "name": "rubber" - }, - { - "name": "emp" - }, { "name": "uranium" } diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/practice.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/practice.png index 6911805ffae..4c9bde58d30 100644 Binary files a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/practice.png and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/practice.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/rubber.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/rubber.png deleted file mode 100644 index aa5c85660a9..00000000000 Binary files a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/uranium.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/uranium.png index 1dba694fefb..e1ed1258817 100644 Binary files a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/uranium.png and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Boxes/Vector/Vector22.rsi/uranium.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/incendiary.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/incendiary.png new file mode 100644 index 00000000000..afc6d959420 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/incendiary.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/meta.json b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/meta.json index 3800ed4dd0d..1fe2f39459c 100644 --- a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/meta.json +++ b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/meta.json @@ -9,6 +9,15 @@ "states": [ { "name": "base" + }, + { + "name": "incendiary" + }, + { + "name": "practice" + }, + { + "name": "uranium" }, { "name": "mag-1" diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/practice.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/practice.png new file mode 100644 index 00000000000..1fa3e9517d8 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/practice.png differ diff --git a/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/uranium.png b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/uranium.png new file mode 100644 index 00000000000..f220c717660 Binary files /dev/null and b/Resources/Textures/Corvax/Objects/Weapons/Guns/Ammunition/Magazine/Vector/vector22mag.rsi/uranium.png differ