Shoulder-length hairstyles resprite (#37000)

* sprite

* final

* final (final fr)

diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl
index af80aaef5c7c35905f99a137a134acd5ebb75fb4..0ce0e27be7fc7f549ffc534ee0d775e8a8b1be43 100644 (file)
--- a/Resources/Locale/en-US/accessories/human-hair.ftl
+++ b/Resources/Locale/en-US/accessories/human-hair.ftl
@@ -163,7 +163,7 @@ marking-HumanHairShorthairg = Short Hair 7
 marking-HumanHair80s = Short Hair 80s
 marking-HumanHairRosa = Short Hair Rosa
 marking-HumanHairB = Shoulder-length Hair
-marking-HumanHairShoulderLengthOverEye = Shoulder-length Over Eye
+marking-HumanHairBAlt = Shoulder-length Hair (Over eye)
 marking-HumanHairSidecut = Sidecut
 marking-HumanHairSkinhead = Skinhead
 marking-HumanHairProtagonist = Slightly Long Hair
@@ -192,7 +192,7 @@ marking-HumanHairUpdo = Updo
 marking-HumanHairVlong = Very Long Hair
 marking-HumanHairLongest = Very Long Hair 2
 marking-HumanHairLongest2 = Very Long Over Eye
-marking-HumanHairVeryshortovereyealternate = Very Short Over Eye
+marking-HumanHairVeryshortovereyealternate = Very Short (Over Eye)
 marking-HumanHairVlongfringe = Very Long with Fringe
 marking-HumanHairVolaju = Volaju
 marking-HumanHairWisp = Wisp

diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
index af0674eb76688273aaf235255429a165ab634292..0af782a6a5b6147cfd0de0b737c39ed9e08ec630 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
@@ -1189,12 +1189,12 @@
     - sprite: Mobs/Customization/human_hair.rsi
       state: swept2
 - type: marking
-  id: HumanHairShoulderLengthOverEye
+  id: HumanHairBAlt
   bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: Mobs/Customization/human_hair.rsi
-      state: shoulderlengthovereye
+      state: b_alt
 - type: marking
   id: HumanHairThinning
   bodyPart: Hair

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/b.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/b.png
index f5640bd418a75f08aa3d440df8fc78387feb136a..2093bb8fd43cd07bdcb332ebac8042cc3a3f0487 100644 (file)
Binary files a/Resources/Textures/Mobs/Customization/human_hair.rsi/b.png and b/Resources/Textures/Mobs/Customization/human_hair.rsi/b.png differ

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/b_alt.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/b_alt.png
new file mode 100644 (file)
index 0000000..9f7ddd1
Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/b_alt.png differ

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
index 1540862d2ac1ff0c239908c5a3bc41e35eec99c0..3184166186bd35f8e4f6e2b24191f41367e5f7c6 100644 (file)
--- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
@@ -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, uneven and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack for SS14",
+    "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 and tailed is drawn by Ubaser, doublebun_long by Emisse, longbundled and bob5 sprited by github:DreamlyJack(624946166152298517), pulato.png made by DreamlyJack, b.png and b_alt.png modified and sprited by KingFroozy (github) for SS14",
     "license": "CC-BY-SA-3.0",
     "states": [
       {
@@ -31,6 +31,10 @@
         "name": "b",
         "directions": 4
       },
+      {
+        "name": "b_alt",
+        "directions": 4
+      },
       {
         "name": "baldfade",
         "directions": 4
@@ -687,10 +691,6 @@
         "name": "swept2",
         "directions": 4
       },
-      {
-        "name": "shoulderlengthovereye",
-        "directions": 4
-      },
       {
         "name": "thinning",
         "directions": 4

diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/shoulderlengthovereye.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/shoulderlengthovereye.png
deleted file mode 100644 (file)
index 9e79245..0000000
Binary files a/Resources/Textures/Mobs/Customization/human_hair.rsi/shoulderlengthovereye.png and /dev/null differ