]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
New Speech Indicators for species that don't have any. (#36126)
authorYoungThug <ramialanbagy@gmail.com>
Fri, 18 Apr 2025 23:19:04 +0000 (16:19 -0700)
committerGitHub <noreply@github.com>
Fri, 18 Apr 2025 23:19:04 +0000 (09:19 +1000)
* DionaAndGingerbread

* DionaSpeechTweaks

* FixGingerbread

* IfYourReadingThisYouMatter

Resources/Prototypes/Entities/Mobs/Species/diona.yml
Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
Resources/Prototypes/typing_indicator.yml
Resources/Textures/Effects/speech.rsi/diona0.png [new file with mode: 0644]
Resources/Textures/Effects/speech.rsi/diona1.png [new file with mode: 0644]
Resources/Textures/Effects/speech.rsi/diona2.png [new file with mode: 0644]
Resources/Textures/Effects/speech.rsi/gingerbread0.png [new file with mode: 0644]
Resources/Textures/Effects/speech.rsi/gingerbread1.png [new file with mode: 0644]
Resources/Textures/Effects/speech.rsi/gingerbread2.png [new file with mode: 0644]
Resources/Textures/Effects/speech.rsi/meta.json

index 5ae09c4d8232876465e40988ed448d3739701ab8..1e39eaec76f8828ca1f8035a6e69ddc887e85fdd 100644 (file)
@@ -92,6 +92,8 @@
       Male: UnisexDiona
       Female: UnisexDiona
       Unsexed: UnisexDiona
+  - type: TypingIndicator
+    proto: diona
   - type: BodyEmotes
     soundsId: DionaBodyEmotes
   - type: IgnoreKudzu
index 003eeb8c50e0c50376009e67737621f4c77d2656..cc4b506dc858479c609098ff996b5c5f2deeab5c 100644 (file)
@@ -42,6 +42,8 @@
           - MobMask
         layer:
           - MobLayer
+  - type: TypingIndicator
+    proto: gingerbread
   - type: Inventory
     femaleDisplacements:
       jumpsuit:
index 7271770ef503a7a5eb51c1b26ddf65eb90dcb26a..295af30d163f29cbd45cecd94d69c1dc667e7bbc 100644 (file)
   id: slime
   typingState: slime0
   offset: 0, 0.125
+
+- type: typingIndicator
+  id: gingerbread
+  typingState: gingerbread0
+  offset: 0, 0.125
+
+- type: typingIndicator
+  id: diona
+  typingState: diona0
+  offset: 0, 0.125
diff --git a/Resources/Textures/Effects/speech.rsi/diona0.png b/Resources/Textures/Effects/speech.rsi/diona0.png
new file mode 100644 (file)
index 0000000..c833b9b
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/diona0.png differ
diff --git a/Resources/Textures/Effects/speech.rsi/diona1.png b/Resources/Textures/Effects/speech.rsi/diona1.png
new file mode 100644 (file)
index 0000000..bcea111
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/diona1.png differ
diff --git a/Resources/Textures/Effects/speech.rsi/diona2.png b/Resources/Textures/Effects/speech.rsi/diona2.png
new file mode 100644 (file)
index 0000000..dd40a2e
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/diona2.png differ
diff --git a/Resources/Textures/Effects/speech.rsi/gingerbread0.png b/Resources/Textures/Effects/speech.rsi/gingerbread0.png
new file mode 100644 (file)
index 0000000..39be046
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/gingerbread0.png differ
diff --git a/Resources/Textures/Effects/speech.rsi/gingerbread1.png b/Resources/Textures/Effects/speech.rsi/gingerbread1.png
new file mode 100644 (file)
index 0000000..e4ab1a0
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/gingerbread1.png differ
diff --git a/Resources/Textures/Effects/speech.rsi/gingerbread2.png b/Resources/Textures/Effects/speech.rsi/gingerbread2.png
new file mode 100644 (file)
index 0000000..1bf41c4
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/gingerbread2.png differ
index 98dd3b20607275cb51726d1b9f345b65a87cceee..17cf95079da47d2ab33649d402d000db53bdf961 100644 (file)
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 | Moth sprites made by PuroSlavKing (Github) | Spider sprites made by PixelTheKermit (Github) | Lizard sprites made by AmalgoMyte (Github)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 | Moth sprites made by PuroSlavKing (Github) | Spider sprites made by PixelTheKermit (Github) | Lizard sprites made by AmalgoMyte (Github) | Diona and Gingerbread sprites made by YoungThugSS14 (Github)",
     "states": [
         {
             "name": "alien0",
         {
             "name": "default2"
         },
+        {
+            "name": "diona0",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "diona1"
+        },
+        {
+            "name": "diona2"
+        },
+        {
+            "name": "gingerbread0",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "gingerbread1"
+        },
+        {
+            "name": "gingerbread2"
+        },
         {
             "name": "guardian0",
             "delays": [