From a371de16d3f0a735f8ac44c4606e6bbae9e7379d Mon Sep 17 00:00:00 2001 From: Futuristic-OK <141568243+Futuristic-OK@users.noreply.github.com> Date: Sat, 28 Sep 2024 12:07:51 +0600 Subject: [PATCH] Some new hairstyles! (#31010) * Add files via upload png of hairs * Update meta.json hairs meta * Update human_hair.yml hairs yml * Update human-hair.ftl hairs named * second try * fix meta * Add files via upload * Add files via upload fix again * Add files via upload again again * Add files via upload again again fix again * Add files via upload i hate yourself * Add files via upload fixxxxx! * Add files via upload aaagaaaaiiin * dd dddddd * Add files via upload fix again * Add files via upload ddsdssddssddsdsds * Update human-hair.ftl * Update human-hair.ftl screw this im just going to update it myself webops time * Update human_hair.yml * Update meta.json * Rename capsdaughter.png to longbow.png * Rename artist.png to shaped.png --------- Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> --- .../Locale/en-US/accessories/human-hair.ftl | 2 ++ .../Mobs/Customization/Markings/human_hair.yml | 14 ++++++++++++++ .../Customization/human_hair.rsi/longbow.png | Bin 0 -> 2061 bytes .../Mobs/Customization/human_hair.rsi/meta.json | 8 ++++++++ .../Mobs/Customization/human_hair.rsi/shaped.png | Bin 0 -> 437 bytes 5 files changed, 24 insertions(+) create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/longbow.png create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/shaped.png diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl index 9575cd5c2f..58314f9bb2 100644 --- a/Resources/Locale/en-US/accessories/human-hair.ftl +++ b/Resources/Locale/en-US/accessories/human-hair.ftl @@ -97,6 +97,7 @@ marking-HumanHairJensen = Jensen Hair marking-HumanHairJoestar = Joestar marking-HumanHairKeanu = Keanu Hair marking-HumanHairKusanagi = Kusanagi Hair +marking-HumanHairLongBow = Long Bow marking-HumanHairLong = Long Hair 1 marking-HumanHairLong2 = Long Hair 2 marking-HumanHairLong3 = Long Hair 3 @@ -147,6 +148,7 @@ marking-HumanHairSpikyponytail = Ponytail (Spiky) marking-HumanHairPoofy = Poofy marking-HumanHairQuiff = Quiff marking-HumanHairRonin = Ronin +marking-HumanHairShaped = Shaped marking-HumanHairShaved = Shaved marking-HumanHairShavedpart = Shaved Part marking-HumanHairShortbangs = Short Bangs diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml index bd7bed25f6..578c6837c0 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml @@ -1363,3 +1363,17 @@ sprites: - sprite: Mobs/Customization/human_hair.rsi state: classiclong3 +- type: marking + id: HumanHairShaped + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: shaped +- type: marking + id: HumanHairLongBow + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: longbow diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/longbow.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/longbow.png new file mode 100644 index 0000000000000000000000000000000000000000..40705175a4796ec6423476df0350915dd87f3d1a GIT binary patch literal 2061 zcmV+o2=e!dP)4Tx04R}TU|=$Eba8TJ5@2A+%_}Jia(7aQh>TKTKhMC%z{~&!iOIzUjsXEa zAa-7UUMd3y_;!tf5kz0s1(}5@j~8$y7ZjBM=|4bhl#*JU%)r2C0Ay#EmlOcS8Rr1m zB1zd`_688UC?v=k$UXvO^QA-BS3v9}2>S_$T?F(5ko^UuJ{`5*&HCkwr=x>4m6b}&A=Rk1yGK!r+h#^37X;B%J$;f0(n2#`HjsydP|5649mOltF zlU@df1v(52{8JHPYK9C90{RRL`{n=uz{XGg#6{pT000JxNklJOFfW_-5rKxPCf$O?V z)3mVcc^-6KPu2flsy75dz--%&)Y-N@QItF|t)I00D+$1zuh;9aZ5y8F0YF&JTLjCp znCE#ApFRL+ng-AFU|E)O|9{Ii6rKP1^C#-{I{N*7NC5aR67om~%d(hhnp3Z9ng&hN zU|AMhTU(RvUs?d}yryYkzPql=bX_O$ocxm@odVo>G5`6%qw6}ky1D`Y#K(uMz|(9N z_(M{G@*t=ZUU^}4brq|ttM`7VfpiM+e4mDLxlGQ_&vTy%#3&FQ&nxl(+zo)P>xO^R z+MJ)CGt07A*0X`@x}jbESFKjr?(QzDR;!VE%d)0&oCK*9;OgqSPNuzZP)bR;TqZKP zs)~NUkN6BwE|<}4Hc>8@BlV_fCPu3W=@gKC)8ey&Gy@6Dn*OqAKiBB>dXW$pLp=xr z_Wk?!iPw9*p43B7o&_Eo{OyyYR4PrZm&IHQFzYFrrU}pUP$(2q-OuspbNV#&dOh~) z)vHKd{5v423;-u5Cs1n{YFRvXuKGoJ$U##8~~j>vp->$*fb@yk|HZM#h4qrw=GZfXXx|YcmP)6!`r4bEF)f@8j3w_fNuH4}u(?=i$@N zj#S%EJ3C4l-nZLQ_7fHA z_xqs}^?F^Y{pIB)48wR(Bz^esfxUeBGAuiegEw#9gnW2^U%q@ntyT-${rK?%@7}#j z?0e?705^Vlc_~epw=I=Q;al26z@2v-2c1p_&z?O4r4+AUzYg0R930^2=m?!o2Zmvw zR;xi2Z59#-LGF;_I8p|AI~CDnY*I?mYPA3W-EJ2L2L}M|obPtK0DxAj1xl$jS0F(E z9`c-k3`7DlDU$@lFbJg-l}ZHw&~CTM`uciUu2d>mUtdSN-6p(DDV0vW#0ZEJNP;Q> zS(^Y51OWhGZ*LF#`}+WZ{r!FH?d?Ub%W?%I-vd+(rfHu9?wDzs1OT?Sw#d@b5&&Rn zX$f0fTSUCh+si;o02PC2+9$y@O%k{H_U&6D{ule^LOkIKPk2HSQVkZq?=#=`Q7jhW z`#xU0cmYDlZyk6TV{AAah8&8;B8tVLG6&@weBWocx3^eaT*U3|EpBdZP$(3zxVQ*P zY3@QW##j&p_xk3XR7Fr)4-lQ_eqLQ&p-?D*5Q5XwQw#=!+?K=!g8@4|Jp~~Ig+c** zLzWN{is1XcQvXV7@x4F35<41=?kz&*eN<-BQr+|C&jA28H#Y$8_9I#P7|}Ehqkq>6j*pKq9*>pmDG6|Pc82BUsUR5g^O*TBLVOtF4E5lh zp*Te6=V>a8pAk?&q5%Bq&#UtslSGh71*r&dT{rw41VN-cFK}HqvKTANG4YrjH^hxo zO6N`l&V_S}*Uv&?1T-2AGHF++(P+%Y00>OxLMfHvD0NU$RMqo5lu9Lh`}U1Z>-=|u z^8o(i2FUMCBu2pY_BOk|zK+!Kjn9RJ1$m}9fpZWyV;hYIxxT)RoNt(hL;?6_XQR;| z-EKF`t6#rL01_JPx$Z%IT!RA_YBb zuxh{)T?_D@y?%f%cg?4vq>pYp{LMK@4)eO#Gb#5#H95Z&JqOwi`3*{+VwX_50K+g0 f!!QiP_y_&~D;cqYy-Y+D00000NkvXXu0mjfo=w2% literal 0 HcmV?d00001 -- 2.51.2