From 11bbf2b0204781e28ce42262413350ac5ad9c05c Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Thu, 11 Jan 2024 03:01:41 -0500 Subject: [PATCH] Uranium & AP magazine and projectile sprites (#23914) Add missing uranium and AP magazine and box sprite layers. Add uranium and AP projectile sprites. Fix whitelist issue that made .45 pistol mags not go in secbelt. --- .../Entities/Clothing/Belt/belts.yml | 1 + .../Guns/Ammunition/Boxes/light_rifle.yml | 3 +- .../Weapons/Guns/Ammunition/Boxes/magnum.yml | 18 +++++- .../Weapons/Guns/Ammunition/Boxes/pistol.yml | 2 +- .../Weapons/Guns/Ammunition/Boxes/rifle.yml | 1 + .../Guns/Ammunition/Magazines/light_rifle.yml | 14 +++++ .../Guns/Ammunition/Magazines/magnum.yml | 58 +++++++++++++++++- .../Guns/Ammunition/Magazines/pistol.yml | 14 +++++ .../Guns/Ammunition/Magazines/rifle.yml | 14 +++++ .../Ammunition/Projectiles/light_rifle.yml | 2 +- .../Guns/Ammunition/Projectiles/magnum.yml | 2 +- .../Guns/Ammunition/Projectiles/pistol.yml | 2 +- .../Guns/Ammunition/Projectiles/rifle.yml | 2 +- .../Guns/Ammunition/SpeedLoaders/magnum.yml | 24 +++++++- .../Weapons/Guns/Projectiles/projectiles.yml | 19 ++++++ .../Boxes/light_rifle.rsi/meta.json | 3 + .../Boxes/light_rifle.rsi/uranium.png | Bin 0 -> 213 bytes .../Ammunition/Boxes/magnum.rsi/meta.json | 6 ++ .../Ammunition/Boxes/magnum.rsi/piercing.png | Bin 0 -> 135 bytes .../Ammunition/Boxes/magnum.rsi/uranium.png | Bin 0 -> 130 bytes .../Ammunition/Boxes/pistol.rsi/meta.json | 3 + .../Ammunition/Boxes/pistol.rsi/uranium.png | Bin 0 -> 214 bytes .../Guns/Ammunition/Boxes/rifle.rsi/meta.json | 3 + .../Ammunition/Boxes/rifle.rsi/uranium.png | Bin 0 -> 245 bytes .../caseless_pistol_mag.rsi/meta.json | 3 + .../caseless_pistol_mag.rsi/uranium.png | Bin 0 -> 279 bytes .../LightRifle/light_rifle_mag.rsi/meta.json | 3 + .../light_rifle_mag.rsi/uranium.png | Bin 0 -> 312 bytes .../Magnum/magnum_smg_mag.rsi/meta.json | 6 ++ .../Magnum/magnum_smg_mag.rsi/piercing.png | Bin 0 -> 255 bytes .../Magnum/magnum_smg_mag.rsi/uranium.png | Bin 0 -> 290 bytes .../pistol_high_capacity_mag.rsi/meta.json | 6 ++ .../pistol_high_capacity_mag.rsi/piercing.png | Bin 0 -> 254 bytes .../pistol_high_capacity_mag.rsi/uranium.png | Bin 0 -> 285 bytes .../Magazine/Pistol/pistol_mag.rsi/meta.json | 6 ++ .../Pistol/pistol_mag.rsi/piercing.png | Bin 0 -> 234 bytes .../Pistol/pistol_mag.rsi/uranium.png | Bin 0 -> 266 bytes .../Magazine/Pistol/smg_mag.rsi/meta.json | 3 + .../Magazine/Pistol/smg_mag.rsi/uranium.png | Bin 0 -> 379 bytes .../Magazine/Rifle/rifle_mag.rsi/meta.json | 3 + .../Magazine/Rifle/rifle_mag.rsi/uranium.png | Bin 0 -> 298 bytes .../Magnum/magnum_speed_loader.rsi/meta.json | 36 +++++++++++ .../magnum_speed_loader.rsi/piercing-1.png | Bin 0 -> 152 bytes .../magnum_speed_loader.rsi/piercing-2.png | Bin 0 -> 167 bytes .../magnum_speed_loader.rsi/piercing-3.png | Bin 0 -> 172 bytes .../magnum_speed_loader.rsi/piercing-4.png | Bin 0 -> 178 bytes .../magnum_speed_loader.rsi/piercing-5.png | Bin 0 -> 196 bytes .../magnum_speed_loader.rsi/piercing-6.png | Bin 0 -> 196 bytes .../magnum_speed_loader.rsi/uranium-1.png | Bin 0 -> 153 bytes .../magnum_speed_loader.rsi/uranium-2.png | Bin 0 -> 168 bytes .../magnum_speed_loader.rsi/uranium-3.png | Bin 0 -> 172 bytes .../magnum_speed_loader.rsi/uranium-4.png | Bin 0 -> 182 bytes .../magnum_speed_loader.rsi/uranium-5.png | Bin 0 -> 196 bytes .../magnum_speed_loader.rsi/uranium-6.png | Bin 0 -> 186 bytes .../Projectiles/projectiles2.rsi/meta.json | 18 ++++++ .../Projectiles/projectiles2.rsi/piercing.png | Bin 0 -> 314 bytes .../Projectiles/projectiles2.rsi/uranium.png | Bin 0 -> 332 bytes 57 files changed, 265 insertions(+), 10 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercing.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/uranium.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/piercing.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/uranium.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/piercing.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/uranium.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/piercing.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-5.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-6.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-5.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-6.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/piercing.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/uranium.png diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 7aeeb4e0f5..e756336423 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -455,6 +455,7 @@ - Radio - Sidearm - MagazinePistol + - MagazineMagnum components: - Stunbaton - FlashOnTrigger diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index 94867fc7aa..0670e37636 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -116,4 +116,5 @@ - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] \ No newline at end of file + map: ["enum.GunVisualLayers.Mag"] + - state: uranium \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index 04f9b7b238..65f6bff00e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -95,4 +95,20 @@ - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] \ No newline at end of file + map: ["enum.GunVisualLayers.Mag"] + - state: uranium + +- type: entity + id: MagazineBoxMagnumAP + parent: BaseMagazineBoxMagnum + name: ammunition box (.45 magnum armor-piercing) + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumAP + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: piercing diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index 5e970b2b0b..9f6a8e8257 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -97,4 +97,4 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - + - state: uranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index f974dbb2ad..c321b77d10 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -137,4 +137,5 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: uranium diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index 7ae4f32524..d420a5c3d8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -96,6 +96,20 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: MagazineLightRifleUranium + name: "magazine (.30 rifle uranium)" + parent: BaseMagazineLightRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleUranium + - type: Sprite + layers: + - state: uranium + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: entity id: MagazineLightRifleMaxim name: "pan magazine (.30 rifle)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index a58bca1fa1..6a1cc041de 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -67,7 +67,7 @@ parent: BaseMagazineMagnum components: - type: BallisticAmmoProvider - proto: CartridgeMagnum + proto: CartridgeMagnumPractice - type: Sprite layers: - state: practice @@ -89,6 +89,34 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: MagazineMagnumUranium + name: pistol magazine (.45 magnum uranium) + parent: BaseMagazineMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumUranium + - type: Sprite + layers: + - state: uranium + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineMagnumAP + name: pistol magazine (.45 magnum armor-piercing) + parent: BaseMagazineMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumAP + - type: Sprite + layers: + - state: piercing + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: entity id: MagazineMagnumSubMachineGun name: "Vector magazine (.45 magnum)" @@ -130,3 +158,31 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineMagnumSubMachineGunUranium + name: "Vector magazine (.45 magnum uranium)" + parent: BaseMagazineMagnumSubMachineGun + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumUranium + - type: Sprite + layers: + - state: uranium + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineMagnumSubMachineGunPiercing + name: "Vector magazine (.45 magnum armor-piercing)" + parent: BaseMagazineMagnumSubMachineGun + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumAP + - type: Sprite + layers: + - state: piercing + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 8793a717e7..679acd299c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -259,3 +259,17 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazinePistolSubMachineGunUranium + name: SMG magazine (.35 auto rubber) + parent: BaseMagazinePistolSubMachineGun + components: + - type: BallisticAmmoProvider + proto: CartridgePistolUranium + - type: Sprite + layers: + - state: uranium + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index 8e65cd992e..5ba57dce4e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -74,3 +74,17 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineRifleUranium + name: "magazine (.20 rifle uranium)" + parent: BaseMagazineRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleUranium + - type: Sprite + layers: + - state: uranium + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index 7167bd6170..3a0df2ac6c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -45,7 +45,7 @@ - type: entity id: BulletLightRifleUranium - parent: BaseBullet + parent: BaseBulletUranium name: bullet (.20 rifle uranium) noSpawn: true components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml index 445d2ad668..1b5cf7890b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -60,7 +60,7 @@ - type: entity id: BulletMagnumUranium name: bullet (.45 magnum uranium) - parent: BaseBullet + parent: BaseBulletUranium noSpawn: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 79a2f7f99d..086a8dc914 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -45,7 +45,7 @@ - type: entity id: BulletPistolUranium - parent: BaseBullet + parent: BaseBulletUranium name: bullet (.35 auto uranium) noSpawn: true components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index 99049b9b34..2113916cf5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -45,7 +45,7 @@ - type: entity id: BulletRifleUranium - parent: BaseBullet + parent: BaseBulletUranium name: bullet (0.20 rifle uranium) noSpawn: true components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml index 9926b0cf5b..b06ca64d8f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml @@ -91,10 +91,30 @@ layers: - state: base map: [ "enum.GunVisualLayers.Base" ] - - state: base-6 + - state: piercing-6 map: [ "enum.GunVisualLayers.Mag" ] - type: MagazineVisuals - magState: base + magState: piercing + steps: 7 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderMagnumUranium + name: "speed loader (.45 magnum uranium)" + parent: BaseSpeedLoaderMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumUranium + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_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 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index b8efdadb10..5557340724 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -147,12 +147,31 @@ parent: BaseBullet noSpawn: true components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: piercing - type: Projectile damage: types: Piercing: 11 # 20% decrease ignoreResistances: true +- type: entity + id: BaseBulletUranium + name: base bullet uranium + parent: BaseBullet + noSpawn: true + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: uranium + - type: Projectile + damage: + types: + Radiation: 11 + # Energy projectiles - type: entity name: taser bolt diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json index 9259015020..22eef0aaf3 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json @@ -27,6 +27,9 @@ }, { "name": "rubber" + }, + { + "name": "uranium" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..7fefe0c6b9f7fb00f70ecb9e3fcc2c5c7b3fd46e GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJIi4<#ArXg@6C_v{Cy4Yk1scRS z9Qo4nU+}WHyS zHanj2^>5OSZC^P2s%NZtR$S7q(8^@zFq3(LPO~+WuI`0vj0WxtEL$Q@ubj<2VUu!C z?aLFgdp`Ql6*$1yv2jispTf1GSqy74X8-4bI)lrDfx+3$vft&`oEJcMGI+ZBxvX&ph+x-$u!ekNcK4 hzHj>w)yvDU!FrXFKw{IyFkYZ~22WQ%mvv4FO#s2iFQNbd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..90238cf3c27596debbca11238774ce8ad68c6817 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzPfr)ekch*{2@)rBgC1(LvV1*WioHf~()N9~3u*Z8`h@;wO-{ bL}ms%3m#L?;|BAAhBA1%`njxgN@xNAq!}ym literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json index 7657edc7ef..6237fcbe6f 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json @@ -24,6 +24,9 @@ }, { "name": "rubber" + }, + { + "name": "uranium" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..1dba694fefb2d5bf42ecfb971a9ec9a5bba635ea GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJxt=bLArXg@6C_v{Cy4Nf3mDoy ztUvOl<^Pgb$xEg^)jlKVcw_k!2@nWN(Mwp;%{)QZT~Pg!V$YThGLjiz|0eC&_JzZ* zdd7;hogeMoO3ZXbJ}|1Simbc#(%xvc#Oae|3|@PJ5-dxL80Aju%kFG8|F?1)Zz7-K z)uJvTMK%YomLpMqvFsBPEw46)Z8=-t7HGibc2EQ4niY%;IWnOpxrRZ#K!-ATy85}S Ib4q9e0C2-hcK`qY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json index f05e5c9261..18e89881dd 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json @@ -30,6 +30,9 @@ }, { "name": "rubber" + }, + { + "name": "uranium" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..8dede3071ea2d4f942a33fde1ce23769953fa0a8 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJ)SO(ArXg@6C_v{Cy4MEBrLho z(D9P zobyMZ;c2~+&i;}oe22F#b(hGD5?Fg8#$npikV1xSLK7oSuYARj;x3SF>6*zPu5k2I mpaGZLK@Ff&8yXuM85v6IbJwhYcY_n?4+c+HKbLh*2~7Yrs9ie% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json index 7ae6c4a71a..8aa221dcb7 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json @@ -22,6 +22,9 @@ { "name": "rubber" }, + { + "name": "uranium" + }, { "name": "mag-1" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..ad8e3d9fb40001c2b461479bece8941cf1fb1bee GIT binary patch literal 279 zcmV+y0qFjTP)m-Yxam-iNwWjSiC7s1q8!+Vcm7>euy{=LHy dAqax7DIb6fNQi^3I1B&)002ovPDHLkV1mU!bOZnZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json index dc6dc886cb..40eaed0198 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json @@ -19,6 +19,9 @@ { "name": "rubber" }, + { + "name": "uranium" + }, { "name": "mag-1" } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..b9dabe5bdafdb41cebd3b2d44f544cae913f3bce GIT binary patch literal 312 zcmV-80muG{P)fJVJI7t$Iry?^WilV00Xo=|dz1Wlo z#vJH7l-3H`JYZ%BApihMsqq~6ycj_5$4EQ7rIf~=VvEIM0e}}E`d@}8rEu;50000< KMNUMnLSTYztbs=W literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json index dc2364cfed..15964feef9 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json @@ -19,6 +19,12 @@ { "name": "rubber" }, + { + "name": "uranium" + }, + { + "name": "piercing" + }, { "name": "mag-1" } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/piercing.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/piercing.png new file mode 100644 index 0000000000000000000000000000000000000000..2ac700b8b646bd29538ebe65ff1f8c0ac7fd619d GIT binary patch literal 255 zcmV zO$x#=5Jq2XPvX#Zz$^4XLJrcS30arA$T^g_stZLh&NQW%Z

2zU0kMpsMQM)o3=0 zNLt48JU2xRh)5cS0p}b5<2dq*nNITp&N)H|0C?{KmU;TtL}$fvF)~fl`UpfMdG84! zyd4;0EQbJ~@B8OC_x1qo)@j)8t`1o8SI2;s|2|{jc0ZUJ=<@lW&G@Tgz=D6R16g&z zI{#HMV8uVT5~kCKg^QxIX1~DkWqvK#3)0$u%&MwQ^Z*m>V3FIBkc$8S002ovPDHLk FV1lwXabo}g literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..a7db07b987d95a5546d5c035c7c947ce2b6ad934 GIT binary patch literal 290 zcmV+-0p0$IP)BPcrmf<3VEMyut@SDFAJF7JEVMsHbYfy>R2%?~4;>cib zm4t-chl9iDU2}yXsrS2xqH?` z8j59Yq%6z#BM=d%wZ<58b756g?I8fjvg|T$`g(xgr^~R{xjqn*zjp?F`FAq|$5TJ3 zfwVdQRWSZu83@5Y_JKxyAawnEWgry)Mg|7+5&z?g!T9HDeaeje?*XiRe;KZa+q>(N oHZm|-F5II%yT46BR8-e=2B%$VL{j!BqW}N^07*qoM6N<$f`EE}Qvd(} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json index dcbc205f54..a01c6d97bc 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json @@ -19,6 +19,12 @@ { "name": "rubber" }, + { + "name": "uranium" + }, + { + "name": "piercing" + }, { "name": "mag-1" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/piercing.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/piercing.png new file mode 100644 index 0000000000000000000000000000000000000000..953ad220660859fb60f807a51afb0bfe56611be1 GIT binary patch literal 254 zcmV zF%p9y5JfkRN1&qO3@NEoQ`yk%(d_8=P+VhEWQLHW!38uX{26Bu72o*2jsPPg|DKEF zB1Gi(xpiGdYt2$}r4(3e^C^}9%{7lN#+b&=xiluC;x(okfDpn9Ob*no1Bl2`1}iHoWTF4$IEaOk;CuG$8Jz9s=LctR z+O&yiGngoG!1CqGQ5=KpAeyCtgoK3uA|fIT3JMAsa#B)K44XD>A}KvE4RkJ`iUW|N zf^H5#wlp#_l0M}Cwc~$yqyb9epKJ$EEB;AJ1GI?$p`QjQjeoKnK+X6kIt|b&{s%=G zAgVoZ>h~Q6J!J-l9nIkxSA52Z>PpNl5%!Pw#;MP!#3gx%3<& zB6**SF?QA3dX*z0c<+x>(j#a)V_(j>^g{@x&&<^|%ozbGr57^`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..36ad667c6313670f113c0213ce59be36943eca15 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJi=HlyArXg@6C_v{Cy4Zv9PsE{ z*3#1Q|3wnFn2y3}9kHTVJtd_>38|^AI$!3?ux|_ysyRQ;wt4g4KYt#)@ttiZn9C-t z$``S(#oLPWOVlP^6E;wyv$c+Df_a0fhdEP) zp>D%K42J(yC6f|TFe%osHHDsrTC~1IqmsP9@ZMsipii);C@rf(1_rEQlfguqG--y@8j2_%kRrgjYaJ2=BwOAWou<0dcZtp&}<_pVej+g!0u>XKB1T)*857@`;6_(W; zo7n+Hj2`Ig33v0&?119w6R*$vpt*V>iuJ-i>>e%Zdt0m*Hp&?GX|=7a^Za5rA2n*I Zz5xS#AV;5dSDOF;002ovPDHLkV1nL^rY8UZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json index 785b31f6be..17803dfbc7 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json @@ -19,6 +19,9 @@ { "name": "rubber" }, + { + "name": "uranium" + }, { "name": "mag-1" } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..782b70ab55cfd4ff11cf381810fd37d6be7d7972 GIT binary patch literal 298 zcmV+_0oDGAP)xYU0b`^C#=j055T0e&uq4{zpQ_qzy?;_blPP(U0_I5GyH!hsd>wfvb1b=3*>464ZZj1~J!l7NsZ##T} P)-!mz`njxgN@xNAFN-}{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-4.png new file mode 100644 index 0000000000000000000000000000000000000000..08bcde0a1966a1fec9226b83726c15e7f6f516b5 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJN>3NZkch*{2@iUUUvtk*hw00=&O{1)7nFD1oeWu9kX zkdg66{g@!L98=GgF7G1QLr%Jzopr0H&5dRR910 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-5.png new file mode 100644 index 0000000000000000000000000000000000000000..987ffc55e3f5de112333128b6173081abe53a1d2 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJZci7-kch*{2@iUUUvtk*hw00=&O{1)7nFD1oeWu9kX zkdg66{g@!L98=GgF7G1QLr%J;{M#(-!d8E=lG{wNSHA}&+E5| o!&(6eT~0~&oNv+)iyfI6HqEH}^1j`9GtgNKp00i_>zopr05AbcCIA2c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-6.png new file mode 100644 index 0000000000000000000000000000000000000000..3a3c5a4e152cd4a1953667ee9347d7ccbe9b5f89 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJZci7-kch*{2@iUUUvtk*hw00=&O{1)7nFD1oeWu9kX zkdg66{g|M$IZHw0ocZ}Y5AP@Z@b7VsSRwmGSkgp7ZArI~tY}XNKVx~`rbS6FQk}C} p4`fJ5=yI~#u(%!60Nc&LuzOO^a%tUsGoZ5=JYD@<);T3K0RV$&MGOD{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-1.png new file mode 100644 index 0000000000000000000000000000000000000000..0dc5897efbd282d6d4f03add6a846f3e64ac29e0 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1Wy;okch*{2@R literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-2.png new file mode 100644 index 0000000000000000000000000000000000000000..3a59593ab23d5242290ca9abcdd7531fe44d11d6 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJd`}n0kch*{2@lWz(EHDbP0l+XkKj%_*f literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-4.png new file mode 100644 index 0000000000000000000000000000000000000000..c4ac8d8ecccdd42e60f34c74d04c2f2a138f1f16 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJT2B|pkch*{2@}+6?e_+tvlu*G{an^LB{Ts58=yvB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-6.png new file mode 100644 index 0000000000000000000000000000000000000000..a0367adcf6d9ccf54d229801f13c65ef965fa717 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJMo$;Vkch*{2@T}s$K1arth~; z>gUgN98PolAEW;3vsVL)N5gyXP|r~7E02^v?G?VTcB#$*@fYXH8P_b;347i6%1-G% zYrA`UM5xEEy3>g-sj(a=#Neqi7G4bK*Tx>+oL;EbC~N*a$P3-hN~;SVhTPq;kU z%^+9H&kEAJCnVpa;rlkjFFYr>CjuRZjOMT94@wD~?RH*b3ef8ep00i_>zopr0Q`l2 A_5c6? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/uranium.png new file mode 100644 index 0000000000000000000000000000000000000000..0feeb3ecfb8b8fa3c9368060ecec9ed03be02d1d GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQfx`y?k)^R7!ENUVwx^;je&uY z(bL5-B;(%O8~$8P4kE`tnyYejeq&$bDqe7rmudY&#i+KoHcjj=G@5SbT@Z~j7g%`l zMM?X;=KF`ffBRT!ch&G`P%X-4Joq)BL?Lm@UAXC>FTGk