Add Additional Hair Options.

[troytroy400]

Description

Adds some new hair options pulled from RMC/CM13. Credit to @Tunguso4ka for converting the sprites to the SS14 format. PR moved from previous PR (Goob-Station/Goob-Station-MRP#74) to here by the request of @CerberusWolfie

---

TODO

N/A

---

Changelog

• add: New Hair: Loose Bun, Shaved Bun, Buzzhawk, High & Tight, Drill Sergeant Cut, Full Buzz Cut and CIA Comb Over.

[github-actions]

RSI Diff Bot; head commit bda8142 merging into 65362e5
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Goobstation/Mobs/Customization/human_hair.rsi

State	Old	New	Status
shortAndPoofy			Modified
shortCurls			Modified
shoulderLengthBraid			Modified
sideSpike			Modified
spaceLoops			Modified
star			Modified
starFro			Modified
styledCurls			Modified
unkemptScientist			Modified
wispy			Modified
braidedExtensions			Removed
cometTail			Removed
fantasyHair			Removed
flatTwistsUpdo			Removed
floorlengthBraid			Removed
floorlengthWavy			Removed
frizzyBraid			Removed
frontBraidsLong			Removed
frontBraidsMedium			Removed
frontBraidsShort			Removed
hairnet			Removed
jellyfish			Removed
kazuyaMishima			Removed
longBraids			Removed
longCurvy			Removed
longPompadour			Removed
mediumCurls			Removed
mullet			Removed
pelvicLengthBraid			Removed
plateau			Removed
queenBee			Removed
saggedMohawk			Removed
sharpMohawk			Removed
buzzhawk			Added
ciacombover			Added
fullshave			Added
hightight			Added
loosebun			Added
sergeantcut			Added

Resources/Textures/_EE/Mobs/Customization/human_hair.rsi

State	Old	New	Status
buzzhawk			Added
ciacombover			Added
flyboy			Added
fullshave			Added
hightight			Added
loosebun			Added
loosebunshaved			Added
outwardponytail			Added
overeyeponytail			Added
sergeantcut			Added
stubbleshave			Added

Edit: diff updated after bda8142

[stellar-novas]

@Tunguso4ka Do you want to be credited in the changelog and/or credited as a commit co-author?

(@ maintainers If they say yes, I'll handle merging)

[angelofallars]

I got one more request. Instead of putting these in the _Goobstation namespace, put them in the _EE namespace since this is not a goobstation PR anymore.

[troytroy400]

I got one more request. Instead of putting these in the _Goobstation namespace, put them in the _EE namespace since this is not a goobstation PR anymore.

I'm looking through and I noticed that the _EE namespace doesn't have a hair.rsi nor preexisting YML or FTL for adding the hair. Would I just essentially make clones of the existing files and change the pathing to be under _EE or is there something more I would need to do?

[angelofallars]

I got one more request. Instead of putting these in the _Goobstation namespace, put them in the _EE namespace since this is not a goobstation PR anymore.

I'm looking through and I noticed that the _EE namespace doesn't have a hair.rsi nor preexisting YML or FTL for adding the hair. Would I just essentially make clones of the existing files and change the pathing to be under _EE or is there something more I would need to do?

Yes, you should just essentially make clones of the existing files but just with the new hairs.

[troytroy400]

Yes, you should just essentially make clones of the existing files but just with the new hairs.

Alrighty, it should all be moved over to EE now. I still have the goobstation changes left over and I'm new to this so I have no idea how to remove them, is it possible to selectively merge only the EE files?

[Tunguso4ka]

@Tunguso4ka Do you want to be credited in the changelog and/or credited as a commit co-author?

no. Its okay.

[angelofallars]

Yes, you should just essentially make clones of the existing files but just with the new hairs.

Alrighty, it should all be moved over to EE now. I still have the goobstation changes left over and I'm new to this so I have no idea how to remove them, is it possible to selectively merge only the EE files?

You can "reset" files/directories to their equivalent in master using this git command:
git checkout origin/master -- path/to/file
https://stackoverflow.com/a/4427783

So you'd need to run the command for Resources/Locale/en-US/_Goobstation/accessories/human-hair.ftl, Resources/Prototypes/_Goobstation/Entities/Mobs/Customization/Markings/human_hair.yml, and the directory Resources/Textures/_Goobstation/Mobs/Customization/human_hair.rsi/.