diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm index 05ea7e636a..9e868d69c6 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm @@ -458,38 +458,6 @@ name = "Half-shaved Hair" icon_state = "hair_halfshaved" -/datum/sprite_accessory/hair/halfshave_long - name = "Half-shaved Hair Long" - icon_state = "hair_halfshave_long" - -/datum/sprite_accessory/hair/halfshave_long_alt - name = "Half-shaved Hair Long Alt" - icon_state = "hair_halfshave_long_alt" - -/datum/sprite_accessory/hair/halfshave_messy - name = "Half-shaved Hair Messy" - icon_state = "hair_halfshave_messy" - -/datum/sprite_accessory/hair/halfshave_messy_alt - name = "Half-shaved Hair Messy Alt" - icon_state = "hair_halfshave_messy_alt" - -/datum/sprite_accessory/hair/halfshave_messylong - name = "Half-shaved Hair Messy Long" - icon_state = "hair_halfshave_messylong" - -/datum/sprite_accessory/hair/halfshave_messylong_alt - name = "Half-shaved Messy Long Alt" - icon_state = "hair_halfshave_messylong_alt" - -/datum/sprite_accessory/hair/hair_halfshave_glamorous - name = "Half-shaved Glamourous" - icon_state ="hair_halfshave_glamorous" - -/datum/sprite_accessory/hair/hair_halfshave_glamorous_alt - name = "Half-shaved Glamourous Alt" - icon_state ="hair_halfshave_glamorous_alt" - /datum/sprite_accessory/hair/harold name = "Harold" icon_state = "hair_harold" diff --git a/hair.dmi b/hair.dmi deleted file mode 100644 index 55c79b9740..0000000000 Binary files a/hair.dmi and /dev/null differ diff --git a/hair_head.dm b/hair_head.dm deleted file mode 100644 index 9e868d69c6..0000000000 --- a/hair_head.dm +++ /dev/null @@ -1,1116 +0,0 @@ -////////////////////// -// Hair Definitions // -////////////////////// -/datum/sprite_accessory/hair - icon = 'icons/mob/hair.dmi' // default icon for all hairs - mutable_category = "HEAD" - - // please make sure they're sorted alphabetically and, where needed, categorized - // try to capitalize the names please~ - // try to spell - // you do not need to define _s or _l sub-states, game automatically does this for you - -/datum/sprite_accessory/hair/bald //this is exempt from the alphabetical sort - name = "Bald" - icon_state = "bald" - -/datum/sprite_accessory/hair/adhara - name = "Adhara" - icon_state = "hair_adhara" - -/datum/sprite_accessory/hair/africanpigtails - name = "African Pig Tails" - icon_state = "hair_africanpigtails" - -/datum/sprite_accessory/hair/afro - name = "Afro" - icon_state = "hair_afro" - -/datum/sprite_accessory/hair/afro2 - name = "Afro 2" - icon_state = "hair_afro2" - -/datum/sprite_accessory/hair/afro2alt - name = "Afro 2 (Alt)" - icon_state = "hair_afro2alt" - -/datum/sprite_accessory/hair/afro_large - name = "Afro (Large)" - icon_state = "hair_bigafro" - -/datum/sprite_accessory/hair/afropuffdouble - name = "Afropuff (Double)" - icon_state = "hair_afropuffdouble" - -/datum/sprite_accessory/hair/afropuffleft - name = "Afropuff (Left)" - icon_state = "hair_afropuffleft" - -/datum/sprite_accessory/hair/afropuffright - name = "Afropuff (Right)" - icon_state = "hair_afropuffright" - -/datum/sprite_accessory/hair/antenna - name = "Ahoge" - icon_state = "hair_antenna" - -/datum/sprite_accessory/hair/amazon - name = "Amazon" - icon_state = "hair_amazon" - -/datum/sprite_accessory/hair/anita - name = "Anita" - icon_state = "hair_anita" - -/datum/sprite_accessory/hair/astolfo - name = "Astolfo" - icon_state = "hair_astolfo" - -/datum/sprite_accessory/hair/balding - name = "Balding Hair" - icon_state = "hair_e" - -/datum/sprite_accessory/hair/baum - name = "Baum" - icon_state = "hair_baum" - -/datum/sprite_accessory/hair/bedhead - name = "Bedhead" - icon_state = "hair_bedhead" - -/datum/sprite_accessory/hair/bedhead_long - name = "Bedhead (Long)" - icon_state = "hair_long_bedhead" - -/datum/sprite_accessory/hair/bedhead_longer - name = "Bedhead (Longer)" - icon_state = "hair_longer_bedhead" - -/datum/sprite_accessory/hair/bedhead2 - name = "Bedhead 2" - icon_state = "hair_bedheadv2" - -/datum/sprite_accessory/hair/bedhead3 - name = "Bedhead 3" - icon_state = "hair_bedheadv3" - -/datum/sprite_accessory/hair/beehive - name = "Beehive" - icon_state = "hair_beehive" - -/datum/sprite_accessory/hair/beehive2 - name = "Beehive 2" - icon_state = "hair_beehive2" - -/datum/sprite_accessory/hair/belenko - name = "Beleneko" - icon_state = "hair_belenko" - -/datum/sprite_accessory/hair/belenkotied - name = "Belenko (Tied)" - icon_state = "hair_belenkotied" - -/datum/sprite_accessory/hair/belle - name = "Belle" - icon_state = "hair_belle" - -/datum/sprite_accessory/hair/bluntbangs - name = "Bluntbangs" - icon_state = "hair_bluntbangs" - -/datum/sprite_accessory/hair/bluntbangsalt - name = "Bluntbangs (Alt)" - icon_state = "hair_bluntbangsalt" - -/datum/sprite_accessory/hair/bob - name = "Bob Hair" - icon_state = "hair_bob" - -/datum/sprite_accessory/hair/bob2 - name = "Bob Hair 2" - icon_state = "hair_bob2" - -/datum/sprite_accessory/hair/bob3 - name = "Bob Hair 3" - icon_state = "hair_bobcut" - -/datum/sprite_accessory/hair/bobcurl - name = "Bobcurl" - icon_state = "hair_bobcurl" - -/datum/sprite_accessory/hair/bobcut - name = "Bobcut" - icon_state = "hair_bobcut" - -/datum/sprite_accessory/hair/bobcutalt - name = "Bobcut (Alt)" - icon_state = "hair_bobcutalt" - -/datum/sprite_accessory/hair/bobcutalt2 - name = "Bobcut (Alt) 2" - icon_state = "hair_bobcutalt2" - -/datum/sprite_accessory/hair/boddicker - name = "Boddicker" - icon_state = "hair_boddicker" - -/datum/sprite_accessory/hair/bowl - name = "Bowl" - icon_state = "hair_bowlcut" - -/datum/sprite_accessory/hair/bowl2 - name = "Bowl 2" - icon_state = "hair_bowlcut2" - -/datum/sprite_accessory/hair/braid - name = "Braid (Floorlength)" - icon_state = "hair_braid" - -/datum/sprite_accessory/hair/braided - name = "Braided" - icon_state = "hair_braided" - -/datum/sprite_accessory/hair/front_braid - name = "Braided Front" - icon_state = "hair_braidfront" - -/datum/sprite_accessory/hair/grandebraid - name = "Braid (Grande)" - icon_state = "hair_grande" - -/datum/sprite_accessory/hair/not_floorlength_braid - name = "Braid (High)" - icon_state = "hair_braid2" - -/datum/sprite_accessory/hair/lowbraid - name = "Braid (Low)" - icon_state = "hair_hbraid" - -/datum/sprite_accessory/hair/shortbraid - name = "Braid (Short)" - icon_state = "hair_shortbraid" - -/datum/sprite_accessory/hair/braidtail - name = "Braided Tail" - icon_state = "hair_braidtail" - -/datum/sprite_accessory/hair/bun - name = "Bun Head" - icon_state = "hair_bun" - -/datum/sprite_accessory/hair/bun2 - name = "Bun Head 2" - icon_state = "hair_bunhead2" - -/datum/sprite_accessory/hair/bun3 - name = "Bun Head 3" - icon_state = "hair_bunhead3" - -/datum/sprite_accessory/hair/bun4 - name = "Bun Head 4" - icon_state = "hair_bunhead4" - -/datum/sprite_accessory/hair/doublebun - name = "Bun Head (Double)" - icon_state = "hair_doublebun" - -/datum/sprite_accessory/hair/largebun - name = "Bun Head (Large)" - icon_state = "hair_largebun" - -/datum/sprite_accessory/hair/tightbun - name = "Bun Head (Tight)" - icon_state = "hair_tightbun" - -/datum/sprite_accessory/hair/business - name = "Business Hair" - icon_state = "hair_business" - -/datum/sprite_accessory/hair/business2 - name = "Business Hair 2" - icon_state = "hair_business2" - -/datum/sprite_accessory/hair/business3 - name = "Business Hair 3" - icon_state = "hair_business3" - -/datum/sprite_accessory/hair/business4 - name = "Business Hair 4" - icon_state = "hair_business4" - -/datum/sprite_accessory/hair/buzz - name = "Buzzcut" - icon_state = "hair_buzzcut" - -/datum/sprite_accessory/hair/cia - name = "CIA" - icon_state = "hair_cia" - -/datum/sprite_accessory/hair/combedback - name = "Combed Back" - icon_state = "hair_combedback" - -/datum/sprite_accessory/hair/combedbob - name = "Combed Bob" - icon_state = "hair_combedbob" - -/datum/sprite_accessory/hair/combover - name = "Combover" - icon_state = "hair_combover" - -/datum/sprite_accessory/hair/coffeehouse - name = "Coffee House" - icon_state = "hair_coffeehouse" - -/datum/sprite_accessory/hair/cornrows1 - name = "Cornrows" - icon_state = "hair_cornrows" - -/datum/sprite_accessory/hair/cornrows2 - name = "Cornrows 2" - icon_state = "hair_cornrows2" - -/datum/sprite_accessory/hair/cornrowbun - name = "Cornrow Bun" - icon_state = "hair_cornrowbun" - -/datum/sprite_accessory/hair/cornrowbraid - name = "Cornrow Braid" - icon_state = "hair_cornrowbraid" - -/datum/sprite_accessory/hair/cornrowdualtail - name = "Cornrow Tail" - icon_state = "hair_cornrowtail" - -/datum/sprite_accessory/hair/cotton - name = "Cotton" - icon_state = "hair_cotton" - -/datum/sprite_accessory/hair/cottonalt - name = "Cotton (Alt)" - icon_state = "hair_cottonalt" - -/datum/sprite_accessory/hair/country - name = "Country" - icon_state = "hair_country" - -/datum/sprite_accessory/hair/crew - name = "Crewcut" - icon_state = "hair_crewcut" - -/datum/sprite_accessory/hair/curls - name = "Curls" - icon_state = "hair_curls" - -/datum/sprite_accessory/hair/curly - name = "Curly" - icon_state = "hair_curly" - -/datum/sprite_accessory/hair/cut - name = "Cut Hair" - icon_state = "hair_c" - -/datum/sprite_accessory/hair/dave - name = "Dave" - icon_state = "hair_dave" - -/datum/sprite_accessory/hair/devillock - name = "Devil Lock" - icon_state = "hair_devillock" - -/datum/sprite_accessory/hair/diagonalbangs - name = "Diagonal Bangs" - icon_state = "hair_diagonalbangs" - -/datum/sprite_accessory/hair/dreadlocks - name = "Dreadlocks" - icon_state = "hair_dreads" - -/datum/sprite_accessory/hair/drillhair - name = "Drill Hair" - icon_state = "hair_drillhair" - -/datum/sprite_accessory/hair/drillhairextended - name = "Drill Hair (Extended)" - icon_state = "hair_drillhairextended" - -/datum/sprite_accessory/hair/emo - name = "Emo" - icon_state = "hair_emo" - -/datum/sprite_accessory/hair/emo2 - name = "Emo 2" - icon_state = "hair_emo2" - -/datum/sprite_accessory/hair/emo_fringe - name = "Emo (Fringe)" - icon_state = "hair_emofringe" - -/datum/sprite_accessory/hair/emo_long - name = "Emo (Long)" - icon_state = "hair_emolong" - -/datum/sprite_accessory/hair/lowfade - name = "Fade (Low)" - icon_state = "hair_lowfade" - -/datum/sprite_accessory/hair/medfade - name = "Fade (Medium)" - icon_state = "hair_medfade" - -/datum/sprite_accessory/hair/highfade - name = "Fade (High)" - icon_state = "hair_highfade" - -/datum/sprite_accessory/hair/baldfade - name = "Fade (Bald)" - icon_state = "hair_baldfade" - -/datum/sprite_accessory/hair/nofade - name = "Fade (None)" - icon_state = "hair_nofade" - -/datum/sprite_accessory/hair/father - name = "Father" - icon_state = "hair_father" - -/datum/sprite_accessory/hair/feather - name = "Feather" - icon_state = "hair_feather" - -/datum/sprite_accessory/hair/flair - name = "Flair" - icon_state = "hair_flair" - -/datum/sprite_accessory/hair/sargeant - name = "Flat Top" - icon_state = "hair_sergeant" - -/datum/sprite_accessory/hair/bigflattop - name = "Flat Top (Big)" - icon_state = "hair_bigflattop" - -/datum/sprite_accessory/hair/flow - name = "Flow Hair" - icon_state = "hair_f" - -/datum/sprite_accessory/hair/fluffy - name = "Fluffy" - icon_state = "hair_fluffy" - -/datum/sprite_accessory/hair/fortuneteller - name = "Fortune Teller" - icon_state = "hair_fortuneteller" - -/datum/sprite_accessory/hair/fringetail - name = "Fringe Tail" - icon_state = "hair_fringetail" - -/datum/sprite_accessory/hair/froofy - name = "Froofy" - icon_state = "hair_froofy" - -/datum/sprite_accessory/hair/geisha - name = "Geisha" - icon_state = "hair_geisha" - -/datum/sprite_accessory/hair/gelled - name = "Gelled Back" - icon_state = "hair_gelled" - -/datum/sprite_accessory/hair/gentle - name = "Gentle" - icon_state = "hair_gentle" - -/datum/sprite_accessory/hair/glammetal - name = "Glam Metal" - icon_state = "hair_glammetal" - -/datum/sprite_accessory/hair/gloomy - name = "Gloomy" - icon_state = "hair_gloomy" - -/datum/sprite_accessory/hair/gloomylong - name = "Gloomy (Long)" - icon_state = "hair_gloomylong" - -/datum/sprite_accessory/hair/hajime - name = "Hajime" - icon_state = "hair_hajime" - -/datum/sprite_accessory/hair/hajimealt - name = "Hajime (Alt)" - icon_state = "hair_hajimealt" - -/datum/sprite_accessory/hair/halfbang - name = "Half-banged Hair" - icon_state = "hair_halfbang" - -/datum/sprite_accessory/hair/halfbang2 - name = "Half-banged Hair 2" - icon_state = "hair_halfbang2" - -/datum/sprite_accessory/hair/halfbangalt - name = "Half-banged Hair (Alt)" - icon_state = "hair_halfbang_alt" - -/datum/sprite_accessory/hair/halfshaved - name = "Half-shaved Hair" - icon_state = "hair_halfshaved" - -/datum/sprite_accessory/hair/harold - name = "Harold" - icon_state = "hair_harold" - -/datum/sprite_accessory/hair/hedgehog - name = "Hedgehog Hair" - icon_state = "hair_hedgehog" - -/datum/sprite_accessory/hair/hightight - name = "High and Tight" - icon_state = "hair_hightight" - -/datum/sprite_accessory/hair/himecut - name = "Hime Cut" - icon_state = "hair_himecut" - -/datum/sprite_accessory/hair/himecut2 - name = "Hime Cut 2" - icon_state = "hair_himecut2" - -/datum/sprite_accessory/hair/shorthime - name = "Hime Cut (Short)" - icon_state = "hair_shorthime" - -/datum/sprite_accessory/hair/himeup - name = "Hime Updo" - icon_state = "hair_himeup" - -/datum/sprite_accessory/hair/hitop - name = "Hitop" - icon_state = "hair_hitop" - -/datum/sprite_accessory/hair/inari - name = "Inari" - icon_state = "hair_inari" - -/datum/sprite_accessory/hair/inkling - name = "Inkling" - icon_state = "hair_inkling" - -/datum/sprite_accessory/hair/jade - name = "Jade" - icon_state = "hair_jade" - -/datum/sprite_accessory/hair/jensen - name = "Jensen" - icon_state = "hair_jensen" - -/datum/sprite_accessory/hair/jessica - name = "Jessica" - icon_state = "hair_jessica" - -/datum/sprite_accessory/hair/joestar - name = "Joestar" - icon_state = "hair_joestar" - -/datum/sprite_accessory/hair/kagami - name = "Kagami" - icon_state = "hair_kagami" - -/datum/sprite_accessory/hair/keanu - name = "Keanu" - icon_state = "hair_keanu" - -/datum/sprite_accessory/hair/kisaragi - name = "Kisaragi" - icon_state = "hair_kisaragi" - -/datum/sprite_accessory/hair/kleeia - name = "Kleeia" - icon_state = "hair_kleeia" - -/datum/sprite_accessory/hair/kusangi - name = "Kusanagi" - icon_state = "hair_kusanagi" - -/datum/sprite_accessory/hair/long - name = "Long Hair 1" - icon_state = "hair_long" - -/datum/sprite_accessory/hair/long2 - name = "Long Hair 2" - icon_state = "hair_long2" - -/datum/sprite_accessory/hair/long3 - name = "Long Hair 3" - icon_state = "hair_long3" - -/datum/sprite_accessory/hair/longalt - name = "Long Hair (Alt)" - icon_state = "hair_longeralt" - -/datum/sprite_accessory/hair/long_over_eye - name = "Long Over Eye" - icon_state = "hair_longovereye" - -/datum/sprite_accessory/hair/long_over_eyealt - name = "Long Over Eye (Alt)" - icon_state = "hair_longovereyealt" - -/datum/sprite_accessory/hair/longbangs - name = "Long Bangs" - icon_state = "hair_lbangs" - -/datum/sprite_accessory/hair/longemo - name = "Long Emo" - icon_state = "hair_longemo" - -/datum/sprite_accessory/hair/longfringe - name = "Long Fringe" - icon_state = "hair_longfringe" - -/datum/sprite_accessory/hair/sidepartlongalt - name = "Long Side Part" - icon_state = "hair_longsidepart" - -/datum/sprite_accessory/hair/manbun - name = "Manbun" - icon_state = "hair_manbun" - -/datum/sprite_accessory/hair/megaeyebrows - name = "Mega Eyebrows" - icon_state = "hair_megaeyebrows" - -/datum/sprite_accessory/hair/messy - name = "Messy" - icon_state = "hair_messy" - -/datum/sprite_accessory/hair/messy2 - name = "Messy2" - icon_state = "hair_messy2" - -/datum/sprite_accessory/hair/modern - name = "Modern" - icon_state = "hair_modern" - -/datum/sprite_accessory/hair/mohawk - name = "Mohawk" - icon_state = "hair_d" - -/datum/sprite_accessory/hair/reversemohawk - name = "Mohawk (Reverse)" - icon_state = "hair_reversemohawk" - -/datum/sprite_accessory/hair/shavedmohawk - name = "Mohawk (Shaved)" - icon_state = "hair_shavedmohawk" - -/datum/sprite_accessory/hair/mohawk_unshaven - name = "Mohawk (Unshaven)" - icon_state = "hair_unshaven_mohawk" - -/datum/sprite_accessory/hair/mulder - name = "Mulder" - icon_state = "hair_mulder" - -/datum/sprite_accessory/hair/newyou - name = "New You" - icon_state = "hair_newyou" - -/datum/sprite_accessory/hair/nia - name = "Nia" - icon_state = "hair_nia" - -/datum/sprite_accessory/hair/nitori - name = "Nitori" - icon_state = "hair_nitori" - -/datum/sprite_accessory/hair/odango - name = "Odango" - icon_state = "hair_odango" - -/datum/sprite_accessory/hair/ombre - name = "Ombre" - icon_state = "hair_ombre" - -/datum/sprite_accessory/hair/oneshoulder - name = "One Shoulder" - icon_state = "hair_oneshoulder" - -/datum/sprite_accessory/hair/over_eye - name = "Over Eye" - icon_state = "hair_shortovereye" - -/datum/sprite_accessory/hair/oxton - name = "Oxton" - icon_state = "hair_oxton" - -//Donator item - fractious -/datum/sprite_accessory/hair/over_eye_fr - name = "Over Eye (fract)" - icon_state = "hair_shortovereye_1f" - ckeys_allowed = list("fractious") - -/datum/sprite_accessory/hair/parted - name = "Parted" - icon_state = "hair_parted" - -/datum/sprite_accessory/hair/partedside - name = "Parted (Side)" - icon_state = "hair_part" - -/datum/sprite_accessory/hair/kagami - name = "Pigtails" - icon_state = "hair_kagami" - -/datum/sprite_accessory/hair/pigtail - name = "Pigtails 2" - icon_state = "hair_pigtails" - -/datum/sprite_accessory/hair/pigtail2 - name = "Pigtails 3" - icon_state = "hair_pigtails2" - -/datum/sprite_accessory/hair/pixie - name = "Pixie Cut" - icon_state = "hair_pixie" - -/datum/sprite_accessory/hair/plait - name = "Plait" - icon_state = "hair_plait" - -/datum/sprite_accessory/hair/pompadour - name = "Pompadour" - icon_state = "hair_pompadour" - -/datum/sprite_accessory/hair/bigpompadour - name = "Pompadour (Big)" - icon_state = "hair_bigpompadour" - -/datum/sprite_accessory/hair/bigpompadouralt - name = "Pompadour (Big) (Alt)" - icon_state = "hair_bigpompadouralt" - -/datum/sprite_accessory/hair/ponytail1 - name = "Ponytail" - icon_state = "hair_ponytail" - -/datum/sprite_accessory/hair/ponytail1alt - name = "Ponytail (Alt)" - icon_state = "hair_ponytailalt" - -/datum/sprite_accessory/hair/ponytail2 - name = "Ponytail 2" - icon_state = "hair_ponytail2" - -/datum/sprite_accessory/hair/ponytail3 - name = "Ponytail 3" - icon_state = "hair_ponytail3" - -/datum/sprite_accessory/hair/ponytail3alt - name = "Ponytail 3 (Alt)" - icon_state = "hair_ponytail3alt" - -/datum/sprite_accessory/hair/ponytail4 - name = "Ponytail 4" - icon_state = "hair_ponytail4" - -/datum/sprite_accessory/hair/ponytail4alt - name = "Ponytail 4 (Alt)" - icon_state = "hair_ponytail4alt" - -/datum/sprite_accessory/hair/ponytail5 - name = "Ponytail 5" - icon_state = "hair_ponytail5" - -/datum/sprite_accessory/hair/ponytail6 - name = "Ponytail 6" - icon_state = "hair_ponytail6" - -/datum/sprite_accessory/hair/highponytail - name = "Ponytail (High)" - icon_state = "hair_highponytail" - -/datum/sprite_accessory/hair/longponytail - name = "Ponytail (Long)" - icon_state = "hair_longstraightponytail" - -/datum/sprite_accessory/hair/sidetail - name = "Ponytail (Side)" - icon_state = "hair_sidetail" - -/datum/sprite_accessory/hair/sidetail2 - name = "Ponytail (Side) 2" - icon_state = "hair_sidetail2" - -/datum/sprite_accessory/hair/sidetail3 - name = "Ponytail (Side) 3" - icon_state = "hair_sidetail3" - -/datum/sprite_accessory/hair/sidetail4 - name = "Ponytail (Side) 4" - icon_state = "hair_sidetail4" - -/datum/sprite_accessory/hair/sidetail5 - name = "Ponytail (Side) 5" - icon_state = "hair_sidetail5" - -/datum/sprite_accessory/hair/sharptail - name = "Ponytail (Sharp)" - icon_state = "hair_sharptail" - -/datum/sprite_accessory/hair/spikytail - name = "Ponytail (Spiky)" - icon_state = "hair_spikyponytail" - -/datum/sprite_accessory/hair/poofy - name = "Poofy" - icon_state = "hair_poofy" - -/datum/sprite_accessory/hair/poofy2 - name = "Poofy 2" - icon_state = "hair_poofy2" - -/datum/sprite_accessory/hair/quadcurls - name = "Quad Curls" - icon_state = "hair_quadcurls" - -/datum/sprite_accessory/hair/quiff - name = "Quiff" - icon_state = "hair_quiff" - -/datum/sprite_accessory/hair/rockstar - name = "Rockstar" - icon_state = "hair_rockstar" - -/datum/sprite_accessory/hair/ronin - name = "Ronin" - icon_state = "hair_ronin" - -/datum/sprite_accessory/hair/row - name = "Rows" - icon_state = "hair_rows1" - -/datum/sprite_accessory/hair/row2 - name = "Rows 2" - icon_state = "hair_rows2" - -/datum/sprite_accessory/hair/rowbun - name = "Rows (Bun)" - icon_state = "hair_rowbun" - -/datum/sprite_accessory/hair/rowdualtail - name = "Rows (Pigtails)" - icon_state = "hair_rowdualtail" - -/datum/sprite_accessory/hair/rowbraid - name = "Rows (Braid)" - icon_state = "hair_rowbraid" - -/datum/sprite_accessory/hair/scully - name = "Scully" - icon_state = "hair_scully" - -/datum/sprite_accessory/hair/shaggy - name = "Shaggy" - icon_state = "hair_shaggy" - -/datum/sprite_accessory/hair/shaved - name = "Shaved" - icon_state = "hair_shaved" - -/datum/sprite_accessory/hair/shavedpart - name = "Shaved (Part)" - icon_state = "hair_shavedpart" - -/datum/sprite_accessory/hair/bangs_short - name = "Short Bangs" - icon_state = "hair_shortbangs" - -/datum/sprite_accessory/hair/short - name = "Short Hair" - icon_state = "hair_a" - -/datum/sprite_accessory/hair/shorthair2 - name = "Short Hair 2" - icon_state = "hair_shorthair2" - -/datum/sprite_accessory/hair/shorthair3 - name = "Short Hair 3" - icon_state = "hair_shorthair3" - -/datum/sprite_accessory/hair/shorthair4 - name = "Short Hair 4" - icon_state = "hair_shorthair4" - -/datum/sprite_accessory/hair/shorthair80s - name = "Short Hair 80s" - icon_state = "hair_80s" - -/datum/sprite_accessory/hair/shorthairrosa - name = "Short Hair Rosa" - icon_state = "hair_rosa" - -/datum/sprite_accessory/hair/stail - name = "Short Tail" - icon_state = "hair_stail" - -/datum/sprite_accessory/hair/shoulderlength - name = "Shoulder-length Hair" - icon_state = "hair_b" - -/datum/sprite_accessory/hair/shy - name = "Shy" - icon_state = "hair_shy" - -/datum/sprite_accessory/hair/sidecut - name = "Sidecut" - icon_state = "hair_sidecut" - -/datum/sprite_accessory/hair/skinhead - name = "Skinhead" - icon_state = "hair_skinhead" - -/datum/sprite_accessory/hair/simple - name = "Simple" - icon_state = "hair_simple" - -/datum/sprite_accessory/hair/skrellvshort - name = "Skrell Replicant (Very Short)" - icon_state = "hair_skrellvshort" - -/datum/sprite_accessory/hair/skrellshort - name = "Skrell Replicant (Short)" - icon_state = "hair_skrellshort" - -/datum/sprite_accessory/hair/skrell - name = "Skrell Replicant (Average)" - icon_state = "hair_skrell" - -/datum/sprite_accessory/hair/skrelllong - name = "Skrell Replicant (Long)" - icon_state = "hair_skrelllong" - -/datum/sprite_accessory/hair/sleaze - name = "Sleaze" - icon_state = "hair_sleaze" - -/datum/sprite_accessory/hair/protagonist - name = "Slightly Long Hair" - icon_state = "hair_protagonist" - -/datum/sprite_accessory/hair/slightlymessy - name = "Slightly Messy Hair" - icon_state = "hair_slightlymessy" - -/datum/sprite_accessory/hair/spiky - name = "Spiky" - icon_state = "hair_spikey" - -/datum/sprite_accessory/hair/spiky2 - name = "Spiky 2" - icon_state = "hair_spiky" - -/datum/sprite_accessory/hair/spiky3 - name = "Spiky 3" - icon_state = "hair_spiky2" - -/datum/sprite_accessory/hair/slimedroplet - name = "Slime Droplet" - icon_state = "hair_slimedroplet" - -/datum/sprite_accessory/hair/slimedropletalt - name = "Slime Droplet (Alt)" - icon_state = "hair_slimedropletalt" - -/datum/sprite_accessory/hair/slimespikes - name = "Slime Spikes" - icon_state = "hair_slimespikes" - -/datum/sprite_accessory/hair/slimetendrils - name = "Slime Tendrils" - icon_state = "hair_slimetendrils" - -/datum/sprite_accessory/hair/slimetendrilsalt - name = "Slime Tendrils (Alt)" - icon_state = "hair_slimetendrilsalt" - -/datum/sprite_accessory/hair/supernova - name = "Supernova" - icon_state = "hair_supernova" - -/datum/sprite_accessory/hair/swept - name = "Swept Back Hair" - icon_state = "hair_swept" - -/datum/sprite_accessory/hair/swept2 - name = "Swept Back Hair 2" - icon_state = "hair_swept2" - -/datum/sprite_accessory/hair/thinning - name = "Thinning" - icon_state = "hair_thinning" - -/datum/sprite_accessory/hair/thinningfront - name = "Thinning (Front)" - icon_state = "hair_thinningfront" - -/datum/sprite_accessory/hair/thinningrear - name = "Thinning (Rear)" - icon_state = "hair_thinningrear" - -/datum/sprite_accessory/hair/topknot - name = "Topknot" - icon_state = "hair_topknot" - -/datum/sprite_accessory/hair/toriyama - name = "Toriyama" - icon_state = "hair_toriyama" - -/datum/sprite_accessory/hair/toriyama2 - name = "Toriyama 2" - icon_state = "hair_toriyama2" - -/datum/sprite_accessory/hair/tressshoulder - name = "Tress Shoulder" - icon_state = "hair_tressshoulder" - -/datum/sprite_accessory/hair/trimmed - name = "Trimmed" - icon_state = "hair_trimmed" - -/datum/sprite_accessory/hair/trimflat - name = "Trimmed (Flat)" - icon_state = "hair_trimflat" - -/datum/sprite_accessory/hair/twincurls - name = "Twincurls" - icon_state = "hair_twincurls" - -/datum/sprite_accessory/hair/twintails - name = "Twintails" - icon_state = "hair_twintail" - -/datum/sprite_accessory/hair/longtwintails - name = "Twintails (Long)" - icon_state = "hair_longstraighttwintails" - -/datum/sprite_accessory/hair/undercut - name = "Undercut" - icon_state = "hair_undercut" - -/datum/sprite_accessory/hair/unkempt - name = "Unkempt" - icon_state = "hair_unkempt" - -/datum/sprite_accessory/hair/updo - name = "Updo" - icon_state = "hair_updo" - -/datum/sprite_accessory/hair/longer - name = "Very Long Hair" - icon_state = "hair_vlong" - -/datum/sprite_accessory/hair/longest - name = "Very Long Hair 2" - icon_state = "hair_longest" - -/datum/sprite_accessory/hair/longestalt - name = "Very Long Hair 2 (Alt)" - icon_state = "hair_longestalt" - -/datum/sprite_accessory/hair/longest2 - name = "Very Long Over Eye" - icon_state = "hair_longest2" - -/datum/sprite_accessory/hair/longestalt - name = "Very Long with Fringe" - icon_state = "hair_vlongfringe" - -/datum/sprite_accessory/hair/short_oe - name = "Very Short Over Eye" - icon_state = "hair_veryshortovereye" - -/datum/sprite_accessory/hair/short_oe_alt - name = "Very Short Over Eye (Alt)" - icon_state = "hair_veryshortovereyealternate" - -/datum/sprite_accessory/hair/vivi - name = "Vivi" - icon_state = "hair_vivi" - -/datum/sprite_accessory/hair/volaju - name = "Volaju" - icon_state = "hair_volaju" - -/datum/sprite_accessory/hair/volajupompless - name = "Volaju (Alt)" - icon_state = "hair_volajupompless" - -/datum/sprite_accessory/hair/wisp - name = "Wisp" - icon_state = "hair_wisp" - -/datum/sprite_accessory/hair/ziegler - name = "Ziegler" - icon_state = "hair_ziegler" - -/datum/sprite_accessory/hair/zone - name = "Zone" - icon_state = "hair_zone" - -/datum/sprite_accessory/hair_gradient - icon = 'icons/mob/hair_gradients.dmi' - -/datum/sprite_accessory/hair_gradient/none - name = "None" - icon_state = "none" - -/datum/sprite_accessory/hair_gradient/fadeup - name = "Fade Up" - icon_state = "fadeup" - -/datum/sprite_accessory/hair_gradient/fadedown - name = "Fade Down" - icon_state = "fadedown" - -/datum/sprite_accessory/hair_gradient/vertical_split - name = "Vertical Split" - icon_state = "vsplit" - -/datum/sprite_accessory/hair_gradient/_split - name = "Horizontal Split" - icon_state = "bottomflat" - -/datum/sprite_accessory/hair_gradient/reflected - name = "Reflected" - icon_state = "reflected_high" - -/datum/sprite_accessory/hair_gradient/reflected_inverse - name = "Reflected Inverse" - icon_state = "reflected_inverse_high" - -/datum/sprite_accessory/hair_gradient/wavy - name = "Wavy" - icon_state = "wavy" - -/datum/sprite_accessory/hair_gradient/long_fade_up - name = "Long Fade Up" - icon_state = "long_fade_up" - -/datum/sprite_accessory/hair_gradient/long_fade_down - name = "Long Fade Down" - icon_state = "long_fade_down" - -/datum/sprite_accessory/hair_gradient/short_fade_up - name = "Short Fade Up" - icon_state = "short_fade_up" - -/datum/sprite_accessory/hair_gradient/short_fade_down - name = "Short Fade Down" - icon_state = "short_fade_down" - -/datum/sprite_accessory/hair_gradient/wavy_spike - name = "Spiked Wavy" - icon_state = "wavy_spiked" diff --git a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/hair_head.dm b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/hair_head.dm index e667f2906a..e5ddf57012 100644 --- a/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/hair_head.dm +++ b/modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/hair_head.dm @@ -1,3 +1,43 @@ +/datum/sprite_accessory/hair/halfshave_long + name ="Half-Shave Long" + icon_state = "hair_halfshave_long" + icon = 'modular_splurt/icons/mob/hair.dmi' + +/datum/sprite_accessory/hair/halfshave_long_alt + name ="Half-Shave Long Alt" + icon_state = "hair_halfshave_long_alt" + icon = 'modular_splurt/icons/mob/hair.dmi' + +/datum/sprite_accessory/hair/halfshave_messy + name ="Half-Shave Messy" + icon_state = "hair_halfshave_messy" + icon = 'modular_splurt/icons/mob/hair.dmi' + +/datum/sprite_accessory/hair/halfshave_messy_alt + name ="Half-Shave Messy Alt" + icon_state = "hair_halfshave_messy_alt" + icon = 'modular_splurt/icons/mob/hair.dmi' + +/datum/sprite_accessory/hair/halfshave_messylong + name ="Half-Shave Messy Long" + icon_state = "hair_halfshave_messylong" + icon = 'modular_splurt/icons/mob/hair.dmi' + +/datum/sprite_accessory/hair/halfshave_messylong_alt + name ="Half-Shave Messy Long Alt" + icon_state = "hair_halfshave_messylong_alt" + icon = 'modular_splurt/icons/mob/hair.dmi' + +/datum/sprite_accessory/hair/halfshave_glamorous + name ="Half-Shave Glamorous" + icon_state ="hair_halfshave_glamorous" + icon = 'modular_splurt/icons/mob/hair.dmi' + +/datum/sprite_accessory/hair/halfshave_glamorous_alt + name ="Half-Shave Glamorous Alt" + icon_state ="hair_halfshave_glamorous_alt" + icon = 'modular_splurt/icons/mob/hair.dmi' + /datum/sprite_accessory/hair/hyenamane name = "Hyena Mane" icon_state = "hair_hyenamane" diff --git a/modular_splurt/icons/mob/hair.dmi b/modular_splurt/icons/mob/hair.dmi index 07e756f8f4..22d3f44bcc 100644 Binary files a/modular_splurt/icons/mob/hair.dmi and b/modular_splurt/icons/mob/hair.dmi differ