From 7a63c78f5b8e624245009f570cea951dae5a5c53 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:34:28 +1100 Subject: [PATCH] "Uneven" hair (#22454) * add * comma * yay * hair --- .../Locale/en-US/accessories/human-hair.ftl | 1 + .../Mobs/Customization/Markings/human_hair.yml | 7 +++++++ .../Mobs/Customization/human_hair.rsi/meta.json | 6 +++++- .../Mobs/Customization/human_hair.rsi/uneven.png | Bin 0 -> 1953 bytes 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/uneven.png diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl index 455f2a15e8..de3eea73b3 100644 --- a/Resources/Locale/en-US/accessories/human-hair.ftl +++ b/Resources/Locale/en-US/accessories/human-hair.ftl @@ -183,3 +183,4 @@ 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 f0630701b1..f6c04ada3c 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml @@ -1293,3 +1293,10 @@ sprites: - sprite: Mobs/Customization/human_hair.rsi state: wisp +- type: marking + id: HumanHairUneven + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: uneven diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json index 21710e761c..c56b30739d 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", + "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", "license": "CC-BY-SA-3.0", "states": [ { @@ -750,6 +750,10 @@ { "name": "bald", "directions": 4 + }, + { + "name": "uneven", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/uneven.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/uneven.png new file mode 100644 index 0000000000000000000000000000000000000000..bb3be1e14f87126dc4b38282005ad369eaae16b2 GIT binary patch literal 1953 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`&f984^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fx%@^cciN^SHZYEbn;L{W{j(Z^!D4am<{kwK}& z`8lPaP`5KOGqC}O1d1pk{2@9bu3q+g>poTyK6e)E=l0G=_fob24 z%SIobkLbKN#i7srqa#<#Oh2fcC-XcK;=b62UNk|E`^T;Xfx7sju=HL7*J z#A3R1!|$$)KKpU@D!-!~GtT+iEMKl=G*jjC_y6VJRnGN1k38w#criod$>q!6;!Yj9 znRWE+S>F%8eo5`wvxnu1f7dKGB8XMVO)~CF=B_Ai{_>W4T~2mvm4Go z@2pWE$Xa;lSc~XXhV9$8A1tx@YBB9}Do0^i*)w|^n+jmAj=T7h!OZoDTgTO`r$6_- zzs1(v=+$zBX+r+mu+xW`EB0J|S;Mvc^l9(^FJGQ??g^MFqdlq4N$yZkeRcKcd-w0( zy_jPb`lEi*t%~~k_ab%{7B{?#EM(Z!)z!6>C*5#ZB^W#PRMq^iRkqi8oidL#eciiu zBS-(^hrUmL{kqi}C-~%G%Zs{^?_T$b|{dcLJ^de>Lms(gucO^@bW! zt3JMtJeRtlRmJIpHnU->dZg?{;f@q`4c7gyhj&k&6lbxzpp%< zRmS6`!=R$4r}syrV9Jf3KX-n1*nRh$?f=CVA9q#E-ySe)kq|?Jub_i@cZRcDa4| z%2lQ*o+ZMHdwRcH{?MCn<#BS(W#iemt}^AkTCwJvg{LI{sYCZQ=d516x(#%p=u*u`pF2^rX z6H67fjSnR(ojW1)zd6T`&!0Enp21N0?6Jj>6-u3#w?8ltJ$7V;&!tU)PP>hK>R0YD zo9V+O=DE}$^xPqq&!2VXc~sxquT$+9^^A4*-F371R$tBH<1*afD$M(eBSDzy3F9PZ zHMMRP{=*uT=Vr<-