Skip to content

Bunnytail Wagging #2255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jakumba merged 4 commits into from
Jan 3, 2026
Merged

Bunnytail Wagging #2255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2109182
Bunnytail Wag
Aikakakah Dec 31, 2025
a3d0c3b
Update meta.json
Aikakakah Jan 1, 2026
b8e3184
Merge branch 'master' into Bunny-Tail-wag
Aikakakah Jan 3, 2026
baab414
Merge branch 'master' into Bunny-Tail-wag
Aikakakah Jan 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/markings/Kemonomimi_tails.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

marking-BunnyTail = Bunny Tail
marking-BunnyTail-bunnytail = Tail
marking-BunnyTailAnimated = Bunny Tail (animated)
marking-BunnyTailAnimated-bunnytail_wag = Tail

marking-BunnyTailAlt = Bunny Tail, Alternative
marking-BunnyTailAlt-bunnytailalt = Bunny Tail, Alternative
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Customization/Markings/kemonomimi_tails.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
- sprite: Mobs/Customization/kemonomimi-tails.rsi
state: bunnytail

- type: marking
id: BunnyTailAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: []
sprites:
- sprite: Mobs/Customization/kemonomimi-tails.rsi
state: bunnytail_wag

- type: marking
id: BunnyTailAlt
bodyPart: Tail
Expand Down
Binary file added Resources/Textures/Mobs/Customization/kemonomimi-tails.rsi/bunnytail_wag.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions Resources/Textures/Mobs/Customization/kemonomimi-tails.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
"name": "bunnytail",
"directions": 4
},
{
"name": "bunnytail_wag",
"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]]
},
{
"name": "bunnytailalt",
"directions": 4
Expand Down
Loading