diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 1a544a81945..24ae7c574de 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -74,6 +74,10 @@ prob: 0.001 - id: WeaponRevolverInspector prob: 0.001 + # DeltaV - .38 special revolver - Adds the .38 Special Revolver 'Lucky 37' to the salvage potential loot + - id: WeaponRevolverLucky + prob: 0.001 + # End of modified code - id: ClothingShoesBootsMagBlinding prob: 0.001 # - Skub diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index 44ec34e1569..4080dbaead1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -13,9 +13,11 @@ MagazineBoxMagnumPractice: 3 MagazineBoxMagnumRubber: 3 - MagazineBoxSpecial: 3 # DeltaV - .38 Special revolver - MagazineBoxSpecialPractice: 3 # DeltaV - .38 Special revolver - MagazineBoxSpecialRubber: 3 # DeltaV - .38 Special revolver + # DeltaV - .38 special ammo - Add various .38 special ammo to ammovend + MagazineBoxSpecial: 3 + MagazineBoxSpecialPractice: 3 + MagazineBoxSpecialRubber: 3 + # End of modified code MagazineBoxPistol: 3 MagazineBoxPistolPractice: 3 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml index 6f643fc0991..3bf47a80dec 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml @@ -67,3 +67,48 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - state: rubber + +- type: entity + parent: BaseMagazineBoxSpecial + id: MagazineBoxSpecialIncendiary + name: ammunition box (.38 special incendiary) + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialIncendiary + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: incendiary + +- type: entity + parent: BaseMagazineBoxSpecial + id: MagazineBoxSpecialUranium + name: ammunition box (.38 special uranium) + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialUranium + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: uranium + +- type: entity + parent: BaseMagazineBoxSpecial + id: MagazineBoxSpecialMindbreaker + name: ammunition box (.38 special mindbreaker) + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialMindbreaker + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: mindbreaker diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml index 2e60b8b7a55..8e1da076c65 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml @@ -35,6 +35,13 @@ components: - type: CartridgeAmmo proto: BulletSpecialPractice + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#dbdbdb" - type: entity id: CartridgeSpecialRubber @@ -43,6 +50,43 @@ components: - type: CartridgeAmmo proto: BulletSpecialRubber + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#43c4f7" + +- type: entity + id: CartridgeSpecialIncendiary + name: cartridge (.38 special incendiary) + parent: BaseCartridgeSpecial + components: + - type: CartridgeAmmo + proto: BulletSpecialIncendiary + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#ff6e52" + +- type: entity + id: CartridgeSpecialUranium + name: cartridge (.38 special uranium) + parent: BaseCartridgeSpecial + components: + - type: CartridgeAmmo + proto: BulletSpecialUranium + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#65fe08" - type: entity id: CartridgeSpecialHoly @@ -51,6 +95,13 @@ components: - type: CartridgeAmmo proto: BulletSpecialHoly + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#fff600" - type: entity id: CartridgeSpecialMindbreaker @@ -59,6 +110,13 @@ components: - type: CartridgeAmmo proto: BulletSpecialMindbreaker + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + map: [ "enum.AmmoVisualLayers.Tip" ] + color: "#950ea9" - type: ChemicalAmmo - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml index 76d285668e6..a021e77f0a2 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml @@ -31,7 +31,31 @@ types: Blunt: 3 - type: StaminaDamageOnCollide - damage: 35 # 3 hits to stun cuz revolver + damage: 30 + +- type: entity + id: BulletSpecialIncendiary + name: bullet (.38 special incendiary) + parent: BaseBulletIncendiary + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 3 + Heat: 27 + +- type: entity + id: BulletSpecialUranium + name: bullet (.38 special uranium) + parent: BaseBulletUranium + noSpawn: true + components: + - type: Projectile + damage: + types: + Radiation: 12 + Piercing: 18 - type: entity id: BulletSpecialHoly @@ -42,8 +66,8 @@ - type: Projectile damage: types: - Blunt: 3 - Holy: 5 + Holy: 6 + Piercing: 25 - type: entity id: BulletSpecialMindbreaker diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml index 6bbf8e4aec9..3b449ad404d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml @@ -78,3 +78,63 @@ steps: 7 zeroVisible: false - type: Appearance + +- type: entity + id: SpeedLoaderSpecialUranium + name: "speed loader (.38 special uranium)" + parent: BaseSpeedLoaderSpecial + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialUranium + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: uranium-6 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: uranium + steps: 7 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderSpecialMindbreaker + name: "speed loader (.38 special mindbreaker)" + parent: BaseSpeedLoaderSpecial + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialMindbreaker + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: mindbreaker-6 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: mindbreaker + steps: 7 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderSpecialHoly + name: "speed loader (.38 special holy)" + parent: BaseSpeedLoaderSpecial + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialHoly + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: holy-6 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: holy + steps: 7 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 23824c6812f..6f4d5b52301 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -81,7 +81,7 @@ - type: Sprite sprite: DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi - type: Gun - fireRate: 4 + fireRate: 3.5 availableModes: - SemiAuto soundGunshot: diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index da93ff5a5e1..a19a21dd924 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -34,7 +34,7 @@ sprite: DeltaV/Objects/Weapons/Guns/Revolvers/k38master.rsi - type: Gun selectedMode: SemiAuto - fireRate: 1.5 + fireRate: 2 availableModes: - SemiAuto - type: RevolverAmmoProvider @@ -59,7 +59,7 @@ sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi - type: Gun selectedMode: SemiAuto - fireRate: 1.5 + fireRate: 1.75 availableModes: - SemiAuto - type: RevolverAmmoProvider @@ -84,7 +84,7 @@ sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi - type: Gun selectedMode: SemiAuto - fireRate: 1.5 + fireRate: 2 availableModes: - SemiAuto - type: RevolverAmmoProvider @@ -108,16 +108,17 @@ - type: Sprite sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi - type: Gun selectedMode: SemiAuto - fireRate: 1 + fireRate: 1.5 availableModes: - SemiAuto - type: RevolverAmmoProvider whitelist: tags: - CartridgeSpecial + - SpeedLoaderSpecial proto: CartridgeSpecialHoly capacity: 4 chambers: [ True, True, True, True ] diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml index 4bae83432bd..cd79417a44e 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml @@ -31,14 +31,30 @@ Plastic: 5 Steel: 5 +- type: latheRecipe + id: CartridgeSpecialIncendiary + result: CartridgeSpecialIncendiary + category: Ammo + completetime: 2 + materials: + Plastic: 20 + +- type: latheRecipe + id: CartridgeSpecialUranium + result: CartridgeSpecialUranium + category: Ammo + completetime: 2 + materials: + Plastic: 20 + Uranium: 10 + - type: latheRecipe id: CartridgeSpecialHoly result: CartridgeSpecialHoly category: Ammo completetime: 2 materials: - Plastic: 5 - Steel: 5 + Steel: 15 Silver: 5 - type: latheRecipe @@ -47,7 +63,7 @@ category: Ammo completetime: 2 materials: - Plastic: 5 + Plastic: 15 Steel: 5 Bluespace: 5 @@ -57,7 +73,7 @@ category: Ammo completetime: 5 materials: - Steel: 1000 + Steel: 1250 - type: latheRecipe id: MagazineBoxSpecialPractice @@ -65,7 +81,7 @@ category: Ammo completetime: 5 materials: - Plastic: 950 + Plastic: 1200 - type: latheRecipe id: MagazineBoxSpecialRubber @@ -76,6 +92,33 @@ Steel: 350 Plastic: 300 +- type: latheRecipe + id: MagazineBoxSpecialIncendiary + result: MagazineBoxSpecialIncendiary + category: Ammo + completetime: 5 + materials: + Plastic: 1250 + +- type: latheRecipe + id: MagazineBoxSpecialUranium + result: MagazineBoxSpecialUranium + category: Ammo + completetime: 5 + materials: + Plastic: 1250 + Uranium: 125 + +- type: latheRecipe + id: MagazineBoxSpecialMindbreaker + result: MagazineBoxSpecialMindbreaker + category: Ammo + completetime: 5 + materials: + Plastic: 1250 + Steel: 75 + Bluespace: 75 + - type: latheRecipe id: ClothingOuterArmorPlateCarrier result: ClothingOuterArmorPlateCarrier diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index 82cbde7ed7e..71993d8c313 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -10,10 +10,10 @@ tier: 1 cost: 7500 recipeUnlocks: - - CartridgeSpecialHoly # DeltaV - .38 Special revolver, Holy ammo - - CartridgeSpecialMindbreaker # DeltaV - .38 Special revolver, Mindbreaker ammo + - CartridgeSpecialHoly + - CartridgeSpecialMindbreaker - ShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo - + - type: technology id: EnergyGuns name: research-technology-energy-gun @@ -26,7 +26,7 @@ recipeUnlocks: - WeaponEnergyGun - WeaponEnergyGunMini - + - type: technology id: EnergyGunsAdvanced name: research-technology-energy-gun-advance @@ -38,7 +38,7 @@ cost: 7500 recipeUnlocks: - WeaponEnergyGunPistol - + - type: technology id: Advanced Laser Manipulation name: research-technology-advance-laser @@ -50,5 +50,5 @@ cost: 12500 recipeUnlocks: - WeaponGunLaserCarbineAutomatic - + diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 0486f38d451..7c8e284ae50 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -159,7 +159,6 @@ - type: EmagLatheRecipes emagStaticRecipes: - CartridgePistol - - CartridgeSpecial # DeltaV - .38 Special revolver - CartridgeMagnum - ShellShotgun - ShellShotgunFlare @@ -171,9 +170,12 @@ - MagazineBoxRifle - MagazineBoxLightRifle - GrenadeBlast + # DeltaV - .38 special ammo - Add .38 special lethals to emagged autolathe + - CartridgeSpecial + - MagazineBoxSpecial + # End of modified code emagDynamicRecipes: - CartridgePistolRubber - - CartridgeSpecialRubber # DeltaV - .38 Special revolver - CartridgeMagnumRubber - ShellShotgunBeanbag - CartridgeRifleRubber @@ -206,6 +208,16 @@ - MagazineGrenadeEmpty - GrenadeEMP - GrenadeFlash + # DeltaV - .38 special ammo - Add various .38 special ammo to emagged autolathe + - CartridgeSpecialRubber + - CartridgeSpecialIncendiary + - CartridgeSpecialUranium + - CartridgeSpecialMindbreaker + - MagazineBoxSpecialRubber + - MagazineBoxSpecialIncendiary + - MagazineBoxSpecialUranium + - MagazineBoxSpecialMindbreaker + # End of modified code - type: entity id: AutolatheHyperConvection @@ -679,20 +691,16 @@ - ShellShotgunSlug - ShellShotgunFlare - ShellTranquilizer - - MagazinePistolSpecial # DeltaV - .38 Special psi-breaker - MagazinePistol - MagazinePistolSubMachineGun - MagazinePistolSubMachineGunTopMounted - MagazineRifle - MagazineLightRifle - MagazineBoxPistol - - MagazineBoxSpecial # DeltaV - .38 Special revolver - - MagazineBoxSpecialPractice # DeltaV - .38 Special revolver - MagazineBoxMagnum - MagazineBoxRifle - MagazineBoxLightRifle - SpeedLoaderMagnum - - SpeedLoaderSpecial # DeltaV - .38 Special revolver - ClothingOuterArmorPlateCarrier # DeltaV - plate carrier body armour - ClothingOuterArmorDuraVest # DeltaV - stabproof vest body armour - TargetHuman @@ -705,10 +713,14 @@ - ShellShotgunPractice - WeaponLaserCarbinePractice - WeaponDisablerPractice + # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab + - MagazineBoxSpecial + - MagazineBoxSpecialPractice + - SpeedLoaderSpecial + - MagazinePistolSpecial + # End of modified code dynamicRecipes: - - CartridgeSpecialRubber # DeltaV - .38 Special revolver - EncryptionKeySyndie # Nyano - - MagazineBoxSpecialRubber # DeltaV - .38 Special revolver - CartridgeLightRifleIncendiary - CartridgeMagnumIncendiary - CartridgePistolIncendiary @@ -733,8 +745,6 @@ - MagazineBoxMagnumUranium - MagazineBoxPistolUranium - MagazineBoxRifleUranium - - CartridgeSpecialHoly # DeltaV - .38 Special revolver, Holy ammo - - CartridgeSpecialMindbreaker # DeltaV - .38 Special revolver, Mindbreaker ammo - ShellSoulbreaker # Nyanotrasen - Shotgun shell to get rid of psionics - MagazineBoxLightRifleRubber - MagazineBoxMagnumRubber @@ -772,6 +782,17 @@ - WeaponEnergyGunMini #DeltaV - Energy Gun but miniature - WeaponEnergyGunPistol #DeltaV - Energy Gun Mini but with the power of a normal energy gun - WeaponGunLaserCarbineAutomatic #DeltaV - New Laser Projectiles with a 20 round carbine + # DeltaV - .38 special ammo - Add various .38 special ammo to security techfab + - CartridgeSpecialRubber + - CartridgeSpecialIncendiary + - CartridgeSpecialUranium + - CartridgeSpecialHoly + - CartridgeSpecialMindbreaker + - MagazineBoxSpecialRubber + - MagazineBoxSpecialIncendiary + - MagazineBoxSpecialUranium + - MagazineBoxSpecialMindbreaker + # End of modified code - type: MaterialStorage whitelist: tags: @@ -806,7 +827,6 @@ staticRecipes: - CartridgePistol - CartridgeMagnum - - CartridgeSpecial # DeltaV - .38 Special revolver - ShellShotgun - ShellShotgunSlug - ShellShotgunFlare @@ -815,9 +835,12 @@ - CartridgeRifle - MagazineBoxPistol - MagazineBoxMagnum - - MagazineBoxSpecial # DeltaV - .38 Special revolver - MagazineBoxRifle - MagazineBoxLightRifle + # DeltaV - .38 special ammo - Add lethal .38 special ammo to ammo techfab + - CartridgeSpecial + - MagazineBoxSpecial + # End of modified code - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 6946f5fe1d1..3696e6110f3 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -33,6 +33,10 @@ - MagazineBoxMagnumIncendiary - MagazineBoxLightRifleIncendiary - MagazineBoxRifleIncendiary + # DeltaV - .38 special incendiary ammo - Add .38 special incendiary ammo to the research tree + - CartridgeSpecialIncendiary + - MagazineBoxSpecialIncendiary + # End of modified code - type: technology id: ExplosiveTechnology @@ -78,15 +82,17 @@ recipeUnlocks: - ShellShotgunBeanbag - CartridgePistolRubber - - CartridgeSpecialRubber # DeltaV - .38 Special revolver - CartridgeMagnumRubber - CartridgeLightRifleRubber - CartridgeRifleRubber - MagazineBoxPistolRubber - - MagazineBoxSpecialRubber # DeltaV - .38 Special revolver - MagazineBoxMagnumRubber - MagazineBoxLightRifleRubber - MagazineBoxRifleRubber + # DeltaV - .38 special rubber ammo - Adds .38 special rubber ammo to the research tree + - CartridgeSpecialRubber + - MagazineBoxSpecialRubber + # End of modified code - type: technology id: UraniumMunitions @@ -107,6 +113,10 @@ - MagazineBoxMagnumUranium - MagazineBoxLightRifleUranium - MagazineBoxRifleUranium + # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree + - CartridgeSpecialUranium + - MagazineBoxSpecialUranium + # End of modified code # Tier 2 @@ -153,7 +163,7 @@ - type: technology id: BasicShuttleArmament name: research-technology-basic-shuttle-armament - icon: + icon: sprite: Structures/Power/cage_recharger.rsi state: full discipline: Arsenal @@ -196,11 +206,11 @@ cost: 15000 recipeUnlocks: - WeaponLaserSvalinn - + - type: technology id: AdvancedShuttleWeapon name: research-technology-advanced-shuttle-weapon - icon: + icon: sprite: Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi state: icon discipline: Arsenal diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/incendiary.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/incendiary.png new file mode 100644 index 00000000000..63e1affa46c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/incendiary.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/meta.json index d50b99b0a23..975993c6651 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/meta.json @@ -18,6 +18,15 @@ }, { "name": "rubber" + }, + { + "name": "incendiary" + }, + { + "name": "uranium" + }, + { + "name": "mindbreaker" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/mindbreaker.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/mindbreaker.png new file mode 100644 index 00000000000..c6f7fc228c4 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/mindbreaker.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/uranium.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/uranium.png new file mode 100644 index 00000000000..20315601774 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/special.rsi/uranium.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/meta.json index 5624759d9b7..d3bfc00981c 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/meta.json @@ -25,6 +25,9 @@ { "name": "rubber" }, + { + "name": "uranium" + }, { "name": "mag-1" }, diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/uranium.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/uranium.png new file mode 100644 index 00000000000..69374a12158 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi/uranium.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-1.png index 67c3ddd4b8f..f10ef5c0f63 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-1.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-1.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-2.png index 2d7bae76be1..3871a02ea3d 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-2.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-2.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-3.png index f516e824d35..8be17ee3a04 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-3.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-3.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-4.png index 310afbdb96d..6a1beb187c9 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-4.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-4.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-5.png index 9e024d7b9dc..1d632d4fed1 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-5.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-5.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-6.png index 174c21f8af6..0150a287612 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-6.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base-6.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base.png index dd46aa81038..0d75c56183a 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-1.png deleted file mode 100644 index 63bf305bbc5..00000000000 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-1.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-2.png deleted file mode 100644 index b0adec9bc6f..00000000000 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-2.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-3.png deleted file mode 100644 index b4a7c390c29..00000000000 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-3.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-4.png deleted file mode 100644 index f2b8fa50d61..00000000000 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-4.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-5.png deleted file mode 100644 index 1138054fd00..00000000000 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-5.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-6.png deleted file mode 100644 index 89bfca7f6dd..00000000000 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/high-velocity-6.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-1.png new file mode 100644 index 00000000000..017ec47b45e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-1.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-2.png new file mode 100644 index 00000000000..2853d098580 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-2.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-3.png new file mode 100644 index 00000000000..330ab025bae Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-3.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-4.png new file mode 100644 index 00000000000..8ee02ef31ea Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-4.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-5.png new file mode 100644 index 00000000000..014217803d7 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-5.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-6.png new file mode 100644 index 00000000000..47caeb743b6 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/holy-6.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/icon.png new file mode 100644 index 00000000000..0ee451aa5c2 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/meta.json index dbecaae60b9..7fd72075d6c 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/meta.json @@ -5,11 +5,14 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi and edited by Floofers", "states": [ { "name": "base" }, + { + "name": "icon" + }, { "name": "base-1" }, @@ -28,24 +31,6 @@ { "name": "base-6" }, - { - "name": "high-velocity-1" - }, - { - "name": "high-velocity-2" - }, - { - "name": "high-velocity-3" - }, - { - "name": "high-velocity-4" - }, - { - "name": "high-velocity-5" - }, - { - "name": "high-velocity-6" - }, { "name": "practice-1" }, @@ -81,6 +66,60 @@ }, { "name": "rubber-6" + }, + { + "name": "uranium-1" + }, + { + "name": "uranium-2" + }, + { + "name": "uranium-3" + }, + { + "name": "uranium-4" + }, + { + "name": "uranium-5" + }, + { + "name": "uranium-6" + }, + { + "name": "mindbreaker-1" + }, + { + "name": "mindbreaker-2" + }, + { + "name": "mindbreaker-3" + }, + { + "name": "mindbreaker-4" + }, + { + "name": "mindbreaker-5" + }, + { + "name": "mindbreaker-6" + }, + { + "name": "holy-1" + }, + { + "name": "holy-2" + }, + { + "name": "holy-3" + }, + { + "name": "holy-4" + }, + { + "name": "holy-5" + }, + { + "name": "holy-6" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-1.png new file mode 100644 index 00000000000..7a71e8faff2 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-1.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-2.png new file mode 100644 index 00000000000..cef078e363d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-2.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-3.png new file mode 100644 index 00000000000..b50d0b36a7d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-3.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-4.png new file mode 100644 index 00000000000..d29af3f4688 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-4.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-5.png new file mode 100644 index 00000000000..ad1a0a990c8 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-5.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-6.png new file mode 100644 index 00000000000..c872c84ba5d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/mindbreaker-6.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-1.png index 7cea456b83a..ba96ef9b7df 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-1.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-1.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-2.png index 95258e57a55..a481fa141b5 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-2.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-2.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-3.png index 2df8d04d138..05e8db87690 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-3.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-3.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-4.png index 6288b36718d..2a78d53348f 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-4.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-4.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-5.png index 6f294593ff6..e165f2cb458 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-5.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-5.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-6.png index f3329b1114b..1895ba06b2a 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-6.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/practice-6.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-1.png index a55a20f4403..c34c3f9ac15 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-1.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-1.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-2.png index eeee78f6fe7..651359d4e96 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-2.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-2.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-3.png index 85fd3c747c5..0e375cadc35 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-3.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-3.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-4.png index baccd8fc23f..1b3d62af14f 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-4.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-4.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-5.png index 53183ac0234..ee6311ff17f 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-5.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-5.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-6.png index 3bd88af36b4..bcd579fc23d 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-6.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/rubber-6.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-1.png new file mode 100644 index 00000000000..4db777e1003 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-1.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-2.png new file mode 100644 index 00000000000..f9622dac87f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-2.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-3.png new file mode 100644 index 00000000000..48c2d57c431 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-3.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-4.png new file mode 100644 index 00000000000..57ef1542fb8 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-4.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-5.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-5.png new file mode 100644 index 00000000000..1db262e6518 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-5.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-6.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-6.png new file mode 100644 index 00000000000..465a9d408f8 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Special/special_speed_loader.rsi/uranium-6.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/base.png index 544812914b5..4a6b468f32f 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/base.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/bolt-open.png index 013665c7e06..20ee4218b09 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/bolt-open.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/icon.png index 61b92bc3172..e87b6328ac2 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/icon.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi/icon.png differ