diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml index cce02f97bd..dc15a65e08 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_tails.yml @@ -7,7 +7,7 @@ forcedColoring: true sprites: - sprite: _CP14/Mobs/Customization/tiefling_tails.rsi - state: tail1 + state: tail - type: marking id: CP14TieflingTailSpades @@ -18,4 +18,31 @@ forcedColoring: true sprites: - sprite: _CP14/Mobs/Customization/tiefling_tails.rsi - state: tail_spades \ No newline at end of file + state: tail_spades + + + + +# Animation + +- type: marking + id: CP14TieflingTailAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_tails.rsi + state: tail_waggin + +- type: marking + id: CP14TieflingTailSpadesAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + followSkinColor: true + forcedColoring: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_tails.rsi + state: tail_spades_waggin diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json index d952a90435..fe836c7f5f 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/meta.json @@ -8,7 +8,15 @@ }, "states": [ { - "name": "tail1", + "name": "tail", + "directions": 4 + }, + { + "name": "tail_spades", + "directions": 4 + }, + { + "name": "tail_waggin", "directions": 4, "delays": [ [ @@ -54,7 +62,7 @@ ] }, { - "name": "tail_spades", + "name": "tail_spades_waggin", "directions": 4, "delays": [ [ @@ -100,4 +108,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail.png b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail.png new file mode 100644 index 0000000000..9c18fa7188 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades.png b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades.png index df360c4f3a..83a5cfb85d 100644 Binary files a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades.png and b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades_waggin.png b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades_waggin.png new file mode 100644 index 0000000000..df360c4f3a Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_spades_waggin.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail1.png b/Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_waggin.png similarity index 100% rename from Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail1.png rename to Resources/Textures/_CP14/Mobs/Customization/tiefling_tails.rsi/tail_waggin.png