Some new hairstyles! #31010

Futuristic-OK · 2024-08-14T20:14:01Z

About the PR

Two new beautiful hairstyle! (by Pyvik)

Why / Balance

This is beautiful!

Technical details

empty

Media

Requirements

I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

null

Changelog

🆑 Pyvik

add: Added 2 new hairstyles.

png of hairs

hairs meta

hairs yml

hairs named

github-actions · 2024-08-14T20:14:36Z

RSI Diff Bot; head commit 2cf92e9 merging into 54d1d3b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Customization/human_hair.rsi

State	Old	New	Status
longbow			Added
shaped			Added

Edit: diff updated after 2cf92e9

lzk228 · 2024-08-14T20:38:53Z

your cl is broken, should have 🆑 emoji

:cl: Name
- add: add

themias · 2024-08-14T20:47:37Z

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

+      },
+      {
+        "name": "capsdaughter"
+        "directions": 4


Needs commas here after the names

Futuristic-OK · 2024-08-15T04:46:20Z

RSI validator fix in progress

Fixed.

TheShuEd · 2024-08-15T06:40:50Z

Can you show this hairs ingame?

dfghjdbghdrbigrdigiydgbiu · 2024-08-15T08:29:30Z

We have such a problem, the game sees hairstyles, but not in the selection menu, not in hairstyles, not in the admin menu, not in scissors, there are no hairstyles, but the game sees hairstyles in files and reads.

Futuristic-OK · 2024-08-15T08:37:37Z

All fixed. Media appear in few minutes
Or little later...

Done

fix again

again again

again again fix again

Futuristic-OK · 2024-08-15T12:36:12Z

Few other fixes and... maybe... done...
100% done. Im think...

i hate yourself

Futuristic-OK · 2024-08-16T10:57:23Z

Can you show this hairs ingame?

PR media edited

Emisse · 2024-08-19T03:19:04Z

the back of the longer hair is hard to read at a glance

UbaserB · 2024-08-25T07:18:17Z

You coming back to this?

fixxxxx!

Futuristic-OK · 2024-08-29T04:51:53Z

You coming back to this?

Sure!

Futuristic-OK · 2024-08-29T04:52:13Z

the back of the longer hair is hard to read at a glance

Better now?

UbaserB · 2024-09-03T09:20:54Z

Are these change requests from maintainers or some kind of error in the code that GitHub is showing?

its basically master being updated with new content so your stuff is outdated and needs to be fixed

UbaserB

After an internal maintainer vote, we've decided that only the short hair variant should be merged as the long hair version looks more like a coat and is hard to fundamentally fix that with the design given.

dddddd

fix again

Futuristic-OK · 2024-09-22T12:25:20Z

After an internal maintainer vote, we've decided that only the short hair variant should be merged as the long hair version looks more like a coat and is hard to fundamentally fix that with the design given.

New one better?

UbaserB · 2024-09-22T15:45:28Z

New one better?

yeah okay good enough for us lol

UbaserB · 2024-09-22T15:47:03Z

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

@@ -193,3 +193,5 @@ marking-HumanHairVeryshortovereyealternate = Very Short Over Eye
 marking-HumanHairVlongfringe = Very Long with Fringe
 marking-HumanHairVolaju = Volaju
 marking-HumanHairWisp = Wisp
+marking-HumanHairArtist = Artist
+marking-HumanHairCapsdaughter = Caps Daughter


last minor nitpick, this is a weird name for a hair, maybe make it more generic

UbaserB · 2024-09-22T15:49:30Z

oh i was just checking the sprite again lol. there are a couple stray pixels here, make it match the other side view please. then good to merge.

ddsdssddssddsdsds

Futuristic-OK · 2024-09-23T12:56:10Z

oh i was just checking the sprite again lol. there are a couple stray pixels here, make it match the other side view please. then good to merge.

Fixed.
Now it "Shaped" and "Long Bow"

screw this im just going to update it myself webops time

UbaserB · 2024-09-25T03:45:48Z

I was going to webedit ops the last changes needed but then forgot that you cant rename images remotely like this, can you change the file names so that it matches?

Futuristic-OK · 2024-09-28T03:09:07Z

Yes. I can

I was going to webedit ops the last changes needed but then forgot that you cant rename images remotely like this, can you change the file names so that it matches?

Yes, i can. It take few minutes

Futuristic-OK · 2024-09-28T03:14:03Z

Done, i think.
If doesn`t, I can use other way to rename it

UbaserB · 2024-09-28T06:07:36Z

Thanks for the contribution, sorry for jumping back and forth with the reviews!

* Add files via upload png of hairs * Update meta.json hairs meta * Update human_hair.yml hairs yml * Update human-hair.ftl hairs named * second try * fix meta * Add files via upload * Add files via upload fix again * Add files via upload again again * Add files via upload again again fix again * Add files via upload i hate yourself * Add files via upload fixxxxx! * Add files via upload aaagaaaaiiin * dd dddddd * Add files via upload fix again * Add files via upload ddsdssddssddsdsds * Update human-hair.ftl * Update human-hair.ftl screw this im just going to update it myself webops time * Update human_hair.yml * Update meta.json * Rename capsdaughter.png to longbow.png * Rename artist.png to shaped.png --------- Co-authored-by: Ubaser <[email protected]>

Futuristic-OK added 5 commits August 13, 2024 19:23

Add files via upload

34765dd

png of hairs

Update meta.json

39935e2

hairs meta

Update human_hair.yml

a9dfb60

hairs yml

Update human-hair.ftl

5b04b1d

hairs named

second try

b45bc09

github-actions bot added No C# For things that don't need code. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. labels Aug 14, 2024

themias reviewed Aug 14, 2024

View reviewed changes

fix meta

7315c7b

Add files via upload

dd12e7b

Futuristic-OK added 3 commits August 15, 2024 18:12

Add files via upload

cf90385

fix again

Add files via upload

0b7b538

again again

Add files via upload

d776a42

again again fix again

Add files via upload

7130b63

i hate yourself

deathride58 added the Undergoing Maintainer Discussion This PR is currently going through an internal discussion by the maintainer team. label Aug 19, 2024

UbaserB added the Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. label Aug 21, 2024

Add files via upload

a22dfc7

fixxxxx!

UbaserB removed the Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. label Aug 29, 2024

Merge branch 'master' into new-hairs

6730b01

github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Sep 3, 2024

UbaserB requested changes Sep 20, 2024

View reviewed changes

UbaserB added Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. and removed Status: Needs Review This PR requires new reviews before it can be merged. labels Sep 20, 2024

Futuristic-OK added 2 commits September 22, 2024 18:22

dd

c48db3c

dddddd

Add files via upload

8766424

fix again

UbaserB reviewed Sep 22, 2024

View reviewed changes

Futuristic-OK added 2 commits September 23, 2024 18:04

Add files via upload

9c38aae

ddsdssddssddsdsds

Update human-hair.ftl

91ea756

Futuristic-OK requested a review from UbaserB September 24, 2024 08:30

github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged. and removed Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. labels Sep 24, 2024

UbaserB added 3 commits September 25, 2024 13:41

Update human-hair.ftl

fec038f

screw this im just going to update it myself webops time

Update human_hair.yml

12ff029

Update meta.json

bc68ef3

Futuristic-OK added 2 commits September 28, 2024 09:12

Rename capsdaughter.png to longbow.png

2679535

Rename artist.png to shaped.png

2cf92e9

UbaserB approved these changes Sep 28, 2024

View reviewed changes

UbaserB merged commit a371de1 into space-wizards:master Sep 28, 2024
13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Some new hairstyles! #31010

Some new hairstyles! #31010

Futuristic-OK commented Aug 14, 2024 •

edited by UbaserB

Loading

github-actions bot commented Aug 14, 2024 •

edited

Loading

lzk228 commented Aug 14, 2024

themias Aug 14, 2024

Futuristic-OK Aug 15, 2024

Futuristic-OK commented Aug 15, 2024 •

edited

Loading

TheShuEd commented Aug 15, 2024

dfghjdbghdrbigrdigiydgbiu commented Aug 15, 2024 •

edited

Loading

Futuristic-OK commented Aug 15, 2024 •

edited

Loading

Futuristic-OK commented Aug 15, 2024 •

edited

Loading

Futuristic-OK commented Aug 16, 2024

Emisse commented Aug 19, 2024

UbaserB commented Aug 25, 2024

Futuristic-OK commented Aug 29, 2024

Futuristic-OK commented Aug 29, 2024

UbaserB commented Sep 3, 2024

UbaserB left a comment

Futuristic-OK commented Sep 22, 2024

UbaserB commented Sep 22, 2024

UbaserB Sep 22, 2024 •

edited

Loading

UbaserB commented Sep 22, 2024

Futuristic-OK commented Sep 23, 2024

UbaserB commented Sep 25, 2024 •

edited

Loading

Futuristic-OK commented Sep 28, 2024

Futuristic-OK commented Sep 28, 2024 •

edited

Loading

UbaserB commented Sep 28, 2024

Some new hairstyles! #31010

Some new hairstyles! #31010

Conversation

Futuristic-OK commented Aug 14, 2024 • edited by UbaserB Loading

About the PR

Why / Balance

Technical details

Media

Requirements

Breaking changes

github-actions bot commented Aug 14, 2024 • edited Loading

lzk228 commented Aug 14, 2024

themias Aug 14, 2024

Choose a reason for hiding this comment

Futuristic-OK Aug 15, 2024

Choose a reason for hiding this comment

Futuristic-OK commented Aug 15, 2024 • edited Loading

TheShuEd commented Aug 15, 2024

dfghjdbghdrbigrdigiydgbiu commented Aug 15, 2024 • edited Loading

Futuristic-OK commented Aug 15, 2024 • edited Loading

Futuristic-OK commented Aug 15, 2024 • edited Loading

Futuristic-OK commented Aug 16, 2024

Emisse commented Aug 19, 2024

UbaserB commented Aug 25, 2024

Futuristic-OK commented Aug 29, 2024

Futuristic-OK commented Aug 29, 2024

UbaserB commented Sep 3, 2024

UbaserB left a comment

Choose a reason for hiding this comment

Futuristic-OK commented Sep 22, 2024

UbaserB commented Sep 22, 2024

UbaserB Sep 22, 2024 • edited Loading

Choose a reason for hiding this comment

UbaserB commented Sep 22, 2024

Futuristic-OK commented Sep 23, 2024

UbaserB commented Sep 25, 2024 • edited Loading

Futuristic-OK commented Sep 28, 2024

Futuristic-OK commented Sep 28, 2024 • edited Loading

UbaserB commented Sep 28, 2024

Futuristic-OK commented Aug 14, 2024 •

edited by UbaserB

Loading

github-actions bot commented Aug 14, 2024 •

edited

Loading

Futuristic-OK commented Aug 15, 2024 •

edited

Loading

dfghjdbghdrbigrdigiydgbiu commented Aug 15, 2024 •

edited

Loading

Futuristic-OK commented Aug 15, 2024 •

edited

Loading

Futuristic-OK commented Aug 15, 2024 •

edited

Loading

UbaserB Sep 22, 2024 •

edited

Loading

UbaserB commented Sep 25, 2024 •

edited

Loading

Futuristic-OK commented Sep 28, 2024 •

edited

Loading