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.

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

Vulpkanin Species #214

Merged
merged 33 commits into from
Apr 13, 2024
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
d596751
DeltaV Body Folder
PursuitInAshes Mar 7, 2024
645bd14
Audio
PursuitInAshes Mar 7, 2024
ee70dd3
Locale Files
PursuitInAshes Mar 7, 2024
9f9c54e
Entities for marking and the mod its self.
PursuitInAshes Mar 7, 2024
ad002ee
Create Vulpakin.yml
PursuitInAshes Mar 7, 2024
78954a8
Name Datasets
PursuitInAshes Mar 7, 2024
034ff60
Emotes,Sounds, Speaking Verbs
PursuitInAshes Mar 7, 2024
c4d6826
Talking Sounds
PursuitInAshes Mar 7, 2024
015cdc7
Sprites
PursuitInAshes Mar 7, 2024
a57d60e
Update Path
PursuitInAshes Mar 7, 2024
73293f3
More Path Fixes + Clown Sprites
PursuitInAshes Mar 7, 2024
70b7edb
Bunch of stuff
PursuitInAshes Mar 8, 2024
dc524c0
YAML Trimming
PursuitInAshes Mar 9, 2024
c74ffb6
Reorganize things to hopefully fix errors
PursuitInAshes Mar 10, 2024
7f8d572
Remove Diet Restriction
PursuitInAshes Apr 6, 2024
d4d3cfb
Reorder and remove some md in body proto
PursuitInAshes Apr 6, 2024
3992379
Maybe fix indentation issue
PursuitInAshes Apr 6, 2024
b0b41a2
Fix error
PursuitInAshes Apr 6, 2024
4406f78
Code Clean Up and better mark down
PursuitInAshes Apr 6, 2024
25baea7
Merge branch 'master' into VulpakinSpecies
PursuitInAshes Apr 6, 2024
6d5c2c0
Port The Howling PR
PursuitInAshes Apr 6, 2024
c3a4845
Sound Improvements
PursuitInAshes Apr 7, 2024
b236ed1
Better Tail Wagging pt1
PursuitInAshes Apr 7, 2024
7625cdf
Whoops
PursuitInAshes Apr 7, 2024
5114b3e
Local Alert Crash Fix
PursuitInAshes Apr 7, 2024
3a209be
Merge branch 'mergealertcrashfix' into VulpakinSpecies
PursuitInAshes Apr 8, 2024
5c96c5e
Revert "Local Alert Crash Fix"
PursuitInAshes Apr 8, 2024
eb9c209
Better Tail Wagging Pt 2
PursuitInAshes Apr 8, 2024
6880d16
Eh, I want these at least playable
PursuitInAshes Apr 8, 2024
2b254bd
Reattribute fluffy tail sprite
PursuitInAshes Apr 11, 2024
758a494
Meta/Attribution Cleanup & Improvement
PursuitInAshes Apr 13, 2024
98cbe9c
Correctly Push Talk Folder Attribution Fix
PursuitInAshes Apr 13, 2024
d0bcb47
Fix RGA Test
PursuitInAshes Apr 13, 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
6 changes: 6 additions & 0 deletions Resources/Audio/_CD/Voice/Talk/license.txt
PursuitInAshes marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pug.ogg (Renamed to vulp.ogg)
pug_ask.ogg (Renamed to vulp_ask.ogg)
pug_exclaim.ogg (Renamed to vulp_exclaim.ogg)
all taken from
https://github.com/goonstation/goonstation/commit/da7c8965c4552ca53af367e6c83a83da2affe790
licensed under CC BY-NC-SA 3.0
Binary file added Resources/Audio/_CD/Voice/Talk/vulp.ogg
Binary file not shown.
Binary file added Resources/Audio/_CD/Voice/Talk/vulp_ask.ogg
Binary file not shown.
Binary file added Resources/Audio/_CD/Voice/Talk/vulp_exclaim.ogg
Binary file not shown.
50 changes: 50 additions & 0 deletions Resources/Audio/_CD/Voice/Vulpkanin/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
- files: ["dog_bark1.ogg", "dog_bark2.ogg", "dog_bark3.ogg"]
license: "CC0-1.0"
copyright: "Original sound by https://freesound.org/people/abhisheky948/sounds/625497/"
source: "https://freesound.org/people/abhisheky948/sounds/625497/"

files: ["dog_bark2.ogg"]
license: "CC0-1.0"
copyright: "Original sound by https://freesound.org/people/michael_grinnell/sounds/464400/"
source: "https://freesound.org/people/michael_grinnell/sounds/464400/"

files: ["dog_bark3.ogg"]
license: "CC0-1.0"
copyright: "Original sound by https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/"
source: "https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/"

- files: ["dog_growl1.ogg", "dog_growl2.ogg", "dog_growl3.ogg"]
license: "CC0-1.0"
copyright: "Original sound by https://freesound.org/people/Glitchedtones/sounds/372533/ - cut out three clips of dog growling, cleaned up, converted to ogg"
source: "https://freesound.org/people/Glitchedtones/sounds/372533/"

- files: ["dog_growl4.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Original sound taken from Paradise Station. Renamed to dog_growl4.ogg"
source: "https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl1.ogg"

- files: ["dog_growl5.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Original sound taken from Paradise Station. Renamed to dog_growl5.ogg"
source: "https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl2.ogg"

- files: ["dog_growl6.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Original sound taken from Paradise Station. Renamed to dog_growl6.ogg"
source: "https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl3.ogg"


- files: ["dog_snarl1.ogg", "dog_snarl2.ogg", "dog_snarl3.ogg"]
license: "CC0-1.0"
copyright: "Original sound by https://freesound.org/people/strongbot/sounds/341090/ - cut out three clips of dog snarling, cleaned up, converted to ogg"
source: "https://freesound.org/people/strongbot/sounds/341090/"

files: ["dog_whine.ogg"]
license: "CC0-1.0"
copyright: "Original sound by https://freesound.org/people/Sruddi1/sounds/34878/ - cleaned up, converted to ogg"
source: "https://freesound.org/people/Sruddi1/sounds/34878/"

- files: ["howl.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "Original sound taken from Goonstation. Renamed to howl.ogg"
source: "https://github.com/goonstation/goonstation/blob/master/sound/voice/animal/werewolf_howl.ogg"
Binary file added Resources/Audio/_CD/Voice/Vulpkanin/dog_bark1.ogg
Binary file not shown.
Binary file added Resources/Audio/_CD/Voice/Vulpkanin/dog_bark2.ogg
Binary file not shown.
Binary file added Resources/Audio/_CD/Voice/Vulpkanin/dog_bark3.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/_CD/Voice/Vulpkanin/dog_whine.ogg
Binary file not shown.
Binary file added Resources/Audio/_CD/Voice/Vulpkanin/howl.ogg
Binary file not shown.
14 changes: 14 additions & 0 deletions Resources/Audio/_CD/Voice/Vulpkanin/license.txt
PursuitInAshes marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
dog_bark1.ogg licensed under CC0 1.0 taken from abhisheky948 at https://freesound.org/people/abhisheky948/sounds/625497/
dog_bark2.ogg licensed under CC0 1.0 taken from michael_grinnell at https://freesound.org/people/michael_grinnell/sounds/464400/
dog_bark3.ogg licensed under CC0 1.0 taken from Geoff-Bremner-Audio at https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/
dog_growl1.ogg licensed under CC0 1.0 taken from GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/
dog_growl2.ogg licensed under CC0 1.0 taken from GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/
dog_growl3.ogg licensed under CC0 1.0 taken from GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/
dog_growl4.ogg licensed under CC-BY-NC-SA 3.0 taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl1.ogg
dog_growl5.ogg licensed under CC-BY-NC-SA 3.0 taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl2.ogg
dog_growl6.ogg licensed under CC-BY-NC-SA 3.0 taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/master/sound/goonstation/voice/growl3.ogg
dog_snarl1.ogg licensed under CC0 1.0 taken from strongbot at https://freesound.org/people/strongbot/sounds/341090/
dog_snarl2.ogg licensed under CC0 1.0 taken from strongbot at https://freesound.org/people/strongbot/sounds/341090/
dog_snarl3.ogg licensed under CC0 1.0 taken from strongbot at https://freesound.org/people/strongbot/sounds/341090/
dog_whine.ogg licensed under CC SAMPLING+ 1.0 DEED taken from Sruddil at https://freesound.org/people/Sruddi1/sounds/34878/
howl.ogg taken from goonstation at https://github.com/goonstation/goonstation/blob/master/sound/voice/animal/werewolf_howl.ogg which is licensed under the CC BY-NC-SA 3.0.
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/_CD/chat/managers/chat_manager.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
chat-speech-verb-vulpkanin-1 = rawrs
chat-speech-verb-vulpkanin-2 = barks
chat-speech-verb-vulpkanin-3 = rurs
chat-speech-verb-vulpkanin-4 = yaps
chat-speech-verb-vulpkanin = Vulpkanin
230 changes: 230 additions & 0 deletions Resources/Locale/en-US/_CD/markings/vulpkanin.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,230 @@
marking-VulpEar-vulp = Vulpkanin ears (base)
marking-VulpEar-vulp-inner = Vulpkanin ears (inner)
marking-VulpEar = Vulpkanin

marking-VulpEarFade-vulp = Vulpkanin ears (base)
marking-VulpEarFade-vulp-fade = Vulpkanin ears (fade)
marking-VulpEarFade = Vulpkanin (fade)

marking-VulpEarSharp-vulp = Vulpkanin ears (base)
marking-VulpEarSharp-vulp-sharp = Vulpkanin ears (sharp)
marking-VulpEarSharp = Vulpkanin (sharp)

marking-VulpEarJackal-jackal = Jackal ears (base)
marking-VulpEarJackal-jackal-inner = Jackal ears (inner)
marking-VulpEarJackal = Vulpkanin Jackal

marking-VulpEarTerrier-terrier = Terrier ears (base)
marking-VulpEarTerrier-terrier-inner = Terrier ears (inner)
marking-VulpEarTerrier = Vulpkanin Terrier

marking-VulpEarWolf-wolf = Wolf ears (base)
marking-VulpEarWolf-wolf-inner = Wolf ears (inner)
marking-VulpEarWolf = Vulpkanin Wolf

marking-VulpEarFennec-fennec = Fennec ears (base)
marking-VulpEarFennec-fennec-inner = Fennec ears (inner)
marking-VulpEarFennec = Vulpkanin Fennec

marking-VulpEarFox-fox = Fox ears
marking-VulpEarFox = Vulpkanin Fox

marking-VulpEarOtie-otie = Otie ears (base)
marking-VulpEarOtie-otie-inner = Otie ears (inner)
marking-VulpEarOtie = Vulpkanin Otie

marking-VulpEarTajaran-msai = Tajaran ears (base)
marking-VulpEarTajaran-msai-inner = Tajaran ears (inner)
marking-VulpEarTajaran = Vulpkanin Tajaran

marking-VulpEarShock-shock = Shock ears
marking-VulpEarShock = Vulpkanin Shock

marking-VulpEarCoyote-coyote = Coyote ears
marking-VulpEarCoyote = Vulpkanin Coyote

marking-VulpEarDalmatian-dalmatian = Dalmatian ears
marking-VulpEarDalmatian = Vulpkanin Dalmatian


marking-VulpSnoutAlt-muzzle_alt = Muzzle
marking-VulpSnoutAlt-nose = Nose
marking-VulpSnoutAlt = Vulpkanin Muzzle 2

marking-VulpSnout-muzzle = Muzzle
marking-VulpSnout-nose = Nose
marking-VulpSnout = Vulpkanin Muzzle

marking-VulpSnoutSharp-muzzle_sharp = Muzzle
marking-VulpSnoutSharp-nose = Nose
marking-VulpSnoutSharp = Vulpkanin Muzzle (sharp)

marking-VulpSnoutFade-muzzle_fade = Muzzle
marking-VulpSnoutFade-nose = Nose
marking-VulpSnoutFade = Vulpkanin Muzzle (fade)

marking-VulpSnoutNose-nose = Nose
marking-VulpSnoutNose = Vulpkanin Nose

marking-VulpSnoutMask-mask = Mask
marking-VulpSnoutMask-nose = Nose
marking-VulpSnoutMask = Vulpkanin Mask

marking-VulpSnoutVulpine-vulpine = Vulpine (base)
marking-VulpSnoutVulpine-vulpine-lines = Vulpine (lines)
marking-VulpSnoutVulpine = Vulpkanin Vulpine

marking-VulpSnoutSwift-vulpine-lines = Swift
marking-VulpSnoutSwift = Vulpkanin Swift

marking-VulpSnoutBlaze-blaze = Blaze
marking-VulpSnoutBlaze = Vulpkanin Blaze

marking-VulpSnoutPatch-patch = Patch
marking-VulpSnoutPatch = Vulpkanin Patch


marking-VulpHeadTiger-tiger_head = Tiger stripes
marking-VulpHeadTiger = Vulpkanin Tiger stripes (head)

marking-VulpHeadTigerFace-tiger_face = Tiger stripes
marking-VulpHeadTigerFace = Vulpkanin Tiger stripes (face)

marking-VulpHeadSlash-slash = Slash
marking-VulpHeadSlash = Vulpkanin Slash


marking-VulpTail-vulp = Vulpkanin tail (base)
marking-VulpTail-vulp-fade = Vulpkanin tail (fade)
marking-VulpTail = Vulpkanin

marking-VulpTailTip-vulp = Vulpkanin tail (base)
marking-VulpTailTip-vulp-tip = Vulpkanin tail (tip)
marking-VulpTailTip = Vulpkanin (tip)

marking-VulpTailAlt-vulp_alt = Vulpkanin tail (base)
marking-VulpTailAlt-vulp_alt-fade = Vulpkanin tail (fade)
marking-VulpTailAlt = Vulpkanin (alt)

marking-VulpTailAltTip-vulp_alt = Vulpkanin tail (base)
marking-VulpTailAltTip-vulp_alt-tip = Vulpkanin tail (tip)
marking-VulpTailAltTip = Vulpkanin (alt, tip)

marking-VulpTailLong-long = Long tail (base)
marking-VulpTailLong-long-tip = Long tail (tip)
marking-VulpTailLong = Vulpkanin Long

marking-VulpTailFox-fox = Fox tail (base)
marking-VulpTailFox-fox-fade = Fox tail (fade)
marking-VulpTailFox = Vulpkanin Fox

marking-VulpTailFoxTip-fox = Fox tail (base)
marking-VulpTailFoxTip-fox-tip = Fox tail (fade)
marking-VulpTailFoxTip = Vulpkanin Fox (tip)

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

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

marking-VulpTailHusky-husky-inner = Husky tail (inner)
marking-VulpTailHusky-husky-outer = Husky tail (outer)
marking-VulpTailHusky = Vulpkanin Husky

marking-VulpTailHuskyAlt-husky = Husky tail
marking-VulpTailHuskyAlt = Vulpkanin Husky (alt)

marking-VulpTailFox2-fox2 = Fox tail
marking-VulpTailFox2 = Vulpkanin Fox 2

marking-VulpTailFox3-fox3 = Fox tail (base)
marking-VulpTailFox3-fox3-tip = Fox tail (tip)
marking-VulpTailFox3 = Vulpkanin Fox 3

marking-VulpTailFennec-fennec = Fennec tail
marking-VulpTailFennec = Vulpkanin Fennec

marking-VulpTailOtie-otie = Otie tail
marking-VulpTailOtie = Vulpkanin Otie

marking-VulpTailFluffy-fluffy = Fluffy tail
marking-VulpTailFluffy = Vulpkanin Fluffy

marking-VulpTailDalmation = Dalmation

marking-VulpTailCorgi = Corgi


marking-VulpBellyCrest-belly_crest = Belly
marking-VulpBellyCrest = Vulpkanin Belly Crest

marking-VulpBellyFull-belly_full = Belly
marking-VulpBellyFull = Vulpkanin Belly 1

marking-VulpBellyFox-belly_fox = Belly
marking-VulpBellyFox = Vulpkanin Belly 2


marking-VulpBodyPointsCrest-points_crest = Points (crest)
marking-VulpBodyPointsCrest = Vulpkanin Points (crest)

marking-VulpBodyPointsFade-points_fade = Vulpkanin Points (fade)
marking-VulpBodyPointsFade = Vulpkanin Points (fade)

marking-VulpBodyPointsSharp-points_sharp = Vulpkanin Points (sharp)
marking-VulpBodyPointsSharp = Vulpkanin Points (sharp)


marking-VulpPointsFeet-points_feet = Points Feet
marking-VulpPointsFeet = Vulpkanin Points Feet

marking-VulpPointsCrestLegs-points_crest-legs = Points (crest)
marking-VulpPointsCrestLegs = Vulpkanin Points Legs (crest)

marking-VulpPointsFadeLegs-points_fade-legs = Points (fade)
marking-VulpPointsFadeLegs = Vulpkanin Points Legs (fade)

marking-VulpPointsSharpLegs-points_sharp-legs = Points (sharp)
marking-VulpPointsSharpLegs = Vulpkanin Points Legs (sharp)


marking-VulpPointsHands-points_hands = Points Hands
marking-VulpPointsHands = Vulpkanin Points Hands

marking-VulpPointsCrestArms-points_crest-arms = Points (crest)
marking-VulpPointsCrestArms = Vulpkanin Points Arms (crest)

marking-VulpPointsFadeArms-points_fade-arms = Points (fade)
marking-VulpPointsFadeArms = Vulpkanin Points Arms (fade)

marking-VulpPointsSharpArms-points_sharp-arms = Points (sharp)
marking-VulpPointsSharpArms = Vulpkanin Points Arms (sharp)


marking-VulpHairAdhara = Adhara
marking-VulpHairAnita = Anita
marking-VulpHairApollo = Apollo
marking-VulpHairBelle = Belle
marking-VulpHairBraided = Braided Hair
marking-VulpHairBun = Bun
marking-VulpHairCleanCut = Clean Cut
marking-VulpHairCurl = Curl
marking-VulpHairHawk = Hawk
marking-VulpHairJagged = Jagged
marking-VulpHairJeremy = Jeremy
marking-VulpHairKajam = Kajam
marking-VulpHairKeid = Keid
marking-VulpHairKleeia = Kleeia
marking-VulpHairMizar = Mizar
marking-VulpHairPunkBraided = Punk Braided
marking-VulpHairRaine = Raine
marking-VulpHairRough = Rough
marking-VulpHairShort = Short Hair
marking-VulpHairShort2 = Short Hair 2
marking-VulpHairSpike = Spike

marking-VulpFacialHairRuff = Ruff
marking-VulpFacialHairElder = Elder
marking-VulpFacialHairElderChin = Elder Chin
marking-VulpFacialHairKita = Kita
3 changes: 2 additions & 1 deletion Resources/Locale/en-US/_CD/species/species.ftl
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
## Species Names

species-name-avali = Avali
species-name-avali = Avali
species-name-vulpkanin = Vulpkanin
13 changes: 13 additions & 0 deletions Resources/Prototypes/_CD/Actions/types.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Vulpkanin Tail Wagging
- type: entity
id: ActionToggleVulpakinWagging
name: action-name-toggle-wagging
description: action-description-toggle-wagging
noSpawn: true
components:
- type: InstantAction
icon: { sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon }
iconOn: { sprite: _CD/Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon }
itemIconStyle: NoItem
useDelay: 1 # Prevents Emote Spam
event: !type:ToggleActionEvent
Loading
Loading