diff --git a/Resources/Locale/en-US/markings/vulpkanin.ftl b/Resources/Locale/en-US/markings/vulpkanin.ftl index 8244b5f86bde5b..003d30aad0d438 100644 --- a/Resources/Locale/en-US/markings/vulpkanin.ftl +++ b/Resources/Locale/en-US/markings/vulpkanin.ftl @@ -96,19 +96,11 @@ marking-VulpHeadSlash = Vulpkanin Slash marking-VulpTail-vulp = Vulpkanin tail (base) marking-VulpTail-vulp-fade = Vulpkanin tail (fade) -marking-VulpTail = Vulpkanin +marking-VulpTail = Vulpkanin (waggable) 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-VulpTailTip = Vulpkanin (waggable, tip) marking-VulpTailAlt-vulp_alt = Vulpkanin tail (base) marking-VulpTailAlt-vulp_alt-fade = Vulpkanin tail (fade) @@ -124,31 +116,17 @@ marking-VulpTailLong = Vulpkanin Long marking-VulpTailFox-fox = Fox tail (base) marking-VulpTailFox-fox-fade = Fox tail (fade) -marking-VulpTailFox = Vulpkanin Fox +marking-VulpTailFox = Vulpkanin Fox (waggable) 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-VulpTailFoxTip = Vulpkanin Fox (waggable, tip) marking-VulpTailBushy-bushfluff = Bush tail -marking-VulpTailBushy = Vulpkanin Bush - -marking-VulpTailBushyWag-bushfluff_wag = Bush tail -marking-VulpTailBushyWag = Vulpkanin Bush (wag) +marking-VulpTailBushy = Vulpkanin Bush (waggable) marking-VulpTailCoyote-coyote = Coyote tail -marking-VulpTailCoyote = Vulpkanin Coyote - -marking-VulpTailCoyoteWag-coyote_wag = Coyote tail -marking-VulpTailCoyoteWag = Vulpkanin Coyote (wag) +marking-VulpTailCoyote = Vulpkanin Coyote (waggable) marking-VulpTailCorgiWag-corgi_wag = Crogi tail marking-VulpTailCorgiWag = Vulpkanin Corgi (wag) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml index 760566c8ff739d..6971d4df87bb16 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml @@ -291,10 +291,10 @@ state: vulp-tip - type: marking - id: VulpTailWag + id: VulpTailAnimated bodyPart: Tail markingCategory: Tail - speciesRestriction: [HumanoidFoxes] + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: vulp_wag @@ -302,10 +302,10 @@ state: vulp_wag-tip #fade - type: marking - id: VulpTailWagTip + id: VulpTailTipAnimated bodyPart: Tail markingCategory: Tail - speciesRestriction: [HumanoidFoxes] + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: vulp_wag @@ -368,10 +368,10 @@ state: fox-tip - type: marking - id: VulpTailFoxWag + id: VulpTailFoxAnimated bodyPart: Tail markingCategory: Tail - speciesRestriction: [HumanoidFoxes] + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: fox_wag @@ -379,10 +379,10 @@ state: fox_wag-fade - type: marking - id: VulpTailFoxWagTip + id: VulpTailFoxTipAnimated bodyPart: Tail markingCategory: Tail - speciesRestriction: [HumanoidFoxes] + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: fox_wag @@ -399,10 +399,10 @@ state: bushfluff - type: marking - id: VulpTailBushyWag + id: VulpTailBushyAnimated bodyPart: Tail markingCategory: Tail - speciesRestriction: [HumanoidFoxes] + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: bushfluff_wag @@ -417,10 +417,10 @@ state: coyote - type: marking - id: VulpTailCoyoteWag + id: VulpTailCoyoteAnimated bodyPart: Tail markingCategory: Tail - speciesRestriction: [HumanoidFoxes] + speciesRestriction: [] sprites: - sprite: DeltaV/Mobs/Customization/Vulpkanin/tail_markings.rsi state: coyote_wag diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml index e8accd314976d2..cb90f82fda6ec9 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml @@ -99,6 +99,8 @@ damage: types: Heat: 1.5 # Rip Fur + - type: Wagging + - type: entity