From 964e6e814c811ed8688441e6b064ab01e3939bba Mon Sep 17 00:00:00 2001
From: UnicornOnLSD <149102472+UnicornOnLSD@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:47:29 -0400
Subject: [PATCH] Cherry-picked commit 76db710a1c5fe4c86674a27c282b4f84cb35446b
 from space-wizards/space-station-14/master

---
 Resources/Locale/en-US/accessories/human-hair.ftl |   1 +
 .../Mobs/Customization/Markings/human_hair.yml    |   7 +++++++
 .../Customization/human_hair.rsi/crewcut2.png     | Bin 0 -> 218 bytes
 .../Mobs/Customization/human_hair.rsi/meta.json   |   4 ++++
 4 files changed, 12 insertions(+)
 create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/crewcut2.png

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index 9bd8c01fb04..a39e09d5d5a 100644
--- 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
index af4114ce480..c3f3bd13a34 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..2209a9ce8376a58827364fd7bfb3f62c76979ec4
GIT binary patch
literal 218
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|ei2$DvS0H@}22Pzi1!O|VIp<!^
z2g<RP1o;Is1a7|i{!34qUNTT5+tbA{L_+fI!Hv9!3<TOP@|$mI;q*Js<RMtQ%V&b*
zx~)MsUQhnS-eSGto$bH0-Uxy0BTct7MK4yb*I;(G+4lC_iQIX;6IcIkop{+~V$iRh
z#V!g_*`inZIxH64=@maJ`}CZ2`IL_fCj|X^#HpUjzx$tcc`eXd22WQ%mvv4FO#nO6
BTnzvK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index 5b682389ed5..7fce0604923 100644
--- 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