From: Puro <103608145+PuroSlavKing@users.noreply.github.com> Date: Thu, 13 Apr 2023 07:21:57 +0000 (+0300) Subject: [Speech] Moth speech bubble (#15356) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a35e2a8bbaa040a3a2ea03f61aeaa0997ab4b2a6;p=space-station-14.git [Speech] Moth speech bubble (#15356) --- 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 0000000000..364d3b344f Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/moth0.png differ diff --git a/Resources/Textures/Effects/speech.rsi/moth1.png b/Resources/Textures/Effects/speech.rsi/moth1.png new file mode 100644 index 0000000000..cfb9a4b03a Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/moth1.png differ diff --git a/Resources/Textures/Effects/speech.rsi/moth2.png b/Resources/Textures/Effects/speech.rsi/moth2.png new file mode 100644 index 0000000000..2361d3a630 Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/moth2.png differ