From 099dd285fb426b37b39f486df614081f570bc75b Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Mon, 10 Feb 2025 16:07:05 +0000 Subject: [PATCH] bring back rubber ammo sprites --- Resources/Migrations/deltaMigrations.yml | 5 +++ .../Guns/Ammunition/SpeedLoaders/magnum.yml | 20 ----------- .../Guns/Ammunition/SpeedLoaders/pistol.yml | 19 ----------- .../Weapons/Guns/Projectiles/projectiles.yml | 20 ----------- .../Guns/Ammunition/Boxes/caseless_rifle.yml | 32 ------------------ .../Guns/Ammunition/Boxes/light_rifle.yml | 1 + .../Weapons/Guns/Ammunition/Boxes/magnum.yml | 2 +- .../Weapons/Guns/Ammunition/Boxes/pistol.yml | 1 + .../Weapons/Guns/Ammunition/Boxes/rifle.yml | 12 ++++--- .../Ammunition/Magazines/caseless_rifle.yml | 3 ++ .../Guns/Ammunition/Magazines/light_rifle.yml | 1 + .../Guns/Ammunition/Magazines/magnum.yml | 15 +------- .../Guns/Ammunition/Magazines/pistol.yml | 2 ++ .../Guns/Ammunition/SpeedLoaders/magnum.yml | 20 +++++++++++ .../Guns/Ammunition/SpeedLoaders/pistol.yml | 19 +++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 19 +++++++++++ .../Boxes/light_rifle.rsi/meta.json | 14 ++++++++ .../Boxes/light_rifle.rsi/rubber.png | Bin 0 -> 199 bytes .../Ammunition/Boxes/magnum.rsi/meta.json | 14 ++++++++ .../Ammunition/Boxes/magnum.rsi/rubber.png | Bin 0 -> 153 bytes .../Ammunition/Boxes/pistol.rsi/meta.json | 14 ++++++++ .../Ammunition/Boxes/pistol.rsi/rubber.png | Bin 0 -> 153 bytes .../Guns/Ammunition/Boxes/rifle.rsi/meta.json | 14 ++++++++ .../Ammunition/Boxes/rifle.rsi/rubber.png | Bin 0 -> 200 bytes .../caseless_pistol_mag.rsi/meta.json | 14 ++++++++ .../caseless_pistol_mag.rsi/rubber.png | Bin 0 -> 223 bytes .../caseless_rifle_mag.rsi/meta.json | 14 ++++++++ .../caseless_rifle_mag.rsi/rubber.png | Bin 0 -> 2155 bytes .../caseless_rifle_mag_short.rsi/meta.json | 14 ++++++++ .../caseless_rifle_mag_short.rsi/rubber.png | Bin 0 -> 358 bytes .../LightRifle/light_rifle_mag.rsi/meta.json | 14 ++++++++ .../LightRifle/light_rifle_mag.rsi/rubber.png | Bin 0 -> 236 bytes .../Magnum/magnum_smg_mag.rsi/meta.json | 14 ++++++++ .../Magnum/magnum_smg_mag.rsi/rubber.png | Bin 0 -> 225 bytes .../pistol_high_capacity_mag.rsi/meta.json | 14 ++++++++ .../pistol_high_capacity_mag.rsi/rubber.png | Bin 0 -> 226 bytes .../Magazine/Pistol/pistol_mag.rsi/meta.json | 14 ++++++++ .../Magazine/Pistol/pistol_mag.rsi/rubber.png | Bin 0 -> 221 bytes .../Magazine/Pistol/smg_mag.rsi/meta.json | 14 ++++++++ .../Magazine/Pistol/smg_mag.rsi/rubber.png | Bin 0 -> 230 bytes .../Magazine/Rifle/rifle_mag.rsi/meta.json | 14 ++++++++ .../Magazine/Rifle/rifle_mag.rsi/rubber.png | Bin 0 -> 244 bytes .../Magnum/magnum_speed_loader.rsi/meta.json | 29 ++++++++++++++++ .../magnum_speed_loader.rsi/rubber-1.png | Bin 0 -> 171 bytes .../magnum_speed_loader.rsi/rubber-2.png | Bin 0 -> 173 bytes .../magnum_speed_loader.rsi/rubber-3.png | Bin 0 -> 174 bytes .../magnum_speed_loader.rsi/rubber-4.png | Bin 0 -> 177 bytes .../magnum_speed_loader.rsi/rubber-5.png | Bin 0 -> 186 bytes .../magnum_speed_loader.rsi/rubber-6.png | Bin 0 -> 188 bytes .../Pistol/pistol_speed_loader.rsi/meta.json | 29 ++++++++++++++++ .../pistol_speed_loader.rsi/rubber-1.png | Bin 0 -> 2252 bytes .../pistol_speed_loader.rsi/rubber-2.png | Bin 0 -> 2376 bytes .../pistol_speed_loader.rsi/rubber-3.png | Bin 0 -> 2569 bytes .../pistol_speed_loader.rsi/rubber-4.png | Bin 0 -> 2621 bytes .../pistol_speed_loader.rsi/rubber-5.png | Bin 0 -> 2574 bytes .../pistol_speed_loader.rsi/rubber-6.png | Bin 0 -> 2573 bytes 56 files changed, 320 insertions(+), 111 deletions(-) delete mode 100644 Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubber.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/rubber.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/rubber.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/rubber.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-1.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-2.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-3.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-4.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-5.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-6.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-1.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-2.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-3.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png create mode 100644 Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-6.png diff --git a/Resources/Migrations/deltaMigrations.yml b/Resources/Migrations/deltaMigrations.yml index 4862f8d940..d2ac267d28 100644 --- a/Resources/Migrations/deltaMigrations.yml +++ b/Resources/Migrations/deltaMigrations.yml @@ -137,3 +137,8 @@ SpawnMobSmile: SentientSmileCore #2025-01-12 ForensicMantisPDA: PsionicMantisPDA + +#2025-02-10 +MagazineBoxCaselessRifleBigRubber: null +MagazineBoxCaselessRifleRubber: null +MagazineMagnumSubMachineGunRubber: null 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 fc36adb83b..ae6bf0cebf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml @@ -80,26 +80,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: SpeedLoaderMagnumRubber - name: "speed loader (.45 magnum rubber)" - parent: BaseSpeedLoaderMagnum - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumRubber - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi - layers: - - state: base - map: [ "enum.GunVisualLayers.Base" ] - - state: rubber-6 - map: [ "enum.GunVisualLayers.Mag" ] - - type: MagazineVisuals - magState: rubber - steps: 7 - zeroVisible: false - - type: Appearance - - type: entity id: SpeedLoaderMagnumAP name: "speed loader (.45 magnum armor-piercing)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml index 0278869ec4..8f3ec37753 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml @@ -57,22 +57,3 @@ steps: 7 zeroVisible: false - type: Appearance - -- type: entity - id: SpeedLoaderPistolRubber - name: "speed loader (.35 auto rubber)" - parent: BaseSpeedLoaderPistol - components: - - type: BallisticAmmoProvider - proto: CartridgePistolRubber - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: rubber-6 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: rubber - 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 bc9789fa77..00f198adb9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -104,26 +104,6 @@ types: Blunt: 1 -# DeltaV - We're keping rubbers so make sure to keep this updated -- type: entity - id: BaseBulletRubber - name: base bullet rubber - parent: BaseBullet - categories: [ HideSpawnMenu ] - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - layers: - - state: rubber - - type: Projectile - damage: - types: - Blunt: 3 - soundHit: - path: /Audio/Weapons/Guns/Hits/snap.ogg - - type: StaminaDamageOnCollide - damage: 22 # 5 hits to stun sounds reasonable - - type: entity id: BaseBulletIncendiary name: base bullet incendiary diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml deleted file mode 100644 index cae1675f16..0000000000 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml +++ /dev/null @@ -1,32 +0,0 @@ -- type: entity - parent: BaseMagazineBoxCaselessRifle - id: MagazineBoxCaselessRifleBigRubber - name: ammunition box (.25 caseless rubber) - components: - - type: BallisticAmmoProvider - capacity: 200 - proto: CartridgeCaselessRifleRubber - - type: Sprite - layers: - - state: base-b - map: ["enum.GunVisualLayers.Base"] - - state: magb-1 - map: ["enum.GunVisualLayers.Mag"] - - state: rubber-b - - type: MagazineVisuals - magState: magb - -- type: entity - parent: BaseMagazineBoxCaselessRifle - id: MagazineBoxCaselessRifleRubber - name: ammunition box (.25 caseless rubber) - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleRubber - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: rubber diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index 2c30951bc9..7c34378008 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -12,3 +12,4 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - state: rubber + sprite: _DV/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index 381ed7931d..71e3dd8fc2 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -12,4 +12,4 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - state: rubber - + sprite: _DV/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index 5b3aba79f0..3bb928a1f8 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -12,3 +12,4 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - state: rubber + sprite: _DV/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index a2c5379664..859fd7eb19 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -5,16 +5,17 @@ components: - type: BallisticAmmoProvider capacity: 200 - proto: CartridgeRiflePractice + proto: CartridgeRifleRubber - type: Sprite layers: - - state: base-b + - state: base-big map: ["enum.GunVisualLayers.Base"] - - state: magb-1 + - state: mag-big-1 map: ["enum.GunVisualLayers.Mag"] - - state: practice-b + - state: rubber + sprite: _DV/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi - type: MagazineVisuals - magState: magb + magState: mag-big - type: entity parent: BaseMagazineBoxRifle @@ -30,3 +31,4 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - state: rubber + sprite: _DV/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml index a537974c0b..495c152347 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -11,6 +11,7 @@ - type: Sprite layers: - state: rubber + sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -27,6 +28,7 @@ - type: Sprite layers: - state: rubber + sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -42,6 +44,7 @@ - type: Sprite layers: - state: rubber + sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index 8b3fbc5ad5..a40e970bf0 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -10,6 +10,7 @@ - type: Sprite layers: - state: rubber + sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index 41931d621d..e0730d61bc 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -10,20 +10,7 @@ - type: Sprite layers: - state: rubber - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - -- type: entity - id: MagazineMagnumSubMachineGunRubber - name: "Vector magazine (.45 magnum rubber)" - parent: BaseMagazineMagnumSubMachineGun - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumRubber - - type: Sprite - layers: - - state: rubber + sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index ea195143da..3dc50f373e 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -10,6 +10,7 @@ - type: Sprite layers: - state: rubber + sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -24,6 +25,7 @@ - type: Sprite layers: - state: rubber + sprite: _DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml new file mode 100644 index 0000000000..3587cd730e --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml @@ -0,0 +1,20 @@ +- type: entity + id: SpeedLoaderMagnumRubber + name: "speed loader (.45 magnum rubber)" + parent: BaseSpeedLoaderMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumRubber + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: rubber-6 + sprite: _DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: rubber + steps: 7 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml new file mode 100644 index 0000000000..5204728894 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml @@ -0,0 +1,19 @@ +- type: entity + parent: BaseSpeedLoaderPistol + id: SpeedLoaderPistolRubber + name: "speed loader (.35 auto rubber)" + components: + - type: BallisticAmmoProvider + proto: CartridgePistolRubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: rubber-6 + sprite: _DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: rubber + steps: 7 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index cc150a1015..a830e1ca0a 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -46,6 +46,25 @@ soundHit: collection: MeatLaserImpact +- type: entity + abstract: true + parent: BaseBullet + id: BaseBulletRubber + name: base bullet rubber + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: rubber + - type: Projectile + damage: + types: + Blunt: 3 + soundHit: + path: /Audio/Weapons/Guns/Hits/snap.ogg + - type: StaminaDamageOnCollide + damage: 22 # 5 hits to stun sounds reasonable + - type: entity parent: BulletPistolIncendiary id: BulletLighterIncendiary diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json new file mode 100644 index 0000000000..fe8d2fc0dc --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/space-wizards/space-station-14/tree/96cb951555347f47f886d1f7524a8e8a92292eff/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi and recoloured by deltanedas (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubber.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..5d366c195baa160ffd0e7296409294afd358758a GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP_WX| z#W5t}aB_kK>*55Fo~A$pF1Ldk5}pnQYhKvzlDO;;`pp*Vk@PO9wCU555Elh{I zJu7>jL}^Vl=X~>czP_A6!dpE7^sV_+;3W$vosz06<4!10IC>cQVtc5aJgKYTvN o+9lJlM*ay$&a{4r4GS0;PO7UUb1gMr4Ri#9r>mdKI;Vst0DmDt+yDRo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json new file mode 100644 index 0000000000..6ab936eaed --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/space-wizards/space-station-14/tree/96cb951555347f47f886d1f7524a8e8a92292eff/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi and recoloured by deltanedas (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..717e1470c1fec667dd6ed06df8ae7cdd3ca3a605 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP|(}c z#W5t}@Y@R;c@HS?xCDlIxVt~K+{2n2V8Erk@rLWY1FRyQ|FZX$Je|t)VDXnPD>I7h wkDm!S9%Qmv{^`4{Z0%V${})>W4Jx?IZS1Hj+}!EE63AolboFyt=akR{01dk{QUCw| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json new file mode 100644 index 0000000000..f199f453b0 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/space-wizards/space-station-14/tree/96cb951555347f47f886d1f7524a8e8a92292eff/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi and recoloured by deltanedas (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..717e1470c1fec667dd6ed06df8ae7cdd3ca3a605 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP|(}c z#W5t}@Y@R;c@HS?xCDlIxVt~K+{2n2V8Erk@rLWY1FRyQ|FZX$Je|t)VDXnPD>I7h wkDm!S9%Qmv{^`4{Z0%V${})>W4Jx?IZS1Hj+}!EE63AolboFyt=akR{01dk{QUCw| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json new file mode 100644 index 0000000000..294307f656 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/space-wizards/space-station-14/tree/96cb951555347f47f886d1f7524a8e8a92292eff/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi and recoloured by deltanedas (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..1c3ab735c244fe62265afb98b2d04cc1e9cd0503 GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP_W9= z#W5t}aB_kK>*55Fo~A$pF1Ldk609XmO^L4mH+CBHE_qr~$Z(=aOpbBRC!HTAo4hp) z_RN@a++)>Jp~}ez?Ed|H#K?T2XMeoigm(-A3E_qcr>`5-DzG;kkYB)jZ~d!em79$A r?_(5BGoJY6(03s9C(v-9O$`hTr~j)YznUo?$p8eNu6{1-oD!MEaktF()}e;*Ns=M*vGpkBDd>iwvu)O8_g+MOKcL34$UeC5~bVVqzsF z4uS?>VJTU+O literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json new file mode 100644 index 0000000000..81349659ef --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..f7aadbfcb8c7790ea5d0044a2846a934d9e488db GIT binary patch literal 2155 zcmV-x2$c7UP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-_bmg6W4{bv=k1SBCOmc#R$*}*J-F19O`q^o8s zRsGp^VnD`v-HRa1fBs(KFI>#YLsIixa*nuCNrfvq9?$D+DW>CjTztL4_(2|SFBl?0 zE9WrJYkq}X-#@T)$=jnmSiki6rHJB#Y1x){e_T#piiA%&UE@%$4{E*(=lXNM)V_uF zG){(O423@7z*9)#@#NEzod1fy;z^>INaE-#-t1@oHGkojx(^a~>pkT!zIi6^={Oa= zg_WQ3bjeAda(tF? z8~%#E9e2U)vBnP6210EiHVg_eGQKF$ph}D8(RS)^G4W(W%iLKGnTv7ZE*pZhZ(3|Y ziVPsa(t(^n%r{@?uv@l07;{)2gqciG28?5?w_L$5-u!|a8@c_& zEC535%BddtrEoU!`P#q=5Y!{hjsRjRD+5pRn2PZTC`@#DQnKz@~%_W#FD9HGjl6eT|BvZc60aQwQv!XF%2abD_%;e z6-H~S&{Z+NLeRKLOHEsD*1VNgJLuC>*Pgp|@1@tlLk3Df7)puGx_Q&dR7@>?lZcKqUZ+wfBbe-yo@sLjkE&?-3M$OH*4iBFBK ztTYGd5-gJhersP9OvP*m(NIBn+5po6UTcc|P+Rw*EU}+q86cq`G2(A9{PQ|C_4tVoqgS!t%@8-7zPM4eivfkfLv& zPFG_@zqN*Hc{HilWQElR8S-7vj^Jp;_#D5S_0U8KYwhg(v_+}i$XZsEg^`Qq?w$=b zv9Ez9DT?HFT}M1WLs`8&yus}=aJ{H%RY4+{<>2uQ8Tnb;AXnmH`Ztto% zC^4$1o(4V9;d{8n&?D&3PFCy&iJ!Ce!foWEt(jG1dOHAY#C}h{@FP0EwV+?H%|8rB zEsA<-I7swqac1ecHvA~>=O`5$>MEn#8U+=1`VL&ZX-(654JHG7&>VR|7l1ng$HoM% zV}(AxGAr6??8YZf+(3<_mKleFkZI>~V~9=}-lhY(L9?EeGb+u$fLnNld!Sr{KTW41 zB2|AHBVB%zO@DG?AkNL~^c8M{Yd1;AdzW+WN2xhBL-^7R zhrSaX|Du)f8;ZyuML$=B(`&(={x5_gKj2`9{|W#A0fcEoLr_UWLm+T+Z)Rz1WdHzp zoPCi!NW(xJ#a~lPi&Q$;LBt_Lb+RBT;wV)tf`!snXw|{w(l2PzkfgXc3a$kQKNhPF zF3!3-xC(;c2Z)oSlcI~1_`jskBF2N`e!RQ)xO)c(tr}C!z6n6pEF+Uli21^*7<@$l z5rhziPhzH?$}Z;MIlk`UFGy6jh^qA@8!nd5g1JYp~8e z`3u8EZ6(Wfnj=VJ2`Qu@LPi5s)Ls4+u0lJHAF$0003hNklI|MAH$m^+z~rVe0WU|=vXGRG?Z;K3t?g3`AC6S}JyY3hIr=T0&R2uWgyD=5e@ zJb3Vkwow4HSV2J!L(b01glq>8od`d?dk(i8W*NDb4&7`B^D!(WVDzD5XBgt5f*1-) z+y2wc0qEI`TG2pK2z+?=eBcTq1_lNOCUI+q7yQZ$&-Kh17;G6B-ZL=3>GKQ>49UF? z3`rFe{?BWRV5CV1pc^cC=_CqGmt64b+Fhzf0VAnRvV`Q^{{ljiSPLXrp|oh(ItF5k zWs*aH+PQ(Of{2>Af$WkHSD{2o@RRKTTy_702agy?t&&;D4S^5uo-Lf6LrA0t!lo~O-;SLyt1;g7^J-f8FmVLy?vk(^A9M;Q4-`A%A{;fJxU5sp0sEQOq(`MtU*U0E-tQ5 zNq~!`aYfsz6%va$RtN|s91$^aD&<%_QFvJc*R0!9djnag^ak$L*3dX%u!DgiW-Y(< Up=-83ftE0My85}Sb4q9e0IVZO?EnA( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json new file mode 100644 index 0000000000..097934b35b --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..9cde22c568cccc27d156e8685fb1abfc6f0330cd GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@3A^6XFV_m6es#($c0*o$Bc5D6gQ#rr{=JTQ8M(Mu_!=7D#VNkY6yv ze<(0#ntcT*=;i6+7*a7OIbnf%f{2T-fRUJpgP=f|QJ9NxK#_~#p%X`48A2UATU{6v zMa4yo4RsERaL5UyFPT1l`a+JBl9DY8IhHUwGBLkpV7RqO!2WdNWqF{f44$rjF6*2U FngGf|J=_2Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json new file mode 100644 index 0000000000..3bac6018d7 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/rubber.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..ad77f0f12665dfd9ba76d36b4167477380dc5014 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2@;6XFV_6A}_iN=nwPTQ_CO6l-g1Dci}CF3VNo9xLR%UwBD;H&6vv zNswPK!+#j4>l6tCin@EcIEGZrNlsXxoFF3NA{=1mCYlsdXlUjl7*Ja1C@4@=SSY5T z@SsagplKCT2Is1oH&~q58jWvgSy?T6SiV9*V8IQiR0f7OaYFgNlRbX|jb!k2^>bP0 Hl+XkK7NA9) literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json new file mode 100644 index 0000000000..3bac6018d7 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..8be70a07eadecbebc20fda9ec3c27620f8b574f7 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2@;6XFV_6A}_iN=nwPTQ_CO6l-g1Dci}CF3VNo9xLR%UwBD;H&6vv zNswPK!+#j4>l6tCiaL3^IEGZrNluUmX$TAu@O8K;5!w-W^ym!%SBI-dSzR4Y96cJz zu-}1W6~hIe5M=|_j0DbTSNG#4f3|TkF?KC1VP{Bf(;OXk; Jvd$@?2>>S~Mw9>m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json new file mode 100644 index 0000000000..445245b7bc --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "All sprites by https://github.com/august-sun.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..50e11d47003d393d83e4b9d51d05459e923c13f8 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV@#icaVRAgmk9c(NZIrJI$y%?;gPG(=y43y(23GxeO_zwYB zPlXr(#S%ST978JRBqvBXC}=dODX3_4XsIn(vZO^TVUbFc;(`txfoVX{r6Ujr1VD<5 zNh3|eTGL92+aQTU!%EXi@%HHzDow8hco-L?Phkm+Vf(~0t6|Xsg-s0#TIB)^4A)e6 VrPC*+wgW9=@O1TaS?83{1OTv|LUsTE literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json new file mode 100644 index 0000000000..cbc26d2a63 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "rubber-1" + }, + { + "name": "rubber-2" + }, + { + "name": "rubber-3" + }, + { + "name": "rubber-4" + }, + { + "name": "rubber-5" + }, + { + "name": "rubber-6" + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-1.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-1.png new file mode 100644 index 0000000000000000000000000000000000000000..d4ee09b545203976b59dcd6dfb23d125582076aa GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_r{^0>*-n;pS-zv+_V|_vg}nC@rreAIO0bs%`2{ol2ZN>c z%YFleWISCQLn`JZCrG?;2ndjDJ^w-~DXk&=sKx?01_mQ$#%_}{zDI!S7(8A5T-G@y GGywn{JTe>r literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-2.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-2.png new file mode 100644 index 0000000000000000000000000000000000000000..1f3b9965b1fbb9874a90ec18cc4d49ad4d1819e3 GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_r{^0>*-n;pS-zv+_V|_vg}nC@rreAIO0bs%`2{ol2ZN>c z%YFle6XFV_r{^0>*-n;pS-zv+_V|_vg}nC@rreAIO0bs%`2{ol2ZN>c z%YFleFVdQ I&MBb@0PLqV*#H0l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-4.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-4.png new file mode 100644 index 0000000000000000000000000000000000000000..bef55e248b5161d79c5c10364aba25ba4ebbec6f GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_r{^0>*-n;pS-zv+_V|_vg}nC@rreAIO0bs%`2{ol2ZN>c z%YFlelssJ=Ln`JZCrG?;2ndjDJ^w-~DXk%#wX#ZM`*f*od}a&`n~m5srHZcT164D4 My85}Sb4q9e095-k$^ZZW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-5.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-5.png new file mode 100644 index 0000000000000000000000000000000000000000..052192ed04b678bf6d5f2d4c6a5f24e2aa2f7543 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_r{^0>*-n;pS-zv+_V|_vg}nC@rreAIO0bs%`2{ol2ZN>c z%YFlev^`xMLn`JZCrG?;2ndjDJ^w-~DXk%#wX({<$03l>=pf5co)Xb38%jSgGSn_) V`#rbhS07LtgQu&X%Q~loCIE7YIi~;s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-6.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-6.png new file mode 100644 index 0000000000000000000000000000000000000000..e33105c761022fc06308ad77601946439ce895a8 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_r{^0>*-n;pS-zv+_V|_vg}nC@rreAIO0bs%`2{ol2ZN>c z%YFlebUj@hLn`JZCrG?;2ndjDJ^w-~DXk%#bwa-q)1}0wMeMPxVbPvu%_YKGX6 XZ?K=e^M1J+P$Pq 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png new file mode 100644 index 0000000000000000000000000000000000000000..9bb14be66175df59b7fcf69db0285a133107bfdb GIT binary patch literal 2621 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png b/Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png new file mode 100644 index 0000000000000000000000000000000000000000..a52d8764c1802cfa11458770d3351500854d60be GIT binary patch literal 2574 zcmV+p3i0)cP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ulI$i7{Ld+J1dtGd2cA_xI=ipyRevZ$l|QP0c>DpU-=dw;`shKi$`%-49s#!kzm^ z<2L)|*2{HPfH4L3m;xF38Z^t7TxkD2Mq6={74;RAkq&${=zyt7;a;3~IMZ?2p(4D5iD z&tnCL;wL!Qb2J<^S{z_)!qpyP$3;s7#COVRCQCc5(~dN-#7v76Eztnt-d9IoLB~fa$v4-&|<$#bV={p;=?mX2^gB=6)#EWZ2%Bq zZoy&_gMnBQODZWUk){M3EBG<2oH$bl14)9=#40H>7m!oQ=f*Rd&R7zV5}v!KwR#xsSYk!rHWxZut=8Q3y#-DA&uNwH@(0||1PG-{@q7E9L zc@&#apq3f^rWB(-<0?G*E>$)zm#U$qKDI&lvxV7(XQ_F&dQ98M=W%@FkF?>tALs*N zS2eZji%{Af!8f=gvGEe`SSz2y;Rs*Bnwf!me!W)o<)a^Bx8vu6Ew(81{fV6;MeBrtKuXufTaU$ zUh5a23f~xjDXsT{{4xrPjAejot+}?cX`EF(y&w%0(2wOD2{bNn$V3Q9v5KaN8XQ|} zgR>|^R-3#8`)Gv=Fl>Ei8eLH`*xC*@<`})Ku9#=#-qYq(2P6aRFg@Vjy4v=l0sAvD z=+RbO5&P>(n9Q)RNZ>IFV@B8)V2o6VjIIqTY>Fi7DR;)UQ6}IS@X_o#!^ZQ}hS!eI zT1?<>V(-VcQY&?&;8hD2Zyj15gKY(1IVO1*07$Ln-2nyiGnVM?RMOruC*Xvb5F0Af zmp1BDlo*D7a#aSDgMvA1o!~n$);z{IebDG^MS4Rp!gQY#TZD8Kps1U$_t#zLi%Ne+ zq~TqqCku?7>raF%)qs;DI!h4LB|uw@&1#uA)`GeXllxZ7-gr5TGaw}pKLSGFM{6ad z1hteb0ObH5Fp#jni(V$m6Wvv@e{fH-K zY}lxg62PVu=hn8~?1qYky9V6}5r_aQvA9xPa%Itu^8P#WZTR|tozx6zXGP^H2Qp7e zQbun665who91ZaagoB|Z5yd-R@gPT$KwXhyGR#1nBn}-a2F8m}TNCduqDX_QAr($N zKoLmjIT%7J_hrz7iKA<=xI->bi5pcD@}lBR1%Zk(WO|8n3uK|*8gCj1KP(z-AjLP3 z(g*xC&nP9y4Aq@2DAb`Ilvae?j`FtmdVD7`ynpd^<))CbFmxa%K^85dP(-GM1Y2-G z3|7S0(;Z))pi-N->g7_?VNbtsh(%g=s@WP)S2WAaHVTW@&6?004NLeUUv#!$2IxUt3E>D-Ko= zamdg*hy_s*N2y{FER?oFs}3fYenFFlB*n#1a4k6au~>C*an{wrRS*O}K%5+%6kVjm z|0RVMF&-TEBH7MVq}m zGo)uy^TZ)yq1eGv2eXo{5Kj|_WkscYZ`NU%^A=~NQe&-q@)rj4>PnjHG)EA}5)w#4 zfP@;#sK7*&R+SV3DcX;@_=jzOl3WtG%3$PJKotr^+YkN+zq>UGQuoK31oUqM7uRh~+5;|kfT1T%)J0qJ(exGy z!220}Qw|uo1$x$;-dg)OeE>4l)$$E+a0rYRDSO@J-QAtN{d=a>-w&(sa=r!8`e^_F z00v@9M??Vs0RI60puMM)00009a7bBm001r{001r{0eGc9b^rhX2XskIMF->s6$>&7 z@79TD0005mNkl&r9227{@yu$^A~8@VLcSJ5ZTE;ARb2FHI!{h+SyBZv8)`IU$Sfe+`tewj z{7$DU6Moa;3y|)n zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cvg9TV{bv>$g}5%%pn-E-%4 zld4pz#_l#Y20hM^1P=DspF8}4BbAy$VbR)ZjW|jxEp^;zypF4-SkCnv>3)Uhr~dGG zk?tPjiwKPEn z0eGCWlLYXvvVxTf<}$j|!xlPvo9lxzh2}*VnFzwb@$(s8J3f0p3EJDkoG9u8E7+Ah zzF>wk=U0pZA+&Ey`QS_8YU1nR#AYza2WEwXJ&sGnV0w?Oe0a{01BRA(m48%&AsZx}bga|k)`021b<&p*%AP$@stV|{63UV~LZp;xnV-u&V8|B4QBiAgT z28jZ)O5swGZ;BA=fio9ot}LwFxYt}u@2sI)m-_{Gn*;hzflE$II*XjAX2H)I`R ze3e=ILIg@((O+`yX{=~9&#|lW#-oXJv}w%U5%{ZxH8`)TWj8&d`z&WVe(_h@@Y55< zMB1rPQ#V4=9!S2mds|4~nSD^3xF9j?PCkEPwP%GaOKiw$Gtox6SC!eZQ-EYtMxJ|4l#@}?#`v8fV__{aS%Ety z8jv=;mFaWvtEuXB=exw8X~TC1z%n>HSO|5I+GaN10#`@F&I8Eo8yKv#GV(f8+7QVr zAqaAtfYpGnwmutTLhCNpc4{v`nm&*WA3|v*gPpuRatxz3rZ`C0V!7J@SDOq1M$NG8 z&zoD=33f?tM++JSSe&z|K84-7!p@^^bjnt*h#uH#U3cL#NwHCswVT#%zHq?~Uuoll zFN|zxP30ilI+9|^6eL9xLAD@oY%JSYo%5W)I&M|3;wbyD4cT-e+wkFGKSUYeG|
    >Z0Y*In#HI$KNgt8a5VN-(*(OuD`(6nDGX;&N0jTcSm z!~Wh9suwhn`!}ltT0AXj`K0Og^O`438$K+X()9$4@I@eku@%WQfRe`HTp^dSiopv= z!RFG7Azhv<)XA}Z57)dj9$ZHYpL68Hntc^!STMZe!U|OAl!rQXSTD7sc+Lo5`(a*D zDp2@P1lFl~h-@|kK6FG15fK86zfum!ZhdY7I5W2 zza;6~?QcQOzkh$s{jB2g=s@WP)S2WAaHVTW@&6?004NLeUUv# z!$2IxUt3E>D-Ko=amdg*hy_s*N2y{FER?oFs}3fYenFFlB*n#1a4k6au~>C*an{wr zRS*O}K%5+%6kVjm|0RVMF&-TEBH7MVq}mGo)uy^TZ)yq1eGv2eXo{5Kj|_WkscYZ`NU%^A=~NQe&-q@)rj4 z>PnjHG)EA}5)w#4fP@;#sK7*&R+SV3DcX;@_=jzOl3WtG%3$PJKotr^+YkN+zq>UG zQuoK31oUqM7uRh~+5;|k zfT1T%)J0qJ(exGy!220}Qw|uo1$x$;-dg)OeE>4l)$$E+a0rYRDSO@J-QAtN{d=a> z-w&(sa=r!8`e^_F00v@9M??Vs0RI60puMM)00009a7bBm001r{001r{0eGc9b^rhX z2XskIMF->s6$>#i0`~(J0005ZNklu}d3K9Du(UO80s@qwMxYKsU z1s3$>5d7!&W6r+(;%*6VWF-=^@KiF*S}h~?-+b`lcS`^`msi|QPDz(Y$ie}#*&L;t zf(XJrnOE+j4-b~;*%k~x8S