From cf4647748a358820853aa95352c95a1e0a5cb4b9 Mon Sep 17 00:00:00 2001 From: BR54FF Date: Tue, 5 Dec 2023 13:37:54 +0700 Subject: [PATCH 1/6] liggers --- modular_ss220/hairs/code/human_hair.dm | 766 ++++++++++++++++++ modular_ss220/hairs/code/unathi_hair.dm | 145 ++++ .../hairs/icons/unathi_facial_hair.dmi | Bin 0 -> 2042 bytes modular_ss220/hairs/icons/unathi_hair.dmi | Bin 0 -> 4224 bytes 4 files changed, 911 insertions(+) create mode 100644 modular_ss220/hairs/code/unathi_hair.dm create mode 100644 modular_ss220/hairs/icons/unathi_facial_hair.dmi create mode 100644 modular_ss220/hairs/icons/unathi_hair.dmi diff --git a/modular_ss220/hairs/code/human_hair.dm b/modular_ss220/hairs/code/human_hair.dm index f481eb0cf9e1..eeaee629acbd 100644 --- a/modular_ss220/hairs/code/human_hair.dm +++ b/modular_ss220/hairs/code/human_hair.dm @@ -5,3 +5,769 @@ /datum/sprite_accessory/hair/crew icon = 'modular_ss220/hairs/icons/human_hair.dmi' icon_state = "crewcut" + +/datum/sprite_accessory/hair/short + name = "Short Hair" + icon_state = "short" + glasses_over = 1 + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/cut + name = "Cut Hair" + icon_state = "cut" + glasses_over = 1 + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/long + name = "Shoulder-length Hair" + icon_state = "long" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/longalt + name = "Shoulder-length Hair Alt" + icon_state = "longfringe" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/longer + name = "Long Hair" + icon_state = "vlong" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/longeralt + name = "Long Hair Alt" + icon_state = "vlongfringe" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/longest + name = "Very Long Hair" + icon_state = "longest" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/longfringe + name = "Long Fringe" + icon_state = "longfringe" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/longestalt + name = "Longer Fringe" + icon_state = "vlongfringe" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/halfbang + name = "Half-banged Hair" + icon_state = "halfbang" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/halfbangalt + name = "Half-banged Hair Alt" + icon_state = "halfbang_alt" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/ponytail1 + name = "Ponytail 1" + icon_state = "ponytailm" + glasses_over = 1 + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/ponytail2 + name = "Ponytail 2" + icon_state = "ponytailf" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/ponytail3 + name = "Ponytail 3" + icon_state = "ponytail3" + glasses_over = 1 + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/sideponytail + name = "Side Ponytail" + icon_state = "stail" + glasses_over = 1 + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/highponytail + name = "High Ponytail" + icon_state = "highponytail" + glasses_over = 1 + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/wisp + name = "Wisp" + icon_state = "wisp" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/parted + name = "Parted" + icon_state = "parted" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/pompadour + name = "Pompadour" + icon_state = "pompadour" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/quiff + name = "Quiff" + icon_state = "quiff" + glasses_over = 1 + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/bedhead + name = "Bedhead" + icon_state = "bedhead" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/bedhead2 + name = "Bedhead 2" + icon_state = "bedhead2" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/bedhead3 + name = "Bedhead 3" + icon_state = "bedhead3" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/beehive + name = "Beehive" + icon_state = "beehive" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/bobcurl + name = "Bobcurl" + icon_state = "bobcurl" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/bob + name = "Bob" + icon_state = "bobcut" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/bowl + name = "Bowl" + icon_state = "bowlcut" + glasses_over = 1 + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/braid2 + name = "Long Braid" + icon_state = "hbraid" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/buzz + name = "Buzzcut" + icon_state = "buzzcut" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/crew + name = "Crewcut" + icon_state = "crewcut" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/combover + name = "Combover" + icon_state = "combover" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/devillock + name = "Devil Lock" + icon_state = "devilock" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/dreadlocks + name = "Dreadlocks" + icon_state = "dreads" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/curls + name = "Curls" + icon_state = "curls" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/afro + name = "Afro" + icon_state = "afro" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/afro2 + name = "Afro 2" + icon_state = "afro2" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/afro_large + name = "Big Afro" + icon_state = "bigafro" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/sergeant + name = "Flat Top" + icon_state = "sergeant" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/emo + name = "Emo" + icon_state = "emo" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/flow + name = "Flow Hair" + icon_state = "flow" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/feather + name = "Feather" + icon_state = "feather" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/hitop + name = "Hitop" + icon_state = "hitop" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/mohawk + name = "Mohawk" + icon_state = "mohawk" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/jensen + name = "Adam Jensen Hair" + icon_state = "jensen" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/cia + name = "CIA" + icon_state = "cia" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/mulder + name = "Mulder" + icon_state = "mulder" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/gelled + name = "Gelled Back" + icon_state = "gelled" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/spiky + name = "Spiky" + icon_state = "spikey" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/kusanagi + name = "Kusanagi Hair" + icon_state = "kusanagi" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/kagami + name = "Pigtails" + icon_state = "kagami" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/himecut + name = "Hime Cut" + icon_state = "himecut" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/braid + name = "Floorlength Braid" + icon_state = "floorbraid" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/odango + name = "Odango" + icon_state = "odango" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/ombre + name = "Ombre" + icon_state = "ombre" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/updo + name = "Updo" + icon_state = "updo" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/skinhead + name = "Skinhead" + icon_state = "skinhead" + glasses_over = 1 + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/balding + name = "Balding Hair" + icon_state = "balding" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/longemo + name = "Long Emo" + icon_state = "emolong" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +////////////////////////////// +//////START VG HAIRSTYLES///// +////////////////////////////// +/datum/sprite_accessory/hair/birdnest + name = "Bird Nest" + icon_state = "birdnest" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/unkept + name = "Unkempt" + icon_state = "unkept" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/modern + name = "Modern" + icon_state = "modern" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/unshavenmohawk + name = "Unshaven Mohawk" + icon_state = "unshavenmohawk" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + glasses_over = 1 + +/datum/sprite_accessory/hair/drills + name = "Twincurls" + icon_state = "twincurl" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/minidrills + name = "Twincurls 2" + icon_state = "twincurl2" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") +////////////////////////////// +//////END VG HAIRSTYLES/////// +////////////////////////////// + +/////////////////////////////////// +//////START POLARIS HAIRSTYLES///// +////////////////////////////////// + +/datum/sprite_accessory/hair/rosa + name = "Rosa" + icon_state = "rosa" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/jade + name = "Jade" + icon_state = "jade" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/manbun + name = "Manbun" + icon_state = "manbun" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/thinningback + name = "Thinning Back" + icon_state = "thinningrear" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/thinningfront + name = "Thinning Front" + icon_state = "thinningfront" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/thinning + name = "Thinning" + icon_state = "thinning" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/bowlcut2 + name = "Bowl 2" + icon_state = "bowlcut2" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/ronin + name = "Ronin" + icon_state = "ronin" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/topknot + name = "Topknot" + icon_state = "topknot" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/regulationmohawk + name = "Regulation Mohawk" + icon_state = "shavedmohawk" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/rowbraid + name = "Row Braid" + icon_state = "rowbraid" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/rowdualbraid + name = "Row Dual Braid" + icon_state = "rowdualtail" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/rowbun + name = "Row Bun" + icon_state = "rowbun" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/hightight + name = "High and Tight" + icon_state = "hightight" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/partfade + name = "Parted Fade" + icon_state = "shavedpart" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/undercut3 + name = "Undercut Swept Left" + icon_state = "undercut3" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/undercut2 + name = "Undercut Swept Right" + icon_state = "undercut2" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/undercut1 + name = "Undercut" + icon_state = "undercut1" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/tightbun + name = "Tight Bun" + icon_state = "tightbun" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/trimmed + name = "Trimmed" + icon_state = "trimmed" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/trimflat + name = "Trimmed Flat Top" + icon_state = "trimflat" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/nofade + name = "Regulation Cut" + icon_state = "nofade" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/baldfade + name = "Balding Fade" + icon_state = "baldfade" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/highfade + name = "High Fade" + icon_state = "highfade" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/medfade + name = "Medium Fade" + icon_state = "medfade" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/lowfade + name = "Low Fade" + icon_state = "lowfade" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/oxton + name = "Oxton" + icon_state = "oxton" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/doublebun + name = "Double-Bun" + icon_state = "doublebun" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/halfshaved + name = "Half-Shaved Emo" + icon_state = "halfshaved" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/shortbangs + name = "Short Bangs" + icon_state = "shortbangs" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/longeralt2 + name = "Long Hair Alt 2" + icon_state = "longeralt2" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/nia + name = "Nia" + icon_state = "nia" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/eighties + name = "80's" + icon_state = "80s" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/volaju + name = "Volaju" + icon_state = "volaju" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/joestar + name = "Joestar" + icon_state = "joestar" + gender = MALE + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/nitori + name = "Nitori" + icon_state = "nitori" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/scully + name = "Scully" + icon_state = "scully" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/vegeta + name = "Vegeta" + icon_state = "toriyama2" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/crono + name = "Chrono" + icon_state = "toriyama" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/poofy2 + name = "Poofy2" + icon_state = "poofy2" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/poofy + name = "Poofy" + icon_state = "poofy" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/fringetail + name = "Fringetail" + icon_state = "fringetail" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/mahdrills + name = "Drillruru" + icon_state = "drillruru" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/familyman + name = "The Family Man" + icon_state = "thefamilyman" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/grandebraid + name = "Grande Braid" + icon_state = "grande" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/fringeemo + name = "Emo Fringe" + icon_state = "emofringe" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/emo2 + name = "Emo Alt" + icon_state = "emo2" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/rows2 + name = "Rows 2" + icon_state = "rows2" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/rows + name = "Rows" + icon_state = "rows1" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/reversemohawk + name = "Reverse Mohawk" + icon_state = "reversemohawk" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/father + name = "Father" + icon_state = "father" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/beehive2 + name = "Beehive 2" + icon_state = "beehive2" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/sleeze + name = "Sleeze" + icon_state = "sleeze" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/tresshoulder + name = "Tress Shoulder" + icon_state = "tressshoulder" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/oneshoulder + name = "One Shoulder" + icon_state = "oneshoulder" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/ponytail6 + name = "Ponytail 6" + icon_state = "ponytail6" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/ponytail5 + name = "Ponytail 5" + icon_state = "ponytail5" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/ponytail4 + name = "Ponytail 4" + icon_state = "ponytail4" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/country + name = "Country" + icon_state = "country" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/bedheadlong + name = "Bedhead Long" + icon_state = "long_bedhead" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/flair + name = "Flaired Hair" + icon_state = "flair" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/twintail + name = "Twintail" + icon_state = "twintail" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/short2 + name = "Short Hair 2" + icon_state = "shorthair3" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/bun2 + name = "Bun 2" + icon_state = "bun2" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/bun3 + name = "Bun 3" + icon_state = "bun3" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/shavehair + name = "Shaved Hair" + icon_state = "shaved" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/veryshortovereyealternate + name = "Overeye Very Short, Alternate" + icon_state = "veryshortovereyealternate" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/veryshortovereye + name = "Overeye Very Short" + icon_state = "veryshortovereye" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/shortovereye + name = "Overeye Short" + icon_state = "shortovereye" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/longovereye + name = "Overeye Long" + icon_state = "longovereye" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/father + name = "Father" + icon_state = "father" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/bun4 // Due to a vulp hairstyle called bun + name = "Bun 4" + icon_state = "bun4" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/////////////////////////////////// +//////END POLARIS HAIRSTYLES/////// +////////////////////////////////// + +////////////////////// +////Ume hairstyles//// +////////////////////// + +/datum/sprite_accessory/hair/eighties_ponytail + name = "80's ponytail" + icon_state = "80_ponytail" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/eighties_ponytailalt + name = "80's ponytail alt" + icon_state = "80_ponytail_alt" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/big_bow + name = "Big bow" + icon_state = "big_bow" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/himecut_long + name = "Himecut long" + icon_state = "himecut_long" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/himecut_long_ponytail + name = "Himecut long ponytail" + icon_state = "himecut_long_ponytail" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/amanita_short + name = "Amanita short" + icon_state = "amanita_short" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/long_curls + name = "Long curls" + icon_state = "long_curls" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") + +/datum/sprite_accessory/hair/long_curls_alt + name = "Long curls alt" + icon_state = "long_curls_alt" + species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") diff --git a/modular_ss220/hairs/code/unathi_hair.dm b/modular_ss220/hairs/code/unathi_hair.dm new file mode 100644 index 000000000000..686162438b74 --- /dev/null +++ b/modular_ss220/hairs/code/unathi_hair.dm @@ -0,0 +1,145 @@ +/datum/sprite_accessory/head_accessory/unathi/knight + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Knight" + icon_state = "knight_horns" + +/datum/sprite_accessory/head_accessory/unathi/drake + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Drake" + icon_state = "drake_horns" + +/datum/sprite_accessory/head_accessory/unathi/long + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Long" + icon_state = "long_horns" + +/datum/sprite_accessory/head_accessory/unathi/largecurled + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Large curled" + icon_state = "largecurled_horns" + +/datum/sprite_accessory/head_accessory/unathi/newcurly + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "New curly" + icon_state = "newcurly_horns" + +/datum/sprite_accessory/head_accessory/unathi/guilmon + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Guimon" + icon_state = "guilmon_horns" + +/datum/sprite_accessory/head_accessory/unathi/straight + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Straight" + icon_state = "straight_horns" + +/datum/sprite_accessory/head_accessory/unathi/straightdouble + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Straight double" + icon_state = "straight_double_horns" + +/datum/sprite_accessory/head_accessory/unathi/broken + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken" + icon_state = "broken_horns" + +/datum/sprite_accessory/head_accessory/unathi/brokenl + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken left" + icon_state = "brokenl_horns" + +/datum/sprite_accessory/head_accessory/unathi/brokenr + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "broken right" + icon_state = "brokenr_horns" + +/datum/sprite_accessory/hair/unathi/knight + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Knight" + icon_state = "knight_horns" + +/datum/sprite_accessory/hair/unathi/drake + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Drake" + icon_state = "drake_horns" + +/datum/sprite_accessory/hair/unathi/long + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Long" + icon_state = "long_horns" + +/datum/sprite_accessory/hair/unathi/largecurled + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Large curled" + icon_state = "largecurled_horns" + +/datum/sprite_accessory/hair/unathi/newcurly + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "New curly" + icon_state = "newcurly_horns" + +/datum/sprite_accessory/hair/unathi/guilmon + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Guimon" + icon_state = "guilmon_horns" + +/datum/sprite_accessory/hair/unathi/straight + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Straight" + icon_state = "straight_horns" + +/datum/sprite_accessory/hair/unathi/straightdouble + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Straight double" + icon_state = "straight_double_horns" + +/datum/sprite_accessory/hair/unathi/broken + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken" + icon_state = "broken_horns" + +/datum/sprite_accessory/hair/unathi/brokenl + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken left" + icon_state = "brokenl_horns" + +/datum/sprite_accessory/hair/unathi/brokenr + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken right" + icon_state = "brokenr_horns" + +/datum/sprite_accessory/hair/unathi/una_cobra_ears + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Unathi Cobra Ears" + icon_state = "cobraears" + secondary_theme = "webbing" + +/datum/sprite_accessory/hair/unathi/una_cobra_hood_alt + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Unathi Cobra Hood Smooth" + icon_state = "cobrahood_alt" + secondary_theme = "webbing" + +/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_short_alt + icon = 'modular_ss220/hairs/icons/unathi_facial_hair.dmi' + name = "Short Webbed Frills Alt" + icon_state = "shortfrillsalt" + secondary_theme = "webbing" + +/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_big + icon = 'modular_ss220/hairs/icons/unathi_facial_hair.dmi' + name = "Big Webbed Frills" + icon_state = "bigfrills" + secondary_theme = "webbing" + +/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_neckfull + icon = 'modular_ss220/hairs/icons/unathi_facial_hair.dmi' + name = "Neckfull Webbed Frills" + icon_state = "neckfullfrills" + secondary_theme = "webbing" + +/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_neck + icon = 'modular_ss220/hairs/icons/unathi_facial_hair.dmi' + name = "Neck Webbed Frills" + icon_state = "neckfrills" + secondary_theme = "webbing" diff --git a/modular_ss220/hairs/icons/unathi_facial_hair.dmi b/modular_ss220/hairs/icons/unathi_facial_hair.dmi new file mode 100644 index 0000000000000000000000000000000000000000..03f488a46217db2b266e7997782716a9db1450b4 GIT binary patch literal 2042 zcmbVNc~H}b68;gugg6MkJgUQ)76pMKGLb6~E>kEfH-uaIL_iWGh=6j*QTi%K4Ah4p z0uiAK%|STAeb{FtMwB$+NF$g~LJO2&nh+qIDV=HGf6hGn$L{{|?aa=8yZdcPfS9A^pB)mOj*h<;mzI>8o`g>UfE%^JnAEh44MlLO zY;E51oVDfHD^4&y^b{8{JNGH)yagLbDgJ~=iNUUD08yrcPO6X`aBdcxL0k7>_rX>hT#ut3<V*ZOA|k?}9Z&Z-s974Y@t=wB?jc1gaKfNafbng0 z&EQZhP%|mrcpy|Xb`q#A0o?V~3QmK7B%6dI1vuq0hv>f~#t#qYIm)XiNAiCgIH*`% z=5xS%3#$wL;FK&1Um{B^<6dNB)0ld|Wn4srDGgL1?pL3Ui2o$)kwDBj%EIk~#a6(~ zI)?vZTlGSw^;9kC=eogPX#vkF4+EczH-K_408aQ{X$^n}0h;y^)BhhxArguHIV4VM zrx_^KTdI>aF<*_k`7W~`HP5nkbBoeK|jn2 zq2nE(nE0JHZH=T>7PqfYy*%62YrQb}aOk-!@d9KoWAy6gV3pyXgu3CyI+V;eD}~~P&x=tDkDq(6 zm>nrxx;3;`Z98OSLkcHrG*BAXGT04#U`Z@Fh30d&J@FFt-;vSqg@0-uNDp)8J^xtY{xtU% z568w9HOn?pK=jM$aw;)U3d$lnD`MdADk&@hX06IqY^xGyKZ5XjK!07r-&w~$r?3ol zN9!m}F=R0RYO_s1h{3=lb}{LYOS=b^k+)$F_S?2V+polYYfET$dk*xX&W^f<8`{!@mJhP2eUO};R8gTQT!uXxcb(zGpuD2iLf9=p2h-gk2x$W}7h1`MGXxj6J_kxf2rn9hG5r9l%;83k>$o zGlmp_VaFfjE@?c`d+fsQGVtBXWMlV2k%6~hX=$o3+_Vo78>rkK%M$2GIPxbygz z9#a!Oc3qk9oQ;2k>*uST>^l?9RMLP>O7>x^3WC%rMRB%gZiQGvdEMXV6{9&|)E(t~ zO{DEkHBboS##t42=~IyF%U3I`d83gSsHbAJYwSnksgH9M$`){ocXsrs@}2OZknBEz zlAjf~Dv|K^p)^t98>-hHgIm|WBFx9b%F?7D=}G|qBcCqbgsZ)gqzDVUGIFhzU=-m! z1dDU}Uao~DmNb9txt|fWyBX?PPIoJkio(2e6dnl&fZcuVl-)k{A>#RdcKbl7Qwb1j z3`J`>hby0*G#6Z0#XNj$0ob=;v_UWvY7M@SqP>O<@+BXDEn}hXf-m#F(n`!|s)49Q z+G)Z`J4@2U2?;U>-`Wtb$8m{oH@PBtS!@ZdjFXNKA-uaX`Wvc{SFXFmofkV literal 0 HcmV?d00001 diff --git a/modular_ss220/hairs/icons/unathi_hair.dmi b/modular_ss220/hairs/icons/unathi_hair.dmi new file mode 100644 index 0000000000000000000000000000000000000000..39b83e3282099d5e7ffc5e98c01accb15758c3a5 GIT binary patch literal 4224 zcmcIoX*3&J+fAsU=Bn0QyxtDlnyR9PgqF6qYO1M*rXh-IlTxmj5}`^b#4U=dp|>?9 z2t^c?w6v%xZOwvEB{f817LnxD^{u#TL2bIy;w_u0>0=aG}cMQI5Y z2><{fed#wFX8-`GxjO*jqPr{m^$DciX&~Cw<98eXFu%~Ckl%xX?*IUiFEZ1+WLh-k z&JWF;c({~8tWbSr2pxtQIJKR#&ACws;x}Xd-T3=(Pg>Yyz>)G9PV|WrQ4Lw&MHJLU zqn@_+xGN+WeNOH1)t8X0tPTo-JMV1^9Y~sE`~Gnb{W0@c@~bl=e?~r?_rXV4j-}m- zw~vvM)^P8)8c!E%MF~lzF9%54v(OLXd)jS|-?oB%@F9Y+uFtDPVk<>9b1bSkD#kib zZoU}?)}p36b7YRe19L{YxeU9`5(J-Remkl{Zxzc03}(o~53nA>0RY*6OEza+BVRDb z?K{*5)Z3T23Rm^;q@E{mdFDBUA}~wh97v}>Mbjpi{1SSpNbAEr(6>yb1IPC|ehqLd zB0eu4^SB9edhS9_b)@3$521oL2=lB3gkIYvf|ZdNyjtP%Nkvte`0RFGrN zFbO>3m|d5WlA`?OQ$9Fmc4Lb}t~m&yex;_($nY%qtf>Ss235^`uu<2K)D3lEs`1q+=pb%ioHMx;BB7)i%{YidppO zxrks)+e!2CucIZSV(4*1)WpU4b+tde(t~SUx$!->PI|<0TO=#GxSx5ORASS{sORFz zpLmk!fcB;FS`Z0(m2B8b&tiI1Gq=4^HoCr#E#0BygrViQDwNJhgi>rhX!x1*&b2AO z9oIhD5M*7l&b8olGjwty6+01Yj<2ZW&f1%t*KfKjs&IrtAt6NkXyL}MiT=!OytjL* ze$$UeM8ly|15C=|djEWYC$gp{gGYNM=A5bwQyf_D4F~r=Q%&l8latni-f2j5LP)0o z`%lwKm*NbWjklg7-CB*F%uVkbZs!MzHwufeQC_jAfvpfjdziTSJD_7mO8@`I$_w z6{s;^3ID92LN1T$iAcs_DV*7xJU36eU*Z=WcCD3DBH-1c3TX=)<0v6bJ1J2+tcxHkRCG+$N@cwKp_=0p46f zc#21D4RcLLbPEVtKc?G>4A*&-dgx19bdtK zSLm{`$6IMz@s|cW;6j(~Jzz8(eO$NLNkXQT$7dnOsq{U9Kx45y{3b zJo66NeU(S{YEeY}ff-?Pqp62vw)>fWo>jcMeanybem`Dy6tBYM(HR(j#4IC6vDGlMaHd}i8zJ7Z*msun86=ayFVp!eRKQxCd^rUAEa+! zLE)s@B%ZC@lv;fDx}qqdADbz?CGQYco@9V_Zi=9jqsHSaQ|s!fMdez7F-0E)62)Y3 zusaOWv5;DcWH~ltVW_t|@&PIX(auA^fB*5huELwt-%BEt=lwc_pZZ>O`RhwKvm9f4 zs0EsE<^tok)%E*5XIdC#lDS^G9!N-4?gmk9s?UGK(0F48_;czR9@h)pgK!6l(}XlH zZk>^QNdk0Z01oOld*tGJEgmL`F1ZDD0;_UfKc8EM8U8={$X{IA{VQ$}RE451WRnJa zgH>~Fv;0wI#;B;Wp+G6q1<3D{@88XBzF2I64q`i5@17VAfiKe28%*9YyA}1J&oS47 znYzBnqr;8V0*j9clXa_T#Zs%)Um$TIBLj33NpBVn#mZNQ!m`Sn zM7|J89A&rj)5X#>_BxB4JyV)18mT0wlW+{xP#rE))_Ms15W%?sX4_Us_NASS!<)l9 zwZpQ2d431`{d3A%OUzo?%xj|n;-Finl(fI9nw4q7(T_SxB|aYD1mTJ@n%AFX6 z?F7D@_pamFkMm1Z(1+0il0BlJ7GuOfz2z=7G5Gseqm!>kT&T;G3jW~D!_hf3OI4@BPr~fu+W!Mvs}-ErwozLrWB;C2>yzBxv@B? z-mg6^PC>cAa8qgR-CnkP<3H5j{s+pqy~8zuj{OyP;Izzdf*VVc?)7k0Rn@$ukJ(;j z;l6cf?x43K*Q+nqpXJ?j4Zh84>~;VupyUoZZ$=-tKQTeN5_-I@(rxYME1ceVLqYVs z&K&3vp%Q8yaq>{EXhR~dzUzZ^)f~^H_r+XocPU`S!S7t4C(ZRxiaDhXy8!`k6KVQ9pz-6hV{ zO=MS@b+n!hpz^-L2;6Hhdmcf!BU0M5{_I->tszU=0t>zR z`_Y+U2x+HL8+}H&tnQo0#ONj-@bNb^GU3oS^LcR2Nw? z`*eHYHJz-2=R?^m#}r~}sbKR`$$WNHYHVwc`=hD-_+E*tnLW`hE>+~{f_pjawJt1? zJ0{ol%&lcEs|!l!^SF#A6!WplSS_A2xXPyUy?_jKc>n;SNc0 zVpw*F7?GT>t%lAq)en{3H|XYkrdVDTWQyavWPAR=8=?w2>sWP(P6cekJfUN#m!>B7 zEcKCbjLHfm>PkdN$5(9bH)}W^&X+mLcw5TP`$Oc)77+$*ZMP9gi&&xtlR2{^-oee` zoSQ64)3+92l%4N|dvDH*$pK!s2}Fed%WU>{8xR$7!qX@Y&7uI_noQw5_?~Oy*aHpX8Fs-2mIWyId-sF?FHY2%kHQ7V(jn23BJr@LK@3_dPOURNG` zZzpa#LZ0FBBPcZy)dCKVx5R~2Vhk4P8xhJbY2c(!FUh8$@Ustjk#MhF+#Y+?eL;khhEEMH2*t zzcL-epu^rRAw%gJkeMx3xOC}#c3G!qpQ8pkW)KEPSt=C=z7&*Zl@j-BsCP6Qfo zb-P^FVbTR={Me+cHfT3P>&rt`rpal;vuwRuYjv8B>40!Bgq-x$WN)2nr z4HZ)~5_3n(?>!B$JQ4_oBMAEbnp30Z3UpmIXLfbU%%1QJk?uC`4X( zd&{^s@$!z9NfRA+w@6LUEF=zap0s==^j~E2zw`gM z;BUwBHlj7h7EE?gbN^;}mzx}t0$ yymB@zW<%I#T`C`VcTM< Date: Tue, 5 Dec 2023 14:22:57 +0700 Subject: [PATCH 2/6] crazy mega liggers --- modular_ss220/hairs/_hairs.dm | 2 +- modular_ss220/hairs/_hairs.dme | 3 + .../hairs/code/unathi_facial_hair.dm | 23 +++ modular_ss220/hairs/code/unathi_hair.dm | 89 +--------- .../hairs/code/unathi_head_accessories.dm | 164 ++++++++++++++++++ 5 files changed, 196 insertions(+), 85 deletions(-) create mode 100644 modular_ss220/hairs/code/unathi_facial_hair.dm create mode 100644 modular_ss220/hairs/code/unathi_head_accessories.dm diff --git a/modular_ss220/hairs/_hairs.dm b/modular_ss220/hairs/_hairs.dm index 9f082c589cac..2940bf0ff79b 100644 --- a/modular_ss220/hairs/_hairs.dm +++ b/modular_ss220/hairs/_hairs.dm @@ -1,4 +1,4 @@ /datum/modpack/hairs name = "Новые волосы" desc = "Добавляет новые типы волос" - author = "oricyUwU, FlutterSnedDraw" + author = "oricyUwU, FlutterSnedDraw, BR54FF" diff --git a/modular_ss220/hairs/_hairs.dme b/modular_ss220/hairs/_hairs.dme index 873e1c645e17..79396d10c85a 100644 --- a/modular_ss220/hairs/_hairs.dme +++ b/modular_ss220/hairs/_hairs.dme @@ -7,5 +7,8 @@ #include "_hairs.dm" #include "code/vulpkanin_hair.dm" #include "code/human_hair.dm" +#include "code/unathi_hair.dm" +#include "code/unathi_head_accessories.dm" +#include "code/unathi_facial_hair.dm" // END_INCLUDE diff --git a/modular_ss220/hairs/code/unathi_facial_hair.dm b/modular_ss220/hairs/code/unathi_facial_hair.dm new file mode 100644 index 000000000000..6e790056d901 --- /dev/null +++ b/modular_ss220/hairs/code/unathi_facial_hair.dm @@ -0,0 +1,23 @@ +/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_short_alt + icon = 'modular_ss220/hairs/icons/unathi_facial_hair.dmi' + name = "Short Webbed Frills Alt" + icon_state = "shortfrillsalt" + secondary_theme = "webbing" + +/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_big + icon = 'modular_ss220/hairs/icons/unathi_facial_hair.dmi' + name = "Big Webbed Frills" + icon_state = "bigfrills" + secondary_theme = "webbing" + +/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_neckfull + icon = 'modular_ss220/hairs/icons/unathi_facial_hair.dmi' + name = "Neckfull Webbed Frills" + icon_state = "neckfullfrills" + secondary_theme = "webbing" + +/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_neck + icon = 'modular_ss220/hairs/icons/unathi_facial_hair.dmi' + name = "Neck Webbed Frills" + icon_state = "neckfrills" + secondary_theme = "webbing" diff --git a/modular_ss220/hairs/code/unathi_hair.dm b/modular_ss220/hairs/code/unathi_hair.dm index 686162438b74..9b36a1829c49 100644 --- a/modular_ss220/hairs/code/unathi_hair.dm +++ b/modular_ss220/hairs/code/unathi_hair.dm @@ -1,58 +1,3 @@ -/datum/sprite_accessory/head_accessory/unathi/knight - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' - name = "Knight" - icon_state = "knight_horns" - -/datum/sprite_accessory/head_accessory/unathi/drake - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' - name = "Drake" - icon_state = "drake_horns" - -/datum/sprite_accessory/head_accessory/unathi/long - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' - name = "Long" - icon_state = "long_horns" - -/datum/sprite_accessory/head_accessory/unathi/largecurled - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' - name = "Large curled" - icon_state = "largecurled_horns" - -/datum/sprite_accessory/head_accessory/unathi/newcurly - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' - name = "New curly" - icon_state = "newcurly_horns" - -/datum/sprite_accessory/head_accessory/unathi/guilmon - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' - name = "Guimon" - icon_state = "guilmon_horns" - -/datum/sprite_accessory/head_accessory/unathi/straight - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' - name = "Straight" - icon_state = "straight_horns" - -/datum/sprite_accessory/head_accessory/unathi/straightdouble - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' - name = "Straight double" - icon_state = "straight_double_horns" - -/datum/sprite_accessory/head_accessory/unathi/broken - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' - name = "Broken" - icon_state = "broken_horns" - -/datum/sprite_accessory/head_accessory/unathi/brokenl - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' - name = "Broken left" - icon_state = "brokenl_horns" - -/datum/sprite_accessory/head_accessory/unathi/brokenr - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' - name = "broken right" - icon_state = "brokenr_horns" - /datum/sprite_accessory/hair/unathi/knight icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' name = "Knight" @@ -110,36 +55,12 @@ /datum/sprite_accessory/hair/unathi/una_cobra_ears icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' - name = "Unathi Cobra Ears" - icon_state = "cobraears" - secondary_theme = "webbing" + name = "Unathi Cobra Ears" + icon_state = "cobraears" + secondary_theme = "webbing" /datum/sprite_accessory/hair/unathi/una_cobra_hood_alt icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' - name = "Unathi Cobra Hood Smooth" - icon_state = "cobrahood_alt" - secondary_theme = "webbing" - -/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_short_alt - icon = 'modular_ss220/hairs/icons/unathi_facial_hair.dmi' - name = "Short Webbed Frills Alt" - icon_state = "shortfrillsalt" - secondary_theme = "webbing" - -/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_big - icon = 'modular_ss220/hairs/icons/unathi_facial_hair.dmi' - name = "Big Webbed Frills" - icon_state = "bigfrills" - secondary_theme = "webbing" - -/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_neckfull - icon = 'modular_ss220/hairs/icons/unathi_facial_hair.dmi' - name = "Neckfull Webbed Frills" - icon_state = "neckfullfrills" - secondary_theme = "webbing" - -/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_neck - icon = 'modular_ss220/hairs/icons/unathi_facial_hair.dmi' - name = "Neck Webbed Frills" - icon_state = "neckfrills" + name = "Unathi Cobra Hood Smooth" + icon_state = "cobrahood_alt" secondary_theme = "webbing" diff --git a/modular_ss220/hairs/code/unathi_head_accessories.dm b/modular_ss220/hairs/code/unathi_head_accessories.dm new file mode 100644 index 000000000000..b4fd251c772d --- /dev/null +++ b/modular_ss220/hairs/code/unathi_head_accessories.dm @@ -0,0 +1,164 @@ +/datum/sprite_accessory/head_accessory/unathi/knight + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Knight" + icon_state = "knight_horns" + +/datum/sprite_accessory/head_accessory/unathi/drake + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Drake" + icon_state = "drake_horns" + +/datum/sprite_accessory/head_accessory/unathi/long + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Long" + icon_state = "long_horns" + +/datum/sprite_accessory/head_accessory/unathi/largecurled + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Large curled" + icon_state = "largecurled_horns" + +/datum/sprite_accessory/head_accessory/unathi/newcurly + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "New curly" + icon_state = "newcurly_horns" + +/datum/sprite_accessory/head_accessory/unathi/guilmon + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Guimon" + icon_state = "guilmon_horns" + +/datum/sprite_accessory/head_accessory/unathi/straight + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Straight" + icon_state = "straight_horns" + +/datum/sprite_accessory/head_accessory/unathi/straightdouble + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Straight double" + icon_state = "straight_double_horns" + +/datum/sprite_accessory/head_accessory/unathi/broken + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken" + icon_state = "broken_horns" + +/datum/sprite_accessory/head_accessory/unathi/brokenl + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken left" + icon_state = "brokenl_horns" + +/datum/sprite_accessory/head_accessory/unathi/brokenr + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken right" + icon_state = "brokenr_horns" + +/datum/sprite_accessory/head_accessory/unathi/knight + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Knight" + icon_state = "knight_horns" + +/datum/sprite_accessory/head_accessory/unathi/drake + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Drake" + icon_state = "drake_horns" + +/datum/sprite_accessory/head_accessory/unathi/long + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Long" + icon_state = "long_horns" + +/datum/sprite_accessory/head_accessory/unathi/largecurled + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Large curled" + icon_state = "largecurled_horns" + +/datum/sprite_accessory/head_accessory/unathi/newcurly + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "New curly" + icon_state = "newcurly_horns" + +/datum/sprite_accessory/head_accessory/unathi/guilmon + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Guimon" + icon_state = "guilmon_horns" + +/datum/sprite_accessory/head_accessory/unathi/straight + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Straight" + icon_state = "straight_horns" + +/datum/sprite_accessory/head_accessory/unathi/straightdouble + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Straight double" + icon_state = "straight_double_horns" + +/datum/sprite_accessory/head_accessory/unathi/broken + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken" + icon_state = "broken_horns" + +/datum/sprite_accessory/head_accessory/unathi/brokenl + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken left" + icon_state = "brokenl_horns" + +/datum/sprite_accessory/head_accessory/unathi/brokenr + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken right" + icon_state = "brokenr_horns" + +/datum/sprite_accessory/head_accessory/unathi/knight + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Knight" + icon_state = "knight_horns" + +/datum/sprite_accessory/head_accessory/unathi/drake + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Drake" + icon_state = "drake_horns" + +/datum/sprite_accessory/head_accessory/unathi/long + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Long" + icon_state = "long_horns" + +/datum/sprite_accessory/head_accessory/unathi/largecurled + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Large curled" + icon_state = "largecurled_horns" + +/datum/sprite_accessory/head_accessory/unathi/newcurly + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "New curly" + icon_state = "newcurly_horns" + +/datum/sprite_accessory/head_accessory/unathi/guilmon + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Guimon" + icon_state = "guilmon_horns" + +/datum/sprite_accessory/head_accessory/unathi/straight + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Straight" + icon_state = "straight_horns" + +/datum/sprite_accessory/head_accessory/unathi/straightdouble + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Straight double" + icon_state = "straight_double_horns" + +/datum/sprite_accessory/head_accessory/unathi/broken + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken" + icon_state = "broken_horns" + +/datum/sprite_accessory/head_accessory/unathi/brokenl + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken left" + icon_state = "brokenl_horns" + +/datum/sprite_accessory/head_accessory/unathi/brokenr + icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + name = "Broken right" + icon_state = "brokenr_horns" From 291b3b0aa310b40318e4df5e6606b32064b2064d Mon Sep 17 00:00:00 2001 From: BR54FF Date: Tue, 5 Dec 2023 20:06:56 +0700 Subject: [PATCH 3/6] liggerz --- modular_ss220/hairs/code/human_hair.dm | 316 +------------------------ 1 file changed, 1 insertion(+), 315 deletions(-) diff --git a/modular_ss220/hairs/code/human_hair.dm b/modular_ss220/hairs/code/human_hair.dm index eeaee629acbd..993ac40a9667 100644 --- a/modular_ss220/hairs/code/human_hair.dm +++ b/modular_ss220/hairs/code/human_hair.dm @@ -7,353 +7,200 @@ icon_state = "crewcut" /datum/sprite_accessory/hair/short - name = "Short Hair" - icon_state = "short" - glasses_over = 1 species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/cut - name = "Cut Hair" - icon_state = "cut" - glasses_over = 1 species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/long - name = "Shoulder-length Hair" - icon_state = "long" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/longalt - name = "Shoulder-length Hair Alt" - icon_state = "longfringe" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/longer - name = "Long Hair" - icon_state = "vlong" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/longeralt - name = "Long Hair Alt" - icon_state = "vlongfringe" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/longest - name = "Very Long Hair" - icon_state = "longest" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/longfringe - name = "Long Fringe" - icon_state = "longfringe" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/longestalt - name = "Longer Fringe" - icon_state = "vlongfringe" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/halfbang - name = "Half-banged Hair" - icon_state = "halfbang" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/halfbangalt - name = "Half-banged Hair Alt" - icon_state = "halfbang_alt" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/ponytail1 - name = "Ponytail 1" - icon_state = "ponytailm" - glasses_over = 1 species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/ponytail2 - name = "Ponytail 2" - icon_state = "ponytailf" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/ponytail3 - name = "Ponytail 3" - icon_state = "ponytail3" - glasses_over = 1 species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/sideponytail - name = "Side Ponytail" - icon_state = "stail" - glasses_over = 1 species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/highponytail - name = "High Ponytail" - icon_state = "highponytail" - glasses_over = 1 species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/wisp - name = "Wisp" - icon_state = "wisp" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/parted - name = "Parted" - icon_state = "parted" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/pompadour - name = "Pompadour" - icon_state = "pompadour" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") glasses_over = 1 /datum/sprite_accessory/hair/quiff - name = "Quiff" - icon_state = "quiff" - glasses_over = 1 species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/bedhead - name = "Bedhead" - icon_state = "bedhead" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/bedhead2 - name = "Bedhead 2" - icon_state = "bedhead2" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/bedhead3 - name = "Bedhead 3" - icon_state = "bedhead3" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/beehive - name = "Beehive" - icon_state = "beehive" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/bobcurl - name = "Bobcurl" - icon_state = "bobcurl" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/bob - name = "Bob" - icon_state = "bobcut" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/bowl - name = "Bowl" - icon_state = "bowlcut" - glasses_over = 1 species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/braid2 - name = "Long Braid" - icon_state = "hbraid" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/buzz - name = "Buzzcut" - icon_state = "buzzcut" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/crew - name = "Crewcut" - icon_state = "crewcut" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/combover - name = "Combover" - icon_state = "combover" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/devillock - name = "Devil Lock" - icon_state = "devilock" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/dreadlocks - name = "Dreadlocks" - icon_state = "dreads" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/curls - name = "Curls" - icon_state = "curls" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/afro - name = "Afro" - icon_state = "afro" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/afro2 - name = "Afro 2" - icon_state = "afro2" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/afro_large - name = "Big Afro" - icon_state = "bigafro" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/sergeant - name = "Flat Top" - icon_state = "sergeant" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/emo - name = "Emo" - icon_state = "emo" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/flow - name = "Flow Hair" - icon_state = "flow" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/feather - name = "Feather" - icon_state = "feather" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/hitop - name = "Hitop" - icon_state = "hitop" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/mohawk - name = "Mohawk" - icon_state = "mohawk" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/jensen - name = "Adam Jensen Hair" - icon_state = "jensen" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/cia - name = "CIA" - icon_state = "cia" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") glasses_over = 1 /datum/sprite_accessory/hair/mulder - name = "Mulder" - icon_state = "mulder" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/gelled - name = "Gelled Back" - icon_state = "gelled" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/spiky - name = "Spiky" - icon_state = "spikey" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/kusanagi - name = "Kusanagi Hair" - icon_state = "kusanagi" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/kagami - name = "Pigtails" - icon_state = "kagami" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/himecut - name = "Hime Cut" - icon_state = "himecut" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/braid - name = "Floorlength Braid" - icon_state = "floorbraid" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/odango - name = "Odango" - icon_state = "odango" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/ombre - name = "Ombre" - icon_state = "ombre" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/updo - name = "Updo" - icon_state = "updo" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/skinhead - name = "Skinhead" - icon_state = "skinhead" - glasses_over = 1 species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/balding - name = "Balding Hair" - icon_state = "balding" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/longemo - name = "Long Emo" - icon_state = "emolong" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") ////////////////////////////// //////START VG HAIRSTYLES///// ////////////////////////////// /datum/sprite_accessory/hair/birdnest - name = "Bird Nest" - icon_state = "birdnest" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/unkept - name = "Unkempt" - icon_state = "unkept" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/modern - name = "Modern" - icon_state = "modern" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/unshavenmohawk - name = "Unshaven Mohawk" - icon_state = "unshavenmohawk" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/drills - name = "Twincurls" - icon_state = "twincurl" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/minidrills - name = "Twincurls 2" - icon_state = "twincurl2" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") ////////////////////////////// //////END VG HAIRSTYLES/////// @@ -364,364 +211,219 @@ ////////////////////////////////// /datum/sprite_accessory/hair/rosa - name = "Rosa" - icon_state = "rosa" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/jade - name = "Jade" - icon_state = "jade" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/manbun - name = "Manbun" - icon_state = "manbun" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/thinningback - name = "Thinning Back" - icon_state = "thinningrear" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/thinningfront - name = "Thinning Front" - icon_state = "thinningfront" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/thinning - name = "Thinning" - icon_state = "thinning" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/bowlcut2 - name = "Bowl 2" - icon_state = "bowlcut2" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/ronin - name = "Ronin" - icon_state = "ronin" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/topknot - name = "Topknot" - icon_state = "topknot" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/regulationmohawk - name = "Regulation Mohawk" - icon_state = "shavedmohawk" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/rowbraid - name = "Row Braid" - icon_state = "rowbraid" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/rowdualbraid - name = "Row Dual Braid" - icon_state = "rowdualtail" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/rowbun - name = "Row Bun" - icon_state = "rowbun" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/hightight - name = "High and Tight" - icon_state = "hightight" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/partfade - name = "Parted Fade" - icon_state = "shavedpart" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/undercut3 - name = "Undercut Swept Left" - icon_state = "undercut3" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/undercut2 - name = "Undercut Swept Right" - icon_state = "undercut2" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/undercut1 - name = "Undercut" - icon_state = "undercut1" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/tightbun - name = "Tight Bun" - icon_state = "tightbun" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/trimmed - name = "Trimmed" - icon_state = "trimmed" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/trimflat - name = "Trimmed Flat Top" - icon_state = "trimflat" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/nofade - name = "Regulation Cut" - icon_state = "nofade" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/baldfade - name = "Balding Fade" - icon_state = "baldfade" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/highfade - name = "High Fade" - icon_state = "highfade" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/medfade - name = "Medium Fade" - icon_state = "medfade" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/lowfade - name = "Low Fade" - icon_state = "lowfade" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/oxton - name = "Oxton" - icon_state = "oxton" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/doublebun - name = "Double-Bun" - icon_state = "doublebun" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/halfshaved - name = "Half-Shaved Emo" - icon_state = "halfshaved" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/shortbangs - name = "Short Bangs" - icon_state = "shortbangs" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/longeralt2 - name = "Long Hair Alt 2" - icon_state = "longeralt2" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/nia - name = "Nia" - icon_state = "nia" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/eighties - name = "80's" - icon_state = "80s" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/volaju - name = "Volaju" - icon_state = "volaju" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/joestar - name = "Joestar" - icon_state = "joestar" - gender = MALE species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/nitori - name = "Nitori" - icon_state = "nitori" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/scully - name = "Scully" - icon_state = "scully" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/vegeta - name = "Vegeta" - icon_state = "toriyama2" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/crono - name = "Chrono" - icon_state = "toriyama" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/poofy2 - name = "Poofy2" - icon_state = "poofy2" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/poofy - name = "Poofy" - icon_state = "poofy" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/fringetail - name = "Fringetail" - icon_state = "fringetail" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") -/datum/sprite_accessory/hair/mahdrills - name = "Drillruru" - icon_state = "drillruru" +/datum/sprite_accessory/hair/mahdrills" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/familyman - name = "The Family Man" - icon_state = "thefamilyman" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/grandebraid - name = "Grande Braid" - icon_state = "grande" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/fringeemo - name = "Emo Fringe" - icon_state = "emofringe" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/emo2 - name = "Emo Alt" - icon_state = "emo2" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/rows2 - name = "Rows 2" - icon_state = "rows2" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/rows - name = "Rows" - icon_state = "rows1" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/reversemohawk - name = "Reverse Mohawk" - icon_state = "reversemohawk" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/father - name = "Father" - icon_state = "father" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/beehive2 - name = "Beehive 2" - icon_state = "beehive2" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/sleeze - name = "Sleeze" - icon_state = "sleeze" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/tresshoulder - name = "Tress Shoulder" - icon_state = "tressshoulder" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/oneshoulder - name = "One Shoulder" - icon_state = "oneshoulder" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/ponytail6 - name = "Ponytail 6" - icon_state = "ponytail6" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/ponytail5 - name = "Ponytail 5" - icon_state = "ponytail5" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/ponytail4 - name = "Ponytail 4" - icon_state = "ponytail4" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/country - name = "Country" - icon_state = "country" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/bedheadlong - name = "Bedhead Long" - icon_state = "long_bedhead" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/flair - name = "Flaired Hair" - icon_state = "flair" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/twintail - name = "Twintail" - icon_state = "twintail" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/short2 - name = "Short Hair 2" - icon_state = "shorthair3" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/bun2 - name = "Bun 2" - icon_state = "bun2" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/bun3 - name = "Bun 3" - icon_state = "bun3" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/shavehair - name = "Shaved Hair" - icon_state = "shaved" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/veryshortovereyealternate - name = "Overeye Very Short, Alternate" - icon_state = "veryshortovereyealternate" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/veryshortovereye - name = "Overeye Very Short" - icon_state = "veryshortovereye" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/shortovereye - name = "Overeye Short" - icon_state = "shortovereye" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/longovereye - name = "Overeye Long" - icon_state = "longovereye" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/father - name = "Father" - icon_state = "father" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/bun4 // Due to a vulp hairstyle called bun - name = "Bun 4" - icon_state = "bun4" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /////////////////////////////////// @@ -733,41 +435,25 @@ ////////////////////// /datum/sprite_accessory/hair/eighties_ponytail - name = "80's ponytail" - icon_state = "80_ponytail" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/eighties_ponytailalt - name = "80's ponytail alt" - icon_state = "80_ponytail_alt" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/big_bow - name = "Big bow" - icon_state = "big_bow" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/himecut_long - name = "Himecut long" - icon_state = "himecut_long" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/himecut_long_ponytail - name = "Himecut long ponytail" - icon_state = "himecut_long_ponytail" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/amanita_short - name = "Amanita short" - icon_state = "amanita_short" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/long_curls - name = "Long curls" - icon_state = "long_curls" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/long_curls_alt - name = "Long curls alt" - icon_state = "long_curls_alt" species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") From 638a96a41df6225dad55000bab811cba34477618 Mon Sep 17 00:00:00 2001 From: BR54FF Date: Tue, 5 Dec 2023 20:11:49 +0700 Subject: [PATCH 4/6] bruh --- modular_ss220/hairs/code/human_hair.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/hairs/code/human_hair.dm b/modular_ss220/hairs/code/human_hair.dm index 993ac40a9667..7eb5a7456ee1 100644 --- a/modular_ss220/hairs/code/human_hair.dm +++ b/modular_ss220/hairs/code/human_hair.dm @@ -336,7 +336,7 @@ /datum/sprite_accessory/hair/fringetail species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") -/datum/sprite_accessory/hair/mahdrills" +/datum/sprite_accessory/hair/mahdrills species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") /datum/sprite_accessory/hair/familyman From f8858c8bdec73bc1002b1b1f4f948ab6ffd622c0 Mon Sep 17 00:00:00 2001 From: BR54FF <106420737+BR54FF@users.noreply.github.com> Date: Wed, 6 Dec 2023 17:14:21 +0700 Subject: [PATCH 5/6] Update modular_ss220/hairs/code/human_hair.dm Co-authored-by: dj-34 --- modular_ss220/hairs/code/human_hair.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/modular_ss220/hairs/code/human_hair.dm b/modular_ss220/hairs/code/human_hair.dm index 7eb5a7456ee1..b0d0b551faf6 100644 --- a/modular_ss220/hairs/code/human_hair.dm +++ b/modular_ss220/hairs/code/human_hair.dm @@ -141,7 +141,6 @@ /datum/sprite_accessory/hair/cia species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/mulder species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") From c365dd8ee75ac68828606acbcbff6d5b113eb2c4 Mon Sep 17 00:00:00 2001 From: BR54FF <106420737+BR54FF@users.noreply.github.com> Date: Wed, 6 Dec 2023 17:14:47 +0700 Subject: [PATCH 6/6] Update modular_ss220/hairs/code/human_hair.dm Co-authored-by: dj-34 --- modular_ss220/hairs/code/human_hair.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/modular_ss220/hairs/code/human_hair.dm b/modular_ss220/hairs/code/human_hair.dm index b0d0b551faf6..cd3547a17c28 100644 --- a/modular_ss220/hairs/code/human_hair.dm +++ b/modular_ss220/hairs/code/human_hair.dm @@ -62,7 +62,6 @@ /datum/sprite_accessory/hair/pompadour species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin") - glasses_over = 1 /datum/sprite_accessory/hair/quiff species_allowed = list("Human", "Slime People", "Tajaran", "Vulpkanin")