tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add vox hairstyle (catfish hair) (#40689)

Browse Source 
* add vox catfish

Co-authored-by: Cadunkus <140308611+Cadunkus@users.noreply.github.com>

* change indents from 2 to 4 in meta.json

* update sprite

Co-authored-by: Cadunkus <140308611+Cadunkus@users.noreply.github.com>

---------

Co-authored-by: Cadunkus <140308611+Cadunkus@users.noreply.github.com>
This commit is contained in:
K-Dynamic
2025-11-22 10:57:10 +13:00
committed by GitHub
parent 83b046ce98
commit 64c00bc2ce
4 changed files with 141 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Resources/Locale/en-US/accessories/vox-hair.ftl
View File

@@ -5,7 +5,7 @@ marking-VoxHairEmperorQuills = Vox Emperor Quills
marking-VoxHairFlowing = Vox Flowing marking-VoxHairFlowing = Vox Flowing
marking-VoxHairHawk = Vox Hawk marking-VoxHairHawk = Vox Hawk
marking-VoxHairHorns = Vox Horns marking-VoxHairHorns = Vox Horns
marking-VoxHairKeelQuills = Vox Keel Quills marking-VoxHairKeelQuills = Vox Keel Quills
marking-VoxHairKeetQuills = Vox Keet Quills marking-VoxHairKeetQuills = Vox Keet Quills
marking-VoxHairKingly = Vox Kingly marking-VoxHairKingly = Vox Kingly
marking-VoxHairLongBraid = Vox Long Braid marking-VoxHairLongBraid = Vox Long Braid
@@ -25,4 +25,5 @@ marking-VoxHairSpotty = Vox Spotty Quills
marking-VoxHairMadScientist = Vox Mad Scientist marking-VoxHairMadScientist = Vox Mad Scientist
marking-VoxHairHedgehog = Vox Hedgehog marking-VoxHairHedgehog = Vox Hedgehog
marking-VoxHairBushy = Vox Bushy Quills marking-VoxHairBushy = Vox Bushy Quills
marking-VoxHairSlick = Vox Slick Quills marking-VoxHairSlick = Vox Slick Quills
marking-VoxHairCatfish = Vox Catfish

16
Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
View File

@@ -147,7 +147,7 @@
sprites: sprites:
- sprite: Mobs/Customization/vox_hair.rsi - sprite: Mobs/Customization/vox_hair.rsi
state: mange_s state: mange_s
- type: marking - type: marking
id: VoxHairMohawk id: VoxHairMohawk
bodyPart: Hair bodyPart: Hair
@@ -267,7 +267,7 @@
sprites: sprites:
- sprite: Mobs/Customization/vox_hair.rsi - sprite: Mobs/Customization/vox_hair.rsi
state: wise_braid_s state: wise_braid_s
- type: marking - type: marking
id: VoxHairYasu id: VoxHairYasu
bodyPart: Hair bodyPart: Hair
@@ -276,4 +276,14 @@
speciesRestriction: [Vox] speciesRestriction: [Vox]
sprites: sprites:
- sprite: Mobs/Customization/vox_hair.rsi - sprite: Mobs/Customization/vox_hair.rsi
state: yasu_s state: yasu_s
- type: marking
id: VoxHairCatfish
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
state: catfish_s

BIN
Resources/Textures/Mobs/Customization/vox_hair.rsi/catfish_s.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

246
Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
View File

@@ -1,123 +1,127 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0", "license": "CC-BY-SA-3.0",
"copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/dcd1f5d88a8c5ba9634fc3fce67a76ada45f71dc/icons/mob/sprite_accessories/vox/vox_hair.dmi and greyscaled. wise_braid_s modified from braid_s by Flareguy. mad_scientist_s modified from keelquills_s by Flareguy. spotty_s, bushy_s, hedgehog_s, and slick_s by Flareguy", "copyright": "Taken from Paradise Station at https://github.com/ParadiseSS13/Paradise/blob/dcd1f5d88a8c5ba9634fc3fce67a76ada45f71dc/icons/mob/sprite_accessories/vox/vox_hair.dmi and greyscaled | wise_braid_s modified from braid_s by Flareguy (github) | mad_scientist_s modified from keelquills_s by Flareguy | spotty_s, bushy_s, hedgehog_s, and slick_s by Flareguy | catfish_s by Cadunkus (github)",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
},
"states": [
{
"name": "bushy_s",
"directions": 4
}, },
{ "states": [
"name": "crestedquills_s", {
"directions": 4 "name": "catfish_s",
}, "directions": 4
{ },
"name": "emperorquills_s", {
"directions": 4 "name": "bushy_s",
}, "directions": 4
{ },
"name": "keelquills_s", {
"directions": 4 "name": "crestedquills_s",
}, "directions": 4
{ },
"name": "keetquills_s", {
"directions": 4 "name": "emperorquills_s",
}, "directions": 4
{ },
"name": "shortquills_s", {
"directions": 4 "name": "keelquills_s",
}, "directions": 4
{ },
"name": "tielquills_s", {
"directions": 4 "name": "keetquills_s",
}, "directions": 4
{ },
"name": "kingly_s", {
"directions": 4 "name": "shortquills_s",
}, "directions": 4
{ },
"name": "afro_s", {
"directions": 4 "name": "tielquills_s",
}, "directions": 4
{ },
"name": "yasu_s", {
"directions": 4 "name": "kingly_s",
}, "directions": 4
{ },
"name": "razor_s", {
"directions": 4 "name": "afro_s",
}, "directions": 4
{ },
"name": "razor_clipped_s", {
"directions": 4 "name": "yasu_s",
}, "directions": 4
{ },
"name": "mad_scientist_s", {
"directions": 4 "name": "razor_s",
}, "directions": 4
{ },
"name": "mohawk_s", {
"directions": 4 "name": "razor_clipped_s",
}, "directions": 4
{ },
"name": "hedgehog_s", {
"directions": 4 "name": "mad_scientist_s",
}, "directions": 4
{ },
"name": "horns_s", {
"directions": 4 "name": "mohawk_s",
}, "directions": 4
{ },
"name": "nights_s", {
"directions": 4 "name": "hedgehog_s",
}, "directions": 4
{ },
"name": "hawk_s", {
"directions": 4 "name": "horns_s",
}, "directions": 4
{ },
"name": "long_braid_s", {
"directions": 4 "name": "nights_s",
}, "directions": 4
{ },
"name": "short_braid_s", {
"directions": 4 "name": "hawk_s",
}, "directions": 4
{ },
"name": "wise_braid_s", {
"directions": 4 "name": "long_braid_s",
}, "directions": 4
{ },
"name": "mange_s", {
"directions": 4 "name": "short_braid_s",
}, "directions": 4
{ },
"name": "ponytail_s", {
"directions": 4 "name": "wise_braid_s",
}, "directions": 4
{ },
"name": "braid_s", {
"directions": 4 "name": "mange_s",
}, "directions": 4
{ },
"name": "surf_s", {
"directions": 4 "name": "ponytail_s",
}, "directions": 4
{ },
"name": "spotty_s", {
"directions": 4 "name": "braid_s",
}, "directions": 4
{ },
"name": "flowing_s", {
"directions": 4 "name": "surf_s",
}, "directions": 4
{ },
"name": "slick_s", {
"directions": 4 "name": "spotty_s",
} "directions": 4
] },
} {
"name": "flowing_s",
"directions": 4
},
{
"name": "slick_s",
"directions": 4
}
]
}