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!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9F3${@^GvDChd
zfq|jJ)5S3)!u{>Ujl9hUBCPfrLW>r0mNrP<Xw(%*J))r*d|@+V^u<)xVy8YA$G>-N
zyw#_FuQBs3aN>~MBedeI!1WCW`L(tSp78o{fWh|6hYvCaN^_F_eUG2BTi2laQPjf5
zyBDkf{WjmX=RsV|({Ra8V!Kk9Rl*oW1CUYUZYFl_gPx^AN54&AU|?YIboFyt=akR{
E00@Cd_5c6?

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!ia0y~yU~m9o4mJh`hE<t`_ZS!$I14-?iy0X7ltGxWVyS%@
z0|UbePZ!6KinzD8Hu4@a5MT}H){SV0d~u`ss^p=K++7M>YyM0Q_@cA)@4u>@@9xZU
zZeU<!vTVHfTY366|5YdUiA>omma<P-dvpJFx%wBD`)+?+@}ASU`rgDd{{9DQr&OzQ
z*QK0&Q`rvI$HF0?-~ciJozW=O*mbwY_wu!{UF&k%|5uyuzka4{?Y-a2)f1n}9$YUR
su=l&abcOo_v8nFZv@<fL3*2Cso~AQ#<DtL=1_lNOPgg&ebxsLQ04Y#n-~a#s

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!ia0y~yU~m9o4mJh`hE<t`_ZS!$I14-?iy0X7ltGxWVyS%@
z0|UbePZ!6KinzD8Hu4@a5MT}H){SV0d~u`ss^p=K++7M>YyM0Q_@cA)@4u>@@9xZU
zZeU<!vTVHfTY366|5YdUiA>omma<P-dvpJFx%wBD`)+?+@}ASU`rgDd{{9DQr&OzQ
z*QK0&Q`rvI$HF0?-~ciJozW=O*mbwY_wu!{UF&k%|5uyuzka4{?Y-a2)f1n}9$YUR
su=l&abcOo_v8nFZv@<fL3*2Cso~AQ#<DtL=1_lNOPgg&ebxsLQ04Y#n-~a#s

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!ia0y~yU~m9o4mJh`hE<t`_ZS!$I14-?iy0X7ltGxWVyS%@
z0|UcOPZ!6KinzD8Hu5$b2(Sj&Fu8JFOJw|ZqU<C?q`E7Yo5B2f4#_dLOY|2y@7g?H
zBVWRXg+oBWp@D&s2@7Ku_m!yoCqJ+F7<YfaxqQ{d4PRttaQDsp?(ytNv{&WQZBJ^w
z>`v-$-THjy86{k1AdEK=wz$n_DP8pana6hCiHqM(=<dEPllkp;=9l;c=I_Qv(E+#b
SK4)NHVDNPHb6Mw<&;$T14O3_U

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!ia0y~yU~m9o4mJh`hE<t`_ZS!$I14-?iy0X7ltGxWVyS%@
z0|UbvPZ!6KinzD8HgX;|5Mc?(ZkZByVDpmGQU@PbGU!iHQr1{*wnKo;{FAT@lcK=)
zEB`V#aR?|lG%zqSv0yUt)B>_&C+B{-_40?;y_1t{ysSN5THc)Ouldy4%IWoWJDb~|
z`C>~|aA}7ds3-Je{*f28X*)cp-g8PnSe1BJxj^Rw^CJP*nR<?8yBQc57(8A5T-G@y
GGywouVN3h~

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!ia0y~yU~m9o4mJh`hE<t`_ZS!$I14-?iy0X7ltGxWVyS%@
z0|Ub*PZ!6KinzD8Hu4@a5OKZuM^GbZ10VMW_S>zD5$#P)f^(j?F*)X*w47G=Smc^*
zk(GY8YXbu#6AOocf&+qaU?R(^t!2I+EI*&vv+9+twnLPEX0-A2GsbIgFE^FXpZR;u
z$Gxk+e?2!-daEF^J}f5bH~zXO^EEEv%Fg=rM^}7jT72$nJ=`uC-vsup*Nmgj@aK3k
QFfcH9y85}Sb4q9e0Or_KB>(^b

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!ia0y~yU~m9o4mJh`hE<t`_ZS!$I14-?iy0X7ltGxWVyS%@
z0|UcOPZ!6KinzD8Hu5$*@URBtwTNg&sB@?E=S=50U?n0V`S8=q<{;MK4-<40=a>Bd
zlf~cM&%nsU!XcpG(12hx8gp(rm010L`jgn;?N{zZRWB<)|9{4;An&U8r_86OrQQgC
zwNZ4}x9guTv2!XTYs6yIWR59s*>m2qg-FOx{cU=C{oMvz#lBN_i`B}7VRrs;e!%>p
X%rH8r`-BMt0|SGntDnm{r-UW|LornM

literal 0
HcmV?d00001