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

New haircuts and small fix #1664

Merged
merged 1 commit into from
Nov 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
50 changes: 50 additions & 0 deletions modular_ss220/hairs/code/human_hair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -693,3 +693,53 @@
icon_state = "punk_lying"
secondary_theme = "acs"
species_allowed = list("Human", "Slime People", "Tajaran")

/datum/sprite_accessory/hair/halfshave
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Halfshave"
icon_state = "halfshave"
species_allowed = list("Human", "Slime People", "Tajaran")

/datum/sprite_accessory/hair/ruby
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Ruby"
icon_state = "ruby"
species_allowed = list("Human", "Slime People", "Tajaran")

/datum/sprite_accessory/hair/long_flipped
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Long Flipped"
icon_state = "long_flipped"
species_allowed = list("Human", "Slime People", "Tajaran")

/datum/sprite_accessory/hair/himeup
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Hime Big Ponytail"
icon_state = "himeup"
species_allowed = list("Human", "Slime People", "Tajaran")

/datum/sprite_accessory/hair/rosemary
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Rosemary"
icon_state = "rosemary"
secondary_theme = "acs"
species_allowed = list("Human", "Slime People", "Tajaran")

/datum/sprite_accessory/hair/slimetendrils
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Slimetendrils"
icon_state = "slimetendrils"
species_allowed = list("Slime People")

/datum/sprite_accessory/hair/country
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Country"
icon_state = "country"
secondary_theme = "acs"
species_allowed = list("Human", "Slime People", "Tajaran")

/datum/sprite_accessory/hair/jinx
icon = 'modular_ss220/hairs/icons/human_hair.dmi'
name = "Jinx"
icon_state = "jinx"
species_allowed = list("Human", "Slime People", "Tajaran")
5 changes: 5 additions & 0 deletions modular_ss220/hairs/code/vulpkanin_hair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -217,3 +217,8 @@
icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi'
name = "Braids"
icon_state = "braids"

/datum/sprite_accessory/hair/vulpkanin/long_bedhead
icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi'
name = "Long Bedhead"
icon_state = "long_bedhead"
Binary file modified modular_ss220/hairs/icons/human_hair.dmi
Binary file not shown.
Binary file modified modular_ss220/hairs/icons/vulpkanin_hair.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,23 @@
/datum/sprite_accessory/hair/nucleation/nuc_neutron
name = "Nucleation Neutron Bomb"
icon_state = "neutron"

/datum/sprite_accessory/hair/nucleation/nuc_duelist
name = "Nucleation Crystalized Duelist"
icon_state = "duelist"

/datum/sprite_accessory/hair/nucleation/nuc_psalad
name = "Nucleation Crystalized Psalad"
icon_state = "psalad"

/datum/sprite_accessory/hair/nucleation/nuc_punk
name = "Nucleation Crystalized Punk"
icon_state = "punk"

/datum/sprite_accessory/hair/nucleation/nuc_rows
name = "Nucleation Crystalized Rows"
icon_state = "rows"

/datum/sprite_accessory/hair/nucleation/nuc_ziegler
name = "Nucleation Crystalized Ziegler"
icon_state = "ziegler"
Binary file not shown.
Loading