From 621b8e14ca387b5c9b1e901e9caaff9f37620126 Mon Sep 17 00:00:00 2001
From: Jonathan Argo <jonathan.argo@gmail.com>
Date: Fri, 12 Jul 2024 05:16:21 -0400
Subject: [PATCH] Made musket wieldable. (#29910)

* Made musket wieldable.

* Updated musket rsi meta.json copyright.

* Copyright adjustment again.
---
 .../Objects/Weapons/Guns/Snipers/snipers.yml      |   2 +-
 .../Weapons/Guns/Snipers/musket.rsi/meta.json     |  10 +++++++++-
 .../Snipers/musket.rsi/wielded-inhand-left.png    | Bin 0 -> 701 bytes
 .../Snipers/musket.rsi/wielded-inhand-right.png   | Bin 0 -> 707 bytes
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-right.png

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 252eecbd0614..f69cb4fd2da3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -66,7 +66,7 @@
 
 - type: entity
   name: musket
-  parent: BaseWeaponSniper
+  parent: [BaseWeaponSniper, BaseGunWieldable]
   id: Musket
   description: This should've been in a museum long before you were born. Uses .60 anti-materiel ammo.
   components:
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
index 7609e516b3a9..b0f1b27c24c9 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Pato Grone for SS14",
+  "copyright": "Made by Pato Grone for SS14, Wielded states by Jonathan Argo",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,14 @@
       "name": "inhand-left",
       "directions": 4
     },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+        "name": "wielded-inhand-right",
+        "directions": 4
+    },
     {
       "name": "base"
     }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf76836959c016316c0389f2e0933ec0eaaba42b
GIT binary patch
literal 701
zcmV;u0z&<XP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkQZ%IT!RCwC$+D%UrQ51mTcL*PaU;%@q(4ZxOk~Ap>jSET2#*GVO
zqN&C$E2Av@EiTab4~!BQ#)WHCRw!YbkXRH48rlhM)AErrw2|wgbV6w<Oi7K2=h@uO
z+`0GMb2_^@AcPP?2qA<JLI@$?;e)XHo9oWF_q9gk(|q(|GBlw878fJ-BGZiH@eJ4_
zfVH<<wn=tt+kU1|Of&u!(CSIvG~-N$Ce+-gd97vvey*<CzYmOsVse(7K5M}qiwWld
z=<DjRpUGyURSz%~@+*KHE6;MO!1Aw+6O#xGc~zjdg$u6Min)#CW?hB*GXJ^eeDm`c
zGi9$wG@=9W?)5B*Oj-lb59jn_izoek3ZR=}LDusf6#;gvyyHV3U$c+|!!WdZ3UH7s
zaQ{&l0Do|-EZ1jGr!{-i=_ij>EVgD(zW?yialnE8%NJYQn$o4imI_poDzu#X2K2TR
z%I>Y_J1`7G^Z9(L-Xh$+bK5@0;NTTzUcS;0LI@#*5JCtcgb+dqA%qY@lxgHQ|9>H-
zR_hR^87GlQGd>=~G~;x4x$Ry6DE0}s+B-3q<_O-pM>3VZ{^srMxAP?KH0F6fbe_1_
z>-E_G!p#8}QOk|rwQY}^hdlyN>=TGuZUFR%u1$sf>MZ>Lr^Q^#v~jg(AKlnx%-2~p
zrXJDD_IJ{c0LL060IKy16ng~>ty-TzV92Z3%F#`Z#6b_G;7-(vxl+29Oab7()T;ox
zw08D>?^o>QH1>(rIodDaq*q{McvST_Wq{NB0jk9Wh{e{<9CKuNRIU8@t^tH^_|(z2
j#A$pXgb+dq@jv+k*L*-4>{EP300000NkvXXu0mjfUV%$0

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8a6bbe8b4d7a2d0eee849a0868fb5884c89389a
GIT binary patch
literal 707
zcmV;!0zCbRP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkQbxA})RCwC$+Cgg*K^z6}x2376)TAYeY!a#?)F_3fQ1l|$qj(Sx
z62)&&+8p{>JXG=2Ytf=09z^icfF4AO4HVrLObkgw5{*rQ$tK`<NOsAZq}im^i|=<?
zGMSw>GrN15KR`r8L_|bHL_|lscQ+#c#eKu(wC-K7+gBNM@Wt!bq^bsx&1Nv^c3J*&
zj!yspve^ubKB^i30Bmo^;rDw009&!QO1}&MP}KmQJlz~>j{P!vZouq?pq%wOaK<?X
z09cP{mOkORu=!*{&JqA1clZ+kaMpbq0HD=e2sumU6#(94YUUW}boR)}1%s-z+qat=
zmuF<qH`38wuGO(yXkhnC+8lGV*C6Fuy=!}^T*A4r=7Mv2vu#Vubxd-n?dqTM$UFBV
z%}tvN1Aw`})s?97;NhC(b=Ts}yPs`r4)qDV{<N=%nvhp~L%soCN5j%)EKmp`>-sNG
z=HTo1K__+l)=hJf)6?g%_ULg(c6513rcz1s_luXWlwmeN2q6=Rgd&8H#=|lc8V<`F
zKtx1DL_|bHL_|bHL_{a+IOqL;GxOMogwf?C8GrK}>ii;V)rzG?VAAcvkHZpFHDJ~U
z414C^wx|W4*Yn||GW$-%PQ5_LSu$$`fM%V*PNIUan83&4Da=pl1Jwug%3qIZicz1?
zE%VR11Us3db|=!SUZ7glq1VTeEmi;kTE1WgY54*Gpwg-jXw?P)t@?n~m8ddkezmH@
zKT<?a?|#&6)FtF?X4=|-_MMJg6>{@^LIHq_GneGv{%2*c&;19*Z%QhaG{47gwE=eW
p?dG*-rc%kC^$0{nL`3vI`wipvC&AsBCZ7NR002ovPDHLkV1l>>PsjiO

literal 0
HcmV?d00001