Cherry-picked commit 6bffa31 from space-wizards/space-station-14/master

Simple-Station · Mar 22, 2024 · 66617c2 · 66617c2
1 parent 3bf08c7
commit 66617c2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -7,6 +7,7 @@ marking-HumanHairBedhead = Bedhead
 marking-HumanHairBedheadv2 = Bedhead 2
 marking-HumanHairBedheadv3 = Bedhead 3
 marking-HumanHairLongBedhead = Long Bedhead
+marking-HumanHairLongBedhead2 = Long Bedhead 2
 marking-HumanHairFloorlengthBedhead = Floorlength Bedhead
 marking-HumanHairBeehive = Beehive
 marking-HumanHairBeehivev2 = Beehive 2

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -61,6 +61,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: long_bedhead
+- type: marking
+  id: HumanHairLongBedhead2
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: long_bedhead2
 - type: marking
   id: HumanHairFloorlengthBedhead
   bodyPart: Hair

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/long_bedhead2.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/long_bedhead2.png
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -419,6 +419,10 @@
         "name": "long_bedhead",
         "directions": 4
       },
+      {
+        "name": "long_bedhead2",
+        "directions": 4
+      },
       {
         "name": "longemo",
         "directions": 4