]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
[Speech] Moth speech bubble (#15356)
authorPuro <103608145+PuroSlavKing@users.noreply.github.com>
Thu, 13 Apr 2023 07:21:57 +0000 (10:21 +0300)
committerGitHub <noreply@github.com>
Thu, 13 Apr 2023 07:21:57 +0000 (00:21 -0700)
Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
Resources/Prototypes/typing_indicator.yml
Resources/Textures/Effects/speech.rsi/meta.json
Resources/Textures/Effects/speech.rsi/moth0.png [new file with mode: 0644]
Resources/Textures/Effects/speech.rsi/moth1.png [new file with mode: 0644]
Resources/Textures/Effects/speech.rsi/moth2.png [new file with mode: 0644]

index 33ddda14f419c8f3e7e7bdd9bc4f094542eb0ded..a1d23368e3bec6ddecb63934a62615ce01e81dc7 100644 (file)
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
-
-
+  - type: TypingIndicatorClothing
+    proto: moth
index 6c1fc02daa6bbc2a24384447456fa2bb2d5865da..b6e9e470e4e8518034004e12d18c6809c901d447 100644 (file)
@@ -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
index 39456686a2df9cdd2db7dea510ac985a2147745c..c02761561865d63134d67b0012f278b11a209286 100644 (file)
@@ -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",
                 ]
             ]
         },
+        {
+            "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 (file)
index 0000000..364d3b3
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 (file)
index 0000000..cfb9a4b
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 (file)
index 0000000..2361d3a
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/moth2.png differ