From e038b07a40a9d8d9918536090ebb82bea520c160 Mon Sep 17 00:00:00 2001 From: halycon <104782767+kleinerstation13@users.noreply.github.com> Date: Mon, 8 Dec 2025 21:07:32 +0100 Subject: [PATCH] Hushpup Shotgun (#41512) * upstream hushpup * fixes incorrect filename in attribution * sprite cleanup * Make the YAML not ass * Remove redundant line of code * Resprite, attributes original sources * More sourcing fixes * Last minute sprite touchups * So... don't accidentally copy paste stuff * Fixes bolt being on the wrong side while wielded * adjust rolloffFactor Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> * Resprite * No more pegs * Spanky mind controlled me to commit these changes --------- Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> --- .../Weapons/Guns/Gunshots/attributions.yml | 5 +++ .../Audio/Weapons/Guns/Gunshots/hushpup.ogg | Bin 0 -> 16307 bytes .../Locale/en-US/store/uplink-catalog.ftl | 4 ++ .../Catalog/Fills/Backpacks/duffelbag.yml | 14 ++++++ .../Prototypes/Catalog/uplink_catalog.yml | 14 ++++++ .../Weapons/Guns/Shotguns/shotguns.yml | 27 ++++++++++++ .../Guns/Shotguns/hushpup.rsi/bolt-open.png | Bin 0 -> 420 bytes .../hushpup.rsi/equipped-BACKPACK.png | Bin 0 -> 753 bytes .../hushpup.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 753 bytes .../Guns/Shotguns/hushpup.rsi/icon.png | Bin 0 -> 436 bytes .../Guns/Shotguns/hushpup.rsi/inhand-left.png | Bin 0 -> 659 bytes .../Shotguns/hushpup.rsi/inhand-right.png | Bin 0 -> 632 bytes .../Guns/Shotguns/hushpup.rsi/meta.json | 41 ++++++++++++++++++ .../hushpup.rsi/wielded-inhand-left.png | Bin 0 -> 587 bytes .../hushpup.rsi/wielded-inhand-right.png | Bin 0 -> 576 bytes 15 files changed, 105 insertions(+) create mode 100644 Resources/Audio/Weapons/Guns/Gunshots/hushpup.ogg create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/bolt-open.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/wielded-inhand-right.png diff --git a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml index 4445bc5f29..1a0136111c 100644 --- a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml +++ b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml @@ -37,3 +37,8 @@ license: "CC-BY-SA-3.0" copyright: "machinegun-one-shot.wav by DeltaCode. Converted to .OGG and MONO by august-sun" source: "https://freesound.org/people/DeltaCode/sounds/668347/" + +- files: ["hushpup.ogg"] + license: "CC-BY-4.0" + copyright: "Created by UnderlinedDesigns and DrinkingWindGames (https://freesound.org/people/DrinkingWindGames/sounds/789647), modified by Halycon" + source: "https://freesound.org/people/UnderlinedDesigns/sounds/188499/" diff --git a/Resources/Audio/Weapons/Guns/Gunshots/hushpup.ogg b/Resources/Audio/Weapons/Guns/Gunshots/hushpup.ogg new file mode 100644 index 0000000000000000000000000000000000000000..c86e6057ccbf007d0caa65f89521ca8c7664a771 GIT binary patch literal 16307 zcmajG1ymftvoAc0yF;+x?j9t#JHa*R;;zBnf(G~C1b6okB)A0+8Z1Bv!GeWvNdEV} z`@MJ0dvkjG^mI*EbyxkWrn+}m)yhf(fC2t)JS5v#GjTQP|s^-1v5cq%m86_mOApjCccf%L>aim^1q z6=d~qSrkAJxJ*Fy9iDtW-dH{9#0-tnQwyZ+Fcwk~7j6p_!iGgu!2lLdDxpA5 zqGC)ck}tKit+B~&v94@!7;9h|Ye4(^2xxe?r`Z7cHd&?rN3qmPgZ{sZnDqz~AO`Ak z*oAc1g+^MPX4sVl@vnwQ0MMpl>MVnoIYnvWLJ9M~jPPW301)FO z9dsf63~EE2bCEcJs^evgi7vHM8m4%QLe7TF`!yXa}?<<7nn!e&%$R+oU{N zR>{AXH%>NUb@?pVN3@@VF+^kvK4&wVg;>6<3y#&B&f5FXjt91)Q?lus+cp33`wuM2 zU*}Br3v7WSqF1u*+L4XG){RBZj|t?bzW*IQVxZkjmk5V)Ln!>?5zO!?ODU7d+!HX8 z^EpQti^<~RWfaOo)zpdTOWZ^LuABk@!m$3L_`j;ZQ2vMF;-t4sqYRDXTw^RxRn@?x z;8EQGmLwV{h+-CA5XEuLdwFg(0&;dG%?tX>B`N9(j3xg(3N$K(MWQ$Y(O)Nt$Z#EH zECapbe;V#5%@p?Yng3Cy&PZS3(1K-#i&cYLSW8n&$J0SC-D9;i+-S*TW6^(OG0yl| z#QzSg|MnaJbegcgKAB<`%Q>7Asv?2>&%poXIWBm^??^wtqfu<2QJ!U)_{F1o&NG86 z{fb9f1K(%{-(!vds=;S8#|xd)f`0LYF1J7pTK)A}{^KzJ+-76Z<9~S0lZ#LZ#P7%@ z!Tm4K$!Cb)=8vbAPomLFqVrC(iq0y}%sVVEMET!5$NFtq#@n)}xBF4?4AE&e(ODJk zh4!O0M;-sq^532#>q-L_&~v0+Y5s@j^l_3(g5K1?qI~{ujlwgaLfxgG{Z9h`Kwl!7 z;@>#(N}ctKI`0>CRxM58|GUS4)Gs{Bb3CA8QvrYo0H{GDhhe>SO_XpH)YGjV6Fj<(?=`FWi;`A$yJto-NV6hg(fxy3l<(beD} z01^D47ECANL&Wd^zzj_tg)uxueUfo6QGJwimsDLrpe#pYQUK|B*eEALZYUOG38}^; z<1lI1xcF{P=(IQk08sQnz>fq2kA*aVMGtH`(@Z7vDB{s7;!029K^JkA7gKpAcz9oF zYK`G)ebLlfB~aFCp;g9JR=&{G!j;y-*P2UH)@pW`;(;z}YJDZp`qBbjB?!<-^Vr~4 z)&p-BK&r=Ln!oXagHgtRSSjQEWyPnp*uwkDUF($=R8Lb&&l9S5t);WzuLx2#l$Y_f zv|6;5FCDbf{I}e-jC7#O*IIf60S1fVTUY*Dgio9ozj%OD(*>w$tH%a|O_q&q;fIPW zhKh>viWY~8nref>gNnk6(FUuEnyS%;+R7UHBamA2p`wAMqJpKeq3W)J<*4ODMMw2$ zLtS=FHy18hjT?uO=ZLJ6SbrIXvpQLgTt?sajdlRdq;UkhvQL)%Xo_eX;H=Z z9;UI6b)yZZM;+`<9+a=NJiewF?dX8(a4`1DGq?_Ka1iRPz8eJ@%>EXbaw2U9hc!Bq zfPF*f%%Z0J@g-JS;7lv3vnwi(8XTDis*WUHY55zaLN{I*={&(L%}1`0r|edTT&If7V{z>lTTIF$moz;QKvw(t#TXI_ zCB=A(3ar}WAdrh@#pTM2aWv%1n?Y73#RQ59oGo|;j+_gm;D}-z19`?FJPildp)Bel z3Xs+3C*gl(>}I5ZtTIEB6cnmclhns^lAl zX9coKQm|(o(l=0Q_Q29d{X47bW^Fs$>LE}#Z3&^GLVYuVog?QSv4TzYlkoCE0)u!^ zxP~2X>4NPO!N5UyAv)CQwY5G)`TgbdAp z3L#H!D;}jjDQ|=2IxfJ3EHN%XU+$_T!N{mJE{;UoJSo7)IJh8yL|a0j$izCRZO6z6 zu7VZJJN~*Yf^zgA1O;6W8IS_Kc!&awI|xK2grU=f#dzjeR3(IDag~7fN3TQDVWdMPp9aTf)n}|M@-Pn&^RL~+%>tFu)~xT=*xpa zjaGYrP$(H3*SD>1S`tI54qxC>qy?d1S^X(PpBVs-!3iDzjU%)`A|fD0SOm%yu);DM z7dRm00V5-67zWc&PAG;15Rws6g}loLV;Z(L}uc# z_`8T83Q&!)oDq0tZ#nmKB#{^gGr%0Dl<+C_0AI3C`9~~B0B?stg1|oMQpYz5P?TT5^Y(2Mq*T!r!`_>fQjBf1~_Ac=V1|y2gPBac?u*I1Q=*RlrS=a@BuwK zMPDJ)OrdJ_kX@@V7+^wvhiNaDTxVh6AQ@DIn*6eJMDgjKAq!iuw~GLDf7F z{zCO{3z_msU4I{@{5SR~7X%>+`xJ$#4`_-;sqA^SKEkS5k0<~^XaL}{WP8N8FhVhy z6PBhJmgtIQ#)hr_RzS8MDn~R(_$7t21W!ZV?jXl3_LXX`xdP`vRf@I(!@H1K*Q#dE zad6v7fdp`1QE~^1LGTDiKtW+}j6i-}-!!Ko9Nae?E)+DB;V`#Z8(074Dz+F1(-(g4NWL15+qK3>D|Pi2F=fhNk|M z){|93&|U6@^W16UUYfS)m@niCx5TEB-t9y znI{Pn+eyDG%bgyk%euritC3!JOg$^7Mf8}kOUXU8G08v`;rv)tTznGhIoZgBD-*yo zw^4NFB_++d-Pp!CfS>=O02ZC31^TjfKijphrEiY;u73{;%cM$|)1{#lpco?=7+1Qj z`7;+2akFYPpbORLoF`*qu0edzF6i9D5_)*8Ln0M`}R)K*per#xFN>CFYIP2jj^u!OMtH#{Q5(J0Z{j6RiJ810W1<{xE>rMO;D zEh=B7qMe@CQ}nU8(=x#V7lgrNo%Gj#xY>1`iT$^NQoecxIlpM_Q-bKxA3>UFk+)uIbzPQVd%YJ^|SjmeODQZfBqcC zgCrI>Nyg>&ocIJG72mw%k<>>+bB&qG`fUf}657`&#+tFtb>AaXzr9c?aLv|sf}|(m zU?GTk(J1pENC%`m+@r}^9;}(wA1Am%)LX28es4$)yq#WA#mMY71F9m+R5c8TPg&Mk ziuxb1G}`$~p8l4ToL@2w@dW`BsAf!XWdMJxj!j?PaOWd}okz*~K60NY@@{>!)i8N! zJ!Bpo6?=#8o_(O45bYrwu3nFlAO2?xcbHk93css3&4*t!y+G429ju>f{RVY5918&| z%!qww+aR2iF)hVz-ggRq_Mk_r@G?d_x3?B-aRAlqEJ~1}h!7>ub9K5YEP#uD+$^Wy zF(^?$GsK@Nz+>)Mu|!J3&aV&519e5&!Dm@v2vlyy_@>-8Xf(x0P*_QaAsbs zLM_Wc3JMT3d^pa2r7ilnk;C0VTcZs>unyC${c|SiYwYu=Wde-Fk-|2Mg|}V!59oF( z83noX<`qmH>;Wd_cv|8)ba$5|Kk`*1MB0jIb?zf~UfPN3OeP{{biYh0+*!iL62*UK zGExKtZLnO-vbXJ?Q?So;SLU4lSE1!buMSJ;f`jPp`9=+BL2j87VFKB zq`QL8?*S%$Ws?)`7Tk;-o{~`+2())^DwndQjQUi-l}9o{=vcf~8a<9zZ&b?F*Sg{a zouZIHU6f}th5p?d?_gao6%AgJ-J$X&J1ih2F(zqHNnb9{JfckEghgf;RA7&mL?bV7 zCkt`@>8MXqJV#dg%YsJ)VnK%rQKLpg`8Ah83L!(|yXyZWhTlGAigKP9@oFCF^CwC! zHb{`hfD?dcRS!R`V!T3cun|x!`F@@7>xdCfBLR8W(aT}HuCJ}t8@JqK74+(-h4ZP0 z-vU@U8s2UHL~*@g2xh5^$RTp1v@7y2oIi6*yHa{>5#MU)jBGQK{H*TKN~cFp(-CRdoe{5&9XVqu|bABcA0h|W4LSI6^}Lfm7<1y}--ljJF8!HAxoRy}4?+4AfeeRoJ{tSF=Xsxg z8*1N;$E8vS?bz)Px>Wu8^ZT!4k^?`mI?#0lhZw?Hxo@ce{TSXNwEN%;?W1A~!QT$O zUG2}$UzSN?-D0fV)9{wpNiYL?uQQU97n6P#U8Jr^`kS85FQ@t)mLEwik2egKWe@|Upisr)#Yn}!0KgzLxY$rV#`DSa0L~??YYU8)< ze!8VyI*?2dC(a@(q^Q__#KIfS6TDz_@l{`}h>rK}PQysYK0I3`{B@&v!6@eO{Vsl+ z0#MfzX?BI3Q9LN4=C&;~^Cs@i`3G;L^4*>bA7I^2xRpXC7HMJh*1Bh!$d;`D*7_Ns z7*tHNg{zJW0BMJj+M?_Z0ZQra-e*oFoEi>EqDRA&+jDd+sV8mu?E>i7wufBNb=FFX zmzLI{=Lf!-n2zW5K8UmVjSNN7KVaU3jm*piWKZBnTr57i`AT~!xMD(P^_8Ts07ABSuBh*?bu>;${Qd!H?3!0zZZixHqnnGSR>Qq?3dv&F}Dbau9r2cCZk zd?W&s2N6S~7I7T%2;(As3_g8hgORtpfc0wKLGmsJ5OjUyV4S(A8cHvEsv0@(ccW2i zIn}f8(y&|h%4VRBSblv@D7;FUX2$Pge2`*|``fQS!^ZI5I-N$`04((_t-D(-Wwx8& zCQeQIq0JQSE}RKDvZ1OH=a1Dmme|Mwot(3AO#&;*zBRk73v^e(&i8U!erVQMxJ(2^ z^0lG26Psy-h8y_slzrymqZGexC{!R@oABW=e<#fogQgvNKcsgIfqUC!@((Osd~SM&c@DOJ7dCgbkGI6+5S>!8u@?d7Zs|pT_wk zZXCs)2QHgeVHW;!;i0*6{sz`Vz%h~gxJt5eV+$5c^*Wbg5f)8JgN#q5+UGx$>O*XZ-n@C9C18J-C(!%>AKO_M|9EEqWZndZ zsxL|`aJ;)Z%^?)pz?Vlg-z3m&6Bf|So0>QXh-K?%-LPq%n*AJtLEo!No!2u@e zE)VCyap^V*#rtH|SE62zW5bQZkaPEbgJ0_?%g=wl(c(jdG4kfo%P&VmWNKwicC3^^ zlcSk<*=uoBXZhe0@aiy6iuFeCOIDvLYD0E)oMReNju$H?D$iJoB@s-iKXvDCTHzbY z0RrHJ*~3Ne=#^;uk1Uek;l;dnY&+RAD|0No+b!O_)V8@twi7ie?RT9ss9*vwvXYXE z^fBMx3Bi2zbb}i5rVf+iRzo-`$pDNGdy8vV`=`IC?gfbqC(@fcY|nQccV?aUZA-3O z;hJ~y@T@n{v3!yJRsEiC2CD8iMZVWg7PAl}F$%MfDUaHIyE5B^^NX=p0?Se2O+4D` z8t3)pkr+x{0{!u zr^VivNAJrwSP9RqJfkfp4UTs8jEA5}&18ZOXgNQiH7JTt$e-nfi5&SNQTu?#D6dHTz;$mzX?3yxQi4!P4Y z|}RvWMOGy0UWEoMy(Aq zdi6y44jLQ3as0sz%5i&d?>#@}%W_rj;SKJu4)1RgI;VIxt`?xr)0v{uaXYNiMvO9< zo8&m6gLfEq8-1y^Rz*5i@Apt?&qltv`-bD3I+yF#KJR$lJ670)+qvG>b;x!>@=a0v zq(>X8Ml|H3u{a}?_WgZ;>@H^Qs$}-YrQJoiqGx29zQ|3|sK4-a`q9q)d?rClUt2Tc zYu-^{T|qhoUT+!;h^6^@4qyqx5*loqR`3!5=i++6#FCl-owX%G) zH?e1``z52g!ONtchNpmd(@_!gdZJPkC*9UbG}Bu*ZhiR{18oa=iFN0pPAn(&ny6#` z!?)HjnjT-j>gZH!m3<8CO9tHt03chHg1N#%jYCf|ZEZA2NG>sgApq(XyDLCs|7p)T zEts&foMyhMH732~^R=7ObI^FSMLy=Fh2dJ+;ZX&l9!vc9LngF^|AEIVRZ%zhmL+ckG zZN6my=-TP?xckPqBz&=3IrR(Y(8;&P@3DE!NBg;i@era>f=`=t3_|B2OA~pDO5MrI z+l|?;F}KBnm#XKpLde6-^1KdqIAu4~;$+=)1omY-8}CwwkgmGKxp9+!|JcP$Y74}s znKRC3nefs;;;-lWtY-snh^lNXC}hRT+c(qJj52nXbzNB`jR1&z*A&3+hg7M#o{qP$ z!UQz~D^m3FOW;?}BE25U2`8d&{C&>XAGW5>nT0Q>4v$B^Hl%H_>ZsnKym%)Ks?&|Li-7%rIOru@A;IF?k_p-cyrVvgPpPn28ygBw*Le&%{RYE#eH{~?fkP}?hX zI_w>788q^J`kMlgw@5>;O|xWW;<#Yn5sM;^ay>eSxKQjc&0u`?i*C69&nEtJ&QJk5 zI(R*uGd#UI_*Ei1Xe;t^$_fSB5j8M!#wXFvD0)poajs-pCbJ;)$Z}Y=@savq7ye< z#YM?Gqoq$VyM|vffx{ziC1#a6VZ6uDndIwXaeehPjvJK@V?RXG+ zLSlVnEF~rC;|c@xeE(J##l^K1LN&jSCO|9iFi6m?qV9=3f^{IQFUBdU!r%_U_TfF|rO^gWbQr6~Xb5(gy zRbXi2$r>^JM{TeN+2XyqO9Wh6t2*0d8dgL3i>_UtsLoqFo@BqXvb>sr zPkWWM<^FrsXLg=oeh@GkhDS$8G%fzFYXA19`2?I1QMnX0_=5(1KhD$I$QyH>@; zMZVfj)8Se3FzP8e^5s$vL1@FOy)iIAyk}07S8IKMLMPTGUmb1L|M()APF!!Kgf8^98w@Or{ z#$u&UGOKF#{w(pGH4G471D811&eN7}aTQ8BWI4@1fnK5TRtW$S#SOEnT7RM|QxqRQ zSc+a=Rg*J@z7VbFWI-6}|Cu=ESDQjzAdy(10`=Rl*(NakN|-8YpLw7*N!6ZOToR$U z`G>w~boGjt_1&uxwH?LzSkJeOE_#chcG5f!sm7cI@as)3`}-MuhSrn4Rb>0_UoG<~ z&=h399+^$FNKOA~Ik6F}*^yQGMO*PG1q+DqfAiLTb7e>Zg(ne9@KL4&n8ipqN-04o zUPWIGzmDU2yy-Y$@9Y*$uhl!ZC%niIn4hR#v^}r;=CEX-YRfG3gJ|%>y4hiq$ox+x z;$FF*!Ybu6lG7yLKiyQA@F_-zA>UDha^A_< zR6e)XRde9v`DXmxPD-}|40iCYyIlvXw7&C~62mN2?%2o|~t6cDE7 z_o(3`3-Yd#Mrcl->gK_%X_w7;!Xe@K%n}bRoBy7=bv6-`&GA`1Gx$}`{Na6=47-gG z^9FU7Zc6sAtY^WNt{Vqm@-cMMj0zA%*v>J^awZZ#aNoh7NNxio9H?@cHKT4{AYuhg z`Go<7Vz7=L$Ks&~4kSZYy2iGm0PyL=QxWSYBaL(f85GbFpAti}YsO0ObiGEHlv9{Z`>X8SjBiVl9v+X5dL9njhW|( zBL~G2+kuagKrJMUW4LiNh zq*h8z*U6Jh{8Q)$PLjCQ=PMq!{So9=MZqP>cLv&x``fZpa~NN zQg&g6ZZ`SXJ*YsguyLxNG3n zkd1>Q(8c>R^$n2UvIOMS>z4VcR?YCJBsuIXlXM7SJk+qK_5Gk`Z)e7{sDM#JpNG_9 zJKRYTbI7hBCP#(8Z?&h3F6VS<6)NOk@yi^P`JQuF10C-83bB3kg`1(u;#=dvDhl=E z{j{*Gp1i*rK-!b^ov>`3L>E$#swi|4MTx?a$98emmhnkxe4kPE{Lk?t>XlQa-k}E} zJqgjIR_d<|&1$tuzNj#g))T1@w&YkYm}@GLq_Ll4#LFg;HBKj2Q!Xu;AKt`Onaq4b zTE0?jq~(shJ?DJ%QRtNorYS~ex8f|MHf*PM;Nc)}cojc5z3j^&F;tUn z#lp56HzIxzD$4O^ELBHZpCKV+^L<$h2^!%?vy|T2Z{jSN1gIfyGe)OHJn%pO-x@<- zKk*0~Zg=HvkM$cnLBauf{PMUe9{AUWeHAGu=|t3+6YY;vum%W|zQ491N6THN@ne6W z@MpU1PWf>xN`!BRbTo?lXWa0tn7BsHAjpct50L&mzNuqxWZGpphwj67n${~A#WKDO%{p9vz?Hl3|H!(-GFCtxGPeij}K&BklP|KTO28q9OMfM;8h zZKXVen=W;rQnbEWf;E}VyW4%divRP{=kl7;KF#{MrEzl$Cd-XS#!@d;2@apS=39g{ z`H!dclO=53Zp$t^7%~CO=RYm$u@j=P{_M?W)i&qDjrca$7WL2qlS z>8vj>=M9bAjhyp(Qvz`dfb>20g-DssL2(@9Yo~MiR`2(SU4ao%5K@GIu>B-F)**Kpio!xSz&G3GW zgd_*YjD-t1!4e&!UX}6c8uxGx6Zv-e?RCEp%78~RM+9e1fpD&zWaR0LS-f+FlLShs zr*%j{G2_-Jlq}T1ppsh;QZ#%ZfR}WrUT7K7)lfP7m~`vI;Aq9i7aXa-aBwN~u808q zgz?GMjNHfF;mX>nBiM6FtJq=H;6{OCc0NRm!6F?L$grSIm0d5Nrhb|3@<7JWXi}V#=1B7 zfVY3(Ul^W>sa~yMNx*qYn+HUF@{44_K$>Zy(^G@!ep2C6K8cGg)pnYP=lxLs#Xv_2 z05LM|_KP}Fu>%Qn?Yv!KHG=_!?Pn@K0L3E@5(xatlH?;Tu&*fHy^7;o%5-V?; zBrkn8L4MKf4j*J(?E4(ISHTGHYUwm6z9i)5U*MBhOWEwN;>}dh;FuSS(S3Xc2aBZV zXywzcrJ+~E7sZkNlkUkGO9_FIG4 z-wH@|yA9@Il2z{xh# z@Cq=wzKiK~3VeOHKb!XX*7w@e`%igw-r-7Be`R;`Nkwb300-_vsQq+RL#sgfSJs)9 zU;H*9_ErNqt1!x5@+8O`t|g?4`gMdF*dCmHn`V=VHK=72ozsiQ3DP_q%Eu~QoNOhY zNrIQc*C_Tc;I&XrmQf2mVRTFn9t1ra*LpQ*^yReqk*1Smw|HUP?8X8s;<&lfE=jzD z5qiIt8Qp&`pCTcKS7t^ATA-w#w78bvMzPUEEbWpctrdF|d4XKHV~ zt*R5XA35n+($0Oa0w>VtVW?uJwl4W;qhmsNJkJYyt#a>49Rqd;7|Z zIK=bkkHCWg7_6#@o|;aQjtmMnPv-{agKmeJouce+31@Ub3E4{z9TC-Xu?j{IQnp)Q zO>eXgzZd8d+(;>VI2e;V^(dMSSir{w(W88RUJx4C0T&xQl~Z}FDW=xA?^rdSK;Nw` zs`i7&RV1Dba7Xvz+kA^yZQ@A;g$)fImr!9OdS{gWeBti+SQckBt~QB%*zQ-Q)bF+)nWwnY*AwTjFQ-YYT28H1 znm%p2QEbbjYF>JBuNLXf6P@><*=#j^)!i)>;E7gCZ|L0b*|4a4kKi=9w*2A1Kl}~$ ztxZ4)#BcZYyU_u{0U4>rhe~*x;HgV3!_$M+OjVDhH_VX>X35k=R4>PJB~lHJ%f@ak z;HnO50AJ#E8h^Q4j<)dewOqUQ^X8rqG|%+ak;mR_w^Tft$@ODmqh5jyzIGB=eakg| zv8tEUEU{WJ&zh$@xqN;UDVpvt$HQoy16r@FS?TfkRhC>EEbQY|me&tneM?;}i+Og{ zi=5p_Ik<=LLpcw9jkh32^&R!~ad+5}sR~>${D3nrB3HHAoMO=q&DQUPteG96v*UfC z3oR{G32}$UBx*<5fZlZ^qebR00 zHiQ3KzMp|fFL5A0l4IPcC7pw_Sg#0t zZ4-RtHdlX^gS>{42jvJxxoDszWbOD;m8l)WV#8Gz`QAiwpp?jW&s7q}v7f4ca!clS z?CUo@&b^zI`8ceLi!5nsF}K8=a{HyU02$vn{~7NdP(1)u@wpI${SG+1NU*ae8JQfBg?G@j z=rIe86r+10nwxQpA1C4HK{a|DY<#zyUum4bpA#9$?R`{kl^h6Q2qN?Lf=LYZ{FcmD z+rWY;>)*BFq**=Wwvkxl0I8#Yo+)NqK!?WnEouNn>3m1hkVNC1)$9 z^|ScMq6%q748j*!Jg{Qstc>(1!0%rhXFOhI=Z~U)k`E9A^BNw};?K{^h`5i+1Tm*S zZ$q0Am)J8%7hBjdev9PV-Rjslnul`IHtINO(ma#j3@m`C#h1?JOb1+q(94Lzuq`Eq z^k1HDBu_{)T&vCpS@?wA{-}Q_m$KWyo|6s6?|UK5fspU>3N}cT3biaVT}|a3F9Gh# z^jv8D&RlK)hA!iuvgd_i@?91)&%Sr+!}jo^HKk;_vh3&A->iU(FqYJ3{ z4>dpcAAfltbn|0n?|N!ItNtY_B7xQlVV>iS20S%|md!!cRbkcPYpRC4_B)kP-Z~1t z+BW)}XJRF}_N zwnD@}545Q%g&!@jPdC_nP33w1b?QDmi%o7bU?T7R>sb4H?&2i7XyVj@^}@4kS3d5Q z8ZCI_D{}cNnM`cP&8(S@)#ZmqHAzD{L!5Uo4eXEck!8wzMt96449lfTJ^4^7p)>R zW-~v0Ioj!Z&YZ4MqnNoN)z1|DoDNbR6E@<0iyiJXU`Fjq_K2*>*12jT);@JBNOR1Y zwcs#ltbf7auv76Fe#v$UkwU#s9(EI>{BSE2#x15~(>(>z0D`rLslXrC7DEfvU7vlf zvG1nMl5vJ#tY7t4q@nlcHHE1Kb2R9;rgv1s-SI2t=^9h-Y|s7$o(P1cZEZ^3527_+x9fa+VG7d+9IZG&<6dgXgjdUT#|izsL}7oA>~A<&T1U>J-D2vf*}T??rk50$BK2U zPu6DF4gWz(+f`4vY~neMd{W@OAS~V-T}pejG?(%LxnGJDCVnkdDNH!bI+Ug<#f(oB z!CNwFpl+ErsNMj8>mpUe%7h7Wd70=bxD!dn@eeR z@vX{TFQj%;Dy32q;Aa5bs67_T4)u+s*L>8`z*o2+LYsBBps%UnvmfB$gZ17IeVn|c z%AzlzfaF2H<)m}$lB;b-nb$&{0P`fwwg^341VCxrx7;_GbLV7xt$=-R1GUjOgOC36 zo(gCDI}Q?gYF>W(g&@KG33f-9aEzsGA*tLAi+=Kl>H_!%@7=C1cuCpZ8i3@TO{J~l zb3y=nMs4|f@5cl2EUKJ$zMN>h{h>v8VjtnjOk>QRl@*uk4`J4QmPs2`Cvod4`AQbs zz3H1u8K%>Wtc9*SE&gPG#Z;v$*n)b@$Uzxo6npeUmi+wKiF#86fTQ=;cJfasIsfg^ z`|KlDX3_1y&covx9Z%tQqkiW)p8T7T$|CH?U_qsW9EEE8o|jaDt&YNlyI&OrLKaxc zlH2vpj=wwZd-ULH6ftmwo)_b)#!sYWPB1f}E!Mk#`w^9l_Gpd7BNG4~F4rLeCFeDh z69edkge)T|W9glkkdVtmVN+WlW5hT_PYF-ZmuSqArqM(pmU3|!WLApw7=+!WT{)L> zr2xs#d7Op0DN#ed zZV;A!6S59Xu}jS`e%+NJ34c1XyjEmqGCM9QOVONWVF~noti)6$zjr=~5w)pZ7ZH9r z+0H!XdTtL<2x7Y28f(H8YZgx9<04qo=QcC!X;(FMarntLV)jOs<`61cN{Ze>@RgyX z?><_%ATwud_<}v2san2I2eZzR$Q+r20tevI_@H#<$^0UU28a3K(4Sw&Y{BA!{f%`$$3cY5SoR{BQ>ce14|13Q^Pf4948uoTEYdsd2~ z5@`d&@$Q$sRi-?sR9!D8uASt=?vqBu{k#od*Ply13T!>?aE-LDxeX*IX_d1_ISW@!wjQ@AJ2*L!JnIx@4>#wqNif<1jLhfGj4rAA0g4Rj zGTLh{yNZ6G6*2NbdpbM25sF?Fe8GA5$;N6?JXkhpbm>YJir;PR+o08&1G-Vl(f!mp zYzoOU(kcsl{o#yBh|8XWl#dD$F!4Dh%u%8!JAs=YY6m}s=gPoodUja(x};ZWYAnC2rJ zli&aV+tuH{0!p3a9ThW^_d4$-$QSZkaF#*@Cj|IkXaP+|UJA0j3CP7kFsJ?VIY>LY zJZ6FKZ@xRo&C|CMG`H%vec{lNqGKn)&T6!5bE8V4lfv?ZeQbvV%95_f^Vr`|^NWRm zXFVSr-5M{<;{XEB5Xt zS#tS6nVVFQo0j99?R}RObPx^b+sJyDX!I6_9=A0Sw@Kf-yIUpmxIT9ier#G(kx7fb zkiU3E{5|-!MHKa1js>!w6y1;&LQ$B-v5sgXSTi-Ww)PmN|$tUBf zPAqd+ShRKwr_zFFW#3gWPnuQ>)3nF6GgN)zZ_NBnrV7t^@q@P#_?~Su{FFa*mT2Et zk!@|J-jWoa9*_JgrU->e1#;w=g?AwWj*x18EM;=SNN z+l6z72-Xf>&d+&^=!MrNsoX)>VcIaw{2tG-U}T+x+Qhwx@zbbIMg0-k>C;{yzeBAV zb4BtIUpXjmD42ayW0^c7M)wu|VIqqGfZi)K3GQOYlU21G#mW`p4yO8N`7qWWmgUVk zy=Gk-OH#;9fKwbuCmNLZ;BDkv=GSH_S}H%E60guEa$lS);|jhstS^!z4R&#^uapNo`{ z!M#Ov9kns&T9$t7Du~LiyHcfA$O$7WLM#{f4f*kaglR~C3;$QECn4GA{NuA(nk(IA z@V~zTQ9peB;H%vm+8=de$7p(>jR!WKYlRzwcbrx1Fe?)#Ua z$RyS1jm78vz8su<=RojK1IIW3+|OhFK06+`7TsH(PT%@1v>Hi}Ar7%6!iap2OC7h@ z8u&#IHYW>`e0+K2wOA&rLrG(IMT|hcg!~3w=!L<>Dl18N_pUngQOpYWPwzKU>##+) zZ+J_MeP__=(eNzsGXtX^^CJs;iITL}Gic?Z-y0uC3!y&_Xb}}Mi+)GgV2&254BI7@ zI>+7S4GD4SXVz|#ql39s*IJEnI*P(d1Qk6(5OE_j(*hpAAwTrMPM#<5ds8VVFE1V! z$XGhnIlL>F>|fmNN12a!&_R8VrJ&$Uu$*)~Y{lbC02s5fz-JT#-*+kr`PkD7gkWp; z_pMG+(^JGgb1OjFiz$N+PnjzmT5hEm(v_5zKTkOVgx|``8HX18E+y+D-A0Ll($doV QfqA^3Xf($yel3ju4`W7@w*UYD literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 7f0f14aed8..9034c82fb8 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -34,6 +34,10 @@ uplink-gloves-north-star-desc = A pair of gloves that reduce your punching coold uplink-gloves-knuckleduster-name = Syndicate Knuckle Dusters uplink-gloves-knuckleduster-desc = A pair of plastitanium knuckle dusters that let you punch hard enough to break the captains jaw into pieces. + +uplink-hushpup-name = Hushpup +uplink-hushpup-desc = A powerful silenced shotgun with a low magazine capacity. Comes with a spare box of buckshot. Uses .50 shotgun ammo. + # Explosives uplink-explosive-grenade-name = Explosive Grenade uplink-explosive-grenade-desc = A simplistic grenade with a 3.5 second long fuse that is geared towards injuring personnel. Causes minimal hull damage. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 6ae9e32a59..7d7c4385a1 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -418,3 +418,17 @@ - id: EmpImplanter - id: ClothingShoesBootsMagSyndie - id: AgentIDCard + +- type: entity + parent: ClothingBackpackDuffelSyndicateBundle + id: ClothingBackpackDuffelSyndicateFilledHushpup + name: Hushpup bundle + description: Contains the Hushpup, bundled with a box of buckshot. Quarter included. + components: + - type: EntityTableContainerFill + containers: + storagebase: !type:AllSelector + children: + - id: WeaponShotgunHushpup + - id: BoxLethalshot + - id: TreasureCoinIron diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 9925596c48..37e4b7a371 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -188,6 +188,20 @@ categories: - UplinkWeaponry +- type: listing + id: UplinkHushpup + name: uplink-hushpup-name + description: uplink-hushpup-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi, state: icon } + productEntity: ClothingBackpackDuffelSyndicateFilledHushpup + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 8 + cost: + Telecrystal: 10 + categories: + - UplinkWeaponry + - type: listing id: UplinkC20RBundle name: uplink-c20r-bundle-name diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 27dc095c73..75e25e2c66 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -294,3 +294,30 @@ components: - type: BallisticAmmoProvider proto: ShellShotgunImprovised + +- type: entity + parent: [BaseWeaponShotgun, BaseGunWieldable, BaseSyndicateContraband] + id: WeaponShotgunHushpup + name: Hushpup + description: An obscure modification of the Enforcer, fitted with an experimental muffler. Great for those with a strict moral code. Uses .50 shotgun shells. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Shotguns/hushpup.rsi + - type: Clothing + sprite: Objects/Weapons/Guns/Shotguns/hushpup.rsi + - type: Item + sprite: Objects/Weapons/Guns/Shotguns/hushpup.rsi + shape: + - 0,0,3,0 # smaller than BaseShotgun by 1 tile + - type: BallisticAmmoProvider + capacity: 4 + - type: GunRequiresWield + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/hushpup.ogg + params: + volume: -3 + rolloffFactor: 1.3 + fireRate: 2 + - type: GunSpreadModifier + spread: 1.2 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..8e31be66caa3ae6dc3475ddee38823ad6acdaf16 GIT binary patch literal 420 zcmV;V0bBlwP)Px$UP(kjR9J=Wk}*reKp2MKNP|;TZmJ12*%ShqJGcbFztAy57k`4?UE-dWRE2004_c2HSS{PtB7gfngZXbzP`aN&x_S z0lcosKX6){!*C8tqjETyrgcyN#u!vp73z$!{QzFq`Y(1kd4G`0&a+g4HJIw2l#_D`CBUc&*%- zAPC^PZgFmi%-;V4u^_uJA68QFFx!)2DrcRIPl%^ZoPd9mE7nMgiE+Fuz;f?!GcWl&(Y}ex0oy0D#dXtTjG#wAf5SB9TZWf1WQ^Uzo=me5=d= O0000Px%t4TybRCt{2nlWo4K@`XT9v7}$b4R!gEKh7wEG)5F!GvW=XA?hxUaKD>yrW zRwS+!iMOpIEi$VrYenLdqeJw@6LbepxOxazw%6hI_I71`5Cki~_kTSRaTx0B`?#!P zQShgw5`VwHH)et_eShaN!S{VuN^y7a z1f7YBeakw1lt4b8$7nQ~mEYanZS|&heloJzEFK>pf#(})v$|Z@jUFVI3fMG@#wH@I z#}lLP0=vTA-d^msi45?4pKaSt(nTU{+fJN;u?=Xq+Y8IDudlbZ2P_)fvMgAZ6}ykv z2Dq-PA?@{$XbEil1TdjN>kksc;V{Wq8$nm&n>+<{h;4vv+weRuT{Q;qJP(CJA$I$B jp8Px%t4TybRCt{2nlWo4K@`XT9v7}$b4R!gEKh7wEG)5F!GvW=XA?hxUaKD>yrW zRwS+!iMOpIEi$VrYenLdqeJw@6LbepxOxazw%6hI_I71`5Cki~_kTSRaTx0B`?#!P zQShgw5`VwHH)et_eShaN!S{VuN^y7a z1f7YBeakw1lt4b8$7nQ~mEYanZS|&heloJzEFK>pf#(})v$|Z@jUFVI3fMG@#wH@I z#}lLP0=vTA-d^msi45?4pKaSt(nTU{+fJN;u?=Xq+Y8IDudlbZ2P_)fvMgAZ6}ykv z2Dq-PA?@{$XbEil1TdjN>kksc;V{Wq8$nm&n>+<{h;4vv+weRuT{Q;qJP(CJA$I$B jp8Px$Zb?KzR9J=Wl0QqsP!z>aq{XQz4+=GVga_^7N3gp~9Qy?v z>fqGHKo^%R4iz_{AarRAga?6;)TK+GgKg-amr@5o@cov{<-Fvad%1u_B9Tb`JIXH6 zG;6$2P%#`n?|heqZQEQ`RiTz72|AsQk`sxVR^@~c0Kjybz%*<8r{+-?|BnYdWm|yj#8-vN?Xu%W3K>=G34`kq0SiF4nP|^KRY>s5r3jT zo&x{~A#j`l9A}XBr}%(TCYZ2DSo`BSg1}e8FwERs7>2;=4J^(5c!mj!@Z`;fA71DO zFvGHvw4ngx2u?DjgLle=?~ivF7B==2fioX ztT&IIvNYNU;Snwj`KEaq;P)Px%O-V#SRCt{2+A(X}KokJrr#28exWR_n5d^{AAYy3o78TOLzrdU6kVOAN-uw$R zdCYpyq2OQ8$wM=E?+`Q?8eH5{2gMi?8v?IGtD@F%9LKtoRNglk+uXZ*I-e!p10aMD zLI@#53n2t%J%^-cI)e!zP)Z4&=jA2|+7iGyM=2$QVF+;r!Vyx8{2C&lMMTI1a( z_4|PNe4g4^Vt8eYrwec$OIZ?9Pry?Sy;W2$yf7#Ugb+dqA%qY@2qAm%F_E^Wd!5t0*>u{ z{dGlM0XgT`Z8aY3L3(VDQQ;1#v=7-rB|ybLjFS5R6@(C2uh&6*8Uo&2r}p={lg1#b t#m^IA7(x&PMv(P{vXIw@DMAP-w4aNy2iqNf25$fW002ovPDHLkV1m7?Enxrv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hushpup.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d175ebb4c513282b3a576609a52d9744bd753c1b GIT binary patch literal 632 zcmV-;0*C#HP)Px%GD$>1RCt{2+P!MqP!tF7zeFJIAj0+H3WC6Q5FG;EqCyuxfhR+U5N&=0dGix! z@|ac7q4*^{G*IsyiUymSf^yZt6c2T$)1?w=<20_TPwV_9VPEWXj*n!adjQ55V~nw; z3xa^kj-d=X0C=89N~uN`K?eZe_q8~Vp_GD@vT;QK0GOspwr$h6-=$+N!k=BPCkIg! zX|Kc<=Vzz5x-gEi6M`Thr4&5ROLNnITQFZ~x8Yq{gifb(G)0h7l2QtB9K-j0EqPtr zwb*qmdjItVgTVmP=@iT5a_71t%x1InxYz3)^chl0y1Fp%?$dW{HXB4y^mIN#2$E9L zWHO;TcY>6X#{DkcTwjvwSP$~}YbAsbB!mC}5K*a}aHw&=OXp{&xDD?R%vb*&fAa5; zOLPU0Qttfa8$$?@P4cE`9%U8vJ=OpKw%cvKk!0+#i(VtRjz!~scdz94?tnUKYzLs} z$uq_nV~jDz7-NhvRzpQit5ou-aFHWBl`KG!BRiGd?KMr448y>im(TI`;|7bxB9~Yz z*#RhUWT&znkZ>J~UfVD5<=c;3J7KRt%Gzyl9gA$+rqO6r&IFt5SafrJxpTv@sPUO! z(<+&N*U3{0?ziA)wSMq^tJMMk%6oifyPx%1xZ9fRCt{2+A(X}Koke?zl*^35Cwrj6_^WTa3N4Scrc+EvUKf7@aOQ7DT_aZ zr+kF0S-f<};K4&WXb4y_C>Dkz-hzkg;HpU^`A(J;V(9<32&B7v_nw57djJs;5fKp) z5&ds!05BX5m2KN^9;{X?3SI%Kg1_>%g7tes zUEKyd7p3UDq;0vyas}x3ggSB^%oY;Kt8SAQKfkH=VI9BxNA0+*c;7ppF@Ji-<@NMk z|3j8(z<4}{u25I!=b88WJ)z2N?PZ-RzJw3a?+I135M|~P5fKp)5fKp)5fKp)rIkK& z>vTHG_kHa;rY41=4H|i3n-~vAbv(~gmQ}~e$=9uCcv4DZlR}vW4bSsb7>0$5P^tib z11lkpw~mog8k-b~HfRLFJ<24HA_d4guKt1tWHnLD781ANycR`~(lsd*Y0#K0B!V1! zGudgdu5lr&iK41={XAAxPx$`bk7VRCt{2+ObZ;P!tB>AA^C#lADld6H*h0nvfU=1_l=vS091F@DMCcF8CTg zf}?{I#xO9rGLTqFY8#S97GfB#gPKU~y}eLWqW`xvw5R8udkQQ)01*)p5fKp){WrPq zUZB(INXxS3&P^s0wA=06A~D}3ZyG3skU|Jdr&F|AEd)V;Zud@mPZUM4EDPmwSsP~( zQ>)cvzu!-7h!8?XQDodW;|9DZm9AUG_4N$^U~9`ty9eX(_{;hDIg=QZ&3~%Xn6d%Q zx+5=p-dwU`u?Wu_0sxMkP3&$9R7wSmo?pHkAA$%yf0PTuP|jwvc#(6T!!Sfz%(9a9 z@mb=9X5EoT?hZ!JFF3!tSKi#LJ92kh;30?*Kk63!DQ72#vQjGGcJQREC-o)`3d zrE-&}02+hM3RNS0UzCudt3D5nZ%z>HYT~>YSRB-ti(DG9ISI~L_|cieqI3^_&1-