From: Seam_Less Date: Wed, 11 Jun 2025 20:03:14 +0000 (-0700) Subject: Magazine rsi Cleanup + Magazine Type Recolor (#37709) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f046d8a1f6399b2876d8a364ae478f7d13f29e4a;p=space-station-14.git Magazine rsi Cleanup + Magazine Type Recolor (#37709) --- 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 e0a3cb4d13..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png and /dev/null differ 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 3bfa3b48b8..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png and /dev/null differ 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 0000000000..b3c57a440a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/stripe.png differ 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 ad8e3d9fb4..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/uranium.png and /dev/null differ 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 18aab251ab..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/practice.png and /dev/null differ 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 829fcd6d59..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/red.png and /dev/null differ 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 0000000000..779465c927 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/stripe.png differ 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 dc1c69b16d..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/practice.png and /dev/null differ 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 05db933351..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/red.png and /dev/null differ 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 0000000000..e18b4b6892 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/stripe.png differ 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 0cb88b1399..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/practice.png and /dev/null differ 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 3990c78a2e..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/red.png and /dev/null differ 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 0000000000..4c1ec65866 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/stripe.png differ 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 deleted file mode 100644 index b9dabe5bda..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/uranium.png and /dev/null differ 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 2ac700b8b6..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/piercing.png and /dev/null differ 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 f3f3bc05ec..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/practice.png and /dev/null differ 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 64bca76850..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/stripe.png new file mode 100644 index 0000000000..7490de7df2 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/stripe.png differ 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 deleted file mode 100644 index a7db07b987..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/uranium.png and /dev/null differ 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 953ad22066..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/piercing.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/practice.png deleted file mode 100644 index 49a1ba89d5..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/practice.png and /dev/null differ 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 6058c25acf..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/red.png and /dev/null differ 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 0000000000..cb0f5c8df0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/stripe.png differ 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 774b22096f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/uranium.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json index 9bc9d85529..ad008dad90 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json @@ -5,26 +5,17 @@ "y": 32 }, "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, inhands by TiniestShark (github)", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)", "states": [ { "name": "base" }, { - "name": "practice" - }, - { - "name": "red" + "name": "stripe" }, { "name": "red-icon" }, - { - "name": "uranium" - }, - { - "name": "piercing" - }, { "name": "mag-1" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/piercing.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/piercing.png deleted file mode 100644 index b6d58fdfeb..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/piercing.png and /dev/null differ 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 4e6907fa19..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/practice.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red.png deleted file mode 100644 index f5a47ffd16..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/red.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/stripe.png new file mode 100644 index 0000000000..917616604b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/stripe.png differ 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 36ad667c63..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/uranium.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json index 79970af702..ad008dad90 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json @@ -5,23 +5,17 @@ "y": 32 }, "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, inhands by TiniestShark (github)", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)", "states": [ { "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/Pistol/smg_mag.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png deleted file mode 100644 index e48f12c57a..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/practice.png and /dev/null differ 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 598770e39b..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png and /dev/null differ 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 0000000000..bb889f3dff Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/stripe.png differ 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 631bb900c5..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/uranium.png and /dev/null differ 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 ddfa208e6b..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png deleted file mode 100644 index 7bca53b450..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png and /dev/null differ 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 51f66e6634..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/stripe.png new file mode 100644 index 0000000000..1677c8d25d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/stripe.png differ 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 0003cc807e..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/uranium.png and /dev/null differ