From de6ddb52be53124b3c4342bb43f0df45f7b116b9 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Mon, 30 Dec 2024 13:58:53 +0300
Subject: [PATCH] pulato (#689)

---
 .../Locale/en-US/_CP14/markings/human-hair.ftl    |   1 +
 .../Locale/ru-RU/_CP14/markings/human-hair.ftl    |   1 +
 .../Mobs/Customization/Markings/human_hair.yml    |   8 ++++++++
 .../Mobs/Customization/human_hair.rsi/meta.json   |   6 +++++-
 .../Mobs/Customization/human_hair.rsi/pulato.png  | Bin 0 -> 792 bytes
 5 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/pulato.png

diff --git a/Resources/Locale/en-US/_CP14/markings/human-hair.ftl b/Resources/Locale/en-US/_CP14/markings/human-hair.ftl
index 6f213fd47f..4725cf65fb 100644
--- a/Resources/Locale/en-US/_CP14/markings/human-hair.ftl
+++ b/Resources/Locale/en-US/_CP14/markings/human-hair.ftl
@@ -11,6 +11,7 @@ marking-CP14HumanHairBigBraid = Full Braid
 marking-CP14HumanHairCrazyBald = CrazyBald
 marking-CP14HumanHairBigDoubleBun = Double Bun
 marking-CP14HumanHairPonyTail7 = Ponytail
+marking-CP14HumanHairPulato = Pulato
 marking-CP14HumanHairSideTail4 = Side tail
 marking-CP14HumanHairSwept2 = Swept
 marking-CP14HumanHairUpdo = Updo
diff --git a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl
index 107d93b486..a70d4f78e6 100644
--- a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl
+++ b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl
@@ -11,6 +11,7 @@ marking-CP14HumanHairBigBraid = Хвост во весь рост
 marking-CP14HumanHairCrazyBald = Безумная проплешина
 marking-CP14HumanHairBigDoubleBun = Два пунпона
 marking-CP14HumanHairPonyTail7 = Конский хвост
+marking-CP14HumanHairPulato = Пулато
 marking-CP14HumanHairSideTail4 = Хвост сбоку
 marking-CP14HumanHairSwept2 = Суровый взгляд
 marking-CP14HumanHairUpdo = Пучок
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml
index ebfb0ef7ee..479fd0f9ed 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -102,6 +102,14 @@
     - sprite: _CP14/Mobs/Customization/human_hair.rsi
       state: ponytail7
       
+- type: marking
+  id: CP14HumanHairPulato
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _CP14/Mobs/Customization/human_hair.rsi
+      state: pulato
+      
 - type: marking
   id: CP14HumanHairSideTail4
   bodyPart: Hair
diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json
index 93e8616f34..b9d427b328 100644
--- a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json
@@ -4,7 +4,7 @@
       "x": 48,
       "y": 48
     },
-    "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, adapted to CrystallEdge by TheShuEd. Crazybald by TheShuEd, maxy_shagy by Max Gab",
+    "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, adapted to CrystallEdge by TheShuEd. Crazybald by TheShuEd, maxy_shagy by Max Gab, pulato.png made by DreamlyJack",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -63,6 +63,10 @@
         "name": "ponytail7",
         "directions": 4
       },
+      {
+        "name": "pulato",
+        "directions": 4
+      },
       {
         "name": "sidetail4",
         "directions": 4
diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/pulato.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/pulato.png
new file mode 100644
index 0000000000000000000000000000000000000000..08edb7fb470bf59a853b5f682731f614121fd831
GIT binary patch
literal 792
zcmV+z1LypSP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00001b5ch_0Itp)
z=>Px%(n&-?RCt{2+&zx!FcgO2!__TQTe9Q@q)X)mP|pHbV-}Fw3rICx77)pjYxlkd
zawag$z-SIbnEO5rkf7lIm?EDD0001h|IJSOf;s0h&-1(E&N*qCM*a7+g%FCh_TBLq
zqwM#4_45DGyx4i;#~7FQ^E^w=xoG~Lw!ZIA8s9m$ytmd$-}ma}SL@Mfnu^G=(Y^N~
za%}WkiE$jIR<3Q^&CP@mLh;_8lzFWlAIDL3CaBE-=iJix^E@vFt~0`WFEPf8mD_?k
zIM(G`&*pmk((?2je>E<Wb1vgJE}zdw_<Cs?$5C?5WlQ&iX_`u1F6$_-4L#5E$-s&+
z$}~+yYZj}_fTn47DJ4lMUA)mYO|xs;_S5e?Qf<r_qg>iRh`e>g`uiHxmY~Doa8sdf
z{oYU8@AtculEfG#r6eM6n~3#s?VXV7F31@3t@Dp|I2?Ah@n2tGPhL|>cNsjY9q=2}
zMy{Q){`}aI-5`YU=|1_|d3@8gKU!P=BlZZYOVCF<h+EGC00000000000000000000
z0002+Oz!gRYv1>!K9p^(73Z7`!|)u>+RCx~FE1}A@dWpJP+R?ieczX^>n@(VSLl(Z
zj{=)Sj!(^NcY^9;sv(5Zb=?wOQ>~+3?h$&VWgXbGj;*ONJ6+eQKWwhn0n;=U@BOme
z)X=7y8Fbz$TU8r-9o*!-mth#hIVaxxC7eowN?uS1p~M)MV2iHnWEci9#)xxniFeuZ
z=&#msIyvX1UbRjl$Iy`wLeW@GRc1iV0W!vjF-F?9-5F!VT6>ZW^b9xQbs3wc*;#8(
z>ST;r>Z?Je18Skyh1&Yf_AAzPsddyEOzMG6*G9&cGlQ;`O}p_$ly^b3V0EqEYCzvt
z)H>8UJ;O4(xD-#b<;<W<WxIF84vAU6ndW}^QGP=m0000000000000000002+GyVbH
WO@{s`lbMqM0000<MNUMnLSTZIDuZtT

literal 0
HcmV?d00001