From 2ba28cc3d21034c93d8b2c4486b9a158d4be9618 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=D0=90=D1=80=D1=82?=
 <123451459+JustArt1m@users.noreply.github.com>
Date: Wed, 6 Mar 2024 04:42:05 +0300
Subject: [PATCH] New cloth & hair (#25772)

* Clothing sprites & meta

* Changing prototypes & sprites

Rename sprites folder, edit prototypes and meta

* Hair_sprites_&_prototype

Add hair sprites and change prototype

* Update meta.json

* Rename added hair

* Revert "Changing prototypes & sprites"

This reverts commit 801cadbdaa90cfb5e7ae43cd7d017e20b40cdc98.

* Revert "Clothing sprites & meta"

This reverts commit 73442163fd8bc8f49207e616b415dc0f26d6ef32.
---
 .../Locale/en-US/accessories/human-hair.ftl      |   2 ++
 .../Mobs/Customization/Markings/human_hair.yml   |  14 ++++++++++++++
 .../Mobs/Customization/human_hair.rsi/bob5.png   | Bin 0 -> 710 bytes
 .../Customization/human_hair.rsi/longbundled.png | Bin 0 -> 1009 bytes
 .../Mobs/Customization/human_hair.rsi/meta.json  |  10 +++++++++-
 5 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/bob5.png
 create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/longbundled.png

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 1f10b363f8..9bd8c01fb0 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -14,6 +14,7 @@ marking-HumanHairBob = Bob Hair
 marking-HumanHairBob2 = Bob Hair 2
 marking-HumanHairBobcut = Bob Hair 3
 marking-HumanHairBob4 = Bob Hair 4
+marking-HumanHairBob5 = Bob Hair 5
 marking-HumanHairBobcurl = Bobcurl
 marking-HumanHairBoddicker = Boddicker
 marking-HumanHairBowlcut = Bowlcut
@@ -95,6 +96,7 @@ marking-HumanHairKusanagi = Kusanagi Hair
 marking-HumanHairLong = Long Hair 1
 marking-HumanHairLong2 = Long Hair 2
 marking-HumanHairLong3 = Long Hair 3
+marking-HumanHairLongWithBundles = Long With Bundles
 marking-HumanHairLongovereye = Long Over Eye
 marking-HumanHairLbangs = Long Bangs
 marking-HumanHairLongemo = Long Emo
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index 92943a7af4..af4114ce48 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -110,6 +110,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bob4
+- type: marking
+  id: HumanHairBob5
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bob5
 - type: marking
   id: HumanHairBobcurl
   bodyPart: Hair
@@ -677,6 +684,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: long3
+- type: marking
+  id: HumanHairLongWithBundles
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: longbundled
 - type: marking
   id: HumanHairLongovereye
   bodyPart: Hair
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/bob5.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/bob5.png
new file mode 100644
index 0000000000000000000000000000000000000000..7585585274c3d876adb44952e4173f6762cd1539
GIT binary patch
literal 710
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@G=>aSW+od^^iF?~sFl+gy$5
z3l={VFe#B~QZC@+(sT4btoS0sf`wQ1xI&e7ZN_7Xvf~M=LifEsR-|A1{JCtdhopJ0
z`<w$GEB3rA+x@y|r_ZFyJKq1*uf6^{b;c2QqxY}h8vlB*H|hP$#s9otYnB<!G<p7c
zr)002r_p<EMV5wG^@D%w?)MyjJcVJBrSmrv$p?q}f_0jA>~!h3)nuM7!0;z;`|UKl
z`Rbp}+~j=rqFrwDO`X<&kGT??+&`^gJMd19uf0v-^2;yE{D)+0zb*7@{Ija!KyiPH
z$NEyw$ikniA|_9p<F`Cy&ozCqZh3(V%#EeaJbyMl)|z4Iy8ZFi=SyQ&`7`u+o%8+{
zWTa}Xt|Q;17<*gquW}@B!q%vzvirlAe2Mz5ks&|(k5K#k(@#G+f9w7KT4MU7%lWs?
zrWIFj^A7)X`TDwu*z?aVOK+|<W)wESgBs1%3x40PYiW+UQq{JsMN0e<uWtNQ=hAc!
z){8S1xGzsr*_59hWw-d#RLd5>h84jkwU(Y-59YmRX|v;eGGY7ksm&>0OxhS;XiwNv
z!SsyNRk-8LJ~IXOb(dGn*|7EY_x_}i{Y<Y;3U(+-R(_0q`^mj={zk!W8;1GMoB9^U
zTwYSJ@}C`pJ=cW$i-SK-YMrt7?9bP(I<-6(r-tWFcqQE6d~sdrKk?U#EZh7TY%AF&
zmA|*|wb||wcU9eCZ#iqzmUpEh%8m15SI>B|AU53Y)K)dO7wa2jw$-2fkbB|6`~6AY
zObh;c`Yb8<xzPk)7;IPiz-xXk=h(*Vj!IxE<V%h4O!M_+&;qhKfEWZW1y2T1p00i_
I>zopr0MT4Ci2wiq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/longbundled.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/longbundled.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bee8c78c51236fdc3765cb2e20080e80aa5b588
GIT binary patch
literal 1009
zcmV<N0}lL&P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000A?Nkl<ZcmeI2
z-Hqxn5QVd=+XNIq0~A03RDi@QZSX)FywU;%Pyh{30F=SKU!=1dg~%B@KU}oq2OK-&
zIcJW?PS)9~`sL-TH2&Rg_q^Zl)qFm$j>luMpLgSD5kH+y&&%af5%_YstghGVPmK_(
z)vDTVw^=@O1Q7mgHmipTpT^_yD8m2t5&-;myH$V_EXCIJb00ge&m238Pq2%{qQ<AD
zU5f7(fSISDIx`J0pwzVKr^v2u4EQ6z!pAlEls@=w0a)iY<&^5GwIs&c51RO78%1>~
zzI(l{*Xt)KkLriR;bq)@zkia7><{Pj`Q?7iw#N^fF2liB%FCVF)Rde_aAyF)6I`n3
zsgSZMy+`2qSCIH=UUOf|!i(b;0EeWR1+^gbbAQZYCqX<^mx}Ke003=xZ9!^d#BPj2
zpv*2JgCQJU)34<*I6mt?$7!y8mv8nLY^d1_@XuqBHZ^VftzDN--FIhz2E3zY_U-!x
zv#s5q+Aclpv@ASale;y__Sw;g9FH$Og$PVbLbdu>65{N^PYU2saBLg<_*0Nt>ut4c
zs6CIv|6TwBVJ4}`0Ez-<wv`o1du@)&f_gyW=Ogw2g0aEtwOet~MidHm-r%wShzx+J
zEi4PoH2nnaNq6hxW3TlXv;nY0v{%^vxDEwEflwe62n9lcP#_ct1ww&PAQT7%LV;EV
ziVsBi8(gQcoXF&y!n88U>>LU|TL6xo`BJNMIe6<hY6>B2;5r8s7e3DDW35-utTRD^
z=N#Swa?KYb3P)2A^n&Nw;ag{eV1iB1IvR(Y{eIx_pCv%^8$E4^=pzMWHk*wHx5x(H
zU{JsW8xHj8pi~^a0B!+v<^~Y6pr8R_2KZ!d`@95l?Z5y_>Cbrj;3N^m)#Lk*#|RtJ
zO#rm55IT`<`@aEfhbne`gZYnBz1+kF98Qb1IeT#38GtjbKfrbE0U6r{E}Dc~UReUz
zKmbJTv1i?4Hm|{kgMx3~_q5#t*fpn}e(Gm`TR`F<PS{wkZDVX-rvTbetjf7*W&y{#
zww%OO+*6pY7a=(!-K2QR={xV)cLfPi#K)!-4w~&ErxOioa&5LPjbsLB<~5*~qH;1p
zox?l12M{o6Pf<Mq|K1SdO5HVSNdaKOnwP`g%qDaI=Rx<Y)H<3lE*De|*Uk(8F~^~c
z;RHsX$aw-;0wNR$1ww&PAQT7%LV-{q6bJ=Efl#1U;4hP4OM~p@Oh*6!01jnXNoGw=
f04e|g00;m8000000Mb*F00000NkvXXu0mjfCAiRI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index c0bf805c38..5b682389ed 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 and tailed 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, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517)",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -79,6 +79,10 @@
         "name": "bob4",
         "directions": 4
       },
+      {
+        "name": "bob5",
+        "directions": 4
+      },
       {
         "name": "bobcurl",
         "directions": 4
@@ -407,6 +411,10 @@
         "name": "long3",
         "directions": 4
       },
+      {
+        "name": "longbundled",
+        "directions": 4
+      },
       {
         "name": "long_bedhead",
         "directions": 4
-- 
2.51.2