From 94c746abe9d3788ad63db46d8771e8b38e221b88 Mon Sep 17 00:00:00 2001
From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Sun, 18 Aug 2024 22:32:15 -0500
Subject: [PATCH] Minor vox customization update: new hairstyles & facial hair
 (#30815)

* new vox customization stuff

* tests fix
---
 .../en-US/accessories/vox-facial-hair.ftl     |   2 ++
 .../Locale/en-US/accessories/vox-hair.ftl     |   2 ++
 .../Markings/vox_facial_hair.yml              |  19 +++++++++++++++++
 .../Mobs/Customization/Markings/vox_hair.yml  |  20 +++++++++++++++++-
 .../vox_facial_hair.rsi/manesmall_s.png       | Bin 0 -> 396 bytes
 .../vox_facial_hair.rsi/meta.json             |  10 ++++++++-
 .../vox_facial_hair.rsi/tuft_s.png            | Bin 0 -> 165 bytes
 .../Mobs/Customization/vox_hair.rsi/meta.json |  10 ++++++++-
 .../Customization/vox_hair.rsi/spotty_s.png   | Bin 0 -> 178 bytes
 .../vox_hair.rsi/wise_braid_s.png             | Bin 0 -> 1064 bytes
 10 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/manesmall_s.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/tuft_s.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_hair.rsi/spotty_s.png
 create mode 100644 Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png

diff --git a/Resources/Locale/en-US/accessories/vox-facial-hair.ftl b/Resources/Locale/en-US/accessories/vox-facial-hair.ftl
index a63b0b5a39..884edbb202 100644
--- a/Resources/Locale/en-US/accessories/vox-facial-hair.ftl
+++ b/Resources/Locale/en-US/accessories/vox-facial-hair.ftl
@@ -3,3 +3,5 @@ marking-VoxFacialHairColonel = Vox Moustache (Colonel)
 marking-VoxFacialHairFu = Vox Moustache (Quill Fu)
 marking-VoxFacialHairNeck = Vox Beard (Neck Quills)
 marking-VoxFacialHairMane = Vox Beard (Mane)
+marking-VoxFacialHairManeSmall = Vox Beard (Small Mane)
+marking-VoxFacialHairTufts = Vox Sideburns (Tufts)
diff --git a/Resources/Locale/en-US/accessories/vox-hair.ftl b/Resources/Locale/en-US/accessories/vox-hair.ftl
index 94483fd6a6..0e11e1a9b8 100644
--- a/Resources/Locale/en-US/accessories/vox-hair.ftl
+++ b/Resources/Locale/en-US/accessories/vox-hair.ftl
@@ -20,3 +20,5 @@ marking-VoxHairShortQuills = Vox Short Quills
 marking-VoxHairSurf = Vox Surf
 marking-VoxHairTielQuills = Vox Tiel Quills
 marking-VoxHairYasu = Vox Yasuhiro
+marking-VoxHairWiseBraid = Vox Wise Braids
+marking-VoxHairSpotty = Vox Spotty Hair
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml
index 6ec5f8999a..066d197223 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml
@@ -34,6 +34,15 @@
     - sprite: Mobs/Customization/vox_facial_hair.rsi
       state: mane_s
 
+- type: marking
+  id: VoxFacialHairManeSmall
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_facial_hair.rsi
+      state: manesmall_s
+
 - type: marking
   id: VoxFacialHairNeck
   bodyPart: FacialHair
@@ -42,3 +51,13 @@
   sprites:
     - sprite: Mobs/Customization/vox_facial_hair.rsi
       state: neck_s
+
+- type: marking
+  id: VoxFacialHairTufts
+  bodyPart: FacialHair
+  markingCategory: FacialHair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_facial_hair.rsi
+      state: tuft_s
+
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
index 9a847b40a9..8748b3a093 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
@@ -95,7 +95,7 @@
   speciesRestriction: [Vox]
   sprites:
     - sprite: Mobs/Customization/vox_hair.rsi
-      state: afro_s
+      state: long_braid_s
 
 - type: marking
   id: VoxHairMange
@@ -169,6 +169,15 @@
     - sprite: Mobs/Customization/vox_hair.rsi
       state: shortquills_s
 
+- type: marking
+  id: VoxHairSpotty
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: spotty_s
+
 - type: marking
   id: VoxHairSurf
   bodyPart: Hair
@@ -187,6 +196,15 @@
     - sprite: Mobs/Customization/vox_hair.rsi
       state: tielquills_s
 
+- type: marking
+  id: VoxHairWiseBraid
+  bodyPart: Hair
+  markingCategory: Hair
+  speciesRestriction: [Vox]
+  sprites:
+    - sprite: Mobs/Customization/vox_hair.rsi
+      state: wise_braid_s
+      
 - type: marking
   id: VoxHairYasu
   bodyPart: Hair
diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/manesmall_s.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/manesmall_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c1756e96bb8c11b89b407d46d781fe399f3af77
GIT binary patch
literal 396
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z-8@|!Ln`LH
zy|uQ##Xx}dL%CRZx5L8=Dp&tJT<m#ahZf7Wb=%VOJe+qt{_#R~cCGzkp+oyJHD_o#
zxVX5iPmpM<c>3$L_=l+v=X5hHaA)99d~&wz+|j)g1e|=jcUjx7O_pd|QJI;y?$1&V
z!J9k+6Yp~Fnzgn$j^EDK-ilG)oomK2&TCO$YWvr{o>uLu5|wRu-k4#*y4Ugl-wQ@L
zhlYN*cUYqNYvsB(t^1mH34J;F|LE`k?@KCQsx0v~*!$0H-)}hqK?JzS9Gj(*<-I0T
zO2l>IcFmnaP92Xem>6ztvz=S}%Iz)VwA7s?Enmyuy<1bPm-m$E`L0XLyRR<K?}_X>
zVaxgQ!Pggi*$Z+-=V+<e-oLe>p!`|fF=eaEx6Jle3tc*BUnk$xk#bZ0%jIu#+;<i4
k5BMgV01N^!c>hHBVRc$1!^YC*z~E)@boFyt=akR{0H`&udjJ3c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/meta.json
index 64eebb8883..3516e2cbe6 100644
--- a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/0f9ef5962f4422836c0a42f289fb24d018918cbc/icons/mob/sprite_accessories/vox/vox_facial_hair.dmi and greyscaled",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/0f9ef5962f4422836c0a42f289fb24d018918cbc/icons/mob/sprite_accessories/vox/vox_facial_hair.dmi and greyscaled. manesmall_s modified by Flareguy from mane_s, tuft_s made by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -26,6 +26,14 @@
     {
       "name": "mane_s",
       "directions": 4
+    },
+    {
+      "name": "manesmall_s",
+      "directions": 4
+    },
+    {
+      "name": "tuft_s",
+      "directions": 4
     }
   ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/tuft_s.png b/Resources/Textures/Mobs/Customization/vox_facial_hair.rsi/tuft_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0a2760d299720b2e9ea2631a421f0babb6fd71b
GIT binary patch
literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|;yqm)Ln`LH
zy|tUS!GMSLz#IDzwU07+&aR9~Li1T#O0M5LTl_v8Xx<zl!MCUCwnV*7^vkzbwJ|nN
zeEsK?AkYL5_%QcOj^M>_>p$;Ly>sa`@0kVNU}2k$40j_OR!6Se(G22yy85}Sb4q9e
E02ur@bN~PV

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 9b08260bd6..99004ffaf8 100644
--- a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "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",
+  "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, spotty by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -75,6 +75,10 @@
       "name": "short_braid_s",
       "directions": 4
     },
+    {
+      "name": "wise_braid_s",
+      "directions": 4
+    },
     {
       "name": "mange_s",
       "directions": 4
@@ -91,6 +95,10 @@
       "name": "surf_s",
       "directions": 4
     },
+    {
+      "name": "spotty_s",
+      "directions": 4
+    },
     {
       "name": "flowing_s",
       "directions": 4
diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/spotty_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/spotty_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..f483e90475bf3923667384bcd355c076f019e7a8
GIT binary patch
literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|ay(reLn`LH
zy=BRFK!Jzlz@Pt}HEJtgEQ%3|^PahK#Rn;`>e~+{8y>4G^SjdT*{-pEeqKe_vmILd
ztZv->8*8`XPQEld&=>}WhNNP%aKpu`*L*$os<rcr(=p}MPTTVABv;%`2Fo*CxWV|X
VI40P2bFVl^z|+;wWt~$(696TXLTdm3

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/wise_braid_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..d35ddc4842baa3ee2997cc43f55cdb58fad12fa2
GIT binary patch
literal 1064
zcmV+@1lRkCP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&;z>k7RCt{2n=y}@FcioCG@Xc0M5PEKF`+7wm(xWVt1f(SFIC4ABN79XB@T74
z5aPDV9j?!X9=X^Yq*d$RlHeG>=g0E{{9XWu!(j{OT)lSuPs?xHRt<&HC$--~KIdF<
z&Q)F4`ukk@?`%4A&Q;Si;GC;0%RB(cvdkN{&r!lwJ^&<1GWuLyKIdGOWqDP=T1t?7
zy7J@+ZQE*3px<rA^-Md~b*&DE!`1$ET`K@E>1#t>*QzKABuN4x1d=2{5CrJDP9F;)
zz!<ZVZPbyhN^ZYYUsGsIa`zwz;QKxv9v*N$pYincgs$rV073}Z$Tx}sB-j+&{x;(Y
zAy5<rnx+9`3{BIZC<;AsTlq!?h@uE#7+zi9oO2b1A)+WUR=`F+!5BjnMJS2_Q51nO
zrhl`QZ)5<9yyx@z)qeCl^<N4ak0#r7-N*yFuG2=bm2YGKAp}mRlLuUm^3;AhoxGtt
zF2SeI3{pz%?tR~nJfQD;y)2}Z`1F}wAM__yfhx~)m8L0nyWNZP+O}0yRcS*lNm-U^
z82KL`AF<tT^<ALvd&F@(x+5Hq$K`?`acy#IOdf!~qQ~RW^L-xxMjikFzVGWv+jxML
z0RW(?Dy#M-`1+;L-^tB~F@TPz`d`D^0BM?9wJ*UirqEUX-2;X$Zxe&84e;^!!K!@;
zrXFf`yPd}vn~X<GK7?r~%IA4Lc^9DewcZ8x(dNatQ|~5I{T9J=Vr#w(ts&of3H)pP
z_Xcn{91e%W;cz${j{lN3@0?7%f3LD5b3xWy<;^~Es0<}5XkTuaK3|IAm}Ob2AP7(t
zzcxST%A0i(=Ug$yK-pRVdXL_8KYlJW`C&4YbeUrW>l1#TybuCm7_OERxI~`kN=i9O
zi_bB_`#HkN`hDMP4=}ACSc1B)Ro8XcZnx<Bex#Ev)+I8-t1hJk@a%@Snmq7ad_jBv
zQc8qjs8eD$+Z2uC7y$GY_!E$9(q#_T1_*)x0Q7p3Qi3sdF<-C-d7dlAo-@W-mU(nH
zAl+;*HUPOl<>CoaAdcgk7$MJd702<5fJe7t+ht(w0YV7e-H%I9$Ovhgu4)8I&re1B
zyZgi{Cuj{>bsueXS=y9>YZgqlZL6jXOr>*_7F#7dHO#|t&ef$H+-kYGSH|8)o6!X^
zsb{oiIOsmwOcqVPrDW9vDvq4eZD<@D1I)S&ervvaQxTUjwrZh7RaK(^OawuIZ_W2v
z&mps)1BNdm#Nlx8=;3G$q?D5nTvNI%&OX{)T=#zytLbT4Ed8gMQ!s7Jt^XJ?2Uj5B
ia5x+ehr{7;81Vz{1<^;#ew8x-0000<MNUMnLSTX(#OtpB

literal 0
HcmV?d00001

-- 
2.51.2