From ce46281e3996af00d4384f489a13a896e9cb695f Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Wed, 24 Jan 2024 18:05:01 -0700
Subject: [PATCH] double bun long hair (#24493)

* new hair

* turn my swag on
---
 .../Locale/en-US/accessories/human-hair.ftl      |   1 +
 .../Mobs/Customization/Markings/human_hair.yml   |   9 ++++++++-
 .../human_hair.rsi/doublebun_long.png            | Bin 0 -> 1272 bytes
 .../Mobs/Customization/human_hair.rsi/meta.json  |   8 ++++++--
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/doublebun_long.png

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index de3eea73b3..2d66537d36 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -59,6 +59,7 @@ marking-HumanHairC = Cut Hair
 marking-HumanHairDandypompadour = Dandy Pompadour
 marking-HumanHairDevilock = Devil Lock
 marking-HumanHairDoublebun = Double Bun
+marking-HumanHairDoublebunLong = Double Bun Long
 marking-HumanHairDreads = Dreadlocks
 marking-HumanHairDrillruru = Drillruru
 marking-HumanHairDrillhairextended = Drill Hair (Extended)
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index f6c04ada3c..bb9d6d2b29 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -305,7 +305,7 @@
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
-      state: classiccornrows2      
+      state: classiccornrows2
 - type: marking
   id: HumanHairClassicFloorlengthBedhead
   bodyPart: Hair
@@ -425,6 +425,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: doublebun
+- type: marking
+  id: HumanHairDoublebunLong
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+  - sprite: Mobs/Customization/human_hair.rsi
+    state: doublebun_long
 - type: marking
   id: HumanHairDreads
   bodyPart: Hair
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/doublebun_long.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/doublebun_long.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ae701e88830c3352b3e0cb4d394f3ba84bc8091
GIT binary patch
literal 1272
zcmV<U1PA+xP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(vPnciRCt{2nm=pnJQT(sl^Y6mG6dpgbF-R4r)JIv=-$tBKTmg)^#;5p9aB0w
zCIpO4Oo$>62A_B6D_uMPYNhdQ1O9=jW2rjQlXDbVM?g(EvMeLcIUTFRIj1bkj@G$I
z`&pKeygbh%X^eADM5I3F>s4jnah!skea}A=D$iA!N<s(#fbaX5PN(3UlVKQ$q6m}8
z1e|jkjYjZ&U)4J&(*AHbgk@O>!>~{uh9NA=!f-g$Zu?i6O3h}Id7ekp=@f&(0ES^;
zHk+w(!!R%y3@{pv006ySk7@Vh6Z?+ikY!o8y}gBLngtO|(^U7v;Sf(xPo?c^byR-y
zv)N2_px^H^83vop2F+&ktb@-ZLu=aufWIPKU0qdXA4Ei+=h1jP-ia|Hs%!$3c%Dac
zuJJriT{7<F{G>x^wPfRA7^2_r@BCkuWh7(&+#w*_2R`PPPN#z?id32WY*`inJufIV
z2?8I3n$PEWe0)4uXFi`-GI*dks3?jcgiw=XUJTt3C@la0Twh-wEMtrvE&r)#3DEEN
z*<><-ob)6_M3c#6Z)ltoAp|;|&dxLWTzZ5KS^@xoZQEds6$Z)}W43K;8$Si<{>$ZZ
z=lLmU3t$+A*7K@pG#W~T^?H4BJ6Zw|5p93_62=(Y4vllO*=zs+H#axx*?PT3tJNx$
z>!2mTp~06e{|Z@_k@T`42#}^J8jXe;d=LaM3<J7r5$zE8E`$(>qNp$lwpuL}2KV>(
zYJSk6)Vsh>K)UyIIz^hMg|g*xiS>GoZnvu)1{WbfeibN*;~2olWSAGkG)-h#Mr9X7
z7ZCzN2>8CQmbw7YZnqJ~u^N1urm!pvzVB;=!9@rld4GRb_tFF8-|h0UT!a8JuJ`@k
zx7%%XFUxi2fr}8J+wH1&PSX@|9IJuHaa{0%?fRc_5dr`oZ=-3NVzF2N`0M&fk|0SE
zEEWr-X{!A;TItJ6mAt&Xs0GjS^Yg`yqo$^&rlzK*<}%n$J-e<;uIpC14|t4i`&FJ#
zDCGY+=j6KXPL943!w32@9*<R?&~;tf?qAuqv|ongX2WW=0%J^FLI~_jnw}fZIc?_v
zR;yK^Z#t9~pxJCPX<#%O6>@}|%|<0Ai0F@YFG@m0f1)Tt7>2NITWyc$&n5^VDoxSD
zaU2SQfFv?4EnV_|exKVe5&h1m=JTP)Ij0~9$Z?$N(&LgK2nrjN^0bD`3m!|Je3kKd
zO!@qyoOfPdUtw7mf*`=d!$Wo1VTteiFijJ-Z6gfB!V#4!lOy|*uR;izrU~Eo(d~A%
z+dO$ksMqVUD2ia)Htz23PHpC7h={^4L=;6|I+LI!fOLPEqLLz1oD$p%5g|zuHTYcG
ztlHGrb{4qT>oFmOc24dqWLZW+h{{f*>?H^S3W8woB1324aV`$ol>IE*j+O@`NwW7h
z_U7j1pL;+)MV==~60NpM3y>tq&hZr0NR?;v4sgh3r_<3ALCXV<9YZ-~8G0(mZ0R1A
zIa^|+(&cA`wzLE|6aqg9-9BmwaPCv!RiN9)(gOU;82>7j^!4rS?b~*Kbh)Iy*3{J0
i)YR0})YQ~`5B~uL5{wco9T4;Y0000<MNUMnLSTYxj8T>V

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 c56b30739d..927d2ec6e4 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",
+    "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",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -251,6 +251,10 @@
         "name": "doublebun",
         "directions": 4
       },
+      {
+        "name": "doublebun_long",
+        "directions": 4
+      },
       {
         "name": "dreads",
         "directions": 4
@@ -756,4 +760,4 @@
         "directions": 4
       }
     ]
-  }
\ No newline at end of file
+  }