diff --git a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs index 10a0c7209d..fbdd8b195d 100644 --- a/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs +++ b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs @@ -4,17 +4,27 @@ using Content.Shared.Lathe.Prototypes; using Content.Shared.Materials; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array; using Robust.Shared.Utility; namespace Content.Shared.Research.Prototypes { [NetSerializable, Serializable, Prototype] - public sealed partial class LatheRecipePrototype : IPrototype + public sealed partial class LatheRecipePrototype : IPrototype, IInheritingPrototype { [ViewVariables] [IdDataField] public string ID { get; private set; } = default!; + /// + [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] + public string[]? Parents { get; } + + /// + [NeverPushInheritance] + [AbstractDataField] + public bool Abstract { get; } + /// /// Name displayed in the lathe GUI. /// @@ -68,4 +78,4 @@ namespace Content.Shared.Research.Prototypes [DataField] public uint MiningPoints; } -} +} \ No newline at end of file diff --git a/Resources/Audio/_NF/Weapons/Guns/Gunshots/attributions.yml b/Resources/Audio/_NF/Weapons/Guns/Gunshots/attributions.yml new file mode 100644 index 0000000000..76f06b0290 --- /dev/null +++ b/Resources/Audio/_NF/Weapons/Guns/Gunshots/attributions.yml @@ -0,0 +1,4 @@ +- files: ["rifle.ogg"] + license: "CC-BY-3.0" + copyright: "Created by Michel Baradari apollo-music.de" + source: "https://opengameart.org/content/chaingun-pistol-rifle-shotgun-shots" diff --git a/Resources/Audio/_NF/Weapons/Guns/Gunshots/rifle.ogg b/Resources/Audio/_NF/Weapons/Guns/Gunshots/rifle.ogg new file mode 100644 index 0000000000..e3e7fb03cc Binary files /dev/null and b/Resources/Audio/_NF/Weapons/Guns/Gunshots/rifle.ogg differ diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 02eee48691..374e6ec4e7 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -8,16 +8,18 @@ - id: ClothingOuterHardsuitSpatio - id: ClothingShoesBootsMag - id: ClothingMaskGasExplorer + - id: ClothingEyesGlassesGarMeson - id: ClothingBeltUtilityFilled - id: SurvivalKnife - id: HandheldGPSBasic - id: RadioHandheld + - id: FlashlightSeclite + - id: Pickaxe - id: SeismicCharge amount: 2 - id: ClothingShoesBootsWinterMiner #Delta V: Add departmental winter boots - id: JetpackMiniFilled # DeltaV - Salv lost their shuttle - id: OreBag - prob: 0.5 - id: Flare prob: 0.3 - id: Flare @@ -48,7 +50,6 @@ - id: ClothingShoesBootsWinterMiner #Delta V: Add departmental winter boots - id: JetpackMiniFilled # DeltaV - Salv lost their shuttle - id: OreBag - prob: 0.5 - id: Flare prob: 0.3 - id: Flare @@ -58,4 +59,4 @@ - id: ClothingNeckSalvager # DeltaV - salvage cloak prob: 0.2 - id: LunchboxLogisticsFilledRandom # DeltaV - Lunchboxes! - prob: 0.3 \ No newline at end of file + prob: 0.3 diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml index 9cac5c3422..1339950470 100644 --- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml @@ -58,6 +58,14 @@ id: LoadoutMagazineMagnumSpare - type: loadout id: LoadoutMagazineMagnumRubberSpare + - type: loadout + id: LoadoutSpeedLoaderRifleHeavy + - type: loadout + id: LoadoutSpeedLoaderRifleHeavySpare + - type: loadout + id: LoadoutSpeedLoaderRifleHeavyRubber + - type: loadout + id: LoadoutSpeedLoaderRifleHeavyRubberSpare - type: characterItemGroup maxItems: 1 @@ -115,6 +123,10 @@ id: LoadoutSecurityRevolverPython - type: loadout id: LoadoutSecurityRevolverPythonNonlethal + - type: loadout + id: LoadoutSecurityArgenti + - type: loadout + id: LoadoutSecurityArgentiNonLethal - type: characterItemGroup id: LoadoutSecurityEyes diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml index 8b75b147fa..e460d2a537 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/salvage_points.yml @@ -19,6 +19,8 @@ - id: FultonBeacon cost: 400 # TODO: bluespace shelter capsule for 400 + - id: SalvageHarpoon + cost: 450 - id: ClothingEyesGlassesGarMeson cost: 500 - id: ClothingBeltSalvageWebbing @@ -37,8 +39,18 @@ - id: Fulton cost: 1000 # TODO: lazarus injector for 1k + - id: WeaponSniperMosinEmpty + cost: 750 # Literally the worst gun in the game. + - id: WeaponRevolverArgentiEmpty + cost: 1100 + - id: WeaponRifleNovaliteC1Empty + cost: 1300 - id: ClothingBackpackDuffelSalvageConscription cost: 1500 + - id: WeaponRifleGestioEmpty + cost: 1600 + - id: WeaponRifleSVTEmpty + cost: 1600 - id: SpaceCash1000 cost: 2000 # TODO: super resonator for 2500 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index c85ce56974..ba06e7630b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -261,3 +261,27 @@ capacity: 5 chambers: [ True, True, True, True, True ] ammoSlots: [ null, null, null, null, null ] + +- type: entity + parent: WeaponRevolverArgenti + id: WeaponRevolverArgentiSecurity + description: The military grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo. + The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: GuideHelp + guides: [ SecurityWeapons ] + +- type: entity + parent: WeaponRevolverArgenti + id: WeaponRevolverArgentiNonLethalSecurity + suffix: Non-lethal + description: The military grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Comes with .20 rubber rifle ammo. + The serial number on the handguard marks this gun as belonging to an NT Security Officer. + components: + - type: RevolverAmmoProvider + capacity: 8 + proto: CartridgeRifleRubber + chambers: [ True, True, True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null, null, null ] + - type: GuideHelp + guides: [ SecurityWeapons ] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index beba0caafc..310dd59bc8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -111,6 +111,16 @@ - type: BallisticAmmoProvider proto: CartridgeLightRifleRubber +- type: entity + name: Kardashev-Mosin + parent: WeaponSniperMosin + id: WeaponSniperMosinEmpty + description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. + suffix: Empty + components: + - type: BallisticAmmoProvider + proto: null + - type: entity name: Hristov parent: [BaseWeaponSniper, BaseGunWieldable] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 723830219f..ec008e1193 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -191,3 +191,98 @@ sprite: Objects/Weapons/Melee/bone_spear.rsi - type: Construction graph: SpearBone + +- type: entity + name: salvage harpoon + parent: BaseItem + id: SalvageHarpoon + description: A spear made of refined steel produced for salvage and hunting purposes. Hunters fancy it when it comes to hunting various carp species. + components: + - type: EmbeddableProjectile + offset: 0.15,0.15 + - type: EmbedPassiveDamage + - type: ThrowingAngle + angle: 225 + - type: LandAtCursor + - type: Tag + tags: + - Spear + - type: Fixtures + fixtures: + fix1: + shape: !type:PolygonShape + vertices: + - -0.40,-0.30 + - -0.30,-0.40 + - 0.40,0.30 + - 0.30,0.40 + density: 20 + mask: + - ItemMask + restitution: 0.3 + friction: 0.2 + - type: Sharp + - type: Sprite + sprite: _DEN/Objects/Weapons/Melee/harpoon.rsi + layers: + - state: spear + - state: spear1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: MeleeWeapon + wideAnimationRotation: -135 + range: 1.75 + damage: + types: + Piercing: 10 + Slash: 2 + heavyRateModifier: 1.3 + heavyRangeModifier: 1.25 + heavyDamageBaseModifier: 1.0 + heavyStaminaCost: 5 + maxTargets: 3 + angle: 20 + animation: WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: DamageOtherOnHit + damage: + types: + Piercing: 16 + - type: Item + size: Ginormous + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage + - type: SolutionContainerManager + solutions: + melee: + maxVol: 1 + - type: MeleeChemicalInjector + solution: melee + - type: RefillableSolution + solution: melee + - type: InjectableSolution + solution: melee + - type: SolutionInjectOnEmbed + transferAmount: 1 + solution: melee + - type: SolutionTransfer + maxTransferAmount: 1 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Piercing: 3 + Slash: 3 + - type: DamageOnLand + damage: + types: + Blunt: 5 + - type: UseDelay + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: spear diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index d2924ad074..ef5d6f3046 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -801,6 +801,7 @@ - MagazineBoxPistolPractice - MagazineBoxRifle - MagazineBoxRiflePractice + - MagazineBoxLightRifle - MagazineLightRifle - MagazineLightRifleEmpty - MagazinePistol @@ -835,6 +836,16 @@ - MagazineBoxSpecialPractice - SpeedLoaderSpecial - MagazinePistolSpecial + - HandheldGPSBasic + - HandheldStationMap + - MagazineNovaliteC1Empty + - MagazineNovaliteC1 + - MagazineLightRifleLowCapacityEmpty + - MagazineLightRifleLowCapacity + - SpeedLoaderRifleHeavy + - SpeedLoaderRifleHeavyEmpty + - WeaponRifleNovaliteC1 + - WeaponRifleGestio dynamicRecipes: - BolaEnergy - BoxBeanbag @@ -979,12 +990,16 @@ - MagazinePistolEmpty - MagazineRifle - MagazineRifleEmpty + - MagazineNovaliteC1 + - MagazineNovaliteC1Empty - MagazineShotgun - MagazineShotgunEmpty - MagazineShotgunSlug - ShellTranquilizer - SpeedLoaderMagnum - SpeedLoaderMagnumEmpty + - SpeedLoaderRifleHeavy + - SpeedLoaderRifleHeavyEmpty - CartridgeSpecial - MagazineBoxSpecial - type: MaterialStorage diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml index dbef5c35f7..282d9d8534 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/uncategorized.yml @@ -305,6 +305,68 @@ items: - MagazineMagnumRubber +- type: loadout + id: LoadoutSpeedLoaderRifleHeavy + category: JobsSecurityAUncategorized + cost: 2 + exclusive: true + requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityEquipment + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - SpeedLoaderRifleHeavy + +- type: loadout + id: LoadoutSpeedLoaderRifleHeavySpare + category: JobsSecurityAUncategorized + cost: 4 + exclusive: true + requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityEquipment + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - SpeedLoaderRifleHeavy + +- type: loadout + id: LoadoutSpeedLoaderRifleHeavyRubber + category: JobsSecurityAUncategorized + cost: 2 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityEquipment + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - SpeedLoaderRifleHeavyRubber + +- type: loadout + id: LoadoutSpeedLoaderRifleHeavyRubberSpare + category: JobsSecurityAUncategorized + cost: 4 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityEquipment + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - SpeedLoaderRifleHeavyRubber + # Service Weapon, limit 1 selection. # Security no longer spawns with a weapon automatically, instead they have a free choice of security appropriate Duty Pistol in their loadouts. # This category is universal to the entire security department by special request, so that players can choose their preferred Duty Pistol even if they aren't playing a security role. @@ -747,6 +809,40 @@ items: - WeaponRevolverPythonNonlethalSecurity +- type: loadout + id: LoadoutSecurityArgenti + category: JobsSecurityAUncategorized + cost: 0 + canBeHeirloom: true + guideEntry: SecurityWeapons + requirements: + - !type:CharacterDepartmentTimeRequirement + department: Security + min: 3600 # 1 hours + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityWeapons + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - WeaponRevolverArgentiSecurity + +- type: loadout + id: LoadoutSecurityArgentiNonLethal + category: JobsSecurityAUncategorized + cost: 0 + canBeHeirloom: true + guideEntry: SecurityWeapons + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutSecurityWeapons + - !type:CharacterDepartmentRequirement + departments: + - Security + items: + - WeaponRevolverArgentiNonLethalSecurity + + # Eyes - type: loadout id: LoadoutSecurityEyesHudSecurity diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 6a1d1e3773..1236a6a375 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -31,6 +31,7 @@ - MagazineMagnumIncendiary - MagazineLightRifleIncendiary - SpeedLoaderMagnumIncendiary + - SpeedLoaderRifleHeavyIncendiary # Frontier - MagazineShotgunIncendiary - MagazineBoxPistolIncendiary - MagazineBoxMagnumIncendiary @@ -83,6 +84,10 @@ - CartridgeSpecialRubber - MagazineBoxSpecialRubber - WeaponDisabler + - MagazineBoxLightRifleRubber # Frontier + - MagazineBoxMagnumRubber # Frontier + - MagazineBoxPistolRubber # Frontier + - MagazineBoxRifleRubber # Frontier - type: technology id: UraniumMunitions @@ -100,6 +105,7 @@ - MagazineMagnumUranium - MagazineLightRifleUranium - SpeedLoaderMagnumUranium + - SpeedLoaderRifleHeavyUranium # Frontier - MagazineBoxPistolUranium - MagazineBoxMagnumUranium - MagazineBoxLightRifleUranium diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle_low.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle_low.yml new file mode 100644 index 0000000000..ce6f603f4d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle_low.yml @@ -0,0 +1,87 @@ +- type: entity + id: MagazineLightRifleLowCapacityEmpty + name: "low cap magazine (.30 rifle any)" + suffix: empty + parent: MagazineLightRifle + components: + - type: BallisticAmmoProvider + proto: null + capacity: 15 + - type: Item + size: Tiny + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineLightRifleLowCapacity + name: "low cap magazine (.30 rifle)" + parent: BaseMagazineLightRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifle + capacity: 15 + - type: Item + size: Tiny + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi + layers: + - state: red + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineLightRifleLowCapacityPractice + name: "low cap magazine (.30 rifle practice)" + parent: MagazineLightRifleLowCapacity + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRiflePractice + capacity: 15 + - type: Item + size: Tiny + - type: Sprite + layers: + - state: practice + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineLightRifleLowCapacityRubber + name: "low cap magazine (.30 rifle rubber)" + parent: MagazineLightRifleLowCapacity + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleRubber + capacity: 15 + - type: Item + size: Tiny + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineLightRifleLowCapacityUranium + name: "low cap magazine (.30 rifle uranium)" + parent: MagazineLightRifleLowCapacity + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleUranium + capacity: 15 + - type: Item + size: Tiny + - type: Sprite + layers: + - state: uranium + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml new file mode 100644 index 0000000000..9550ec8836 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/novalitec1clip.yml @@ -0,0 +1,63 @@ +# Empty mags +- type: entity + parent: BaseMagazineRifle + id: MagazineNovaliteC1Empty + name: "clip (.20 rifle any)" + suffix: empty + components: + - type: Tag + tags: + - MagazineNovaliteC1 + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - CartridgeRifle + capacity: 15 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 16 + zeroVisible: false + - type: Appearance + +- type: entity + parent: MagazineNovaliteC1Empty + id: MagazineNovaliteC1 + name: "clip (.20 rifle)" + suffix: full + components: + - type: BallisticAmmoProvider + proto: CartridgeRifle + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + parent: MagazineNovaliteC1Empty + id: MagazineNovaliteC1Rubber + name: "clip (.20 rifle rubber)" + suffix: full + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleRubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml new file mode 100644 index 0000000000..38e98a0b89 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml @@ -0,0 +1,150 @@ +- type: entity + id: BaseSpeedLoaderHeavyRifle + name: "speed loader (.20 rifle)" + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - SpeedLoaderRifleHeavy + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeRifle + capacity: 8 + - type: Sprite + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + +- type: entity + id: SpeedLoaderRifleHeavy + name: "speed loader (.20 rifle)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifle + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: icon + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderRifleHeavyEmpty + name: "speed loader (.20 rifle any)" + parent: SpeedLoaderRifleHeavy + components: + - type: BallisticAmmoProvider + proto: null + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: base + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-8 + map: [ "enum.GunVisualLayers.Mag" ] + +- type: entity + id: SpeedLoaderRifleHeavyIncendiary + name: "speed loader (.20 rifle incendiary)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleIncendiary + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: base-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: base + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderRifleHeavyPractice + name: "speed loader (.20 rifle practice)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRiflePractice + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: practice-icon + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: practice-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: practice + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderRifleHeavyUranium + name: "speed loader (.20 rifle uranium)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleUranium + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: uranium-icon + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: uranium-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: uranium + steps: 9 + zeroVisible: false + - type: Appearance + +- type: entity + id: SpeedLoaderRifleHeavyRubber + name: "speed loader (.20 rifle rubber)" + parent: BaseSpeedLoaderHeavyRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeRifleRubber + - type: Icon + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + state: rubber-icon + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - state: rubber-8 + map: [ "enum.GunVisualLayers.Mag" ] + - type: MagazineVisuals + magState: rubber + steps: 9 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml new file mode 100644 index 0000000000..4ea8711a78 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -0,0 +1,45 @@ +- type: entity + name: Argenti + parent: BaseWeaponRevolver + id: WeaponRevolverArgenti + description: The civilian grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo. + components: + - type: Sprite + scale: 0.75 , 0.75 + sprite: _NF/Objects/Weapons/Guns/Revolvers/argenti.rsi + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Revolvers/argenti.rsi + - type: Gun + fireRate: 2.5 + resetOnHandSelected: false + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeRifle + - SpeedLoaderRifleHeavy + capacity: 8 + proto: CartridgeRifle + chambers: [ True, True, True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null, null, null ] + - type: StaticPrice + price: 200 + +- type: entity + parent: WeaponRevolverArgenti + id: WeaponRevolverArgentiNonlethal + suffix: Non-lethal + components: + - type: RevolverAmmoProvider + capacity: 8 + proto: CartridgeRifleRubber + chambers: [ True, True, True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null, null, null ] + +- type: entity + parent: WeaponRevolverArgenti + id: WeaponRevolverArgentiEmpty + components: + - type: RevolverAmmoProvider + capacity: 8 + chambers: [ False, False, False, False, False, False, False, False ] + ammoSlots: [ null, null, null, null, null, null, null, null ] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml new file mode 100644 index 0000000000..d1bc77b002 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -0,0 +1,281 @@ +# Frontier +- type: entity + name: Gestio + parent: BaseWeaponRifle + id: WeaponRifleGestio + description: An old prototype burst-fire NanoTrasen marksman rifle. Manufactured by Silver Industries. It never left the trials. Given its antiquity it is considered a civilian grade weapon. Uses .30 rifle ammo. + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi + - type: Gun + fireRate: 3.75 + projectileSpeed: 30 + angleDecay: 4 #in testing 3 was more balanced + angleIncrease: 6 + minAngle: 21 #generally meant to be 1 when used properly + maxAngle: 30 #generally meant to be 5 when used properly + selectedMode: Burst + availableModes: + - Burst + soundGunshot: + path: /Audio/_NF/Weapons/Guns/Gunshots/rifle.ogg + params: + volume: -5 + - type: Wieldable + - type: GunWieldBonus + minAngle: -20 + maxAngle: -25 + angleDecay: 4 #in testing 3 was more balanced + angleIncrease: -3 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifleLowCapacity + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + +- type: entity + parent: WeaponRifleGestio + id: WeaponRifleGestioRubber + suffix: Non-lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifleLowCapacityRubber + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifleRubber + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + +- type: entity + parent: WeaponRifleGestio + id: WeaponRifleGestioEmpty + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + +- type: entity + parent: BaseWeaponRifle + id: WeaponRifleNovaliteC1 + name: Novalite C1 + description: A modification to the Lecter from SW LLC, a civilian grade semi-automatic rifle with an internal magazine. Nanotrasen Representatives can not stress how compliant this rifle is. Uses .20 rifle ammo. + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi + - type: Gun + fireRate: 4 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + params: + variation: 0.125 + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineNovaliteC1 + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineNovaliteC1 + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + +- type: entity + parent: WeaponRifleNovaliteC1 + id: WeaponRifleNovaliteC1Rubber + suffix: Non-lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineNovaliteC1Rubber + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineNovaliteC1 + gun_chamber: + name: Chamber + startingItem: CartridgeRifleRubber + priority: 1 + whitelist: + tags: + - CartridgeRifle + +- type: entity + parent: WeaponRifleNovaliteC1 + id: WeaponRifleNovaliteC1Empty + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineNovaliteC1 + gun_chamber: + name: Chamber + priority: 1 + whitelist: + tags: + - CartridgeRifle + +- type: entity + id: WeaponRifleSVT + name: SVT-40 + parent: BaseWeaponRifle + description: |- + Once a weapon used in war, now a civilian hunting rifle brought to you by S.E.S.W.C., "Retreating is Considered Treason" is etched on one side. + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi + quickEquip: false + slots: + - Back + - suitStorage + - type: Gun + fireRate: 4 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + - type: ChamberMagazineAmmoProvider + soundRack: + path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifleLowCapacity + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + +- type: entity + parent: WeaponRifleSVT + id: WeaponRifleSVTEmpty + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + priority: 1 + whitelist: + tags: + - CartridgeLightRifle diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml new file mode 100644 index 0000000000..9f69e7cc35 --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml @@ -0,0 +1,110 @@ +- type: latheRecipe + abstract: true + id: BaseWeaponRecipe + category: Weapons + completetime: 2 + materials: + Steel: 300 + Plastic: 300 + +- type: latheRecipe + abstract: true + parent: BaseWeaponRecipe + id: BaseWeaponRecipeLong + completetime: 5 + +- type: latheRecipe + abstract: true + id: BaseAmmoRecipe + category: Ammo + completetime: 5 + +- type: latheRecipe + abstract: true + parent: BaseAmmoRecipe + id: BaseEmptyAmmoRecipe + completetime: 1 + +- type: latheRecipe # novalite mag empty + id: MagazineNovaliteC1Empty + parent: BaseEmptyAmmoRecipe + result: MagazineNovaliteC1Empty + materials: + Steel: 20 + +- type: latheRecipe # novalite mag + id: MagazineNovaliteC1 + parent: BaseAmmoRecipe + result: MagazineNovaliteC1 + materials: + Steel: 245 # 20 [Steel per empty mag] + 15 [bullets] * 15 [Steel per bullet] + +- type: latheRecipe # gestio mag empty + id: MagazineLightRifleLowCapacityEmpty + parent: BaseEmptyAmmoRecipe + result: MagazineLightRifleLowCapacityEmpty + materials: + Steel: 20 + +- type: latheRecipe # gestio mag + id: MagazineLightRifleLowCapacity + parent: BaseAmmoRecipe + result: MagazineLightRifleLowCapacity + materials: + Steel: 245 # 20 [Steel per empty mag] + 15 [bullets] * 15 [Steel per bullet] + +- type: latheRecipe + id: SpeedLoaderRifleHeavyEmpty + parent: BaseEmptyAmmoRecipe + result: SpeedLoaderRifleHeavyEmpty + materials: + Steel: 25 + +- type: latheRecipe + id: SpeedLoaderRifleHeavy + parent: BaseAmmoRecipe + result: SpeedLoaderRifleHeavy + materials: + Steel: 140 # 25 [Steel per empty mag] + 8 [bullets] * 15 [Steel per bullet] + +- type: latheRecipe + id: SpeedLoaderRifleHeavyPractice + parent: BaseAmmoRecipe + result: SpeedLoaderRifleHeavyPractice + materials: + Steel: 65 # 25 [Steel per empty mag] + 8 [bullets] * 5 [Steel per practice bullet] + +- type: latheRecipe + id: SpeedLoaderRifleHeavyUranium + parent: BaseAmmoRecipe + result: SpeedLoaderRifleHeavyUranium + materials: + Steel: 25 # 25 [Steel per empty mag] + Plastic: 80 # 8 [bullets] * 10 [Plastic per bullet] + Uranium: 80 # 8 [bullets] * 10 [Uranium per bullet] + +- type: latheRecipe + id: SpeedLoaderRifleHeavyIncendiary + parent: BaseAmmoRecipe + result: SpeedLoaderRifleHeavyIncendiary + materials: + Steel: 25 # 25 [Steel per empty mag] + Plastic: 120 # 8 [bullets] * 15 [Plastic per bullet] + +- type: latheRecipe + id: WeaponRifleNovaliteC1 + parent: BaseWeaponRecipeLong + result: WeaponRifleNovaliteC1 + materials: + Steel: 2500 + Plasteel: 1200 + Plastic: 1500 + +- type: latheRecipe + id: WeaponRifleGestio + parent: BaseWeaponRecipeLong + result: WeaponRifleGestio + materials: + Steel: 2500 + Plasteel: 1200 + Plastic: 1500 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml new file mode 100644 index 0000000000..ed3e6361f7 --- /dev/null +++ b/Resources/Prototypes/_NF/tags.yml @@ -0,0 +1,8 @@ +- type: Tag + id: SpeedLoaderRifleHeavy + +- type: Tag + id: WeaponRifleNovaliteC1 + +- type: Tag + id: MagazineNovaliteC1 \ No newline at end of file diff --git a/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/equipped-BACKPACK.png b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..1dc959e069 Binary files /dev/null and b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..1dc959e069 Binary files /dev/null and b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/inhand-left.png b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/inhand-left.png new file mode 100644 index 0000000000..e5e43527d3 Binary files /dev/null and b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/inhand-right.png b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/inhand-right.png new file mode 100644 index 0000000000..bc91353ecb Binary files /dev/null and b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/meta.json b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/meta.json new file mode 100644 index 0000000000..88f48787d5 --- /dev/null +++ b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "rosycup, DiscordID: 258362008557060117", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spear" + }, + { + "name": "spear1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/spear.png b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/spear.png new file mode 100644 index 0000000000..de31d4ce85 Binary files /dev/null and b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/spear.png differ diff --git a/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/spear1.png b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/spear1.png new file mode 100644 index 0000000000..37c79e3528 Binary files /dev/null and b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/spear1.png differ diff --git a/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/wielded-inhand-left.png b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..bc9b429b17 Binary files /dev/null and b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/wielded-inhand-right.png b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..718e2831e8 Binary files /dev/null and b/Resources/Textures/_DEN/Objects/Weapons/Melee/harpoon.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/bigdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/bigdisplay.png new file mode 100644 index 0000000000..53fd5ab0ff Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/bigdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/display.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/display.png new file mode 100644 index 0000000000..3d514bb89a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/display.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json new file mode 100644 index 0000000000..3b3fa34766 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "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, and from base and mag-1 in anti_material.rsi by Alekshhh", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bigdisplay" + }, + { + "name": "display" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/10x24display.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/10x24display.png new file mode 100644 index 0000000000..ce8cd57889 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/10x24display.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/bigdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/bigdisplay.png new file mode 100644 index 0000000000..4a21cf68df Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/bigdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/bigrubberdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/bigrubberdisplay.png new file mode 100644 index 0000000000..333d64cb89 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/bigrubberdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/display.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/display.png new file mode 100644 index 0000000000..a9dc8f8428 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/display.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json new file mode 100644 index 0000000000..942223151b --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_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/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi, tweaked by Alekshhh", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "10x24display" + }, + { + "name": "bigdisplay" + }, + { + "name": "bigrubberdisplay" + }, + { + "name": "display" + }, + { + "name": "practicedisplay" + }, + { + "name": "rubberdisplay" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practicedisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practicedisplay.png new file mode 100644 index 0000000000..8c950707c9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practicedisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubberdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubberdisplay.png new file mode 100644 index 0000000000..1cb2046383 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubberdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/bigdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/bigdisplay.png new file mode 100644 index 0000000000..f4f5fa5105 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/bigdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/display.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/display.png new file mode 100644 index 0000000000..a18857d48f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/display.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiarydisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiarydisplay.png new file mode 100644 index 0000000000..bd431a24bd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/incendiarydisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json new file mode 100644 index 0000000000..e110673e1d --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_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/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi, tweaked by Alekshhh.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bigdisplay" + }, + { + "name": "display" + }, + { + "name": "incendiarydisplay" + }, + { + "name": "practicedisplay" + }, + { + "name": "rubberdisplay" + }, + { + "name": "uraniumdisplay" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practicedisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practicedisplay.png new file mode 100644 index 0000000000..5b437956c8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/practicedisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubberdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubberdisplay.png new file mode 100644 index 0000000000..bea8981025 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/rubberdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uraniumdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uraniumdisplay.png new file mode 100644 index 0000000000..a41a578c08 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/uraniumdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capdisplay.png new file mode 100644 index 0000000000..3f479843a3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/capdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/display.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/display.png new file mode 100644 index 0000000000..251428a333 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/display.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiarydisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiarydisplay.png new file mode 100644 index 0000000000..f0b6b04f54 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/incendiarydisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json new file mode 100644 index 0000000000..eee4d793d9 --- /dev/null +++ b/Resources/Textures/_NF/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. capbase and cap in magnum.rsi modified from base and rubber by potato1234x (github) for ss14, tweaked by Aleshhh", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "capdisplay" + }, + { + "name": "display" + }, + { + "name": "incendiarydisplay" + }, + { + "name": "piercingdisplay" + }, + { + "name": "practicedisplay" + }, + { + "name": "rubberdisplay" + }, + { + "name": "uraniumdisplay" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercingdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercingdisplay.png new file mode 100644 index 0000000000..09afbb82da Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/piercingdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practicedisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practicedisplay.png new file mode 100644 index 0000000000..32013078a6 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/practicedisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubberdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubberdisplay.png new file mode 100644 index 0000000000..df56950fe9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/rubberdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uraniumdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uraniumdisplay.png new file mode 100644 index 0000000000..bc0fcc6b35 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/uraniumdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/display.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/display.png new file mode 100644 index 0000000000..e49af45817 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/display.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/empdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/empdisplay.png new file mode 100644 index 0000000000..d972925eeb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/empdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png new file mode 100644 index 0000000000..d4e1ca2510 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/incendiarydisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json new file mode 100644 index 0000000000..5dcfe5e39d --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.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/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi, tweaked by Alekshhh", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "display" + }, + { + "name": "empdisplay" + }, + { + "name": "incendiarydisplay" + }, + { + "name": "practicedisplay" + }, + { + "name": "rubberdisplay" + }, + { + "name": "uraniumdisplay" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practicedisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practicedisplay.png new file mode 100644 index 0000000000..b70dffcc34 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/practicedisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubberdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubberdisplay.png new file mode 100644 index 0000000000..690264fb11 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/rubberdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uraniumdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uraniumdisplay.png new file mode 100644 index 0000000000..80c321e44f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/uraniumdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/bigdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/bigdisplay.png new file mode 100644 index 0000000000..32ca9324b1 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/bigdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/bigpracticedisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/bigpracticedisplay.png new file mode 100644 index 0000000000..1499e5e814 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/bigpracticedisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/display.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/display.png new file mode 100644 index 0000000000..a11260d0a1 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/display.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiarydisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiarydisplay.png new file mode 100644 index 0000000000..b5835b087d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/incendiarydisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json new file mode 100644 index 0000000000..e73e1e4d39 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.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, tweaked by Alekshhh", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bigdisplay" + }, + { + "name": "bigpracticedisplay" + }, + { + "name": "display" + }, + { + "name": "incendiarydisplay" + }, + { + "name": "practicedisplay" + }, + { + "name": "rubberdisplay" + }, + { + "name": "uraniumdisplay" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practicedisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practicedisplay.png new file mode 100644 index 0000000000..c49a4113b1 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practicedisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubberdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubberdisplay.png new file mode 100644 index 0000000000..f79d926fa6 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubberdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uraniumdisplay.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uraniumdisplay.png new file mode 100644 index 0000000000..53131842d3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/uraniumdisplay.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/base.png new file mode 100644 index 0000000000..254b15d64e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/mag-1.png new file mode 100644 index 0000000000..6be8b7fe8e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/meta.json new file mode 100644 index 0000000000..15add7b96a --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Data_Redacted", + "states": [ + { + "name": "base" + }, + { + "name": "practice" + }, + { + "name": "red" + }, + { + "name": "rubber" + }, + { + "name": "uranium" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/practice.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/practice.png new file mode 100644 index 0000000000..a146281c86 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/practice.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/red.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/red.png new file mode 100644 index 0000000000..e8065a1cce Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/red.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/rubber.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/rubber.png new file mode 100644 index 0000000000..653430109c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/rubber.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/uranium.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/uranium.png new file mode 100644 index 0000000000..af9139f883 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_cap_mag.rsi/uranium.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png new file mode 100644 index 0000000000..956577e3a1 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png new file mode 100644 index 0000000000..8182b21f64 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png new file mode 100644 index 0000000000..e5098ddf47 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-10.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png new file mode 100644 index 0000000000..aa689c9290 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-11.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png new file mode 100644 index 0000000000..a2c008fa1c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-12.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png new file mode 100644 index 0000000000..d3a7d26fee Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-13.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png new file mode 100644 index 0000000000..06c8afc777 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-14.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png new file mode 100644 index 0000000000..9302a39279 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-15.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png new file mode 100644 index 0000000000..7081547a51 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png new file mode 100644 index 0000000000..458e8cd972 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png new file mode 100644 index 0000000000..f9767afa04 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png new file mode 100644 index 0000000000..f4f0b1df6b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png new file mode 100644 index 0000000000..dc7c130249 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png new file mode 100644 index 0000000000..bf3cfe20a8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png new file mode 100644 index 0000000000..db949f30b9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png new file mode 100644 index 0000000000..b9af911cac Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/mag-9.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json new file mode 100644 index 0000000000..62b8aa2237 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/novalite_clip.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f, https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "mag-6" + }, + { + "name": "mag-7" + }, + { + "name": "mag-8" + }, + { + "name": "mag-9" + }, + { + "name": "mag-10" + }, + { + "name": "mag-11" + }, + { + "name": "mag-12" + }, + { + "name": "mag-13" + }, + { + "name": "mag-14" + }, + { + "name": "mag-15" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/base.png new file mode 100644 index 0000000000..e23683ef8b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-1.png new file mode 100644 index 0000000000..83bd6559f9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-10.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-10.png new file mode 100644 index 0000000000..d4032831b8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-10.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-2.png new file mode 100644 index 0000000000..dd9917616e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-3.png new file mode 100644 index 0000000000..0f1d6358f5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-4.png new file mode 100644 index 0000000000..64e2302a07 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-5.png new file mode 100644 index 0000000000..0efcb9a87d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-6.png new file mode 100644 index 0000000000..70398a3e93 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-7.png new file mode 100644 index 0000000000..64c5ccb545 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-8.png new file mode 100644 index 0000000000..f3cb791208 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-9.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-9.png new file mode 100644 index 0000000000..c01e4a4ef3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/mag-9.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/meta.json new file mode 100644 index 0000000000..0d24eb61c1 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/Magazine/Turret/box_mag.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Sprites made by Stagnation for SS14 New Frontier", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "mag-6" + }, + { + "name": "mag-7" + }, + { + "name": "mag-8" + }, + { + "name": "mag-9" + }, + { + "name": "mag-10" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png new file mode 100644 index 0000000000..2c6f3fb072 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png new file mode 100644 index 0000000000..9fc7ae245b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png new file mode 100644 index 0000000000..223c9e3b4f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png new file mode 100644 index 0000000000..e8efed267b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png new file mode 100644 index 0000000000..690e4e402c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png new file mode 100644 index 0000000000..cc5db9400d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png new file mode 100644 index 0000000000..8755dd94de Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png new file mode 100644 index 0000000000..eada216221 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png new file mode 100644 index 0000000000..8af13d1cf1 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png new file mode 100644 index 0000000000..c6df5f222b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json new file mode 100644 index 0000000000..e6cc7f46fd --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json @@ -0,0 +1,149 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by @Stagnation on the frontier discord", + "states": [ + { + "name": "base" + }, + { + "name": "icon" + }, + { + "name": "base-1" + }, + { + "name": "base-2" + }, + { + "name": "base-3" + }, + { + "name": "base-4" + }, + { + "name": "base-5" + }, + { + "name": "base-6" + }, + { + "name": "base-7" + }, + { + "name": "base-8" + }, + { + "name": "practice-1" + }, + { + "name": "practice-2" + }, + { + "name": "practice-3" + }, + { + "name": "practice-4" + }, + { + "name": "practice-5" + }, + { + "name": "practice-6" + }, + { + "name": "practice-7" + }, + { + "name": "practice-8" + }, + { + "name": "practice-icon" + }, + { + "name": "rubber-1" + }, + { + "name": "rubber-2" + }, + { + "name": "rubber-3" + }, + { + "name": "rubber-4" + }, + { + "name": "rubber-5" + }, + { + "name": "rubber-6" + }, + { + "name": "rubber-7" + }, + { + "name": "rubber-8" + }, + { + "name": "rubber-icon" + }, + { + "name": "uranium-1" + }, + { + "name": "uranium-2" + }, + { + "name": "uranium-3" + }, + { + "name": "uranium-4" + }, + { + "name": "uranium-5" + }, + { + "name": "uranium-6" + }, + { + "name": "uranium-7" + }, + { + "name": "uranium-8" + }, + { + "name": "uranium-icon" + }, + { + "name": "piercing-1" + }, + { + "name": "piercing-2" + }, + { + "name": "piercing-3" + }, + { + "name": "piercing-4" + }, + { + "name": "piercing-5" + }, + { + "name": "piercing-6" + }, + { + "name": "piercing-7" + }, + { + "name": "piercing-8" + }, + { + "name": "piercing-icon" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png new file mode 100644 index 0000000000..4930f3f998 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png new file mode 100644 index 0000000000..28cbeba80b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png new file mode 100644 index 0000000000..63b7a84f90 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png new file mode 100644 index 0000000000..749eba847a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png new file mode 100644 index 0000000000..f7608dbedb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png new file mode 100644 index 0000000000..3079f5324e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png new file mode 100644 index 0000000000..0a1ec7887e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png new file mode 100644 index 0000000000..7c46da59ce Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-icon.png new file mode 100644 index 0000000000..c84f3f68fe Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png new file mode 100644 index 0000000000..e5f08f1d51 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png new file mode 100644 index 0000000000..ababaa8467 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png new file mode 100644 index 0000000000..411fc78a3f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png new file mode 100644 index 0000000000..515b63889f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png new file mode 100644 index 0000000000..cc7011a164 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png new file mode 100644 index 0000000000..2e7e7fbcda Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png new file mode 100644 index 0000000000..f8e250bd15 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png new file mode 100644 index 0000000000..d7dfe0371f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-icon.png new file mode 100644 index 0000000000..670965cafd Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png new file mode 100644 index 0000000000..5dca9d7803 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png new file mode 100644 index 0000000000..f615854e5c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png new file mode 100644 index 0000000000..44dacb9f0b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png new file mode 100644 index 0000000000..7216d9f79f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png new file mode 100644 index 0000000000..7a6d1b044d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png new file mode 100644 index 0000000000..65a9e355e0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png new file mode 100644 index 0000000000..18a0b63c5d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png new file mode 100644 index 0000000000..a5517503eb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-icon.png new file mode 100644 index 0000000000..d77bd3998b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png new file mode 100644 index 0000000000..084eb43a8c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png new file mode 100644 index 0000000000..1c6069bcbb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png new file mode 100644 index 0000000000..a47505934c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png new file mode 100644 index 0000000000..b5b31a8e2b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png new file mode 100644 index 0000000000..4cc1339682 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png new file mode 100644 index 0000000000..8e6e5ba62e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png new file mode 100644 index 0000000000..5378e8179f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png new file mode 100644 index 0000000000..1366878720 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-icon.png new file mode 100644 index 0000000000..c8511271a9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/icon.png new file mode 100644 index 0000000000..c6312eb193 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json new file mode 100644 index 0000000000..c29f3bd3e2 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json new file mode 100644 index 0000000000..16b3da4e21 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi", + "states": [ + { + "name": "practice-icon" + }, + { + "name": "rubber-icon" + }, + { + "name": "uranium-icon" + }, + { + "name": "piercing-icon" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-icon.png new file mode 100644 index 0000000000..eb206ca5cb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/piercing-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-icon.png new file mode 100644 index 0000000000..52e3e24477 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/practice-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-icon.png new file mode 100644 index 0000000000..c8cc0f50a5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/rubber-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-icon.png new file mode 100644 index 0000000000..3997f05ca9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/uranium-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/icon.png new file mode 100644 index 0000000000..d81d3830bb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json new file mode 100644 index 0000000000..8f391b8d35 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from and modified https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "icon" + }, + { + "name": "practice-icon" + }, + { + "name": "rubber-icon" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-icon.png new file mode 100644 index 0000000000..5da27bd87c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-icon.png new file mode 100644 index 0000000000..8df55ead87 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png new file mode 100644 index 0000000000..5da259a423 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png new file mode 100644 index 0000000000..d5c2e5102f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png new file mode 100644 index 0000000000..5da259a423 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png new file mode 100644 index 0000000000..57fb0c7c59 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png new file mode 100644 index 0000000000..97f36840ff Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json new file mode 100644 index 0000000000..b261898e2f --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by @Stagnation on frontier discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/base.png new file mode 100644 index 0000000000..6fe18f245a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/bolt-open.png new file mode 100644 index 0000000000..261f484f0a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..5d0e0fb6ca Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..5d0e0fb6ca Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/icon.png new file mode 100644 index 0000000000..0b5b1cd0d9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-left.png new file mode 100644 index 0000000000..5c1b05b362 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-right.png new file mode 100644 index 0000000000..335115ae8e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/mag-0.png new file mode 100644 index 0000000000..3d7e94ddda Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/mag-0.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/meta.json new file mode 100644 index 0000000000..6526cece8c --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Data_Redacted)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..cc2fb20564 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..9496a36c74 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/gestio.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png new file mode 100644 index 0000000000..947d0a89b4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png new file mode 100644 index 0000000000..9a8d405132 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..aff01673b1 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png new file mode 100644 index 0000000000..0e1eb2312b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png new file mode 100644 index 0000000000..9054ef072f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png new file mode 100644 index 0000000000..e0bb34e6c7 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png new file mode 100644 index 0000000000..8aeb1b4d9d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/mag-0.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json new file mode 100644 index 0000000000..70e934ec94 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/meta.json @@ -0,0 +1,43 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111 | wielded-inhand-right and wielded-inhand-left sprites made by Stagnation (discord) and those two sprites specifically are under CC-BY-NC-SA-3.0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..1a20b9c047 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..0dd4640d40 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/novalitec1.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/base.png new file mode 100644 index 0000000000..d9ae07cc6a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/bolt-open.png new file mode 100644 index 0000000000..08f7f26f9d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..628d7a1f97 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..c282e88f52 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/icon.png new file mode 100644 index 0000000000..d9ae07cc6a Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png new file mode 100644 index 0000000000..56b8bda3f3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-right.png new file mode 100644 index 0000000000..c962a6ddb7 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/mag-0.png new file mode 100644 index 0000000000..2fcdfbe224 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/mag-0.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/meta.json new file mode 100644 index 0000000000..0257e70364 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..4151984eec Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..ec31f01af4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/wielded-inhand-right.png differ