diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index 7c6e52d44fb..f1138951c6a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -9,6 +9,7 @@ MagazineBoxLightRiflePractice: 15 MagazineBoxLightRifleRubber: 15 WeaponShotgunDoubleBarreled: 15 + WhitePhosphorusGrenade: 3 # Add for Frontier BoxShotgunSlug: 15 BoxLethalshot: 15 BoxBeanbag: 15 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index a45924fd4c5..1cbfcba9a22 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -39,15 +39,50 @@ price: 500 - type: entity - name: Kardashev-Mosin + name: Kardashev-Mosin # Mosin Rework was done for Frontier parent: BaseWeaponSniper id: WeaponSniperMosin description: A civilian grade weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. components: - type: Sprite sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi + state: base + - type: AmmoCounter + - type: Gun + useKey: false + fireRate: 1.25 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/sniper.ogg + - type: BallisticAmmoProvider + capacity: 5 + proto: CartridgeLightRifle + whitelist: + tags: + - CartridgeLightRifle + - type: MeleeWeapon + attackRate: .85 + damage: + types: + Piercing: 16 + Slash: 5 + angle: 0 + wideAnimationRotation: -135 + - type: DisarmMalus + animation: WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Sharp + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage + sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi - type: StaticPrice - price: 210 + price: 500 - type: entity name: Hristov diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index fa67a4a6923..1f7aa6d322b 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -6,6 +6,8 @@ WeaponRevolverArgentiNonlethal: 10 WeaponShotgunDoubleBarreledRubber: 10 WeaponFlareGun: 20 + WeaponPistolValentineNonLethal: 4 + WeaponSniperSVTNonlethal: 4 BoxDonkSoftBox: 10 BoxCartridgeCap: 10 MagazineBoxPistolRubber: 10 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml index 4c0e45a98a3..cacc1eb5b68 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/mobs.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity name: Arcadia Industries Shredder Spawner id: SpawnMobArcIndShredder parent: MarkerBase diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml new file mode 100644 index 00000000000..d2f38fa7bd1 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml @@ -0,0 +1,55 @@ +- type: entity + id: MagazineSVT + name: "10 rounder SVT Magazine (.30 rifle)" + parent: BaseMagazineLightRifle + components: + - type: Tag + tags: + - MagazineLightRifle + - type: BallisticAmmoProvider + proto: CartridgeLightRifle + capacity: 10 + - type: Sprite + sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi + +- type: entity + id: MagazineSVTUranium + name: "10 rounder SVT magazine (.30 rifle uranium)" + parent: MagazineSVT + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleUranium + - type: Sprite + layers: + - state: uranium + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineSVTRubber + name: "10 Rounder SVT magazine (.30 rifle rubber)" + parent: MagazineSVT + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifleRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazineSVTPractice + name: "10 rounder SVT magazine (.30 rifle practice)" + parent: MagazineSVT + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRiflePractice + - type: Sprite + layers: + - state: practice + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml index 0955471580d..68973e7986c 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml @@ -36,3 +36,21 @@ - type: SpentAmmoVisuals state: emp suffix: false + +- type: entity + parent: SmokeGrenade + id: WhitePhosphorusGrenade + name: M34 'Willie Pete' Grenade + description: A collaboration of Kesco and Sam's Weaponary Emporium, brings you this old but faithful phosphorous smoke-based incendiary grenade. + components: + - type: Sprite + sprite: _NF/Objects/Weapons/M34.rsi + - type: SmokeOnTrigger + duration: 5 + spreadAmount: 10 + solution: + reagents: + - ReagentId: Phlogiston + Quantity: 10 + - ReagentId: Napalm + Quantity: 10 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml new file mode 100644 index 00000000000..332fff637fb --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml @@ -0,0 +1,34 @@ +- type: entity + name: Valentine + parent: BaseWeaponPistol + id: WeaponPistolValentine + description: An old and bloodstain, with a light blue S.T.A.R.S. medallion on the wooden grip. It seems to use .35 Auto. + components: + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Pistols/Valentine.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: _NF/Objects/Weapons/Guns/Pistols/Valentine.rsi + - type: AmmoCounter + - type: Gun + fireRate: 3 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + +- type: entity + name: Valentine + suffix: Non-lethal + parent: WeaponPistolValentine + id: WeaponPistolValentineNonLethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolRubber diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml index 46a5c2a1c8f..0f03f958bbe 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml @@ -5,9 +5,9 @@ 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 - sprite: _NF/Objects/Weapons/Argenti-Revolver.rsi + sprite: _NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi - type: Clothing - sprite: _NF/Objects/Weapons/Argenti-Revolver.rsi + sprite: _NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi - type: Gun fireRate: 2 resetOnHandSelected: false diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml index c7518a112b3..11f8d4794b1 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml @@ -8,5 +8,89 @@ whitelist: tags: - CartridgeLightRifle - capacity: 10 + capacity: 5 proto: CartridgeLightRifleRubber + +- type: entity + id: WeaponSniperSVT + name: SVT-40 + parent: BaseWeaponRifle + description: Magazine-fed rifle That uses .30 ammunition. "Retreating is considered Treason" is carved in the wooden stock of the gun. + 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: AmmoCounter + - type: Gun + fireRate: 3 + 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: MagazineSVT + 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: Appearance + - type: StaticPrice + price: 1000 + +- type: entity + parent: WeaponSniperSVT + id: WeaponSniperSVTNonlethal + suffix: Non-lethal + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineSVTRubber + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifleRubber + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + + diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml index d9cc13c2299..32206fa5b28 100644 --- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml @@ -24,3 +24,16 @@ FoodMealFries: 1 FoodOnionRings: 1 OrganAnimalHeart: 1 + +- type: microwaveMealRecipe + id: ChickenNuggets Recipe + name: McNuggets recipe + result: FoodBoxNugget + time: 15 + reagents: + Cornoil: 10 + Flour: 10 + solids: + FoodEgg: 3 + FoodMeatChickenCutlet: 2 + MaterialCardboard1: 1 diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png new file mode 100644 index 00000000000..795c69b9d30 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-1.png new file mode 100644 index 00000000000..73de7220736 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-1.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json new file mode 100644 index 00000000000..17803dfbc77 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "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": "practice" + }, + { + "name": "red" + }, + { + "name": "rubber" + }, + { + "name": "uranium" + }, + { + "name": "mag-1" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png new file mode 100644 index 00000000000..795c69b9d30 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png new file mode 100644 index 00000000000..795c69b9d30 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png new file mode 100644 index 00000000000..6e838bd805c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png new file mode 100644 index 00000000000..a17efb0b0cb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/base.png new file mode 100644 index 00000000000..4eb8087206f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/bolt-open.png new file mode 100644 index 00000000000..6be642fef6f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/bolt-open.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/equipped-BELT.png new file mode 100644 index 00000000000..af76d78defc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/icon.png new file mode 100644 index 00000000000..4eb8087206f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/inhand-left.png new file mode 100644 index 00000000000..a67e865350e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/inhand-right.png new file mode 100644 index 00000000000..bb94093fd6c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/mag-0.png new file mode 100644 index 00000000000..332593944fb Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/mag-0.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/meta.json new file mode 100644 index 00000000000..398957a77be --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Pistols/Valentine.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-3.0", + "copyright": "Made by VividPups", + "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-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/bolt-open.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/bolt-open.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/bolt-open.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-BELT.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/equipped-BELT.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/icon.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/icon.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/Argenti-Revolver.rsi/meta.json 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 00000000000..55a312cfe42 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 00000000000..7c4f0962ba0 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 00000000000..3de79a0dad9 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/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/icon.png new file mode 100644 index 00000000000..55a312cfe42 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 00000000000..8481ebeba26 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 00000000000..abb15caff4e 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 00000000000..bb873aa2611 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 00000000000..12a95021c63 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "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", + "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 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/M34.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/M34.rsi/icon.png new file mode 100644 index 00000000000..d13ab9745d4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/M34.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Weapons/M34.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/M34.rsi/meta.json new file mode 100644 index 00000000000..60b919588c3 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/M34.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/524270a5bcc1e0ea844b98c5a204986cec9721ac/icons/obj/weapons/grenade.dmi and modified by deltanedas (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "primed" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Weapons/M34.rsi/primed.png b/Resources/Textures/_NF/Objects/Weapons/M34.rsi/primed.png new file mode 100644 index 00000000000..2455be0117e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/M34.rsi/primed.png differ