From 453e30f409a3a9caa99f1edebe19e5bcd0585d7c Mon Sep 17 00:00:00 2001 From: ThereDrD0 <88589686+ThereDrD0@users.noreply.github.com> Date: Fri, 15 Sep 2023 01:24:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D1=84=D1=84=20=D1=85=D1=80=D0=B8?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2=D0=B0=20+=20=D1=84=D0=BE=D1=80=D1=81?= =?UTF-8?q?=D0=B2=D0=B5=D0=BB=D0=B4=D0=B5=D0=B4=20=D0=BF=D1=80=D0=B8=D0=BA?= =?UTF-8?q?=D0=BE=D0=BB=20(#400)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Христов воскресе * penis edit * Спрайты, звуки и фиксы --- .../EntitySystems/SharedHandsSystem.Drop.cs | 5 +++ .../EntitySystems/SharedHandsSystem.Pickup.cs | 12 +++++++ .../Components/WieldableComponent.cs | 3 ++ Content.Shared/Wieldable/WieldableSystem.cs | 17 +++++++-- Resources/Audio/White/Gun/insert.ogg | Bin 0 -> 8265 bytes .../Catalog/Fills/Items/briefcases.yml | 7 +++- .../Prototypes/Catalog/uplink_catalog.yml | 4 +-- .../Ammunition/Projectiles/antimateriel.yml | 6 ++-- .../Objects/Weapons/Guns/Snipers/snipers.yml | 8 +++-- .../Weapons/Guns/Snipers/hristov.rsi/base.png | Bin 0 -> 296 bytes .../Snipers/hristov.rsi/equipped-BACKPACK.png | Bin 0 -> 1176 bytes .../Guns/Snipers/hristov.rsi/inhand-left.png | Bin 0 -> 745 bytes .../Guns/Snipers/hristov.rsi/inhand-right.png | Bin 0 -> 736 bytes .../Guns/Snipers/hristov.rsi/meta.json | 34 ++++++++++++++++++ .../hristov.rsi/wielded-inhand-left.png | Bin 0 -> 745 bytes .../hristov.rsi/wielded-inhand-right.png | Bin 0 -> 736 bytes 16 files changed, 84 insertions(+), 12 deletions(-) create mode 100644 Resources/Audio/White/Gun/insert.ogg create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/wielded-inhand-right.png diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs index 42201ab6af..d87d195122 100644 --- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs +++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs @@ -2,6 +2,7 @@ using System.Numerics; using Content.Shared.Hands.Components; using Content.Shared.Interaction; using Content.Shared.Tag; +using Content.Shared.Pulling.Components; using Robust.Shared.Containers; using Robust.Shared.Map; @@ -66,6 +67,10 @@ public abstract partial class SharedHandsSystem if (checkActionBlocker && !_actionBlocker.CanDrop(uid)) return false; + // WD edit + if (HasComp(hand.HeldEntity) && TryComp(uid, out var sharedPullerComponent) && sharedPullerComponent.Pulling == null) + return false; + return true; } diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs index bbae03e45b..509d0ddabc 100644 --- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs +++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs @@ -1,6 +1,8 @@ using Content.Shared.Database; using Content.Shared.Hands.Components; using Content.Shared.Item; +using Content.Shared.Popups; +using Content.Shared.Wieldable.Components; using Robust.Shared.Containers; using Robust.Shared.Map; using Robust.Shared.Physics; @@ -10,6 +12,7 @@ namespace Content.Shared.Hands.EntitySystems; public abstract partial class SharedHandsSystem : EntitySystem { + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; private void InitializePickup() { SubscribeLocalEvent(HandleEntityInserted); @@ -178,6 +181,15 @@ public abstract partial class SharedHandsSystem : EntitySystem if (checkActionBlocker && !_actionBlocker.CanPickup(uid, entity)) return false; + // WD edit + if (TryComp(entity, out var wieldableComponent) && handsComp.CountFreeHands() < 2 && wieldableComponent.ForceTwoHanded) + { + var message = Loc.GetString("wieldable-component-not-enough-free-hands", + ("number", 1), ("item", entity)); + _popupSystem.PopupClient(message, entity, uid); + return false; + } + // check can insert (including raising attempt events). return ContainerSystem.CanInsert(entity, handContainer); } diff --git a/Content.Shared/Wieldable/Components/WieldableComponent.cs b/Content.Shared/Wieldable/Components/WieldableComponent.cs index 4a50b93072..8ba2e000fe 100644 --- a/Content.Shared/Wieldable/Components/WieldableComponent.cs +++ b/Content.Shared/Wieldable/Components/WieldableComponent.cs @@ -30,6 +30,9 @@ public sealed partial class WieldableComponent : Component public string? WieldedInhandPrefix = "wielded"; public string? OldInhandPrefix = null; + + [DataField("forceTwoHanded")] + public bool ForceTwoHanded; } [Serializable, NetSerializable] diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs index 0f6422241c..dcbe9a7f81 100644 --- a/Content.Shared/Wieldable/WieldableSystem.cs +++ b/Content.Shared/Wieldable/WieldableSystem.cs @@ -1,6 +1,7 @@ using Content.Shared.Hands; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; +using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Item; using Content.Shared.Popups; @@ -43,6 +44,16 @@ public sealed class WieldableSystem : EntitySystem SubscribeLocalEvent(OnGunUnwielded); SubscribeLocalEvent(OnGetMeleeDamage); + SubscribeLocalEvent(OnHandEquipped); + } + + // WD edit + private void OnHandEquipped(EntityUid uid, WieldableComponent component, GotEquippedHandEvent args) + { + if (component.ForceTwoHanded) + { + TryWield(args.Equipped, component, args.User, true); + } } private void OnMeleeAttempt(EntityUid uid, MeleeRequiresWieldComponent component, ref AttemptMeleeEvent args) @@ -114,7 +125,7 @@ public sealed class WieldableSystem : EntitySystem private void OnUseInHand(EntityUid uid, WieldableComponent component, UseInHandEvent args) { - if (args.Handled) + if (args.Handled || component.ForceTwoHanded) return; if (!component.Wielded) @@ -160,9 +171,9 @@ public sealed class WieldableSystem : EntitySystem /// Attempts to wield an item, starting a UseDelay after. /// /// True if the attempt wasn't blocked. - public bool TryWield(EntityUid used, WieldableComponent component, EntityUid user) + public bool TryWield(EntityUid used, WieldableComponent component, EntityUid user, bool quiet = false) { - if (!CanWield(used, component, user)) + if (!CanWield(used, component, user, quiet)) return false; var ev = new BeforeWieldEvent(); diff --git a/Resources/Audio/White/Gun/insert.ogg b/Resources/Audio/White/Gun/insert.ogg new file mode 100644 index 0000000000000000000000000000000000000000..cb82a03975b1385ddd02d281e38def1663301521 GIT binary patch literal 8265 zcmaiZc|4R|^!Q_6(^#`iMTpVJ5;C@|VXQNZWi-haLK0&q*%Bq|*oBPjTb3kCLiVg< zrzlHEB}+uVXY{`B_xt_pcR%;J&$(y2_nv#sz2})Ra&$BSD1m>t+OW?L7`bnegQy;JjL<*C4~`L^1nisBvaIj*G{vj{`p_!KGk0}CqSycjrUDi z#6>Aduu78I&w`J`Z98{+hr7xk(T+@%Artvsoo)ZhQPBK-pHtT`qX1L^K**C@>?+Zd zD;&bBZp^a?RUdF!=TX;Z4TVbUTlETi#tG!-s7G0e-XDy^0Azs&YQ7xd(Q5Pp;lj!m z31K42AQXiFan58MME&1J3*iJ()#y)$FG|WYhkcgcgNAD%EFd6mg+KhH`pfjNQUu5> zB&%Z_MvGX1hPS~*qeI&zUvh<0%Zfe<{Uq5n8pfm^l^&)myT=>usOHP{cMKslowzVs zwJz@Pt7_m3Xb~?t!h6*UdBepJ^k>8QW$ZbDH~`4W6OGOjWrXlnGXh-z08vG8yz_u| z$3wfTpiJ~9ENQ@f0O&zJo#=d>*iSkMLY4`_$93spF}%0>xJn<3>i~c;idoBpgYH<) z9suZbU{~9@j8_AN#P==V#T+Fd#Nk>*8PG{=W`XyvUHz1ZX zJqNm%GNlGUC@<5JIUVF%&TP-IWc&+>RQV02i;;021FJVOSvx`Ke3@Td`r}#%u?+TjSFS%XcISCl7-7x#BzFAjTzRZ ztQL)g5tGo2$M)j~ZLdztV;_eiYqpJoJP&>_~-|5Lw1-?Iv% z*uW}2A}u>&qJ_abj1%yd^+8q>5xCu;S+MTmZ7c{5mj9>zT{;-#{GhY{T?nj`+p`a` zB9sLAcbVXZ0(UsHkNr)zT1anLsDBu4v?XK2u8iW)8j-;aapF*y-B5B4BeFOXIUL5! z&79z7RfnHWahTo>n*U!FM|ZqLHULma5QHV1gC#7=#|r7HI(3NwsG|#;!yqIHeH^i_$Oj6s*50U;F=6 zreg;e0st=|?YlzSXdx{$2pn5Cgqdtz=vyfvt-J8vVVS>c9AZ}n4QlT7_t5xf0|0=z zyON`K2x`D4Jcbs>n23*|wZ=>^|G#1|B4fY~8kT_^u!C67zOs~9wUyG8F46p)aYMvX z{&=5gXy!6R$}aUCT1tbtlb{x!L<1U)8bE<@CDkR>4!t{|`$b4=03mjo*on|CdNzte zRuy0sk;FPvm&Hu5+apTE>Xn=(nz|HMfkFTs_%P)T#&J@pasa@6W;7!#BFT0Dwj77< zK`cRSqY=+D?FJB{SxG$zk*q{E7!mBkmNSzEbeA#{hjm3k|7fKEA9Ya~do2JW0(`gw zHAs{(;1D)o*D~V3jk9ZwCCl{7$f8U!1{?-srWi{u0}Mgf;F5s>2gZb53&V*qAsAq4 z9p1~hO`2k6xiDjO4puus<^=rgC4)(F7o_6BF0RgPHswE6m~m6gv>Zs4MS0;+7zayG zvp3Fi9Ai!j0yU4B7))|vFa*rxm;;7@xAwx!n&BqLF_xsDX;OqWDX6Wm_|@&6^74}E z(u3-Y2d_5Pl5|J($rBpWL}3ifYu!xnZdUACz2I`yj!da)_XPwqw8Jl8o<_?p)81tPVa1tMPg66p~ zr0s;{|RsnNqLQU#28S||We z>WflEM3&M63)BF2c&3KFS`^;_IL0xF1xZO^5DXq3CPFf!5=q($Dv`> z=X7joL&t=RTf=s`=U`DS)Rq8G5Ou%%o_kW&V7$)DkotExpX2lz=8fXhvdw0@@`v35~v0 z2F5)lIqvyngt_RzuoVX47=asipuInoP%@ZFZ+Q2X=8y~+S*MRNVD!25{>9+&v&TFb zJPx<3iIN2!7<6!DPzuCY?gWjP9%JevtYt9fAco*DZ-FE8)ZwkT&Bn+WH>=B$R^#~D z-3S|mLjCQvSDOcI-xc2hz&C0-AcvCAOj{nt%LG536_~hzd#k1+5C#FSQX&M61kXn9 zJ78KOnaj+%V1UU!LeS8;5q0B4Ir@n^H)&rLxO2VUV^O4!iP(oeu$< zusW=r11wF)866J}{4vUd{n! zK^z)+EK5&@R{z7n$eHai6(;;2L=1-@Mag`iZ6WGl^N*GP#U=cQL!c=n`T<=sz$(QF z2%Q)GM5!9lp*7V(a@OLxUBR&Qe@@>bygmlj{H3VfV+PZ z0N&9+ScjljBRgreAH1W}0kdJSbOEh&K&t?yrl!n;_}r>DLm$6Wuz^X+KZTl_`WOQJ z5TK?${<@)_ar#Rnf8CJrY7sB{FN=waU4Wev;J*Ot7UUP?hl`5|3JSnP#YFi*B)Pt!^%Y1d4wR^sZc7Y&%ryzcKHi0v~~Rw(QLh|h0cI2Z(|^=c!k7qjqC z21DS+pEZj{iKh?D72h}e1s=HSl_FX^wP8w~gp&Oj$v9>dy3P5hKny$BPe}zl4X;Mk z2H_v)JizwK&@c?8zz6D-_&Qk|OO%+6w4YwxU*DqaKLJQSQ->F9xISHkB8);^tH)90 zX6Z}-vu3Xih>CU$*`lDd1jMVEfMy^+9NWT?w)2!0;qNo10#ATzYY)dJ+oJ&lTx@?Sn%a;cb{#H*cJlgYbHErmWU{*-) zx8v(ptTc;Vvew_QO~0R8cW0cZohzq>%5jWYx~;B_`c#eWq|Meknq<91VX))#*;qrC z%~{hPy~RDe-7n*!+Q*1hmrJkTF}Mf4e&WDgu|W71|1H+KaX(?%UQlVz!d4sBq1B-HE(X!dNC#e{vb;TldzGpF(7whg}2s-8HFC6Qfm} zk_e}y2=O}o%t(Bq0#WkIu~ItzRY{Ovbqw(Psy5T5k0*cd>(B$KBaRMA58b!@*Qw$V z%u|78C08gov?s5Oe4I2?pyZ_p@iR5la#_DTnY9%_V(qFNPi|q7pap*Fqpzo^y=|Q3 z<);P;l+&Ypew)S{pRpYeh)^2)?FtAPd?a4n{(A5rL^p&4WWR8}RP#RL9ZE4c;>4`V zrSIlu*A{BlO3-PgU*su-P?$VR|Lrni`XVYBo$cpRQ%y3;qgM3u!%cH-(nI$SM=#$j ze5DnPUHC}}K#edlvSTJ!VNspTysat0vy62_6FsZLP*>#-QR%7Yv)AmW^cSXj11O;e zsp22Pcgjlda{>HyF76}px_t;;xiz@@y-kIH3zRo_Ku?@}QhMS~6Do`!sGR;ow<_-6 z@FP++&#kYiw6?waLTo%G$H-){DgNWhFEpSv#WzyUJ6wG5EMv)sW2Mhm$|kOWPHE_q z@x-J`ZO{#NiV&%mmC;wIIX%RkWW_U#ZFvV@*%UT>?fe|1Zv#TwMapzLvzm)>l)&rw zMa6MLuOpj-4K=!) zdGjbW)ZA?ADz?qbqY!(#fenD8F#5sXcl{|q1x-J>()UIDS4>{bf60KrmR=Xm(*rUl zsg-S7J^{8A>HvQhFK?ew*?A_a=bz*-ryF7n>DZJ|4+ZVsp7o-<4aW5QJ&CG^PCh9l zYmeX3Pe)6+Z^E5GUf4 zLbT6a-sqz%!XmHC8(uD(&~cPqgRPId^!t%~MdPS>f7LMPyM1QKkBC(HQ?lk_YWC3+ zu|xV4w`EJ4pl@gYh+0520|s+1n|lQ%QQM6}+*nXnY>A61I~6lt0!4L+2fTrUdS(^Z zYRi5yojf825ws={~opOT%?Y4vORUIv}=k)HU zr#^Y|v{OW$sxyq-lat2sgDnnF~y%VXZofL_XLN6y;n*|m9J~AsIc7}(Or6m z@8Nn+_x|Y4P59Pb4;Jc-B}Eo-zf~w3BW~Cs>b{Dv577MU5wE86>p{JR=C*z22JEM7 zA#Eqsoj#{LA^M#MGqFSdTafonom+vwb;ZoJw0{mxwbRfPT|4`+I>^g)@JhgEw#LUL zqZr}jJVbhHUGc&YRCuGRMlp6_eM>0ZAnjNDou)dMWxM34mx}PgXbu0GH@7g@ z+(!#_@0WS3C5lDz<>|r%9~@=Wwb;6`+_X}BJ6?Plzi?A9d7w*s)<|Msrv93ohuhT) zKLQf2P6nC$a#w2)p84|fln-ys=TNJ}+s(CfyMRi!7q+v%U4$z&I8^78s?p8o1g1Da zyCe>pH#H)~DCO`?y=Oz)e^Txl?EE@?&m|9EU|YgvXkC$|tWZ3s0$XSGF@%a>OILpq zGH+JLa;<6{&Ir5i#LzbQjnDK+D&%WDBsF<-9__xgHcvTMSMR_2KK%L3@j#T*Hqa}d znlg*}ycB49oqeC+W38m!0?(+jIJKXhVp)vyyMC+pWVS`S)OEWSo-pSJZ;A)6JU!{? zcRf_xSAjDl3#emUC>0Y~L;qL`W@eczgOyb=${!>gVWr|JA53S-m7Qv z1X~=uf5cR*#>J=5{-!D@GwfmQ-f+eb{EzN?1Z%?5x2B4z7UFnKfoHw3(A%EUB+`K+ zdV}!x=gVM{-*+3UgTOyQbMqDx8d5mLJVM(X9IE4ch5xL}X3W(?v$y5lNgOi(e1lUR@Sx=gG3K z#KG6OxCP}iS)=fVT~nbmmvLD~0tz_H6WmwKFB_L8cZu0Z&QsS1;P;E_nrUeE+%%>A z_5vam<3DiX_tY!lL)$-+egahG=do_bEdLxwYO1q+&_^JR2UvY` z-1IZsJmWRZwNt|7wm!LE;9yrZSKQR^Y$p5SerBsX7%}f2x3n{BqW&yzk zIAyGsfylG#I@d3LwmSDKb*1@F&@*TMFtdFPTH)Ia!7VYbceM|MZv`FA-8+5V`usgR zg>g#*i{15IjE&)Mr90H#A9d^H1Ad*cZ^(M{>4_|#ZAW0E)@7#M1qXgK^5D%9Lvjv< z$^9X(<_*Ds&8Vds7@Ll$o7Gsx5=B7x?xY~V_M*r zGdkndOWXb930?^}TE2ELu^}JSXubd4NWH3>5*VdZ!{!(g(S7tl69sqI3*m<4aN;ji z&69N2>5!^1$s<9{TX(y&pF$f9&m@-a{>eS`xNBN#&cPq!r)Kp_ZpiP(!>_Eb`&i?D z|FAmWjJV;(q$)Ju>mzAhi?{7}w58klRd)AtP?1G30b*TrC-WLUz0N5NZsd4Z^WlIF znU@4w^H1Uq(@}mU5;%!)o%3=qq*ZF3EZGOaeeRg&!An7=8Gj^-a?!JfA>)P zic}bd>M0<#z|TfwT~m)xych|6dk_3qV!XiGef!pSvvT-bcOH(z)yWD{p|tT*Knvxw zl8rmoq`W!S@5WE!+NgOv$ zZb}C(7HXXebI{nZFHUFwv$eCbt@7~c0@u{e+sQEk>{e0TwE3YkE4{Rm^>zj=z;r$3 zT4(LKshw8p;1offVOJ`iOQE!uwvY1I&Oxp|>CZf{VqMimZ%=;1%pIB!@s-T!SO=zh zc3n(vO;=Oi1L$Uvu+P4Bvt_c*PHr3Z1+}v(4P6Xt z4KKdG$~FpIc`g3M?R=b`S2^2u$(98z8aiSL1QV`JDe0T-eaJ?C@UcD-Q#rY7LlKw8 z(_u?bE2Q|d-R{<>D9+vWMz<|7VciVvg>gF-Gr`LAJ#~)`gZ>XWCvo%V3bQjTg4Suh z%ccGOGr|m}Sye0VO;@v;t*omZZjVXV$g8*I`PN#Ob4fT3MFxKNtQ zTmK_?!TZx^ud3+f@0+&p5>i6EoEG>hwHqI+cE#tGOAFlI2wE1-shRvSpHsf#TxA1H0l#^cFWH-hFFu`EP8#7As)VqzJG&l{t}zff zJ-mbQml6{v13F0AL`C}pmAN9vE0GR2C&MmR$FtlKGHY7Ta^nA1EN^e+{_W4a+*;SU zYNbPxxrRHN`wil^lUKxl=(ZVqdVRuUbNP-4zZ(tB;)Z87pU)?cUU~6bs*4f)gwFzo z^dyjMp%k1zYYhKR(+8<9$vapEPLa*K>N}aZYjRhtp8XhuSClg`m>M|RbQ_qsItl8> z^y9y)S9$pI_%$*S}XaN3NUYEKS*%ZU!dzUEhtgL84dEedIXp|^V zVulp-VfW;VwvS{Rn6f`}KewN2 zDM)R6oSce=Su|z1rlnQ3Uet(l=?r7tae6;eI;PR|XpgG6g`jeF?(@kl4ng*^O?dN7 z#VaJkh5eY@)6IwT=g}YB&9|)i?^9D!g2zDMMU#%VCul26k{LACL{@krQ3(*{)OY4J z$^&AvRZJ{P^Bat$HKoB#WY*k=k-Rv$4?Ve-BFXxk25F_PHE(N2W}Cy((bsd?s4(O#F)d=Y~MUKZ#JzmHcw>d zv`tr7H)x$X+w6@DuHQxK_eVaRA!O@WKmp|ayf>7f6+NxFqWJW07-jJfo_^>GO@f3{ z0Fumu>PEpW^DU(rJXdN;4hqjy{NCZYaN+xR9$6MeIcbBjTV7a5R4#uW;L})paJk{3*IY)_Dmq-C17RlV8rId8IF^) z${9)NR>@5~a<-SAUwdO+jlj=Z2o!W53Hxcw9F}V}&e?8g#cWHRx*Dn+DqmFpS*|Nz z>>>>>> ef8809aaff (Бафф христова + форсвелдед прикол (#400)) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 8a9c4badce..bdc6e9c9ab 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -390,7 +390,7 @@ description: uplink-sniper-ammo-desc productEntity: MagazineBoxAntiMateriel cost: - Telecrystal: 2 + Telecrystal: 6 # WD edit categories: - UplinkAmmo @@ -813,7 +813,7 @@ icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } productEntity: BriefcaseSyndieSniperBundleFilled cost: - Telecrystal: 12 + Telecrystal: 20 # WD edit categories: - UplinkBundles saleLimit: 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml index 31d7b65fe8..9e6ffbaf53 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml @@ -7,7 +7,5 @@ - type: Projectile damage: types: - Piercing: 40 - Structural: 30 - - type: StaminaDamageOnCollide - damage: 35 + Piercing: 140 #WD edit + Structural: 150 #WD edit diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index be1ca7b272..a74d49c330 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -53,15 +53,19 @@ description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo. components: - type: Sprite - sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi + sprite: Objects/Weapons/Guns/Snipers/hristov.rsi - type: Clothing - sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi + sprite: Objects/Weapons/Guns/Snipers/hristov.rsi - type: BallisticAmmoProvider + soundInsert: /Audio/White/Gun/insert.ogg whitelist: tags: - CartridgeAntiMateriel capacity: 5 proto: CartridgeAntiMateriel + - type: Wieldable + wieldTime: 0 + forceTwoHanded: True - type: entity name: musket diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..5e5959c1b2ae42e60d3dc5527df307f950e47530 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_<>lqGva-Cqyi83^r%ai$Y15`NcV5NC^SlMhag+r41vC7I zfUBoMjDTWOJzX3_D(0kKJji?4fP*z4!1#dwhWD=X4upyoxOFVjyP$XBuYPHM&8f35 z5)H%_26%2%Y^?V0j27CaHi7HNr>XS{oNxKPRwTA4FZtDU;_D}dgca^9F4%o3;S@dk zO1tdB!t=^%XI||-DmI_EzQNK)z-0boFyt=akR{02|qH8~^|S literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..f30c94c0f5bb5e1c467d4dbe7b710d21c778a464 GIT binary patch literal 1176 zcmV;J1ZVq+P)`@;1K;$Q%qI;D#3{^oIhp zNy=E#2#7|bQj?Pi`(kY*Bi~3P;MUnV+YU}A$SDk8KBL@tS{eV<>o@iF91z;RmGY$( zavJ+%9n{?1Ob;GCmNK3c0`6Zur~F!8B`2{r)}ajEdmiYDA7-J3D$vxlnNo9UTb^K> zfYIyy%FpiwwvPppg8&H^E?%N%qYv3}dq)fe*c#Io0WhBL_un0LJo^_4#s7{wJ3HxS zZ@bcWd&KhGmI+WBfBw!BR~~?Z!Clna*0Of|a_j{S44h^mXmt&i2*8Bg?fJx~P8=^k z1AJhMv>TU37#g}(e%?5se(_>AV&qDnV#N!qCIA!hgy)9a>meKtE4f@Q0QbiY!EY#& z)#jn92*3oq)UBV0*X4!9MREeAQi*MG_fZBv&1Z1PNPrjO##kBGQV2Mm?X~bV`;E;R z3GY#6=iagq=nxTX8chS@#>Qz77n?k^i=`v^=Cz&}8E z31<5U3<;3kjZq7Tyw|S+q7$ISdlhE-2n-2;20vp{d#g1>eFTOC;9EZ$A995Ss(0X% zI3#*5*6=lp`Ur#}aPrtu%4V~a$z-Tr!9@{>He4bz+ee^F0Ho;UIpqz=hD?P)dO0?Cgef+%#MbBjb(w2(-@EBml-A>FT1f@$ta#l~o0A zR$QO2HAH1r)JL%Xd`$vyVltJgWcIT0(ByfUtA`!|Gcf8SP(wEaAVF#6fLc84*ny~z zz%U6S2V}CJsk^(orVUY6V78CI{~n}1Hz)0Ylyq93MkH9bl_=Pfh qaomR4J_0`nP=muKfEpYPPrzR{@kH-6p&>5-00008GFe+t=I8-#laMM#C8l7U%q!QzOqk;E>jzYbC>%x99%* zyge~`dHUbpmRXnQ?v301vBGB8=3oKC84a($Mp>Wg`yjKpWJl2|yWKZ)_N6qQx&4+c z=*}F@m2!)#`u+3#c+?K;Km6m~GXsU5|6P0*@7F6^E!nqmk>ad|brbC7pZ`*|_f=`; z2Alh8_v?EEbY*gr7bF~wWov);A!*}^>l1%CI9#6lsyg z^N%5~tl{yBucz%AVmMy5KGwLiDC6{BR>KpMm}{7KoNV-tHc?vgc#Zj$_zNvh*f`A^ zels7_>hszwlex0Wnsb7u>JtkFWr0su?LK|ycbyzpHs>>g9Q*&6_`QLG4C$$lh0fnp z5NOy`?B(BZM7_P{<5YJb}zGUz4ykxb$L$FnT6N?aU)Vv6;mDKtXC#~AGT?90n;vnr>mdKI;Vst0Fc{I AV*mgE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..46c0aba5fdd7a7110a3cd8ea82893edbc3549252 GIT binary patch literal 736 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V0} zPZ!6KiaBp*`Su+$;AyoL3UAO|lXzD3f!Z5O*6KW_=?T2qHx4Pz*vH|n=5=d}iL>dq z$*V4ybw1X&Z+Ii9Ih|4AsS(4H7`BEfrx_*`NiqcKF*}?}Whm0hHJhz|>h;%G@A{8F z=Km{f$#D7Q7ftzldE3p|AO3j!@x%AkS5IA?e>Ux1-TwRhavrCS3&yRvp8dVRZvO6~ z?YH-aK9h8hHHp!i{?2wm&+%lbO*cNiEqnb=e|onze|z)iqiY$?eE3;&%=!B!J`O9J zxqkLM&1}mGV%~T^ZC<}QLg!C9JHxrtZVNtZ-M8XwG`OqS$Z`CT9n1N@Ex()t-c9sS zmphSSv~ZcOF^hu5@+U{y(iyU+7)RXX{8qD-^-l4W@4xq&PPmbfRJyC_%***x|46y0 z-_ZWV;LnMT&g$9OD}xNAoz9O`hD5AP5<#d;46G+Y#nKSW7qc= z%zfR@Pp-Xw%ay#ZQvbg`V3SW@F`zFI72aWdQDeD|MZ5l6?ZDvRikcof3L%#jQ&OV<7FT7>u zHBXkQdwo0a8<#^8KhQG9b4sArQ$Qf>mfHlx5RhbOmk|C(x~Gtbv% zunSk1Ht`_yzmOV*qIi!h6^!3+2j4onQ1^3F(5o-j4$I~*nP%61>F}S$b}Hvvro>vr zt60e#yZhTC>&LRYe%cSBEtyo`+^T1UrW%i(SD1gWKCCh-6>4aD0!*?Dp00i_>zopr E00%BW;s5{u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/meta.json new file mode 100644 index 0000000000..484769178f --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8f80135526073e29f4aaa34338651f6e473ccf5d GIT binary patch literal 745 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V1+ zPZ!6KiaBqitS22Z;1M<6$+RWlu8GFe+t=I8-#laMM#C8l7U%q!QzOqk;E>jzYbC>%x99%* zyge~`dHUbpmRXnQ?v301vBGB8=3oKC84a($Mp>Wg`yjKpWJl2|yWKZ)_N6qQx&4+c z=*}F@m2!)#`u+3#c+?K;Km6m~GXsU5|6P0*@7F6^E!nqmk>ad|brbC7pZ`*|_f=`; z2Alh8_v?EEbY*gr7bF~wWov);A!*}^>l1%CI9#6lsyg z^N%5~tl{yBucz%AVmMy5KGwLiDC6{BR>KpMm}{7KoNV-tHc?vgc#Zj$_zNvh*f`A^ zels7_>hszwlex0Wnsb7u>JtkFWr0su?LK|ycbyzpHs>>g9Q*&6_`QLG4C$$lh0fnp z5NOy`?B(BZM7_P{<5YJb}zGUz4ykxb$L$FnT6N?aU)Vv6;mDKtXC#~AGT?90n;vnr>mdKI;Vst0Fc{I AV*mgE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/hristov.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..46c0aba5fdd7a7110a3cd8ea82893edbc3549252 GIT binary patch literal 736 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V0} zPZ!6KiaBp*`Su+$;AyoL3UAO|lXzD3f!Z5O*6KW_=?T2qHx4Pz*vH|n=5=d}iL>dq z$*V4ybw1X&Z+Ii9Ih|4AsS(4H7`BEfrx_*`NiqcKF*}?}Whm0hHJhz|>h;%G@A{8F z=Km{f$#D7Q7ftzldE3p|AO3j!@x%AkS5IA?e>Ux1-TwRhavrCS3&yRvp8dVRZvO6~ z?YH-aK9h8hHHp!i{?2wm&+%lbO*cNiEqnb=e|onze|z)iqiY$?eE3;&%=!B!J`O9J zxqkLM&1}mGV%~T^ZC<}QLg!C9JHxrtZVNtZ-M8XwG`OqS$Z`CT9n1N@Ex()t-c9sS zmphSSv~ZcOF^hu5@+U{y(iyU+7)RXX{8qD-^-l4W@4xq&PPmbfRJyC_%***x|46y0 z-_ZWV;LnMT&g$9OD}xNAoz9O`hD5AP5<#d;46G+Y#nKSW7qc= z%zfR@Pp-Xw%ay#ZQvbg`V3SW@F`zFI72aWdQDeD|MZ5l6?ZDvRikcof3L%#jQ&OV<7FT7>u zHBXkQdwo0a8<#^8KhQG9b4sArQ$Qf>mfHlx5RhbOmk|C(x~Gtbv% zunSk1Ht`_yzmOV*qIi!h6^!3+2j4onQ1^3F(5o-j4$I~*nP%61>F}S$b}Hvvro>vr zt60e#yZhTC>&LRYe%cSBEtyo`+^T1UrW%i(SD1gWKCCh-6>4aD0!*?Dp00i_>zopr E00%BW;s5{u literal 0 HcmV?d00001