From 31f8f768a06bb4a98889cdeb4fdd0fd5fda28092 Mon Sep 17 00:00:00 2001
From: Jopogrechkin <killerden392@gmail.com>
Date: Sun, 12 Oct 2025 08:35:12 +0300
Subject: [PATCH] Brand new hair (#39850)

* Update human_hair.yml

* overeyepigtail

* Update meta.json

* Update human-hair.ftl

* Update meta.json

* Update Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml

rerun test

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---
 Resources/Locale/en-US/accessories/human-hair.ftl |   1 +
 .../Mobs/Customization/Markings/human_hair.yml    |   7 +++++++
 .../Mobs/Customization/human_hair.rsi/meta.json   |   6 +++++-
 .../human_hair.rsi/overeyepigtail.png             | Bin 0 -> 810 bytes
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/overeyepigtail.png

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 50d2b2790e..b9b103b58a 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -199,3 +199,4 @@ marking-HumanHairVlongfringe = Very Long with Fringe
 marking-HumanHairVolaju = Volaju
 marking-HumanHairWisp = Wisp
 marking-HumanHairLongWithBangs = Long With Bangs
+marking-HumanHairOverEyePigtail = Pigtail (Over Eye)
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index fb6f8d4fed..a7748c4566 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1405,3 +1405,10 @@
   sprites:
   - sprite: Mobs/Customization/human_hair.rsi
     state: longwithbangs
+- type: marking
+  id: HumanHairOverEyePigtail
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+  - sprite: Mobs/Customization/human_hair.rsi
+    state: overeyepigtail
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index dcacd1d743..35ec37005f 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, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack, b.png and b_alt.png modified and sprited by KingFroozy (github), long_with_bangs shaped and longbow by Futuristic (and Pyvik) for SS14, cube and baby by CoolioDudio",
+    "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), pulato.png made by DreamlyJack, b.png and b_alt.png modified and sprited by KingFroozy (github), long_with_bangs shaped and longbow by Futuristic (and Pyvik) for SS14, cube and baby by CoolioDudio, overeyepigtail by GovnokradZXC",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -814,6 +814,10 @@
       {
         "name": "longwithbangs",
         "directions": 4
+      },
+      {
+        "name": "overeyepigtail",
+        "directions": 4
       }
     ]
   }
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/overeyepigtail.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/overeyepigtail.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3c94ba0572f0715faff77172b56e6c813e069df
GIT binary patch
literal 810
zcmV+_1J(SAP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZr)Ja4^RCt{2n$POuFc8P5vb43}so>2Q5IptRH&S1-
zN3Vhxkp=|C;K4F&dPw%L#I3ISGwDBF=5rBio0<8VNlIn_EI~wN`)rf+>Idh%R}q@9
z@7O$qh)PNcm&*l4qY(@S0|<h^YAjp(d7eXAmf*TB42MH&`vV)}Qc4g)T(3zfJDZBy
zzUO)1x-NL0SIfSU0M+34`#o&8TR5N3AcW{d1Z`jAdEU+MHYs5wKsET;Z05vq?4)T5
zhzLRm;G9E}B&~>`r~ND65Yc#C;}p=r>+e+&(lmuQj$2s^f*^2qyWLIdRe5&(CyWHR
zTrLl<YY}|kw{pUi`(T9-fQWEB9*xKPWpeZBbh`QXtN6YT!{N}_0TYU%07Qf!2yR5s
z!52kgJZ59lb-iAz>2%uqR;bq)-}hlW9$y2uO+Di^;2B{UHZ{~seBXySj-8??Y6ssa
zS(bJ39<W-iu6CC5ML%zXpMc&L5fLVniFF)}r9fZUto&8JRsj7{WV7;D`C0+OFm!C*
z{QfJd3!*JwI|BgfPk(|S2!bF8f*=TjAnfU*PvBD;G=MSIn<Gt#V11nY$atRT5Qbr^
zN9|dbslnjigRIUPBmn*fFQo)2CFFSyoOAFzuhn#5j49oVpzYuLWQtXXNY%Km%uXf~
zXS3N@)#%^lcsyQv5p=IYT@kEiz<uz#I1xpWQ>RMv6Hyd7S_A;NepW>=#aMu9@R}}9
zXQL=`(liBtKQlu6VJkwdWAV1TLS7++xb_Rw6~Txs%M|BaF~(FAg$Y~q_M0S$VvH%q
zm}<RAYB^u1YTidt)LV5~r-5$I(S1ryl+2%kh^kcsHCfIV>To!;;~yegO|h;y91hB4
zJA69@q?AyWrJYwD!Z|m(|Er6mP4Kn=x<mBS$@BbaKjS0b7N9K4uP8?sMPZx<Z_($T
oZ^}3MN)QA=5ClOG1VQw{ZzWzTln_8AEC2ui07*qoM6N<$g7C9&H2?qr

literal 0
HcmV?d00001