Skip to content

Commit

Permalink
vulpkanin species (#11)
Browse files Browse the repository at this point in the history
* initial port

* masks and helmets

* wags his tail

* nukies + fixes

* fox ears inner layer

Co-Authored-By: Kr8art <[email protected]>

* smokables sprites

did you know that aquif is secretly a slug??

---------

Co-authored-by: Kr8art <[email protected]>
  • Loading branch information
MilonPL and Kr8art authored Jan 6, 2025
1 parent a0a1814 commit fd96af8
Show file tree
Hide file tree
Showing 379 changed files with 4,262 additions and 75 deletions.
4 changes: 4 additions & 0 deletions Resources/Audio/_Emberfall/Voice/Talk/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- files: ["vulp.ogg, vulp_ask.ogg, vulp_exclaim.ogg"]
license: "CC-BY-NC-SA-3.0"
copyright: "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"
source: "https://github.com/DeltaV-Station/Delta-v/commit/65d35d0b3c20aa4e8a0e749a4de8392e53051e86"
Binary file added Resources/Audio/_Emberfall/Voice/Talk/vulp.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
50 changes: 50 additions & 0 deletions Resources/Audio/_Emberfall/Voice/Vulpkanin/attributions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
- files: ["dog_bark1.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 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 not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/_emberfall/chat/emotes.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
chat-emote-name-bark = Bark
chat-emote-name-snarl = Snarl
chat-emote-name-whine = Whine
chat-emote-name-howl = Howl
chat-emote-name-growl = Growl
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
231 changes: 231 additions & 0 deletions Resources/Locale/en-US/_emberfall/markings/vulpkanin.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
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 (base)
marking-VulpEarFox-fox-inner = Fox ears (inner)
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
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_emberfall/species/species.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
species-name-vulpkanin = Vulpkanin
28 changes: 28 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,26 @@
head:
- state: equipped-head-light
shader: unshaded
head-vox: # Emberfall - vox state
- state: equipped-head-light-vox
shader: unshaded
head-vulpkanin: # Emberfall - vulp state
- state: equipped-head-light-vulpkanin
shader: unshaded
- type: Clothing
clothingVisuals:
head:
- state: equipped-head
- state: equipped-head-unshaded
shader: unshaded
head-vox: # Emberfall - vox state (why isnt this upstream??)
- state: equipped-head-vox
- state: equipped-head-unshaded-vox
shader: unshaded
head-vulpkanin: # Emberfall - vulp state
- state: equipped-head-vulpkanin
- state: equipped-head-unshaded-vulpkanin
shader: unshaded
- type: PointLight
color: "#adffe6"
- type: PressureProtection
Expand Down Expand Up @@ -106,12 +120,26 @@
head:
- state: equipped-head-light
shader: unshaded
head-vox: # Emberfall - vox state
- state: equipped-head-light-vox
shader: unshaded
head-vulpkanin: # Emberfall - vulp state
- state: equipped-head-light-vulpkanin
shader: unshaded
- type: Clothing
clothingVisuals:
head:
- state: equipped-head
- state: equipped-head-unshaded
shader: unshaded
head-vox: # Emberfall - vox state
- state: equipped-head-vox
- state: equipped-head-unshaded-vox
shader: unshaded
head-vulpkanin: # Emberfall - vulp state
- state: equipped-head-vulpkanin
- state: equipped-head-unshaded-vulpkanin
shader: unshaded
- type: PointLight
radius: 6
- type: PressureProtection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@
- type: marking
id: TattooEyeRight
bodyPart: Eyes
markingCategory: Head
speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
markingCategory: [Head]
speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Vulpkanin] # Emberfall - Add vulpkanin
coloring:
default:
type:
Expand All @@ -128,7 +128,7 @@
id: TattooEyeLeft
bodyPart: Eyes
markingCategory: Head
speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf]
speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Vulpkanin] # Emberfall - Add vulpkanin
coloring:
default:
type:
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/_Emberfall/Actions/types.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: entity
id: ActionToggleVulpakinWagging
name: action-name-toggle-wagging
description: action-description-toggle-wagging
categories: [ HideSpawnMenu ]
components:
- type: InstantAction
icon: { sprite: _Emberfall/Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon }
iconOn: { sprite: _Emberfall/Mobs/Customization/Vulpkanin/tail_markings.rsi, state: tail-wag-icon }
itemIconStyle: NoItem
useDelay: 1 # Prevents Emote Spam
event: !type:ToggleActionEvent
Loading

0 comments on commit fd96af8

Please sign in to comment.