From 34cc49ccf01b06ca00edfb1d7ed8ef71a8c94dfa Mon Sep 17 00:00:00 2001
From: RedBookcase <crazykid1590@gmail.com>
Date: Mon, 14 Jul 2025 17:49:27 -0700
Subject: [PATCH] Made the Mosin bayonet usable. (#38295)

* Made mosin an alt-melee weapon, added reagent fill for the weapon.

* fixes

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: beck-thompson <beck314159@hotmail.com>
---
 .../Objects/Weapons/Guns/Snipers/snipers.yml  |  39 ++++++++++++++++++
 .../Guns/Snipers/bolt_gun_wood.rsi/base1.png  | Bin 0 -> 214 bytes
 .../equipped-backpack-fill-1.png              | Bin 0 -> 278 bytes
 .../equipped-suitstorage-fill-1.png           | Bin 0 -> 278 bytes
 .../bolt_gun_wood.rsi/inhand-left-fill-1.png  | Bin 0 -> 263 bytes
 .../bolt_gun_wood.rsi/inhand-right-fill-1.png | Bin 0 -> 250 bytes
 .../Guns/Snipers/bolt_gun_wood.rsi/meta.json  |  29 ++++++++++++-
 .../wielded-inhand-left-fill-1.png            | Bin 0 -> 256 bytes
 .../wielded-inhand-right-fill-1.png           | Bin 0 -> 263 bytes
 9 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base1.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-suitstorage-fill-1.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left-fill-1.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right-fill-1.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left-fill-1.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right-fill-1.png

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 5514db42e6..655f866f77 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -46,6 +46,45 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
+    layers:
+    - state: base
+    - state: base1
+      map: [ "enum.SolutionContainerLayers.Fill" ]
+      visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    fillBaseName: base
+    inHandsFillBaseName: -fill-
+    inHandsMaxFillLevels: 1
+    equippedFillBaseName: -fill-
+    equippedMaxFillLevels: 1
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Piercing: 12
+    angle: 0
+    animation: WeaponArcThrust
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+  - type: MeleeRequiresWield
+  - type: AltFireMelee
+    attackType: Heavy
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        maxVol: 2
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 2
+  - type: Sharp
+    butcherDelayModifier: 2 #It's a bayonet
   - type: GunRequiresWield
   - type: StaticPrice
     price: 500
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/base1.png
new file mode 100644
index 0000000000000000000000000000000000000000..eeab79f154c85952816e78d81e98bfdccea95ef6
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?31We{epSZZGe6zuSH
zaSVxYe>-s_Z?l02tG$NMqD7pg4U#t+bp=w7XlMps*vuGxF_pF0sn5mn?_C>j_37Vh
z%)ASnI3)K7tvD-ieZxV1t?hy*ynY;Dus!qPgN%XFoTPu><LB(wHK=|RwXpH-#p-{*
y&G+qj5Et__T=J9Ht`ugKFh<b;WYoBuiJkkPXQ|N9ZxeuSV(@hJb6Mw<&;$Sofk^fM

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-backpack-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..416958f47a47b3051757d860a6842af784f76049
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDCf{D0srt
z#WAEJ?(MCOyoU?~SOdCsBN`%K+-SZkd1xbdmjc(CKa&H#=q&yFuWIMJJF}b{7#Nu>
z8}I#Ap1#e0)rox~Q}&9b>{Hg>+<#rJ{)Oef+aH&_=QOUqH}Q<W|AE>m)vDZeDQDkQ
zwuAMta0n<kfDAxqG)gsg-L3Jxd@XF(x}5g^)#m%JpD9~=@Aq=`#HX?c*9!;i{q8Sa
m;XXlZsyjCAj7;eQHyEa;=}g>sC@=x&Ck9VfKbLh*2~7YgP-5T!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/equipped-suitstorage-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..416958f47a47b3051757d860a6842af784f76049
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDCf{D0srt
z#WAEJ?(MCOyoU?~SOdCsBN`%K+-SZkd1xbdmjc(CKa&H#=q&yFuWIMJJF}b{7#Nu>
z8}I#Ap1#e0)rox~Q}&9b>{Hg>+<#rJ{)Oef+aH&_=QOUqH}Q<W|AE>m)vDZeDQDkQ
zwuAMta0n<kfDAxqG)gsg-L3Jxd@XF(x}5g^)#m%JpD9~=@Aq=`#HX?c*9!;i{q8Sa
m;XXlZsyjCAj7;eQHyEa;=}g>sC@=x&Ck9VfKbLh*2~7YgP-5T!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-left-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd742402be88695d598e19cd5db8ce8fbde03a92
GIT binary patch
literal 263
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDCf{D7e$p
z#WAEJ?(MCOyv+sztN}Jmu3Xm=8NZz<JIN5K?#kt6Fn^vya*XW~{e{lEHqY0{m#|^s
z5KwSvU|?jz!kEQ<CF=gk&nrI0-QRC6Uv+WA7nvE{eKWs%JbM!DRk?KAlUgsklloh?
zKA(9;36~iN<4uGuZu4167kz)`v7L9~;<ppJyKl>6e*2yIB|d@qyRlJp!0o%wfu3OS
MboFyt=akR{04xntXaE2J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/inhand-right-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..cce29feaca9c7a3e2ff174be54b8213737479398
GIT binary patch
literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDCf{D7ePc
z#WAEJ?(MCOoQDlWSOT(Jro<iCyyUdh!N-*h`cssYHI|$05MVR^BrL<EDDeHtzsyY>
z0tyZd42(=Hn2bENfb7`GxnFL*{NZ))<Rlv}Ymb+fHz)gRKDD-TdVSr_=Jsd4*isc-
z+TjN33H_LV<V9`T4$rCgoYD_gCEiso(D}gpNWgWbo@3c=pt~77UHx3vIVCg!09av5
A`~Uy|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
index e4f1ef8dd8..c9436ead7b 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "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, wield sprites by RiceMar1244",
+    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244. Reagent fill sprites by RedBookcase on Github.",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,9 @@
         {
             "name": "base"
         },
+        {
+            "name": "base1"
+        },
         {
             "name": "bolt-open"
         },
@@ -17,25 +20,49 @@
             "name": "inhand-left",
             "directions": 4
         },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
         {
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-left",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left-fill-1",
+            "directions": 4
+        },
         {
             "name": "wielded-inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-right-fill-1",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
+        {
+            "name": "equipped-backpack-fill-1",
+            "directions": 4
+        },
         {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
+        },
+        {
+            "name": "equipped-suitstorage-fill-1",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2e86175dad80effa842ba7494708df721d57476
GIT binary patch
literal 256
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDCf{D7eYf
z#WAEJ?(MCOyoU@#Trd6+)Ck(Z$Gw65b}M5<dsCC(oab#!j=3i-r`0_cxn^5rrQhw^
zz`)4F!XcpGfM6V$$g*l{nePY7&nNb*dS$Ea5apj4Z9M&q@!H$VP37}v{$BHO@9OVg
z&&`zHDu}EPi%I&8zwXI=jZ3()vwr>272lZ_pZi)5w@b!1fqm;W<LEQ|Ii5h*GkCiC
KxvX<aXaWG{*i<C|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right-fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f37e1748700e055abc006af150c9c94e6a56b4a
GIT binary patch
literal 263
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F3${@^GvDCf{D7e$p
z#WAEJ?(MCOyv+_gtO0o~BAOBE+$sGz(|Hb9iHJx({Is$;h&A}b1RcfsCIA0q@i+G~
zFfy@l2q-u-AQ+9toLf#MR==PABsO^al{-<@%gWFHpD`=QyXyTZ^Qmd6H^N_S6y5dh
z`sYjRoXW@=u^2U(W6E3hoVRQt67o}jo8Df3x4~Ai@6_F5wQ^yYoqwDkFn=gBj1KBP
RVFL67gQu&X%Q~loCICY*RQCV?

literal 0
HcmV?d00001

-- 
2.52.0