Skip to content

Commit 3d0485f

Browse files
authored
Shoulder-length hairstyles resprite (space-wizards#37000)
* sprite * final * final (final fr)
1 parent b3ea8ee commit 3d0485f

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

‎Resources/Locale/en-US/accessories/human-hair.ftl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ marking-HumanHairShorthairg = Short Hair 7
163163
marking-HumanHair80s = Short Hair 80s
164164
marking-HumanHairRosa = Short Hair Rosa
165165
marking-HumanHairB = Shoulder-length Hair
166-
marking-HumanHairShoulderLengthOverEye = Shoulder-length Over Eye
166+
marking-HumanHairBAlt = Shoulder-length Hair (Over eye)
167167
marking-HumanHairSidecut = Sidecut
168168
marking-HumanHairSkinhead = Skinhead
169169
marking-HumanHairProtagonist = Slightly Long Hair
@@ -192,7 +192,7 @@ marking-HumanHairUpdo = Updo
192192
marking-HumanHairVlong = Very Long Hair
193193
marking-HumanHairLongest = Very Long Hair 2
194194
marking-HumanHairLongest2 = Very Long Over Eye
195-
marking-HumanHairVeryshortovereyealternate = Very Short Over Eye
195+
marking-HumanHairVeryshortovereyealternate = Very Short (Over Eye)
196196
marking-HumanHairVlongfringe = Very Long with Fringe
197197
marking-HumanHairVolaju = Volaju
198198
marking-HumanHairWisp = Wisp

‎Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,12 +1189,12 @@
11891189
- sprite: Mobs/Customization/human_hair.rsi
11901190
state: swept2
11911191
- type: marking
1192-
id: HumanHairShoulderLengthOverEye
1192+
id: HumanHairBAlt
11931193
bodyPart: Hair
11941194
markingCategory: Hair
11951195
sprites:
11961196
- sprite: Mobs/Customization/human_hair.rsi
1197-
state: shoulderlengthovereye
1197+
state: b_alt
11981198
- type: marking
11991199
id: HumanHairThinning
12001200
bodyPart: Hair
10 Bytes
Loading
703 Bytes
Loading

‎Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"x": 32,
55
"y": 32
66
},
7-
"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",
7+
"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",
88
"license": "CC-BY-SA-3.0",
99
"states": [
1010
{
@@ -31,6 +31,10 @@
3131
"name": "b",
3232
"directions": 4
3333
},
34+
{
35+
"name": "b_alt",
36+
"directions": 4
37+
},
3438
{
3539
"name": "baldfade",
3640
"directions": 4
@@ -687,10 +691,6 @@
687691
"name": "swept2",
688692
"directions": 4
689693
},
690-
{
691-
"name": "shoulderlengthovereye",
692-
"directions": 4
693-
},
694694
{
695695
"name": "thinning",
696696
"directions": 4
Binary file not shown.

0 commit comments

Comments
 (0)