]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
"Uneven" hair (#22454)
authorUbaser <134914314+UbaserB@users.noreply.github.com>
Wed, 13 Dec 2023 21:34:28 +0000 (08:34 +1100)
committerGitHub <noreply@github.com>
Wed, 13 Dec 2023 21:34:28 +0000 (14:34 -0700)
* add

* comma

* yay

* hair

Resources/Locale/en-US/accessories/human-hair.ftl
Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
Resources/Textures/Mobs/Customization/human_hair.rsi/uneven.png [new file with mode: 0644]

index 455f2a15e89db618456ef09217bef406cad2bcea..de3eea73b3371b97c6f0bdaf491ddc7e1ebbe266 100644 (file)
@@ -183,3 +183,4 @@ marking-HumanHairVeryshortovereyealternate = Very Short Over Eye
 marking-HumanHairVlongfringe = Very Long with Fringe
 marking-HumanHairVolaju = Volaju
 marking-HumanHairWisp = Wisp
+marking-HumanHairUneven = Uneven
index f0630701b1e2f325e425adf7045a4c4306b236f3..f6c04ada3c9405e9d2c0a782db9cff4716bce889 100644 (file)
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
       state: wisp
+- type: marking
+  id: HumanHairUneven
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: Mobs/Customization/human_hair.rsi
+      state: uneven
index 21710e761c00479659c4a83dc1fd48cfe2cf6121..c56b30739d47ca1b5313782ed6e474e18d4af1cd 100644 (file)
@@ -4,7 +4,7 @@
       "x": 32,
       "y": 32
     },
-    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi , resprited by Alekshhh, a modified by potato1234x",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi , resprited by Alekshhh, a modified by potato1234x, uneven is drawn by Ubaser",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
       {
         "name": "bald",
         "directions": 4
+      },
+      {
+        "name": "uneven",
+        "directions": 4
       }
     ]
   }
\ No newline at end of file
diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/uneven.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/uneven.png
new file mode 100644 (file)
index 0000000..bb3be1e
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/uneven.png differ