From 500661d4b1be03f6a1688d57a0544951f1db8899 Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Thu, 2 Jan 2025 11:40:05 +0200 Subject: [PATCH 1/4] =?UTF-8?q?=D0=B0=D1=80=D0=B1=D0=BB=D1=8F=D0=BB=D0=B5?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Blur/BlurOnCollideComponent.cs | 8 +++ .../ADT/Blur/BlurOnCollideSystem.cs | 37 ++++++++++ .../Knockdown/KnockdownOnCollideComponent.cs | 9 +++ .../ADT/Knockdown/KnockdownOnCollideSystem.cs | 43 +++++++++++ .../Components/BlurryVisionComponent.cs | 4 +- .../Guns/Gunshots/heavy_shot_suppressed.ogg | Bin 0 -> 12252 bytes .../Catalog/store/uplink-catalog.ftl | 2 + .../Weapons/Guns/Battery/battery_gun.ftl | 4 ++ .../Prototypes/ADT/Catalog/uplink_catalog.yml | 11 +++ .../Weapons/Guns/Battery/battery_gun.yml | 66 +++++++++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 67 ++++++++++++++++++ .../Crafting/Graphs/Improvised/crossbow.yml | 25 +++++++ .../ADT/Recipes/Crafting/improvised.yml | 15 +++- Resources/Prototypes/ADT/status_effects.yml | 3 + Resources/Prototypes/ADT/tags.yml | 3 + .../Objects/Weapons/Guns/Basic/base_pka.yml | 4 +- .../Weapons/Guns/Battery/ebow.rsi/base.png | Bin 0 -> 379 bytes .../Guns/Battery/ebow.rsi/equipped-BACK.png | Bin 0 -> 217 bytes .../Weapons/Guns/Battery/ebow.rsi/icon.png | Bin 0 -> 448 bytes .../Guns/Battery/ebow.rsi/inhand-left.png | Bin 0 -> 426 bytes .../Guns/Battery/ebow.rsi/inhand-right.png | Bin 0 -> 411 bytes .../Weapons/Guns/Battery/ebow.rsi/mag-0.png | Bin 0 -> 375 bytes .../Weapons/Guns/Battery/ebow.rsi/mag-1.png | Bin 0 -> 883 bytes .../Weapons/Guns/Battery/ebow.rsi/meta.json | 35 +++++++++ .../Guns/Battery/miniature_ebow.rsi/base.png | Bin 0 -> 365 bytes .../miniature_ebow.rsi/equipped-BELT.png | Bin 0 -> 217 bytes .../Guns/Battery/miniature_ebow.rsi/icon.png | Bin 0 -> 404 bytes .../miniature_ebow.rsi/inhand-left.png | Bin 0 -> 268 bytes .../miniature_ebow.rsi/inhand-right.png | Bin 0 -> 265 bytes .../Guns/Battery/miniature_ebow.rsi/mag-0.png | Bin 0 -> 244 bytes .../Guns/Battery/miniature_ebow.rsi/mag-1.png | Bin 0 -> 756 bytes .../Guns/Battery/miniature_ebow.rsi/meta.json | 35 +++++++++ .../Guns/Projectiles/cbbolt.rsi/cbbolt.png | Bin 0 -> 164 bytes .../Guns/Projectiles/cbbolt.rsi/meta.json | 14 ++++ 34 files changed, 381 insertions(+), 4 deletions(-) create mode 100644 Content.Shared/ADT/Blur/BlurOnCollideComponent.cs create mode 100644 Content.Shared/ADT/Blur/BlurOnCollideSystem.cs create mode 100644 Content.Shared/ADT/Knockdown/KnockdownOnCollideComponent.cs create mode 100644 Content.Shared/ADT/Knockdown/KnockdownOnCollideSystem.cs create mode 100644 Resources/Audio/ADT/Weapons/Guns/Gunshots/heavy_shot_suppressed.ogg create mode 100644 Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/crossbow.yml create mode 100644 Resources/Prototypes/ADT/status_effects.yml create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/base.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/equipped-BACK.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/mag-0.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/mag-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/base.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/equipped-BELT.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/mag-0.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/mag-1.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi/cbbolt.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi/meta.json diff --git a/Content.Shared/ADT/Blur/BlurOnCollideComponent.cs b/Content.Shared/ADT/Blur/BlurOnCollideComponent.cs new file mode 100644 index 00000000000..aa3758e33fc --- /dev/null +++ b/Content.Shared/ADT/Blur/BlurOnCollideComponent.cs @@ -0,0 +1,8 @@ +namespace Content.Shared._White.Collision.Blur; + +[RegisterComponent] +public sealed partial class BlurOnCollideComponent : Component +{ + [DataField] + public float BlurTime = 5f; +} diff --git a/Content.Shared/ADT/Blur/BlurOnCollideSystem.cs b/Content.Shared/ADT/Blur/BlurOnCollideSystem.cs new file mode 100644 index 00000000000..257dc5bd748 --- /dev/null +++ b/Content.Shared/ADT/Blur/BlurOnCollideSystem.cs @@ -0,0 +1,37 @@ +using Content.Shared.Eye.Blinding.Components; +using Content.Shared.Projectiles; +using Content.Shared.StatusEffect; +using Content.Shared.Throwing; + +namespace Content.Shared._White.Collision.Blur; + +public sealed class BlurOnCollideSystem : EntitySystem +{ + [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnProjectileHit); + SubscribeLocalEvent(OnEntityHit); + } + + private void OnEntityHit(Entity ent, ref ThrowDoHitEvent args) + { + ApplyEffects(args.Target, ent.Comp); + } + + private void OnProjectileHit(Entity ent, ref ProjectileHitEvent args) + { + ApplyEffects(args.Target, ent.Comp); + } + + private void ApplyEffects(EntityUid target, BlurOnCollideComponent component) + { + _statusEffects.TryAddStatusEffect(target, + "BlurryVision", + TimeSpan.FromSeconds(component.BlurTime), + true); + } +} diff --git a/Content.Shared/ADT/Knockdown/KnockdownOnCollideComponent.cs b/Content.Shared/ADT/Knockdown/KnockdownOnCollideComponent.cs new file mode 100644 index 00000000000..b1a0f3fd2f9 --- /dev/null +++ b/Content.Shared/ADT/Knockdown/KnockdownOnCollideComponent.cs @@ -0,0 +1,9 @@ +using Content.Shared.ADT.Crawling; + +namespace Content.Shared.ADT.Collision.Knockdown; + +[RegisterComponent] +public sealed partial class KnockdownOnCollideComponent : Component +{ + +} diff --git a/Content.Shared/ADT/Knockdown/KnockdownOnCollideSystem.cs b/Content.Shared/ADT/Knockdown/KnockdownOnCollideSystem.cs new file mode 100644 index 00000000000..6c1553919b5 --- /dev/null +++ b/Content.Shared/ADT/Knockdown/KnockdownOnCollideSystem.cs @@ -0,0 +1,43 @@ +using Content.Shared.Projectiles; +using Content.Shared.ADT.Crawling; +using Content.Shared.Throwing; +using Content.Shared.DoAfter; +using Content.Shared.Explosion; +using Content.Shared.Input; +using Robust.Shared.Input.Binding; +using Content.Shared.Standing; +using Robust.Shared.Serialization; +using Content.Shared.Stunnable; +using Robust.Shared.Player; +using Content.Shared.Movement.Systems; +using Content.Shared.Alert; +using Content.Shared.Climbing.Components; +using Content.Shared.Popups; +using Robust.Shared.Physics.Systems; +using Robust.Shared.Map.Components; +using Content.Shared.Climbing.Systems; +using Content.Shared.Climbing.Events; + +namespace Content.Shared.ADT.Collision.Knockdown; + +public sealed class KnockdownOnCollideSystem : EntitySystem +{ + [Dependency] private readonly StandingStateSystem _standing = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnProjectileHit); + } + + private void OnProjectileHit(Entity ent, ref ProjectileHitEvent args) + { + ApplyEffects(args.Target, ent.Comp); + } + + private void ApplyEffects(EntityUid target, KnockdownOnCollideComponent component) + { + _standing.Down(target, dropHeldItems: false); + } +} diff --git a/Content.Shared/Eye/Blinding/Components/BlurryVisionComponent.cs b/Content.Shared/Eye/Blinding/Components/BlurryVisionComponent.cs index faff4b9e527..4dc3a08fde7 100644 --- a/Content.Shared/Eye/Blinding/Components/BlurryVisionComponent.cs +++ b/Content.Shared/Eye/Blinding/Components/BlurryVisionComponent.cs @@ -15,13 +15,13 @@ public sealed partial class BlurryVisionComponent : Component /// Amount of "blurring". Also modifies examine ranges. /// [ViewVariables(VVAccess.ReadWrite), DataField("magnitude"), AutoNetworkedField] - public float Magnitude; + public float Magnitude = 4f; // Goobstation /// /// Exponent that controls the magnitude of the effect. /// [ViewVariables(VVAccess.ReadWrite), DataField("correctionPower"), AutoNetworkedField] - public float CorrectionPower; + public float CorrectionPower = 2f; // Goobstation public const float MaxMagnitude = 6; public const float DefaultCorrectionPower = 2f; diff --git a/Resources/Audio/ADT/Weapons/Guns/Gunshots/heavy_shot_suppressed.ogg b/Resources/Audio/ADT/Weapons/Guns/Gunshots/heavy_shot_suppressed.ogg new file mode 100644 index 0000000000000000000000000000000000000000..bbf631346764af6d881b7b4e35185b8dc6120c85 GIT binary patch literal 12252 zcmb7qbzD_X^YFb$my|SkLAq0E>CVfgL+J(uE-4+-ed+EF5s(z=?n{SCDIkiH621rg zKF{ZQ-ap>o?>(R0{mhx2o!Ob4*)x02(Xg@62BCodxjK~p0!hbhvrUAPn^m!3c(-gKmU0p-uugl9q8A$dtu9^;c5eMv@_Se zV-Hb+@bU2S@$m8RLs&GNob6t?TDe&{yR)JL1JgK5q5GC zfvCDT+d!n@u5Rvb0F{-c9oz|`Y31tn!pg$k&cjLs!pj4o-2n^)YGvjMQMIymzh!6P z>hi+Y1rVZb*2+~}+Xe1y36Zn52AH}* z)Lfh$th^rp6jG|vI%?uFPu zw^U%XzXoKImeB=+FhQU|dR6kiz^Mcs5QqQ-%CCNs>O0hVw(c8Lu0Y}&aSLr$D@^%B zv;xp!XBnmMD1dW=2v`DBKm`S|VrII2l-}z+qovp()S_e?yoJIdc~U6C#1YGe`*g{x z(tF~&w3v7XXdu8lBr)kiNuY{!VgG7aOVZ7wSWDB*M_9|K-NtwaAtCr8Uy748rLkCx zHI>;aic_Gc2(7l>y_xzDB2`Jcm4t>LYHHmY9ENnpI~-pmOy|lc>$&j?q5j&K}5k8By%eB*SIi#=5~Gs zN!IL#NLUtgYejmN+l26Lw&MiFX13b|>qtg_e#TU$+k_HsX31a3nz{jc&@bwCr) zZ8+V9V~TkU?_hR_x-{0`1^y>;6kd`HCQ=V4GN`;^P@CZx|0$sHOJJH<4saLk2PV@G z;IpJw+K)|U1+8XvtdJg7OU+hBEq(^gej8{1Q5N9;896}M&VIG^zt`k|Kx1pE=+IEY86-mw|75ibFw z$$&4YM+u5ty9=ZUwbqI$DBGOE8_4Q`Om2wFRV;mJZyg*~!eyY2{3O z_APMhwB~MN;8||sbY5%p_#hn6QId@vKS?!8H+PoS_bXe)(-EVeV z?W*N?|BK(>O5dl{Zl!epciY#tF7Ev{-qo%;5*_4%j?v?ABqD5+)PHl)?~{=HzXh2s z`fYgmn|b9fG{=5A^&4^Amw)&w@8?)s?6=DS*GrLI&$x*nxLANg-TDSk0WJyU8+uR# zG3YsgD?Tq89TXSX4@&T*l?g2f_;!me$CR*2ib<7~IL&dTchXbFgjowxQl(ir!-x!V zO8Q8Z?P{8I9qc*h36vcQQpjakIZNm5Rcnxxyy$dp>dHIW!0rZg%=7J*yW>OmAi(3? zzM+`JVmmtpSA>lwG)0+>7m;F)ThXTrjcO`}SvWLolUhs^q>!qxH2@t>yxZg!W5Tz> zv;PX82j-#+I4HnMn56<>#md@0CaeUo68XXcj8Nt5CsmHD0a&qC^aHFo`}Jj%I8#&1 zIa&J`&Bt2%Q;jeRni7;_faw~=2)E4Jpq zVBfGqYBAZgJ?}8lSvGI4*08;7J|@0HZaLnHabFrxkW_}1w|U;)iFb$kAK|R?04vV< zWuW6uIFb_3V}22^)dIk(qCeAN;=^FNg$Cz5wZ)itf2zZH>sh8z0ubuBLcjwlT@xJ$ zTdcdV4Q1&k4@IXN$WESu^rgE&*#@#h5|sPX-3XLNvO_eLl`{ZHi8UojS-B<*s;pem z1cWX2ZP+?arRY=V-)=gRY@omoFF8hk$!ZB&Ej2Jq63fj3QR#7unHJDNHgo>P01kYM zf$1RO@HOJw#ApHV{Ife6I1mnMv+lQ;l~cc20i6Z76|m2n!S68hP8RyNn5AYX6Jh5y zAR@@Z&C-|K4lld7aR+~>-UD?LQ-cDr9rbBG729&u-^~h0&CPJ7(doi)rGcz4MOu-S z5d?bP4F*BFL-{mqhm=7OAk&2O89LMe4@>h3paGz8<-6PeS9AAN{r_$rfWGK`0)71R zymt?iSO)B_wxEC3%B`N~i{$Fofy3WX|_Amn*>At^~v4GdBf-i zS9M?&nn;ae0B1C`=NurnH~_rV(190#SV~IBEvk9v4P}%nn#e6;1Q!gU012Q?>sb;s zns>n1;jlGr-n_bL2gpvun@BBc1b0{6e%umIGy&PSW=+4oL#;5zCtomV6%QXofc1Ey zKFM8Ih|>7ZObnnv$q3$oY&U!$fMu0=0XBE}up;X}xX^@ua0Mw)zP~ue6ipyRZ|MM> z^6=lWw??CJ{|Cofa?9_wm$d{)x>^2aD=9$lKM>KsA?Uy8ilNH?i~xpV(cO)`Z3;qf zx!gjxa_=Cv65w3+;v?`#e2$u92{Q4Su0v-W2< z;j)HMm#VUcrXVJG!y}SOjc^{^1F~6y+tdjq2!(|w0Sv;x#Dan(&4LPKLNN)7y1U=K zdkdU)q%Ff0WjW9zv5=Blyfh#VE}pG>lHmjL%l&BX6d!}R4n+v034#gwK7+6oyFXw( z5jzTJUj2xgQwYVlJE{U3=6w)o5S@T<6?t!+glaxk2*;JZt+$mm&zbI*c7W>E%$Dh&%1IW!#dlydj3ohU2 zL%kw}uiJ@fU=nMs1W!9$&b(D;kQ68DmT z237;UX%(V_#mw=#9qBMv7s1jf32@er9ne$`4jcETwuuw*rSc7Tgm$AMylMSj+m-C` zJ@+URb6NG+!0M@BbOOAOB%rlSe{=64gBq%@Y(|$Y=W7i+YU3rMiFB1aDv8tC$-?3X zrB>+JKad+f^c>+bu^_{%@<%648WwT4xFVas?3XxkZyeL-_$sopt z=0CZKg660nx7xowU9BECvN1Lq$z6U(+ng4y(oDM|?)O5Xmg)P__Yha!GW_3J%~9wp zAheH{&+?pIq48PN++ov`eq)Is0fetyRnl>>%T0}v#On#m_-)l+Vpt#I=T=J@pIxl7 zRx$7U7I=DUq%;Y*mGs#hygzYP?vgM!LbL^v>b}=6vvOH6)WKtt%r*VpA)(_yqaKIg z9}FjaUDj!cXlWA|nkY}}ACK`5B2rmdb}T2|o3ApPm2}8D9$V|27~>=iZNo=jrWci* zoWUKF5)jO+?-Jsgb_o%F`VNT;Cj5>1n;JH?kC8ykrtDgnj%(fAZ)sZd$cU)R$&a4p zC<4377Y)&q9|)@V9N97q7qf%u97a~c^prd^27IrqUBCFg{ImP(tmXb-&Cexgd*rag zn(OJuUmH~{GH!kRXP=QCb*i)y(8;HtBEEX+XsCJBlxA4gVmvdly7_XbMbE7{D@Or; za~Q~xlEqh<813v7RfljCa}VMz&lE**ctZ=qRNrTDSfVO-d9Me$^2(pqMYiCivRuX z_#BBBX08YigKr37>$7w9pLUtb_IOFe!*x8+rm+|&R7C=ZCVL}{L?_9|Mjf`lzf;&QAflgnqf;0nBiMp#`n^l<|U2zMoztmi)n`o)kLe^DaOqI$r zTHl8gk5gyQlP>)&#smd^Wo}fS{Gt`3N_g!k5VnhAFnoZNr;zZik}Nm|Zy&pa1wG+q zZTmH(pgSoIl55OcsIK8Jsyn1{2yE7^KHO=nizj=_I z$HjmtHFm=5!DJ^KQSKzL)^^TeTvP}aV-gK*NCoNMBS8I#qv6tV%kN6N9>+ystYQ-0$!?W{GB0Ai$fl&{3+BPvX`8Ow?PilJh4MndZ_u*jijM z-lX#M^wj_2Lp$u7-3bS=Uibl;C|Yy{j)GRKF>|!)G_K10T-5icj~=+Y+w&K#6p6Uz zj(IZlj~Yy0Tkpz#f%guf)1y(_8f56BcA%GfF{*z%(2W^$|L$s$@rSQZqzzYt)u&1g z)x1TAY0$hPbZYX-z}}dTBbiyq6^H1mz0out{ecTb===VOldqa)3~|)%3Xk;69=kH8 zC_nu0b;+xFCQ^ykfSLfG7X+&RCgxNu^`&f{eJUzkiLvB-!fz2y;gUNW|JIq;nVIU7 zQsd=~M{kX`NvvW;*mz@H%^2wtt1XTw8N#AJHTLuG>}CJ!S>n)eUNVJ0teUM?5VE@KwTQ@Q>DUdHH^ zcW1m_J0teEh>&|04VWcm>B3D|uN}%uYMf5) z8U*}(k%RfmCaCPIp%9pfS6Okgx{c_Oi?5`TNDSkJXK=WQjQ~&Q%sUy3r!E3E1;RWh zAMnp_`of;0z-7T*=Qy1~($-LR)){1j3<9ar7yxs1g zk-0Lz#s6(BGCj8hSx3v^`ePpz&br=F7saP8`kWNdlfQn2fbByTeV!Wsn7o$BG?U^M z3M(uzYgfF7UhrFVDrbZk9nL|H_eO|(3uWlak4Fv3%VA!UV!nxNVm8c2{XShsr3RIn zghXW3S2M=OijGOFB<;lZNYt^}^R)>(>fQ~T65x93J%B2!n7AFC)1E{hoM>0JfHS0RPO^yg1x`)3~BO_p13BIJ{#bGX07EDetd-eLj;IN|Iq-@!Zx{y}rYtL)5NC!MI zJ8CM^ccaKCaxmz;LwwhsqAK3HRteOpT%|D1;L9hA2WJRi$XPzi*nWDFc>J8|B5bF| z0YrIv@Tm7DCuT2ADo*<*!)Uk~A(UuF@FZDx4NB{+bt5iFpKiZzstED?^k_b-_c0Q z7o>GsQ4wFA91!jz1jZryb9+_!tfY+SU4gG$)QESD&#cUP?R7mQVuGG`V1>R~^s&(v z=BuuZ1?8UOjE2&ep%edzEf=)zkw3kT6@EfhZeJ;oq*cP8ZSv(k@4~#TxdqgBJ*4#} zkN82@mMFPJPS7`D}A5~70!od)M zFyu&G#tS(wYahnTT#-{P=7~H9b`v?j<-#XziH(V2mX&Fgvofta7OcEtZ=xNMHa;Tc zJqiYFg;}YOlqpP}G&HK5oI#RaNIG%2M*fXB%4xb30_#nUzkl&_6?a zw9`^ga%1y$7Jua!-0jcwt8YG%7R5XjQchd*Em1`hZ*pt*-358g;8XLEIiXiHy8XLm zdwB@f$q(7W;#|9iD2E|c^bf@oiQWYJtMaKk`?d9j$GzhxMj4=|)-FTfzM3f(trFSH zNOHI4R8~dX|KK&_k9T7J;QlYa(*c|9r*9U}Q*;-MJ4@5a9uulBf;}UXE084PPm&yZ zGuQ5e;T8vEFA8HFq@mgG-l-n=cf-?1$CNpEHqYDI{x<0A^eqBvwOI*^)8Nz z*Yl7(4%WBIw4mzXtapDQ;hhkJdJq4z8d%OlVsYVfCg|(?KefuE`92Z8vS8GdSIBvB^29+ViWPz07A-pI`#6?Pf(*kz-tx^-a85Ux zxy_dPlQ*>t6q;S{))#xQ^hT_;B?6PVl|5>}8wk}jSkEKT)_6GTVo8`Sp%K+_bjK~q<(A5)2wOGGw`Sr2GSaN`i|Az^=Hc$g^#FO#J=oW-}U2O zv^bDcTFL*|#l5kfOcD@JmL)9q>wE@np^=ohO+FY{Y6wEF%1y(mAmU_{dP+h!l?t%NM^Y_<0KlOKi=(TmZ zcFl$+=<$NM{IYgd}Ar`JIN-3h{ts@~N`$x%2 zUp7Z;>_2eA$mJZ96Oc_&NsAY2bBb=G#u2?U0_Q)~^Gl6k+uBPTDCwox#V5ZfL(*Qa z@3$-TK)Jlde>t;C9cs2Bk}Z9*7umv$vgFb}7hbTe(sqJPJ>Oo6QxVjgy;pTZx3AJW zD-E>#TCy!yshgCv&X6si^rUKX&1c6sGeF5KY7J(ozdAeFflf9voqJ%1=I4{S#jsDu zs!{wX#SdQW#{50a;o9Qp+C*2McHRFxp`U3kWh4VJ$tBx~W`yD42mZn-#n=A$Tf57UnMW*6ARRI8D>;tT8h6 zDboJK%uPwZ;z^}riO_q;P#-b@ksFV(IUC{N$BQolY!ZHX?6q2W5_2+672yd~HL+zd zz0V~0rg&=iUT?T#@Yge<2ka`p7;`%|m|9dEODQ&}TE6LGV&l3=RJwi%!5mSJw%(#H zMr^S(O1kj9-ffdn)-vJ1bH4l@g#7*aco;Hw;~jADTFIKNJN36~M3jw;SqPRl$uL2J z^izek#Usd;*2CVNGJ!5i?UHLRa{~%Udn`=@4d))()Mb>aOs`+nfpe?FT_cHO>U z0D*2_BLMF~K%P&Re$aHiZFy5uSz1+6k(ZL1mW&7pd*$llU~Btq*a)Ufn+6+tL$QI4Iy>7SS09~LIS_Rf z6K+Cg?@Ix4<1&+t=>uCEBCmJpPYIcw&0)h~1u>gZHnpUP;{HA=~B(HFY+dere`%%?eS_ znMU4>fU_F2^tYg>_N@e|I*Pabi?6u}rB|~i&Y!^^AO^kGRPdE)e&k21&=~vt4HCh(zFV@en4@&RV^f+V5FwkYx;!-9X zoH}H-S`dO~&<9<%W?t(<%d5t0pU0GXp@|C^7%{?g_9+%*AA18OgAdJmJx5S z!)`~i`FyS)+Uz^X@5UEY=P(d?Q7;b%OZ^0yroNp~*vLe8e6Ba*n-wY~ee7Igt+P)N zajjC+B789B67V>{n_!x%E>l_G*YQzy-j+Hwr__>Y(JIZ=OK!IuT?zj9WaFmJzFs-p zlD+N(q1w|oO3lnQ7t`d7v#)1wH0H!j^EIP3DrdT2GmlY2erxR%jKRgE`^?s{V1?@8 zfrO-jLNW-VOUx8Lm7(ASXFXM&FiIZ$=>-?bn63$R&-bG@)t37&Xv*dhvicezT9AJ# z?x@~FI2gmLM8qn8oYz&x5BInDq9`oHpwq zJv5D^&N}ulh--tIAj4Yy)I*Oa>^PkZSi=lu4WrrI4bA5U2KFHWLP3z^_YtAJ20SH} z=5w&2$JLXJ$p`e2&l&s;ao+GtZtgxXHauART}P|A9_uSO(L2ocif7t9w`S`w*`Tfi zJ7`Bf>4ilAY_Sw1_W}$|cI&d;S^wT@H@j2zUVg>>3t3cK%{8hAiS~^5av5vepJ}{mxI(3jw}!d9b&QJGBHEJsJvLh_c_KP}tE1~>&eevm70ng) zFF}>KocUlo>UDOHZH2cO4aF=}3%n9zM70DT!$1@jS7-zyFekW-R zR=o<6WL0 zj1tL>@g+6$WUdz_nj-@#((Q&sW5jC8o4gNmjB`24oSp6q*R}D%K4lium^_h{*UwX# z`evi+Yi~H%$_1*^9K*pd;+y1SpOZfLOhy+lQouU45ACtsNnpD2d3O+j$zbiIEZ6&T zchY6dBXb44yF1+=87rJNT0C3kIT6H~+Uz9%ktcf0ZycYfGWSZ?5s~A0WQvQQ7o%L6 z>U~Oy)VHM@7DZTvPCG@t9843g3TwGCDPofOWwRj(F+nu0=&BbE+^rQHh?Zb5da6ZkD2A{_ybU z@O-9g@h{w^??h4EC=#i%`wJed_h_0)vY#P`8*G~=rr@1B2WT)-ipLx#N=a}8_O6#1o|E|>HWMQ-t!!qW6F$?ymsL?6X&;2YF7SJ=+!5w1s& zGTfZo4Q#z?RHk@hLKdpi@Q)+0gw)N$s)jp<{eO52|BEg;NTpTc;Sbfq}gS zw6RuJpY+7o;EQe%LpuL)Jc2QENjQDHe($yRJmoZk+dPoRQ%3FeW&?`7uK~Ti`SA}lz^Uu{b zu9z2x#lx&ewtDp!3LGWRuncElzPd82GNbT4-CLw`>9uwsQc78OTl?Ky4(Aq=&=&qy7 z$#2%C0hcm(&I*~OE_3fv^cPn@bjW{>q~dw9ljW(PCulH6#8jaL(~hQJTVmK_+tGS# zt%j%M0{KIZYR4$0bH89)N%OwP{3BE-#JawPt#N`$f`yRUU-{^wFBHsk>L zd)0PTz*6pM->=(X^+Jl?O?Ho@?=LkXtl2@8@YpCNE9~bq!!F5P8~fid`G+XYpUhHn z7j;J4cq%BIRQqr6{VXbpB5az?$iV}<`#d)k*tb8hOe1xys9s1rT8qqOE4^WOv10_e zir7pq7M4yCows5{B1&p@<%R>}L703&>EA!i)htOnl_iZ~5F{tgGD(K?=wsQ+0Fz1? ztYh{>c7r9xLuC&=^!2e41ZwHp#_~a3rGH!}JQRYxO-@z2id`2fEBjqPvgnxP2~veH zPu$!1q-Ul)f)#gqVC^-05g>}(j?XXSiTO>j!?VODC|^2>8~Edq5ykyR@lPv`LF+G6 zsh$VSJtn>65ssapE=?OuwHqJ-#LuN|*qEZcvBUGtwBv6OOEhUPp5aGB`w`0+gBh9g z=5yC|$0V+SfExDId+pinoT}0HWcaoHpx~~?+Q;9;UX7f<#PJ_Xj@!U?8-s=Fux`g>&-T4hDTB#A-1p)y^F`(szX|t`>0|Ty)rr8*ex5pipReBDvnZ`Be#%Uyy!fsMgxYcMNk=z*EcQF{-zK zg19QN%tLZ$w^|AFgbZPfJVdgqq4#%!LkzB$pQ*~oH#}T z3S9EqsDGWF8h54eEdW;49IR(dPu+V2^Cz?ZHis)$yuWq?J>2}-mo=qk5NvYP|3d}w zSaIhSHTNrW6Y_C^lSACNxSJ2B(iVq~>1`QJ0R^k;>TEc`%cv6LDQ~8Yc8AdM z1MQWeOuz?NhiLLY@m)8ge?};3AJTD%=CJ&3z_dSXqkO78OxTwjtif)cD=Q)$);2~U zWk)VMTLBt^Il6rcdms-Q) zdNk0-k% rp(pvT>O8|d4B)C8p$?agD*67@u_?+LfJWhRF3~B?+Fc(V5fsWPfb{B zP^R#vYX)H=g?^Wsh)zYD;;S?|r$3AU4Fz8kc1wXJQnSAUau8~qD;|wy>ZqE#9*mJ@ zz+Vw9{VMp=7S#cSG(_I9G7kf-i6Af_BWEw|Uvc_5iP z{L-;KJ(Nd2xH{=ZchJf2L|~~xQ+t%th@DFTQsgJwR?gg*grSb9bUnr0k(Z=%VTUL1 zbzAaJkNJxLGu|l@(hy&qXn&WE#f{6Zf2#k+vqteer*W`VP|s-4OKffoADrk9opS%w z@6p$tKwZ0BdjA6;^}2sdW{Q7TNlEW@hV_43FO++K=GXAIULSm4*LiP%K)peTIk!A9 zky=}!WU5aEZObbGze-6qQmUttXgqU=e|-LMEq|_-5|QL4LlB*Y{PQgK1O6Tw0zeNIDNvN_SJ{S1_mm z$8}iDz}PI0FOh%fCu$l|-8Eb4L}pV=ZLLH_&c>iJ)NA{--$8+|7I7=N=iHu221icr zGEmBaAa>-Q6geZofZboMPu!1|a_4~50`J2?pm)*qf82<4Vt-xyNl~*`RkShD;U<)$@AxpxVch+cfU5T&Zxe2RS-6n@0|tZf F{|~I_G)4db literal 0 HcmV?d00001 diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl index 985823d3b94..3b64cd6a1d7 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/store/uplink-catalog.ftl @@ -198,3 +198,5 @@ uplink-suppressor-description = Устанавлаемый на ствол ун uplink-attachments-magneticharness-name = Магнитный ремень uplink-attachments-magneticharness-description = Комплект из ремня и магнитных креплений, которые крепятся к верхней планке. В случае потери бойцом равновесия - оружие не падает на землю и остается с владельцем. +uplink-miniature-energy-crossbow-name = Миниатюрный энергетический арбалет +uplink-miniature-energy-crossbow-desc = Миниатюрный энергетический арбалет синдиката, тихий и смертоносный. Производитель данного товара заверяет: Будь бы он плохим, производители энергетических мечей не создавали бы 1653 по счёту коллаборацию с нами. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl index 0bee193477d..01063d3fba8 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl @@ -1,3 +1,7 @@ ent-ADTWeaponPistolX01 = X-01 М.Э.П. .desc = Мультифазовый энергетический пистолет. Это дорогая, современная версия антикварного лазерного пистолета. У этого оружия есть несколько уникальных режимов огня, но нет возможности самостоятельно перезаряжаться с течением времени. .suffix = { "Пистолет, Мультифазовый" } +ent-WeaponMiniatureEnergyCrossbow = миниатюрный энергетический арбалет + .desc = Энергетический арбалет синдиката, маленький, тихий и смертоносный. +ent-WeaponEnergyCrossbow = энергетический арбалет + .desc = Тяжёлое смертоносное оружие, поддаётся модификации модулями ПКА. Любимое оружие революционеров, еретиков и прочих любителей кустарной смерти. diff --git a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml index b59099012c5..892ca9f10c4 100644 --- a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml @@ -627,3 +627,14 @@ conditions: - !type:ListingLimitedStockCondition stock: 3 + +- type: listing + id: UplinkMiniatureEnergyCrossbow + name: uplink-miniature-energy-crossbow-name + description: uplink-miniature-energy-crossbow-desc + icon: { sprite: /Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi, state: icon } + productEntity: WeaponMiniatureEnergyCrossbow + cost: + Telecrystal: 9 + categories: + - UplinkWeaponry diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml index d0d91d0f87c..2e0a45e8f1a 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml @@ -212,3 +212,69 @@ price: 7500 - type: Item size: Normal + +- type: entity + name: Miniature Energy Crossbow + parent: BaseWeaponBatterySmall + id: WeaponMiniatureEnergyCrossbow + description: The syndicate's energy crossbow, small, silent and deadly. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + resetOnHandSelected: false + soundGunshot: + path: /Audio/ADT/Weapons/Guns/Gunshots/heavy_shot_suppressed.ogg + params: + volume: -5 + - type: ProjectileBatteryAmmoProvider + proto: BulletMic + fireCost: 900 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 300 + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: true + +- type: entity + name: Energy Crossbow + parent: WeaponMiniatureEnergyCrossbow + id: WeaponEnergyCrossbow + description: Energy crossbow, big, powerful and stily. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Guns/Battery/ebow.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: ProjectileBatteryAmmoProvider + proto: BulletEnergyCrossbow + fireCost: 900 + - type: Item + size: Ginormous + - type: Construction + graph: EnergyCrossbowGraph + node: crossbow + - type: Gun + resetOnHandSelected: false + soundGunshot: + path: /Audio/ADT/Weapons/Guns/Gunshots/heavy_shot_suppressed.ogg + params: + volume: -5 + fireRate: 1 + - type: UpgradeableGun + whitelist: + tags: + - PKAUpgrade + - type: ContainerContainer + containers: + upgrades: !type:Container diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index bd05c153067..e85caa397e5 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -210,3 +210,70 @@ soundHit: collection: WeakHit forceSound: true + +- type: entity + id: BulletMic + name: MIC bolt + parent: BaseBullet + categories: [ HideSpawnMenu ] + description: Not too bad, but you still don't want to get hit by it. + components: + - type: Sprite + noRot: false + sprite: ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi + layers: + - state: cbbolt + - type: Projectile + damage: + types: + Heat: 15 + - type: Ammo + muzzleFlash: null + - type: Reflective + reflective: + - Energy + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.05,-0.05,0.05,0.05" + hard: false + mask: + - Opaque + - type: KnockdownOnCollide + - type: BlurOnCollide + + +- type: entity + id: BulletEnergyCrossbow + name: Energy Crossbow bolt + parent: BaseBullet + categories: [ HideSpawnMenu ] + description: Not too bad, but you still don't want to get hit by it. + components: + - type: Sprite + noRot: false + sprite: ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi + layers: + - state: cbbolt + - type: Projectile + damage: + types: + Heat: 17 + - type: Ammo + muzzleFlash: null + - type: Reflective + reflective: + - Energy + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.05,-0.05,0.05,0.05" + hard: false + mask: + - Opaque + - type: KnockdownOnCollide + - type: BlurOnCollide diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/crossbow.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/crossbow.yml new file mode 100644 index 00000000000..bdf407d25df --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/crossbow.yml @@ -0,0 +1,25 @@ +- type: constructionGraph + id: EnergyCrossbowGraph + start: start + graph: + - node: start + edges: + - to: crossbow + steps: + - tag: PKA + icon: + sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi + state: icon + name: PKA + - tag: ModularReceiver + icon: + sprite: Objects/Misc/modular_receiver.rsi + state: icon + name: modular receiver + - material: Cable + amount: 15 + - material: Uranium + amount: 10 + doAfter: 10 + - node: crossbow + entity: WeaponEnergyCrossbow diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml index 01797e4f6fc..794d9fe2962 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/improvised.yml @@ -113,4 +113,17 @@ description: Dagger to cut your enemies. icon: sprite: ADT/Objects/Weapons/Melee/makeshitdaggers/uraniumdagger.rsi - state: icon \ No newline at end of file + state: icon + +- type: construction + name: energy crossbow + id: ADTEnergyCrossbow + graph: EnergyCrossbowGraph + startNode: start + targetNode: crossbow + category: construction-category-weapons + objectType: Item + description: Big and modifyable. + icon: + sprite: ADT/Objects/Weapons/Guns/Battery/ebow.rsi + state: icon diff --git a/Resources/Prototypes/ADT/status_effects.yml b/Resources/Prototypes/ADT/status_effects.yml new file mode 100644 index 00000000000..320f3d7ddcd --- /dev/null +++ b/Resources/Prototypes/ADT/status_effects.yml @@ -0,0 +1,3 @@ +- type: statusEffect + id: BlurryVision + alwaysAllowed: true diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index a0d79e01f59..61e12718d41 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -450,3 +450,6 @@ - type: Tag id: MiningShop + +- type: Tag + id: PKA diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml index 48fa3df524f..c69324e9d17 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml @@ -74,4 +74,6 @@ soundHit: collection: GenericHit - type: AltFireMelee #ADT_Tweak - + - type: Tag #ADT tweak + tags: + - PKA diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..3e263ca5658b94a65d423344f38c40db269550be GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|ssnsNT!FN* zva+kItA&LHke!;EYG7b+`RXNxXABHy7#OxNgocK8cXzMbbx2)Zed(%I4F4G#tpfKp zb>v!TxVgF6+uJKBD6HpT?48(KSy`E$o*t=TvH#CC`8=Cq28PJUNDU2*ObHDuE344p z;Qai2O-)TRGqb3uC?M(19Z&$YQnMt;FPPy!ap1d;jN2@rrb`GMF3^!u)*Mstn^L3cfQ!R~}9~7v0FNFngL(>6BT8C$8l`PbiYxy7VxA hiSn^O{r{e;hW+5+U@@AWei7&h22WQ%mvv4FO#mr@o{9hf literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/equipped-BACK.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/equipped-BACK.png new file mode 100644 index 0000000000000000000000000000000000000000..a4d64471de75176baf8ed097eabddb0024010bd3 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAP_Wz6 z#WAE}&f8lDIS)AquwHOoqt$rBn}z?Sf@Z?6&FxsjI6mUA2ngKSQHc;NGT= zTni01H#d8Gdj$oBzidps6MHKwE7Q}{BQ-37{!ey1RDlC~U{bk}Jr5hn9msI<0x02&n-En2s`>&Y~TFzu#+qzY4lCd3+qG8Y` z1Lut1nciY<+>ho-%*<3f)bY2q_2MK3c0a|N8Y~B2IdeF_*ug*T*b0F|elPx8 zZ^$g^X+H-X2yG|e6cI-cdiBcgu&C*&t;ucLK6To CkHQ83 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3ccac4e1f1e8b50ba460030fdf2d5ffbcaa47856 GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zQ#@T9Ln`LH zy>+nnkbwZ}h54d$eROwTbmdymy>od($wA%Ng85N<*bB@o&gD71IqLS`)5F6e`Fun3 z6hj9W7;xX3`u(MAr%6e722W3TxVqYQgT!}E)*G{GN^0J+-k81T z`xo)3rN`^+gpw}THg~|mw$t~EX4zlW-Eg$@l#pr7lv+1srE>||;x#i?n*J+TVIT1L zCu3;oJ`T@W%7&fi_*LxX1@tVgaotaT`==p><=X8lZs$wu9;nW~{m?p@>HO{0Yp&gF z%=<9UvMYanx_6y!ohR#wxiuy8g1A1!pVWV*y_Dg7z%}0q9a&#^zkR&3VB^!=wZOn< N@O1TaS?83{1OWVVyJ!Fa literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..35875745fa1e036609a2da29ef07a1a3ffd80451 GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zLp@y_Ln`LH zy?L;=*+78xf`8P^s2#cDA`|qU`7yq0l8$|1x7A|$3<>@2CgxKU{`#L{eVCE1!jN&>tZv(h+@QTH|813Uz&iD=2cZKogSZlNSucu!t(XBn#X)M_SAjjuw48o zFz)Ho|Gn=0pWj?gg}YL4=Og1!r|!GR%beaRb3i0++WIH9sZ(Yf{owj({nut$d15wO zymsrXRaG|_^h~>h*yNoWzOwB+mBkjnI_ACp%af0m*UWww^&%+c{jngH+JI>e>$Q%Px$F-b&0R9J=WS21eCFcf_@UOi<92}O4(MR@fIOtXgIwOxb8j-E~LAWGMOPoULk zYEBT6*--ErqE7y_7^Q{s?ZJ7A^d#f|^u8>815-!9@ls<9@;rAP*IIkyum})BxI{|g zwY6RmECTNCmo97~;)#@A5g~^F064xJahaW=wGL`)kx2O?E$jmRia`Wib72||0Dc!n zcOd%xk^do0Q|b#Ldh??@Ft~u)T3lvl;_NB-j-n{gwk_f~#%8;AZ?EqGpMZz{(CKgh z0DLwLo*$pE*{yW2mo`>djB*98gNRRhD5_ zRVd4n3X^F#;9LD*0EX>4Tx04R}tkv&MmKpe$iTT4Y-9LylaAwzYtAS&W0RV;#q(pG5I!Q|2}XktiG zTpR`0f`cE6RRU7TlmpZjw}l%mN1pGZ8*bi*QEC!XH4 zbk6(40;@<0@j3CBK^G)`{?%w`A)9&vFMWu3;&t<1l00051Nkl(=TLg0_WXdHgZfPG zOCZm4&-;-J{B<~ay+}&=DsMCzY7!?&V&s|0OTb(5siL7kG!C*k4P#_2b0Nkaq z0sEYj_2xKEwh5y^wOgr^uK@89_If=XKg~XlgEDXhH`mu}t!@%VfwJO2zu%|R>AaM; z10142uyS5AFrD6tfbYV} zwLFXhHSaFy+;n=dG=}r;0&DfU&Q0WC@y8^NV?Bl@@_+mT;2GwQyHKlKg|Gks002ov JPDHLkV1h1>sTcqN literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/meta.json new file mode 100644 index 00000000000..ac0eeada4b5 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/ebow.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/commit/1d0e3dde0f89e7926be32a3706883c3f003931f8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..87e37340c5e3bf5e8d3d62196b240891b1e8a24f GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|ssnsNT!FN* zva+kItA&LHke!;EYG7b+`RXNxXABHy7#OxNgocK8cXzMbbx2)Zed(%I4F4G#tpfKp zb>v!TxVgF6+uJKBD6HpT?48(KSy`E$o*t=TvH#CC`8=Cq28PJUNDU2*ObHDuE344p z;Qai2O-)TRGqb3uC?M(19Z&$YQnMt;FPPy!ap1d;jN2@rrfg3a#}JF&xBa{M4k&QA zwl=c%YR~@vfBIh4S{0KkesgVh-JQ)mWz!GInNLifw4IQvmAVu4dhL6OxSR_YUVW(& zkUCP*sJP54@ZgzO^4cAqX95KRYa}KaCwySMIa8oOY+jS+!{&#&?#i+G4|AT|F!$Nc RzX}R622WQ%mvv4FO#lT3nIQlG literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..a4d64471de75176baf8ed097eabddb0024010bd3 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAP_Wz6 z#WAE}&f8lDIS)AquwHOoqt$rBn}z?Sf@Z?6&FxsjI6mUA2ngKSQHc;NGT= zTni01H#d8Gdj$oBzidps6MHKwE7Q}{BQ-37{!ey1RCHeXd=r`>UCDDZaTOP<Cy8Wx%CdXZl3_lmx^M#-9HPARI(CiSC^LgRFFn!ONoUEyVief<5F?hQAxvX`60fZNh3T`DspC#vLX z-3qz&gWFj9YpnhLb=zBZ-JDaL$@q4cP{3Qx)0XR}v%IXGW!ka%!C#yCd+t?!E}Z>c zz4Dm)>x$-UkM=*#5cu~b+_zySZ~T4hYY>Bh>EUQ;1>bz|gjb;e+%P%b_u8x3sBv&MOdU;}UxJm++0PWe`&t7#dznKK>Qrm;Qk&+k)=eKL2Q0t16UA^YZ&Q!JHVdFVdQ&MBb@ E01{nu6aWAK literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/mag-0.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..cb7a970e822d4f568d9732bf3fb5b507825438cc GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>pWc?Ln2z= zUOmX$Y{1j{&^`Txrqeyfbk!M}s}6aja{7fH<$I^eoDl7@pyvCD{gWIT*6p@dnlxon z#`XPc4m)$qcrJO1BiJF-%g}X2Z?MQ7#WOl*bS$4=KK^hMv;9w|3vXMz85m@aFYGGd zzVW?wh2Zp+EX>4Tx04R}tkv&MmKpe$iTT4Y-9LylaAwzYtAS&W0RV;#q(pG5I!Q|2}XktiG zTpR`0f`cE6RRU7TlmpZjw}l%mN1pGZ8*bi*QEC!XH4 zbk6(40;@<0@j3CBK^G)`{?%w`A)9&vFMWu3;&t<1l0003iNklzfKs2 zqO}&&eS569>$)UKf~kp726~F37-hnkK>0$BL{TJB6iJq4S6{~@34F*qaOWiY(+A2I z=>7+jBqm7!plKSbZQHB&CNYqv>2TV%ZQ0vcCSyYJP*flhOxcrygaYp zKm%5FR^!3gfQG}%ftBY`*Yz;|di?A@)<6YXYpJU9Cd?=irIY}~aV!8zscx1dlv;M% zt%PBC!$y?H7C_eorPR=ZOT;H@L62n}({7sP2GO5V{(c8cUPEI7Yh7ML)4c0hQWbkzLb6Mw< G&;$VPQ7*Co literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi/meta.json new file mode 100644 index 00000000000..9ce46c39477 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/Projectiles/cbbolt.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cbbolt" + } + ] +} From b32ce58cc0fcc3823f32f64bcb6e6e4a2c98ff8b Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Thu, 2 Jan 2025 17:40:41 +0200 Subject: [PATCH 2/4] =?UTF-8?q?=D1=80=D0=B5=D0=B2=D1=8C=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Catalog/uplink_catalog.yml | 4 ++-- .../Entities/Objects/Weapons/Guns/Battery/battery_gun.yml | 6 +++--- .../Objects/Weapons/Guns/Projectiles/projectiles.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml index 892ca9f10c4..5305b462691 100644 --- a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml @@ -629,11 +629,11 @@ stock: 3 - type: listing - id: UplinkMiniatureEnergyCrossbow + id: ADTUplinkMiniatureEnergyCrossbow name: uplink-miniature-energy-crossbow-name description: uplink-miniature-energy-crossbow-desc icon: { sprite: /Textures/ADT/Objects/Weapons/Guns/Battery/miniature_ebow.rsi, state: icon } - productEntity: WeaponMiniatureEnergyCrossbow + productEntity: ADTWeaponMiniatureEnergyCrossbow cost: Telecrystal: 9 categories: diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml index 2e0a45e8f1a..049b6553321 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml @@ -216,7 +216,7 @@ - type: entity name: Miniature Energy Crossbow parent: BaseWeaponBatterySmall - id: WeaponMiniatureEnergyCrossbow + id: ADTWeaponMiniatureEnergyCrossbow description: The syndicate's energy crossbow, small, silent and deadly. components: - type: Sprite @@ -245,8 +245,8 @@ - type: entity name: Energy Crossbow - parent: WeaponMiniatureEnergyCrossbow - id: WeaponEnergyCrossbow + parent: ADTWeaponMiniatureEnergyCrossbow + id: ADTWeaponEnergyCrossbow description: Energy crossbow, big, powerful and stily. components: - type: Sprite diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index e85caa397e5..c78b2c8c3ef 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -212,7 +212,7 @@ forceSound: true - type: entity - id: BulletMic + id: ADTBulletMic name: MIC bolt parent: BaseBullet categories: [ HideSpawnMenu ] @@ -246,7 +246,7 @@ - type: entity - id: BulletEnergyCrossbow + id: ADTBulletEnergyCrossbow name: Energy Crossbow bolt parent: BaseBullet categories: [ HideSpawnMenu ] From 973a07a9aa4e44419ed615f1881b050319fb9cae Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Thu, 2 Jan 2025 17:53:43 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl | 4 ++-- .../ADT/Recipes/Crafting/Graphs/Improvised/crossbow.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl index 01063d3fba8..6d96d2b6bf2 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/Battery/battery_gun.ftl @@ -1,7 +1,7 @@ ent-ADTWeaponPistolX01 = X-01 М.Э.П. .desc = Мультифазовый энергетический пистолет. Это дорогая, современная версия антикварного лазерного пистолета. У этого оружия есть несколько уникальных режимов огня, но нет возможности самостоятельно перезаряжаться с течением времени. .suffix = { "Пистолет, Мультифазовый" } -ent-WeaponMiniatureEnergyCrossbow = миниатюрный энергетический арбалет +ent-ADTWeaponMiniatureEnergyCrossbow = миниатюрный энергетический арбалет .desc = Энергетический арбалет синдиката, маленький, тихий и смертоносный. -ent-WeaponEnergyCrossbow = энергетический арбалет +ent-ADTWeaponEnergyCrossbow = энергетический арбалет .desc = Тяжёлое смертоносное оружие, поддаётся модификации модулями ПКА. Любимое оружие революционеров, еретиков и прочих любителей кустарной смерти. diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/crossbow.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/crossbow.yml index bdf407d25df..12283aa5196 100644 --- a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/crossbow.yml +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/Improvised/crossbow.yml @@ -22,4 +22,4 @@ amount: 10 doAfter: 10 - node: crossbow - entity: WeaponEnergyCrossbow + entity: ADTWeaponEnergyCrossbow From 6e915950b28cc57869da3ef3846241d05a5330f0 Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Thu, 2 Jan 2025 17:59:29 +0200 Subject: [PATCH 4/4] Update battery_gun.yml --- .../ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml index 049b6553321..f038a10d6e4 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/Battery/battery_gun.yml @@ -233,7 +233,7 @@ params: volume: -5 - type: ProjectileBatteryAmmoProvider - proto: BulletMic + proto: ADTBulletMic fireCost: 900 - type: BatterySelfRecharger autoRecharge: true @@ -257,7 +257,7 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - type: ProjectileBatteryAmmoProvider - proto: BulletEnergyCrossbow + proto: ADTBulletEnergyCrossbow fireCost: 900 - type: Item size: Ginormous