diff --git a/Resources/Locale/en-US/_strings/markings/human_tails.ftl b/Resources/Locale/en-US/_strings/markings/human_tails.ftl index d30a00524b..1af3e466e5 100644 --- a/Resources/Locale/en-US/_strings/markings/human_tails.ftl +++ b/Resources/Locale/en-US/_strings/markings/human_tails.ftl @@ -3,3 +3,5 @@ marking-FoxTail = Fox Tail marking-BigFoxTail = Big Fox Tail marking-SharkTail = Shark Tail + +marking-LizardTail = Lizard Tail diff --git a/Resources/Locale/ru-RU/_strings/markings/human_tails.ftl b/Resources/Locale/ru-RU/_strings/markings/human_tails.ftl index d34d8188d3..ee4e1a21e7 100644 --- a/Resources/Locale/ru-RU/_strings/markings/human_tails.ftl +++ b/Resources/Locale/ru-RU/_strings/markings/human_tails.ftl @@ -1,3 +1,4 @@ marking-FoxTail = лисий хвост marking-BigFoxTail = большой лисий хвост marking-SharkTail = акулий хвост +marking-LizardTail = хвост ящерицы diff --git a/Resources/Prototypes/_Sunrise/Entities/Customization/Markings/human_tails.yml b/Resources/Prototypes/_Sunrise/Entities/Customization/Markings/human_tails.yml index 2d4794c94f..11c2753a34 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Customization/Markings/human_tails.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Customization/Markings/human_tails.yml @@ -2,7 +2,7 @@ id: FoxTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [Human] + speciesRestriction: [Human, Dwarf] sponsorOnly: false # Sunrise sprites: - sprite: _Sunrise/Mobs/Customization/Vulpkanin/tail_markings.rsi @@ -14,7 +14,7 @@ id: BigFoxTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [Human] + speciesRestriction: [Human, Dwarf] sponsorOnly: false # Sunrise coloring: default: @@ -37,8 +37,20 @@ id: SharkTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [Human] + speciesRestriction: [Human, Dwarf] sponsorOnly: false # Sunrise sprites: - sprite: _Sunrise/Mobs/Customization/human_tails.rsi state: shark_tail + +- type: marking + id: LizardTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Human, Dwarf] + sponsorOnly: false # Sunrise + sprites: + - sprite: _Sunrise/Mobs/Customization/human_tails.rsi + state: lizard_tail_primary + - sprite: _Sunrise/Mobs/Customization/human_tails.rsi + state: lizard_tail_secondary diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/human_tails.rsi/lizard_tail_primary.png b/Resources/Textures/_Sunrise/Mobs/Customization/human_tails.rsi/lizard_tail_primary.png new file mode 100644 index 0000000000..3cbc46f8b2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/human_tails.rsi/lizard_tail_primary.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/human_tails.rsi/lizard_tail_secondary.png b/Resources/Textures/_Sunrise/Mobs/Customization/human_tails.rsi/lizard_tail_secondary.png new file mode 100644 index 0000000000..72cdcbe6f8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/human_tails.rsi/lizard_tail_secondary.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/human_tails.rsi/meta.json b/Resources/Textures/_Sunrise/Mobs/Customization/human_tails.rsi/meta.json index 9a3a52dc89..01504fe5e4 100644 --- a/Resources/Textures/_Sunrise/Mobs/Customization/human_tails.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Mobs/Customization/human_tails.rsi/meta.json @@ -16,6 +16,162 @@ [ 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15 ], [ 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15 ] ] - } + }, + { + "name": "lizard_tail_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": "lizard_tail_secondary", + "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 + ] + ] + } ] }