eh

DeltaV-Station · Jun 6, 2024 · fbc4254 · fbc4254
1 parent cde276b
commit fbc4254
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 187 deletions.
diff --git a/Resources/Locale/en-US/deltav/markings/felinid.ftl b/Resources/Locale/en-US/deltav/markings/felinid.ftl
@@ -5,3 +5,7 @@ marking-FelinidFluffyTail = Fluffy Tail
 marking-FelinidFluffyTailRings = Fluffy Tail with rings
 marking-FelinidAlternativeTail = Alternative Wagging Tail
 marking-FelinidAlternativeTail-m_waggingtail_cat_FRONT = Alternative Wagging Tail
+marking-FelinidTiger = Tiger tail
+marking-FelinidTiger-m_tail_tiger_primary = Primary colour
+marking-FelinidTiger-m_tail_tiger_secondary = Tip of tail colour
+marking-FelinidTiger-m_tail_tiger_tertiary = Stripes
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml
@@ -39,16 +39,3 @@
       state: m_tail_tiger_secondary
     - sprite: DeltaV/Mobs/Customization/Felinid/tiger_tail.rsi
       state: m_tail_tiger_tertiary
-
-- type: marking
-  id: FelinidWaggingTiger
-  bodyPart: Tail
-  markingCategory: Tail
-  speciesRestriction: [Felinid]
-  sprites:
-    - sprite: DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi
-      state: m_waggingtail_tiger_primary-test
-    - sprite: DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi
-      state: m_waggingtail_tiger_secondary-test
-    - sprite: DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi
-      state: m_waggingtail_tiger_tertiary-test
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/tiger_tail.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/tiger_tail.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "null for now",
+    "copyright": "Taken from https://github.com/Bubberstation/Bubberstation/commit/4485ffb39b8c824167ef23a217bfe335b545778a on Bubberstation fork.",
     "size": {
       "x": 32,
       "y": 32

diff --git a/...stomization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_primary-test.png b/...stomization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_primary-test.png
diff --git a/...omization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_secondary-test.png b/...omization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_secondary-test.png
diff --git a/...tomization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_tertiary-test.png b/...tomization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_tertiary-test.png
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/meta.json