Add "tailed" hair (space-wizards#25216)

* add * yes
joshepvodka · Feb 18, 2024 · 5fb2863 · 5fb2863
1 parent 3dfd880
commit 5fb2863
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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