mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-23 03:56:27 +01:00
Merge pull request #3861 from Belsima/hair
Adds a bunch of new hair styles.
This commit is contained in:
@@ -188,6 +188,10 @@
|
||||
name = "Bedhead 3"
|
||||
icon_state = "hair_bedheadv3"
|
||||
|
||||
bedheadlong
|
||||
name = "Bedhead Long"
|
||||
icon_state = "hair_long_bedhead"
|
||||
|
||||
beehive
|
||||
name = "Beehive"
|
||||
icon_state = "hair_beehive"
|
||||
@@ -616,6 +620,30 @@
|
||||
manbun
|
||||
name = "Manbun"
|
||||
icon_state = "hair_manbun"
|
||||
|
||||
shy
|
||||
name = "Shy"
|
||||
icon_state = "hair_shy"
|
||||
|
||||
jade
|
||||
name = "Jade"
|
||||
icon_state = "hair_jade"
|
||||
|
||||
country
|
||||
name = "Country"
|
||||
icon_state = "hair_country"
|
||||
|
||||
rosa
|
||||
name = "Rosa"
|
||||
icon_state = "hair_rosa"
|
||||
|
||||
dave
|
||||
name = "Dave"
|
||||
icon_state = "hair_dave"
|
||||
|
||||
mohawkunshaven
|
||||
name = "Unshaven Mohawk"
|
||||
icon_state = "hair_unshaven_mohawk"
|
||||
/*
|
||||
///////////////////////////////////
|
||||
/ =---------------------------= /
|
||||
@@ -746,6 +774,18 @@
|
||||
chinless
|
||||
name = "Chinless Beard"
|
||||
icon_state = "facial_chinlessbeard"
|
||||
|
||||
tribeard
|
||||
name = "Tribeard"
|
||||
icon_state = "facial_tribeard"
|
||||
|
||||
moonshiner
|
||||
name = "Moonshiner"
|
||||
icon_state = "facial_moonshiner"
|
||||
|
||||
martial
|
||||
name = "Martial Artist"
|
||||
icon_state = "facial_martialartist"
|
||||
/*
|
||||
///////////////////////////////////
|
||||
/ =---------------------------= /
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Belsima
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- imageadd: "Added a bunch of new hairstyles."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 85 KiB |
Reference in New Issue
Block a user