From 6c545bed2e9b0457572c7f960f7911ddf4ba6730 Mon Sep 17 00:00:00 2001 From: Maxtone Date: Mon, 15 Jan 2024 23:14:43 -0600 Subject: [PATCH 1/6] Adds plasteel broadsword --- .../Entities/Objects/Weapons/Melee/sword.yml | 36 ++++++++++++++++++ .../broadsword.rsi/equipped-BACKPACK.png | Bin 0 -> 3597 bytes .../Melee/broadsword.rsi/equipped-BELT.png | Bin 0 -> 3435 bytes .../Weapons/Melee/broadsword.rsi/icon.png | Bin 0 -> 3158 bytes .../Melee/broadsword.rsi/inhand-left.png | Bin 0 -> 3251 bytes .../Melee/broadsword.rsi/inhand-right.png | Bin 0 -> 3258 bytes .../Weapons/Melee/broadsword.rsi/meta.json | 30 +++++++++++++++ 7 files changed, 66 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/meta.json diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml new file mode 100644 index 00000000000..cee607df328 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml @@ -0,0 +1,36 @@ +- type: entity + name: plasteel broadsword + parent: BaseItem + id: PlasteelBroadsword + description: An ancient design manufactured with modern materials and machines for a very specific target demographic. + components: + - type: Sharp + - type: Sprite + sprite: _NF/Objects/Weapons/Melee/broadsword.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.5 + damage: + types: + Slash: 15 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Reflect + enabled: true + reflectProb: .1 + spread: 90 + - type: Item + size: 15 + sprite: _NF/Objects/Weapons/Melee/broadsword.rsi + - type: Tag + tags: + - Sword + - WeaponMelee + - type: DisarmMalus + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage + - belt diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..5c0a2dd067efa65580862d1115e732b243931f00 GIT binary patch literal 3597 zcmV+o4)XDdP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}0009hNkl53-LWoB7SWd2eSXf`|}g2_fLZ02lxR2)2Y9z2WD#=cKL80)Wux zI;F+n0MOQEkZ9 z9gm)b5Tc6gP;XZS(3Lw6>ynpcx#qm0D7F;808kD|(USnunPD19M8#o0+t33#rA4IX zw~(6O!t}ydaqQf)nqS@?X#oH{dHY$|QNphBx(r0;=zV6G00`rfb<+b5l! z*5cH4^pC&5&SnX}^53zY?Y9)G!cLV3fHzY~q+WdzUI)F=_-R_-_<@zHm#|taiyV?w zp3*cA(3J;(M++atVFR7p%I|EJuv#qJh99!K=Cy(ft)Sw8vTDoit%4FlRL0n~Gp;Ca z3&2=kHx)~}D3*3>TE3aGw45WOUd$yGYf_P_^=**1Rmst}X>*z;kMO zM?ui;UhgD6m;;_$P=yuOsc`^wO&V>5Gj|8cY->3FS3nWPrt^xRKd640??_{j6n*c!7%1w&_0ssv}=j!I0j9nsL z$wWLxt>Hgv*eTf5%?TF1+%#U&LERy`6;!S4xN2lY^a{0BP%Cvxt2seelA^i`0`RO) zU?LtP0Eo1;@2gOI4&W%1*YDXH4pmjCJu9SP5Oa&82aBJ2>#O)=K~l317H9QfB`T72EYJKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}0007pNklAJF_ zbKv4H>2mzjImhSfe@)DcJlg_tZUR662mk>f00e*l5C8%|00;m9AOHkF4s9{+i5DmP zJUrS101Cdp>@@Qc0mGv`)apI}j34us0<^ugPPMwv@3y|+J3aycKj{>(UcX`hc=@6* z`9b{??|k0Gr4JBIWCW(&b9{LGWA=9CP3UA-*8>1R_xCwPBEZbrBka7vkM~?!UE*q` z$d4U2ZO$lun)p7GuH~6i~@D_X9a-L)&@<6vrgY3iy;9Z00e*l5C8%|03==w&Z3Et2oL}QAX_!S zw572ylN1mD0zd!=0F!pwDDnBvug1&y#mPROd1an^0JXZ0zp}Ye3#!p3P3xwp=Xn#a z9mfe>3k2tjx>nHf#kDQoJ?Ii}FUu`EO$zf>`T3-3!0thpT-)NC;}2%iA*z}>O`(mW z{6_WVp&FfJBx;3&dcD%;VNewPm#IS7JRVSat-z^9Kw6{GXaE2e5(_k26=M z`v4`umDdU!SBKOB5L9JnwNW7{1hqLMs)D=_B~|{1S{o;IzYRwd`x2rQU~K?um&U9% zDwvK0qX2@tG}K0gY0XmF5OiyT7J%TF&q`s`O;wWr4$E>_0OZ>K3;?+g=DW>;(Q5zz N002ovPDHLkV1gH7TE_qY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9d4538c052b4a6a015d586380e27d9b13e553b14 GIT binary patch literal 3158 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bd5fe17307c33cd21cf5c1c20df72748c15acdff GIT binary patch literal 3251 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 q_`2_y;2WpjN8%kwqHB*)?W7 Date: Mon, 15 Jan 2024 23:39:39 -0600 Subject: [PATCH 2/6] Fixed strap --- .../broadsword.rsi/equipped-BACKPACK.png | Bin 3597 -> 3653 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/equipped-BACKPACK.png index 5c0a2dd067efa65580862d1115e732b243931f00..67f678b3ffb0e1256f8097d63040c25ce410dd13 100644 GIT binary patch delta 899 zcmV-}1AP3A9K{^4&XMY#Vv0l%QJ$1wqFy#4 z=x93(Q807_b*O|ukTnSM5Haf<@s373L`0qvdz1V4Yn;XxZ8 z9<*U{B%yjj@g{aZc?(C&L!N(NAP&9BK>VrD3t<r2@8Gs)4F|8Wb-?1b~wjvop)7iviU{Yds)bKmZT`1ONd*01yBK00BS% z5CDuni`&8i8Wn=x21|3JYpC8+Y+^#B(!uiS5Wj!D0F+LL^!V(T1y0R$NWEhK0pI~w zl-J%o=UN*er$H*d6HIRp9|_0+XmTV`7?KDsZd4qVG2HUrMb@A-V79E!g2V7B2 zLlUGl%@7d+?ruKY{LgrbJH=L{t+Bo?b~>6=;p@2vU1?CcxTD3Xt37T+6zfxK##&kj zD4Kh>vOQkvc4j~@R0t^}GRL*Yt$<+E0u5J!#WBEY2(7KH_00mu1wl0lxVt$e=kR)Y zv##x53-LWoB7SWd2eSXf`|}g2_fLZ02lxR2)2Y9z2Sf7x96m-%>sbX=Q^du z-~iCpW|7Y1E7v25sPB~6&i0$9D02Q5PMo?S+*kr)Z}|Sepc^Wk$z#uJoqK=@1Ral_ zgb<>N>`-r41<;i{59^YbWx3|OqA0c$zW`7UNzs!4(wSizNkqkAKikj)I;BOV=C_cV z-@^35S8?pzvzmWj-X3WI06cm7S=dp+uJXDJMCa&zW|#m7Ch0G#J(tdZ`bHb(N9Hpo7Sl@Vumve(?JNwkzZE#Y)NSDWFaBuj7E$b_a;t1B_ z)OGZazrfCB3BU5+v7PO=6sy8cl?Q+~Q%R&=eG*;=z0rU8X5Gj|8cY->3FS3nWPrt^xRKd640??___hubTis)yhqa0RjLGMCa<}n~Yr| zUdco}My=sLYS<~*)XfPNzT7lk(m~xJx)oHd?6_)VMf3`_R!}Q-N~<|RSCXQ-3j*-0 zPhcV*BLIlBwePD?dk)|zl-KXs8V*%es6EXJ8=EA&Rvv&W<$1>kp^lCYPupYkNblM` zjSWKvjfNkj(N1GUA0pz)P{>XCfp{4D-yjJ7(-h|e7ytuc01SWuFaQR?0D>vM2LM&> Vx@B3bSgrs7002ovPDHLkV1f!cj(q?C From 000402dcdc4ba0b6a15343511983808d47841d5d Mon Sep 17 00:00:00 2001 From: Maxtone Date: Mon, 15 Jan 2024 23:45:53 -0600 Subject: [PATCH 3/6] I guess it's more of an arming sword --- .../_NF/Entities/Objects/Weapons/Melee/sword.yml | 8 ++++---- .../equipped-BACKPACK.png | Bin .../equipped-BELT.png | Bin .../{broadsword.rsi => armingsword.rsi}/icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../{broadsword.rsi => armingsword.rsi}/meta.json | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename Resources/Textures/_NF/Objects/Weapons/Melee/{broadsword.rsi => armingsword.rsi}/equipped-BACKPACK.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Melee/{broadsword.rsi => armingsword.rsi}/equipped-BELT.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Melee/{broadsword.rsi => armingsword.rsi}/icon.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Melee/{broadsword.rsi => armingsword.rsi}/inhand-left.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Melee/{broadsword.rsi => armingsword.rsi}/inhand-right.png (100%) rename Resources/Textures/_NF/Objects/Weapons/Melee/{broadsword.rsi => armingsword.rsi}/meta.json (100%) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml index cee607df328..60aaba68d05 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml @@ -1,12 +1,12 @@ - type: entity - name: plasteel broadsword + name: plasteel arming sword parent: BaseItem - id: PlasteelBroadsword + id: PlasteelArmingSword description: An ancient design manufactured with modern materials and machines for a very specific target demographic. components: - type: Sharp - type: Sprite - sprite: _NF/Objects/Weapons/Melee/broadsword.rsi + sprite: _NF/Objects/Weapons/Melee/armingsword.rsi state: icon - type: MeleeWeapon wideAnimationRotation: -135 @@ -22,7 +22,7 @@ spread: 90 - type: Item size: 15 - sprite: _NF/Objects/Weapons/Melee/broadsword.rsi + sprite: _NF/Objects/Weapons/Melee/armingsword.rsi - type: Tag tags: - Sword diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/equipped-BELT.png rename to Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/equipped-BELT.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/icon.png rename to Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/icon.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/inhand-left.png rename to Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/inhand-left.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/inhand-right.png rename to Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/inhand-right.png diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Objects/Weapons/Melee/broadsword.rsi/meta.json rename to Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/meta.json From 0b5b3a02a8316c4ecabeb5bf96981d720347b83c Mon Sep 17 00:00:00 2001 From: Maxtone Date: Tue, 16 Jan 2024 08:43:00 -0600 Subject: [PATCH 4/6] Based on cap sabre --- .../Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml index 60aaba68d05..60aaa71facc 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml @@ -1,6 +1,6 @@ - type: entity name: plasteel arming sword - parent: BaseItem + parent: CaptainSabre id: PlasteelArmingSword description: An ancient design manufactured with modern materials and machines for a very specific target demographic. components: From 6f951ee3bc315b72476829cfd39dfb60cc860881 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sun, 21 Jan 2024 01:39:46 +0200 Subject: [PATCH 5/6] remove sword tag --- .../Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml index 60aaa71facc..5055617f236 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml @@ -25,7 +25,6 @@ sprite: _NF/Objects/Weapons/Melee/armingsword.rsi - type: Tag tags: - - Sword - WeaponMelee - type: DisarmMalus - type: Clothing From 44ba4c7d16af100aa3417d36d6117ddbe6dddab5 Mon Sep 17 00:00:00 2001 From: Dvir Date: Mon, 22 Jan 2024 13:55:43 +0200 Subject: [PATCH 6/6] Grid Inventory moment, its using the parent 15 size anyway --- .../Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml index 5055617f236..091e5c57a72 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml @@ -21,7 +21,6 @@ reflectProb: .1 spread: 90 - type: Item - size: 15 sprite: _NF/Objects/Weapons/Melee/armingsword.rsi - type: Tag tags: