From 64c00bc2ce5ecfe6e9f921e62d5072a0018b7929 Mon Sep 17 00:00:00 2001
From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Sat, 22 Nov 2025 10:57:10 +1300
Subject: [PATCH] Add vox hairstyle (catfish hair) (#40689)

* 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>
---
 .../Locale/en-US/accessories/vox-hair.ftl     |   5 +-
 .../Mobs/Customization/Markings/vox_hair.yml  |  16 +-
 .../Customization/vox_hair.rsi/catfish_s.png  | Bin 0 -> 1109 bytes
 .../Mobs/Customization/vox_hair.rsi/meta.json | 248 +++++++++---------
 4 files changed, 142 insertions(+), 127 deletions(-)
 create mode 100644 Resources/Textures/Mobs/Customization/vox_hair.rsi/catfish_s.png

diff --git a/Resources/Locale/en-US/accessories/vox-hair.ftl b/Resources/Locale/en-US/accessories/vox-hair.ftl
index e6e32e9c80..a0b2d74aec 100644
--- a/Resources/Locale/en-US/accessories/vox-hair.ftl
+++ b/Resources/Locale/en-US/accessories/vox-hair.ftl
@@ -5,7 +5,7 @@ marking-VoxHairEmperorQuills = Vox Emperor Quills
 marking-VoxHairFlowing = Vox Flowing
 marking-VoxHairHawk = Vox Hawk
 marking-VoxHairHorns = Vox Horns
-marking-VoxHairKeelQuills = Vox Keel Quills 
+marking-VoxHairKeelQuills = Vox Keel Quills
 marking-VoxHairKeetQuills = Vox Keet Quills
 marking-VoxHairKingly = Vox Kingly
 marking-VoxHairLongBraid = Vox Long Braid
@@ -25,4 +25,5 @@ marking-VoxHairSpotty = Vox Spotty Quills
 marking-VoxHairMadScientist = Vox Mad Scientist
 marking-VoxHairHedgehog = Vox Hedgehog
 marking-VoxHairBushy = Vox Bushy Quills
-marking-VoxHairSlick = Vox Slick Quills
\ No newline at end of file
+marking-VoxHairSlick = Vox Slick Quills
+marking-VoxHairCatfish = Vox Catfish
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
index 01d88513d8..e6e5026fc0 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
@@ -147,7 +147,7 @@
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: mange_s
-      
+
 - type: marking
   id: VoxHairMohawk
   bodyPart: Hair
@@ -267,7 +267,7 @@
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
       state: wise_braid_s
-      
+
 - type: marking
   id: VoxHairYasu
   bodyPart: Hair
@@ -276,4 +276,14 @@
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: yasu_s
\ No newline at end of file
+      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
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/catfish_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/catfish_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c241343113e1a71c320b53cbbb4e54cafb0e913
GIT binary patch
literal 1109
zcmV-b1giUqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(4@pEpRCt{2n!ii)P8`SId2)qX8X*}%g5cKOEUpd(C->qYT^wEf7xWLXe?S*;
z5Em!cAl-#@6uK28M}`!d5DQ7UXL;^O`>lNvZTj_jo_m2vlJh=4^0~`-?*k;|@jQ?5
zA4)0X_qJi1+oO~U`(LrGlxggF9y3i7Ns^$^Xo&m#ItT(dj#H}7GK@weW*7$2G)1je
z!+1Q#{{FtW4#N<wR;!f#A4MDT-~k|xW2mZ%BuSvED&jZ>0PyEkVHgI&Fhs3Z0|3~z
z4FH(UW(dO&hGCTMvv9U3rR?S91yK~iG|dHLVHhF^0%)3sy}i9ks(`<MdcBS)ig0mp
zA)fX7eUX&$cwEXpDcbP)`56FkdU~n=fa|)9zmayktpLFN{XKhqeJvGO8B|rpY&Ju;
z+r`7f1EMH`rfKMOI(U41M4F~(Hk+mTEIb6VEJK!M;=0{#EBWA8wb?Yj??Y8p^m;wu
z*N^~!UayBVO);O(#c(W2;RLKAAAHsDvW}t%wrz_^uU4zUwrxaFw9u|7r5ZmyJ+Ymg
zot1&RuFKxv-*IwsQfX2~qY-N~8c31^aU7%BY=U2Fng+|Vs!4$7d92D$Tp1{(EQ%tL
z08P^{pU;sbNp+t=$8nTxEq2yHDP_Lzi?JTZv6vgmj(?P02bAu;BKS<d{QEN%TB-v6
z?;*h7J||!9zVC}=av2J*1HJ=%g3HfG)9Lg-&;L0FgTbf&A^Orf;JfjeB>WW#I66A|
zH%nh4kw_#Gi9{liNF)-;cHz4(`LhDsw4JxPmGc3k(TL&KPORs7tX{8UHk%1qik}a_
zC%31Izysym;F_kv_kD0*9LG`eeirF-ZKHf<`5}a6vx&>gOWfYx0)Pk_0CsnGg=B>d
zCSq0K05F+MKnQ_h80dDpxVgDmDUPi3<HHB}J$B#sVVWl1-rjI^b%lPvkI7^L<PJpy
zL4e_KxNvV%;;HMp47p?<92|(i`8{3NaejV|>+5Urcl-ba)@+%7s0&z@rSK%!wvD_X
z!3}b!2q72_hsd%FXJ==^kn6hat4Uby<L>T`4TnP<A0HzK0^!FpMS{n=1T3pCJPBNe
z<`s}-83-XO&joCv0#@~rWf{UST<}BJb>Z9c3!{{>kCO1=wzy?kisLwnZQCG(!1sN0
zIvsI1!8A<}LQt>QODnRQpw((Ax~_u|B8FVA*F&e%5y9KG4aaembrtYi$9W~BX^O+c
zLxobxc-9Fa3&HcTTGhdcRsHAv(RCe`WeFAAw(ZTxWuE7;!C<iPt^JG;SryB^l#$AQ
zs|<Ob$MOOs=Q|0Jt9+SGr-c?sg{84SNq*XxuiIYYZkj*ce~CmQkw_#Gi9{liNF)-8
bqyl~dpY~9HYcvT~00000NkvXXu0mjfE_M*g

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
index 446bbd5c95..59791d521c 100644
--- a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
@@ -1,123 +1,127 @@
 {
-  "version": 1,
-  "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",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "bushy_s",
-      "directions": 4
-    },
-    {
-      "name": "crestedquills_s",
-      "directions": 4
-    },
-    {
-      "name": "emperorquills_s",
-      "directions": 4
-    },
-    {
-      "name": "keelquills_s",
-      "directions": 4
-    },
-    {
-      "name": "keetquills_s",
-      "directions": 4
-    },
-    {
-      "name": "shortquills_s",
-      "directions": 4
-    },
-    {
-      "name": "tielquills_s",
-      "directions": 4
-    },
-    {
-      "name": "kingly_s",
-      "directions": 4
-    },
-    {
-      "name": "afro_s",
-      "directions": 4
-    },
-    {
-      "name": "yasu_s",
-      "directions": 4
-    },
-    {
-      "name": "razor_s",
-      "directions": 4
-    },
-    {
-      "name": "razor_clipped_s",
-      "directions": 4
-    },
-    {
-      "name": "mad_scientist_s",
-      "directions": 4
-    },
-    {
-      "name": "mohawk_s",
-      "directions": 4
-    },
-    {
-      "name": "hedgehog_s",
-      "directions": 4
-    },
-    {
-      "name": "horns_s",
-      "directions": 4
-    },
-    {
-      "name": "nights_s",
-      "directions": 4
-    },
-    {
-      "name": "hawk_s",
-      "directions": 4
-    },
-    {
-      "name": "long_braid_s",
-      "directions": 4
-    },
-    {
-      "name": "short_braid_s",
-      "directions": 4
-    },
-    {
-      "name": "wise_braid_s",
-      "directions": 4
-    },
-    {
-      "name": "mange_s",
-      "directions": 4
-    },
-    {
-      "name": "ponytail_s",
-      "directions": 4
-    },
-    {
-      "name": "braid_s",
-      "directions": 4
-    },
-    {
-      "name": "surf_s",
-      "directions": 4
-    },
-    {
-      "name": "spotty_s",
-      "directions": 4
-    },
-    {
-      "name": "flowing_s",
-      "directions": 4
-    },
-    {
-      "name": "slick_s",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "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": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "catfish_s",
+            "directions": 4
+        },
+        {
+            "name": "bushy_s",
+            "directions": 4
+        },
+        {
+            "name": "crestedquills_s",
+            "directions": 4
+        },
+        {
+            "name": "emperorquills_s",
+            "directions": 4
+        },
+        {
+            "name": "keelquills_s",
+            "directions": 4
+        },
+        {
+            "name": "keetquills_s",
+            "directions": 4
+        },
+        {
+            "name": "shortquills_s",
+            "directions": 4
+        },
+        {
+            "name": "tielquills_s",
+            "directions": 4
+        },
+        {
+            "name": "kingly_s",
+            "directions": 4
+        },
+        {
+            "name": "afro_s",
+            "directions": 4
+        },
+        {
+            "name": "yasu_s",
+            "directions": 4
+        },
+        {
+            "name": "razor_s",
+            "directions": 4
+        },
+        {
+            "name": "razor_clipped_s",
+            "directions": 4
+        },
+        {
+            "name": "mad_scientist_s",
+            "directions": 4
+        },
+        {
+            "name": "mohawk_s",
+            "directions": 4
+        },
+        {
+            "name": "hedgehog_s",
+            "directions": 4
+        },
+        {
+            "name": "horns_s",
+            "directions": 4
+        },
+        {
+            "name": "nights_s",
+            "directions": 4
+        },
+        {
+            "name": "hawk_s",
+            "directions": 4
+        },
+        {
+            "name": "long_braid_s",
+            "directions": 4
+        },
+        {
+            "name": "short_braid_s",
+            "directions": 4
+        },
+        {
+            "name": "wise_braid_s",
+            "directions": 4
+        },
+        {
+            "name": "mange_s",
+            "directions": 4
+        },
+        {
+            "name": "ponytail_s",
+            "directions": 4
+        },
+        {
+            "name": "braid_s",
+            "directions": 4
+        },
+        {
+            "name": "surf_s",
+            "directions": 4
+        },
+        {
+            "name": "spotty_s",
+            "directions": 4
+        },
+        {
+            "name": "flowing_s",
+            "directions": 4
+        },
+        {
+            "name": "slick_s",
+            "directions": 4
+        }
+    ]
+}
-- 
2.52.0