diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml index 8b61c6a21b..269bdbfb09 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml @@ -216,7 +216,7 @@ - type: Sprite layers: - state: blue - - texture: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/icon.png + - texture: Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/icon.png - type: ConditionalSpawner prototypes: - MagazineSRifle @@ -253,7 +253,7 @@ - type: Sprite layers: - state: blue - - texture: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/icon.png + - texture: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/icon.png - type: ConditionalSpawner prototypes: - MagazinePistol @@ -270,7 +270,7 @@ - type: Sprite layers: - state: blue - - texture: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/icon.png + - texture: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/icon.png - type: ConditionalSpawner prototypes: - MagazineMagnum diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimaterial.yml similarity index 79% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/boxes.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimaterial.yml index a2233758d2..34e849ef50 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimaterial.yml @@ -1,7 +1,7 @@ - type: entity - id: BoxAntiMaterial - name: "ammunition box (.60 anti-material)" parent: BaseItem + id: BoxAntiMaterial + name: ammunition box (.60 anti-material) components: - type: AmmoBox caliber: AntiMaterial @@ -9,7 +9,7 @@ fillPrototype: CartridgeAntiMaterial - type: Sprite netsync: false - sprite: Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi + sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi layers: - state: base map: ["enum.RangedBarrelVisualLayers.Base"] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/clrifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/clrifle.yml new file mode 100644 index 0000000000..18a47b48a4 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/clrifle.yml @@ -0,0 +1,157 @@ +- type: entity + abstract: true + parent: BaseItem + id: BoxClRifleBase + name: ammunition box (.25 caseless) + components: + - type: AmmoBox + caliber: ClRifle + capacity: 60 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi + netsync: false + - type: Appearance + visuals: + - type: MagVisualizer + magState: mag + steps: 2 + zeroVisible: false + +# Boxes +- type: entity + parent: BoxClRifleBase + id: BoxClRifle10x24 + name: ammunition box (.25 caseless) + components: + - type: AmmoBox + capacity: 200 + fillPrototype: CartridgeClRifle + - type: Sprite + layers: + - state: base-10x24 + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag10-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer + magState: mag10 + steps: 2 + zeroVisible: false + +- type: entity + parent: BoxClRifleBase + id: BoxClRifleBigBox + name: ammunition box (.25 caseless) + components: + - type: AmmoBox + capacity: 200 + fillPrototype: CartridgeClRifle + - type: Sprite + layers: + - state: base-b + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: magb-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer + magState: magb + steps: 2 + zeroVisible: false + +- type: entity + parent: BoxClRifleBase + id: BoxClRifleBigBoxRubber + name: ammunition box (.25 caseless rubber) + components: + - type: AmmoBox + capacity: 200 + fillPrototype: CartridgeClRifleRubber + - type: Sprite + layers: + - state: base-b + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: magb-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: rubber-b + - type: Appearance + visuals: + - type: MagVisualizer + magState: magb + steps: 2 + zeroVisible: false + +- type: entity + parent: BoxClRifleBase + id: BoxClRifleBox + name: ammunition box (.25 caseless) + components: + - type: AmmoBox + fillPrototype: CartridgeClRifle + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + +- type: entity + parent: BoxClRifleBase + id: BoxClRifleBoxFlash + name: ammunition box (.25 caseless flash) + components: + - type: AmmoBox + fillPrototype: CartridgeClRifleFlash + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: flash + +- type: entity + parent: BoxClRifleBase + id: BoxClRifleBoxHV + name: ammunition box (.25 caseless high-velocity) + components: + - type: AmmoBox + fillPrototype: CartridgeClRifleHV + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: hv + +- type: entity + parent: BoxClRifleBase + id: BoxClRifleBoxPractice + name: ammunition box (.25 caseless practice) + components: + - type: AmmoBox + fillPrototype: CartridgeClRiflePractice + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: practice + +- type: entity + parent: BoxClRifleBase + id: BoxClRifleBoxRubber + name: ammunition box (.25 caseless rubber) + components: + - type: AmmoBox + fillPrototype: CartridgeClRifleRubber + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: rubber diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/lrifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/lrifle.yml new file mode 100644 index 0000000000..f459ed14f5 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/lrifle.yml @@ -0,0 +1,99 @@ +- type: entity + abstract: true + parent: BaseItem + id: BoxLRifleBase + name: ammunition box (.30 rifle) + components: + - type: AmmoBox + caliber: LRifle + capacity: 50 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi + netsync: false + - type: Appearance + visuals: + - type: MagVisualizer + magState: mag + steps: 2 + zeroVisible: false + +# Boxes +- type: entity + parent: BoxLRifleBase + id: BoxLRifleBigBox + name: ammunition box (.30 rifle) + components: + - type: AmmoBox + capacity: 200 + fillPrototype: CartridgeLRifle + - type: Sprite + layers: + - state: base-b + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: magb-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer + magState: magb + steps: 2 + zeroVisible: false + +- type: entity + parent: BoxLRifleBase + id: BoxLRifleBox + name: ammunition box (.30 rifle) + components: + - type: AmmoBox + fillPrototype: CartridgeLRifle + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + +- type: entity + parent: BoxLRifleBase + id: BoxLRifleBoxHV + name: ammunition box (.30 rifle high-velocity) + components: + - type: AmmoBox + fillPrototype: CartridgeLRifleHV + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: hv + +- type: entity + parent: BoxLRifleBase + id: BoxLRifleBoxPractice + name: ammunition box (.30 rifle practice) + components: + - type: AmmoBox + fillPrototype: CartridgeLRiflePractice + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: practice + +- type: entity + parent: BoxLRifleBase + id: BoxLRifleBoxRubber + name: ammunition box (.30 rifle rubber) + components: + - type: AmmoBox + fillPrototype: CartridgeLRifleRubber + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: rubber diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml similarity index 55% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/boxes.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index 67d57e9918..e1c0f7e6bf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -1,19 +1,14 @@ - type: entity - id: BoxMagnumBase - name: "ammunition box (.40 magnum)" - parent: BaseItem abstract: true + parent: BaseItem + id: BoxMagnumBase components: - type: AmmoBox caliber: Magnum - capacity: 30 + capacity: 60 - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi netsync: false - layers: - - state: base - map: ["enum.RangedBarrelVisualLayers.Base"] - - state: mag-1 - map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - type: MagVisualizer @@ -23,56 +18,75 @@ # Boxes - type: entity - id: BoxMagnum - name: "ammunition box (.40 magnum)" parent: BoxMagnumBase + id: BoxMagnum + name: ammunition box (.40 magnum) components: - type: AmmoBox - capacity: 60 fillPrototype: CartridgeMagnum - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] - type: entity - id: BoxMagnumFlash - name: "ammunition box (.40 magnum flash)" parent: BoxMagnumBase + id: BoxMagnumFlash + name: ammunition box (.40 magnum flash) components: - type: AmmoBox - capacity: 60 fillPrototype: CartridgeMagnumFlash - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: flash - type: entity - id: BoxMagnumHV - name: "ammunition box (.40 magnum high-velocity)" parent: BoxMagnumBase + id: BoxMagnumHV + name: ammunition box (.40 magnum high-velocity) components: - type: AmmoBox - capacity: 60 fillPrototype: CartridgeMagnumHV - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: hv - type: entity - id: BoxMagnumPractice - name: "ammunition box (.40 magnum practice)" parent: BoxMagnumBase + id: BoxMagnumPractice + name: ammunition box (.40 magnum practice) components: - type: AmmoBox - capacity: 60 fillPrototype: CartridgeMagnumPractice - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: practice - type: entity - id: BoxMagnumRubber - name: "ammunition box (.40 magnum rubber)" parent: BoxMagnumBase + id: BoxMagnumRubber + name: ammunition box (.40 magnum rubber) components: - type: AmmoBox - capacity: 60 fillPrototype: CartridgeMagnumRubber - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: rubber diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml similarity index 55% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/boxes.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index eb5e1a71db..2a0d042f9c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -1,20 +1,15 @@ - type: entity - id: BoxPistolBase - name: "ammunition box (.35 auto)" - parent: BaseItem abstract: true + parent: BaseItem + id: BoxPistolBase + name: ammunition box (.35 auto) components: - type: AmmoBox caliber: Pistol - capacity: 30 - + capacity: 60 - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi netsync: false - layers: - - state: base - map: ["enum.RangedBarrelVisualLayers.Base"] - - state: mag-1 - map: ["enum.RangedBarrelVisualLayers.Mag"] - type: Appearance visuals: - type: MagVisualizer @@ -24,61 +19,75 @@ # Boxes - type: entity + parent: BoxPistolBase id: BoxPistolBox - name: "ammunition box (.35 auto)" - parent: BoxPistolBase + name: ammunition box (.35 auto) components: - type: AmmoBox - capacity: 60 fillPrototype: CartridgePistol - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] - type: entity + parent: BoxPistolBase id: BoxPistolBoxFlash - name: "ammunition box (.35 auto flash)" - parent: BoxPistolBase + name: ammunition box (.35 auto flash) components: - type: AmmoBox - capacity: 60 fillPrototype: CartridgePistolFlash - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: flash - type: entity + parent: BoxPistolBase id: BoxPistolBoxHV - name: "ammunition box (.35 auto high-velocity)" - parent: BoxPistolBase + name: ammunition box (.35 auto high-velocity) components: - type: AmmoBox - capacity: 60 fillPrototype: CartridgePistolHV - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: hv - type: entity + parent: BoxPistolBase id: BoxPistolBoxPractice - name: "ammunition box (.35 auto practice)" - parent: BoxPistolBase + name: ammunition box (.35 auto practice) components: - type: AmmoBox - capacity: 60 fillPrototype: CartridgePistolPractice - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: practice - type: entity - id: BoxPistolBoxRubber - name: "ammunition box (.35 auto rubber)" parent: BoxPistolBase + id: BoxPistolBoxRubber + name: ammunition box (.35 auto rubber) components: - type: AmmoBox - capacity: 60 fillPrototype: CartridgePistolRubber - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: rubber diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/srifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/srifle.yml new file mode 100644 index 0000000000..6a697ea757 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/srifle.yml @@ -0,0 +1,135 @@ +- type: entity + abstract: true + parent: BaseItem + id: BoxSRifleBase + components: + - type: AmmoBox + caliber: SRifle + capacity: 60 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi + netsync: false + - type: Appearance + visuals: + - type: MagVisualizer + magState: mag + steps: 2 + zeroVisible: false + +# Boxes +- type: entity + parent: BoxSRifleBase + id: BoxSRifleBigBox + name: ammunition box (.20 rifle) + components: + - type: AmmoBox + capacity: 200 + fillPrototype: CartridgeSRifle + - type: Sprite + layers: + - state: base-b + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: magb-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - type: Appearance + visuals: + - type: MagVisualizer + magState: magb + steps: 2 + zeroVisible: false + +- type: entity + parent: BoxSRifleBase + id: BoxSRifleBigBoxRubber + name: ammunition box (.20 rifle rubber) + components: + - type: AmmoBox + capacity: 200 + fillPrototype: CartridgeSRiflePractice + - type: Sprite + layers: + - state: base-b + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: magb-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: practice-b + - type: Appearance + visuals: + - type: MagVisualizer + magState: magb + steps: 2 + zeroVisible: false + +- type: entity + parent: BoxSRifleBase + id: BoxSRifleBox + name: ammunition box (.20 rifle) + components: + - type: AmmoBox + fillPrototype: CartridgeSRifle + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + +- type: entity + parent: BoxSRifleBase + id: BoxSRifleBoxFlash + name: ammunition box (.20 rifle flash) + components: + - type: AmmoBox + fillPrototype: CartridgeSRifleFlash + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: flash + +- type: entity + parent: BoxSRifleBase + id: BoxSRifleBoxHV + name: ammunition box (.20 rifle high-velocity) + components: + - type: AmmoBox + fillPrototype: CartridgeSRifleHV + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: hv + +- type: entity + parent: BoxSRifleBase + id: BoxSRifleBoxPractice + name: ammunition box (.20 rifle practice) + components: + - type: AmmoBox + fillPrototype: CartridgeSRiflePractice + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: practice + +- type: entity + parent: BoxSRifleBase + id: BoxSRifleBoxRubber + name: ammunition box (.20 rifle rubber) + components: + - type: AmmoBox + fillPrototype: CartridgeSRifleRubber + - type: Sprite + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-1 + map: ["enum.RangedBarrelVisualLayers.Mag"] + - state: rubber diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml similarity index 88% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml index 5d3f26bdbd..b50670ffb2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/boxes.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml @@ -1,8 +1,8 @@ - type: entity - id: BoxDonkSoftBase - name: "foamdart box" - parent: BaseItem abstract: true + parent: BaseItem + id: BoxDonkSoftBase + name: foamdart box components: - type: AmmoBox caliber: Rocket @@ -12,9 +12,9 @@ # Boxes - type: entity - id: BoxDonkSoftBox - name: "foam dart box" parent: BoxDonkSoftBase + id: BoxDonkSoftBox + name: foam dart box components: - type: AmmoBox capacity: 40 @@ -24,9 +24,9 @@ state: foambox - type: entity - id: BoxCartridgeCap - name: "cap gun cartridge box" parent: BoxDonkSoftBase + id: BoxCartridgeCap + name: cap gun cartridge box components: - type: AmmoBox capacity: 20 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml index 8afbe0f536..56663cd1be 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/antimaterial.yml @@ -1,7 +1,7 @@ - type: entity + parent: BaseItem id: CartridgeAntiMaterial name: cartridge (.60 anti-material) - parent: BaseItem components: - type: Ammo caliber: AntiMaterial diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/clrifle.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/cartridges.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/clrifle.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/lrifle.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/cartridges.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/lrifle.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/cartridges.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/cartridges.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/cartridges.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/srifle.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/cartridges.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/srifle.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/cartridges.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/toy.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml deleted file mode 100644 index 8ae452d1ff..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/boxes.yml +++ /dev/null @@ -1,120 +0,0 @@ -- type: entity - id: BoxClRifleBase - name: "ammunition box (.25 caseless)" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: ClRifle - capacity: 30 - - - type: Sprite - netsync: false - layers: - - state: base - map: ["enum.RangedBarrelVisualLayers.Base"] - - state: mag-1 - map: ["enum.RangedBarrelVisualLayers.Mag"] - - type: Appearance - visuals: - - type: MagVisualizer - magState: mag - steps: 2 - zeroVisible: false - -# Boxes -- type: entity - id: BoxClRifle10x24 - name: "ammunition box (.25 caseless)" - parent: BoxClRifleBase - components: - - type: AmmoBox - capacity: 200 - fillPrototype: CartridgeClRifle - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi - -- type: entity - id: BoxClRifleBigBox - name: "ammunition box (.25 caseless)" - parent: BoxClRifleBase - components: - - type: AmmoBox - capacity: 200 - fillPrototype: CartridgeClRifle - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi - -- type: entity - id: BoxClRifleBigBoxRubber - name: "ammunition box (.25 caseless rubber)" - parent: BoxClRifleBase - components: - - type: AmmoBox - capacity: 200 - fillPrototype: CartridgeClRifleRubber - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi - -- type: entity - id: BoxClRifleBox - name: "ammunition box (.25 caseless)" - parent: BoxClRifleBase - components: - - type: AmmoBox - capacity: 60 - fillPrototype: CartridgeClRifle - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi - -- type: entity - id: BoxClRifleBoxFlash - name: "ammunition box (.25 caseless flash)" - parent: BoxClRifleBase - components: - - type: AmmoBox - capacity: 60 - fillPrototype: CartridgeClRifleFlash - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi - -- type: entity - id: BoxClRifleBoxHV - name: "ammunition box (.25 caseless high-velocity)" - parent: BoxClRifleBase - components: - - type: AmmoBox - capacity: 60 - fillPrototype: CartridgeClRifleHV - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi - -- type: entity - id: BoxClRifleBoxPractice - name: "ammunition box (.25 caseless practice)" - parent: BoxClRifleBase - components: - - type: AmmoBox - capacity: 60 - fillPrototype: CartridgeClRiflePractice - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi - -- type: entity - id: BoxClRifleBoxRubber - name: "ammunition box (.25 caseless rubber)" - parent: BoxClRifleBase - components: - - type: AmmoBox - capacity: 60 - fillPrototype: CartridgeClRifleRubber - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml deleted file mode 100644 index 1d20ffcde0..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/boxes.yml +++ /dev/null @@ -1,72 +0,0 @@ -- type: entity - id: BoxLRifleBase - name: "ammunition box (.30 rifle)" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: LRifle - capacity: 30 - - - type: Sprite - netsync: false - layers: - - state: base - map: ["enum.RangedBarrelVisualLayers.Base"] - - state: mag-1 - map: ["enum.RangedBarrelVisualLayers.Mag"] - - type: Appearance - visuals: - - type: MagVisualizer - magState: mag - steps: 2 - zeroVisible: false - -# Boxes -- type: entity - id: BoxLRifleBigBox - name: "ammunition box (.30 rifle)" - parent: BoxLRifleBase - components: - - type: AmmoBox - capacity: 200 - fillPrototype: CartridgeLRifle - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi - -- type: entity - id: BoxLRifleBoxHV - name: "ammunition box (.30 rifle high-velocity)" - parent: BoxLRifleBase - components: - - type: AmmoBox - capacity: 50 - fillPrototype: CartridgeLRifleHV - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi - -- type: entity - id: BoxLRifleBoxPractice - name: "ammunition box (.30 rifle practice)" - parent: BoxLRifleBase - components: - - type: AmmoBox - capacity: 50 - fillPrototype: CartridgeLRiflePractice - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi - -- type: entity - id: BoxLRifleBoxRubber - name: "ammunition box (.30 rifle rubber)" - parent: BoxLRifleBase - components: - - type: AmmoBox - capacity: 50 - fillPrototype: CartridgeLRifleRubber - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/clrifle.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/magazines.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/clrifle.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/lrifle.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/magazines.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/lrifle.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/magazines.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/magazines.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/magazines.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/magazines.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/srifle.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/magazines.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/srifle.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/projectiles.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml index 1cef82866c..f0b24d2263 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/AntiMaterial/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimaterial.yml @@ -1,8 +1,8 @@ - type: entity + abstract: true + parent: BulletBaseHV id: BulletAntiMaterial name: bullet (.60 anti-material) - parent: BulletBaseHV - abstract: true components: - type: Projectile damages: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/clrifle.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/ClRifle/projectiles.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/clrifle.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/lrifle.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/projectiles.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/lrifle.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/projectiles.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/projectiles.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Shotgun/projectiles.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/srifle.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/projectiles.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/srifle.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/projectiles.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml deleted file mode 100644 index 6b41ac93c1..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SRifle/boxes.yml +++ /dev/null @@ -1,108 +0,0 @@ -- type: entity - id: BoxSRifleBase - name: "ammunition box (.20 rifle)" - parent: BaseItem - abstract: true - components: - - type: AmmoBox - caliber: SRifle - capacity: 30 - - - type: Sprite - netsync: false - layers: - - state: base - map: ["enum.RangedBarrelVisualLayers.Base"] - - state: mag-1 - map: ["enum.RangedBarrelVisualLayers.Mag"] - - type: Appearance - visuals: - - type: MagVisualizer - magState: mag - steps: 2 - zeroVisible: false - -# Boxes -- type: entity - id: BoxSRifleBigBox - name: "ammunition box (.20 rifle)" - parent: BoxSRifleBase - components: - - type: AmmoBox - capacity: 200 - fillPrototype: CartridgeSRifle - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi - -- type: entity - id: BoxSRifleBigBoxRubber - name: "ammunition box (.20 rifle rubber)" - parent: BoxSRifleBase - components: - - type: AmmoBox - capacity: 200 - fillPrototype: CartridgeSRifleRubber - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi - -- type: entity - id: BoxSRifleBox - name: "ammunition box (.20 rifle)" - parent: BoxSRifleBase - components: - - type: AmmoBox - capacity: 60 - fillPrototype: CartridgeSRifle - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi - -- type: entity - id: BoxSRifleBoxFlash - name: "ammunition box (.20 rifle flash)" - parent: BoxSRifleBase - components: - - type: AmmoBox - capacity: 60 - fillPrototype: CartridgeSRifleFlash - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi - -- type: entity - id: BoxSRifleBoxHV - name: "ammunition box (.20 rifle high-velocity)" - parent: BoxSRifleBase - components: - - type: AmmoBox - capacity: 60 - fillPrototype: CartridgeSRifleHV - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi - -- type: entity - id: BoxSRifleBoxPractice - name: "ammunition box (.20 rifle practice)" - parent: BoxSRifleBase - components: - - type: AmmoBox - capacity: 60 - fillPrototype: CartridgeSRiflePractice - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi - -- type: entity - id: BoxSRifleBoxRubber - name: "ammunition box (.20 rifle rubber)" - parent: BoxSRifleBase - components: - - type: AmmoBox - capacity: 60 - fillPrototype: CartridgeSRifleRubber - - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/speed_loaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speed Loaders/lrifle.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/LRifle/speed_loaders.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speed Loaders/lrifle.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/speed_loaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speed Loaders/magnum.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magnum/speed_loaders.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speed Loaders/magnum.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/speed_loaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speed Loaders/pistol.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Pistol/speed_loaders.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speed Loaders/pistol.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speed Loaders/toy.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Toy/speedloaders.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speed Loaders/toy.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Explosives/ammunition.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Explosives/ammunition.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/meta.json deleted file mode 100644 index 0835ac8f77..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/icon.png deleted file mode 100644 index 26ed4ff109..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/icon.png deleted file mode 100644 index 7d4c64d7f4..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/meta.json deleted file mode 100644 index 0835ac8f77..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/base.png deleted file mode 100644 index 8ff5d05644..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/icon.png deleted file mode 100644 index ac5b51bebf..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/mag-1.png deleted file mode 100644 index 6a77161ab2..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/meta.json deleted file mode 100644 index 0835ac8f77..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box_rubber.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/base.png deleted file mode 100644 index 2205c9952c..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/icon.png deleted file mode 100644 index 43b716d1b6..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/mag-1.png deleted file mode 100644 index edcbdbd385..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_flash.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/base.png deleted file mode 100644 index ef8e31e13b..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/icon.png deleted file mode 100644 index 3231de5d90..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/mag-1.png deleted file mode 100644 index edcbdbd385..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_hv.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/base.png deleted file mode 100644 index 319dbdeca9..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/icon.png deleted file mode 100644 index b927c72ad0..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/mag-1.png deleted file mode 100644 index edcbdbd385..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_practice.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/base.png deleted file mode 100644 index 00fa197d65..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/icon.png deleted file mode 100644 index 69d6ebeb63..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/mag-1.png deleted file mode 100644 index edcbdbd385..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box_rubber.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/icon.png deleted file mode 100644 index 3b2fa0a3f1..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/meta.json deleted file mode 100644 index 0835ac8f77..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/meta.json deleted file mode 100644 index 0835ac8f77..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/base.png deleted file mode 100644 index 6a4ebbc268..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/icon.png deleted file mode 100644 index 87d0f755da..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/mag-1.png deleted file mode 100644 index a6feb95c36..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/meta.json deleted file mode 100644 index 0835ac8f77..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_hv.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/base.png deleted file mode 100644 index f1bb30648f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/icon.png deleted file mode 100644 index 4d6507596c..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/mag-1.png deleted file mode 100644 index a6feb95c36..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/meta.json deleted file mode 100644 index 0835ac8f77..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_practice.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/base.png deleted file mode 100644 index 290ebc7990..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/icon.png deleted file mode 100644 index ecbc57cf2f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/mag-1.png deleted file mode 100644 index a6feb95c36..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/meta.json deleted file mode 100644 index 0835ac8f77..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box_rubber.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/base.png deleted file mode 100644 index 6eb75d44cc..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/base.png deleted file mode 100644 index c7238e30c6..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/icon.png deleted file mode 100644 index cd17ee8a38..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/mag-1.png deleted file mode 100644 index dbc1078dd9..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_flash.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/base.png deleted file mode 100644 index 67541b8bb6..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/icon.png deleted file mode 100644 index ed485e993a..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/mag-1.png deleted file mode 100644 index dbc1078dd9..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_hv.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/base.png deleted file mode 100644 index 4f307e7df1..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/icon.png deleted file mode 100644 index 413750bcf9..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/mag-1.png deleted file mode 100644 index dbc1078dd9..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_practice.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/base.png deleted file mode 100644 index a905091d26..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/icon.png deleted file mode 100644 index 6de8be102a..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/mag-1.png deleted file mode 100644 index dbc1078dd9..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box_rubber.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/base.png deleted file mode 100644 index ccfe03d309..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/icon.png deleted file mode 100644 index ebb397a6bf..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/mag-1.png deleted file mode 100644 index f32f686266..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_flash.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/base.png deleted file mode 100644 index 0e7717e27a..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/icon.png deleted file mode 100644 index 765d4154c4..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/mag-1.png deleted file mode 100644 index f32f686266..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_hv.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/base.png deleted file mode 100644 index d4a38ca825..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/icon.png deleted file mode 100644 index 3598ef7c9a..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/mag-1.png deleted file mode 100644 index f32f686266..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_practice.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/base.png deleted file mode 100644 index 38154c90d9..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/icon.png deleted file mode 100644 index 8e077f7615..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/mag-1.png deleted file mode 100644 index f32f686266..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box_rubber.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/icon.png deleted file mode 100644 index bedb1d82a1..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/base.png deleted file mode 100644 index 43a6eae23f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/icon.png deleted file mode 100644 index 90ccd7de5c..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/mag-1.png deleted file mode 100644 index a3d15b76e6..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box_rubber.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/base.png deleted file mode 100644 index 45561147ca..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/icon.png deleted file mode 100644 index 7bfc5530f3..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/mag-1.png deleted file mode 100644 index 2d9e2d767f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_flash.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/base.png deleted file mode 100644 index ab93da09ee..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/icon.png deleted file mode 100644 index 6bda43eb64..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/mag-1.png deleted file mode 100644 index 2d9e2d767f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_hv.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/base.png deleted file mode 100644 index cccfc242f9..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/icon.png deleted file mode 100644 index 92e514c351..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/mag-1.png deleted file mode 100644 index 2d9e2d767f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/meta.json deleted file mode 100644 index 0f38c5191a..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_practice.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/base.png deleted file mode 100644 index a1c7b52f42..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/base.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/icon.png deleted file mode 100644 index eb460e4e00..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/mag-1.png deleted file mode 100644 index 2d9e2d767f..0000000000 Binary files a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/mag-1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/meta.json deleted file mode 100644 index 3b7e34c5cc..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box_rubber.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", - "states": [ - { - "name": "base" - }, - { - "name": "icon" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/icon.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/icon.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/AntiMaterial/anti_material.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/meta.json new file mode 100644 index 0000000000..0b02c18419 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/983ad377d25729357b7ff8025f8014bd2f6ae9f7/icons/obj/ammo.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base-10x24.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base-10x24.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base-b.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base-b.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/flash.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/flash.png new file mode 100644 index 0000000000..b50945ba8f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/flash.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/hv.png new file mode 100644 index 0000000000..0cf4172164 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/hv.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/icon.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/icon.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_box.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/mag10-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/10x24_box.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/mag10-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/magb-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/ClRifle/cl_rifle_big_box.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/magb-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/meta.json new file mode 100644 index 0000000000..04a9fb6184 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "base-b" + }, + { + "name": "base-10x24" + }, + { + "name": "mag-1" + }, + { + "name": "magb-1" + }, + { + "name": "mag10-1" + }, + { + "name": "flash" + }, + { + "name": "hv" + }, + { + "name": "practice" + }, + { + "name": "rubber" + }, + { + "name": "rubber-b" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/practice.png new file mode 100644 index 0000000000..2f77d8364b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/rubber-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/rubber-b.png new file mode 100644 index 0000000000..cf04605a79 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/rubber-b.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/rubber.png new file mode 100644 index 0000000000..6363a6f5cc Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/rubber.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/base-b.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/base-b.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/hv.png new file mode 100644 index 0000000000..11cc4b5f65 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/hv.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/icon.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/icon.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_box.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/magb-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/LRifle/l_rifle_big_box.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/magb-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/meta.json new file mode 100644 index 0000000000..115af1937f --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "base-b" + }, + { + "name": "mag-1" + }, + { + "name": "magb-1" + }, + { + "name": "hv" + }, + { + "name": "practice" + }, + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/practice.png new file mode 100644 index 0000000000..9bdb2c01d1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/rubber.png new file mode 100644 index 0000000000..6384490615 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/rubber.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png new file mode 100644 index 0000000000..e977e2e724 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/flash.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/flash.png new file mode 100644 index 0000000000..a2921b45fc Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/flash.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/hv.png new file mode 100644 index 0000000000..6e64601f6b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/hv.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/icon.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/icon.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Magnum/magnum_box.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json new file mode 100644 index 0000000000..5a978b945c --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "flash" + }, + { + "name": "hv" + }, + { + "name": "practice" + }, + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png new file mode 100644 index 0000000000..24ceb79488 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png new file mode 100644 index 0000000000..ccef0288d1 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubber.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/flash.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/flash.png new file mode 100644 index 0000000000..0698be7c2f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/flash.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/hv.png new file mode 100644 index 0000000000..d9c8bf3dc7 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/hv.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/icon.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/icon.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/Pistol/pistol_box.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json new file mode 100644 index 0000000000..5a978b945c --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "flash" + }, + { + "name": "hv" + }, + { + "name": "practice" + }, + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png new file mode 100644 index 0000000000..6a2e8481c3 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png new file mode 100644 index 0000000000..f317d03c21 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubber.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/base-b.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/base-b.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/flash.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/flash.png new file mode 100644 index 0000000000..7de6be0c89 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/flash.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/hv.png new file mode 100644 index 0000000000..b580737a95 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/hv.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/icon.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/icon.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/icon.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_box.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/magb-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/SRifle/s_rifle_big_box.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/magb-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/meta.json new file mode 100644 index 0000000000..d91e29a27c --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "base-b" + }, + { + "name": "mag-1" + }, + { + "name": "magb-1" + }, + { + "name": "flash" + }, + { + "name": "hv" + }, + { + "name": "practice" + }, + { + "name": "practice-b" + }, + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/practice-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/practice-b.png new file mode 100644 index 0000000000..0c8f89ffc3 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/practice-b.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/practice.png new file mode 100644 index 0000000000..b3f236d787 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/rubber.png new file mode 100644 index 0000000000..ada010cafb Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/rubber.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/base.png new file mode 100644 index 0000000000..09cc70d6ef Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/icon.png new file mode 100644 index 0000000000..9a0cfee6b6 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-1.png new file mode 100644 index 0000000000..b5b70cc859 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-2.png new file mode 100644 index 0000000000..fa67e8801c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-3.png new file mode 100644 index 0000000000..b436f1dbc8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-4.png new file mode 100644 index 0000000000..8505a40d6d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-5.png new file mode 100644 index 0000000000..8da9ab83e5 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-6.png new file mode 100644 index 0000000000..703bfbf86d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-6.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-7.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-7.png new file mode 100644 index 0000000000..4c0454314d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-7.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/meta.json new file mode 100644 index 0000000000..01e679daee --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "mag-6" + }, + { + "name": "mag-7" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/base.png new file mode 100644 index 0000000000..518fa5947b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/hv.png new file mode 100644 index 0000000000..e07e5ffd1c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/hv.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-1.png new file mode 100644 index 0000000000..4f930fb7ca Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-2.png new file mode 100644 index 0000000000..36da9b29a5 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-3.png new file mode 100644 index 0000000000..69f0ef4b5d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-4.png new file mode 100644 index 0000000000..16c225e946 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-5.png new file mode 100644 index 0000000000..cf1c48a34e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-5.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/meta.json new file mode 100644 index 0000000000..d47fb675f1 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "hv" + }, + { + "name": "practice" + }, + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/practice.png new file mode 100644 index 0000000000..1270482f62 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/rubber.png new file mode 100644 index 0000000000..0c2dfa71c8 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/rubber.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/base.png new file mode 100644 index 0000000000..829fcd6d59 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/flash.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/flash.png new file mode 100644 index 0000000000..1ee4ff6255 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/flash.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/hv.png new file mode 100644 index 0000000000..8a68794a09 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/hv.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/mag-1.png new file mode 100644 index 0000000000..54bf062641 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/meta.json new file mode 100644 index 0000000000..19dae78f6d --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "flash" + }, + { + "name": "hv" + }, + { + "name": "practice" + }, + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/practice.png new file mode 100644 index 0000000000..99c40ca302 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/rubber.png new file mode 100644 index 0000000000..3d7f49706b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/rubber.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/base.png new file mode 100644 index 0000000000..05db933351 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/flash.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/flash.png new file mode 100644 index 0000000000..03d4875554 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/flash.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/hv.png new file mode 100644 index 0000000000..7841e6bf0a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/hv.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/mag-1.png new file mode 100644 index 0000000000..f67c10605d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/meta.json new file mode 100644 index 0000000000..19dae78f6d --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "flash" + }, + { + "name": "hv" + }, + { + "name": "practice" + }, + { + "name": "rubber" + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/practice.png new file mode 100644 index 0000000000..d2deffb46d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/practice.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/rubber.png new file mode 100644 index 0000000000..d4aa304e13 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/rubber.png differ