From: ~DreamlyJack~ <148849095+DreamlyJack@users.noreply.github.com>
Date: Tue, 31 Dec 2024 10:29:39 +0000 (+0500)
Subject: Add hair pulato (#34117)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=94422e299b2f694a67eab9efc7fd165b614d602a;p=space-station-14.git

Add hair pulato (#34117)

* add sprite pulato

* update

* add pulato hair

* add pulato hair

* add pulato hair

* update meta "pulato"
---

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 0000000000..7fd30556fe
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/pulato.png differ