From: Futuristic-OK <141568243+Futuristic-OK@users.noreply.github.com>
Date: Sat, 28 Sep 2024 06:07:51 +0000 (+0600)
Subject: Some new hairstyles! (#31010)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a371de16d3f0a735f8ac44c4606e6bbae9e7379d;p=space-station-14.git

Some new hairstyles! (#31010)

* Add files via upload

png of hairs

* Update meta.json

hairs meta

* Update human_hair.yml

hairs yml

* Update human-hair.ftl

hairs named

* second try

* fix meta

* Add files via upload

* Add files via upload

fix again

* Add files via upload

again again

* Add files via upload

again again fix again

* Add files via upload

i hate yourself

* Add files via upload

fixxxxx!

* Add files via upload

aaagaaaaiiin

* dd

dddddd

* Add files via upload

fix again

* Add files via upload

ddsdssddssddsdsds

* Update human-hair.ftl

* Update human-hair.ftl

screw this im just going to update it myself
webops time

* Update human_hair.yml

* Update meta.json

* Rename capsdaughter.png to longbow.png

* Rename artist.png to shaped.png

---------

Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
---

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 9575cd5c2f..58314f9bb2 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -97,6 +97,7 @@ marking-HumanHairJensen = Jensen Hair
 marking-HumanHairJoestar = Joestar
 marking-HumanHairKeanu = Keanu Hair
 marking-HumanHairKusanagi = Kusanagi Hair
+marking-HumanHairLongBow = Long Bow
 marking-HumanHairLong = Long Hair 1
 marking-HumanHairLong2 = Long Hair 2
 marking-HumanHairLong3 = Long Hair 3
@@ -147,6 +148,7 @@ marking-HumanHairSpikyponytail = Ponytail (Spiky)
 marking-HumanHairPoofy = Poofy
 marking-HumanHairQuiff = Quiff
 marking-HumanHairRonin = Ronin
+marking-HumanHairShaped = Shaped
 marking-HumanHairShaved = Shaved
 marking-HumanHairShavedpart = Shaved Part
 marking-HumanHairShortbangs = Short Bangs
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index bd7bed25f6..578c6837c0 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1363,3 +1363,17 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: classiclong3
+- type: marking
+  id: HumanHairShaped
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: shaped
+- type: marking
+  id: HumanHairLongBow
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: longbow
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/longbow.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/longbow.png
new file mode 100644
index 0000000000..40705175a4
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/longbow.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index d6cd1e11da..ff556dbc78 100644
--- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -790,6 +790,14 @@
       {
         "name": "classiclong3",
         "directions": 4
+      },
+      {
+        "name": "shaped",
+        "directions": 4
+      },
+      {
+        "name": "longbow",
+        "directions": 4
       }
     ]
   }
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/shaped.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/shaped.png
new file mode 100644
index 0000000000..f65d7cf444
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/shaped.png differ