double bun long hair (#24493)

* new hair

* turn my swag on

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index de3eea73b3371b97c6f0bdaf491ddc7e1ebbe266..2d66537d3682d6f9751d114f686c51a52ac1ab58 100644 (file)
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -59,6 +59,7 @@ marking-HumanHairC = Cut Hair
 marking-HumanHairDandypompadour = Dandy Pompadour
 marking-HumanHairDevilock = Devil Lock
 marking-HumanHairDoublebun = Double Bun
+marking-HumanHairDoublebunLong = Double Bun Long
 marking-HumanHairDreads = Dreadlocks
 marking-HumanHairDrillruru = Drillruru
 marking-HumanHairDrillhairextended = Drill Hair (Extended)

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index f6c04ada3c9405e9d2c0a782db9cff4716bce889..bb9d6d2b2950d46a58318782f13977708f28294c 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -305,7 +305,7 @@
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
-      state: classiccornrows2      
+      state: classiccornrows2
 - type: marking
   id: HumanHairClassicFloorlengthBedhead
   bodyPart: Hair
@@ -425,6 +425,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: doublebun
+- type: marking
+  id: HumanHairDoublebunLong
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+  - sprite: Mobs/Customization/human_hair.rsi
+    state: doublebun_long
 - type: marking
   id: HumanHairDreads
   bodyPart: Hair

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/doublebun_long.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/doublebun_long.png
new file mode 100644 (file)
index 0000000..6ae701e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/doublebun_long.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 c56b30739d47ca1b5313782ed6e474e18d4af1cd..927d2ec6e4413059f9fdfcc09e13ee852c7a9e79 100644 (file)
--- 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",
+    "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",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -251,6 +251,10 @@
         "name": "doublebun",
         "directions": 4
       },
+      {
+        "name": "doublebun_long",
+        "directions": 4
+      },
       {
         "name": "dreads",
         "directions": 4
@@ -756,4 +760,4 @@
         "directions": 4
       }
     ]
-  }
\ No newline at end of file
+  }