From 8ec96713f75dc1918be269e3b8e33707cc26e90f Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sat, 25 May 2024 07:58:20 -0500
Subject: [PATCH 01/24] add a new weapon to the game

svt new gun
---
 .../Entities/Structures/Machines/lathe.yml    |   2 +
 .../Fills/Items/weapon_cases_expedition.yml   |  13 +++
 .../Fills/Items/weapon_cases_shuttle_guns.yml |  23 ++++++
 .../_NF/Catalog/Fills/Lockers/guns.yml        |  12 +++
 .../Random/dungeon_rng_items_armory.yml       |   1 +
 .../Weapons/Ammunition/Cartridges/Rifles.yml  |  74 ++++++++++++++++++
 .../Objects/Weapons/Guns/Guns/snipers.yml     |  57 ++++++++++++++
 .../Prototypes/_NF/Recipes/Lathes/ammo.yml    |  17 ++++
 .../Weapons/Ammunition/svt40.rsi/base.png     | Bin 0 -> 258 bytes
 .../Weapons/Ammunition/svt40.rsi/mag-0.png    | Bin 0 -> 153 bytes
 .../Weapons/Ammunition/svt40.rsi/mag-1.png    | Bin 0 -> 157 bytes
 .../Weapons/Ammunition/svt40.rsi/meta.json    |  29 +++++++
 .../Weapons/Ammunition/svt40.rsi/practice.png | Bin 0 -> 258 bytes
 .../Weapons/Ammunition/svt40.rsi/red.png      | Bin 0 -> 258 bytes
 .../Weapons/Ammunition/svt40.rsi/rubber.png   | Bin 0 -> 257 bytes
 .../Weapons/Ammunition/svt40.rsi/uranium.png  | Bin 0 -> 258 bytes
 .../Guns/Rifles/svt40.rsi/Inhand-left.png     | Bin 0 -> 583 bytes
 .../Weapons/Guns/Rifles/svt40.rsi/base.png    | Bin 0 -> 633 bytes
 .../Guns/Rifles/svt40.rsi/bolt-open.png       | Bin 0 -> 622 bytes
 .../Rifles/svt40.rsi/equipped-BACKPACK.png    | Bin 0 -> 907 bytes
 .../Weapons/Guns/Rifles/svt40.rsi/icon.png    | Bin 0 -> 633 bytes
 .../Guns/Rifles/svt40.rsi/inhand-right.png    | Bin 0 -> 631 bytes
 .../Weapons/Guns/Rifles/svt40.rsi/mag-0.png   | Bin 0 -> 153 bytes
 .../Weapons/Guns/Rifles/svt40.rsi/meta.json   |  35 +++++++++
 24 files changed, 263 insertions(+)
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml
 create mode 100644 Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-0.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-1.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/Inhand-left.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/base.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/bolt-open.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-BACKPACK.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/mag-0.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index cd0ba89b3b5..c94b02a1051 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -883,6 +883,8 @@
         - ShellTranquilizer
         - SpeedLoaderMagnum
         - SpeedLoaderMagnumEmpty
+        - MagazineSVT #frontier by VividPups
+        - MagazineSVTempty #frontier VividPups
     - type: MaterialStorage
       whitelist:
         tags:
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
index e51ebec6996..f7fcd156feb 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
@@ -219,6 +219,19 @@
     - id: MagazineBoxMagnum
       amount: 2
 
+- type: entity #Made By VividPups
+  parent: WeaponCaseLong
+  id: WeaponCaseLongSVTExpedition
+  suffix: Dungeon, SVT
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSVT
+      amount: 1
+    - id: MagazineSVT
+      amount: 2
+
 # RPG
 - type: entity
   parent: WeaponCaseLong
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
index 5cbddced502..5b169c45a42 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
@@ -167,6 +167,29 @@
       - id: WeaponShotgunSawnNonlethal
       - id: BoxBeanbag
 
+# WeaponSVT
+- type: entity  #Made By VividPups
+  parent: WeaponCaseLongShuttle
+  id: ShuttleWeaponSVT
+  nospawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponSVT
+      - id: MagazineSVT
+
+# WeaponSVTNonlethal # Frontier - TODO: Restore this later
+# - type: entity
+  # parent: WeaponCaseLongShuttle
+  # id: ShuttleWeaponSVTNonlethal
+  # noSpawn: true
+  # components:
+  # - type: StorageFill
+    # contents:
+      # - id: N/A
+      # - id: MagazineSVTRubber
+
+
 # T3:
 # WeaponEnergyGun
 - type: entity
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml
index b3eb7f240a0..2750d3db32d 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml
@@ -117,6 +117,12 @@
       prob: 0.1
 #    - id: ShuttleKardashev-MosinNonlethal # Frontier - TODO: Restore rubber
 #      orGroup: T1-2
+#      prob: 0.1
+    - id: ShuttleWeaponSVT
+      orGroup: T1-2
+      prob: 0.1
+#    - id: ShuttleWeaponSVTNonlethal # Frontier - TODO: Restore rubber
+#      orGroup: T1-2
 #      prob: 0.1
     # T2-1
     - id: ShuttleWeaponPistolMk58
@@ -142,6 +148,12 @@
       prob: 0.1
 #    - id: ShuttleWeaponShotgunSawnNonlethal # Frontier - TODO: Restore rubber
 #      orGroup: T2-1
+#      prob: 0.1
+    - id: ShuttleWeaponSVT
+      orGroup: T2-1
+      prob: 0.1
+#    - id: ShuttleWeaponSVTNonlethal # Frontier - TODO: Restore rubber
+#      orGroup: T2-1
 #      prob: 0.1
     # T2 Melee
     - id: SpearReinforced
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_rng_items_armory.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_rng_items_armory.yml
index 48aef9e8cc0..57ae7328207 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_rng_items_armory.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_rng_items_armory.yml
@@ -106,6 +106,7 @@
     - WeaponCaseShortLaserGunExpedition
     - WeaponCaseLongKammererExpedition
     - WeaponCaseLongRepeaterExpedition
+    - WeaponCaseLongSVTExpedition
     #- WeaponCaseShortSvalinnExpedition
     chance: 0.7
     offset: 0.0
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml
new file mode 100644
index 00000000000..4e9a214ae03
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml
@@ -0,0 +1,74 @@
+- 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: MagazineSVTempty
+  name: "10 rounder SVT magazine (.30 rifle any)"
+  suffix: empty
+  parent: MagazineSVT
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+
+- 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  to be added back when Rubber rounds are added. 
+ # 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"]
+
+- type: entity
+  id: MagazineSVTIncendiary 
+  name: "10 rounder SVT magazine (.30 rifle incendiary)"
+  parent: MagazineSVT
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleIncendiary
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi
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 128b1c91a6a..1b130f1a00a 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
@@ -9,3 +9,60 @@
       # - CartridgeLightRifle
     # capacity: 10
     # proto: CartridgeLightRifleRubber
+
+- type: entity
+  id: WeaponSVT
+  name: SVT-40
+  parent: BaseWeaponRifle
+  description: Once a weapon used in war, now a civilian hunting rifle, Retreating is Consider Treason is etch into the 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: 3.5
+    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
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml b/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml
new file mode 100644
index 00000000000..74a19d2f069
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml
@@ -0,0 +1,17 @@
+# these were added By VividPups for the AMMOfab for The SVT
+
+- type: latheRecipe
+  id: MagazineSVT
+  result: MagazineSVT
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
+
+- type: latheRecipe
+  id: MagazineSVTempty
+  result: MagazineSVTempty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 25
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 0000000000000000000000000000000000000000..795c69b9d30270b7fbed857bd845af01e654b466
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}dpunnLn2z=
zUUKweb`)rRxW7v6nM9<EO+%hdm$)JKbj!YUfs?K!Q#dPFO)tOS*>O^f@gzsnmF<}t
zyW&I5c{P_#3Hp_6`0T^cKX*cz4t)D=6>usgzS|(6;?+F<Z&}BA3O2v1-&0<>#4fAh
z_f4Mc^5S6CTgwirPH0g%bX$B;wdIUJzudao(wAAA1E1D@KA8}Bi;cC#$FRk570==0
z7v}`lC!`lvKfn5z`SMB0*W2Yn7P8#U{;&NLXz#!6`XTduRwi^D*bDRrgQu&X%Q~lo
FCIDsPY@h%D

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb873aa26119570899abb4f2f1fe20655d90a206
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}!JaOTArY-_
zFK*;Lpupo2s9x-nsWjn6y@ZNUPo}bqu)OU5(!84Vn>-8*4ikbu&gs&&=2QJ+y?uLI
z*<9^IqWh!IA6k69ovTN6O2NtEyQl9lFjT*ubX{<F-TuUSpz#czu6{1-oD!M<H7PWs

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..73de722073667d6c96aa9ddd26ef0ffd86449ca3
GIT binary patch
literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R};hrvzArY;~
z2@<S}6GVEN0u8v_tP+;E6mRSORWA`8=`XZ;)}l=I54RjAGEZ=fpLV#O4G6s5IYmCI
u3ZFMN00JM|qRClhy<n{eH9+Q6FfuHj&CNW)W~MXH3I<PCKbLh*2~7as$}PtL

literal 0
HcmV?d00001

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..40eaed0198f
--- /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 0000000000000000000000000000000000000000..795c69b9d30270b7fbed857bd845af01e654b466
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}dpunnLn2z=
zUUKweb`)rRxW7v6nM9<EO+%hdm$)JKbj!YUfs?K!Q#dPFO)tOS*>O^f@gzsnmF<}t
zyW&I5c{P_#3Hp_6`0T^cKX*cz4t)D=6>usgzS|(6;?+F<Z&}BA3O2v1-&0<>#4fAh
z_f4Mc^5S6CTgwirPH0g%bX$B;wdIUJzudao(wAAA1E1D@KA8}Bi;cC#$FRk570==0
z7v}`lC!`lvKfn5z`SMB0*W2Yn7P8#U{;&NLXz#!6`XTduRwi^D*bDRrgQu&X%Q~lo
FCIDsPY@h%D

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..795c69b9d30270b7fbed857bd845af01e654b466
GIT binary patch
literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}dpunnLn2z=
zUUKweb`)rRxW7v6nM9<EO+%hdm$)JKbj!YUfs?K!Q#dPFO)tOS*>O^f@gzsnmF<}t
zyW&I5c{P_#3Hp_6`0T^cKX*cz4t)D=6>usgzS|(6;?+F<Z&}BA3O2v1-&0<>#4fAh
z_f4Mc^5S6CTgwirPH0g%bX$B;wdIUJzudao(wAAA1E1D@KA8}Bi;cC#$FRk570==0
z7v}`lC!`lvKfn5z`SMB0*W2Yn7P8#U{;&NLXz#!6`XTduRwi^D*bDRrgQu&X%Q~lo
FCIDsPY@h%D

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..6e838bd805c1b7ce7943b62226ee7a49899f771d
GIT binary patch
literal 257
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}yFFbTLn2z=
zUUKwuHWX=n_+M@PF22AR2kS!JyX|~3yQIVekMwR?8dAW$w$}1^<F>_ON7Ol<)=fU3
zYWZD_CCE#2>6i0KCm!B@Ep5)paQl9?zvg0R-9rwE`(k9?Ugecc2wfgfzw7tQjM57X
z;Wo){^Ydo8glp?Hs;CJ5t6KQ8v**+8XXTSO&OYncd-h%Py+tLWtSvr<Esj}V{(eh2
zx4?eG_k#Z~u1}YozL@*oz3U6uR3p}1tDiJK$m`{vTBfL{UZ-k&H9&r1@O1TaS?83{
F1OP(NZ9)J5

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..a17efb0b0cba6d6c4cc6b6ce399ba424725a1c34
GIT binary patch
literal 258
zcmV+d0sa1oP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#yh%hsR9J=W(y>YdK@^4I|ITjW6A1Q-ja}0CVp{lYL3|7wT_l1K*v3lD&N(SG
zRx5}r2y(w>;4*XWonauQlu}B6ET$YjJw9=j0I>bB4wN$ctVI|o+;#V(z1k@Q^k<vz
zZ|=s+lLk1vJ;K`G+*FCSX>bW7A&Kz&3-vsYW|W^cKVL3fZMLesY~L6xO531-kST^R
zNR?rD{W53LAK1IRxbn^Qii6pl$EP)@LJ7Ku^{?colv4WNcJg*jCVI~jN&o-=07*qo
IM6N<$g7778ZU6uP

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..8481ebeba260a6f2ed974888d278945113f80d79
GIT binary patch
literal 583
zcmV-N0=WH&P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%0ZBwbRCt{2+Pi83K@<kyf0Gnxv=2lQa4+6vyI5G;iau`M!YE$WBH$AkMc0U)
z6mew{FQd+^j-C$$o1K|67m=MGV2m-w7-Nhv#@Lmk)km5KnT;t%rCetHT~?ziCP3;6
z1uAYHG@BruNJ#DHNk$_Z3<Yh%9}h8|1MR^;Mf2CGUaPKG`Qz<1IR8p^m~>^wI%}}?
zT9q8r3O}!;cqQA_wUadeCA`EQ5x27NdL1;Hon!hU$F%Ssd&c+3N4M`O8K-i=DsHUg
zAyjrOs<`<`w!89~4T?7&40L+EUHuUNqh71hkJrNImlxUil>ZOt_C2H9_Y7JZu#@Jl
z6*U~wqGqFoxRnL|3)geo@8cE=>*EkU7Af04_L%5v+i!wnI`>h0AUp|fv2b6-GsYNW
zj4{R-V@wPBTt=MW&`VJQfYqhsO-{nT2_OJSCla991Qj<Q(U78b@U?h*Fu-)agg+ie
zF&>$u9bE!ItIJ7UP$`!Yx=a<ld<YuR;<BRR=4m({VdyWy*XdiwE}9R}qVT{qWC<cU
zF5&z@*u}F1=Vk*$Y{?IV3HL93YfH!mh`9dzz=_!a5mNI5N@q?m8z7{ROOa)#AUi*x
zG#?<C4G=Q(7tlICuqzuNBFGPDpCLG<2s>%g&E*FUO+t95+--i~Cbs;k?zV7t0e>}t
V?6{Kw45a`7002ovPDHLkV1h4h{~!PW

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..55a312cfe42cacf5b4c0531eb129b623540073be
GIT binary patch
literal 633
zcmV-<0*3vGP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%Gf6~2R9J<@mrG9*VHky<nYI)GO<EPBu~=zoDHnw_ny}C)2{D003?}aQr@HbI
z5;q2sgiC8tQ4}blrJWlyud7y2TBnyOXE`&O=X~dU-<ugYCne)aITv6uo|KNmPntMK
z_>d$9Z~p^VI{{C`;?mQ5f%WWXr4zhU8crnY#_p9PxidD5q1yngZEn=$cu|2oUwGyU
z4&ZAy{6TUE`*4@Y$SAMhzWZ;&?W{o3u_%{&yZK%)S;=Kxy}Ml%2tc3D$F6R<hC}NK
z2tYa(rLRlnz=Y+DdpLl<6?i%p1>j0JOukTLIa7bbouy_gsKTR>LALV;ykBb^4$V~{
zGouOex=Hv_h@HbcAG2FcSJ`L+)rr=vw&wsfG6&?v`~v;`Aylml2n9puLnhaf6SoP-
z^z<}8_79N#J!}Ou+aYi<)CwDLw+Ccme3Fu0=9*&A74%cm9gZxUPr2s1cWvP2jfemY
z^eFiJKFXG$39M#Yi@u_|b0C#U%60V^098@g(@c&fz-l(rwh>-$56D&P2-C7LEt{7s
zn-mRLX(POz1dzvxTf(2C=gGHR%>)+bW-%OL=Ha6X+>@1`^-@`!n`Qs&1_j;X&3dlZ
zbDkKG`Kfyp@;j&~yjuI>DI88$AW!d4u=ndH;7~LiFS%7!Rwqv;$I(hff&o88O=Bs$
zee%Ai24re%1To44aWG7WrLAv&8}w8HNGcMMyU~HlvFq6HQ?-H`*E_0?uDqh(y`0|_
Toh@8h00000NkvXXu0mjfn^7C`

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..7c4f0962ba0fac7d189b32f02f695b7262c0a1c5
GIT binary patch
literal 622
zcmV-!0+IcRP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%C`m*?R9J<@m)lR%U>L@K-GL#X2~%S<4ksHM<Dig56O1$Nf|x*}Mz8r#^~ys?
zyu(Q{U~{M#l(EUqZE0U`+%lBS9op@=Y11~}?|I+n{l26yB!z=v8455Q49mdb%_fEj
zpOMh??SJ5oLBK<Spp1=QU?=@q83gZ)W<#O2ZMVyj+*z1Ktr-9$_jX%y?1(^KzIfgd
z9KdNcJQkk8I61;MH_w}Q@BiCjD<hC-z|ZCJQN9;65}9;IYg-k808BWY9M$xW;n05v
z1RxslGcn>IufbNTb2xyjA9yt22jGg=ORi94E7gAB&Qq@uG~j;UGzYmnACld}p~nbT
z=R=aKX?QP9a(I&CV|u^mD0}IE0E{}U*+5+zh{qlP;C3qHOTYT6z8eDq5PKLGInH7z
zP&G{47bp8+1D(x)EG;fmu2s0EsEl}Alxrp>-QZKEzv??OaPx*w0H($ioGvF7U8o9d
zr!$reLECd65(&$7$0+~~MIl?&I2AYB>6B$hc)J;pt9l7dH_&v0SBX7}DkLm~x03)8
z58aYK_cUECRm%=+tgoS(!s?^Pb+|2+pSP%NtgmtWb(ca-=j~3W)pxcSkY_9RDC7=t
zpzu2R#a1|+jX<8>Un2YS2VhcEO*^>_)vJ>y%ZpUYMLcd7#cGw!^g;7`TMfv{!W^Pj
z@L-~9CY$@;{x)c<1dxc&CwKi*^=&t>-={_dEuIfl1FgKS-;5gA*?6!8X8-^I07*qo
IM6N<$g4n|thX4Qo

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..3de79a0dad9068cbba33174486a901e4827a9ee8
GIT binary patch
literal 907
zcmV;619bd}P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&MM*?KRCt{2n$JrcQ4q(!8=F9)(L<UL+**GS2vl<_d#i+a$UzjO{V#IqsYg#9
zJ$dQ9*FsC7P{D&mdMct9YpD=w)%pV^lp3<)TKDx3UPxkA-|o(?Zu>r`{MgLS`@WgU
zOJ)FxL?R*N+0z*oq<e&@4EY7Mz~lm)8-J)xw(#cdJB89-;39w;QURu>rr6J&9ZHiO
zp^P$80oK>o@nCR}(&QE9Cr4S{+$OU}CO}D3*^H_{-}y#mvLlOo=K$(LP}n0AAQ6iI
z0G2n(q(!O|uRm`Bpb>#Y0IJ;(Av<2gUO0_cU(ZPFxfWnyI@ehI%hi3)cOL*AC3_l=
z-HPu@fab-|t!(?U_-0;w*i-;_A~+VHdGXv4KiK-T1OWK*<9o|Jor>T{fceQ$W?Y&u
zE=@dtztQ4Iu~_u99voLqtnHpOo^$a}Yq}$Qwgs5Y53|#nj?<dnap!-nEje;TlvF%~
z#}AXx61XCCNmFf$Z%crZrm~7|prRX=Ilo$gr|Gb~QC667hIoIb@tT_ybd&;qReLKw
zZtW|~X#E<zjUs$&6tXIt$Yt)<NzhM}NEBTrjjccm004(IvtuE&OCSZP9+c4+_U-g7
zkw_#Gi9{liNd9;H=>1b*$4}e82JgBEp89v!7tirD0{%5@3E=hg2Nj<AnNFtzkpg!7
zv=spZ7e}D_H<pr;rn1@mFav;zT!sx?90`9m@HJpIKg<%b2r9Y(E`l9|1sEF|VSC{;
zvg5@YuXWO*a>D%NDC_Nx0jM`?=2o^9K0h!vG$Q1Ktq5rD%Uj`O7o4y#onw)%y8G>2
zArU`0q$$8#)O=jVON`5UXT)u5URVI$kLUgQcKFWscE>#L)A4(?x8|GuYo8ym!d3*V
z?VjMcdbKCThb639=9KWoTivI9e&8nViC(BBz~cQ$%lGg1_H^74YAU*MZHlGhA*A9-
zR1bbL(pLRMF2f30f2#X+h<w9Pc8^<(k{a|FQGbO~K#4?A$g1o~x_;=m?IDTlC}dTp
zM50313KzjHvn~S1ufvWL?92}cMSzw7JFJ;V#Y2G^Md9-UHx)wR2<QtlR1eDTJ@WxM
hKOm7vBoc{4guk)3IT1Lig~0#-002ovPDHLkV1gm6tUUk#

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..55a312cfe42cacf5b4c0531eb129b623540073be
GIT binary patch
literal 633
zcmV-<0*3vGP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%Gf6~2R9J<@mrG9*VHky<nYI)GO<EPBu~=zoDHnw_ny}C)2{D003?}aQr@HbI
z5;q2sgiC8tQ4}blrJWlyud7y2TBnyOXE`&O=X~dU-<ugYCne)aITv6uo|KNmPntMK
z_>d$9Z~p^VI{{C`;?mQ5f%WWXr4zhU8crnY#_p9PxidD5q1yngZEn=$cu|2oUwGyU
z4&ZAy{6TUE`*4@Y$SAMhzWZ;&?W{o3u_%{&yZK%)S;=Kxy}Ml%2tc3D$F6R<hC}NK
z2tYa(rLRlnz=Y+DdpLl<6?i%p1>j0JOukTLIa7bbouy_gsKTR>LALV;ykBb^4$V~{
zGouOex=Hv_h@HbcAG2FcSJ`L+)rr=vw&wsfG6&?v`~v;`Aylml2n9puLnhaf6SoP-
z^z<}8_79N#J!}Ou+aYi<)CwDLw+Ccme3Fu0=9*&A74%cm9gZxUPr2s1cWvP2jfemY
z^eFiJKFXG$39M#Yi@u_|b0C#U%60V^098@g(@c&fz-l(rwh>-$56D&P2-C7LEt{7s
zn-mRLX(POz1dzvxTf(2C=gGHR%>)+bW-%OL=Ha6X+>@1`^-@`!n`Qs&1_j;X&3dlZ
zbDkKG`Kfyp@;j&~yjuI>DI88$AW!d4u=ndH;7~LiFS%7!Rwqv;$I(hff&o88O=Bs$
zee%Ai24re%1To44aWG7WrLAv&8}w8HNGcMMyU~HlvFq6HQ?-H`*E_0?uDqh(y`0|_
Toh@8h00000NkvXXu0mjfn^7C`

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..abb15caff4e311f7a1a5f6e243f726fc6d17edf8
GIT binary patch
literal 631
zcmV--0*L*IP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%F-b&0RCt{2+Rbj-KoAG;|E3@6B|Je%BC+cw1%rG`4^dAQ*Q$NaRC$LyKqUkU
z##E}rq31RcA*#ys5Z2<W@fu?roB2sd*jg6Pc)UK$0*o=n7-Nhv#uzIwntx(BO5sBC
zKmhQ*`7Zo!D^3DpXE!4R0O!>z=y8IM=f?VRoCJtiGiU5}JjTPH8K(EY^1hVZ5CFP3
zeH&Klm(QOPS1ny?wXdbW$<jiorJ|@LY%J?mvrfvX<9E=<&%3{P^;+QD@cUjr0;{xC
zbawm(KklaRM*$G$5!O<XP4)_aI-YB)cw;PUS*be?(d=ogKMD$U*Z+e6;G?ThQ4L&u
zy%zIx0$6zqI5kN$6YxiYC`s_ZQ=p=v8t8TV&{BoL1AsXJEfsm~R?$m7l9r0<jzeoF
zO(G6~mYNn04l8)$5UQOq#u#IaF~%5U?4Ve8ip$a+UNY|z0~SfJNx)Wp_dL<#1n1Ri
zc=+7ds03`?chB4Hcx*N9xdbHYyYC5s1Z{m&`qVx<p%3b$P!+ICYkhYk%jRj`joOV1
zVTK)K>UeG{|6}_aTzi&G|Gn4k1L-c1bg2~pAdSr$Njt#Q@mx$MQ{4D5Hz7pGYLmt;
zCS2;j2g3ony+Pu6O~10)3VZsgc)5c)1OQZ2gXWJzVvCzJ(hMHh@zytU*Tj*)U^v`r
zZl@+mh!^ljesMQwXsOAmN$Ulxl$$iXc8eARiyB|beG0Zgl`imAr4Nu5*gqN|*gi>y
RwG03N002ovPDHLkV1nQo9q|AF

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..bb873aa26119570899abb4f2f1fe20655d90a206
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}!JaOTArY-_
zFK*;Lpupo2s9x-nsWjn6y@ZNUPo}bqu)OU5(!84Vn>-8*4ikbu&gs&&=2QJ+y?uLI
z*<9^IqWh!IA6k69ovTN6O2NtEyQl9lFjT*ubX{<F-TuUSpz#czu6{1-oD!M<H7PWs

literal 0
HcmV?d00001

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

From 79b467c1d7ec67c975205fe3bc75208eb8abb203 Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sat, 25 May 2024 08:14:04 -0500
Subject: [PATCH 02/24] update

update
---
 .../_NF/Catalog/Fills/Items/weapon_cases_expedition.yml       | 2 +-
 .../_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml     | 2 +-
 .../_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
index f7fcd156feb..cbeaa3726fc 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
@@ -219,7 +219,7 @@
     - id: MagazineBoxMagnum
       amount: 2
 
-- type: entity #Made By VividPups
+- type: entity #made By VividPups added in with PR 1770
   parent: WeaponCaseLong
   id: WeaponCaseLongSVTExpedition
   suffix: Dungeon, SVT
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
index 5b169c45a42..cb9622c3f29 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
@@ -168,7 +168,7 @@
       - id: BoxBeanbag
 
 # WeaponSVT
-- type: entity  #Made By VividPups
+- type: entity  #made By VividPups added in with PR 1770
   parent: WeaponCaseLongShuttle
   id: ShuttleWeaponSVT
   nospawn: true
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 1b130f1a00a..439beb7d2b3 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
@@ -10,11 +10,11 @@
     # capacity: 10
     # proto: CartridgeLightRifleRubber
 
-- type: entity
+- type: entity #made By VividPups added in with PR 1770
   id: WeaponSVT
   name: SVT-40
   parent: BaseWeaponRifle
-  description: Once a weapon used in war, now a civilian hunting rifle, Retreating is Consider Treason is etch into the side 
+  description: Once a weapon used in war, now a civilian hunting rifle brought to you by S.E.S.W, Retreating is Consider Treason is etch into the side 
   components:
   - type: Sprite
     sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi

From ae413120ecf857430b0ed5f840eafb822ac91cd2 Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sat, 25 May 2024 08:16:29 -0500
Subject: [PATCH 03/24] small updates

small updates
---
 .../Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml   | 2 +-
 Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml
index 4e9a214ae03..a7c98629a67 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity #made By VividPups added in with PR 1770
   id: MagazineSVT
   name: "10 rounder SVT Magazine (.30 rifle)"
   parent: BaseMagazineLightRifle
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml b/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml
index 74a19d2f069..b3426a0b88f 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml
@@ -1,4 +1,4 @@
-# these were added By VividPups for the AMMOfab for The SVT
+# these were added By VividPups for the AMMOfab for; added in with PR 1770
 
 - type: latheRecipe
   id: MagazineSVT

From 0e32673e0f39034da1e29e4d31f90838da2f1f76 Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sat, 25 May 2024 20:16:31 -0500
Subject: [PATCH 04/24] so i can fix it

so i can fix it
---
 .../svt40.rsi/{Inhand-left.png => inhand-lef.png}   | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/{Inhand-left.png => inhand-lef.png} (100%)

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-lef.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/Inhand-left.png
rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-lef.png

From a6f3e26b57f6516bb862766e6bd7e8837f99636a Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sat, 25 May 2024 20:18:44 -0500
Subject: [PATCH 05/24] fix

fix
---
 .../svt40.rsi/{inhand-lef.png => inhand-left.png}   | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/{inhand-lef.png => inhand-left.png} (100%)

diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-lef.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-lef.png
rename to Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/inhand-left.png

From 5d7efe70f82eef504bf32b472d352d8434f6ec4f Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sat, 25 May 2024 20:43:57 -0500
Subject: [PATCH 06/24] some updates

pratice is more of an outlier now to look more like the tip of the bullet
---
 .../Objects/Weapons/Guns/Guns/snipers.yml       |   2 +-
 .../Weapons/Ammunition/svt40.rsi/mag-0.png      | Bin 153 -> 0 bytes
 .../Weapons/Ammunition/svt40.rsi/practice.png   | Bin 258 -> 271 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-0.png

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 439beb7d2b3..27d96e5639e 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
@@ -21,7 +21,7 @@
     layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: mag-0
+      - state: base
         map: ["enum.GunVisualLayers.Mag"]
   - type: Clothing
     sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi
diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-0.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/mag-0.png
deleted file mode 100644
index bb873aa26119570899abb4f2f1fe20655d90a206..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}!JaOTArY-_
zFK*;Lpupo2s9x-nsWjn6y@ZNUPo}bqu)OU5(!84Vn>-8*4ikbu&gs&&=2QJ+y?uLI
z*<9^IqWh!IA6k69ovTN6O2NtEyQl9lFjT*ubX{<F-TuUSpz#czu6{1-oD!M<H7PWs

diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png
index 795c69b9d30270b7fbed857bd845af01e654b466..8de8b0e0c49bfca4cfc46498ea59e11e492b3cc4 100644
GIT binary patch
delta 230
zcmV<C02%*+0*?ZaF@MQPL_t(oh3(L>O#?v?h2ekqY$ybDB8G$#2%v%M!wx9u8i0TR
zAsR6UG7>G=`1U;l@CC>uoFybQU$Q$R?ab^z2qA<J{#Y9GxIQ{|kpQs$b@t>u9daod
z$Sk_2oxMg4(6+5_?{0?p^5SZ^f6q5fv;P53>e|-!=cY(Zs$UA{gd`-9{JEh;_q?-L
z{%!N~vr`wFjS8#HJH17oR474`$%bT*3Vpx+vCgOsY|Uraetfv+aC*S&+Y(eDC%TvA
gUh0PsLipc40BE;WYa-9&jQ{`u07*qoM6N<$f((IfY5)KL

delta 217
zcmV;~04D#B0)hgNF@L;CL_t(oh3(QoN&`U<h2g(?CgvDfL_C0QJc<`F3zs>LXAsFn
zbd(8r1vS&}xroUs0m%r0)VFCUx?fc{4JoCRQu<>t=J3V*+*Ja=_V+qa%4A=QFi?2v
zo)7kF#|&_@?ti>@d89sSfcx1DYj<-~CEBLJC6I(9!rK?3dr~==QBG}seRb(-vr*-J
z^T}XQ+6D!LOfiH(stm)&(VS6#U}tfA=hfo_)5#g@w;oiX1l?=@EBPs<l>WCbRG&<#
TV2HrI00000NkvXXu0mjfM{;HH


From 851ba81c144b3fb047cfd684b2d2ed41259eaf6a Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sat, 25 May 2024 20:51:38 -0500
Subject: [PATCH 07/24] Update weapon_cases_shuttle_guns.yml

SOOOOOOOO
---
 .../_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
index cb9622c3f29..13ba58a9c54 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
@@ -171,7 +171,7 @@
 - type: entity  #made By VividPups added in with PR 1770
   parent: WeaponCaseLongShuttle
   id: ShuttleWeaponSVT
-  nospawn: true
+  noSpawn: true
   components:
   - type: StorageFill
     contents:

From 11a558e86c2a34b4570e6f75d24f29a59e2fc18e Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sun, 26 May 2024 16:59:01 -0500
Subject: [PATCH 08/24] rifle

IM NOT GOOD AT ENGLISHER
---
 .../Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml
index a7c98629a67..417490a88f6 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml
@@ -1,6 +1,6 @@
 - type: entity #made By VividPups added in with PR 1770
   id: MagazineSVT
-  name: "10 rounder SVT Magazine (.30 rifle)"
+  name: "10 rounder SVT magazine (.30 rifle)"
   parent: BaseMagazineLightRifle
   components:
   - type: Tag

From 230de001bea8e5eb904809a701b2e28d8f32e9fc Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sun, 26 May 2024 17:20:57 -0500
Subject: [PATCH 09/24] In the wrong place

Mags where in the wrong place
---
 .../Weapons/Ammunition/{Cartridges => Magazines}/Rifles.yml       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/{Cartridges => Magazines}/Rifles.yml (100%)

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml
similarity index 100%
rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/Rifles.yml
rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml

From 75bb1b108ee9fe8a38ddfa563b6eacd532b566b0 Mon Sep 17 00:00:00 2001
From: VividPups <150621839+VividPups@users.noreply.github.com>
Date: Wed, 29 May 2024 19:05:17 -0500
Subject: [PATCH 10/24] Update
 Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml

Co-authored-by: whatston3 <166147148+whatston3@users.noreply.github.com>
---
 .../_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
index 13ba58a9c54..393a3fdf309 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
@@ -186,7 +186,7 @@
   # components:
   # - type: StorageFill
     # contents:
-      # - id: N/A
+      # - id: WeaponSVTNonlethal
       # - id: MagazineSVTRubber
 
 

From fa6d8931dfcbfe4805ac9b8163c03e57bedf881a Mon Sep 17 00:00:00 2001
From: VividPups <150621839+VividPups@users.noreply.github.com>
Date: Wed, 29 May 2024 19:05:23 -0500
Subject: [PATCH 11/24] Update
 Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml

Co-authored-by: whatston3 <166147148+whatston3@users.noreply.github.com>
---
 .../_NF/Catalog/Fills/Items/weapon_cases_expedition.yml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
index cbeaa3726fc..25b507c6c78 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
@@ -219,7 +219,7 @@
     - id: MagazineBoxMagnum
       amount: 2
 
-- type: entity #made By VividPups added in with PR 1770
+- type: entity #made By VividPups added in with PR 1417
   parent: WeaponCaseLong
   id: WeaponCaseLongSVTExpedition
   suffix: Dungeon, SVT

From 7a6415da329063eeb93f9de48167e458ec46b97c Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Wed, 29 May 2024 20:02:12 -0500
Subject: [PATCH 12/24] updates

upated.  recentering the PNG files, changes to the IDs
---
 .../Weapons/Ammunition/Magazines/Rifles.yml   |  34 +++++++++---------
 .../Weapons/Ammunition/svt40.rsi/base.png     | Bin 258 -> 255 bytes
 .../Weapons/Ammunition/svt40.rsi/mag-1.png    | Bin 157 -> 127 bytes
 .../Weapons/Ammunition/svt40.rsi/practice.png | Bin 271 -> 269 bytes
 .../Weapons/Ammunition/svt40.rsi/red.png      | Bin 258 -> 255 bytes
 .../Weapons/Ammunition/svt40.rsi/rubber.png   | Bin 257 -> 254 bytes
 .../Weapons/Ammunition/svt40.rsi/uranium.png  | Bin 258 -> 256 bytes
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml
index 417490a88f6..154bfe0a5cc 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml
@@ -1,6 +1,6 @@
 - type: entity #made By VividPups added in with PR 1770
-  id: MagazineSVT
-  name: "10 rounder SVT magazine (.30 rifle)"
+  id: 10roundmagazine
+  name: "10 round magazine (.30 rifle)"
   parent: BaseMagazineLightRifle
   components:
   - type: Tag
@@ -13,18 +13,18 @@
     sprite: _NF/Objects/Weapons/Ammunition/svt40.rsi
 
 - type: entity
-  id: MagazineSVTempty
-  name: "10 rounder SVT magazine (.30 rifle any)"
+  id: 10roundmagazineempty
+  name: "10 round magazine (.30 rifle any)"
   suffix: empty
-  parent: MagazineSVT
+  parent: 10roundmagazine
   components:
   - type: BallisticAmmoProvider
     proto: null
 
 - type: entity
-  id: MagazineSVTUranium
-  name: "10 rounder SVT magazine (.30 rifle uranium)"
-  parent: MagazineSVT
+  id: 10roundmagazineUranium
+  name: "10 round magazine (.30 rifle uranium)"
+  parent: 10roundmagazine
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRifleUranium
@@ -36,9 +36,9 @@
       map: ["enum.GunVisualLayers.Mag"]
 
 # type: entity  to be added back when Rubber rounds are added. 
- # id: MagazineSVTRubber
-  #name: "10 Rounder SVT magazine (.30 rifle rubber)"
-  #parent: MagazineSVT
+ # id: 10roundmagazineRubber
+  #name: "10 round magazine(.30 rifle rubber)"
+  #parent: 10roundmagazine
   #components:
   # type: BallisticAmmoProvider
   # proto: CartridgeLightRifleRubber
@@ -50,9 +50,9 @@
     #map: ["enum.GunVisualLayers.Mag"]
 
 - type: entity
-  id: MagazineSVTPractice
-  name: "10 rounder SVT magazine (.30 rifle practice)"
-  parent: MagazineSVT
+  id: 10roundmagazinePractice
+  name: "10 round magazine (.30 rifle practice)"
+  parent: 10roundmagazine
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRiflePractice
@@ -64,9 +64,9 @@
       map: ["enum.GunVisualLayers.Mag"]
 
 - type: entity
-  id: MagazineSVTIncendiary 
-  name: "10 rounder SVT magazine (.30 rifle incendiary)"
-  parent: MagazineSVT
+  id: 10roundmagazineIncendiary 
+  name: "10 round magazine (.30 rifle incendiary)"
+  parent: 10roundmagazine
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRifleIncendiary
diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png
index 795c69b9d30270b7fbed857bd845af01e654b466..a2a3e8cb1bd7eb96e50e1021145d11c370735568 100644
GIT binary patch
delta 214
zcmV;{04e{10{;P!F@L#9L_t(oh3(R@O#?v?h2ekp&QOK}BMN|oQfR~kgf52~5TX${
z&{?7duy5ZZFm}90Lcn~<N~_V^nbAT@DW&w^#hl{H)rG4BfbE}iqLjtyF2X?JWq57M
z?&macyB(WrH;r|(8hBVPv5u3QD$#cxE`cN@5k72);jJmNv`;>MbA9D%vsdMFzhkl}
zeTM=<rWnE?Ri^2yd8k=`;OK6B@8_pS&KGBFKSof65)AL-ukun#DWyO44Z(~|spt#-
Q*#H0l07*qoM6N<$g8VmTQvd(}

delta 217
zcmV;~04D$c0fGXMF@L;CL_t(oh3(QoN&`U<h2g(?CgvDfL_C0QJc<`F3zs>LXAsFn
zbd(8r1vS&}xroUs0m%r0)VFCUx?fc{4JoCRQu<>t=J3V*+*Ja=_V+qa%4A=QFi?2v
zo)7kF#|&_@?ti>@d89sSfcx1DYj<-~CEBLJC6I(9!rK?3dr~==QBG}seRb(-vr*-J
z^T}XQ+6D!LOfiH(stm)&(VS6#U}tfA=hfo_)5#g@w;oiX1l?=@EBPs<l>WCbRG&<#
TV2HrI00000NkvXXu0mjfrHW=?

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
index 73de722073667d6c96aa9ddd26ef0ffd86449ca3..3bd7ed2c0488ab5a6a6132c8b568c2be0e56c1aa 100644
GIT binary patch
delta 84
zcmbQsSU<tg&(hPyF(jfjIYEMTae_!sQ=kDCn}ornRf@OW{@VAfU8CL^>U(huv&w91
gF1Ldka79Io3=xZ1n64y#U}gXUPgg&ebxsLQ0MgYQKL7v#

delta 114
zcmb=Q%Q(R>C*0G;F(jfjIYEMTae_!sQ=kEtn^nRRm*Q=`zv?BTBmIR|&svnp{^6G6
zMCJ*O@zW01vjKs(JEzD;RpIl-20-9rTQoVVtQV~Hpa#gC3Py&-v$>fk*vxch00K`}
KKbLh*2~7Yd)h4?D

diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png
index 8de8b0e0c49bfca4cfc46498ea59e11e492b3cc4..3643df7c2c5bad3a18b635b2c297cfa71d69702e 100644
GIT binary patch
delta 228
zcmV<A02}|00*wNYF@MKNL_t(oh3(KgPQySHh2ek32`mI;QA5KLC}0ELM^dmLZvYAk
zgxE+hC`fD}A)a$6ATFqEghavpnwhy8-4}!qLJ0p|n)10mI(Cr&u>E!R<UAi@DH+JD
zx~EaOCpFNvt#9vchWF*g)o}kFZ<^-!8#t+JTl>jPk(gB#&Rq#fNFw=jL#yt2RPH>s
z`1#qXi_K1j&F-DvBF`$6AjxDyGDwBK-;N$?(gyaHi)%kV+;ccT;Pq_{Dv%T1%lb$8
eLI@#*KlK63F;#2-zl5&<0000<MNUMnLSTY7Cu*Mn

delta 230
zcmV<C02%*{0*?ZaF@MQPL_t(oh3(L>O#?v?h2ekqY$ybDB8G$#2%v%M!wx9u8i0TR
zAsR6UG7>G=`1U;l@CC>uoFybQU$Q$R?ab^z2qA<J{#Y9GxIQ{|kpQs$b@t>u9daod
z$Sk_2oxMg4(6+5_?{0?p^5SZ^f6q5fv;P53>e|-!=cY(Zs$UA{gd`-9{JEh;_q?-L
z{%!N~vr`wFjS8#HJH17oR474`$%bT*3Vpx+vCgOsY|Uraetfv+aC*S&+Y(eDC%TvA
gUh0PsLipc40BE;WYa-9&jQ{`u07*qoM6N<$f)-<LbpQYW

diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png
index 795c69b9d30270b7fbed857bd845af01e654b466..a2a3e8cb1bd7eb96e50e1021145d11c370735568 100644
GIT binary patch
delta 214
zcmV;{04e{10{;P!F@L#9L_t(oh3(R@O#?v?h2ekp&QOK}BMN|oQfR~kgf52~5TX${
z&{?7duy5ZZFm}90Lcn~<N~_V^nbAT@DW&w^#hl{H)rG4BfbE}iqLjtyF2X?JWq57M
z?&macyB(WrH;r|(8hBVPv5u3QD$#cxE`cN@5k72);jJmNv`;>MbA9D%vsdMFzhkl}
zeTM=<rWnE?Ri^2yd8k=`;OK6B@8_pS&KGBFKSof65)AL-ukun#DWyO44Z(~|spt#-
Q*#H0l07*qoM6N<$g8VmTQvd(}

delta 217
zcmV;~04D$c0fGXMF@L;CL_t(oh3(QoN&`U<h2g(?CgvDfL_C0QJc<`F3zs>LXAsFn
zbd(8r1vS&}xroUs0m%r0)VFCUx?fc{4JoCRQu<>t=J3V*+*Ja=_V+qa%4A=QFi?2v
zo)7kF#|&_@?ti>@d89sSfcx1DYj<-~CEBLJC6I(9!rK?3dr~==QBG}seRb(-vr*-J
z^T}XQ+6D!LOfiH(stm)&(VS6#U}tfA=hfo_)5#g@w;oiX1l?=@EBPs<l>WCbRG&<#
TV2HrI00000NkvXXu0mjfrHW=?

diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png
index 6e838bd805c1b7ce7943b62226ee7a49899f771d..2d50c2e7e5044d8906e97bd4251990d6345c8fc5 100644
GIT binary patch
delta 213
zcmV;`04o210{#JzF@Ly8L_t(oh3(S8O+zsdgyDbf7g7fbq5!y13w@9SN2*B?5u%Y0
zMM0v4K%QqfKyvou!h!uRmaNrycV$Q^rIh}=m{NSbxN?&Ku>Et6lrlTtMHnb-wy#~;
z!;}Vg^&V<(^;1{Xqy{coVVx#7O=74Omp~Gd2!C&A)0tU%A5Oo!y>YWSs&P1eGFp_O
zqJWSohA>Etas22WYSJG#Sw1}a<$29~cEQ{G9@L-&+ui<Gc`2oo(x3VQxO7U&<JonQ
P00000NkvXXu0mjfY2jlB

delta 216
zcmV;}04M+c0f7RLF@L*BL_t(oh3(QoN<%Reh2j4uueuIVTtGW<E!~F>9J(48QN)e3
zrBrYWt$jJifwrR-#3u;lev`l@Irk<6Qc5YM^v`0*;oIvQHwggS-)m1PqeCsiKw-XI
z9PQN&8DLeXP=C7n>1cJ(09QO??Qd?HL{}>=fg~gm{(7PLiBXL5+vazZv760Kjm_?Z
z-lB9B1%ym7gh6Wb{q|(epg*wpaR2Dnml>C%3*O$>pavyauGW8&pHfQcynO;%<x0wY
SO(^sL0000<MNUMnLSTY~S!VwL

diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png
index a17efb0b0cba6d6c4cc6b6ce399ba424725a1c34..0c02545d45a1df4a042625a62ef23eac998eab8a 100644
GIT binary patch
delta 215
zcmV;|04V>00)PULF@L&AL_t(oh3(R@N<%>qh2ekp-oz&m>=hfk*yP2u@YzIs3>&>j
z0)appt7z_?W1+F$Yh&Sj&B8LAof#HVN-3rPE~XS;o?p010NDOMM@pIf+(j5DJP$8T
z+5MCTc30c>;-Rf<QUj+?XIRI{O_k`o4wpa@k_dloXvbSqW>9H;e0jZawK=G=KYTD+
zl)gg&AyW)tkSgQ&-aOQ#KX7z=bLYp0droF^)|(ZmLJ5Y~)vxkWN-3p3^$DgwO(yeo
R{qO()002ovPDHLkV1grWWWE3Z

delta 217
zcmV;~04D!{0)hgNF@L;CL_t(oh3(R@N&`U@h2j6sZsHRN_KJ;N()eOp_-sLZ3>#e}
zf)LooO3ltWDKu6qh${$kzh>YvbMBpCAf=R2N`EY-96mihag_kD{jm;|GW)DW7%1Fz
z_oKbqDFgIpo9}P##><liIJ`Z=+TYw%iMDBQ2_zwj@cRq(JW`Kll%F;~UoKp2wyL~r
z-xw@P+n|7uDTXjem0@`OGH22s*t@*A^3C;%gV~(Nr!}ZT3A%^%ujHqcQu^O^@^(!o
Tde0I{00000NkvXXu0mjf#-V7i


From 0e12d8687ae1fc8fbb8c54749d8dceb43082e571 Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Wed, 29 May 2024 20:06:52 -0500
Subject: [PATCH 13/24] updates again

# changes
---
 .../Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml  | 2 +-
 .../_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml
index 154bfe0a5cc..c7076051411 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/Rifles.yml
@@ -1,4 +1,4 @@
-- type: entity #made By VividPups added in with PR 1770
+- type: entity #made By VividPups added in with PR 1470
   id: 10roundmagazine
   name: "10 round magazine (.30 rifle)"
   parent: BaseMagazineLightRifle
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 27d96e5639e..9dcc0b5a50d 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
@@ -10,11 +10,11 @@
     # capacity: 10
     # proto: CartridgeLightRifleRubber
 
-- type: entity #made By VividPups added in with PR 1770
+- type: entity #made By VividPups added in with PR 1417
   id: WeaponSVT
   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, Retreating is Consider Treason is etch into the side 
+  description: Once a weapon used in war, now a civilian hunting rifle brought to you by S.E.S.W.C, Retreating is Consider Treason is etch into the side 
   components:
   - type: Sprite
     sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi

From 74012b75634ced3a5bbc8c917db9c2bc3cbb6197 Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Thu, 30 May 2024 02:26:28 -0500
Subject: [PATCH 14/24] Shuttle update

Shuttle update
---
 Resources/Prototypes/Entities/Structures/Machines/lathe.yml   | 4 ++--
 .../_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index c94b02a1051..7abb44ceb83 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -883,8 +883,8 @@
         - ShellTranquilizer
         - SpeedLoaderMagnum
         - SpeedLoaderMagnumEmpty
-        - MagazineSVT #frontier by VividPups
-        - MagazineSVTempty #frontier VividPups
+        - 10roundmagazine #frontier by VividPups
+        - 10roundmagazineempty #frontier by VividPups
     - type: MaterialStorage
       whitelist:
         tags:
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
index 393a3fdf309..5a15a48a0dc 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
@@ -176,7 +176,7 @@
   - type: StorageFill
     contents:
       - id: WeaponSVT
-      - id: MagazineSVT
+      - id: 10roundmagazine
 
 # WeaponSVTNonlethal # Frontier - TODO: Restore this later
 # - type: entity

From 973871314084a741704b57a2ce9eaf1045fef2ad Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Thu, 30 May 2024 02:39:51 -0500
Subject: [PATCH 15/24] ammo

ammo
---
 Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml b/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml
index b3426a0b88f..fb792004c9c 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/ammo.yml
@@ -1,17 +1,17 @@
 # these were added By VividPups for the AMMOfab for; added in with PR 1770
 
 - type: latheRecipe
-  id: MagazineSVT
-  result: MagazineSVT
+  id: 10roundmagazine
+  result: 10roundmagazine
   category: Ammo
   completetime: 5
   materials:
     Steel: 25
 
 - type: latheRecipe
-  id: MagazineSVTempty
-  result: MagazineSVTempty
+  id: 10roundmagazineempty
+  result: 10roundmagazineempty
   category: Ammo
   completetime: 5
   materials:
-    Steel: 25
+    Steel: 20

From 99583ac198039e5f0a11d61c8b3ea0348a2b6c9a Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Thu, 30 May 2024 03:07:00 -0500
Subject: [PATCH 16/24] aaa

updates to the yml again
---
 .../_NF/Catalog/Fills/Items/weapon_cases_expedition.yml         | 2 +-
 .../_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
index 25b507c6c78..cf0c46094ab 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
@@ -229,7 +229,7 @@
     contents:
     - id: WeaponSVT
       amount: 1
-    - id: MagazineSVT
+    - id: 10roundmagazine
       amount: 2
 
 # RPG
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 9dcc0b5a50d..ff244aa37de 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
@@ -43,7 +43,7 @@
     slots:
       gun_magazine:
         name: Magazine
-        startingItem: MagazineSVT
+        startingItem: 10roundmagazine
         insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
         ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
         priority: 2

From 46ec8a2cb899526999073966a675f844147be9e8 Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Mon, 3 Jun 2024 22:06:47 -0500
Subject: [PATCH 17/24] Delete snipers.yml

moves stuff around
---
 .../Objects/Weapons/Guns/Guns/snipers.yml     | 68 -------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
deleted file mode 100644
index ff244aa37de..00000000000
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-# - type: entity # Frontier - TODO: Restore Rubber
-  # id: Kardashev-MosinNonlethal
-  # parent: WeaponSniperMosin
-  # suffix: Non-lethal
-  # components:
-  # - type: BallisticAmmoProvider
-    # whitelist:
-      # tags:
-      # - CartridgeLightRifle
-    # capacity: 10
-    # proto: CartridgeLightRifleRubber
-
-- type: entity #made By VividPups added in with PR 1417
-  id: WeaponSVT
-  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 Consider Treason is etch into the side 
-  components:
-  - type: Sprite
-    sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi
-    layers:
-      - state: base
-        map: ["enum.GunVisualLayers.Base"]
-      - state: base
-        map: ["enum.GunVisualLayers.Mag"]
-  - type: Clothing
-    sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi
-    quickEquip: false
-    slots:
-    - Back
-    - suitStorage
-  - type: Gun
-    fireRate: 3.5
-    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: 10roundmagazine
-        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

From 339b3b771ba0e032a6953ca7bfddd0182b2bd07d Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Mon, 3 Jun 2024 22:07:03 -0500
Subject: [PATCH 18/24] Update snipers.yml

---
 .../Objects/Weapons/Snipers/snipers.yml       | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Snipers/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Snipers/snipers.yml
index 12cbbc255f4..38811d20721 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Snipers/snipers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Snipers/snipers.yml
@@ -16,3 +16,60 @@
       - CartridgeMagnum
     capacity: 7
     proto: CartridgeMagnum
+
+- type: entity #made By VividPups added in with PR 1417
+  id: WeaponSVT
+  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 Consider Treason is etch into the side 
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi
+    layers:
+      - state: base
+        map: ["enum.GunVisualLayers.Base"]
+      - state: base
+        map: ["enum.GunVisualLayers.Mag"]
+  - type: Clothing
+    sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
+  - type: Gun
+    fireRate: 3.5
+    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: 10roundmagazine
+        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

From 0ea12bb1cc7b641c0b2ad2dd261d6060f23d17c3 Mon Sep 17 00:00:00 2001
From: Whatstone <whatstone3@gmail.com>
Date: Sat, 8 Jun 2024 21:05:10 -0400
Subject: [PATCH 19/24] Resolve merge conflicts (for real this time)

---
 .../Prototypes/_NF/Catalog/Fills/Lockers/guns.yml    | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml
index 3519d11e799..95afe9e0aab 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml
@@ -146,21 +146,15 @@
     - id: ShuttleWeaponShotgunSawn
       orGroup: T2-1
       prob: 0.1
-<<<<<<< HEAD
-#    - id: ShuttleWeaponShotgunSawnNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunSawnNonlethal
+      orGroup: T2-1
+      prob: 0.1
     - id: ShuttleWeaponSVT
       orGroup: T2-1
       prob: 0.1
 #    - id: ShuttleWeaponSVTNonlethal # Frontier - TODO: Restore rubber
 #      orGroup: T2-1
 #      prob: 0.1
-=======
-    - id: ShuttleWeaponShotgunSawnNonlethal
-      orGroup: T2-1
-      prob: 0.1
->>>>>>> 4792913cd5e1cdade38c8c9a505781a41e697ef6
     # T2 Melee
     - id: SpearReinforced
       orGroup: Melee

From bba8d44c90f94c2ef59454c16a2a4341e9b0d1cb Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sun, 16 Jun 2024 09:56:51 -0500
Subject: [PATCH 20/24] aaa

aaaa oogabogaa
---
 .../Spawners/Random/dungeon_items_mercenary.yml        | 10 ----------
 .../Markers/Spawners/Random/dungeon_items_weapons.yml  |  3 ++-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
index 85d63c6506c..7380774ccc0 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
@@ -96,16 +96,6 @@
         color: red
   - type: RandomSpawner
     prototypes:
-    - WeaponCaseShortMk58Expedition
-    - WeaponCaseShortMk58Expedition
-    - WeaponCaseShortDeckardExpedition
-    - WeaponCaseShortLaserGunExpedition
-    - WeaponCaseShortLaserGunExpedition
-    - WeaponCaseLongKammererExpedition
-    - WeaponCaseLongRepeaterExpedition
-    - WeaponCaseLongSVTExpedition
-    #- WeaponCaseShortSvalinnExpedition
-    chance: 0.7
     - WeaponCaseShort
     - WeaponCaseLong
     - SpawnDungeonLootGunT1
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
index 62ed83aa2e8..21ea6cbf3c7 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
@@ -126,7 +126,7 @@
   id: SpawnDungeonLootGunT2
   parent: MarkerBasePlaceFree
   suffix: "Dungeon, Gun, T2"
-  noSpawn: true
+  #noSpawn: true
   components:
   - type: Sprite
     layers:
@@ -149,6 +149,7 @@
     - WeaponCaseLongLecterExpedition
     - WeaponCaseLongEnergyGunExpedition
     - WeaponCaseLongRepeaterExpedition
+    - WeaponCaseLongSVTExpedition
     chance: 0.95
     offset: 0.0
     rarePrototypes:

From 471e256227296f6e1d327b82b699a12bb2c934e4 Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sun, 16 Jun 2024 10:16:29 -0500
Subject: [PATCH 21/24] Update dungeon_items_weapons.yml

YEET
---
 .../Entities/Markers/Spawners/Random/dungeon_items_weapons.yml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
index 21ea6cbf3c7..ac5aa4ec357 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml
@@ -126,7 +126,7 @@
   id: SpawnDungeonLootGunT2
   parent: MarkerBasePlaceFree
   suffix: "Dungeon, Gun, T2"
-  #noSpawn: true
+  noSpawn: true
   components:
   - type: Sprite
     layers:

From 512786758bc56ab62c1f924853e429ff50aba114 Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sun, 16 Jun 2024 10:52:33 -0500
Subject: [PATCH 22/24] Update weapon_cases_expedition.yml

this should work?
---
 .../Fills/Items/weapon_cases_expedition.yml   | 255 +++++++++++++++++-
 1 file changed, 241 insertions(+), 14 deletions(-)

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
index cf0c46094ab..78cf6b3db27 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
@@ -26,7 +26,48 @@
     - id: MagazineMagnum
       amount: 2
 
+- type: entity
+  parent: WeaponCaseShort
+  id: WeaponCaseShortViper
+  suffix: Dungeon, Viper
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolViper
+      amount: 1
+    - id: MagazinePistol
+      amount: 2
+
+- type: entity
+  parent: WeaponCaseShort
+  id: WeaponCaseShortCobra
+  suffix: Dungeon, Cobra
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponPistolCobra
+      amount: 1
+    - id: MagazinePistolCaselessRifle
+      amount: 1
+    - id: MagazineBoxCaselessRifle10x24
+      amount: 1
+
 # Revolvers
+- type: entity
+  parent: WeaponCaseShort
+  id: WeaponCaseShortArgentiExpedition
+  suffix: Dungeon, Argenti
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRevolverArgentiExpedition
+      amount: 1
+    - id: SpeedLoaderRifleHeavy
+      amount: 2
+
 - type: entity
   parent: WeaponCaseShort
   id: WeaponCaseShortDeckardExpedition
@@ -40,7 +81,59 @@
     - id: SpeedLoaderMagnum
       amount: 2
 
+- type: entity
+  parent: WeaponCaseShort
+  id: WeaponCaseShortPython
+  suffix: Dungeon, Python
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponRevolverPython
+      amount: 1
+    - id: SpeedLoaderMagnum
+      amount: 2
+
 # Shotguns
+- type: entity
+  parent: WeaponCaseShort
+  id: WeaponCaseShortHandmadeExpedition
+  suffix: Dungeon, Handmade Pistol
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponShotgunHandmadeExpedition
+      amount: 1
+    - id: BoxLethalshot
+      amount: 1
+
+- type: entity
+  parent: WeaponCaseLong
+  id: WeaponCaseLongShotgunDoubleBarreledExpedition
+  suffix: Dungeon, Double Barreled
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponShotgunDoubleBarreledExpedition
+      amount: 1
+    - id: BoxLethalshot
+      amount: 2
+
+- type: entity
+  parent: WeaponCaseShort
+  id: WeaponCaseShortSawnExpedition
+  suffix: Dungeon, Sawn-off
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponShotgunSawnExpedition
+      amount: 1
+    - id: BoxLethalshot
+      amount: 1
+
 - type: entity
   parent: WeaponCaseLong
   id: WeaponCaseLongKammererExpedition
@@ -54,11 +147,26 @@
     - id: BoxLethalshot
       amount: 2
 
+- type: entity
+  parent: WeaponCaseLong
+  id: WeaponCaseLongBulldog
+  suffix: Dungeon, Bulldog
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponShotgunBulldog
+      amount: 1
+    - id: MagazineShotgun
+      amount: 2
+    - id: BoxLethalshot
+      amount: 2
+
 # SMGs
 - type: entity
   parent: WeaponCaseLong
   id: WeaponCaseLongWT550Expedition
-  suffix: Dungeon, SMG, WT550
+  suffix: Dungeon, WT550
   noSpawn: true
   components:
   - type: StorageFill
@@ -67,11 +175,13 @@
       amount: 1
     - id: MagazinePistolSubMachineGunTopMounted
       amount: 2
+    - id: MagazineBoxPistol
+      amount: 1
 
 - type: entity
   parent: WeaponCaseLong
   id: WeaponCaseLongAtreidesExpedition
-  suffix: Dungeon, SMG, Atreides
+  suffix: Dungeon, Atreides
   noSpawn: true
   components:
   - type: StorageFill
@@ -80,11 +190,13 @@
       amount: 1
     - id: MagazinePistolSubMachineGun
       amount: 2
+    - id: MagazineBoxPistol
+      amount: 2
 
 - type: entity
   parent: WeaponCaseLong
   id: WeaponCaseLongDrozdExpedition
-  suffix: Dungeon, SMG, Drozd
+  suffix: Dungeon, Drozd
   noSpawn: true
   components:
   - type: StorageFill
@@ -93,6 +205,23 @@
       amount: 1
     - id: MagazinePistolSubMachineGun
       amount: 2
+    - id: MagazineBoxPistol
+      amount: 1
+
+- type: entity
+  parent: WeaponCaseLong
+  id: WeaponCaseLongC20r
+  suffix: Dungeon, C20r
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSubMachineGunC20r
+      amount: 1
+    - id: MagazinePistolSubMachineGun
+      amount: 2
+    - id: MagazineBoxPistol
+      amount: 2
 
 # Rifles
 - type: entity
@@ -124,7 +253,7 @@
 - type: entity
   parent: WeaponCaseLong
   id: WeaponCaseLongM90Expedition
-  suffix: Dungeon, M90
+  suffix: Dungeon, M-90gl
   noSpawn: true
   components:
   - type: StorageFill
@@ -134,6 +263,21 @@
     - id: MagazineRifle
       amount: 2
 
+- type: entity #made By VividPups added in with PR 1417
+  parent: WeaponCaseLong
+  id: WeaponCaseLongSVTExpedition
+  suffix: Dungeon, SVT
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSVT
+      amount: 1
+    - id: 10roundmagazine
+      amount: 2 
+   
+
+
 # Energy
 - type: entity
   parent: WeaponCaseShort
@@ -193,6 +337,19 @@
       amount: 1
 
 # Sniper
+- type: entity
+  parent: WeaponCaseLong
+  id: WeaponCaseLongMosinExpedition
+  suffix: Dungeon, Mosin
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSniperMosinExpedition
+      amount: 1
+    - id: MagazineBoxLightRifle
+      amount: 2
+
 - type: entity
   parent: WeaponCaseLong
   id: WeaponCaseLongHristovExpedition
@@ -219,31 +376,45 @@
     - id: MagazineBoxMagnum
       amount: 2
 
-- type: entity #made By VividPups added in with PR 1417
+# Launchers
+- type: entity
   parent: WeaponCaseLong
-  id: WeaponCaseLongSVTExpedition
-  suffix: Dungeon, SVT
+  id: WeaponCaseLongLauncherRocketExpedition
+  suffix: Dungeon, RPG
   noSpawn: true
   components:
   - type: StorageFill
     contents:
-    - id: WeaponSVT
+    - id: WeaponLauncherRocket
       amount: 1
-    - id: 10roundmagazine
+    - id: CartridgeRocket
       amount: 2
 
-# RPG
 - type: entity
   parent: WeaponCaseLong
-  id: WeaponCaseLongLauncherRocketExpedition
-  suffix: Dungeon, RPG
+  id: WeaponCaseLongLauncherChinaLake
+  suffix: Dungeon, China Lake
   noSpawn: true
   components:
   - type: StorageFill
     contents:
-    - id: WeaponLauncherRocket
+    - id: WeaponLauncherChinaLake
       amount: 1
-    - id: CartridgeRocket
+    - id: GrenadeFrag
+      amount: 2
+
+# LMG
+- type: entity
+  parent: WeaponCaseLong
+  id: WeaponCaseLongLightMachineGunL6
+  suffix: Dungeon, L6
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponLightMachineGunL6
+      amount: 1
+    - id: MagazineLightRifleBox
       amount: 2
 
 # Melee
@@ -301,3 +472,59 @@
     contents:
     - id: EnergySwordDouble
       amount: 1
+
+# Explosives
+- type: entity
+  parent: WeaponCaseShort
+  id: WeaponCaseShortFireBomb
+  suffix: Dungeon, Fire Bomb
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: FireBomb
+      amount: 4
+
+- type: entity
+  parent: WeaponCaseShort
+  id: WeaponCaseShortPipeBomb
+  suffix: Dungeon, Pipe Bomb
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: PipeBomb
+      amount: 4
+
+- type: entity
+  parent: WeaponCaseShort
+  id: WeaponCaseShortSeismicCharge
+  suffix: Dungeon, Seismic Charge
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: SeismicCharge
+      amount: 4
+
+- type: entity
+  parent: WeaponCaseShort
+  id: WeaponCaseShortExGrenade
+  suffix: Dungeon, Explosive Grenade
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: ExGrenade
+      amount: 4
+
+- type: entity
+  parent: WeaponCaseShort
+  id: WeaponCaseShortC4
+  suffix: Dungeon, C4
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+    - id: C4
+      amount: 2

From 01c0758b4293757281a564efcf5809eb6f8eb8cf Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sun, 23 Jun 2024 09:23:12 -0500
Subject: [PATCH 23/24] GADDAMNIT WHATSONE

AAAAAAAAAAAAAA
---
 .../Objects/Weapons/Guns/Snipers/snipers.yml  |   2 +-
 .../Weapons/Ammunition/svt40.rsi/base.png     | Bin 255 -> 175 bytes
 .../Weapons/Guns/Rifles/svt40.rsi/base.png    | Bin 633 -> 333 bytes
 .../Guns/Rifles/svt40.rsi/bolt-open.png       | Bin 622 -> 314 bytes
 .../Rifles/svt40.rsi/equipped-BACKPACK.png    | Bin 907 -> 983 bytes
 .../Rifles/svt40.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1028 bytes
 .../Weapons/Guns/Rifles/svt40.rsi/icon.png    | Bin 633 -> 0 bytes
 .../Guns/Rifles/svt40.rsi/inhand-left.png     | Bin 583 -> 743 bytes
 .../Guns/Rifles/svt40.rsi/inhand-right.png    | Bin 631 -> 758 bytes
 .../Weapons/Guns/Rifles/svt40.rsi/mag-0.png   | Bin 153 -> 0 bytes
 .../Weapons/Guns/Rifles/svt40.rsi/meta.json   |  20 ++++++++++++------
 .../Rifles/svt40.rsi/wielded-inhand-left.png  | Bin 0 -> 1063 bytes
 .../Rifles/svt40.rsi/wielded-inhand-right.png | Bin 0 -> 995 bytes
 13 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/equipped-SUITSTORAGE.png
 delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/icon.png
 delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/mag-0.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/wielded-inhand-left.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/wielded-inhand-right.png

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 639e5f17eb1..089ece65bb1 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -47,7 +47,7 @@
     - Back
     - suitStorage
   - type: Gun
-    fireRate: 3.5
+    fireRate: 4
     selectedMode: SemiAuto
     availableModes:
       - SemiAuto
diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png
index a2a3e8cb1bd7eb96e50e1021145d11c370735568..a521b2f1ac0629931278e1ec37fab7801376f7ea 100644
GIT binary patch
delta 133
zcmV;00DAxb0j~j&F@9-DL_t(oh3(Ke3V=Wi1<-FbWd>3Rg5X@#!mEkkWdtp!ij_+t
z$OJq8>p~Wi07OJYe^+^$RH8L)0sy40#x%}nZrRqNnXUx@pbx?B@sP7?mU{u<`o!^t
n((6B=5=|xAdnFMO5k1=hy9pF#=PBG(00000NkvXXu0mjf1zR}7

delta 214
zcmV;{04e{k0sjGzF@L#9L_t(oh3(R@O#?v?h2ekp&QOK}BMN|oQfR~kgf52~5TX${
z&{?7duy5ZZFm}90Lcn~<N~_V^nbAT@DW&w^#hl{H)rG4BfbE}iqLjtyF2X?JWq57M
z?&macyB(WrH;r|(8hBVPv5u3QD$#cxE`cN@5k72);jJmNv`;>MbA9D%vsdMFzhkl}
zeTM=<rWnE?Ri^2yd8k=`;OK6B@8_pS&KGBFKSof65)AL-ukun#DWyO44Z(~|spt#-
Q*#H0l07*qoM6N<$f*}uPe*gdg

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
index 55a312cfe42cacf5b4c0531eb129b623540073be..03905046b93eb240c5e85695b80bb7be826de85f 100644
GIT binary patch
delta 317
zcmey#a+Ya=WIZzj1B1(wu46!ou{g-xiDBJ2nU_G0Yk*IPE0E64Ob-hUk(QR2IBlw`
zin^bVhn=mJFuy>et(t<YhOUmGny84IhKi)1u#}`+hPi5$qmGcEkdc(6uexTAqn@gS
zsI|ksSwMrtOM?7@8UCYzdI*0*ckz9on#rCnjv*GkOD`PcJ7mDad|}1Z-65W#F3kV`
zuS|L5Wy`Yr%?Fv~T_^hEC!S(n(W;&m_^Rvw9mZD-bE+P{>pEHc;ot4n__K@ozcFZ(
zpR7z*-_p$f#$i`p`JTJ8-dTm5uiSjiPW?*K-Ryrkmmj<|I=|>_8;_Y!5%YJy{5OvU
z&&+?h=D_|B3ep>@E-)SJaGbAUEcVq$pq}yYI(9)mq1JGq`xrc3{an^LB{Ts5i-d=_

delta 619
zcmV-x0+jvD0{H}x8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00J{fL_t(og~gXkPZMDn
zg`b(W6ah_I6{E3OX=y1Jg*2M5&?pHpfkX@@?)ay=@)8m^29bnIYf(`YD50gD8#Aw~
zR!~}}mnmmCGnwan=X~Fr88{~;<4HLeU^1SRj>AuyI7j%9B!32P{{vS$0Z+u@($jl^
z_3US*6TDLzP9*Ba?v*3CGd7H&+W@R>Zq(#>QGq;Pc;*TY;A=PhL2?NDaF@u)D6ikX
z`)|VStU%JSD3^P?`Cc$t$z@%=yImCsK%dXYu5P)8L+c3$KspwsuS?~?gyoETIDo$u
zcsdpZ;7T}5zJE|;Ia7bbouy_gsKTR>LALV;ykBb^4$V~{GouOex=Hv_h@HbcAG2Fc
zSJ`L+)rr=vw&wsfG6&?v`~v;`Aylml2n9puLnhaf6SoP-^z<}8_79N#J!}Ou+aYi<
z)CwDLw+Ccme3Fu0=9*&A74%cm9gZxUPr2s1cWvP2jem#$4D=}Y{65N-pb4yITZ_J;
zx^p0vO3HQh7ywmK*wajoCBSMn)3y;_Zx6^->j=}bF)f>yE1MJzSZO1?o&=D`iCe;-
zqvy%DT+IX)=Vmb+VdmkZ3fz;GpY>8%oSS9;>jnkg;>~)l)^na1kol>56!JT$D7;$x
z;wc<XS7abh?@zGz>nGq)G#oFvRaI6ePbSCFN=1SJKSfPrDZ730zNZFcYHS2C$^>yR
zOoyedZ+{!~R02pU5|O*nfy%M#*zZ%df*RL5s*bL_qTjuo-xZxLTv-4B002ovPDHLk
FV1j;u9ijjL

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
index 7c4f0962ba0fac7d189b32f02f695b7262c0a1c5..08f7f26f9d8f05747c853cb209989cee40fd0a9f 100644
GIT binary patch
delta 298
zcmaFIvWsbgWIZzj1B1(wu46!ou{g-xiDBJ2nU_G0Yk*IPE0E64Ob-hUk(QR2IBlw`
zin^bVhn=mJFuy>et(t<YhOUmGny84IhKi)1u#}`+hPi5$qmGcEkdc(6uexTAqn@gS
zsI|ksSwMrtOM?7@8UCYzdI*0*ckz9ong&l7#}JF&rI!M^m=$?kFD}?~@L<Q%v|ay~
znw?=<=luG8r+#O~x5t`cI~}$bxa#umeQ96L89QmQ{F{3wH`$->H`}*+eenf`tT*M%
zRfpy=nmFd$JbZg4;kE6x*>)3`OTV4LDtu?I`Ikc0pXzg&{xq_eTu`=RX7*8L>&q|}
es|stVXWX!lEi+`r6+56~7(8A5T-G@yGywpOLU%v_

delta 608
zcmV-m0-yc50`3Hm8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00JmUL_t(og~gZKPt#x+
z#(&*`A)pCUV>AvY8yn-GkVO-WGwy<zK%z#k`A_xALrA>CNitw_s2G&7$<A$QUvJzp
zl+7L5?YU{wHs9}g-{<|lq%b6fgJBs8FdPiaz~Rj%h6taL(0}ypf8dTmz(awcjE!Gl
zC;eF&1n-PyL!q{9x66^-S(rtw82}{rc3X1nh(KPxc-|2lz-cu+7M{U4Il?zL&zpDe
z|Jz|JBampo&*kw^z85qSnRG{MTNQx-OgNn!)%1?x(0>O6AR6#9G2$Sv!B(nsIDo4k
zcr@S#;ELBvu76NuE7gAB&Qq@uG~j;UGzYmnACld}p~nbT=R=aKX?QP9a(I&CV|u^m
zD0}IE0E{}U*+5+zh{qlP;C3qHOTYT6z8eDq5PKLGInH7zP&G{47bp8+1D(x)EG;fm
zu2s0EsEl}Alxrp>-QZKEzv??OaPx*w0H($ioGvF7U4N(wY^O7p3_;s-AQB17b;l_H
z4n-kb)i@P5+v${LM|is#kgIwLO*hbVgI9??iYg>5gtwCb5)a*yKle0UEmg}7Y^<-L
zn!@U%$91?Zm7lk$Y^<+w{B@T?P3P@Srqy@07?5Wx_bB8JaiH)z`NdW^oQ*)9-d`g7
z^9Nv3R9Q_sxee8;lPAlIRLey?ZWqOBmCf`)^Ltwj$jZVTqE_%=qG~3a```XHXsZN}
uh|ec?{ZsXAH?ZHQMg%RM4^#uKysqDj8ra!*umxuT0000<MNUMnLSTY!LmCbM

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
index 3de79a0dad9068cbba33174486a901e4827a9ee8..628d7a1f9724f0bddde9135e702729eaaff6e874 100644
GIT binary patch
delta 948
zcmV;l155mi2iFIXF@KRsL_t(|ob8%VOB+EL#-Gif4XiO)x(U<-GyzSF!IKJNlw3TN
z(DZ|N>B(bGo{A?g{U9php*`3_p;W6-#A;jYC9R->re>*Wbb1IAHj-pBadyqh{7xa8
zeP`Zh-kI6WGk`!K5D54YjXot#itFMXFf%iYk>MoQ&W;QxNq=T$mS;%o;GMkHak*E3
z)8HyVA{?@0l&p-;O@M`|D4CD>kQ$Bi3fVwvG>-Y04+~RKt|D*~KvQG@!0P&@#4Dze
zuOGMTpLvSFMS$g8+S1aey!m+zO_8A~G78x^mp1P$z)F6+-jUazik6H%0Fa=D%;*y=
zZ5>O2J_Uh3g@23i_Y%OE{L<F3Wyu>!ghOO;V_%ZpF34_ILm#@KYXOW6FK+DHk~{#!
zG!<G<C9k$G>)+j{61oy#IhQ7tn_E<FZt-&MOFj7)&!1Vg7JU1DDE&YP0HDbpOiqm9
zEs55zce^Gq3sA_$NvW)(RMu@B`Md1w?qPL(Q!)-fH-EbWQv${YtX%Ngkx!;b@y`W5
z|N7m~ejytt=X!;?UtLXshf3Z^WMHsiwC!4idxCs2MR+|HJMLvD5e|`|h!-(U<r2?v
z0uXnt(tX6s<>kn60!TM}cUs2@008CcUjX1X4Fm##Kp+qZ1Wu<L1J#j_!p*SFK()%I
z=0P_GDt~hYSYdxVie65BWH`zEPtl`U1Av-=dgW1=?(wkvI1vt!o*jPF3{*ekJxmpF
z<xwoNzaI)F0sK|H!KUsd7N(+v8mKHVuK`D=XFd1-dm$Sq^n3!qc9Mii0JG$IpWf(%
z<y@Ma>y?J@sDT<87$jOyC0bBz*{_ZTFjJM+fqw-SR`TOScDoP{t617PmYNx;nYrn<
zF<R~dR5hOxz_ngNOjB`mde-!}%egcum30`)&}yhdExTPUP1>E^Jrs*4ZL79z1!U%?
zF*z{?O>Vtg(vc7JDYp4@)S(8@V9x`<yZ0X?AMwKP^_nIRv=QL^@<Li&-;{QC_gdae
z4}VG6X_XtNnpvB74b*0st^vj3iRAZs;UnIr*Fyont<Ef6@Y=Pxc6cB~`&Ia>x@kPq
zC&8ME|C(OATYh$7CO9=vucg-O7R9sz{8b&%eidtn2R*U>cXBp?#XvO`Af~Apituq_
z?SjQXZ7V<`93ph?Q&pWprv_@rZ-cyTX)P-`Iz5xj=02ru1yJ><ngW49AP@)ykBR>Z
Wwmf+`1wf4e0000<MNUMnLSTZj$G;x{

delta 871
zcmV-t1DO2R2a5-gF@Hr#L_t(|ob8&=OB+!T$G;n!K%&t@nh@Mte-H>%b1HkQgm}n7
z6r}wxa_Ol@PaZva>AlxNOQBG~gGG8Oq8Dqa5Ng%>10|Fivf^6z^$=c2VpiYo&aQ6z
zKBxTH%+CA1naN9L0Et8*A>`T985X2_gs2Sp1+~EB0-PIvsDDki@aFA1h0<Q&B7hoF
z0j8#=*w39EN|PO-j51OI*4NkZU~rJq<Q3*8M_Jz7CbLH-KuJ^CjH*E2`9@{3Ba3_I
z0O~?e*dr4l5sLr-mN&|zMXD38KW_q{5rISis@)JFJ6^<IIE`0d&q(aK7GPmI*I4|^
z)qT%*9{?UDdw&{_-HPu@fab-|t!(?U_-0;w*i-;_A~+VHdGXv4KiK-T1OWK*<9o|J
zor>T{fceQ$W?Y&uE=@dtztQ4Iu~_u99voLqtnHpOo^$a}Yq}$Qwgs5Y53|#nj?<dn
zap!-nEje;TlvF%~#}AXx61XCCNmFf$Z%crZrm~7|pnswpmN~y#fv4%Pyirz|afWz*
zrtzAa6m*mVepP!bK5p$R%xL`@yp1A!YZS67o5*GE)=AJ$lt>g^CXKB?3IG6yHM3(O
zv`Zibs2-Hj7xwM+Es;nh5{X12kx2e`{OJ8tV8>6}zXtER2%h?P*B8(6Gy?uLYzg4?
z^amB5`G1*Crvs4!cKoyz0RtCDp!zqKl9Hyf+59jAfQej&4O|=ve>U(nU^YL@60ry>
zx&bbN9fSoK8yaDI;WV=2#T&16(xP(0{NyO>?T!JcH*4lrwiP}<Fg7$I<b$mUXzt5f
z;ba$_urQrtk*>P??Oh=eKRKi+z+2ROT*ga`%YS-j#BFO{SODIS=l%J1_|Ers$2{-T
z@q4wm=9~R%pC7QoRs^i=p5VB8wI{`gC9GQJl<>t{-KTwi;3n>gUZ^F&;{8d>_wV=i
zbleeYD!OrPilyQqq~b|b4}LS!R{caS!wOk{s{3__e8W(7k6VnA8uS=Ze}z*(i9}Jz
zs$lF%x_;=m?IDTlC}dTpM50313KzjHvn~S1ufvWL?92}cMSzw7JFJ;V#Y2G^Md9-U
xHx)wR2<QtlR1eDTJ@WxMKOm7vBoc{4guk)3IT1Lig~0#-002ovPDHLkV1g04s3-sc

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 0000000000000000000000000000000000000000..c282e88f52a7ad60de521b90a568a38b0b95b0b3
GIT binary patch
literal 1028
zcmV+f1pE7mP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&zDYzuRCt{2n$1faK^VrLRX2e(CW{-PCZGvuK9rtR5ToScp-Al?;-x2#Ie99c
zdg<TLvx<0V4=M<vHiC%859}qapaHcSYMMAbgiSX#S!a`(d@;XM$j;8kGw-}RyUzdu
zfj}T&hu8axG*i88tSgL6Ok!{#$h5PA13?m*m}FTcKUfc*cfHIbpxIz5K%mFXWtMo>
z&rE>1F)x|+*%1!;Syfp?IONB)&yKk<FH;ei37{!90Kn49n#8J3Bgfmjh2JbiU?RZc
z%rMu`*ZK1O5t?Fyrq~dR`kAy@wE!PyUl%&^X(!2L_5pynG(<w(SXjT1oSh1soeC4-
zs}jIC_=WWgZi6=x=y8+z)kDeF-UeHHTTve>p<)4y4bQJ0)@1Mi;L}uSE|q-Py)FD#
zO(aw#z~am>$>g4p$vxry@<Czn@7})QmJ3eL64E)`007O_fzgp6d?nt(^-6PsWdUMQ
zKe>BI<L)6{)0uzHUVI-*D{GQ*0xEerSQ>z_0iFrZjM-qAB!AuD+mD|`?Z={il1gVR
z_p72MP_Mxo@$~i;&33Jla6>Q~3=>w{;--5U3iP;1zek2oQ<>D)bOMm}e5Bin%;e>$
z=>(8+Y@f7ECjbCEWPbwyvt=L<2m}IwK+rN+@e!MHCul}f`G~x*;v-s$0A3b#J+UMJ
z59^y3w6DsR1c=8EaC(+#_)kyakRSIQ3RT$-&V8v1$J@JbP?n{R0N&Pjy`UE0zC+<=
zeX~aQ5ow?nz>!TCS=5cj+?ba<cZX=Awk2|aKJZjJgILs0J}2}4`!p4)OqSRcCmz#x
z0D#o(O;Hl3j(|w08^ooVmSKH*gNDVKVdCt}XZ%k)NoisILMr7WMyAF~-cJ<)G@+zh
zQ?*2Qs57}IQ)g%|zK>+`vgGxW5umwLqPbM!>Fpz$OC>LTebw!0{g_NG&>d=^v^~GE
zxh2_&42LY29Xw#N1R_)87#$gcX3Gc3Iou^TLHhc0b}BXV=X8e}K#@IPj^{q2k&*(W
zZf~Tel{INEzHeHw9)h*B%8i-+r8bunN0PTog(I6TTgEgACX<(vLzZDDGB!51N;c+p
zI%?|7>UoByO&TB3GzsQI=TF(|G~vesTEU<Dh$mOq|J`RA0gh}M-Yyl(iKB*j0kU#7
zfyPHP6~L#d==bE+i$(pU9?$t|dC5mCy95F~Zek}gfPbL`<TpEwa6*KJldEg#<m%eA
y4An+R%8`~mf>L$~=pmzrkU$_12m}H_tMM0IUstiS=u*@G0000<MNUMnLSTYwe&5Cb

literal 0
HcmV?d00001

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
deleted file mode 100644
index 55a312cfe42cacf5b4c0531eb129b623540073be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 633
zcmV-<0*3vGP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%Gf6~2R9J<@mrG9*VHky<nYI)GO<EPBu~=zoDHnw_ny}C)2{D003?}aQr@HbI
z5;q2sgiC8tQ4}blrJWlyud7y2TBnyOXE`&O=X~dU-<ugYCne)aITv6uo|KNmPntMK
z_>d$9Z~p^VI{{C`;?mQ5f%WWXr4zhU8crnY#_p9PxidD5q1yngZEn=$cu|2oUwGyU
z4&ZAy{6TUE`*4@Y$SAMhzWZ;&?W{o3u_%{&yZK%)S;=Kxy}Ml%2tc3D$F6R<hC}NK
z2tYa(rLRlnz=Y+DdpLl<6?i%p1>j0JOukTLIa7bbouy_gsKTR>LALV;ykBb^4$V~{
zGouOex=Hv_h@HbcAG2FcSJ`L+)rr=vw&wsfG6&?v`~v;`Aylml2n9puLnhaf6SoP-
z^z<}8_79N#J!}Ou+aYi<)CwDLw+Ccme3Fu0=9*&A74%cm9gZxUPr2s1cWvP2jfemY
z^eFiJKFXG$39M#Yi@u_|b0C#U%60V^098@g(@c&fz-l(rwh>-$56D&P2-C7LEt{7s
zn-mRLX(POz1dzvxTf(2C=gGHR%>)+bW-%OL=Ha6X+>@1`^-@`!n`Qs&1_j;X&3dlZ
zbDkKG`Kfyp@;j&~yjuI>DI88$AW!d4u=ndH;7~LiFS%7!Rwqv;$I(hff&o88O=Bs$
zee%Ai24re%1To44aWG7WrLAv&8}w8HNGcMMyU~HlvFq6HQ?-H`*E_0?uDqh(y`0|_
Toh@8h00000NkvXXu0mjfn^7C`

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
index 8481ebeba260a6f2ed974888d278945113f80d79..56b8bda3f3a762d38c6b3089a4ee918092faa664 100644
GIT binary patch
delta 706
zcmV;z0zLi51m^{iF@K>+L_t(|obB3CYuZp02k?K26lw<vjhWie(TqgXKJ3N9Mr)r2
zKJKaZeQ*1cdn$!~0HK{LDh1m~yplVLV?lcMP;{=;&eR(VdVa6Ux%Zyj<c6FBFvb{T
zj4{R-V~jDTgy$B?bBm-Rj*9tAvZ6X*!OBp@cd48w^n%Vz3x6<mgUWeA#doP-WfDn*
z(gc{gLAR+i0H7V*q3T=Eq<B^=&n;5bx6lsm006hCG)&!4o&;qHFm;1Aw;b%1c2ScN
zS|UV45=1mW+^grgMcVNlG$f%VLeyl0z0xi=w;bh3P`U%0?JQ1D&TxHmrPYJ3))FB~
z`3yufnEF;2CV%VvqKTFWQ4hM>_05%bdU6J5JF9ZK002#8FjF^3$nc+-1uH|Oo7nLk
zoL@BY{qozyF-_f|4eNf9niQx9UG3rT597~DX|PE)^KWQ<eeHh0M-~SBfAL9~%OJqt
zod5v6po8%%Y1=tUuj%Lo9hj@Bxh)<@;24~w9(1+giGQ$RWk(M)+s@I!e)&Zf|6)wt
z7`-GNSC1%(<Bc)K7-Nhv#u#Iau_Y1r^V-}#iq2D<BrIG4KD~P#>;DUvfMGFpX)V<=
zz;lcA<-IpkO+k4AJ|7n5Qs@{qPc$UOF29dcT866lE&;$>UBg$g@?<4=7M@$AkLDd3
z@_yYl8Gqq-|0kYPIZmmZSWQNFHRuB{u;V)bK&q24YM!{fL`#IYO{K9{+C{U~0nm(H
zK36um;kFkt)W$2pDofpu#T|}&aQFeICugyDL1LBIr^?~akyP_UqNQk6Nl3DJBJo;$
z!OD<`2H3E&=>L*vw|~SMGwJ4u#NPwzL02<ZQ#<Gd9USbJVcWT>kF14jo-lQTj;lvB
oO%iN7M+@0J5qAe9ITyx&KXE!kWR)tnlmGw#07*qoM6N<$g6#NFs{jB1

delta 545
zcmV++0^a@S1;+%CF@FI`L_t(|obB4XY63wN2H<~_6lt^%L=tc>-etR3Slfy|Zr;Ku
zUe+Su6BtF;h@KR2Wf3o<&a94}4+NW?nKKuWogZL~F~%5Uj4{U8m7~>1ng^MUDMqDS
zX8m1Oqbepq>IwxaZXPt7Ae~4^?dM5GBO43_ZNeW9F`WbL!GAzS^Vg|ftFBl1<Lxy#
z|4Me4bY;gnYq0fNl^oLwKd+>CCEL}tlQjP&yu=<6x3chh9W<JqWBMY;wD2B##`nla
zx9=$#r*gq6Zmi@XRCX+?xcNx7yYiV0iZ>n%bb7sA{Sg48UaQiN*TUzQ7uoof{}1T)
zJ)_(A3|bnnlYi!}6*U~wqGqFoxRnL|3)geo@8cE=>*EkU7Af04_L%5v+i!wnI`>h0
zAUp|fv2b6-GsYNWj4{R-V@wPBTt=MW&`VJQfYqhsO-{nT2_OJSCla991Qj<Q(U78b
z@U?h*Fu-)agg+ieF&>$u9bE!ItIJ7UP$`!Yx=a<le18ZU(c-eA;^t{M9%1M&!q@3r
z$1a)=(4z3bHDn1QIWFP+K-k5z1m|W0L~O|qgbDXAeQQg|28g)+{J@FX01;C214?I3
zFdHDGkV}zeryx5&pfn#Km<<pz^B2%MKd>tsAR@>QXrCcCr3gD|(#_=u4oyOMr`&CR
j;3l^GsT%IKaCQNIHG%B7lK~8+00000NkvXXu0mjfiKO}u

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
index abb15caff4e311f7a1a5f6e243f726fc6d17edf8..c962a6ddb7d4c09123da5353277ccac65b3cb01e 100644
GIT binary patch
delta 721
zcmV;?0xtdc1oj1xF@La0L_t(|ob8%TOXE-!hTljKrVJ#Q#8!jQK+_KwZWILVZuYLM
zzro))+fwLa+{uj7DYXpLnUbb7L+LOgo>_#3qE&P2?T7I^t1fbrbKZ0BN$7h3hG7_n
zVHk#C7>0S%7@AI^Ym|8evJ57Z_k%&~yw>7gn72$}br;Ra-hU=4MN4Q+ECJkHVdawt
zfR1-ByheTL0ykHnPsTl3sty3u@OmqGZ2VxLTmS@^LhGL00fweid5h2r2yK6WRZV`9
z&sWVT#`8m$UfR7+3gG4nR4H1~wi>FbnY!$<$Xh100z!F<o{f8|0B){8rJ@s6{xZ15
z!Tv6`cbt_LVSn8H4Na$^ngS5^g-X$SvX4CyVBGD$U0p}p{@>^iYSlWNY<iC2%fZle
z+TL++u)mAT;1+FvfL1^#6`iRfs1FyDW&i+`z>m)SSlL>&P9pEvW#MGgs8#C#fSWL0
zqPuGVVSy)mS@grublR}O3Qs2g7BMvaQK9md85Othb$_FxDga>H8A^T7(D%A9*3~zi
z{BukbVa>KPbbM4!eDVO$@Op|8_~?6GY*=a7c7||PIi*$Z?DHURnPg}>omEaLRN<ZS
z-U`n!48t%C!!QiPFpMBc{qrD}Ihxeu0RembWN&kxaV(A40?cAPCyJyVgV;OZA#to{
z*|@m^oqr#?QlB}K0CBBnnM}?q$Q;*+Ex;_+vn-~~D#+r+5t&KG*0YmM<IBZYe7qY0
z&`~Nn06;&Q-=*7X(X2wViMBt$P)*_H*H3BB5fT6pvz}i|-ZF_0&MGKDIIAH0$O#84
zVm-fxMcMUot0hT<Mb0Wny>Z?$$-lkBhLy(XZ%Tkp=eO|v7d@*m^LM~B8eUH^)>ZVq
zE{>1N!p?J|W);T%dt4E0J41<^RhVT5%qtd#VW#pQOl)H|Q-XIu00000NkvXXu0mjf
D#F$`J

delta 593
zcmV-X0<Qh`1@{DyF@G^hL_t(|obB4pZrVT)2k`%<AL=DMK}jO9>m>z)d`k~ePZigy
zea=*Qhde+f1PaDfs>Gq^HW4AJ%JdM{;;Zo*V;h_KNl4gQ7SDLRKFk7)F~%5Uj4{R-
zD=?aWVmV6TLh?WW@V@yj{BA2w0%B)3BLo2F)hg(5f{y3L`hRhp1c+EOXY6)7#>1Z(
zruV<{zLeY$0J=DR8&>L<&z}-kEnRB0ucg1q(n6@EqNpTnEbCUYPRgm{chJYryT5q#
zTHxF8`(8f+tF%;fcKilE?xyfZ0TAaA)>4s8_6mSHo@=UjV=QY~sXGqQ>}jk&3JP`C
z|APSFqpMI+4S!sHy%zIx0$6zqI5kN$6YxiYC`s_ZQ=p=v8t8TV&{BoL1AsXJEfsm~
zR?$m7l9r0<jzeoFO(G6~mYNn04l8)$5UQOq#u#IaF~%5U?4Ve8ip$a+UNY|z0~SfJ
zNx)Wp_dL<#1n1Ric=+7ds03`?chB4Hcx*N9xdbHYyMONqfdp-RQ~K0CJE0Hiq)-*G
zOKW|1Bg^J#-i_Lg3t@&GWa@ZsD*t2q8eDspO#i*t?E~p9kaVdP03eOc8c93A)bU(Q
zCR5z_F*hMZ$ZC_uE+$;+zX!tsy1hZ-c}>5v*$R95sd%}AIRpSyRD<S^Lt=}YG|~(n
z*zwjkb4u65k-%U$+-h#8CP|1F@JD`eH)v?7$*D=}1*?>sG`x0;76XeKU&?(7wn3FH
f@KvP`kQLZJ8X(v{Nrtry00000NkvXXu0mjf{dXBp

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
deleted file mode 100644
index bb873aa26119570899abb4f2f1fe20655d90a206..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}!JaOTArY-_
zFK*;Lpupo2s9x-nsWjn6y@ZNUPo}bqu)OU5(!84Vn>-8*4ikbu&gs&&=2QJ+y?uLI
z*<9^IqWh!IA6k69ovTN6O2NtEyQl9lFjT*ubX{<F-TuUSpz#czu6{1-oD!M<H7PWs

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
index 12a95021c63..f0146e82a56 100644
--- a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/meta.json
@@ -1,24 +1,18 @@
 {
     "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",
+    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, 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
@@ -30,6 +24,18 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "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 0000000000000000000000000000000000000000..4151984eecc88bd1a9bd85e5f94056acfd41101c
GIT binary patch
literal 1063
zcmV+?1laqDP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&;Ymb6RCt{2nptleR}_H1u^}d20s$uWfMOYyt&&~IRi#w6`^qn9`y2Y(lDze;
zQlA<}t<>eAmb|1bZYyxecqn)aF`(NAe8<BMj)T<nd{4v7UCuf84j_FO1VIo4K@bE%
z5ClPZUr8l1s@Hwrqyrg5Dw$D6)d4_F8yHQ+fqiVG&8TuN8#vX9F>H)@d`T4wFAY6j
z*)9>753s(z#>MNZ0?^L^rutQ8)PQf=w;%I<Ke^QyiBOQ-YK*iQRhh8K#*%g8F>7Zv
z05&(ax}F(de(|~5e*TQwS&gu{NZBqCx#L3xBfR)+zpdh5JxZx>ohiz8iLki{;9ds;
zvu?XzcYZMd(q>et>DCZNvsJ5J<7!gLj7s>Lq^(*0EY{neZNDl}{-->22aJmkt}6r(
zHW$&$no4GrH`qU_iiEGp)<+LOx3XH-zjGIWqa(*1>%cxXa@nN2OO8*@IUNwp`T1*R
z?#;Q$zcK0@I+eG{Zz#UUPoBC7I@SJ@#jItuQ@y<UbO(S#r@~4kMBJPrV86P0Hr>{5
zM)}?A=)E~k8>0obU$!~0kKNc}*0O@~Xr0Gk>@AfxqeI_&9e6IAR5QxY8>8+P;-`~y
zibsF-omY?VP5xan_OF0**;>NQ&psu8SOTE<cfRL0w0HZ?`~AchLPN)&RN|T&O%@4;
zRP12_=%2h7@2;72g2Na)m`E_B^y-h2{Ci0x7*dg7=+^%O2!bF8f*=TjAP9mW2!bF8
z{};wJ&9`NyZ{>VIr$im6eLTLT0M^&nDBC6FHPqQhpRl`^$EZ3umkrlmYcrinW>g?B
z>)Pm>@Kyy_TU}SR+Jzg84$iCCKg=fB`{Bp71iXh8pxfJPL%q9~2Vf-<Vg-N>GYzhl
z_L4TEN*}Dy2Q8qtn(r#Wpi>&1TI>G(yL`a;^$qI*1-nVYiUN>tTqO~V5bl^~b7PC`
z=g%k<UK)>|JazB)GSn~7b{M>7dNUjLSm|prVG}^*R%09-wHBzKn(x{=sboeiT$~WS
zHwQr4n&q3FBAKws*ZaF|?Q_|riknkx@0D4Jw8W=Y=z|RKP3dK(I~V2Sn5E(ip*AB8
zt+NLC#&p*X=vjb-ui4dkM)@h6R`|Ji)YfN|pl%bb<g}mceE(zCvYKzSR$VX3AT{6h
z3g}ZB&`KPxHTRiswzD}iiw{YxEVBLG_W<u)mO9mn5ebHrR`XtB*0S;@cwirsHlu2g
zn(zB1SU9b4R<Dn=nmU+CnBq=5?WNyqcUG^nU$!as$fak8aeTf$E1-A5q>2EODfmc;
hE*Atr5QP6E{{p3V<chrGd=vlx002ovPDHLkV1k_W1DOB-

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..ec31f01af4430d5263cd92f90da4fe301a28a93a
GIT binary patch
literal 995
zcmV<9104K`P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&ok>JNRCt{2n!#@xM-+#@O(0N*7|cR2Ag4yL!IA6(QlwOIdTQlcZ*Bjw-g{5-
z7g(u!NF6m&+Cvp7KrG?30+%j}z!>Zp-01=DmW9QF6cePrPeKekZ)fJcc{4)#JrD#z
z5ClOG1VIo4;bXJDmQk~u@7jNPdD6vRW}i$ht7LLnWwTo(lgmmEhE%_OGP!&uf$>aY
zytSFN7jb&p26|4_j0)jsjG9qFzu}=^R5i;^4~CT0m(6a`K53{@=}*mNc(xxt>WzJT
z`XRp9^I2<1M<YsI*U-*;%T__1xBGd=-1d+4wT#jlX3y~AB{xUnaUFoWR2>tSjKA&n
zZf@T(E<nww@WsxT06c#3)HMLp;H%6%1(2^9>})0|9JWcv7kH63Xf7;X9)MfzBO;48
z0Z7Le`0mHw9LDQw8I|&!1CWefV=q@@RSyC1x^V_T`SABEb8Z~MOJTKrJLY)yX~Ik4
zuuZXheJB8qBM@1<iBEX}cvtQW4X!mz4lddUruAJ1AOMbx`IzKu1^}yi2%qxuuH3<g
zmsYDaWNTl7t=5U{{Clm#d#yt{8nMrOcqyz}H$0eUU3{?>HXhu^JnPz@d2!zF4^S|w
zTEVDlySaVM3dSggF2Pc>&T*$R<dEMVpj7ImcVY!qJg5L*HtKWXxW(WRyzoN-lwCH-
z@t}XlFWXT)7*dIq6sgr1d(VHKyCBR2Js47YFf`LYErK8jf*=TjAP9mW2!bF8!aOid
zm3Y=nqz(_VwV73ysl+O%b8jO>?&T}Yvo3=wF~BILcviRuz!FIMRpN9sq6Wp1rKL}}
zOP}5rzfH+FCl!wXQ0&5+ToHmg;ek1}A3kF5#ZN#lc!Q$ltZ)rL!0UCW#Jomj!chu_
zQxf+Zf58W+#E+jmwcA!vM9rwE{_NR!aGy81B3i?AWY4r!DA&PuHrA9SltND|^(il<
zW}RQlha=@Qi%EpiZ@>9k0sOH0jBqqI)Njf0(39l9e_j}C>~V@CU_=J=tHkiH1b*yU
z7`BbA*cu^BE|&HeOPG!NQ2$#X5x=7Vc5~y^9;BlYWfeyNRF7ITN7#<M1V^dFiTE8g
znBG^d6i-@ov8spcngHn4Jv6)Swys4|`I^CTXShJZZ87CPiU4eX{u%QkmL8aOyT$=}
z8Qp4~xY|x-$1KO^O(suABP!talDrk-m!p<zCe77?r_H$a4uT*Ef*|}q`3GN%yJ$g}
RS?B-&002ovPDHLkV1g{;&*K09

literal 0
HcmV?d00001


From 5813bba484228a7511fc0f787c4903158f43a8e4 Mon Sep 17 00:00:00 2001
From: VividPups <68whiskty@gmail.com>
Date: Sun, 23 Jun 2024 10:00:52 -0500
Subject: [PATCH 24/24] ADSFGAFGA

AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
---
 .../Objects/Weapons/Guns/Snipers/snipers.yml    |   2 +-
 .../Weapons/Ammunition/svt40.rsi/base.png       | Bin 175 -> 186 bytes
 .../Weapons/Ammunition/svt40.rsi/mag-1.png      | Bin 127 -> 126 bytes
 .../Weapons/Ammunition/svt40.rsi/practice.png   | Bin 269 -> 186 bytes
 .../Weapons/Ammunition/svt40.rsi/red.png        | Bin 255 -> 186 bytes
 .../Weapons/Ammunition/svt40.rsi/rubber.png     | Bin 254 -> 191 bytes
 .../Weapons/Ammunition/svt40.rsi/uranium.png    | Bin 256 -> 185 bytes
 .../Weapons/Guns/Rifles/svt40.rsi/base.png      | Bin 333 -> 315 bytes
 .../Weapons/Guns/Rifles/svt40.rsi/icon.png      | Bin 0 -> 315 bytes
 .../Weapons/Guns/Rifles/svt40.rsi/mag-0.png     | Bin 0 -> 192 bytes
 .../Weapons/Guns/Rifles/svt40.rsi/meta.json     |  16 +++++++++++-----
 11 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/mag-0.png

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 089ece65bb1..d73e9081d1a 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -38,7 +38,7 @@
     layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
-      - state: base
+      - state: mag-0
         map: ["enum.GunVisualLayers.Mag"]
   - type: Clothing
     sprite: _NF/Objects/Weapons/Guns/Rifles/svt40.rsi
diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/base.png
index a521b2f1ac0629931278e1ec37fab7801376f7ea..f3d28e71f1e6397b5bd3e275e4f11bc2d3008524 100644
GIT binary patch
delta 145
zcmZ3_xQlUuVSS0Gi(^PcYjT1F>*55Fo~A$pE;p+LmGH&u`X1K1vKF!dLEGYXe*+NM
z^Y=$%%I6bh4zkw2>m{nS*wrJa1wUa(tZV!qw5f~d#6pKY<rybR8F=p0f0(57H>I6{
pnOQ|7A*Tp#^g#`Y0tSY_T*>t_E7rF&FmN$2c)I$ztaD0e0sx=tHM{@-

delta 133
zcmV;00DAwr0j~j&F@9-DL_t(oh3(Ke3V=Wi1<-FbWd>3Rg5X@#!mEkkWdtp!ij_+t
z$OJq8>p~Wi07OJYe^+^$RH8L)0sy40#x%}nZrRqNnXUx@pbx?B@sP7?mU{u<`o!^t
n((6B=5=|xAdnFMO5k1=hy9pF#=PBG(00000NkvXXu0mjf;d3~C

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
index 3bd7ed2c0488ab5a6a6132c8b568c2be0e56c1aa..83b951efbdc11b99e15ed099d4da3df7163e9298 100644
GIT binary patch
delta 82
zcmb=gn_%c`;pyTS649ERAi=sgL8PZC(143g!eG+sjryk_+V|9czf|0|(miid?lldB
d0=I)F*cd##*qJylEp=xA0#8>zmvv4FO#t)G9Yp{D

delta 83
zcmb=cpJ3=`>FMGa649ERAi=sgL8PZC(143g!eG)W#oKOw?R(a)QSS`(y|{&0Wwte!
f+d&Puq9R6yh(#<+R}w!kGXR07tDnm{r-UW|$JZPm

diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/practice.png
index 3643df7c2c5bad3a18b635b2c297cfa71d69702e..f3d28e71f1e6397b5bd3e275e4f11bc2d3008524 100644
GIT binary patch
delta 145
zcmeBW+Qm4*u)f68#W5tJH90|ob#a17Pg9@)mz!0BO8DY+eGlthSqs^KplxxxzX1sB
z`TL_W<@1R$2U+Xi^%B)u?CO!zf}b!X);0bQ+SJ8!VxdEy@{ALu3_N%0KTJ~ko6^p}
p%&a1kkW&OV`k;nH0Rux|uH^ce73<p>7`PZ1JYD@<);T3K0RW9SHJbnc

delta 228
zcmV<A02}|h0gVEXF@MKNL_t(oh3(KgPQySHh2ek32`mI;QA5KLC}0ELM^dmLZvYAk
zgxE+hC`fD}A)a$6ATFqEghavpnwhy8-4}!qLJ0p|n)10mI(Cr&u>E!R<UAi@DH+JD
zx~EaOCpFNvt#9vchWF*g)o}kFZ<^-!8#t+JTl>jPk(gB#&Rq#fNFw=jL#yt2RPH>s
z`1#qXi_K1j&F-DvBF`$6AjxDyGDwBK-;N$?(gyaHi)%kV+;ccT;Pq_{Dv%T1%lb$8
eLI@#*KlK63F;#2-zl5&<0000<MNUMnLSTYikZQ>Q

diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/red.png
index a2a3e8cb1bd7eb96e50e1021145d11c370735568..f3d28e71f1e6397b5bd3e275e4f11bc2d3008524 100644
GIT binary patch
delta 145
zcmey*xQlUuVSS0Gi(^PcYjT1F>*55Fo~A$pE;p+LmGH&u`X1K1vKF!dLEGYXe*+NM
z^Y=$%%I6bh4zkw2>m{nS*wrJa1wUa(tZV!qw5f~d#6pKY<rybR8F=p0f0(57H>I6{
pnOQ|7A*Tp#^g#`Y0tSY_T*>t_E7rF&FmN$2c)I$ztaD0e0szfAHVgm&

delta 214
zcmV;{04e{v0sjGzF@L#9L_t(oh3(R@O#?v?h2ekp&QOK}BMN|oQfR~kgf52~5TX${
z&{?7duy5ZZFm}90Lcn~<N~_V^nbAT@DW&w^#hl{H)rG4BfbE}iqLjtyF2X?JWq57M
z?&macyB(WrH;r|(8hBVPv5u3QD$#cxE`cN@5k72);jJmNv`;>MbA9D%vsdMFzhkl}
zeTM=<rWnE?Ri^2yd8k=`;OK6B@8_pS&KGBFKSof65)AL-ukun#DWyO44Z(~|spt#-
Q*#H0l07*qoM6N<$f+|5~iU0rr

diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/rubber.png
index 2d50c2e7e5044d8906e97bd4251990d6345c8fc5..2b6d6131d6dd4d228bf1134c7f123222942a632b 100644
GIT binary patch
delta 150
zcmeyzxSw%?VSS~ii(^PcYjT1F>*55Fo~A$pE;p+LmGH&u`X1K1vKF!dLEGYXe*+NM
z^Y=$%%IAm^r3co=@8j8?=Xk@0NBzX6IgO1?0s_y(f9R{OKG7h<^~9p7Glu=Zfxqnf
vnwR{`I1CINoEVR(nRB@v)PP#U$j<Qlkc?I&|IQX$1|aZs^>bP0l+XkKKpQwl

delta 213
zcmV;`04o2#0saAyF@Ly8L_t(oh3(S8O+zsdgyDbf7g7fbq5!y13w@9SN2*B?5u%Y0
zMM0v4K%QqfKyvou!h!uRmaNrycV$Q^rIh}=m{NSbxN?&Ku>Et6lrlTtMHnb-wy#~;
z!;}Vg^&V<(^;1{Xqy{coVVx#7O=74Omp~Gd2!C&A)0tU%A5Oo!y>YWSs&P1eGFp_O
zqJWSohA>Etas22WYSJG#Sw1}a<$29~cEQ{G9@L-&+ui<Gc`2oo(x3VQxO7U&<JonQ
P00000NkvXXu0mjfoTFnz

diff --git a/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png b/Resources/Textures/_NF/Objects/Weapons/Ammunition/svt40.rsi/uranium.png
index 0c02545d45a1df4a042625a62ef23eac998eab8a..5c9e2860625a1d960447a767c17dcde49869044e 100644
GIT binary patch
delta 144
zcmV;B0B`?*0=WT@F@JMOL_t(oh3(NX3qVj5#qmGcDT7i9GlTCxO8F9EQU=8*U_e=2
zgTeVt?+y38)43obBJy{Rb+9a|ElVQ+nz{vGUYE!3dDZ}9-Z9dhH`nwzyl5cwgDp-n
y?k!kCxYhudewbd(n;U?mh3jlxfryC6=XSNC8!Pvjy&eDn00{s|MNUMnLSTX#sz7W2

delta 215
zcmV;|04V>t0e}LKF@L&AL_t(oh3(R@N<%>qh2ekp-oz&m>=hfk*yP2u@YzIs3>&>j
z0)appt7z_?W1+F$Yh&Sj&B8LAof#HVN-3rPE~XS;o?p010NDOMM@pIf+(j5DJP$8T
z+5MCTc30c>;-Rf<QUj+?XIRI{O_k`o4wpa@k_dloXvbSqW>9H;e0jZawK=G=KYTD+
zl)gg&AyW)tkSgQ&-aOQ#KX7z=bLYp0droF^)|(ZmLJ5Y~)vxkWN-3p3^$DgwO(yeo
R{qO()002ovPDHLkV1iJ}Wb^<4

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
index 03905046b93eb240c5e85695b80bb7be826de85f..d9ae07cc6a15ee0223d67c263de0bcdd41869813 100644
GIT binary patch
delta 158
zcmV;P0Ac^l0=oi`rGJ4*L_t(Ijiu624g(<wMN#79bueOVD((K4T2^qU>G*pdC`7YA
zPqTvqIvOXA=IE|_9um5wK!31@Yq3x6|Ge<4di6;Ukh5FW2d!|N92lo=xp__K5b%-v
zMV~0jjb^OC0*~mp<CyOx|CCdM_`wry(C&#1Ofx4w(N=EsN*92C0nRK2c`;8)CjbBd
M07*qoM6N<$f-ERV%K!iX

delta 176
zcmV;h08jtB0?h)DrGJx2L_t(Ijiu1R4#F@D1JJ0IyHrV4L<9f-sbu0xJp{Y#@EoU#
z$d6x<$^)o{Cu&jZivQdJ>HwU2<L-*deenL<g<s915B2~kcgcBYC$xhH>_ED1cf8%2
z?mAS@d9&6&C)8ryYyNE0;OR2YqRoa3OmYMFPH*hv5zL?ItSP|1@E{wode8#Fh(Vty
eGZyts5Pt!~t_Kkg5`|X)0000<MNUMnLSTY5AXa<;

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 0000000000000000000000000000000000000000..d9ae07cc6a15ee0223d67c263de0bcdd41869813
GIT binary patch
literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|TmyVUT!D0U
zW_nm?h_tlC#A#DiRn+}_JnU?(g!u&$ZPgTHHFR|h)kH<yG*l!7g{36rGR#%09Cd^Q
zg^Z*mebqH{9Q9NsM6Dh6%>o)EUJ~RN%<vy8*w9^kAE>0!)5S5wqIc<~Kt5(g4%fg(
zPf87va<tz5n;sQbu>9qZYB>#;&G!DAo0+Yo)cc;jSXV74v}=h&{f74JjsEZc@A<I0
z>Z>RJgw4@c+1D1#k&#%Qx3kjsg}{f2zg_2Roa#+mbAYM;#g4}_-mCnd65Rabpm5%W
ncb&XG#_Dz#!}7j(HPkbn(_yPL^!HK+I)=g1)z4*}Q$iB}e4u%h

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..2fcdfbe224e88aaa5afc990c4f56a0ee903e2b07
GIT binary patch
literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Rh}-6ArY;~
z2@<S}6GVEN0u8v_4hFCv`or{J^Wu4z&NO@Z{{K^~nsnG-yps6${qx5k`5UV3nSr2r
z>sr>EeF=*0m!E1smt@Z0{D1zbgC`YKS9|mc7C4lNnEd^7k|X(k{f9|P?g1<<KUx0;
j&k}Gyr~$T!M}vW3gQrAhzapa|&=m}xu6{1-oD!M<kK052

literal 0
HcmV?d00001

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
index f0146e82a56..0257e70364f 100644
--- a/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Rifles/svt40.rsi/meta.json
@@ -1,18 +1,24 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111",
+    "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
@@ -22,19 +28,19 @@
             "directions": 4
         },
         {
-            "name": "equipped-BACKPACK",
+            "name": "wielded-inhand-left",
             "directions": 4
         },
         {
-            "name": "equipped-SUITSTORAGE",
+            "name": "wielded-inhand-right",
             "directions": 4
         },
         {
-            "name": "wielded-inhand-left",
+            "name": "equipped-BACKPACK",
             "directions": 4
         },
         {
-            "name": "wielded-inhand-right",
+            "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
     ]