From: Арт <123451459+JustArt1m@users.noreply.github.com>
Date: Wed, 6 Mar 2024 01:42:05 +0000 (+0300)
Subject: New cloth & hair (#25772)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=2ba28cc3d21034c93d8b2c4486b9a158d4be9618;p=space-station-14.git

New cloth & hair (#25772)

* Clothing sprites & meta

* Changing prototypes & sprites

Rename sprites folder, edit prototypes and meta

* Hair_sprites_&_prototype

Add hair sprites and change prototype

* Update meta.json

* Rename added hair

* Revert "Changing prototypes & sprites"

This reverts commit 801cadbdaa90cfb5e7ae43cd7d017e20b40cdc98.

* Revert "Clothing sprites & meta"

This reverts commit 73442163fd8bc8f49207e616b415dc0f26d6ef32.
---

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 1f10b363f8..9bd8c01fb0 100644
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -14,6 +14,7 @@ marking-HumanHairBob = Bob Hair
 marking-HumanHairBob2 = Bob Hair 2
 marking-HumanHairBobcut = Bob Hair 3
 marking-HumanHairBob4 = Bob Hair 4
+marking-HumanHairBob5 = Bob Hair 5
 marking-HumanHairBobcurl = Bobcurl
 marking-HumanHairBoddicker = Boddicker
 marking-HumanHairBowlcut = Bowlcut
@@ -95,6 +96,7 @@ marking-HumanHairKusanagi = Kusanagi Hair
 marking-HumanHairLong = Long Hair 1
 marking-HumanHairLong2 = Long Hair 2
 marking-HumanHairLong3 = Long Hair 3
+marking-HumanHairLongWithBundles = Long With Bundles
 marking-HumanHairLongovereye = Long Over Eye
 marking-HumanHairLbangs = Long Bangs
 marking-HumanHairLongemo = Long Emo
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index 92943a7af4..af4114ce48 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -110,6 +110,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: bob4
+- type: marking
+  id: HumanHairBob5
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: bob5
 - type: marking
   id: HumanHairBobcurl
   bodyPart: Hair
@@ -677,6 +684,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: long3
+- type: marking
+  id: HumanHairLongWithBundles
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: longbundled
 - type: marking
   id: HumanHairLongovereye
   bodyPart: Hair
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/bob5.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/bob5.png
new file mode 100644
index 0000000000..7585585274
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/bob5.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/longbundled.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/longbundled.png
new file mode 100644
index 0000000000..2bee8c78c5
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/longbundled.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 c0bf805c38..5b682389ed 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",
+    "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)",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -79,6 +79,10 @@
         "name": "bob4",
         "directions": 4
       },
+      {
+        "name": "bob5",
+        "directions": 4
+      },
       {
         "name": "bobcurl",
         "directions": 4
@@ -407,6 +411,10 @@
         "name": "long3",
         "directions": 4
       },
+      {
+        "name": "longbundled",
+        "directions": 4
+      },
       {
         "name": "long_bedhead",
         "directions": 4