Skip to content

Commit

Permalink
Merge pull request #5856 from Smokingsquirrel/rogue-hair
Browse files Browse the repository at this point in the history
Adds Hair from Rogue
  • Loading branch information
Trilbyspaceclone authored Nov 21, 2024
2 parents 4abf314 + bc0f7b2 commit ceca0ee
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 0 deletions.
50 changes: 50 additions & 0 deletions code/modules/sprite_accessories/_accessory_hair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
name = "Bald"
icon_state = "bald"

/datum/sprite_accessory/hair/acolyte
name = "Acolyte"
icon_state = "acolyte"

/datum/sprite_accessory/hair/afro
name = "Afro"
icon_state = "afro"
Expand Down Expand Up @@ -119,6 +123,13 @@
name = "Bobcurl"
icon_state = "bobcurl"

/* Needs a bit more sprite rework
/datum/sprite_accessory/hair/bob_long
name = "Long bob"
icon_state = "bob_long"
*/

/datum/sprite_accessory/hair/bowl1
name = "Bowl"
icon_state = "bowlcut1"
Expand Down Expand Up @@ -159,6 +170,10 @@
name = "Business 4"
icon_state = "business4"

/datum/sprite_accessory/hair/busness5
name = "Business 5"
icon_state = "business5"

/datum/sprite_accessory/hair/bun
name = "Bun"
icon_state = "bun"
Expand Down Expand Up @@ -215,6 +230,13 @@
name = "Crewcut"
icon_state = "crewcut"

/* needs blackscaling
/datum/sprite_accessory/hair/courtly
name = "Courtly"
icon_state = "courtly"
*/

/datum/sprite_accessory/hair/crono
name = "Chrono"
icon_state = "toriyama"
Expand Down Expand Up @@ -456,6 +478,10 @@
name = "Long"
icon_state = "vlong"

/datum/sprite_accessory/hair/longeralt1
name = "Long Alternative"
icon_state = "vlong_alt"

/datum/sprite_accessory/hair/longeralt2
name = "Long 2"
icon_state = "longeralt2"
Expand Down Expand Up @@ -580,6 +606,14 @@
name = "Parted"
icon_state = "parted"

/datum/sprite_accessory/hair/pigtails2
name = "Pigtails 2"
icon_state = "pigtails2"

/datum/sprite_accessory/hair/pigtails3
name = "Pigtails 3"
icon_state = "pigtails3"

/datum/sprite_accessory/hair/pixie
name = "Pixie"
icon_state = "pixie"
Expand Down Expand Up @@ -616,6 +650,10 @@
name = "Ponytail 7"
icon_state = "ponytail7"

/datum/sprite_accessory/hair/ponytail8
name = "Ponytail 8"
icon_state = "ponytail8"

/datum/sprite_accessory/hair/poofy
name = "Poofy"
icon_state = "poofy"
Expand All @@ -636,6 +674,10 @@
name = "Ramona"
icon_state = "ramona"

/datum/sprite_accessory/hair/recruit
name = "Recruit"
icon_state = "recruit"

/datum/sprite_accessory/hair/reversemohawk
name = "Reverse Mohawk"
icon_state = "reversemohawk"
Expand Down Expand Up @@ -764,6 +806,10 @@
name = "One Shoulder"
icon_state = "oneshoulder"

/datum/sprite_accessory/hair/tartar
name = "Tartar"
icon_state = "tartar"

/datum/sprite_accessory/hair/thinning
name = "Thinning"
icon_state = "thinning"
Expand Down Expand Up @@ -824,6 +870,10 @@
name = "Vivi"
icon_state = "vivi"

/datum/sprite_accessory/hair/viking
name = "Viking"
icon_state = "viking"

/datum/sprite_accessory/hair/volaju
name = "Volaju"
icon_state = "volaju"
Expand Down
Binary file modified icons/mob/hair.dmi
Binary file not shown.
Binary file modified icons/mob/human_races/species/human/hair.dmi
Binary file not shown.

0 comments on commit ceca0ee

Please sign in to comment.