From 7d560f67f3d4e3d7865e169550050a124f255e4f Mon Sep 17 00:00:00 2001
From: UnicornOnLSD <nikouh4175@gmail.com>
Date: Fri, 12 Apr 2024 17:57:34 +0200
Subject: [PATCH] remove duplicate "classic crewcut" as it was upstreamed

---
 .../Locale/en-US/deltav/accessories/hair.ftl      |   1 -
 .../Entities/Mobs/Customization/Markings/hair.yml |   8 --------
 .../Customization/hair.rsi/classic_crewcut.png    | Bin 218 -> 0 bytes
 .../DeltaV/Mobs/Customization/hair.rsi/meta.json  |   4 ----
 4 files changed, 13 deletions(-)
 delete mode 100644 Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_crewcut.png

diff --git a/Resources/Locale/en-US/deltav/accessories/hair.ftl b/Resources/Locale/en-US/deltav/accessories/hair.ftl
index 7fbfc786290..ee6e2a83e7a 100644
--- a/Resources/Locale/en-US/deltav/accessories/hair.ftl
+++ b/Resources/Locale/en-US/deltav/accessories/hair.ftl
@@ -6,7 +6,6 @@ marking-HumanHairClassicNoFade = Fade (None, Classic)
 marking-HumanHairClassicLowFade = Fade (Low, Classic)
 marking-HumanHairClassicMedFade = Fade (Medium, Classic)
 marking-HumanHairClassicOmbre = Ombre Classic
-marking-HumanHairClassicCrewcut = Crewcut Classic
 marking-HumanHairClassicLong = Long 1 (Classic)
 marking-HumanHairClassicLong2 = Long 2 (Classic)
 marking-HumanHairClassicLong3 = Long 3 (Classic)
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml
index 51cba35429f..eeef0dbe43d 100644
--- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml
@@ -62,14 +62,6 @@
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: classic_ombre
 
-- type: marking
-  id: HumanHairClassicCrewcut
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: DeltaV/Mobs/Customization/hair.rsi
-      state: classic_crewcut
-
 - type: marking
   id: HumanHairClassicLong
   bodyPart: Hair
diff --git a/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_crewcut.png b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/classic_crewcut.png
deleted file mode 100644
index 2209a9ce8376a58827364fd7bfb3f62c76979ec4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json
index 387949d4b31..c7bc1121c13 100644
--- a/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json
@@ -36,10 +36,6 @@
             "name":"classic_ombre",
             "directions": 4
         },
-        {
-            "name":"classic_crewcut",
-            "directions": 4
-        },
         {
             "name":"classic_long",
             "directions": 4