Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Additional Hair Options. #1689

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,10 @@ marking-HumanHairStarFro = Star Fro
marking-HumanHairStyledCurls = Styled Curls
marking-HumanHairUnkemptScientist = Unkempt Scientist
marking-HumanHairWispy = Wispy
marking-HumanHairHightight = High & Tight
marking-HumanHairBuzzhawk = Buzz Hawk
marking-HumanHairShavedbun = Shaved Loose Bun
marking-HumanHairLoosebun = Loose Bun
marking-HumanHairSergeantcut = Drill Sergeant Cut
marking-HumanHairFullshave = Full Buzz Cut
marking-HumanHairCiacombover = CIA Comb Over
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,38 @@
sprites:
- sprite: _Goobstation/Mobs/Customization/human_hair.rsi
state: frizzyBraid

- type: marking
id: HumanHairHightight
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: _Goobstation/Mobs/Customization/human_hair.rsi
state: hightight

- type: marking
id: HumanHairBuzzhawk
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: _Goobstation/Mobs/Customization/human_hair.rsi
state: buzzhawk

- type: marking
id: HumanHairShavedbun
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: _Goobstation/Mobs/Customization/human_hair.rsi
state: shavedbun

- type: marking
id: HumanHairLoosebun
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: _Goobstation/Mobs/Customization/human_hair.rsi
state: loosebun

- type: marking
id: HumanHairWispy
Expand All @@ -262,3 +294,27 @@
sprites:
- sprite: _Goobstation/Mobs/Customization/human_hair.rsi
state: wispy

- type: marking
id: HumanHairSergeantcut
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: _Goobstation/Mobs/Customization/human_hair.rsi
state: sergeantcut

- type: marking
id: HumanHairFullshave
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: _Goobstation/Mobs/Customization/human_hair.rsi
state: fullshave

- type: marking
id: HumanHairCiacombover
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: _Goobstation/Mobs/Customization/human_hair.rsi
state: ciacombover
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,143 +1,171 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"copyright": "Sprited by Bloomyex and implemented by RobynTheWarcrime, FrizzyBraid by Renee - https://discord.com/channels/1202734573247795300/1288192265319223387/1288887697917607936 | flatTwistsUpdo edited by Skubman",
"license": "CC-BY-SA-3.0",
"states": [
{
"name": "braidedExtensions",
"directions": 4
},
{
"name": "cometTail",
"directions": 4
},
{
"name": "fantasyHair",
"directions": 4
},
{
"name": "flatTwistsUpdo",
"directions": 4
},
{
"name": "floorlengthBraid",
"directions": 4
},
{
"name": "floorlengthWavy",
"directions": 4
},
{
"name": "frizzyBraid",
"directions": 4
},
{
"name": "frontBraidsLong",
"directions": 4
},
{
"name": "frontBraidsMedium",
"directions": 4
},
{
"name": "frontBraidsShort",
"directions": 4
},
{
"name": "hairnet",
"directions": 4
},
{
"name": "jellyfish",
"directions": 4
},
{
"name": "kazuyaMishima",
"directions": 4
},
{
"name": "longBraids",
"directions": 4
},
{
"name": "longCurvy",
"directions": 4
},
{
"name": "longPompadour",
"directions": 4
},
{
"name": "mediumCurls",
"directions": 4
},
{
"name": "mullet",
"directions": 4
},
{
"name": "pelvicLengthBraid",
"directions": 4
},
{
"name": "plateau",
"directions": 4
},
{
"name": "queenBee",
"directions": 4
},
{
"name": "saggedMohawk",
"directions": 4
},
{
"name": "sharpMohawk",
"directions": 4
},
{
"name": "shortAndPoofy",
"directions": 4
},
{
"name": "shortCurls",
"directions": 4
},
{
"name": "shoulderLengthBraid",
"directions": 4
},
{
"name": "sideSpike",
"directions": 4
},
{
"name": "spaceLoops",
"directions": 4
},
{
"name": "star",
"directions": 4
},
{
"name": "starFro",
"directions": 4
},
{
"name": "styledCurls",
"directions": 4
},
{
"name": "unkemptScientist",
"directions": 4
},
{
"name": "wispy",
"directions": 4
}
]
}
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by Bloomyex and implemented by RobynTheWarcrime, FrizzyBraid by Renee - https://discord.com/channels/1202734573247795300/1288192265319223387/1288887697917607936 | flatTwistsUpdo edited by Skubman, https://github.com/cmss13-devs/cmss13/blob/5ac4050eacf80ca5216402ded336f3efb2fb003e/icons/mob/humans/human_hair.dmi, https://github.com/cmss13-devs/cmss13/blob/5ac4050eacf80ca5216402ded336f3efb2fb003e/icons/mob/humans/human_hair.dmi, https://github.com/cmss13-devs/cmss13/blob/5ac4050eacf80ca5216402ded336f3efb2fb003e/icons/mob/humans/human_hair.dmi, https://github.com/cmss13-devs/cmss13/blob/5ac4050eacf80ca5216402ded336f3efb2fb003e/icons/mob/humans/human_hair.dmi, https://github.com/cmss13-devs/cmss13/blob/5ac4050eacf80ca5216402ded336f3efb2fb003e/icons/mob/humans/human_hair.dmi, https://github.com/cmss13-devs/cmss13/blob/5ac4050eacf80ca5216402ded336f3efb2fb003e/icons/mob/humans/human_hair.dmi, https://github.com/cmss13-devs/cmss13/blob/5ac4050eacf80ca5216402ded336f3efb2fb003e/icons/mob/humans/human_hair.dmi",
angelofallars marked this conversation as resolved.
Show resolved Hide resolved
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "braidedExtensions",
"directions": 4
},
{
"name": "cometTail",
"directions": 4
},
{
"name": "fantasyHair",
"directions": 4
},
{
"name": "flatTwistsUpdo",
"directions": 4
},
{
"name": "floorlengthBraid",
"directions": 4
},
{
"name": "floorlengthWavy",
"directions": 4
},
{
"name": "frizzyBraid",
"directions": 4
},
{
"name": "frontBraidsLong",
"directions": 4
},
{
"name": "frontBraidsMedium",
"directions": 4
},
{
"name": "frontBraidsShort",
"directions": 4
},
{
"name": "hairnet",
"directions": 4
},
{
"name": "jellyfish",
"directions": 4
},
{
"name": "kazuyaMishima",
"directions": 4
},
{
"name": "longBraids",
"directions": 4
},
{
"name": "longCurvy",
"directions": 4
},
{
"name": "longPompadour",
"directions": 4
},
{
"name": "mediumCurls",
"directions": 4
},
{
"name": "mullet",
"directions": 4
},
{
"name": "pelvicLengthBraid",
"directions": 4
},
{
"name": "plateau",
"directions": 4
},
{
"name": "queenBee",
"directions": 4
},
{
"name": "saggedMohawk",
"directions": 4
},
{
"name": "sharpMohawk",
"directions": 4
},
{
"name": "shortAndPoofy",
"directions": 4
},
{
"name": "shortCurls",
"directions": 4
},
{
"name": "shoulderLengthBraid",
"directions": 4
},
{
"name": "sideSpike",
"directions": 4
},
{
"name": "spaceLoops",
"directions": 4
},
{
"name": "star",
"directions": 4
},
{
"name": "starFro",
"directions": 4
},
{
"name": "styledCurls",
"directions": 4
},
{
"name": "unkemptScientist",
"directions": 4
},
{
"name": "wispy",
"directions": 4
},
{
"name": "loosebun",
"directions": 4
},
{
"name": "shavedbun",
"directions": 4
},
{
"name": "buzzhawk",
"directions": 4
},
{
"name": "hightight",
"directions": 4
},
{
"name": "sergeantcut",
"directions": 4
},
{
"name": "fullshave",
"directions": 4
},
{
"name": "ciacombover",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading