From 389eeb360fda3bbfcc333a7f5ec46da1f1bd8082 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Tue, 7 Jan 2025 23:50:34 +0300 Subject: [PATCH 1/2] telescopichka-resprite --- .../ru-RU/ss220/weapons/telescopichka.ftl | 2 +- .../Objects/Weapons/Melee/telescopichka.yml | 7 +- .../Weapons/Melee/telescopichka.rsi/meta.json | 71 ++---------------- .../telescopichka.rsi/off-inhand-left.png | Bin 250 -> 150 bytes .../telescopichka.rsi/off-inhand-right.png | Bin 249 -> 144 bytes .../telescopichka.rsi/on-inhand-left.png | Bin 993 -> 562 bytes .../telescopichka.rsi/on-inhand-right.png | Bin 1015 -> 562 bytes .../Melee/telescopichka.rsi/telescope_off.png | Bin 426 -> 265 bytes .../Melee/telescopichka.rsi/telescope_on.png | Bin 1027 -> 356 bytes 9 files changed, 9 insertions(+), 71 deletions(-) diff --git a/Resources/Locale/ru-RU/ss220/weapons/telescopichka.ftl b/Resources/Locale/ru-RU/ss220/weapons/telescopichka.ftl index b4dcc6939f2c7b..60c551a0427e3d 100644 --- a/Resources/Locale/ru-RU/ss220/weapons/telescopichka.ftl +++ b/Resources/Locale/ru-RU/ss220/weapons/telescopichka.ftl @@ -1,2 +1,2 @@ -ent-Telescopichka = Телескопическая дубинка-шокер +ent-Telescopichka = Телескопическая дубинка .desc = Компактное оружие для самозащиты. Можно сложить, чтобы уменьшить занимаемое место. diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml index 01b9bfae8e19e7..2bfbdb729e8a68 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml @@ -6,7 +6,7 @@ id: Telescopichka description: Very loud and very dangerous energy sword that can reflect shots. Can be stored in pockets when turned off. components: - - type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita + - type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita sound: path: /Audio/SS220/Effects/Drop/stunprod.ogg params: @@ -34,9 +34,8 @@ - type: MeleeWeapon wideAnimationRotation: -135 angle: 60 - animation: WeaponArcSlash - soundHit: - path: /Audio/Weapons/egloves.ogg + soundHit: !type:SoundCollectionSpecifier + collection: BatonHit damage: types: Blunt: 0 diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/meta.json b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/meta.json index d8536ea62a770f..ad893e568ab1ba 100644 --- a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/meta.json +++ b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/meta.json @@ -1,23 +1,14 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from goonstation at https://github.com/goonstation/goonstation/pull/7163/commits/5429349ac82b1cadc401f5b0f00dc868cbaed177, modified by Estkemran (Github) for SS220", + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Sprited by Estkemran (Github) for SS220", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "telescope_on", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] + "name": "telescope_on" }, { "name": "telescope_off" @@ -32,63 +23,11 @@ }, { "name": "on-inhand-left", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] + "directions": 4 }, { "name": "on-inhand-right", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] + "directions": 4 } ] } diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-left.png index 791e2f1c9210880d9ab18d1f9dbb725f7e344afc..b6f1b31487c86f22d8d2191c4cf229abc3c24121 100644 GIT binary patch delta 108 zcmeyxIE`_FVQPSc>7!jv+KQ$h?lC-kU{}1Bk%58X zfd1WZ`Q64o)#sE=a=z>pSt`X06a|6?Q`P#P7dLHVG~-}k_;8b3a}~Gpy^XfIAURK0 KKbLh*2~7Z9yeP2% delta 209 zcmV;?051QQ0r~-uF@Lm4L_t(|obB2%4uUWg2H@(*9b7zz2|HnRV(=6mi3N_r!fhDq zVBCwg4JO|=KiWsz?foGD0000bH1inSeuycxZ9l|j9+PTwIG5g_na8+IYgis#QvLGi z!Zxj;<{=c*%ws&=pSy4L+wTtNm!J3?Lhhcbxm<5qn$NWkwMvw_F)slC00000;K=sm z0#fD94;0G>?9BzF`iuNP>G}TQ^8+=SJ8XWS_7vCDm^Uv00Dyg7Zw6k+L&H&@00000 LNkvXXu0mjf04-sq diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-right.png b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/off-inhand-right.png index 7040c8fe546a0a257068f07a1c6fb1ff18e51016..ee9b509a08ee87e9bd043d2e2ac00cdcfb1e318d 100644 GIT binary patch delta 102 zcmey#IDv73VZ4{8i(^Q|oVT|Q@-herxH`64aQ+H46y2e#I8*aM`sU};g&2UKX6;qG z!|v`UKQ3l(y;uEYF-Qyu4xF1j_t4rphvh)_Lb1z>xs}yD`RqV4p00i_>zopr0M=b4 A1poj5 delta 208 zcmV;>05AWL0r>%tF@Lj3L_t(|obB2%4uUWg2H?hlTex@*6L-Su#K0*$5(^xJmGiLF z$wiG(gi6i#jU-L}zOubP1ONa4;8fMI=-c?~97`(tHlC{b>791>ABLt3Q#Xcx8A8#w zaq7k}H05W9!ugW@pYYW^ZiiRMmCh26xIY}T973+Sw=0*4=1Gzh0000003ctlcJOnh z=qfz)1Ll~ugMUL7U4^x~1l#W_BnY?Ju0rZftj+IMcnJUi@^=NSrCw`^+wsc)0000< KMNUMnLSTYNw_|w# diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-left.png b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/on-inhand-left.png index 2a8c315d68861ab4bc16a129ca0d89cd7c488fa1..3132132e921a8ccd3e77c8aee2e95ec1d137f204 100644 GIT binary patch literal 562 zcmV-20?qx2P)VLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX( z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6 z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM` z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n z29`evF_T^fh6Oqd4E$3OVrqsA3<{90001a#$k$k@8NJf zi+c8$^!2`)ZumK$ET{9wGf+E4aCrif6vD-1p8M_5L?J)Q-F%6|yL|zYw64ppuf-C4%5=gQL+fRYq@lXt+D~Nt(Bxi zZ{K1Kw|qc}-hTD@fq$|Azi1{u;MwCRKL7v*HjVKzf9iBttpET307*qoM6N<$f>^@c A-2eap literal 993 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>V4m&i;uumf z=j~lvKj}b`wuk&JY2qd!dYQ_Kfsc<(&5Q|Hv_>J)X%owI%{vdej$K)op?TA3n*pz8 z&GB6eW`11oVqWowJ^sR)toQ$Z-nh}CSQThK5Il$oeSJ0U%+JM7H-5+|yQI_dwP^$6 z-*Y-nm(+AF@4ub3cb4a__0PLky4Fb@_PMlo$=W5?tM*lFIn_6(K5NQ;pNHo6|K-$q z&WgybvyJ!JeDeKg)!nZyOwC`azyAf}ifgNV<>Ku3y!e@?<#}DTxcynQjMMp_{3rFR z7%nlrKfL<3w`bL*bxI=7XU-25-wu@6Ucr5%jt6Mp@h`8oXdGPobE)&@SC1yme|gqk zb8cN-;n#29zki>9YpU$)lat@itOp8Q`}RLfe&4Q7YmZ%+o`2AEzwVt+<)7AX_@R3J zaP>dMk4q;ozMm{^yZ?(KPx!Z!^8R)ZUqi_g|NBk%exB%ZtHUGN@Zr_{_f=0>^xciT zynB7@{eS!V@2{%0K0W`$%37_`3w=iaO>)1eeC@rTaosoT+TL5!;@5^7pKf>G@>Du) z_cQam2d|$m55CH;e~LXZqRsi4bShAgJwfy3%3XVF%sCE+C!VM|`DU|6dR^x7mw*3l zOcjXkX7mVpQq%4H!s`E@7W35YQS0j}wn$EVKjnVtGaa^z;YoX|@48LDzfJP^K92T# zkNa!?E&TA*KjEJGL@$8_LKXZ?e;C?Pyu*<6;osum_kS*ail{KN{#f;nLE7L<_~YQ4PA|9$FCZg03&{rd9i%ZpgH zKby{Xc2&1`U0T3D&y^+Dt6!h|e)j#V#Ld4xT)pm`ZpijtZeM}8NAy3xf1+ahpHx+x zw^!LG(qzr2i0XrX_5RQ2_N!cSbCK%iTyOVZFYwsMtFkqA4woOVkFEc|@BaN&XTfoD zR;%=uT50>`qwBWDoz;;yx;QO=MyyGFMtQ;Ozu($YEmHOcmRVLLewHIXO5f001bFV_;x1aCC8UWfEXu$jvJ$3UYT+h=`0*U_Z~m#=y(~28qeV z1&#p$J|K2peqJgA2KaW3fe}Ps)&-e`DUTO$B^MNx0O>zKY?P8(oXo($XaHnqmzNX( z#Tn-S*&<2VVD<(OyC@{c8OS~YWb>s%*jGU8BnbNnh+PEq1d#m&q&^+YX5s*w17XX6 z*d?hIAbS~{^9w4AGSf3k6bvmbEfpM7@{>{(f-8$lQge$HJoA$Ciwg3K5=&B3fNCM` z0|P;bLQsfl05w`@lIU-O02B`p*5^QQ_%e!}L5Lwha%oW+l*!0sOqh=_V~zv^ga1+n z29`evF_T^fh6Oqd4E$3OVrqsA3 z5Oa@1H^3O33_ZH52Zjde?bEbHvj+t07*qoM6N<$f~Vrv AFaQ7m literal 1015 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>VBYBI;uumf z=j~lX@902@V;_%eeAgD?(({vyO-vb-r- zU3~dB;VIEwvPC@V5AUtcc=vnWlYjNzx}o!n-&uZ-;jO&y1+)qX8m8vh%rdc*cl6?( zcqzii#@AwM=W?Sy-|fPBUji@hpLx6<4NSnO35aIpaH9c-T$f^ZBi< zdG$ZcET@;KymZ;jo0zF+FWtXun)C*Z`v$j7_ly3s*<<@oWB;CD8;--t7AI>K=Uo32 z_Jw1|xnIAzn>Xy>-ut=v(4UN&yq~4no)^Czo>ZDZaC#xbdJ;cpZQ1Y zIgg*~T=H`Fta{{&%(N1>!c)Smk_ujby5kQ1MGlyA>3{tXOQ%XFL`?PH$x zRq@5CZ9j?^zVW)`zg&*tOT53RUc{L}5}`@GNfo^@-b6=EJ#R$RM3eMz=tslvxI{eI%x zf9_Yg|47gvmhXIZ^Xh`~D4Bz;KTF%)mUnyCEiu~v?bqkKdz+8P$J@_8xsp-%XW!4% ztvO-#HKA88MfM!rJ?*^devLby%0HFv_)!|i|Nf_Xr+6z*#rr*1KEJ-#a#Hs96LWQW z6u)LY`pXvZ{?D;R>sb+Sk9ItLod0UT>T8Z}rt>PxVFG+gkJ5 ze|=IuyUNdZRm|euHOR@$X8#JSA0NK$Sp4Uc-$#X4c5RDY%TD%-Jd;kH{aie^Vd0Y3 zYxeIq;5fY7;AG9oH|Y~E{joY@?(kxZA?NuyPaS<;OC8uW<+HBY!mod}pZcemXYu9T zmq&jd{#*8?__f2n;JTZJ>4B5ON{>`sKVqu4Kf}=Mr_!D$Klh#d?9ZqF?*Q*?eu&2o ar2XW7e>AV*eqZx0kcg+NpUXO@geCyc>gl%t diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/telescope_off.png b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/telescope_off.png index ec8422006d4980af8db00d0427d2bbafd05ca1eb..372d7fcb33c322d68cbf81f5bda5dceca4f85f7b 100644 GIT binary patch delta 225 zcmV<703QFU1Bn8VFn<8UNklj}&AC3yU;SXybe#_?h@W@{W1QP9s< zdin{=%jb8G>G6iVXz%jc&@!%df;3$rFMO-dUK#xBcx8cq#48IB5f29h06&Y@5K(Kt bUA*!D#e`o(4(fvH00000NkvXXu0mjfM~rFC delta 387 zcmV-}0et?60;&U$Fn2wb$@BX$CEc2MhPIYgtCC| zt@q%)?f~7aM6Op781;ujH!JkI1Ar}jcMdWWa4kpFO#{!KZJ}}D0H;X>HmfDYa)Hm+ zF+d_XD0JZL@|wB7pl%v`eZ2E>{}dYz2|6(94+TKoG?>~GHmfB7%}zTuJhp(`_qo4d zYEP8FGLg5ywR{{=EEfQfS5-Jf?7%L3?k`lCdkO8pA^2vsOy%oC1+s<*3j78S@V6hAwWb`EZVYdNCYs%i2*EBH}?YOAKX hmLpXE^LhS6z5yBYu6#Mxh-Lr)002ovPDHLkV1hBhwx0k1 diff --git a/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/telescope_on.png b/Resources/Textures/SS220/Objects/Weapons/Melee/telescopichka.rsi/telescope_on.png index ace60faaf8923be641efed9752f8aff0e32cdf9a..532cf70b9aac21b27c32ea3911741544b868fbf2 100644 GIT binary patch literal 356 zcmV-q0h|7bP)Px$9!W$&R9J=Wl`&4kFcgOWA_njfOZLkRY_lP;wdyT621nr_90s@mY1#n+Q}O6_ zdrXlM+El4z8wUTY6@Q$=2b`!LmAFhTKvbiW5&+=6=WoBA_19-d zzlxN_e94uR*sNQ4@9`U+RG<%Ewaq9eiNI8N5`lBzK;%nkjpIs6yuLgiJ@2Hk#_?jl zWUXkl^95eu{}O&y4XttPy$4Z^rg@7}waFWFuUhP$PkN5~@Xfl#ZXaT>rwM391Ni6H z2SNzZ{&FV;v?5kY;qHE$1b#AF5nJQ<>HU_iaV&($SGNxS@OZ;oQBwH9IJ>cTRom@D z(ymR>a!sB0hCfh0iBHsd6>D~Zt;jC1y&`+IPUvP=4cIWP>ZQEGyeOR| zO|EYgr#tBAa_Fk&_Fib>Jl2%y+@(9CYX%qBrO6`vx0`+L=-ixPy4iU4-Jf$zCjNc0 z_xYQ1dH0xEm>L_T*CpxS+xdURBj)2zr1`JxKfQ75b5Z##Z2z`zKF{@U-7%e=S8hLG z6|jkk;P=|g8~2voNchqIx%W8DSnn5qUflB|yL)fNR`*pAa{e+bZfv(c{;iR%^HtxK z-&c}TzjF7DYtzoIo%izr+aK{~mmBR?GXH;-_3`t|2vi{zcaqB z3<~rAl)RC?b*N4ar201N(nX#}-)0_t{%hKv5Z!)tzDsHETsrE1uh*VmQu-X;2|8prT1BhWRWq(zafg#Ud+srun#{IJk^OM^= zKU{rseI0`qtHSAgQ!#tXf{Y@Wgkt6p-?~@J6_oCu$zf#p)!yFMEfu}`%Z0uV;aj+a zPJb^iRxfh9aj^aw(+$N6?H|1Jo2EH+b1}r^Wjz$ybN5dh*Mu%L(fK-0k21_)%XhE8 zxm;n>lZMA@#dvoLzImme&AQ_0ldSVX*1!E@8IL~EIlsH?`*fX#yUp91;U6xRWZY)W*ChM5ZQm62Ai0CqN8>+9Z4ikH0Xi(^)qj>Si=**h z>=Zb1XqYV+*W!w)q3LBcIGwR0he#A z5!gSqJKU{qbOTLTDt6L1>-JHK4=&&z;Gx#6$5QE>jM%)%XV^wjl nF0A7x!#O0}=%7%b_n)zV`{FCJ$r1IyT+QI=>gTe~DWM4f_A2kT From 6f2fe46919a3d13aee8d61f30ae07cce8cdfa496 Mon Sep 17 00:00:00 2001 From: EstKemran Date: Wed, 8 Jan 2025 00:47:09 +0300 Subject: [PATCH 2/2] Update telescopichka.yml --- .../SS220/Entities/Objects/Weapons/Melee/telescopichka.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml index 2bfbdb729e8a68..bfd0807eb7a907 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Weapons/Melee/telescopichka.yml @@ -6,7 +6,7 @@ id: Telescopichka description: Very loud and very dangerous energy sword that can reflect shots. Can be stored in pockets when turned off. components: - - type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita + - type: EmitSoundOnLand ##new sound_drop effect, add MIXnikita sound: path: /Audio/SS220/Effects/Drop/stunprod.ogg params: