diff --git a/Resources/Locale/en-US/deltav/markings/felinid.ftl b/Resources/Locale/en-US/deltav/markings/felinid.ftl index add82918ea3..cac87110ac3 100644 --- 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 index 7083db7cfb7..dfacda5154b 100644 --- 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 index 7b725574c8e..9b91c3a2f8d 100644 --- 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/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_primary-test.png b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_primary-test.png deleted file mode 100644 index aa57011619f..00000000000 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_primary-test.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_secondary-test.png b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_secondary-test.png deleted file mode 100644 index c28d61e8682..00000000000 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_secondary-test.png and /dev/null differ diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_tertiary-test.png b/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_tertiary-test.png deleted file mode 100644 index 8f11866aaf9..00000000000 Binary files a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/m_waggingtail_tiger_tertiary-test.png and /dev/null differ 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 deleted file mode 100644 index d41c18af842..00000000000 --- a/Resources/Textures/DeltaV/Mobs/Customization/Felinid/wagging_tiger_tail.rsi/meta.json +++ /dev/null @@ -1,173 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "null", - "size": { - "x": 32, - "y": 32 - }, - "states": [ -{ - "name": "m_waggingtail_tiger_primary-test", - "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 - ] - ] - }, - { - "name": "m_waggingtail_tiger_secondary-test", - "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 - ] - ] - }, - { - "name": "m_waggingtail_tiger_tertiary-test", - "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 - ] - ] - } - ] -}