diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml index 994af53cb1a..23ca45b5386 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml @@ -387,3 +387,214 @@ sprites: - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi state: feroxi-arm-stripes-tiger + +# Animated +- type: marking + id: FeroxiTailAndDorsalAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + +- type: marking + id: FeroxiTailAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + +- type: marking + id: FeroxiStripedTailAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes-wagging + +- type: marking + id: FeroxiStripedTailAndDorsalAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-stripes + +- type: marking + id: FeroxiTipTailAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip-wagging + +- type: marking + id: FeroxiTipTailAndDorsalAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-tip + +- type: marking + id: FeroxiTailBlitzAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-stripes + +- type: marking + id: FeroxiTailBlitzNoDorsalAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under-wagging + +- type: marking + id: FeroxiTwoToneTailAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under-wagging + +- type: marking + id: FeroxiTwoToneTailAndDorsalAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + +- type: marking + id: FeroxiStripeTwoToneTailAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under-wagging + +- type: marking + id: FeroxiStripeTwoToneTailAndDorsalAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-stripes + +- type: marking + id: FeroxiTipTwoToneTailAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under-wagging + +- type: marking + id: FeroxiTipTwoToneTailAndDorsalAnimated + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under-wagging + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: _DV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-tip diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml index 1f1256d17d9..2549b2228c6 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Species/feroxi.yml @@ -8,6 +8,7 @@ - type: HumanoidAppearance species: Feroxi - type: Hunger + - type: Wagging - type: Inventory speciesId: feroxi - type: Thirst diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-bottom-tip-wagging.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-bottom-tip-wagging.png new file mode 100644 index 00000000000..f2f68c10543 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-bottom-tip-wagging.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-second-dorsal-tip-wagging.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-second-dorsal-tip-wagging.png new file mode 100644 index 00000000000..d6fe87d58cc Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-second-dorsal-tip-wagging.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-stripes-wagging.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-stripes-wagging.png new file mode 100644 index 00000000000..e08fb203501 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-stripes-wagging.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-top-tip-wagging.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-top-tip-wagging.png new file mode 100644 index 00000000000..07e867b6475 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-top-tip-wagging.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-under-wagging.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-under-wagging.png new file mode 100644 index 00000000000..f8700b8c206 Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-under-wagging.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-wagging.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-wagging.png new file mode 100644 index 00000000000..34da58883ba Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-wagging.png differ diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json index c207acddcb4..2d96289207d 100644 --- a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json +++ b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Made by BlitzTheSquishy", + "copyright": "Made by BlitzTheSquishy. Animation by Verybigman311", "size": { "x": 32, "y": 32 @@ -42,6 +42,474 @@ { "name": "feroxi-dorsal-stripes", "directions": 4 + }, + { + "name": "feroxi-tail-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, + 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": "feroxi-tail-top-tip-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, + 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": "feroxi-tail-bottom-tip-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, + 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": "feroxi-tail-second-dorsal-tip-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, + 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": "feroxi-tail-stripes-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, + 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": "feroxi-tail-under-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, + 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 + ] + ] } ] }