From 6918f1235b263d4b98b53c5bb9e5d2cc075acf44 Mon Sep 17 00:00:00 2001 From: ultradyper Date: Tue, 18 Aug 2026 12:31:55 +0000 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=D1=80=D0=B0=D0=BF=D0=B8=D1=80?= =?UTF-8?q?=D0=B0=20=D1=81=D0=B8=D0=BD=D0=B4=D0=B8=D0=BA=D0=B0=D1=82=D0=B0?= =?UTF-8?q?=20=D0=B2=20=D0=B0=D0=BF=D0=BB=D0=B8=D0=BD=D0=BA=D0=B5=20=D0=B7?= =?UTF-8?q?=D0=B0=208=20=D0=A2=D0=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Catalog/store/uplink-catalog.ftl | 2 ++ .../Entities/Objects/Weapons/Melee/swords.ftl | 8 +++++++ .../Catalog/store/uplink-catalog.ftl | 3 +++ .../Entities/Objects/Weapons/Melee/swords.ftl | 3 +++ .../Prototypes/ADT/Catalog/uplink_catalog.yml | 14 +++++++++++ .../Entities/Objects/Weapons/Melee/swords.yml | 22 ++++++++++++++++++ .../Objects/Weapons/Melee/rapier.rsi/icon.png | Bin 0 -> 2451 bytes .../Weapons/Melee/rapier.rsi/inhand-left.png | Bin 0 -> 4671 bytes .../Weapons/Melee/rapier.rsi/inhand-right.png | Bin 0 -> 4638 bytes .../Weapons/Melee/rapier.rsi/meta.json | 22 ++++++++++++++++++ 10 files changed, 74 insertions(+) create mode 100644 Resources/Locale/en-US/ADT/prototypes/Catalog/store/uplink-catalog.ftl create mode 100644 Resources/Locale/en-US/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/meta.json diff --git a/Resources/Locale/en-US/ADT/prototypes/Catalog/store/uplink-catalog.ftl b/Resources/Locale/en-US/ADT/prototypes/Catalog/store/uplink-catalog.ftl new file mode 100644 index 00000000000..56f9d7bf618 --- /dev/null +++ b/Resources/Locale/en-US/ADT/prototypes/Catalog/store/uplink-catalog.ftl @@ -0,0 +1,2 @@ +uplink-adt-rapier-name = Rapier +uplink-adt-rapier-desc = A thin syndicate blade that pierces armor with precise thrusts. diff --git a/Resources/Locale/en-US/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl b/Resources/Locale/en-US/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl new file mode 100644 index 00000000000..801ce14c1a7 --- /dev/null +++ b/Resources/Locale/en-US/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl @@ -0,0 +1,8 @@ +ent-ADTRapier = rapier + .desc = A thin syndicate rapier, its blade designed to pierce through armor with precise thrusts. + +ent-ADTStraightRazor = straight razor + .desc = Easy to cut a throat with it. + +ent-ADTGladius = gladius + .desc = The old sword of the Roman Empire, it is still good for campaigns against the barbarians in the technical corridors. 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 dda7166b205..4db71a73b22 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 @@ -257,3 +257,6 @@ uplink-box-music-disks-desc = Тихо выполнять цели - не ваш uplink-code-speak-implanter-name = Имплантер Кодового языка uplink-code-speak-implanter-desc = Каждый уважающий себя ядерный оперативник знает этот язык. Имплантер замаскирован под обычный имплантер Общегалактического языка. + +uplink-adt-rapier-name = Рапира +uplink-adt-rapier-desc = Тонкий клинок синдиката, пробивающий броню точными уколами. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl index b56db4df137..2ab8e9e7e8d 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/swords.ftl @@ -9,3 +9,6 @@ ent-ADTStraightRazor = опасная бритва ent-ADTGladius = гладиус .desc = Старый меч Римской империи, он все еще хорош для кампаний против варваров в технических помещениях. + +ent-ADTRapier = рапира + .desc = Тонкая рапира синдиката, созданная для пробивания брони точными уколами. diff --git a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml index e5c78925830..72a48d61c11 100644 --- a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml @@ -1,5 +1,19 @@ #UplinkWeaponry +- type: listing + id: ADTUplinkRapier + name: uplink-adt-rapier-name + description: uplink-adt-rapier-desc + icon: { sprite: /Textures/ADT/Objects/Weapons/Melee/rapier.rsi, state: icon } + productEntity: ADTRapier + discountCategory: usualDiscounts + discountDownTo: + Telecrystal: 5 + cost: + Telecrystal: 8 + categories: + - UplinkWeaponry + - type: listing id: ADTUplinkAdvancedHristov name: uplink-hristov-bundle-name diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml index 6a53850c156..e4563934332 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml @@ -411,3 +411,25 @@ - type: Construction graph: ADTBBattleaxe node: ADTBoneCompBattleaxe + +- type: entity + parent: [ BaseSword, BaseSyndicateContraband ] + id: ADTRapier + name: rapier + description: A thin syndicate rapier, its blade designed to pierce through armor with precise thrusts. + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/rapier.rsi + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 17 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: ArmorPenetration + penetration: 0.3 + - type: Reflect + reflectProb: .1 + spread: 90 + - type: DisarmMalus diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..eb0476a5c1f945aa2e877d18f50c1580db902656 GIT binary patch literal 2451 zcmcImd2ka|91bu*X)P4X9}ZJ+Sq`~2dnTK#1Sk!(MZ(c$Z0k^9v-^^+B-wR$OVR>T z5JX{wGC(<}qhP0^oK}H?mC{-d9IW7IQH}}dhzM9maX{qoZJLxrsEjjaX0vZM-}`>w z`~AM(dwF&0>@g5G%_m8L4p9#c_bY02Q@D2K%=}I92>836p2Fg*$y<_2#Dmn zrXm@#3J|-QzyyLI5!P-d86bEVY9vAt6or!%PEZ(W=SYfU7$o*VVK`OvayiZkv0(7Y zffnhy!r^!*6f%csv#k1X(r&jy0-T~Sh`_Xxpw5S}pf)hh-~^hWN{TMYLBwF>J#w+` zK%vyOH3XD)+MpK86U-PM<`tYY6ULh2K$ojyXduvz*7WgnV3e5N2NG-U5(VHnK$DAA z0gRsmg8IOCFr`S=Wvxhlh_?2h?@=fU?E#fy)gMidDB!>k0+3sSSTd?l;WAXf>$2*W zWq-Uvg+ENZ z#?R?kx{c+%3}J%>vWZsALctV!U}iBJ0Zl-9y_8LahWsC;$GC+eKIj8*=fu(fzL-aI z@jn;yz`lCaI#72vdE2D>7K0o6Wt+qB`^|U9yzvG|hplN?Q;XGf9Pewd?&x@Dunc3h z+h`BQva}sz?TiQGy@b&oJk9Wc0;I)0DjL@>!P(JK8xh`d#3=Hvy*@q}9w5fB{pf-Z z?S~%-!n&#OX#1vR&_$D}b85CT-JQRrX&qUVIxTJKA>W%X*0p?6;-MR9r$m6TVBK(MHYflZX z{ruqdO~2H2zdFBlLF<{*sS}6Y@|i22+CF1fmstfBYFg&zgQof&w{nZ?ZshJ0lHPl6 zM{T4wXT#yodbErj@nPA_2I<1pzl8ark}9=|T3S8()20yzZjVb_C>5A5?U{aJ`Qlcl zbzs#;zmHnAY;69mB`5bLm#xWJSv@>uad%%YvZbteud+oAALv#VX#Dz%#%)U0w$7^~ zITNS1xTYXIPwlVY4yFwH@@6^RbLHUjZfTFrOFGvuV(pQvxjPdFZKyq860WR1N#{lA zU2lAK?DB5c$Hj$bTj$ganbvjE;nW`M7dMZL-0tE$oVu!cOG{bGg4UWD&eOGy4_>^{ zztgXE6_%b)_D*ol`*YcM`a73$a+~HB94~A9ArqPL?DO0GZiy}3RzI-onZ4=Yx5UW) zlKLYP);{yv+r9UHZ?mnS3nEKa=PhTcwG^9Qq?tbN<^s8#ax0txPao8qF_G*<33v9P{J( W;S1`<=T#Vgo3h7GcJ3TEYti4lnq98| literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d2e03668a2d8769f22ff178469a62b33fa24d3e0 GIT binary patch literal 4671 zcmd5=3s_WT8a`kGhA5Qj^IdYbK?J0x7nlh+^u35sAiXZFpIY#1_!ZAi~T3!)2t>V7Gnt*?FFG=A1L%|GwY- z|IWNNJLV;~N4*|}AjmBuTp0_#gKUS36F8Tu(=ULpF^2F3CJ1tU!ge@7)?!Zx8vDLF zF2S4-9VKV=S`p3Z8D3=38h|te1q50QG`oa13m85{ty2iES051y)SN;XFNsE?4WWFh zI((^-pSv_Bj$OKhr8r^Wi-G`)8~|u}GcB-aH9C{rq7e4s%E7hmu~;bR6EQDQ2!m~e zf`sVVf>6DY7f>PuW)TDxNGTCY@GL`M{sIiaFfodW5e!BtIf}^%LNM?V0y-n7lE*5; z2FSpjLYQhc8{}efR#uiM3m55)DPokOC;%YFFc?U{rfi*=w!k`*&me-5H?c;w!K~Kn z1U5vP(Px+yLZE8D4O)X8R%aUU6Y!YWLL0=W2(j7JC&;mOIYWj~(?`y+VqU{*d7aq= zWKp}UAyseIn^N@;fwuqr3j*NV=x95~19j1A?Gz^Sj7(t0fI}WAZHmh_@ZwnBq|Y$2 z{ESSXrq7@?CUY!*-=8B`4#fKw8|0xzo;K@^aeBRGFwC1!R9)od8DuY!RLBR~c5-`W{G>);njHdWOv{^j?!C{^z5LhOoaG)F|!w`m3Q4BXyy%<7;Be(=)o&=Wx7!YWR z!Fia$WEjaZJdM!A5Ujo^^oLaZ`?2rqJMwU~Ef=x}qBfULx5rP=*J|W6YipqjA!{pt zo)Zo{RzILpMwF8S>$6gM0Qx&^p`YEPSDCYDBOjass%qG_BYvpzdR-=O9HPE~Hqv10 z;*BPSP-WC>1@;ypFzW@h!JtvIw9RmFrj8rf9qjHDK9t8qXAa{cmPQd)B7;d%rGgQj zz+f4PNMV_Zz*s4X-~=HZbn$OoWZNlmxkNJ94*wGu4Y;38rFAJh*!abNz!;Y2Sz5}W zFh`RFOyV|U5EV#Gl?*``h9FS_bk=??e`^dW2Ri|d{*R1dhs}Utf^N$Tdy+idX&i4< z56OX{d1hBZ(3f%l9ll{R4kJ*C;Ak912?+*s1n9Ri8R$y3j*j5Gio{sv|0PJn8Z)xJ z__rDNz-eNn<%10!Z2A}ds(kvIZh!9-|GKUA-z)pmBFxrm`ercsgBs{a3knQnaxhrf zM~#1LC>Y?^|Iy*X)&%^gH9Nd}?jTM|eci28E}gi+Q}nqv2rk>XV1P-<>)6t?h{AnFEg+656r7}$m!V= zHGhNamr03r%~64nyVNKw5p+*kUfXi$ctCw&@vbH~q-|DdFf@C{oR6x$_h?MDM&z`g zF4=yHC)|QEx;&)Jt^G9>?ge3c_O`&v?4Vrd-TodBw07J24^KuU73-)Cd#WBgcH-Jo z+n;+rJ$Bk#^}aVuVNtzXsvUMKdvE8o9iHlaVMUI%Yy9;WouSg+x7&W`b%17_J>Id% z<-<`g^OfJW7py+EuIAEZv+JFeP|VC{>GD&8-R?}Kb8gZ(*WHzGCN@>pKjug~SqdAi zb(!M&RO`eW?a7rF!`HdEz-s_S@jEkv8eKzL>n7~{e4k_z!UC<%x3!PTb4%{dvl@R| z-gfR_Z`da^l-n6;t?RnFW@YR&&HMA7%%^LSvBe#?jv-^M^XH`<*|GkVPg!X*GB&Y# zd_FBGD|KtlnR2(jxBGf&-Qqt@G@h9A>gD-)n#tvn?}qIvCilBfPy5wtdxC_IJs;jNy~6WA`Dl@;GQ*)f!MFKN zr)vAclU1KJ3XkkBXxIJdEp5fl#cy3^C=(rVo;s%P#5T&>dRJASnt1+)`K`D$zw@Z1 zW%KQ7#hHLri!0k2^A=U^yfE!`U`FezgfH69h*CNyZe4#$IyJLObN~w~X{SB&uY8uy zIwgmtzOV7&6AQw+t0Ria@|y_D=AyFc;~T$uui@wt#jb{2~F$RLh+U zmbZ!yh3#$e45>d{Tl2keTH)I4oGo6LL>Jd7i<7JB4)~W>q@>xf-?&Xlo{Xq%x zM}iiAJFa5UtA_5}z#wx>h-ShC?=sWkqwX8>y6qhh*WW~>-+!Pqf)iu=p z)b+}yue_G+nIw!!b13)z=)k^p*XE5nx&IWDySMH9Bx#d7x&jcen< z)~>O{(*e$koM0E*(|pv>Gdsp8|TJWpCykLC5$VoIQD1p;rHIV$<{f(aZL7c z`(%@rY>5lp`uP)9cw*r&X?L3cdUyJpPp0hf f`%dCe@xA!=wt34XV-i=|{^E(45u+>*NzVHhq0g(S literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/rapier.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6ff5e7e9ba36d33494725364863be61500203573 GIT binary patch literal 4638 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 Date: Tue, 18 Aug 2026 12:42:01 +0000 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=D1=80=D0=B0=D0=BF=D0=B8=D1=80=D0=B0?= =?UTF-8?q?=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B0=D0=B3=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D0=BC=20=D1=81=D0=B8=D0=BD=D0=B4=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0=D1=82=D0=B0,=20=D0=AF=D0=9E=20=D0=B8=20=D1=81=D0=BE?= =?UTF-8?q?=D0=BB=D0=BE=20=D0=AF=D0=9E=20=D0=BD=D0=B5=D0=B4=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D1=83=D0=BF=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Catalog/uplink_catalog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml index 72a48d61c11..c62c19a9d85 100644 --- a/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/ADT/Catalog/uplink_catalog.yml @@ -13,6 +13,12 @@ Telecrystal: 8 categories: - UplinkWeaponry + conditions: + - !type:StoreWhitelistCondition + blacklist: + tags: + - NukeOpsUplink + - LoneOpsUplink - type: listing id: ADTUplinkAdvancedHristov