]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Return Long2 and Long3 hairstyles (#30963)
authorАрт <123451459+JustArt1m@users.noreply.github.com>
Tue, 3 Sep 2024 08:29:24 +0000 (11:29 +0300)
committerGitHub <noreply@github.com>
Tue, 3 Sep 2024 08:29:24 +0000 (18:29 +1000)
* Sprites

* Prototype_&_Locale

* sorted_in_alphabetical_order

Resources/Locale/en-US/accessories/human-hair.ftl
Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong2.png [new file with mode: 0644]
Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong3.png [new file with mode: 0644]
Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json

index 7d3467a610ca73c19a90ba74fa917d8f4f2a0933..9575cd5c2fa80ecdea7a554c2268c458ffc6572f 100644 (file)
@@ -45,6 +45,8 @@ marking-HumanHairClassicBusiness = Classic Business Hair
 marking-HumanHairClassicCia = Classic CIA
 marking-HumanHairClassicCornrows2 = Classic Cornrows 2
 marking-HumanHairClassicFloorlengthBedhead = Classic Floorlength Bedhead
+marking-HumanHairClassicLong2 = Classic Long Hair 2
+marking-HumanHairClassicLong3 = Classic Long Hair 3
 marking-HumanHairClassicModern = Classic Modern
 marking-HumanHairClassicMulder = Classic Mulder
 marking-HumanHairClassicWisp = Classic Wisp
index aa983583c5a284d7ca7484748bd02e98758b7ee6..bd7bed25f680055c7363b286f652f990aa87f2d9 100644 (file)
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: tailed
+- type: marking
+  id: HumanHairClassicLong2
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: classiclong2
+- type: marking
+  id: HumanHairClassicLong3
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: classiclong3
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong2.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong2.png
new file mode 100644 (file)
index 0000000..4bf29c6
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong2.png differ
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong3.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong3.png
new file mode 100644 (file)
index 0000000..6597c3a
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong3.png differ
index 8fd4f5e1b91f174b126696e26fb7ff8c4d4d7a86..d6cd1e11daa953678109dc34fe73ae4f75d527f2 100644 (file)
       {
         "name": "tailed",
         "directions": 4
+      },
+      {
+        "name": "classiclong2",
+        "directions": 4
+      },
+      {
+        "name": "classiclong3",
+        "directions": 4
       }
     ]
   }