]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
new haircut alternative (brought back old one) (#25935)
authorUnicornOnLSD <149102472+UnicornOnLSD@users.noreply.github.com>
Tue, 12 Mar 2024 18:47:29 +0000 (19:47 +0100)
committerGitHub <noreply@github.com>
Tue, 12 Mar 2024 18:47:29 +0000 (14:47 -0400)
added crew cut 2 wew

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

index 9bd8c01fb04a7ad7708ea55b7c2715cf0ac78621..a39e09d5d5af8d6d573ed04cb449917699b69b60 100644 (file)
@@ -55,6 +55,7 @@ marking-HumanHairCornrowbun = Cornrow Bun
 marking-HumanHairCornrowbraid = Cornrow Braid
 marking-HumanHairCornrowtail = Cornrow Tail
 marking-HumanHairCrewcut = Crewcut
+marking-HumanHairCrewcut2 = Crewcut 2
 marking-HumanHairCurls = Curls
 marking-HumanHairC = Cut Hair
 marking-HumanHairDandypompadour = Dandy Pompadour
index af4114ce480a756e16ec2406cdc0d6dce39dd1bd..c3f3bd13a345b32dad9bca816734a7658d94eb3b 100644 (file)
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: crewcut
+- type: marking
+  id: HumanHairCrewcut2
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: crewcut2
 - type: marking
   id: HumanHairCurls
   bodyPart: Hair
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/crewcut2.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/crewcut2.png
new file mode 100644 (file)
index 0000000..2209a9c
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/crewcut2.png differ
index 5b682389ed526f89030104545e2736be2a0ddb7b..7fce060492358f2879b52736726b9001202efad1 100644 (file)
         "name": "crewcut",
         "directions": 4
       },
+      {
+        "name": "crewcut2",
+        "directions": 4
+      },
       {
         "name": "curls",
         "directions": 4