From 3d0485fe5b8f15294d6153f143724356eb8ac885 Mon Sep 17 00:00:00 2001 From: KingFroozy <140668342+KingFroozy@users.noreply.github.com> Date: Tue, 29 Apr 2025 00:00:10 +0300 Subject: [PATCH] Shoulder-length hairstyles resprite (#37000) * sprite * final * final (final fr) --- .../Locale/en-US/accessories/human-hair.ftl | 4 ++-- .../Mobs/Customization/Markings/human_hair.yml | 4 ++-- .../Mobs/Customization/human_hair.rsi/b.png | Bin 666 -> 676 bytes .../Mobs/Customization/human_hair.rsi/b_alt.png | Bin 0 -> 703 bytes .../Mobs/Customization/human_hair.rsi/meta.json | 10 +++++----- .../human_hair.rsi/shoulderlengthovereye.png | Bin 598 -> 0 bytes 6 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/b_alt.png delete mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/shoulderlengthovereye.png diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl index af80aaef5c..0ce0e27be7 100644 --- a/Resources/Locale/en-US/accessories/human-hair.ftl +++ b/Resources/Locale/en-US/accessories/human-hair.ftl @@ -163,7 +163,7 @@ marking-HumanHairShorthairg = Short Hair 7 marking-HumanHair80s = Short Hair 80s marking-HumanHairRosa = Short Hair Rosa marking-HumanHairB = Shoulder-length Hair -marking-HumanHairShoulderLengthOverEye = Shoulder-length Over Eye +marking-HumanHairBAlt = Shoulder-length Hair (Over eye) marking-HumanHairSidecut = Sidecut marking-HumanHairSkinhead = Skinhead marking-HumanHairProtagonist = Slightly Long Hair @@ -192,7 +192,7 @@ marking-HumanHairUpdo = Updo marking-HumanHairVlong = Very Long Hair marking-HumanHairLongest = Very Long Hair 2 marking-HumanHairLongest2 = Very Long Over Eye -marking-HumanHairVeryshortovereyealternate = Very Short Over Eye +marking-HumanHairVeryshortovereyealternate = Very Short (Over Eye) marking-HumanHairVlongfringe = Very Long with Fringe marking-HumanHairVolaju = Volaju marking-HumanHairWisp = Wisp diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml index af0674eb76..0af782a6a5 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml @@ -1189,12 +1189,12 @@ - sprite: Mobs/Customization/human_hair.rsi state: swept2 - type: marking - id: HumanHairShoulderLengthOverEye + id: HumanHairBAlt bodyPart: Hair markingCategory: Hair sprites: - sprite: Mobs/Customization/human_hair.rsi - state: shoulderlengthovereye + state: b_alt - type: marking id: HumanHairThinning bodyPart: Hair diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/b.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/b.png index f5640bd418a75f08aa3d440df8fc78387feb136a..2093bb8fd43cd07bdcb332ebac8042cc3a3f0487 100644 GIT binary patch delta 653 zcmV;80&@MD1*8R#BYyw^b5ch_0Itp)=>Px%UP(kjRCt{2nz4?fFc5}+PS#0faDqXg>WQlsOW{b!Xuq_lwAKec=GwU3Zk^T|)>r*od_C7oqY zBmwd~hqV@Yp5yR#$jYM3y!Vgq!qbSw@pv43)>_ZrUjj)0=NteG-uJR7v$80&$uS@T zA^ZA-Y~(;51Ap4KWjR`dzVFcCe#benkp!4i+5Dxye_X7!XxkRfIkasHYc0Dik^p5< z&ZhaZ`>#?}RW_9c!2Ri0RTcL&G{$u3fbXtn_gU8jVagj@4y=XHOKdV!E{7M+D?>oAHWz-8;u)dy-}&a0$4MDrjOotjGql!l&V8}o`>4g! ze%n(qgnt+*B{FgbjH|MJ8$11hd;M`P1}dy+Fq{(zwyx_(=c_;Q3Y4MkvM95+d}0000!*iLD2y zgv88V^pO0?U)0k2AtMsZ5{bmI-%q;Ov+BoxvmeJ_Q3RaN=We-NR@dvb!n#_ms`-3Q z-NgvdG);$`bzML69)6!elxuKs9)&M)nvLrhvzp)O~P3+qQq09ptD;6i{r1?*Y#n+bSjGj9U$1Qv_MlK^>!dcEClzE1!EhmyS7n`-f~b3y>l zp$>cxAP7j2|9@P+0Z4)(`jU97FXRXbAOOJiY6XuwO;2D5ye^I@VodpTU&u~Z>pf-y zm;~P*V{*W^gJJ3m0vOgxiU|jlq$YzU9Kf(vQcO6YBsCc<;Q)rUl48OEC8^0^2?sE& zl@t>WC`nBQOE`dGt)!T6KuKycSi%7eYw3Id`i1ye`+sswZp0uzRz0J@G)Aeu0GcEF z{r+EbQh+e+X)6h7i(EHIPp6Y_Z?F%%9*{tz(%S{n4bn3S?~q{n1_%MtkwuFd1oX`d zSe0eYOS@ioi>)p&6M&AasLsAS2JBEw`aQBfLlXggA3tx)kCF9mO=bdgI~s2AoCz8O zk9|A?nR^kC+AN|30aI9(Gcq5bhao;S7|~Z}UmasJ4Cy^42Uy6;7h6B8q z&E?*3KrTvo)fo=(Vm6n1!vVP{C>j?hOazqLf#i;Q%jYbGbJhkc(1Yb%q1H cn9b$h2de~;P%7(d{r~^~07*qoM6N<$f>gR36951J diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/b_alt.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/b_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..9f7ddd1c924ea9e0855184803e3a163e215c4c95 GIT binary patch literal 703 zcmV;w0zmzVP)Px%c}YY;RCt{2nlW#rFc5_wr*zqRB}?v)ZY%obPaO6Av$Vc`Yqoc_9oJhza-FNW zVq;!WF!PD%-_HG~iVfIQDb)bNe^0XKL6a3&aI@cQR<9C{S$y6ynL7=xlH(6;U1_f$v* z)YrOmqEbq-Ia0JzWo z+jfHv=-T8pz?G<_ zl$dJkYj~03Gu+@GX@``@Ng1G&>Q1K zAr|Gi%;sXC67(4K&j|qN4@<;8AmJ#_Wp=q-CS#$p%6mY+2$f|PvqD?_c<*~Hogf2l zw_D%(gI^<{S$u`=ZoD5$2qXg@xjqVZn^u5g)0Zi291M2*L&#&0VHk#C l7=~dOhG7_nVHjpt`~{3edGuPx%5J^NqRCt{2+OcipFcb#hUukW(Gzf42Lp=vjtpNmN18?LF0#2a;Sh-Ve5Fnu1 zwV5KJAS<@+$U7+k@_&tB88Y8{q^aT&px>>?d8lpMAf<%&9#TpurLf&@vwkZ_*L6WD z1#2y&lmLLk;gB`{OX>sDiB9JJQ(-rwC%l~jPXZ9^PXYdzeL zv(a_kqD3&qggE2CM-k#@DJ6_C$>S##Kx++aEwt8f&cS<+s;Y_*!rOQ@mLi0>`>d3j z{r+zx6~H++Tx0S8u-olki=uc-9zBEi{!8LYsqEq>?*V<^KfJ%$Y+kb>$Q(N+JWl*s zY;%$dFdj6{e$=*Y$O#~awHAHf!#Rh(?_sUY{;i|}#H6RmM@`c#`YLRirg*dpfREW< zdi+1`vN^kOj`+%(UWtf^h=_=Yh=_=YXx4u@AK<-Tr!n!#7!!mLn8xs|VKXPWH)xCr zu{9n$!cs~IAy#ROOp_nSvUq#k7!&HchI0-|si9k}lp2b#G$91``~5L?h{v(ib)8&< zJ9@yS(c~U?RK2Tlq#tJkCym2 z`L#B|s4UCV^j_-UFnI->&*$O#9dCdsDdk;Esj~Kf=)03&UEE<~KYp$A0MCri1^kql kh=_=Yh=_=Yh=_i)cZDNFTGPI(r2qf`07*qoM6N<$f=CS*QUCw| -- 2.51.2