]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
add lizard speech bubble (#23365)
authorlunarcomets <140772713+lunarcomets@users.noreply.github.com>
Thu, 1 Feb 2024 13:24:17 +0000 (05:24 -0800)
committerGitHub <noreply@github.com>
Thu, 1 Feb 2024 13:24:17 +0000 (00:24 +1100)
* add bubble sprites and yaml changes

* fixed issues

* lizardified names

* more fixes, got rid of error

* add indicator to kobolds

* updated sprites (removed notch, brightened colours)

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
Resources/Prototypes/typing_indicator.yml
Resources/Textures/Effects/speech.rsi/lizard0.png [new file with mode: 0644]
Resources/Textures/Effects/speech.rsi/lizard1.png [new file with mode: 0644]
Resources/Textures/Effects/speech.rsi/lizard2.png [new file with mode: 0644]
Resources/Textures/Effects/speech.rsi/meta.json

index 804dc23006f4467dc843c8832edda69a2846ee3c..f6ba7626638e19e1f96af58695743db5c62ae682 100644 (file)
       Male: UnisexReptilian
       Female: UnisexReptilian
       Unsexed: UnisexReptilian
+  - type: TypingIndicator
+    proto: lizard
   - type: InteractionPopup
     successChance: 0.9
     interactSuccessString: petting-success-monkey
index bcad5d8920e36a3e9bc797a8656e11256f66546c..f00c2f6db393d9cb24e32ef80e88022a15361f3e 100644 (file)
@@ -28,6 +28,8 @@
   - type: Speech
     speechSounds: Lizard
     speechVerb: Reptilian
+  - type: TypingIndicator
+    proto: lizard
   - type: Vocal
     sounds:
       Male: UnisexReptilian
index b7e6768448fa172e4f9005ea01eddc25a3b0a09b..3a0484fc0b3dbad4e36336df9b1c52092d9e4a57 100644 (file)
   typingState: spider0
   offset: 0, 0.125
 
+- type: typingIndicator
+  id: lizard
+  typingState: lizard0
+  offset: 0, 0.0625
+
 - type: typingIndicator
   id: slime
   typingState: slime0
diff --git a/Resources/Textures/Effects/speech.rsi/lizard0.png b/Resources/Textures/Effects/speech.rsi/lizard0.png
new file mode 100644 (file)
index 0000000..a05ea40
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/lizard0.png differ
diff --git a/Resources/Textures/Effects/speech.rsi/lizard1.png b/Resources/Textures/Effects/speech.rsi/lizard1.png
new file mode 100644 (file)
index 0000000..bc2f151
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/lizard1.png differ
diff --git a/Resources/Textures/Effects/speech.rsi/lizard2.png b/Resources/Textures/Effects/speech.rsi/lizard2.png
new file mode 100644 (file)
index 0000000..dcbac1d
Binary files /dev/null and b/Resources/Textures/Effects/speech.rsi/lizard2.png differ
index 3f8f1d752a38e84cf55752ccf2d0887104514b73..65d5615b3e349ed7d40f8b9a0c6c2d560efda084 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)",
+    "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)",
     "states": [
         {
             "name": "alien0",
                 ]
             ]
         },
+        {
+            "name": "lizard0",
+            "delays": [
+                [
+                    0.3,
+                    0.3,
+                    0.3,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "lizard1"
+        },
+        {
+            "name": "lizard2"
+        },
         {
             "name": "moth0",
             "delays": [