remove duplicate "classic crewcut" as it was upstreamed

DeltaV-Station · Apr 12, 2024 · 7d560f6 · 7d560f6
1 parent 4b80e48
commit 7d560f6
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 13 deletions.
diff --git 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
@@ -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
diff --git 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