From c648bbad2ad185eecd9fcfa5ed722f255c709a4a Mon Sep 17 00:00:00 2001
From: Adrian16199 <piaskowskiadrian0@gmail.com>
Date: Tue, 26 Dec 2023 12:45:53 +0100
Subject: [PATCH 1/2] Adds more classic hair.

For a friend.
---
 .../Locale/en-US/deltav/accessories/hair.ftl  |   3 +++
 .../Mobs/Customization/Markings/hair.yml      |  24 ++++++++++++++++++
 .../Customization/hair.rsi/classic_long.png   | Bin 0 -> 417 bytes
 .../Customization/hair.rsi/classic_long2.png  | Bin 0 -> 351 bytes
 .../Customization/hair.rsi/classic_long3.png  | Bin 0 -> 412 bytes
 .../Mobs/Customization/hair.rsi/meta.json     |  12 +++++++++
 6 files changed, 39 insertions(+)
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_long.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_long2.png
 create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_long3.png

diff --git a/Resources/Locale/en-US/deltav/accessories/hair.ftl b/Resources/Locale/en-US/deltav/accessories/hair.ftl
index 6579016713d..526c9fd8423 100644
--- a/Resources/Locale/en-US/deltav/accessories/hair.ftl
+++ b/Resources/Locale/en-US/deltav/accessories/hair.ftl
@@ -7,3 +7,6 @@ marking-HumanHairClassicLowFade = Fade (Low, Classic)
 marking-HumanHairClassicMedFade = Fade (Medium, Classic)
 marking-HumanHairClassicOmbre = Ombre Classic
 marking-HumanHairClassicCrewcut = Crewcut Classic
+marking-HumanHairClassicLong = Long Classic
+marking-HumanHairClassicLong2 = Long (2, Classic)
+marking-HumanHairClassicLong3 = Long (3 ,Classic)
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml
index eff21afe088..51cba35429f 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml
@@ -69,3 +69,27 @@
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: classic_crewcut
+
+- type: marking
+  id: HumanHairClassicLong
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: DeltaV/Mobs/Customization/hair.rsi
+      state: classic_long
+
+- type: marking
+  id: HumanHairClassicLong2
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: DeltaV/Mobs/Customization/hair.rsi
+      state: classic_long2
+
+- type: marking
+  id: HumanHairClassicLong3
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: DeltaV/Mobs/Customization/hair.rsi
+      state: classic_long3
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_long.png b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_long.png
new file mode 100644
index 0000000000000000000000000000000000000000..39721687cc6e159f1ace50ab6acfb77b762cc389
GIT binary patch
literal 417
zcmV;S0bc%zP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000IP)t-s0001*
znwrGK#MIQ(>FMeI|No6Q7Y+ab00DGTPE!Ct=GbNc00BKoL_t&-8STMAZrmUMhS9HJ
z_B{fciT5Zmd#et6WccrYl}?lZp2Smi*-CkjzxBFsWM2b!lG4gSk^;jt#iE75N-CCN
z)2zZUNveUt$hn<il2kd$kQr>0UN~3-gq1E<RRua90T(<UeAG?wH0CKoxzL!4q<UfS
z+yuJoB5j_|^2XBGq?^J+MsIc=GK-{CXbkTR?+mk~8VrwIRby50bOPK;W70M&?hGq8
zp6(JB#f^sy*sFc!PdwoH_J4{sa9~s6j#W~~d~jA(fumRzU+7+nQsF37%{$$^D^-Tc
z#C<2zIp(?em2TFax#MQ-3|n?Tx$`5tg<(p3QC9{NS3a4Fr}I~>d@||T&=_$-p2lWQ
zxIkl8PE4LIaKh5r%n280mdpva(L7~NxL-78<HX`=Jf{rb{wco!wdXo>o2cS(00000
LNkvXXu0mjfqNTbD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_long2.png b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_long2.png
new file mode 100644
index 0000000000000000000000000000000000000000..950bc1430b48c479ee40a5f7a3c27d241303ab3c
GIT binary patch
literal 351
zcmV-l0igbgP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000FP)t-s0002Q
z#KhFp)amKz{{R10JQqCx0004WQchC<K<3zH0002~Nkl<ZNXPAzQF4SJ5JVgF0L0n@
zumuO$a_0ajeg8A%BPpE`mgGCxu2N}zfHTDm@Jr?RgD2z2dy1^ale-0SPRdUts{uCW
z_R$I-1=xb}q-YNmpx7<MY%zadCm<J~02}~L-2uRP5w53)|C(l^)M5DMnMl^?@k*H_
zFUdBVSXpf<FG^DRi~|63${1>a4|wbUD&4JL*2{NRLo7l|2+43-*OWg=-E{nZIrTHS
z=;B4WlSKpDP4fW!cGJLAnp3{d4-Gt;I*gMB{IkuBuB_mCKu`@sddaOvVgh0h@JG*a
xCS;YIV~N}c&K_hU>b~s*=g{?kGT^O0rcbd@B;aRar%eC=002ovPDHLkV1j`xm-_$!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_long3.png b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_long3.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc7eb6ea0613d30a5621d8a7f524ca2cbe6935cc
GIT binary patch
literal 412
zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000IP)t-s0001+
zo13z-vdGBD?d|RV|NnE%$728h00DGTPE!Ct=GbNc00B5jL_t&-8STNla-%Q+K+&s*
zdqGGq2HayKdVxgm82<lTwn#u?24}WTat{BiwH&mTgJzj6nI;BHMh?#1No1VkL`E*x
zwjoh{3_Tfn6JjEfi|e0cicvEfc12v)n;{Y2Gm@w<g`SKqpdwMx%{>|6VI)z`xj-Tq
z5niwn(oJC!>?9T1C^l-H``A9&NYH4Ie3CRF4#7%ZxyChyb+){sLWq3`yw<or^p<a^
zrsZ2D((vc^YHAM3I|t3W)MUzGzLOh<I2d+fiOWJphHz^wJ2|~MXGyekr6gnP5Io6c
zEJsboS9SFuQNDh7a+gwfB)XFY2ZdFhM2$Q+xKMTMjC^C{pyFl)8{y!cgAWLXF9r*m
z0}m3xC$T;_ahVNYuAUS6$wqaYP#wFD6N;U%oREe;Kg>Vqy(iCHXj$_B0000<MNUMn
GLSTYikE^r*

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json
index c2197e13ea7..387949d4b31 100644
--- a/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json
@@ -39,6 +39,18 @@
         {
             "name":"classic_crewcut",
             "directions": 4
+        },
+        {
+            "name":"classic_long",
+            "directions": 4
+        },
+        {
+            "name":"classic_long2",
+            "directions": 4
+        },
+        {
+            "name":"classic_long3",
+            "directions": 4
         }
     ]
 }

From b4d10a1658c46b1b6be6d9b78328bebb4ec6c590 Mon Sep 17 00:00:00 2001
From: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Date: Wed, 27 Dec 2023 19:03:25 +0100
Subject: [PATCH 2/2] Update Resources/Locale/en-US/deltav/accessories/hair.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
---
 Resources/Locale/en-US/deltav/accessories/hair.ftl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Locale/en-US/deltav/accessories/hair.ftl b/Resources/Locale/en-US/deltav/accessories/hair.ftl
index 526c9fd8423..7fbfc786290 100644
--- a/Resources/Locale/en-US/deltav/accessories/hair.ftl
+++ b/Resources/Locale/en-US/deltav/accessories/hair.ftl
@@ -7,6 +7,6 @@ marking-HumanHairClassicLowFade = Fade (Low, Classic)
 marking-HumanHairClassicMedFade = Fade (Medium, Classic)
 marking-HumanHairClassicOmbre = Ombre Classic
 marking-HumanHairClassicCrewcut = Crewcut Classic
-marking-HumanHairClassicLong = Long Classic
-marking-HumanHairClassicLong2 = Long (2, Classic)
-marking-HumanHairClassicLong3 = Long (3 ,Classic)
+marking-HumanHairClassicLong = Long 1 (Classic)
+marking-HumanHairClassicLong2 = Long 2 (Classic)
+marking-HumanHairClassicLong3 = Long 3 (Classic)