From ef8a52eea02c4d34b0ea39c3cc5dcb4339e49e07 Mon Sep 17 00:00:00 2001 From: Ubaser Date: Wed, 14 Feb 2024 18:56:55 +1100 Subject: [PATCH 1/2] add --- .../Locale/en-US/accessories/human-hair.ftl | 3 ++- .../Mobs/Customization/Markings/human_hair.yml | 7 +++++++ .../Mobs/Customization/human_hair.rsi/meta.json | 6 +++++- .../Mobs/Customization/human_hair.rsi/tailed.png | Bin 0 -> 2123 bytes 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl index 2d66537d3682..1f10b363f8a4 100644 --- a/Resources/Locale/en-US/accessories/human-hair.ftl +++ b/Resources/Locale/en-US/accessories/human-hair.ftl @@ -163,6 +163,7 @@ marking-HumanHairSpiky = Spiky 2 marking-HumanHairSpiky2 = Spiky 3 marking-HumanHairSwept = Swept Back Hair marking-HumanHairSwept2 = Swept Back Hair 2 +marking-HumanHairTailed = Tailed marking-HumanHairThinning = Thinning marking-HumanHairThinningfront = Thinning (Front) marking-HumanHairThinningrear = Thinning (Rear) @@ -175,6 +176,7 @@ marking-HumanHairTwoStrands = Two Strands marking-HumanHairUndercut = Undercut marking-HumanHairUndercutleft = Undercut Left marking-HumanHairUndercutright = Undercut Right +marking-HumanHairUneven = Uneven marking-HumanHairUnkept = Unkept marking-HumanHairUpdo = Updo marking-HumanHairVlong = Very Long Hair @@ -184,4 +186,3 @@ marking-HumanHairVeryshortovereyealternate = Very Short Over Eye marking-HumanHairVlongfringe = Very Long with Fringe marking-HumanHairVolaju = Volaju marking-HumanHairWisp = Wisp -marking-HumanHairUneven = Uneven diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml index bb9d6d2b2950..92943a7af4b6 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml @@ -1307,3 +1307,10 @@ sprites: - sprite: Mobs/Customization/human_hair.rsi state: uneven +- type: marking + id: HumanHairTailed + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: tailed diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json index 927d2ec6e441..c0bf805c3862 100644 --- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven is drawn by Ubaser, doublebun_long by Emisse", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse", "license": "CC-BY-SA-3.0", "states": [ { @@ -758,6 +758,10 @@ { "name": "uneven", "directions": 4 + }, + { + "name": "tailed", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png new file mode 100644 index 0000000000000000000000000000000000000000..4c6e1d94d14bdb8c36946b54ba7a964ebfc6b185 GIT binary patch literal 2123 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F;KxA5N2eb5`33|fjK8LB%&n3*T*V3KUXg?B|j-uuOhbq ztjngt3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D3TAo+dIm~% zTnY*bHbp6ERzWUqQ0+jTtx`rwNr9EVetCJhUb(Seeo?xG?W zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$ z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F zXfoK|;*u17BnA3L1_l&2TID3>rQ0f1=%%EmC6?xtDA{@Xy2l%uT3XuZLsX&ahKQmXYNL{p zmyJF=C)sg{E@QD~U|@;!ba4!+V0;^8?XBV{@Xk_CuqI(if?CrfW>*29zpPE2jSKsI zds&!$Sy+`1dRz&(aOA`t`3KDRA0+#lhD3&$6ujFvEkDEk`L^n9>HP0k9eg`)*1KP; z_N`kLyWCwf^S?Q>qty51%a$Fwem(r^#fuA%9Y5ZD_3G6R-@b+E>gX)F^gQeEhJIyzcv@$%*F-+x$GSzUTOZJOBC+qYN8C@oB3nX#KQ zz~cU`TdT6NvY0IRpX}SWFCj0_kC&G>(|Oac8~5-3UofjLxMM|vmBXCWo4kTv2mg7ud1@LFySK?Oq8FWX618w_vFKe4Ne@yj+HJ-1Du@ifp+!J&UjCwhF`J zxpU`cqz7r1Mr_%%N$Amcwt_(E2zdqX;PN0>hdcLn@7}#bV{`VCJwL6PS^IT;S(Yg^ zEcAHb^-Wk~4A;}hV*I>c zCia|Q0N;%BTX)9j8GOFK{9XQH?!bU`8}FMjJ+Sz^KSn5JuYm#&2lJr@3`)iLfP4I# zj~P<+d;H>F{^v93pvhp#q^%4SIou`xJ=^X-N94xO<8n Date: Thu, 15 Feb 2024 22:10:20 +1100 Subject: [PATCH 2/2] yes --- .../Customization/human_hair.rsi/tailed.png | Bin 2123 -> 2164 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png index 4c6e1d94d14bdb8c36946b54ba7a964ebfc6b185..f24abb81e320e65fb535f5930fd908f77c546deb 100644 GIT binary patch delta 1197 zcmV;e1XBCU5cCkR*aLruNklBlsy5tQ0}2EYe$ADB>S1v=X#b5k&>}x%Y0e zvm#plZw9<5=1)va_#Yo1($v%>BO@c;`ue(mdwVO3i;I!ux$1u~H8tfY5($}~pZ8{G zXZ_F5Pw_lY78Vwq@e{V-FcNcV{NUiAS<3OZw>O!boHTPdW-Hrf-t+Ubkv%;i+KZ)C--Yyjt71nm;^nl=Q0u;vA*Vju~ zS(yjpf!xv2;mys>nVm>$Re;9P(UCEpqG>q$zVFM@(h|EuuSpMNXyhb-F^*lvuH#c) zUjB_?fTPsb)@Fc-XXxhU#t5pas*;C?hqTAh8*m-r0Kx`R} z3G&-cW}3vY@$qpV$)~%!``bEP!#sq-&d!b@jqBp5pPruludgpzUS2lh_V@QqjqKmm z)n(fBK5T!O8L;^JV=*T^1-HG@($aK4*g$STOr~x{1-Ts}u^|kJxw^V)b|2xeySrFk2+{HL(oQEq&bM~AOUD6lgaeX zL=x(-Xl-rH$L|f`GTC7{#-ik%NFET@_x}DqJXC+MK4L!jI|B)iC5i_|B7m+);9}OJ zqoXFl9UmVXSk}QXaM8z^fH2EHNd^q9uC6xrhV^nGA@8|SVlQ7%#H>?`BH0!&~BbpZ6QV7KQwTsPPiN6aIKTy=NHKE(b{U4!{eyR(Fe%XUU&Se2vIzocb91wFc6P=h zFB=ZVVf@+InQ{9#NOuZ>Y>GjVtE(&L_{%0Q*EkYz9LDFualY=FfSdtR3*yFz#RH-k zqH7{DP>lZ@5mnP=%78MU3@8K2fHEbZ3@8K2fHI&AC_V@)+wSynV~?!K09Xh-L^d$wl}@2bJ=o|^9Zs=ltO zU8hGWY5z9^K^pg`rl!Kz*H_ii(V@o2$Ai_?)$sQARxKWBB&=rt0hK zgNKKQFbLjZ>+0&9@qgHY!%57g^CKf8dMV}4&(CUldRot+%vQI}yr-uptsDKp!GXHD zxltHjUtg=Mt1ESQc&M+T3#8cS#2hEa;Mn>3xq|a;ZEdPpEUJcvhG1`RFWlJJP*qh` z8aJy*fWuo`TN;0(r>95v_&7Q`(&Ltv7S-F^t6U3 z=H~bbHj;69c^NrgTU-0d&bWUuB_jX}Kmwe9d3jMYGc$1= z`g(SDRuja~G$ZHB1r9>)IXk=m=!=VZ&@OOQwLS2w!{E)zzjb z8lyHK4CjC6=QH^_L}5d*CE)V%vfh29!}j*J79%=H0_TJ17poJVgu%@nlJmue1j+av(vot>R%XHqG3ShTXT65{s;a8VmrA0SIpcTz<_ z+}^vpySON`YvjE7I|BueElmWbB7mVt;7axr6BB>Bz~Pr48hbMhTSwYgj_F!SH1?r)HiKei4X0xfxRuF z^$~v(6#~FKd^kQnR^8p*`c$Y=4<=~?v1wbH!x`%*LS#1X{Mp%=#)q79XiyeCori8< zg9J9yHp)u%)&%g}oq*_J0N)hBI|7x60AK(Mjse>wfwrx!tyw=SbV`Bs_4V-d^fV&X zbUqSRaDW;BIJ}+0*45ReMn^}j{c<`T#*2SRI3Z@Jf$_1iF>5dy>8nR1V7Ivur~$Ci zr8yCR@Z);`ND1b@3!v}0v;il^czT0Feks8UE(CPn;Ck`KNp4 zlrKq&0NUBvsrvi-z35BAfgH}CoSf(s^g+5)3M3f@LoO~Zq8gDj&zBqp*oX7J?1}WS zNJfGT2EH-8L_h|9ipnGgD)IkD61K>N0bxKG5C((+VL%uV2801&Ko}4Pgn@sAfnRl~ V9v5HZhpqqs002ovPDHLkV1fmzFn|C6