]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
The return of the 'long bedhead' haircut as an alternative (#26336)
authorRenQ <164364533+ImRenQ@users.noreply.github.com>
Fri, 22 Mar 2024 17:35:40 +0000 (20:35 +0300)
committerGitHub <noreply@github.com>
Fri, 22 Mar 2024 17:35:40 +0000 (13:35 -0400)
Resources/Locale/en-US/accessories/human-hair.ftl
Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
Resources/Textures/Mobs/Customization/human_hair.rsi/long_bedhead2.png [new file with mode: 0644]
Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json

index a39e09d5d5af8d6d573ed04cb449917699b69b60..3a507ec6cfc3228d3d014068766f361a4d0acad3 100644 (file)
@@ -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
index c3f3bd13a345b32dad9bca816734a7658d94eb3b..449f8aa2cd40311aea288773b504dab177f965af 100644 (file)
   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
new file mode 100644 (file)
index 0000000..12520f0
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/long_bedhead2.png differ
index 7fce060492358f2879b52736726b9001202efad1..5cb41c258b865d47d33bd674ad620c0089c4b4cd 100644 (file)
         "name": "long_bedhead",
         "directions": 4
       },
+      {
+        "name": "long_bedhead2",
+        "directions": 4
+      },
       {
         "name": "longemo",
         "directions": 4