space-wizards/space-station-14
1
0
Fork 0
mirror of https://github.com/space-wizards/space-station-14.git synced 2026-02-14 19:29:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Vulp Tail Wags + Tail Fixes (#42843)

Browse Source 
* Localization for Coyote

* Wagging action un-commented

* Species wagging action uncommented

* Sprites added, meta adjusted.

* Proper wag support
This commit is contained in:
Tiniest Shark
2026-02-10 17:10:59 -05:00
committed by GitHub
parent 457cd6509c
commit 7009a06151
24 changed files with 693 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Resources/Locale/en-US/markings/vulpkanin.ftl
View File

@@ -120,6 +120,9 @@ marking-VulpTailVulpFade-vulp = Vulpkanin tail (Base)
marking-VulpTailVulpFade-vulp-fade = Vulpkanin tail (Fade)
marking-VulpTailVulpFade = Vulpkanin (Fade)
marking-VulpTailCoyote-coyote = Coyote Tail (Base)
marking-VulpTailCoyote = Vulpkanin Coyote
# Chest

19
Resources/Prototypes/Actions/types.yml
View File

@@ -415,16 +415,15 @@
useDelay: 1
itemIconStyle: BigAction
# TODO: Add back once we have animated tails again. Were removed due to the sprite rework, causing all of them to not fit anymore.
# - type: entity
# parent: ActionToggleWagging
# id: ActionToggleWaggingVulpkanin
# components:
# - type: Action
# icon: { sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon }
# iconOn: { sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon }
# itemIconStyle: NoItem
# useDelay: 1 # Prevents Emote Spam
- type: entity
parent: ActionToggleWagging
id: ActionToggleWaggingVulpkanin
components:
- type: Action
icon: { sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon }
iconOn: { sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon }
itemIconStyle: NoItem
useDelay: 1 # Prevents Emote Spam
- type: entity
parent: BaseAction

4
Resources/Prototypes/Body/Species/vulpkanin.yml
View File

@@ -177,8 +177,8 @@
heatDamage:
types:
Heat: 2.5 # Per second, scales with temperature & other constants
# - type: Wagging TODO: Add back once we have animated tails again. Were removed due to the sprite rework, causing all of them to not fit anymore.
# action: ActionToggleWaggingVulpkanin
- type: Wagging
action: ActionToggleWaggingVulpkanin
- type: TemperatureProtection
heatingCoefficient: 1.2
coolingCoefficient: 0.3

81
Resources/Prototypes/Entities/Mobs/Customization/Markings/Vulpkanin/vulpkanin_tail.yml
View File

@@ -59,4 +59,83 @@
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp-fade
state: vulp-fade
- type: marking
id: VulpTailCoyote
bodyPart: Tail
groupWhitelist: [ Vulpkanin ]
sprites:
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: coyote
# Animated
- type: marking
id: VulpTailFennecAnimated
bodyPart: Tail
groupWhitelist: []
sprites:
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fennec-wagging
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fennec-wagging-tip
- type: marking
id: VulpTailFluffyAnimated
bodyPart: Tail
groupWhitelist: []
sprites:
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fluffy-wagging
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fluffy-wagging-tip
- type: marking
id: VulpTailHuskyAnimated
bodyPart: Tail
groupWhitelist: []
sprites:
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: husky-wagging
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: husky-wagging-inner
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: husky-wagging-outer
- type: marking
id: VulpTailLongAnimated
bodyPart: Tail
groupWhitelist: []
sprites:
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: long-wagging
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: long-wagging-tip
- type: marking
id: VulpTailVulpAnimated
bodyPart: Tail
groupWhitelist: []
sprites:
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp-wagging
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp-wagging-tip
- type: marking
id: VulpTailVulpFadeAnimated
bodyPart: Tail
groupWhitelist: []
sprites:
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp-wagging
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp-wagging-fade
- type: marking
id: VulpTailCoyoteAnimated
bodyPart: Tail
groupWhitelist: []
sprites:
- sprite: Mobs/Customization/Vulpkanin/tail_markings.rsi
state: coyote-wagging

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/coyote-wagging.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/coyote.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 474 B

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fennec-wagging-tip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fennec-wagging.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fluffy-wagging-tip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/fluffy-wagging.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky-wagging-inner.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 764 B

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky-wagging-outer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/husky-wagging.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/long-tip.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 329 B

After

Width:  |  Height:  |  Size: 322 B

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/long-wagging-tip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/long-wagging.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/long.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 562 B

After

Width:  |  Height:  |  Size: 554 B

600
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/DeltaV-Station/Delta-v/commit/65d35d0b3c20aa4e8a0e749a4de8392e53051e86. Fluffy created by Skarletto (Github). Modified by FairlySadPanda (Github/Discord)",
"copyright": "Taken from https://github.com/DeltaV-Station/Delta-v/commit/65d35d0b3c20aa4e8a0e749a4de8392e53051e86. Fluffy created by Skarletto (Github). Modified by FairlySadPanda and TiniestShark (Github/Discord). Wagging animations by TiniestShark (Github)",
"size": {"x": 32, "y": 32},
"states": [
{
@@ -58,6 +58,604 @@
{
"name": "coyote",
"directions": 4
},
{
"name": "fennec-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
]
]
},
{
"name": "fennec-wagging-tip",
"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": "fluffy-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
]
]
},
{
"name": "fluffy-wagging-tip",
"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": "husky-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
]
]
},
{
"name": "husky-wagging-inner",
"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": "husky-wagging-outer",
"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": "long-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
]
]
},
{
"name": "long-wagging-tip",
"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": "vulp-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
]
]
},
{
"name": "vulp-wagging-fade",
"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": "vulp-wagging-tip",
"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": "coyote-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
]
]
}
]
}

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp-fade.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 398 B

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp-tip.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 401 B

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp-wagging-fade.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp-wagging-tip.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp-wagging.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
Resources/Textures/Mobs/Customization/Vulpkanin/tail_markings.rsi/vulp.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 540 B

After

Width:  |  Height:  |  Size: 664 B