From f046d8a1f6399b2876d8a364ae478f7d13f29e4a Mon Sep 17 00:00:00 2001 From: Seam_Less Date: Wed, 11 Jun 2025 13:03:14 -0700 Subject: [PATCH] Magazine rsi Cleanup + Magazine Type Recolor (#37709) --- .../Ammunition/Magazines/caseless_rifle.yml | 39 +++++---- .../Guns/Ammunition/Magazines/light_rifle.yml | 36 ++++++-- .../Guns/Ammunition/Magazines/magnum.yml | 44 +++++----- .../Guns/Ammunition/Magazines/pistol.yml | 80 ++++++++++++------ .../Guns/Ammunition/Magazines/rifle.yml | 38 ++++++--- .../caseless_pistol_mag.rsi/meta.json | 8 +- .../caseless_pistol_mag.rsi/practice.png | Bin 223 -> 0 bytes .../caseless_pistol_mag.rsi/red.png | Bin 223 -> 0 bytes .../caseless_pistol_mag.rsi/stripe.png | Bin 0 -> 446 bytes .../caseless_pistol_mag.rsi/uranium.png | Bin 279 -> 0 bytes .../caseless_rifle_mag.rsi/meta.json | 7 +- .../caseless_rifle_mag.rsi/practice.png | Bin 375 -> 0 bytes .../caseless_rifle_mag.rsi/red.png | Bin 367 -> 0 bytes .../caseless_rifle_mag.rsi/stripe.png | Bin 0 -> 714 bytes .../caseless_rifle_mag_short.rsi/meta.json | 5 +- .../caseless_rifle_mag_short.rsi/practice.png | Bin 361 -> 0 bytes .../caseless_rifle_mag_short.rsi/red.png | Bin 362 -> 0 bytes .../caseless_rifle_mag_short.rsi/stripe.png | Bin 0 -> 446 bytes .../LightRifle/light_rifle_mag.rsi/meta.json | 10 +-- .../light_rifle_mag.rsi/practice.png | Bin 236 -> 0 bytes .../LightRifle/light_rifle_mag.rsi/red.png | Bin 236 -> 0 bytes .../LightRifle/light_rifle_mag.rsi/stripe.png | Bin 0 -> 705 bytes .../light_rifle_mag.rsi/uranium.png | Bin 312 -> 0 bytes .../Magnum/magnum_smg_mag.rsi/meta.json | 13 +-- .../Magnum/magnum_smg_mag.rsi/piercing.png | Bin 255 -> 0 bytes .../Magnum/magnum_smg_mag.rsi/practice.png | Bin 225 -> 0 bytes .../Magnum/magnum_smg_mag.rsi/red.png | Bin 225 -> 0 bytes .../Magnum/magnum_smg_mag.rsi/stripe.png | Bin 0 -> 705 bytes .../Magnum/magnum_smg_mag.rsi/uranium.png | Bin 290 -> 0 bytes .../pistol_high_capacity_mag.rsi/meta.json | 11 +-- .../pistol_high_capacity_mag.rsi/piercing.png | Bin 254 -> 0 bytes .../pistol_high_capacity_mag.rsi/practice.png | Bin 226 -> 0 bytes .../pistol_high_capacity_mag.rsi/red.png | Bin 226 -> 0 bytes .../pistol_high_capacity_mag.rsi/stripe.png | Bin 0 -> 705 bytes .../pistol_high_capacity_mag.rsi/uranium.png | Bin 285 -> 0 bytes .../Magazine/Pistol/pistol_mag.rsi/meta.json | 13 +-- .../Pistol/pistol_mag.rsi/piercing.png | Bin 234 -> 0 bytes .../Pistol/pistol_mag.rsi/practice.png | Bin 221 -> 0 bytes .../Magazine/Pistol/pistol_mag.rsi/red.png | Bin 221 -> 0 bytes .../Magazine/Pistol/pistol_mag.rsi/stripe.png | Bin 0 -> 705 bytes .../Pistol/pistol_mag.rsi/uranium.png | Bin 266 -> 0 bytes .../Magazine/Pistol/smg_mag.rsi/meta.json | 10 +-- .../Magazine/Pistol/smg_mag.rsi/practice.png | Bin 230 -> 0 bytes .../Magazine/Pistol/smg_mag.rsi/red.png | Bin 230 -> 0 bytes .../Magazine/Pistol/smg_mag.rsi/stripe.png | Bin 0 -> 705 bytes .../Magazine/Pistol/smg_mag.rsi/uranium.png | Bin 379 -> 0 bytes .../Magazine/Rifle/rifle_mag.rsi/meta.json | 13 +-- .../Magazine/Rifle/rifle_mag.rsi/practice.png | Bin 270 -> 0 bytes .../Magazine/Rifle/rifle_mag.rsi/red.png | Bin 262 -> 0 bytes .../Magazine/Rifle/rifle_mag.rsi/rubber.png | Bin 298 -> 0 bytes .../Magazine/Rifle/rifle_mag.rsi/stripe.png | Bin 0 -> 705 bytes .../Magazine/Rifle/rifle_mag.rsi/uranium.png | Bin 262 -> 0 bytes 52 files changed, 166 insertions(+), 161 deletions(-) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/uranium.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/practice.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/red.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/practice.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/red.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/stripe.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/piercing.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/practice.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/stripe.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/uranium.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/piercing.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/practice.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/stripe.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/uranium.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/piercing.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/stripe.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/stripe.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/stripe.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml index e3584701f0..148a64ec92 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -107,7 +107,7 @@ capacity: 10 - type: Sprite slayers: - - state: red + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -122,6 +122,7 @@ - state: inhand-left-mag right: - state: inhand-right-mag + - state: inhand-right-stripe - type: entity id: MagazinePistolCaselessRiflePractice @@ -134,10 +135,12 @@ capacity: 10 - type: Sprite layers: - - state: practice + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#dbdbdb" - type: MagazineVisuals magState: mag steps: 6 @@ -148,11 +151,11 @@ left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ea5800" + color: "#dbdbdb" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ea5800" + color: "#dbdbdb" - type: entity id: MagazineCaselessRifle @@ -163,7 +166,7 @@ proto: CartridgeCaselessRifle - type: Sprite layers: - - state: red + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -171,12 +174,8 @@ inhandVisuals: left: - state: inhand-left-mag - - state: inhand-left-stripe - color: "#9b0000" right: - state: inhand-right-mag - - state: inhand-right-stripe - color: "#9b0000" - type: entity id: MagazineCaselessRiflePractice @@ -187,20 +186,22 @@ proto: CartridgeCaselessRiflePractice - type: Sprite layers: - - state: practice + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#dbdbdb" - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ea5800" + color: "#dbdbdb" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ea5800" + color: "#dbdbdb" - type: entity id: MagazineCaselessRifleShort @@ -212,7 +213,7 @@ capacity: 20 - type: Sprite layers: - - state: red + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -220,12 +221,8 @@ inhandVisuals: left: - state: inhand-left-mag - - state: inhand-left-stripe - color: "#9b0000" right: - state: inhand-right-mag - - state: inhand-right-stripe - color: "#9b0000" - type: entity id: MagazineCaselessRifleShortPractice @@ -237,17 +234,19 @@ capacity: 20 - type: Sprite layers: - - state: practice + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#dbdbdb" - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ea5800" + color: "#dbdbdb" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ea5800" + color: "#dbdbdb" 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 880cc4d773..f56092ba1f 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 @@ -65,7 +65,7 @@ proto: CartridgeLightRifle - type: Sprite layers: - - state: red + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -73,12 +73,8 @@ inhandVisuals: left: - state: inhand-left-mag - - state: inhand-left-stripe - color: "#9b0000" right: - state: inhand-right-mag - - state: inhand-right-stripe - color: "#9b0000" - type: entity id: MagazineLightRifleEmpty @@ -112,20 +108,22 @@ proto: CartridgeLightRiflePractice - type: Sprite layers: - - state: practice + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#dbdbdb" - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ea5800" + color: "#dbdbdb" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ea5800" + color: "#dbdbdb" - type: entity id: MagazineLightRifleUranium @@ -137,10 +135,12 @@ proto: CartridgeLightRifleUranium - type: Sprite layers: - - state: uranium + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#00cd42" - type: Item inhandVisuals: left: @@ -160,6 +160,24 @@ components: - type: BallisticAmmoProvider proto: CartridgeLightRifleIncendiary + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#ff6e52" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#ff6e52" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#ff6e52" - type: entity id: MagazineLightRifleMaxim 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 04f6ef741e..705601870f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -79,7 +79,7 @@ proto: CartridgeMagnum - type: Sprite layers: - - state: red + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -87,12 +87,8 @@ inhandVisuals: left: - state: inhand-left-mag - - state: inhand-left-stripe - color: "#9b0000" right: - state: inhand-right-mag - - state: inhand-right-stripe - color: "#9b0000" - type: entity id: MagazineMagnumPractice @@ -104,20 +100,22 @@ proto: CartridgeMagnumPractice - type: Sprite layers: - - state: practice + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#dbdbdb" - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ea5800" + color: "#dbdbdb" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ea5800" + color: "#dbdbdb" - type: entity id: MagazineMagnumUranium @@ -129,10 +127,12 @@ proto: CartridgeMagnumUranium - type: Sprite layers: - - state: uranium + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#00cd42" - type: Item inhandVisuals: left: @@ -154,10 +154,12 @@ proto: CartridgeMagnumAP - type: Sprite layers: - - state: piercing + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#540000" - type: Item inhandVisuals: left: @@ -199,7 +201,7 @@ proto: CartridgeMagnum - type: Sprite layers: - - state: red + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -207,12 +209,8 @@ inhandVisuals: left: - state: inhand-left-mag - - state: inhand-left-stripe - color: "#9b0000" right: - state: inhand-right-mag - - state: inhand-right-stripe - color: "#9b0000" - type: entity id: MagazineMagnumSubMachineGunPractice @@ -223,20 +221,22 @@ proto: CartridgeMagnumPractice - type: Sprite layers: - - state: practice + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#dbdbdb" - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ea5800" + color: "#dbdbdb" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ea5800" + color: "#dbdbdb" - type: entity id: MagazineMagnumSubMachineGunUranium @@ -247,10 +247,12 @@ proto: CartridgeMagnumUranium - type: Sprite layers: - - state: uranium + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#00cd42" - type: Item inhandVisuals: left: @@ -271,10 +273,12 @@ proto: CartridgeMagnumAP - type: Sprite layers: - - state: piercing + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#540000" - type: Item inhandVisuals: left: 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 0af1c92d12..6af54bb114 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -148,7 +148,7 @@ proto: CartridgePistol - type: Sprite layers: - - state: red + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -156,12 +156,8 @@ inhandVisuals: left: - state: inhand-left-mag - - state: inhand-left-stripe - color: "#9b0000" right: - state: inhand-right-mag - - state: inhand-right-stripe - color: "#9b0000" - type: entity id: MagazinePistolEmpty @@ -193,6 +189,24 @@ components: - type: BallisticAmmoProvider proto: CartridgePistolIncendiary + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#ff6e52" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#ff6e52" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#ff6e52" - type: entity id: MagazinePistolPractice @@ -204,20 +218,22 @@ proto: CartridgePistolPractice - type: Sprite layers: - - state: practice + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#dbdbdb" - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ea5800" + color: "#dbdbdb" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ea5800" + color: "#dbdbdb" - type: entity id: MagazinePistolUranium @@ -229,10 +245,12 @@ proto: CartridgePistolUranium - type: Sprite layers: - - state: uranium + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#00cd42" - type: Item inhandVisuals: left: @@ -274,7 +292,7 @@ proto: CartridgePistol - type: Sprite layers: - - state: red + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -282,12 +300,8 @@ inhandVisuals: left: - state: inhand-left-mag - - state: inhand-left-stripe - color: "#9b0000" right: - state: inhand-right-mag - - state: inhand-right-stripe - color: "#9b0000" - type: entity id: MagazinePistolHighCapacityPractice @@ -298,20 +312,22 @@ proto: CartridgePistol - type: Sprite layers: - - state: practice + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#dbdbdb" - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ea5800" + color: "#dbdbdb" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ea5800" + color: "#dbdbdb" - type: entity id: MagazinePistolSubMachineGun @@ -328,7 +344,7 @@ path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg - type: Sprite layers: - - state: red + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -336,12 +352,8 @@ inhandVisuals: left: - state: inhand-left-mag - - state: inhand-left-stripe - color: "#9b0000" right: - state: inhand-right-mag - - state: inhand-right-stripe - color: "#9b0000" - type: entity id: MagazinePistolSubMachineGunEmpty @@ -375,20 +387,22 @@ proto: CartridgePistolPractice - type: Sprite layers: - - state: practice + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#dbdbdb" - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ea5800" + color: "#dbdbdb" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ea5800" + color: "#dbdbdb" - type: entity id: MagazinePistolSubMachineGunUranium @@ -400,10 +414,12 @@ proto: CartridgePistolUranium - type: Sprite layers: - - state: uranium + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#00cd42" - type: Item inhandVisuals: left: @@ -423,10 +439,22 @@ components: - type: BallisticAmmoProvider proto: CartridgePistolIncendiary + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#ff6e52" - type: Item inhandVisuals: left: - state: inhand-left-mag + - state: inhand-left-stripe + color: "#ff6e52" right: - state: inhand-right-mag + - state: inhand-right-stripe + color: "#ff6e52" 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 88f3df5388..5a83b23475 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -1,4 +1,3 @@ -# Empty mags - type: entity id: BaseMagazineRifle name: "magazine (.20 rifle)" @@ -32,7 +31,6 @@ zeroVisible: false - type: Appearance -# Magazines - type: entity id: MagazineRifle name: "magazine (.20 rifle)" @@ -42,7 +40,7 @@ proto: CartridgeRifle - type: Sprite layers: - - state: red + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] @@ -50,12 +48,8 @@ inhandVisuals: left: - state: inhand-left-mag - - state: inhand-left-stripe - color: "#9b0000" right: - state: inhand-right-mag - - state: inhand-right-stripe - color: "#9b0000" - type: entity id: MagazineRifleEmpty @@ -85,6 +79,24 @@ components: - type: BallisticAmmoProvider proto: CartridgeRifleIncendiary + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#ff6e52" + - type: Item + inhandVisuals: + left: + - state: inhand-left-mag + - state: inhand-left-stripe + color: "#ff6e52" + right: + - state: inhand-right-mag + - state: inhand-right-stripe + color: "#ff6e52" - type: entity id: MagazineRiflePractice @@ -95,20 +107,22 @@ proto: CartridgeRiflePractice - type: Sprite layers: - - state: practice + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#dbdbdb" - type: Item inhandVisuals: left: - state: inhand-left-mag - state: inhand-left-stripe - color: "#ea5800" + color: "#dbdbdb" right: - state: inhand-right-mag - state: inhand-right-stripe - color: "#ea5800" + color: "#dbdbdb" - type: entity id: MagazineRifleUranium @@ -119,10 +133,12 @@ proto: CartridgeRifleUranium - type: Sprite layers: - - state: uranium + - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + - state: stripe + color: "#00cd42" - type: Item inhandVisuals: left: 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 cf0bdc58af..e78af4ebce 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 @@ -11,17 +11,11 @@ "name": "base" }, { - "name": "practice" - }, - { - "name": "red" + "name": "stripe" }, { "name": "red-icon" }, - { - "name": "uranium" - }, { "name": "mag-1" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png deleted file mode 100644 index e0a3cb4d131811f0fc9d5ff6c0edf8a000bef114..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_?d|PDLqj<@I8;?t_Zu*r_G5k(!BAn}JOe1lQ4-`A%`P zgJ6M+c)_ud#15qcv*P6B8WtTodh`f`>j4Q42{v;EhKq7sOcjdL41wk{c)I$ztaD0e F0suMjJM;hm diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png deleted file mode 100644 index 3bfa3b48b8cb3f4a32fe4794c108be3513289f55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_?d|PDLqj<@I8;?tO&J*C7#LNV$gsM)1hDd4WaU_yAShB&;wY9NCRS47 zAXwlcUT`cVu|w&=tT;KjhDC>t9zDX~dO(6hg3X+P;i4QDQ-$I*L!h|~p00i_>zopr E0Lq&=6951J diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png new file mode 100644 index 0000000000000000000000000000000000000000..b3c57a440a4aa879d31a5435e0fd8e449be2ce7a GIT binary patch literal 446 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^S0KHA|Nb*)&OCee?BU99 zY(PF^NswPKgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~Ij105pNB{-dOFVsD*bP0l+XkK DDM~1~ literal 0 HcmV?d00001 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 deleted file mode 100644 index ad8e3d9fb40001c2b461479bece8941cf1fb1bee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279 zcmV+y0qFjTP)m-Yxam-iNwWjSiC7s1q8!+Vcm7>euy{=LHy dAqax7DIb6fNQi^3I1B&)002ovPDHLkV1mU!bOZnZ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json index 3cf2583ec8..6c00eec2ad 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json @@ -5,16 +5,13 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (github)", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)", "states": [ { "name": "base" }, { - "name": "practice" - }, - { - "name": "red" + "name": "stripe" }, { "name": "mag-1" diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/practice.png deleted file mode 100644 index 18aab251ab83df3196487b94f172be823c9e882a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmV--0f_#IP)gir6%^z!^x{P$~{L3DXQQV5_MeE8X06q+1B zaxQrG?ibmXVFQe$Hpvo_bN>qnNn$OK7#JXh(xPSS7>F&FNe%&O=LWJ0B5LLavP(i- zg%T;jPqqVa)%_11JR-?*1_lz#0c7yu-E)QuXi-5f8003iA ValMlbcvAoX002ovPDHLkV1j`UlN|s6 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/red.png deleted file mode 100644 index 829fcd6d59f0b36f60bedf6c1faf47db52a71133..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFq(O~IEGZrNwz6?z;M`sX&K|z z+AEBU`6PJw5){J{or>Po*L>oB=9ji)C9?z&@bsM7*kxbwp=05KEpPv~ywjQ_>o|#7 zZ;tgz1qGE(#dQl5j(>P?P&w$W+F3?}Zc&jZ22b9s@i|e(aIy2l;oZ**PA5*An5`Mf zw?I_kB%^`+VJ9Xxd8@KEMLjK$iM;uK3r{eMd|(wd@s|RLr>b;DuGZ?y?527@`;${Q2^}|JPCj1tf!~tDnm{ Hr-UW|0=SR7 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png new file mode 100644 index 0000000000000000000000000000000000000000..779465c927295117e8d84b7aa9f4b1dfea144498 GIT binary patch literal 714 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$DvR|REV15>wv(3HOZ8OxR} zyLt2GvuDpfefpG^b@dKV4P!}=UoeBivm0q3PLj8~3quF1tOt<8S>O>_%)r1c48n{I zv*t(u1=&kHeO=jKvWhXt3I6+2@r8kbN!!!KF+@X@QGx0HU!aOnfEfazX=&*W$il2? hVWJF6*2Ung9hgGVK5W literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json index 3cf2583ec8..12c196b4b4 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json @@ -11,10 +11,7 @@ "name": "base" }, { - "name": "practice" - }, - { - "name": "red" + "name": "stripe" }, { "name": "mag-1" diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/practice.png deleted file mode 100644 index dc1c69b16d8b0e858601388d304e25d88ec5aac0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmV-v0ha!WP)Lf6LrA0t!;RLJNsNb|y@gxc`^^9@ck=iJ z?3(ZZveLlX584c;1SBxTVbSvqM_GXlkd+IN(*icjCr)o5x>#nUq*^b)B&RopcDWA7eH(Gme2{S00000NkvXX Hu0mjfWonTB diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/red.png deleted file mode 100644 index 05db9333513b46dffc3538d9c20fbb7d8b731e1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmV-w0hRuVP)Lf6LrA0t!9nW^=BFQ6$Kd>o?=fQ_y9>E(B6{Hh-`5O$5RyfN5(!R z=LV9a!20bOhU^z-QN*T77&EkeS7I=?G+>ZbkRZtsBs;)o`fSF{(4d|wVaza9!Wb@h z^7sW(jUz7&92GWUcqAc#Ar6b4Z#c>dY=Ep>fSeYvSw3-k1JT7YBPGr9{LF^`$R!}D zmNPI=SPo2_-oW_n?Q;egCe?BV1`0!f8er%b#iI@wbpWLR0E{zfXbb}|X#fBK07*qo IM6N<$g0udL+yDRo diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png new file mode 100644 index 0000000000000000000000000000000000000000..e18b4b6892ad58c8b30ff3eb88e57315321e77e7 GIT binary patch literal 446 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*Hqo|{rmUdym|B4vu9Hz z=SBd<8B2ovf*Bm1-ADs*lDyqr7&=&GJ%Aj}0*}aI1_o|n5N2eUHAey{$X?><>&pI; zRg96@()9T?RiGYiPZ!4!2}wo;#{2((Dh40mggI#~l)<$I%E)SfGC*FV2T*Ba%Gc2f QS_ZPq)78&qol`;+0L!N+uK)l5 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 3f70e9ee6c..6095aa7d98 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 @@ -5,19 +5,13 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (github)", + "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)", "states": [ { "name": "base" }, { - "name": "practice" - }, - { - "name": "red" - }, - { - "name": "uranium" + "name": "stripe" }, { "name": "mag-1" diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png deleted file mode 100644 index 0cb88b1399c348cee0e462dadb303287757aac8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_<>lo~O-;SLyt1;gyp$OV+?aPpFmUdVy8x8qC<*clX7~>Q zS5Ji)0mULcT^vIy<|HRbI4CS>P*ZrLp`p>B^x(~#9wmh*Pg=ADrcIkB)}SL07Z=y3 zB*4YexT0;<3W-G=D+GiRj))jIm2xbeD7>tJYu4?ly@9M#dIR@rYiOJ>*ulUMvzFib U&^6niKuZ`rUHx3vIVCg!08`0GLjV8( diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png deleted file mode 100644 index 3990c78a2eddde0007d8ea4366dc424ac9d89bb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_<>lo~O-;SLyt1;gycigEGBCUq7A{m&PXfwulmz(&GyI2u ztEWPYfMSuJE{-7;bCMGz92Ax`s42YB(9md5dhq5=kCMWZCoNh6)22-mYtRvhi;L@1 z65wKKT+y~_g~TF`6#_yDM??&qN;wu!6kgWAHS6}&-aytVy@7kRH8f5b>|kJsS<7#I T=$h?Mpd}2Ru6{1-oD!M<&W%S$ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/stripe.png new file mode 100644 index 0000000000000000000000000000000000000000..4c1ec65866d2217e7757834efabc487f4bdcbcf7 GIT binary patch literal 705 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0J61me$bFux#0~{rmU- zR}vBh3Ne-h`2{mLJiCzw;v{*yyD)UH%6b4foCO|{#S9GG!XV7ZFl&wkP>{XE)7O># zC962I413d)GHC_|CT&j_#}ExsMg^w(e}O87HV|=fF&04fg0Qi%5sHA2l9CdN0J7>) aHvSMefJVJI7t$Iry?^WilV00Xo=|dz1Wlo z#vJH7l-3H`JYZ%BApihMsqq~6ycj_5$4EQ7rIf~=VvEIM0e}}E`d@}8rEu;50000< KMNUMnLSTYztbs=W 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 9916225771..dbf98bdf55 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 @@ -5,22 +5,13 @@ "y": 32 }, "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, inhands by TiniestShark (github)", + "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)", "states": [ { "name": "base" }, { - "name": "practice" - }, - { - "name": "red" - }, - { - "name": "uranium" - }, - { - "name": "piercing" + "name": "stripe" }, { "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 deleted file mode 100644 index 2ac700b8b646bd29538ebe65ff1f8c0ac7fd619d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/practice.png deleted file mode 100644 index f3f3bc05ec8d2f06691ae437f9f679b3aa90f2f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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$Bc5D6gRAro>k7F0?&M`tNT^b&%eYAirRS z|4?AgH2Vrr(96@sF{ENna>4@j1Q8cu0V6RH2SI@_qc9iYfFc*eLnn^9GK4yKwz@DT zii(RE8|oYs;gAzZUow6A^o1NLB_&%Hax7tVWMY2Hz;J7mfc@#j%kn@|89ZJ6T-G@y GGywoiZa(Ay diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red.png deleted file mode 100644 index 64bca76850f7a1e3ef691d53dfd0495db28f2cb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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$Bc5D6gRA#>Q4JB(z;x+D)Lg9i+D;$S;`T zKNOfV&AtK@^zw9Z45^rtoUlMWLBvH^z(`EQK~NyfD9lATpvcAW(21k2451F5tuBm- zqT(XPhB^mDIOGJBPcrmf<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(} 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 d760950257..4a31ca1326 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 @@ -11,16 +11,7 @@ "name": "base" }, { - "name": "practice" - }, - { - "name": "red" - }, - { - "name": "uranium" - }, - { - "name": "piercing" + "name": "stripe" }, { "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 deleted file mode 100644 index 953ad220660859fb60f807a51afb0bfe56611be1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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*no1Bl21Iz_^OqVAq9jv*Cuk`opvCy0o+2nU$Ci6(^<8k)HX29y>$3JMez7K$k- zJm^vrXj;XT!MSSY4HhT1M&lb=R#wX%mak9{Sa8EBm4V?+oKU{+WY3>KBN;qh{an^L HB{Ts5p9e&d diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red.png deleted file mode 100644 index 6058c25acf0f06f8fac30e7507508815b6ba0aa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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-g1QwD}O28P)T3_H{r?z(+F4OGEZ z666=m@E->1Iz_^OqVAq9jv*Cuk`opvCy0o+2nU$Ci6(^<8k)HX29y>$3JMez7K$k- zJm^vrXj;XT!MSSY4HhT1M&lb=R#wX%mak9{Sa8EBm4V?+oKU{+WY3>KBN;qh{an^L HB{Ts51PViV diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/stripe.png new file mode 100644 index 0000000000000000000000000000000000000000..cb0f5c8df036d767dc68782bf0aa57d34e7f8a8a GIT binary patch literal 705 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4*UXfX{rmTyIdkUb&704j zJ&R8-EC)(4mIV0)GdMiEkp|)$t)?hWm>ppI3rh N;pyt@0;ET#Ye literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/uranium.png deleted file mode 100644 index 774b22096f3af55d523ea0e8b5440bac09254ce4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmV+&0pk9NP)`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{ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png deleted file mode 100644 index 4e6907fa1928e9dfe3f95342945154ec340a7739..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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-hi{RRxD{g_`xF#K=jcHuHw3sk{X z666=m@E->1Iz_^OqE4PJjv*Cuk`p9C8Uh0Zd>w8|gmwfTJ$ggH)#2(1Iz_^OqE4PJjv*Cuk`p9C8Uh0Zd>w8|gmwfTJ$ggH)#2(<1}1G!7sn6{QAP!(`+tEdM!~>@0HcbFi{ZdnO}wprzZmXc%K29U O(&6dq=d#Wzp$P!W#4S7k 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 deleted file mode 100644 index 36ad667c6313670f113c0213ce59be36943eca15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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_aBOLu2FOIgMcq45@#_49YtdEP+Ncc)I$z JtaD0e0sw%|MJNCO diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png deleted file mode 100644 index 598770e39b83c3f097aa51c64fd61f8c99121fe5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5x0V6XFV_B_$=*)YR zh`S`nFPPy!9MqQ8UIhxfd%8G=RLn_ESRkDc;v_6!7U(ds+{CxcNzlMk#5wSg${V$g zRW5}uG!63|f`cL(R;kpAbummXcv{3JvY>BOLu2FOIgMcq45@#_49YtdEP+Ncc)I$z JtaD0e0sytjL#qG) diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/stripe.png new file mode 100644 index 0000000000000000000000000000000000000000..bb889f3dff62265507c35d8811418010093f6885 GIT binary patch literal 705 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4*Hqp7w6wH_hK6O!mhIoa z|8Cp6sX!^lk|4ie28U-i(mVM6<{<$6A*SJpnypb bRRI-w^D`OE1PXTF1R3e+>gTe~DWM4f+fFFp literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png deleted file mode 100644 index 631bb900c596d377e57d03080a04f9a66c164782..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 379 zcmV->0fhdEP) 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 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 2a9924621d..75f309c580 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 @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "All sprites by https://github.com/august-sun, inhands by TiniestShark (github)", + "copyright": "All sprites by https://github.com/august-sun, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)", "size": { "x": 32, "y": 32 @@ -11,16 +11,7 @@ "name": "base" }, { - "name": "practice" - }, - { - "name": "red" - }, - { - "name": "rubber" - }, - { - "name": "uranium" + "name": "stripe" }, { "name": "mag-1" diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png deleted file mode 100644 index ddfa208e6bfc0f1d007a05e4cf5c9c8ab3363e8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|`~rMJT!FNN zxRi#Pima@xgN;SDje1{}!|~M-KtZ4gP#h?z6>SqSJ%Qn@6GV+ZBcm4s!&C+axUL=* z#z~F>uOb*Ua(5a5O_VAL@(X78j|;E|{Z#;}^6+$V46*1nlE%aC?1vCUR%3L@z@rc#|>3|6hN933sf YOpbZ!I=wG$KrSqSJ%Qn@6GV+ZBcm4s!&IP7ByjuD z#c4pUL`jfeFvEZB;N=|`GoTs|PZ!4!i{9h}3Dy@4f-E1j5}253Rvq9v&{d$7ke0}l zxJi_Q%dt^GkM&SMLolPvg)X&%}udHGNET7#Qk5F@5~SXmS?h N3{O`-mvv4FO#sPgR~7&O diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png deleted file mode 100644 index 51f66e6634665f7ed14600e5bf2ca5ace8c350af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|k^_7~T!FNN zxRi#Pima@xgN;SDje1{}!|~M-KtZ4gP#h?z6>SqSJ%Qn@6GV+ZBcm4s!&C+axUL=* z#z~F>uOd*4V&u?g;P+y%o_biCaS_lO#gZVuV21w$fZG?pB|ya{XE)7O># zC962I3}bftWjzK4CT&j_#}ExsMg^w(e}O87J79EiaWNJ^@+G6Ov9S?~fD#ZO3m_>T Z;mq&xOl{rsxt@c9!PC{xWt~$(69Az(DHH$z literal 0 HcmV?d00001 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 deleted file mode 100644 index 0003cc807e9635adae7cff475004ec9d4fe7a28d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|JOX?|T!FNN zxRi#Pima@xgN;SDje1{}!|~M-KtZ4gP#h?z6>SqSJ%Qn@6HqZOAiC}CA)uT@NswPK z!+-4HXC@xeIv^b|q2Y-9l?tVvi4zlQ`k3Z0Fz7ZhMQ8a{J_5PP)78&qol`;+ E07uAF2mk;8 -- 2.51.2