Skip to content

Commit

Permalink
Ports 8 hairstyles from Citadel (#19205)
Browse files Browse the repository at this point in the history
From
Citadel-Station-13/Citadel-Station-13-RP#6109

To address the elephant in the room; yes, these are reference hairs. I
think they should get in anyway because they look good, we don't have
enough good hairstyles, and we literally have Vegeta hair titled
'Vegeta' ingame already. I can rename them if you suggest new names, if
that is preferred. I just couldn't think of any.

Accidentally deleted the branch. Oopsies! Old PR:
#19204
  • Loading branch information
listerla authored Jun 9, 2024
1 parent ec194f9 commit 551b153
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 0 deletions.
40 changes: 40 additions & 0 deletions code/modules/mob/abstract/new_player/sprite_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,12 @@ Follow by example and make good judgement based on length which list to include
length = 3
chatname = "hair drills"

/datum/sprite_accessory/hair/eagle
name = "Eagle"
icon_state = "hair_eagle"
length = 1
chatname = "short hair"

/datum/sprite_accessory/hair/emo
name = "Emo"
icon_state = "hair_emo"
Expand Down Expand Up @@ -565,6 +571,12 @@ Follow by example and make good judgement based on length which list to include
icon_state = "hair_fade_none"
chatname = "short hair"

/datum/sprite_accessory/hair/falcon
name = "Falcon"
icon_state = "hair_falcon"
length = 3
chatname = "very long hair"

/datum/sprite_accessory/hair/father
name = "Father"
icon_state = "hair_father"
Expand Down Expand Up @@ -702,6 +714,12 @@ Follow by example and make good judgement based on length which list to include
icon_state = "hair_hitop"
chatname = "hitop"

/datum/sprite_accessory/hair/hummingbird
name = "Hummingbird"
icon_state = "hair_hummingbird"
length = 2
chatname = "long hair"

/datum/sprite_accessory/hair/jade
name = "Jade"
icon_state = "hair_jade"
Expand Down Expand Up @@ -759,6 +777,28 @@ Follow by example and make good judgement based on length which list to include
length = 4
chatname = "very long hair"

/datum/sprite_accessory/hair/macaw
name = "Macaw"
icon_state = "hair_macaw"
length = 2
chatname = "long hair"

/datum/sprite_accessory/hair/magpie
name = "Magpie, 1"
icon_state = "hair_magpie"

/datum/sprite_accessory/hair/magpie/two
name = "Magpie, 2"
icon_state = "hair_magpie2"

/datum/sprite_accessory/hair/magpie/three
name = "Magpie, 3"
icon_state = "hair_magpie3"

/datum/sprite_accessory/hair/magpie/four
name = "Magpie, 4"
icon_state = "hair_magpie4"

/datum/sprite_accessory/hair/marysue
name = "Mary Sue"
icon_state = "hair_marysue"
Expand Down
4 changes: 4 additions & 0 deletions html/changelogs/hairport.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: Pirouette, AlphaM01
delete-after: True
changes:
- imageadd: "Ported a few hairstyles; Eagle, Falcon, Hummingbird, Macaw, and four varieties of Magpie."
Binary file modified icons/mob/human_face/hair.dmi
Binary file not shown.

0 comments on commit 551b153

Please sign in to comment.