Under Toned Tail (#25685)

* Undertoned Tail

* Locale

diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl
index 10b9e36dbed6ceffe7bd7431831a400517e08815..cfc44a4ba213b94552d260adf0e6f781ade93f52 100644 (file)
--- a/Resources/Locale/en-US/markings/reptilian.ftl
+++ b/Resources/Locale/en-US/markings/reptilian.ftl
@@ -22,7 +22,8 @@ marking-LizardHornsShort = Lizard Horns (Short)
 marking-LizardHornsSimple-horns_simple = Lizard Horns
 marking-LizardHornsSimple = Lizard Horns
 
-marking-LizardTailSmooth-tail_smooth = Lizard Tail (Smooth)
+marking-LizardTailSmooth-tail_smooth_primary = Lizard Tail
+marking-LizardTailSmooth-tail_smooth_secondary = Under Tone
 marking-LizardTailSmooth = Lizard Tail (Smooth)
 
 marking-LizardTailLarge-tail_large = Lizard Tail (Large)

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
index 718347259622e1c7f7108900cd19abac4bf1c0b8..d1ed51013a2dd03836605c4cde25f4c11f60930b 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -124,7 +124,9 @@
   speciesRestriction: [Reptilian]
   sprites:
   - sprite: Mobs/Customization/reptilian_parts.rsi
-    state: tail_smooth
+    state: tail_smooth_primary
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: tail_smooth_secondary
 
 - type: marking
   id: LizardTailLarge
@@ -316,7 +318,9 @@
   speciesRestriction: []
   sprites:
     - sprite: Mobs/Customization/reptilian_parts.rsi
-      state: tail_smooth_wagging
+      state: tail_smooth_wagging_primary
+    - sprite: Mobs/Customization/reptilian_parts.rsi
+      state: tail_smooth_wagging_secondary
 
 - type: marking
   id: LizardTailSpikesAnimated

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
index 1c4c1a2fbc6cb154b7062f620644005c3c72aee8..8eaac10cd94b27909c3732ea4485e6afa7c209fa 100644 (file)
--- a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
@@ -27,6 +27,14 @@
       "name": "tail_ltiger_front",
       "directions": 4
     },
+    {
+      "name": "tail_smooth_behind_primary",
+      "directions": 4
+    },
+    {
+      "name": "tail_smooth_behind_secondary",
+      "directions": 4
+    },
     {
       "name": "tail_smooth_behind",
       "directions": 4
@@ -47,6 +55,14 @@
       "name": "tail_ltiger_behind",
       "directions": 4
     },
+    {
+      "name": "tail_smooth_primary",
+      "directions": 4
+    },
+    {
+      "name": "tail_smooth_secondary",
+      "directions": 4
+    },
     {
       "name": "tail_smooth",
       "directions": 4
@@ -68,7 +84,85 @@
       "directions": 4
     },
     {
-      "name": "tail_smooth_wagging",
+      "name": "tail_smooth_wagging_primary",
+      "directions": 4,
+      "delays": [
+          [
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1
+          ],
+          [
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1
+          ],
+          [
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1
+          ],
+          [
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1
+          ]
+      ]
+    },
+    {
+      "name": "tail_smooth_wagging_secondary",
       "directions": 4,
       "delays": [
           [

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_primary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_primary.png
new file mode 100644 (file)
index 0000000..41a23be
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_primary.png differ

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_secondary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_secondary.png
new file mode 100644 (file)
index 0000000..15391fd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_behind_secondary.png differ

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_primary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_primary.png
new file mode 100644 (file)
index 0000000..331b27b
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_primary.png differ

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_secondary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_secondary.png
new file mode 100644 (file)
index 0000000..9c8c1dd
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_secondary.png differ

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging.png
deleted file mode 100644 (file)
index 6522270..0000000
Binary files a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_primary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_primary.png
new file mode 100644 (file)
index 0000000..1f6f691
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_primary.png differ

diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_secondary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_secondary.png
new file mode 100644 (file)
index 0000000..f4e2eca
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_smooth_wagging_secondary.png differ