diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Tajaran.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Tajaran.yml index 9aba8b8a30d..8f97d5823aa 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Tajaran.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Tajaran.yml @@ -144,6 +144,8 @@ markingCategory: Tail speciesRestriction: [TajaranSpecies] sprites: + - sprite: ADT/Mobs/Species/Tajaran/parts.rsi + state: tail_m - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3 state: wingler_3 @@ -153,6 +155,8 @@ markingCategory: Tail speciesRestriction: [TajaranSpecies] sprites: + - sprite: ADT/Mobs/Species/Tajaran/parts.rsi + state: tail_m - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3 state: wingler_2 @@ -162,6 +166,8 @@ markingCategory: Tail speciesRestriction: [TajaranSpecies] sprites: + - sprite: ADT/Mobs/Species/Tajaran/parts.rsi + state: tail_m - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3 state: wingler_1 @@ -171,6 +177,8 @@ markingCategory: Tail speciesRestriction: [TajaranSpecies] sprites: + - sprite: ADT/Mobs/Species/Tajaran/parts.rsi + state: tail_m - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3 state: tail_tip @@ -180,6 +188,8 @@ markingCategory: Tail speciesRestriction: [TajaranSpecies] sprites: + - sprite: ADT/Mobs/Species/Tajaran/parts.rsi + state: tail_m - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3 state: tail_ring @@ -189,6 +199,8 @@ markingCategory: Tail speciesRestriction: [TajaranSpecies] sprites: + - sprite: ADT/Mobs/Species/Tajaran/parts.rsi + state: tail_m - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от prazat911 state: tail_skeleton @@ -210,6 +222,91 @@ - sprite: ADT/Mobs/Species/Tajaran/parts.rsi state: tail_m +#Хвосты Animated +- type: marking + id: TailWingler3Animated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: ADT/Mobs/Species/Tajaran/parts.rsi + state: tail_m_wagging + - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3 + state: wingler_3_wagging + +- type: marking + id: TailWingler2Animated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: ADT/Mobs/Species/Tajaran/parts.rsi + state: tail_m_wagging + - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3 + state: wingler_2_wagging + +- type: marking + id: TailWingler1Animated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: ADT/Mobs/Species/Tajaran/parts.rsi + state: tail_m_wagging + - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3 + state: wingler_1_wagging + +- type: marking + id: TailTipAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: ADT/Mobs/Species/Tajaran/parts.rsi + state: tail_m_wagging + - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3 + state: tail_tip_wagging + +- type: marking + id: TailRingAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: ADT/Mobs/Species/Tajaran/parts.rsi + state: tail_m_wagging + - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3 + state: tail_ring_wagging + +- type: marking + id: TailSkeletonAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: ADT/Mobs/Species/Tajaran/parts.rsi + state: tail_m_wagging + - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от prazat911 + state: tail_skeleton_wagging + +- type: marking + id: TailFluffyAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi #Спрайты от moroz_3 + state: tail_fluffy_wagging + +- type: marking + id: TailColorAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: ADT/Mobs/Species/Tajaran/parts.rsi + state: tail_m_wagging + #Голова. ##Голова (верх) diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Vulpkanin.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Vulpkanin.yml index b64849e2d8e..bae57583631 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Vulpkanin.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/Vulpkanin.yml @@ -76,6 +76,8 @@ markingCategory: Tail speciesRestriction: [VulpkaninSpecies] sprites: + - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi + state: tail_m - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi state: tail1 @@ -85,6 +87,8 @@ markingCategory: Tail speciesRestriction: [VulpkaninSpecies] sprites: + - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi + state: tail_m - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi state: tail2 @@ -97,6 +101,38 @@ - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi state: tail_m +#Animated +- type: marking + id: ADTVulpkanintail1Animated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi + state: tail_m_wagging + - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi + state: tail1_wagging + +- type: marking + id: ADTVulpkanintail2Animated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi + state: tail_m_wagging + - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi + state: tail2_wagging + +- type: marking + id: ADTVulpkanintailAllAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi + state: tail_m_wagging + #- type: marking # id: ADTVulpkanintail3 # bodyPart: Tail diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Tajaran.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/Tajaran.yml index 12f522e0d09..2b8b840ce06 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/Tajaran.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/Tajaran.yml @@ -53,6 +53,7 @@ noRot: true drawdepth: Mobs scale: 0.95, 0.95 + - type: Wagging - type: entity save: false diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml b/Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml index 47e21729a20..e4c55adca12 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Species/Vulpkanin.yml @@ -55,6 +55,7 @@ noRot: true drawdepth: Mobs scale: 0.95, 0.95 + - type: Wagging - type: entity save: false diff --git a/Resources/Prototypes/ADT/Species/Tajaran.yml b/Resources/Prototypes/ADT/Species/Tajaran.yml index 53c48562662..65666dda3ed 100644 --- a/Resources/Prototypes/ADT/Species/Tajaran.yml +++ b/Resources/Prototypes/ADT/Species/Tajaran.yml @@ -29,7 +29,7 @@ RLeg: MobTajaranRLeg LFoot: MobTajaranLFoot RFoot: MobTajaranRFoot - Tail: MobTajaranTail + Tail: MobHumanoidAnyMarking - type: markingPoints id: MobTajaranMarkingLimits @@ -46,7 +46,8 @@ required: false Tail: points: 1 - required: false + required: true + defaultMarkings: [ TailColor ] Head: points: 3 required: false diff --git a/Resources/Prototypes/ADT/Species/Vulpkanin.yml b/Resources/Prototypes/ADT/Species/Vulpkanin.yml index f7089ddf4eb..11469c9d3ce 100644 --- a/Resources/Prototypes/ADT/Species/Vulpkanin.yml +++ b/Resources/Prototypes/ADT/Species/Vulpkanin.yml @@ -29,7 +29,7 @@ RLeg: MobVulpkaninRLeg LFoot: MobVulpkaninLFoot RFoot: MobVulpkaninRFoot - Tail: MobVulpkaninTail + Tail: MobHumanoidAnyMarking - type: markingPoints id: MobVulpkaninMarkingLimits @@ -43,7 +43,8 @@ required: false Tail: points: 1 - required: false + required: true + defaultMarkings: [ ADTVulpkanintailAll ] Head: points: 4 required: false diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/meta.json b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/meta.json index cea988f2e80..71d63267c86 100644 --- a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/meta.json +++ b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/meta.json @@ -8,7 +8,7 @@ }, "states": [ { - "name": "wingler_1", + "name": "wingler_1_wagging", "directions": 4, "delays": [ [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15], @@ -18,7 +18,7 @@ ] }, { - "name": "wingler_2", + "name": "wingler_2_wagging", "directions": 4, "delays": [ [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15], @@ -28,7 +28,7 @@ ] }, { - "name": "wingler_3", + "name": "wingler_3_wagging", "directions": 4, "delays": [ [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15], @@ -38,7 +38,7 @@ ] }, { - "name": "tail_ring", + "name": "tail_ring_wagging", "directions": 4, "delays": [ [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15], @@ -48,7 +48,7 @@ ] }, { - "name": "tail_skeleton", + "name": "tail_skeleton_wagging", "directions": 4, "delays": [ [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15], @@ -58,7 +58,7 @@ ] }, { - "name": "tail_fluffy", + "name": "tail_fluffy_wagging", "directions": 4, "delays": [ [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15], @@ -68,7 +68,7 @@ ] }, { - "name": "tail_tip", + "name": "tail_tip_wagging", "directions": 4, "delays": [ [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15], @@ -76,6 +76,34 @@ [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": "wingler_1", + "directions": 4 + }, + { + "name": "wingler_2", + "directions": 4 + }, + { + "name": "wingler_3", + "directions": 4 + }, + { + "name": "tail_ring", + "directions": 4 + }, + { + "name": "tail_skeleton", + "directions": 4 + }, + { + "name": "tail_fluffy", + "directions": 4 + }, + { + "name": "tail_tip", + "directions": 4 } ] } diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_fluffy.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_fluffy.png index 20ea8605666..d616cbfa446 100644 Binary files a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_fluffy.png and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_fluffy.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_fluffy_wagging.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_fluffy_wagging.png new file mode 100644 index 00000000000..20ea8605666 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_fluffy_wagging.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_ring.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_ring.png index c159eed2122..997db1de1aa 100644 Binary files a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_ring.png and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_ring.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_ring_wagging.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_ring_wagging.png new file mode 100644 index 00000000000..c159eed2122 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_ring_wagging.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_skeleton.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_skeleton.png index 59044e9b856..f858e1ecc06 100644 Binary files a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_skeleton.png and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_skeleton.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_skeleton_wagging.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_skeleton_wagging.png new file mode 100644 index 00000000000..59044e9b856 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_skeleton_wagging.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_tip.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_tip.png index 131e89032d7..6e572aa67cb 100644 Binary files a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_tip.png and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_tip.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_tip_wagging.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_tip_wagging.png new file mode 100644 index 00000000000..131e89032d7 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/tail_tip_wagging.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_1.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_1.png index deec37f19aa..722e3611201 100644 Binary files a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_1.png and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_1.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_1_wagging.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_1_wagging.png new file mode 100644 index 00000000000..deec37f19aa Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_1_wagging.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_2.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_2.png index c933f3e69ff..e69ef5dd9f7 100644 Binary files a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_2.png and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_2.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_2_wagging.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_2_wagging.png new file mode 100644 index 00000000000..c933f3e69ff Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_2_wagging.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_3.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_3.png index 445b894f6a5..3e88613f90e 100644 Binary files a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_3.png and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_3.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_3_wagging.png b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_3_wagging.png new file mode 100644 index 00000000000..445b894f6a5 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Tajaran/tajaran_tail.rsi/wingler_3_wagging.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/meta.json b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/meta.json index 9ffb6fbf125..6cf02ba2e08 100644 --- a/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/meta.json +++ b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/meta.json @@ -12,7 +12,7 @@ "directions": 4 }, { - "name": "tail1", + "name": "tail1_wagging", "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 ], @@ -22,7 +22,7 @@ ] }, { - "name": "tail2", + "name": "tail2_wagging", "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 ], @@ -32,7 +32,7 @@ ] }, { - "name": "tail_m", + "name": "tail_m_wagging", "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 ], @@ -40,6 +40,18 @@ [ 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": "tail1", + "directions": 4 + }, + { + "name": "tail2", + "directions": 4 + }, + { + "name": "tail_m", + "directions": 4 } ] } diff --git a/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail1.png b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail1.png index 7e1ed562b98..e41acce3e09 100644 Binary files a/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail1.png and b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail1.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail1_wagging.png b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail1_wagging.png new file mode 100644 index 00000000000..7e1ed562b98 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail1_wagging.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail2.png b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail2.png index 092347aa1df..5aa8d489db3 100644 Binary files a/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail2.png and b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail2.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail2_wagging.png b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail2_wagging.png new file mode 100644 index 00000000000..092347aa1df Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail2_wagging.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail_m.png b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail_m.png index 0254becd1c2..a685687f32b 100644 Binary files a/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail_m.png and b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail_m.png differ diff --git a/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail_m_wagging.png b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail_m_wagging.png new file mode 100644 index 00000000000..0254becd1c2 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Customization/Vulpkanin/vulpkanin_tail.rsi/tail_m_wagging.png differ diff --git a/Resources/Textures/ADT/Mobs/Species/Tajaran/parts.rsi/meta.json b/Resources/Textures/ADT/Mobs/Species/Tajaran/parts.rsi/meta.json index 31780b8e9fe..5a836124d9e 100644 --- a/Resources/Textures/ADT/Mobs/Species/Tajaran/parts.rsi/meta.json +++ b/Resources/Textures/ADT/Mobs/Species/Tajaran/parts.rsi/meta.json @@ -67,6 +67,10 @@ }, { "name": "tail_m", + "directions": 4 + }, + { + "name": "tail_m_wagging", "directions": 4, "delays": [ [0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15, 0.15], diff --git a/Resources/Textures/ADT/Mobs/Species/Tajaran/parts.rsi/tail_m.png b/Resources/Textures/ADT/Mobs/Species/Tajaran/parts.rsi/tail_m.png index f25f8906948..ca37c51a6ec 100644 Binary files a/Resources/Textures/ADT/Mobs/Species/Tajaran/parts.rsi/tail_m.png and b/Resources/Textures/ADT/Mobs/Species/Tajaran/parts.rsi/tail_m.png differ diff --git a/Resources/Textures/ADT/Mobs/Species/Tajaran/parts.rsi/tail_m_wagging.png b/Resources/Textures/ADT/Mobs/Species/Tajaran/parts.rsi/tail_m_wagging.png new file mode 100644 index 00000000000..f25f8906948 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Species/Tajaran/parts.rsi/tail_m_wagging.png differ diff --git a/Resources/Textures/ADT/Mobs/Species/Vulpkanin/parts.rsi/meta.json b/Resources/Textures/ADT/Mobs/Species/Vulpkanin/parts.rsi/meta.json index a26830d1622..34f813e9be8 100644 --- a/Resources/Textures/ADT/Mobs/Species/Vulpkanin/parts.rsi/meta.json +++ b/Resources/Textures/ADT/Mobs/Species/Vulpkanin/parts.rsi/meta.json @@ -57,6 +57,10 @@ }, { "name": "tail_m", + "directions": 4 + }, + { + "name": "tail_m_wagging", "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 ], diff --git a/Resources/Textures/ADT/Mobs/Species/Vulpkanin/parts.rsi/tail_m.png b/Resources/Textures/ADT/Mobs/Species/Vulpkanin/parts.rsi/tail_m.png index 0254becd1c2..a685687f32b 100644 Binary files a/Resources/Textures/ADT/Mobs/Species/Vulpkanin/parts.rsi/tail_m.png and b/Resources/Textures/ADT/Mobs/Species/Vulpkanin/parts.rsi/tail_m.png differ diff --git a/Resources/Textures/ADT/Mobs/Species/Vulpkanin/parts.rsi/tail_m_wagging.png b/Resources/Textures/ADT/Mobs/Species/Vulpkanin/parts.rsi/tail_m_wagging.png new file mode 100644 index 00000000000..0254becd1c2 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Species/Vulpkanin/parts.rsi/tail_m_wagging.png differ