New Guns and Mosin Rework and Sawn PKA fix

Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml

@@ -8,6 +8,7 @@
     MagazineBoxLightRiflePractice: 15
     MagazineBoxLightRifleRubber: 15
     WeaponShotgunDoubleBarreled: 15
+    WhitePhosphorusGrenade: 3  # Add for Frontier 
     BoxShotgunSlug: 15
     BoxLethalshot: 15
     BoxBeanbag: 15

Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml

@@ -1,6 +1,7 @@
 - type: vendingMachineInventory
   id: JaniDrobeInventory
   startingInventory:
+    SpaceCleanerGrenade: 10 # For you Slips, Frontier
     ClothingBackpackMessengerJanitor: 2 # Frontier
     ClothingUniformJumpsuitJanitor: 2
     ClothingUniformJumpskirtJanitor: 2

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -38,15 +38,50 @@
     price: 500
 
 - type: entity
-  name: Kardashev-Mosin
+  name: Kardashev-Mosin  # Mosin Rework was done for Frontier 
   parent: BaseWeaponSniper
   id: WeaponSniperMosin
   description: A 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

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

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

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"]

Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/explosives.yml

@@ -36,3 +36,37 @@
   - 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
+
+- type: entity
+  parent: SmokeGrenade
+  id: SpaceCleanerGrenade
+  name: SpaceCleaner Grenade
+  description: "A Jani's best friend"
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/CleanNade.rsi
+  - type: SmokeOnTrigger
+    duration: 5
+    spreadAmount: 20
+    solution:
+      reagents:
+      - ReagentId: SpaceCleaner
+        Quantity: 50

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/pistols.yml

@@ -0,0 +1,35 @@
+- 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 Seem to be chamber in .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
+  description: An old and bloodstain, with a light blue S.T.A.R.S. medallion on the wooden grip. It Seem to be chamber in .35 Auto
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolRubber

Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml

@@ -5,9 +5,9 @@
   description: 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

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 chamber in .30 Cal. "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
+
+

Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml

@@ -12,3 +12,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

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"
+        }
+    ]
+}

Resources/Textures/_NF/Objects/Weapons/CleanNade.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"
+    }
+  ]
+}