repositioned spooky long hair to its proper place in the alphabet (tweak) (#27370)

* repositioned spooky long hair to its proper place in the alphabet

* forgot the meta.json for hairstyles oopsie

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index f052f232de35119fa37c355b71bb571c43941b7e..7d3467a610ca73c19a90ba74fa917d8f4f2a0933 100644 (file)
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -55,7 +55,6 @@ marking-HumanHairCornrows2 = Cornrows 2
 marking-HumanHairCornrowbun = Cornrow Bun
 marking-HumanHairCornrowbraid = Cornrow Braid
 marking-HumanHairCornrowtail = Cornrow Tail
-marking-HumanHairSpookyLong = Spooky Long
 marking-HumanHairCrewcut = Crewcut
 marking-HumanHairCrewcut2 = Crewcut 2
 marking-HumanHairCurls = Curls
@@ -166,6 +165,7 @@ marking-HumanHairProtagonist = Slightly Long Hair
 marking-HumanHairSpikey = Spiky
 marking-HumanHairSpiky = Spiky 2
 marking-HumanHairSpiky2 = Spiky 3
+marking-HumanHairSpookyLong = Spooky Long
 marking-HumanHairSwept = Swept Back Hair
 marking-HumanHairSwept2 = Swept Back Hair 2
 marking-HumanHairTailed = Tailed

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index c2a7ac4ebf71b362a025056b3542677f39dcdcc2..aa983583c5a284d7ca7484748bd02e98758b7ee6 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -397,13 +397,6 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: cornrowtail
-- type: marking
-  id: HumanHairSpookyLong
-  bodyPart: Hair
-  markingCategory: Hair
-  sprites:
-    - sprite: Mobs/Customization/human_hair.rsi
-      state: spookylong
 - type: marking
   id: HumanHairCrewcut
   bodyPart: Hair
@@ -1167,6 +1160,13 @@
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: spiky2
+- type: marking
+  id: HumanHairSpookyLong
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: spookylong
 - type: marking
   id: HumanHairSwept
   bodyPart: Hair

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index a6dc03eda834e691e9e45e1b21f278b33487d166..8fd4f5e1b91f174b126696e26fb7ff8c4d4d7a86 100644 (file)
--- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -231,10 +231,6 @@
         "name": "country",
         "directions": 4
       },
-      {
-        "name": "spookylong",
-        "directions": 4
-      },
       {
         "name": "crewcut",
         "directions": 4
@@ -671,6 +667,10 @@
         "name": "spikyponytail",
         "directions": 4
       },
+      {
+        "name": "spookylong",
+        "directions": 4
+      },
       {
         "name": "stail",
         "directions": 4