From 5fb2863f488bf1853ba7bea0cb9da0437634e749 Mon Sep 17 00:00:00 2001
From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Sun, 18 Feb 2024 07:49:48 +1100
Subject: [PATCH] Add "tailed" hair (#25216)

* add

* yes
---
 .../Locale/en-US/accessories/human-hair.ftl      |   3 ++-
 .../Mobs/Customization/Markings/human_hair.yml   |   7 +++++++
 .../Mobs/Customization/human_hair.rsi/meta.json  |   6 +++++-
 .../Mobs/Customization/human_hair.rsi/tailed.png | Bin 0 -> 2164 bytes
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 2d66537d3682..1f10b363f8a4 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -163,6 +163,7 @@ marking-HumanHairSpiky = Spiky 2
 marking-HumanHairSpiky2 = Spiky 3
 marking-HumanHairSwept = Swept Back Hair
 marking-HumanHairSwept2 = Swept Back Hair 2
+marking-HumanHairTailed = Tailed
 marking-HumanHairThinning = Thinning
 marking-HumanHairThinningfront = Thinning (Front)
 marking-HumanHairThinningrear = Thinning (Rear)
@@ -175,6 +176,7 @@ marking-HumanHairTwoStrands = Two Strands
 marking-HumanHairUndercut = Undercut
 marking-HumanHairUndercutleft = Undercut Left
 marking-HumanHairUndercutright = Undercut Right
+marking-HumanHairUneven = Uneven
 marking-HumanHairUnkept = Unkept
 marking-HumanHairUpdo = Updo
 marking-HumanHairVlong = Very Long Hair
@@ -184,4 +186,3 @@ marking-HumanHairVeryshortovereyealternate = Very Short Over Eye
 marking-HumanHairVlongfringe = Very Long with Fringe
 marking-HumanHairVolaju = Volaju
 marking-HumanHairWisp = Wisp
-marking-HumanHairUneven = Uneven
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index bb9d6d2b2950..92943a7af4b6 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1307,3 +1307,10 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: uneven
+- type: marking
+  id: HumanHairTailed
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: tailed
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index 927d2ec6e441..c0bf805c3862 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, doublebun_long by Emisse",
+    "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",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -758,6 +758,10 @@
       {
         "name": "uneven",
         "directions": 4
+      },
+      {
+        "name": "tailed",
+        "directions": 4
       }
     ]
   }
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/tailed.png
new file mode 100644
index 0000000000000000000000000000000000000000..f24abb81e320e65fb535f5930fd908f77c546deb
GIT binary patch
literal 2164
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
be&Pdtu9vbe(l|Y>KsCOntDnm{r-UW|V=PtA

literal 0
HcmV?d00001