From a35e2a8bbaa040a3a2ea03f61aeaa0997ab4b2a6 Mon Sep 17 00:00:00 2001 From: Puro <103608145+PuroSlavKing@users.noreply.github.com> Date: Thu, 13 Apr 2023 10:21:57 +0300 Subject: [PATCH] [Speech] Moth speech bubble (#15356) --- .../Entities/Clothing/Neck/cloaks.yml | 4 +- Resources/Prototypes/typing_indicator.yml | 6 ++- .../Textures/Effects/speech.rsi/meta.json | 39 +++++++++++++++++- .../Textures/Effects/speech.rsi/moth0.png | Bin 0 -> 1456 bytes .../Textures/Effects/speech.rsi/moth1.png | Bin 0 -> 2154 bytes .../Textures/Effects/speech.rsi/moth2.png | Bin 0 -> 2068 bytes 6 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Effects/speech.rsi/moth0.png create mode 100644 Resources/Textures/Effects/speech.rsi/moth1.png create mode 100644 Resources/Textures/Effects/speech.rsi/moth2.png diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index 33ddda14f4..a1d23368e3 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -155,5 +155,5 @@ - type: ContainerContainer containers: toggleable-clothing: !type:ContainerSlot {} - - + - type: TypingIndicatorClothing + proto: moth diff --git a/Resources/Prototypes/typing_indicator.yml b/Resources/Prototypes/typing_indicator.yml index 6c1fc02daa..b6e9e470e4 100644 --- a/Resources/Prototypes/typing_indicator.yml +++ b/Resources/Prototypes/typing_indicator.yml @@ -1,4 +1,4 @@ -- type: typingIndicator +- type: typingIndicator id: default typingState: default0 @@ -21,3 +21,7 @@ - type: typingIndicator id: lawyer typingState: lawyer0 + +- type: typingIndicator + id: moth + typingState: moth0 diff --git a/Resources/Textures/Effects/speech.rsi/meta.json b/Resources/Textures/Effects/speech.rsi/meta.json index 39456686a2..c027615618 100644 --- a/Resources/Textures/Effects/speech.rsi/meta.json +++ b/Resources/Textures/Effects/speech.rsi/meta.json @@ -5,7 +5,7 @@ "y": 64 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 | Moth sprites made by PuroSlavKing (Github)", "states": [ { "name": "alien0", @@ -198,6 +198,43 @@ ] ] }, + { + "name": "moth0", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.4 + ] + ] + }, + { + "name": "moth1", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "moth2", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, { "name": "machine0", "delays": [ diff --git a/Resources/Textures/Effects/speech.rsi/moth0.png b/Resources/Textures/Effects/speech.rsi/moth0.png new file mode 100644 index 0000000000000000000000000000000000000000..364d3b344fc9a961bb9fd298a6ba8f24de940fde GIT binary patch literal 1456 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 IF!8pF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Effects/speech.rsi/moth2.png b/Resources/Textures/Effects/speech.rsi/moth2.png new file mode 100644 index 0000000000000000000000000000000000000000..2361d3a630a4661636095c9fff87e8903865650e GIT binary patch literal 2068 zcmdUw=|9`q9>-5C5xbye#MX>*M@zblGHo^5v6fbAbZYEM8B47#F&&X2T6=r7RIMFt zM{S|CmJn;MGE&{h3rVCj)+AJfAemq9{TJrReegY>2j}%Y56*eNzbE6uc?V?$9R&b@ zvXi5&8t#3PGquQvQA(n!ftcc)&P7PKB>iHiRICQrCacr>EP`)fNXIcipG zQXQ!l`rzzuz}D#saI}CE+yno~KtU%+~`;2sq)pH?UVLTmxx(fOmVN_O92WK*juba?V;O zg^XAB9o>rwF|m5BYT_-y&sbh`0PJbi`4wQC&@Eak!TsRHCNfuE=h(5%p^pAkDXmLq zT_<7r$95#5$^FCq0v^Jqb6cFtnRva1u8YKC zjJEKq+I;smv89tY&@V8MN}1(x4TPn*3D`!MY<@@iC1%y@0jwCd!2H3HYM%B5i`y~T z#4gL8^M85}WXqoxiiC>Y&pZ68{e;dT_9BKiv#Qr8IdY_z+P;<2yv0Jk5h3w4^tfqB z00w7%B*-1P?j^aPDK+b%*rx*ZW@-FN`4W>cK(VmK4xl)fLqxtIFqQxp+%7LE92-JHC5!DKBFhQ{Q#c zB(jUJZc+}l$IR65fFVxsQjD_JA~j`-?Dq_K_B}j5K^DtRI!E<&lY^GIa{XO0)DFK^ zE;qze3#4EO_!{}Br`d{rNw=ZL@0{>V$*-{|5gBK{fqIXuSb%x&WX_r&tRx*fwMWTE zGVk0_i~;n3O_J{)CoyA*Ug_8HFOwY<(nFvxjD&o9=V+C@<0Uw?V~ zZdYBOCwF6sCuspJ*8Cd<*RDQ^ggqB=_=b2@Ae`*c?Bk=l#b_yH4|(7V8vU@Wte{+< zG~}8$9&}}-;C3O^uB?72fAXa|V>mCdJbKqoMkBDrC7X^$A4=LayEi)C&IboY$ceGX zS7U{h2}cumZ%VPORCYF;s2i?9)nz~}w3jJo_(2=E<-q=5;?8Ppi;*>4r?w1S*Sht| zifxtal3RZCmDS>KoLgty%RupJ`*VE)0#_l2DPVS4P`;Fa~LfoAnr zoLtLm5W~iY`)`SwEm(8QMz<4#(+L%bcwrtAlkyg829dScIoW{b$F^wlrqYV_;Ebl3 z?%y)52g~I9)e1()kfa^rsk6UU8BA?|q;SQn1c%LlC(uNJ_-1>`FN`?4%Zw?L5~638 zt}TC17~FIEze-(#K$I%VOHB;9UAeT{Ufi}#WOTsSWCOztWm#HThNJ!H=<#x|VpV-u zoxx1&BT8{R%^H%+@JIUl#&7lc&6^52kj4|9D`m;wR+O%s$ znsC|EE~zr}N?pLn26H7T3=ohOYDx0(Ut|qW=tiXa?EI{;uzaZVt!eNx`yA7h>D@r@ z2#dx zlkL_AX2{0L?6|zo5|sA1;VI!>nnT0ZL> zfNBM2{c_-{G?@moSr>)7tx6-}30Bk?R;#NFP{~!fq>1<56q91Ok8#QnC@+GwOb3sp d{u2tWB#*z4<<2){7DC@VaI!mZTYtts