Cherry-picked commit 76db710 from space-wizards/space-station-14/master

Simple-Station · Apr 21, 2024 · 964e6e8 · 964e6e8
1 parent 3bf08c7
commit 964e6e8
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
@@ -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

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -397,6 +397,13 @@
   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
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -235,6 +235,10 @@
         "name": "crewcut",
         "directions": 4
       },
+      {
+        "name": "crewcut2",
+        "directions": 4
+      },
       {
         "name": "curls",
         "directions": 4