Skip to content
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

Jump to bottom

Allow vulps to wag #1152

Closed
wants to merge 2 commits into from
Closed

Allow vulps to wag #1152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d814fac
Add vulp wag toggle like the lizard one
pissdemon Apr 29, 2024
d6522dc
Merge branch 'master' into I-have-a-little-itch-o3o-wags-tails-can-yo…
pissdemon Apr 29, 2024
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
30 changes: 4 additions & 26 deletions Resources/Locale/en-US/deltav/markings/vulpkanin.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,6 @@ marking-VulpTailTip-vulp = Vulpkanin tail (base)
marking-VulpTailTip-vulp-tip = Vulpkanin tail (tip)
marking-VulpTailTip = Vulpkanin (tip)

marking-VulpTailWag-vulp_wag = Vulpkanin tail (base)
marking-VulpTailWag-vulp_wag-fade = Vulpkanin tail (fade)
marking-VulpTailWag = Vulpkanin (wag)

marking-VulpTailWagTip-vulp_wag = Vulpkanin tail (base)
marking-VulpTailWagTip-vulp_wag-tip = Vulpkanin tail (tip)
marking-VulpTailWagTip = Vulpkanin (wag, tip)

marking-VulpTailAlt-vulp_alt = Vulpkanin tail (base)
marking-VulpTailAlt-vulp_alt-fade = Vulpkanin tail (fade)
marking-VulpTailAlt = Vulpkanin (alt)
Expand All @@ -130,28 +122,14 @@ marking-VulpTailFoxTip-fox = Fox tail (base)
marking-VulpTailFoxTip-fox-tip = Fox tail (fade)
marking-VulpTailFoxTip = Vulpkanin Fox (tip)

marking-VulpTailFoxWag-fox_wag = Fox tail (base)
marking-VulpTailFoxWag-fox_wag-fade = Fox tail (fade)
marking-VulpTailFoxWag = Vulpkanin Fox (wag)

marking-VulpTailFoxWagTip-fox_wag = Fox tail (base)
marking-VulpTailFoxWagTip-fox_wag-tip = Fox tail (tip)
marking-VulpTailFoxWagTip = Vulpkanin Fox (wag, tip)

marking-VulpTailBushy-bushfluff = Bush tail
marking-VulpTailBushy = Vulpkanin Bush

marking-VulpTailBushyWag-bushfluff_wag = Bush tail
marking-VulpTailBushyWag = Vulpkanin Bush (wag)

marking-VulpTailCoyote-coyote = Coyote tail
marking-VulpTailCoyote = Vulpkanin Coyote

marking-VulpTailCoyoteWag-coyote_wag = Coyote tail
marking-VulpTailCoyoteWag = Vulpkanin Coyote (wag)

marking-VulpTailCorgiWag-corgi_wag = Crogi tail
marking-VulpTailCorgiWag = Vulpkanin Corgi (wag)
marking-VulpTailCorgi-corgi = Corgi tail
marking-VulpTailCorgi = Vulpkanin Corgi

marking-VulpTailHusky-husky-inner = Husky tail (inner)
marking-VulpTailHusky-husky-outer = Husky tail (outer)
Expand All @@ -176,8 +154,8 @@ marking-VulpTailOtie = Vulpkanin Otie
marking-VulpTailFluffy-fluffy = Fluffy tail
marking-VulpTailFluffy = Vulpkanin Fluffy

marking-VulpTailDalmatianWag-dalmatian_wag = Dalmatian tail
marking-VulpTailDalmatianWag = Vulpkanin Dalmatian (wag)
marking-VulpTailDalmatian-dalmatian = Dalmatian tail
marking-VulpTailDalmatian = Vulpkanin Dalmatian


marking-VulpBellyCrest-belly_crest = Belly
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/DeltaV/Actions/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Vulpkanin Tail Wagging
- type: entity
id: ActionToggleVulpkaninWagging
name: action-name-toggle-wagging
description: action-description-toggle-wagging
noSpawn: true
components:
- type: InstantAction
icon: { sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon }
iconOn: { sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon }
itemIconStyle: NoItem
useDelay: 1 # Prevents Emote Spam
event: !type:ToggleActionEvent
60 changes: 39 additions & 21 deletions Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,32 +280,32 @@
state: vulp-fade

- type: marking
id: VulpTailTip
id: VulpTailAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp-tip
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp_wag
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp_wag-tip #fade

- type: marking
id: VulpTailWag
id: VulpTailTip
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp_wag
state: vulp
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp_wag-tip #fade
state: vulp-tip

- type: marking
id: VulpTailWagTip
id: VulpTailTipAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: vulp_wag
Expand Down Expand Up @@ -368,21 +368,21 @@
state: fox-tip

- type: marking
id: VulpTailFoxWag
id: VulpTailFoxAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fox_wag
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fox_wag-fade

- type: marking
id: VulpTailFoxWagTip
id: VulpTailFoxTipAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: fox_wag
Expand All @@ -399,10 +399,10 @@
state: bushfluff

- type: marking
id: VulpTailBushyWag
id: VulpTailBushyAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: bushfluff_wag
Expand All @@ -417,19 +417,28 @@
state: coyote

- type: marking
id: VulpTailCoyoteWag
id: VulpTailCoyoteAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: coyote_wag

- type: marking
id: VulpTailCorgiWag
id: VulpTailCorgi
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: corgi

- type: marking
id: VulpTailCorgiAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: corgi_wag
Expand Down Expand Up @@ -502,10 +511,19 @@
state: fluffy

- type: marking
id: VulpTailDalmatianWag
id: VulpTailDalmatian
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Vulpkanin]
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: dalmatian

- type: marking
id: VulpTailDalmatianAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: []
sprites:
- sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi
state: dalmatian_wag
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@
Female: FemaleVulpkanin
Unsexed: MaleVulpkanin
- type: DogVision
- type: Wagging
action: ActionToggleVulpkaninWagging

- type: entity
save: false
Expand Down
Binary file added Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/corgi.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.
Binary file added ...es/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/dalmatian.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.
13 changes: 12 additions & 1 deletion Resources/Textures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise edited by Floofers",
"copyright": "Taken from https://github.com/ParadiseSS13/Paradise edited by Floofers, tail-wag-icon and corgi and dalmation created by PursuitInAshes based off of 'vulp'. Fluffy created by Skarletto (Github).",
"size": {"x": 32, "y": 32},
"states": [
{
Expand Down Expand Up @@ -96,6 +96,10 @@
"directions": 4,
"delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]
},
{
"name": "corgi",
"directions": 4
},
{
"name": "corgi_wag",
"directions": 4,
Expand Down Expand Up @@ -137,10 +141,17 @@
"name": "fluffy",
"directions": 4
},
{
"name": "dalmatian",
"directions": 4
},
{
"name": "dalmatian_wag",
"directions": 4,
"delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]
},
{
"name": "tail-wag-icon"
}
]
}
Binary file added ...extures/DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi/tail-wag-icon.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.
Loading