Merge pull request #906 from Sha-Seng/low-pigtails-from-skel

low pigtails by skel
impstation · Dec 5, 2024 · b124fed · b124fed
2 parents a91442d + b1094a1
commit b124fed
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/Resources/Locale/en-US/_Impstation/accessories/human-hair.ftl b/Resources/Locale/en-US/_Impstation/accessories/human-hair.ftl
@@ -1,2 +1,3 @@
 marking-HumanHairGatheredlow = Gathered Low
-marking-HumanHairFrenchBraid = French Braid
+marking-HumanHairFrenchBraid = French Braid
+marking-HumanHairLowpigtails = Low Pigtails
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -5,3 +5,11 @@
   sprites:
     - sprite: _Impstation/Mobs/Customization/human_hair.rsi
       state: gatheredlow
+
+- type: marking
+  id: HumanHairLowpigtails
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: _Impstation/Mobs/Customization/human_hair.rsi
+      state: lowpigtails
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/human_hair.rsi/lowpigtails.png b/Resources/Textures/_Impstation/Mobs/Customization/human_hair.rsi/lowpigtails.png
diff --git a/Resources/Textures/_Impstation/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/human_hair.rsi/meta.json
@@ -4,12 +4,16 @@
       "x": 32,
       "y": 32
     },
-    "copyright": "gatheredlow sprited by Sha-Seng (Github)",
+    "copyright": "gatheredlow sprited by Sha-Seng (Github), lowpigtails by Skeleskitty (Discord)",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
         "name": "gatheredlow",
         "directions": 4
+      },
+      {
+        "name": "lowpigtails",
+        "directions": 4
       }
     ]
   }