Skip to content

Commit

Permalink
Merge pull request TauCetiStation#255 from dred1792/newhair2hotfix
Browse files Browse the repository at this point in the history
Хотфикс
  • Loading branch information
DieSiege authored Sep 30, 2018
2 parents e224894 + dd4ed3f commit b8639c1
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 38 deletions.
68 changes: 30 additions & 38 deletions code/modules/mob/dead/new_player/sprite_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -674,14 +674,6 @@
name = "Blunt Bangs"
icon_state = "hair_bluntbangs"

/datum/sprite_accessory/hair/whispybangshigh
name = "Whispy Bangish"
icon_state = "hair_whispybangshigh"

/datum/sprite_accessory/hair/whispybangs
name = "Whispy Bangs"
icon_state = "hair_whispybangs"

/datum/sprite_accessory/hair/combedbob
name = "Combed Bob"
icon_state = "hair_combedbob"
Expand Down Expand Up @@ -715,126 +707,126 @@
icon_state = "hair_ponytailf"
gender = FEMALE

/datum/sprite_accessory/hair/wisp
/datum/sprite_accessory/hair/wisp
name = "Wisp"
icon_state = "hair_wisp"
gender = FEMALE

/datum/sprite_accessory/hair/halfshaved
/datum/sprite_accessory/hair/halfshaved
name = "Half-Shaved Emo"
icon_state = "hair_halfshaved2"

/datum/sprite_accessory/hair/longeralt2
/datum/sprite_accessory/hair/longeralt2
name = "Long Hair Alt 2"
icon_state = "hair_longeralt2"

/datum/sprite_accessory/hair/bun4
/datum/sprite_accessory/hair/bun4
name = "Bun 4"
icon_state = "hair_bun4"

/datum/sprite_accessory/hair/doublebun
/datum/sprite_accessory/hair/doublebun
name = "Double-Bun"
icon_state = "hair_doublebun"

/datum/sprite_accessory/hair/rows
/datum/sprite_accessory/hair/rows
name = "Rows"
icon_state = "hair_rows1"

/datum/sprite_accessory/hair/rows2
/datum/sprite_accessory/hair/rows2
name = "Rows 2"
icon_state = "hair_rows2"

/datum/sprite_accessory/hair/twintail
/datum/sprite_accessory/hair/twintail
name = "Twintail"
icon_state = "hair_twintail"

/datum/sprite_accessory/hair/coffeehouse
/datum/sprite_accessory/hair/coffeehouse
name = "Coffee House Cut"
icon_state = "hair_coffeehouse"

gender = MALE
/datum/sprite_accessory/hair/veryshortovereye
/datum/sprite_accessory/hair/veryshortovereye
name = "Overeye Very Short"
icon_state = "hair_veryshortovereye"

/datum/sprite_accessory/hair/oxton
/datum/sprite_accessory/hair/oxton
name = "Oxton"
icon_state = "hair_oxton"

/datum/sprite_accessory/hair/zieglertail
/datum/sprite_accessory/hair/zieglertail
name = "Zieglertail"
icon_state = "hair_ziegler"

/datum/sprite_accessory/hair/fringeemo
/datum/sprite_accessory/hair/fringeemo
name = "Emo Fringe"
icon_state = "hair_emofringe"

/datum/sprite_accessory/hair/poofy2
/datum/sprite_accessory/hair/poofy2
name = "Poofy2"
icon_state = "hair_poofy2"

/datum/sprite_accessory/hair/fringetail
/datum/sprite_accessory/hair/fringetail
name = "Fringetail"
icon_state = "hair_fringetail"

/datum/sprite_accessory/hair/bun3
/datum/sprite_accessory/hair/bun3
name = "Bun 3"
icon_state = "hair_bun3"

/datum/sprite_accessory/hair/veryshortovereyealternate
/datum/sprite_accessory/hair/veryshortovereyealternate
name = "Overeye Very Short, Alternate"
icon_state = "hair_veryshortovereyealternate"

/datum/sprite_accessory/hair/undercut2
/datum/sprite_accessory/hair/undercut2
name = "Undercut Swept Right"
icon_state = "hair_undercut2"
gender = MALE

/datum/sprite_accessory/hair/spikyponytail
/datum/sprite_accessory/hair/spikyponytail
name = "Spiky Ponytail"
icon_state = "hair_spikyponytail"

/datum/sprite_accessory/hair/grandebraid
/datum/sprite_accessory/hair/grandebraid
name = "Grande Braid"
icon_state = "hair_grande"

/datum/sprite_accessory/hair/fringetail
/datum/sprite_accessory/hair/fringetail
name = "Fringetail"
icon_state = "hair_fringetail"

/datum/sprite_accessory/hair/rowbun
/datum/sprite_accessory/hair/rowbun
name = "Row Bun"
icon_state = "hair_rowbun"

/datum/sprite_accessory/hair/rowdualbraid
/datum/sprite_accessory/hair/rowdualbraid
name = "Row Dual Braid"
icon_state = "hair_rowdualtail"

/datum/sprite_accessory/hair/rowbraid
/datum/sprite_accessory/hair/rowbraid
name = "Row Braid"
icon_state = "hair_rowbraid"

/datum/sprite_accessory/hair/regulationmohawk
/datum/sprite_accessory/hair/regulationmohawk
name = "Regulation Mohawk"
icon_state = "hair_shavedmohawk"

/datum/sprite_accessory/hair/topknot
/datum/sprite_accessory/hair/topknot
name = "Topknot"
icon_state = "hair_topknot"

/datum/sprite_accessory/hair/ronin
/datum/sprite_accessory/hair/ronin
name = "Ronin"
icon_state = "hair_ronin"

/datum/sprite_accessory/hair/bowlcut2
/datum/sprite_accessory/hair/bowlcut2
name = "Bowl 2"
icon_state = "hair_bowlcut2"

/datum/sprite_accessory/hair/manbun
/datum/sprite_accessory/hair/manbun
name = "Manbun"
icon_state = "hair_manbun"

/datum/sprite_accessory/hair/country
/datum/sprite_accessory/hair/country
name = "Country"
icon_state = "hair_country"

Expand Down
Binary file modified icons/mob/human_face.dmi
Binary file not shown.

0 comments on commit b8639c1

Please sign in to comment.