From 94422e299b2f694a67eab9efc7fd165b614d602a Mon Sep 17 00:00:00 2001
From: ~DreamlyJack~ <148849095+DreamlyJack@users.noreply.github.com>
Date: Tue, 31 Dec 2024 15:29:39 +0500
Subject: [PATCH] Add hair pulato (#34117)

* add sprite pulato

* update

* add pulato hair

* add pulato hair

* add pulato hair

* update meta "pulato"
---
 Resources/Locale/en-US/accessories/human-hair.ftl |   1 +
 .../Mobs/Customization/Markings/human_hair.yml    |   7 +++++++
 .../Mobs/Customization/human_hair.rsi/meta.json   |   6 +++++-
 .../Mobs/Customization/human_hair.rsi/pulato.png  | Bin 0 -> 761 bytes
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/pulato.png

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 58314f9bb2..af80aaef5c 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -146,6 +146,7 @@ marking-HumanHairSidetail3 = Ponytail (Side) 3
 marking-HumanHairSidetail4 = Ponytail (Side) 4
 marking-HumanHairSpikyponytail = Ponytail (Spiky)
 marking-HumanHairPoofy = Poofy
+marking-HumanHairPulato = Pulato
 marking-HumanHairQuiff = Quiff
 marking-HumanHairRonin = Ronin
 marking-HumanHairShaped = Shaped
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index 578c6837c0..af0674eb76 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -54,6 +54,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bedheadv3
+- type: marking
+  id: HumanHairPulato
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: pulato
 - type: marking
   id: HumanHairLongBedhead
   bodyPart: Hair
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index ff556dbc78..1540862d2a 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)",
+    "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 for SS14",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -567,6 +567,10 @@
         "name": "protagonist",
         "directions": 4
       },
+      {
+        "name": "pulato",
+        "directions": 4
+      },
       {
         "name": "quiff",
         "directions": 4
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/pulato.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/pulato.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fd30556feb6ad2f2d9e174de8cf1013227d83e0
GIT binary patch
literal 761
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU^?LG;uuoF_;!|W*DD8+*312J
zR$?sT56(>FE_lNfvlv9mSQaxjJ-AW1|2u1+h+@`N-z2GfnlIK}xxe>$UD(tIzM(t+
z+-KRR^zi=s@AFST4Vvq>JZoo6*yo>nX8EWoMhpILKm0J=Y_{#Rxb@ew_QtjU`Cl1v
zvL@hz&wRh-U$qi0%+FkOdCT3r?;LU;L=rB@8^*9asIj{~-{weRUvkzhhXflXrE=c+
zf6_LuT&`Vl^^5VmZ12xq3>r7CW`(lrJm13V+Sa~e>)WT|FGRMQ#yzr@W{Cb%VPlu0
zFV?L;x0*AtX2s$I?=JZ{w`^JA#{78cZUbqCgZJ{bciFS{3CwG}Xm+e3o>l&am*R<S
zP0QC-N>zuaGatB6w!60S@;>Q$^=Ef2%xxDmUI=sF$Jxc85MW*({ATmNXM5J=DhSs^
zWw<{SXZDco|GFlD)#+`=y!R&--QTdx`@-BW_Pd|X|5{%3t?}qlcZc{&-`w-RW`Dk8
z#wcun3pE;Y?m6>ikC2;H)JcKV&hNi#EgV0d3NP-7UvRl3V)_ve4u*rDlU$+|b45J^
zx8BV9W*Xn)alA58d6KrqzepLuD(#kp&`TnvUs73bX06`1^2_!bLw?>Z7fpWrW?V9_
zQk<bZr+l8~mYb8VXillxaJ-%?%x>ky2C<sYF|*{(`}I1CGv=6b9Vt9x+fcl8Y5R{a
z+3o-T6<+f^uFb7#d+CtPmj$NZCDP;>mo9tS(oo8|EOOxq%Oh!i6LS?#s7nRuI-KH_
zn}3sGh7RMYQ`;<?_C4FUY<<(&ZN_@MmqK1y|K`vTuuNF}Ix;!=>f-E+GhIAxFTWx#
zk@LE5;`x0!<(npVNlG=eEVH{RzOwsWLr3%deapldc1^UGd?R6JFFC(<W&`I8Y>3D8
afxfp~li%(xwsv5WX7F_Nb6Mw<&;$Tu7+3rN

literal 0
HcmV?d00001

-- 
2.51.2