From 25252e069769dcc896924eaedfbbf2a62b660c0a Mon Sep 17 00:00:00 2001 From: DocNight Date: Sun, 28 May 2023 16:13:01 +0300 Subject: [PATCH] Merge pull request #129 from frosty-dev/animation-icons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Tweak] Иконки для эмоуты анимаций # Conflicts: # Resources/Prototypes/White/Actions/emotes.yml --- Resources/Prototypes/White/Actions/emotes.yml | 27 ++++++------------ .../Textures/White/Actions/EmoteFlip.png | Bin 0 -> 689 bytes .../Textures/White/Actions/EmoteJump.png | Bin 0 -> 543 bytes .../Textures/White/Actions/EmoteTurn.png | Bin 0 -> 1526 bytes Resources/Textures/White/Actions/meta.json | 20 +++++++++++++ 5 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 Resources/Textures/White/Actions/EmoteFlip.png create mode 100644 Resources/Textures/White/Actions/EmoteJump.png create mode 100644 Resources/Textures/White/Actions/EmoteTurn.png create mode 100644 Resources/Textures/White/Actions/meta.json diff --git a/Resources/Prototypes/White/Actions/emotes.yml b/Resources/Prototypes/White/Actions/emotes.yml index c190c9c284..d924cdd4c7 100644 --- a/Resources/Prototypes/White/Actions/emotes.yml +++ b/Resources/Prototypes/White/Actions/emotes.yml @@ -3,36 +3,27 @@ id: EmoteActionFlip name: emote-flip-action-name description: emote-flip-action-description - nospawn: true - components: - - type: InstantAction - icon: Interface/Actions/blight.png - event: !type:EmoteActionEvent - emote: EmoteFlip + icon: White/Actions/EmoteFlip.png + event: !type:EmoteActionEvent + emote: EmoteFlip # jump animation - type: entity id: EmoteActionJump name: emote-jump-action-name description: emote-jump-action-description - nospawn: true - components: - - type: InstantAction - icon: Interface/Actions/blight.png - event: !type:EmoteActionEvent - emote: EmoteJump + icon: White/Actions/EmoteJump.png + event: !type:EmoteActionEvent + emote: EmoteJump # turn around in 4 directions animation - type: entity id: EmoteActionTurn name: emote-turn-action-name description: emote-turn-action-description - nospawn: true - components: - - type: InstantAction - icon: Interface/Actions/blight.png - event: !type:EmoteActionEvent - emote: EmoteTurn + icon: White/Actions/EmoteTurn.png + event: !type:EmoteActionEvent + emote: EmoteTurn # Using EmoteAnimation from IC action chat diff --git a/Resources/Textures/White/Actions/EmoteFlip.png b/Resources/Textures/White/Actions/EmoteFlip.png new file mode 100644 index 0000000000000000000000000000000000000000..2695743082035f340882d9921fc1bbff7acc6aba GIT binary patch literal 689 zcmV;i0#5yjP)Px%Ye_^wR9J=WmpyLVFc^kkI(3m6mBu1EfL8-CqF$gweGG3A+B0P8863Eolp}QW zk_(sx3uN^HBzP3vM1Wy`85}Z{EXtH@piAG05P!bs`yoXF|5&W*BM}i}jH!0(#b4KG z1fUEu#@I2&T|wU2I!xm(p482+Q^#cz5m7b`8%2W|qF2=d)DrVsbo(PTg)m`keH~ke zGJJK%kjoV3-bEYR2O;#wa?WW!p{qaN@%wUuT&CErme?d>Zvj8zESrYpN4#;J6aY+R z(~!L37yx$OCmeYY>i%*xq=?}S$B-gMQxIzka+xBR>8>4w*shk?u9gMkxlAENjI&?} z0Pu$6#&uE&;76RT7c;CEGko~+LwnTu_^B{X!E6!%DdJWT)(H3!XDYwz#SFb*Q1Ctz z_sC_cz4s%|o|4D6en*Id`7-OFELEHUbb)sJBLFBwu1@vaunI`r>-M>KfnG2G038XH zI@bs|1E_+0-~X!HN@WO@K9_Z!2GM*%s>sfQp*Cn!lkIpg0@*YqbE|C<0khalwJE}b z0Di=oS%iMXnGIr-2;?$_8t($(R0C4PI_!UcU6V5Qlssw>m7?`x)(FB0z>hdn$1U)- z)i#MhFBlY}p$@S!gbl=b7bpnxKr+86C>sQ@E9Npt<3E_WfU0zLSmiRsdNC_}@AgL; zxXsV15g5%U^!#vB@G_f*^!#u`rp$RKrKyTU)lIARj(O}&SVf{v=J?7YJo-8wezSI! zz25^k#e)R=7V_t3r|W!W1WbrFAX3EeuIGDBQ~_BZCZ>*kp4H7i7@||W4b8Xaf0gwD X-#)+fOEgPz00000NkvXXu0mjfhE+AL literal 0 HcmV?d00001 diff --git a/Resources/Textures/White/Actions/EmoteJump.png b/Resources/Textures/White/Actions/EmoteJump.png new file mode 100644 index 0000000000000000000000000000000000000000..234d3d30d081bab43565300a960ecb270e8d84d5 GIT binary patch literal 543 zcmV+)0^t3LP)Px$*-1n}R9J=Wmp^WUFcii=lU9llWJF==(ykd$xkHbUF;dUadoa>lV51dj5EecyElC&%%ZTIaJJg? zUPv#1EDD7iEGun@E{MA8g%EDdL*1!nAl6W;>> z-tJ$dC-tk0bjdh*vM3a{4^Oxp53u(`K>yiqh4d7}ORE?`Ly()TdQj*$b$dkB? zdzQS)kYDY~@c^F0x>EwU5&~L%o^EkY69B-(4`4Z-6!#O~<8nMmV{CsRg`#%|0N|V^ zQcSDH>+RWU!w5u2#yjEI(mD+%et;~3R#IhAC?Px)ut`KgR9J=OmrraRR~5#;@7_Cq{QgYrm-;#Jb7&QsCeEU&pbiZZf-MUqP&O>s zM5+LxO0eq66`O8YvOslE!CfPDSE&mYNFYI=2@7yVB}ik`ywrAL`+1(RD}-os*^ zX_VUOvsJO-Zmu*l_uSw4&Np+<0RQiUCs~xPEF}P%01^NxfPV7B_tO6fK)SM&nCWLa zzDQT8f<%0osxY~3d+XhkKpYF;U~{qA+wr-VI-p7*J{^5@vr98|?IaKr13bF9J@;Zq znJ5{;qXq?U^VEEF>qHRh7_dz@>a9i#S2|Qd^2Wxy5byBD#=D>jl4#*d$BlZcsJt=p zI1T^+pv+T z;mUPDvg8MUI#h|HYo$X2pe^3M63m>xD1x>xGOdhI=@2AA9Y9}U87jHd)8kL>~RTIht)eCbB1sK*nm7WoCC6uas2ZE&kZyu~%Ot1f*9p0@PFiK?RrZLq!cx zM+%^V__{K&MG%R2FQWYn#XX3x{3w8l=1lwYzb6I&kcul)m!}W3nTqUamn01!tx6#W z9W@}{9UyCZyXW&gr=uolVvuZ^XTEV(pM4<%a8snJ9r=kL4lRL*Bp4q)ZujnH@$iG2 zboLhnAL^*->~I@mN04Fwu_M^wHgwcoV`%$d4hIf6C)%8!tGRc=nE*zEl z6BQU|FEVz`7%CmU^Gd?{92nG~PCp0LIuF0|A=sD$!zSGR=3?@_cm53Az`@!lWe+^z zG(0T8Nyb4k#|HR3KprdSF%P3hf|T7`Uvc;U+VS__TaD&lOv<7Uw|%FpTIZMj&WEq- z(_icaVH5fNTdA5~x~}KH)HU;8zV|rDi2%}-rKJ4B&r(0yT~$#6$#x*w4*c$&)ZM?8 za%v`3QKKVMB{1BEeg8MF`#ZnAmi5*rYECC