diff --git a/modular_ss220/hairs/_hairs.dm b/modular_ss220/char_customize/_char_customize.dm similarity index 100% rename from modular_ss220/hairs/_hairs.dm rename to modular_ss220/char_customize/_char_customize.dm diff --git a/modular_ss220/hairs/_hairs.dme b/modular_ss220/char_customize/_char_customize.dme similarity index 79% rename from modular_ss220/hairs/_hairs.dme rename to modular_ss220/char_customize/_char_customize.dme index 79396d10c85a..c292fad95cf4 100644 --- a/modular_ss220/hairs/_hairs.dme +++ b/modular_ss220/char_customize/_char_customize.dme @@ -4,11 +4,12 @@ #endif // BEGIN INCLUDE -#include "_hairs.dm" +#include "_char_customize.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" +#include "code/human_body_markings.dm" // END_INCLUDE diff --git a/modular_ss220/char_customize/code/human_body_markings.dm b/modular_ss220/char_customize/code/human_body_markings.dm new file mode 100644 index 000000000000..acdb35078765 --- /dev/null +++ b/modular_ss220/char_customize/code/human_body_markings.dm @@ -0,0 +1,42 @@ + +/datum/sprite_accessory/body_markings/cybernetics/cybershoulders + icon = 'modular_ss220/char_customize/icons/human_body_markings.dmi' + name = "Cybernetic neck and shoulders (man)" + species_allowed = list("Human") + icon_state = "shoulders_m" + +/datum/sprite_accessory/body_markings/cybernetics/cybershouldersalt + icon = 'modular_ss220/char_customize/icons/human_body_markings.dmi' + name = "Cybernetic neck and shoulders (female)" + species_allowed = list("Human") + icon_state = "shoulders_w" + +/datum/sprite_accessory/body_markings/cybernetics/cybershouldersandjaw + icon = 'modular_ss220/char_customize/icons/human_body_markings.dmi' + name = "Cybernetic neck, shoulders and jaw (man)" + species_allowed = list("Human") + icon_state = "shoulders_jaw_m" + +/datum/sprite_accessory/body_markings/cybernetics/cybershouldersandjawalt + icon = 'modular_ss220/char_customize/icons/human_body_markings.dmi' + name = "Cybernetic neck, shoulders and jaw (female)" + species_allowed = list("Human") + icon_state = "shoulders_jaw_w" + +/datum/sprite_accessory/body_markings/cybernetics/cyberjaw + icon = 'modular_ss220/char_customize/icons/human_body_markings.dmi' + name = "Cybernetic jaw" + species_allowed = list("Human") + icon_state = "jaw" + +/datum/sprite_accessory/body_markings/cybernetics/cybereyeaddon + icon = 'modular_ss220/char_customize/icons/human_body_markings.dmi' + name = "Cybernetic eyes addon" + species_allowed = list("Human") + icon_state = "eyes" + +/datum/sprite_accessory/body_markings/cybernetics/cyberjawandeyes + icon = 'modular_ss220/char_customize/icons/human_body_markings.dmi' + name = "Cybernetic eyes addon and jaw" + species_allowed = list("Human") + icon_state = "jaw_eyes" diff --git a/modular_ss220/hairs/code/human_hair.dm b/modular_ss220/char_customize/code/human_hair.dm similarity index 89% rename from modular_ss220/hairs/code/human_hair.dm rename to modular_ss220/char_customize/code/human_hair.dm index 5feb93306c3a..5767873e176c 100644 --- a/modular_ss220/hairs/code/human_hair.dm +++ b/modular_ss220/char_customize/code/human_hair.dm @@ -3,7 +3,7 @@ */ /datum/sprite_accessory/hair/crew - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' icon_state = "crewcut" /datum/sprite_accessory/hair/short @@ -458,288 +458,288 @@ /* New human hair */ /datum/sprite_accessory/hair/hair_glammetal - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Glam Metal" icon_state = "hair_glammetal" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/hair_undercut_fem_s - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Undercut Female" icon_state = "hair_undercut_fem" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/hair_curtains - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Curtains" icon_state = "hair_curtains" species_allowed = list("Human", "Slime People") glasses_over = 0 /datum/sprite_accessory/hair/hair_damsel - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Damsel" icon_state = "hair_damsel" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/zone_s - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Zone" icon_state = "zone" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/butterfly - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Butterfly" icon_state = "butterfly" secondary_theme = "beads" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/cascading_long_bob - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Cascading Long Bob" icon_state = "cascading_long_bob" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/jinshi - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Jinshi" icon_state = "jinshi" secondary_theme = "beads" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/long_strait - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Long Strait" icon_state = "long_strait" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/pine - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Pine" icon_state = "pine" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/short_bob - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Short Bob" icon_state = "short_bob" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/waves_mid - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Waves Mid" icon_state = "waves_mid" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/whim - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Whim" icon_state = "whim" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/vulpkanin/tomahawk_spiker - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Tomahawk Spiker" icon_state = "tomahawk_spiker" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/twosideup - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Two Side Up" icon_state = "twosideup" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/lowbraid - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Low Braid" icon_state = "lowbraid" secondary_theme = "bow" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/glamour_short - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Glamour Short" icon_state = "glamour_short" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/glamour_long - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Glamour Long" icon_state = "glamour_long" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/stasy - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Stasy" icon_state = "stasy" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/stasy_morning - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Stasy Morning" icon_state = "stasy_morning" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/spike_pod - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Spike Pod" icon_state = "spike_pod" secondary_theme = "acs" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/hikka - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Hikka" icon_state = "hikka" secondary_theme = "acs" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/inari - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Inari" icon_state = "inari" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/drow - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Drow" icon_state = "drow" secondary_theme = "webbing" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/harpy - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Harpy" icon_state = "harpy" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/harpy_braid - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Harpy Long Braid" icon_state = "harpy_braid" secondary_theme = "bow" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/long_buns_alt - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Long Buns Alt" icon_state = "long_buns_alt" secondary_theme = "webbing" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/harpy_twinbraids - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Harpy Twinbraids" icon_state = "harpy_twinbraids" secondary_theme = "bow" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/cotton - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Cotton" icon_state = "cotton" secondary_theme = "ribb" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/kisaragi - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Kisaragi" icon_state = "kisaragi" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/rockstar - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Rockstar" icon_state = "rockstar" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/tribun - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Tri-bun" icon_state = "tribun" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/longtwintails - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Long Twintails" icon_state = "longtwintails" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/long_strand - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Long Strand Lock" icon_state = "long_strand" secondary_theme = "lock" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/eighties_alt - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "80s Alt" icon_state = "eighties_alt" secondary_theme = "acs" species_allowed = list("Human", "Slime People") /datum/sprite_accessory/hair/eighties_alt_tajaran - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Tajaran 80s Alt" icon_state = "eighties_alt_tajaran" secondary_theme = "acs" species_allowed = list("Tajaran") /datum/sprite_accessory/hair/punk_lying - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Punk Lying" icon_state = "punk_lying" secondary_theme = "acs" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/halfshave - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Halfshave" icon_state = "halfshave" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/ruby - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Ruby" icon_state = "ruby" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/long_flipped - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Long Flipped" icon_state = "long_flipped" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/himeup - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Hime Big Ponytail" icon_state = "himeup" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/rosemary - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Rosemary" icon_state = "rosemary" secondary_theme = "acs" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/slimetendrils - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Slimetendrils" icon_state = "slimetendrils" species_allowed = list("Slime People") /datum/sprite_accessory/hair/country - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Country" icon_state = "country" secondary_theme = "acs" species_allowed = list("Human", "Slime People", "Tajaran") /datum/sprite_accessory/hair/jinx - icon = 'modular_ss220/hairs/icons/human_hair.dmi' + icon = 'modular_ss220/char_customize/icons/human_hair.dmi' name = "Jinx" icon_state = "jinx" species_allowed = list("Human", "Slime People", "Tajaran") diff --git a/modular_ss220/hairs/code/unathi_facial_hair.dm b/modular_ss220/char_customize/code/unathi_facial_hair.dm similarity index 69% rename from modular_ss220/hairs/code/unathi_facial_hair.dm rename to modular_ss220/char_customize/code/unathi_facial_hair.dm index 6e790056d901..8a30426f42e1 100644 --- a/modular_ss220/hairs/code/unathi_facial_hair.dm +++ b/modular_ss220/char_customize/code/unathi_facial_hair.dm @@ -1,23 +1,23 @@ /datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_short_alt - icon = 'modular_ss220/hairs/icons/unathi_facial_hair.dmi' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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/char_customize/code/unathi_hair.dm similarity index 62% rename from modular_ss220/hairs/code/unathi_hair.dm rename to modular_ss220/char_customize/code/unathi_hair.dm index 9b36a1829c49..10801681967d 100644 --- a/modular_ss220/hairs/code/unathi_hair.dm +++ b/modular_ss220/char_customize/code/unathi_hair.dm @@ -1,66 +1,66 @@ /datum/sprite_accessory/hair/unathi/knight - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + icon = 'modular_ss220/char_customize/icons/unathi_hair.dmi' name = "Knight" icon_state = "knight_horns" /datum/sprite_accessory/hair/unathi/drake - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + icon = 'modular_ss220/char_customize/icons/unathi_hair.dmi' name = "Drake" icon_state = "drake_horns" /datum/sprite_accessory/hair/unathi/long - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + icon = 'modular_ss220/char_customize/icons/unathi_hair.dmi' name = "Long" icon_state = "long_horns" /datum/sprite_accessory/hair/unathi/largecurled - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/icons/unathi_hair.dmi' name = "Guimon" icon_state = "guilmon_horns" /datum/sprite_accessory/hair/unathi/straight - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + icon = 'modular_ss220/char_customize/icons/unathi_hair.dmi' name = "Straight" icon_state = "straight_horns" /datum/sprite_accessory/hair/unathi/straightdouble - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/icons/unathi_hair.dmi' name = "Broken" icon_state = "broken_horns" /datum/sprite_accessory/hair/unathi/brokenl - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/icons/unathi_hair.dmi' 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/char_customize/code/unathi_head_accessories.dm similarity index 63% rename from modular_ss220/hairs/code/unathi_head_accessories.dm rename to modular_ss220/char_customize/code/unathi_head_accessories.dm index b4fd251c772d..ad218f22158e 100644 --- a/modular_ss220/hairs/code/unathi_head_accessories.dm +++ b/modular_ss220/char_customize/code/unathi_head_accessories.dm @@ -1,164 +1,164 @@ /datum/sprite_accessory/head_accessory/unathi/knight - icon = 'modular_ss220/hairs/icons/unathi_hair.dmi' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/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' + icon = 'modular_ss220/char_customize/icons/unathi_hair.dmi' name = "Broken right" icon_state = "brokenr_horns" diff --git a/modular_ss220/hairs/code/vulpkanin_hair.dm b/modular_ss220/char_customize/code/vulpkanin_hair.dm similarity index 61% rename from modular_ss220/hairs/code/vulpkanin_hair.dm rename to modular_ss220/char_customize/code/vulpkanin_hair.dm index 31f5665fd471..057d0ffd2429 100644 --- a/modular_ss220/hairs/code/vulpkanin_hair.dm +++ b/modular_ss220/char_customize/code/vulpkanin_hair.dm @@ -1,224 +1,224 @@ /datum/sprite_accessory/hair/vulpkanin/hair_ponytailf - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Ponytailf" icon_state = "ponytailf" /datum/sprite_accessory/hair/vulpkanin/hair_pigtailss - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Pigtails (Vulpkanin)" icon_state = "pigtailss" /datum/sprite_accessory/hair/vulpkanin/hair_dave - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Dave (Vulpkanin)" icon_state = "dave" /datum/sprite_accessory/hair/vulpkanin/hair_ziegler - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Ziegler" icon_state = "ziegler" /datum/sprite_accessory/hair/vulpkanin/hair_hightight - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Hightight" icon_state = "hightight" /datum/sprite_accessory/hair/vulpkanin/hair_sergeant - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Sergeant" icon_state = "sergeant" /datum/sprite_accessory/hair/vulpkanin/hair_grande - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Grande" icon_state = "grande" /datum/sprite_accessory/hair/vulpkanin/hair_beehive2 - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Beehive (Vulpkanin)" icon_state = "beehive2" /datum/sprite_accessory/hair/vulpkanin/hair_longeralt - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Longeralt" icon_state = "longeralt" /datum/sprite_accessory/hair/vulpkanin/hair_curly - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Curly" icon_state = "curly" /datum/sprite_accessory/hair/vulpkanin/hair_bunhead3 - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Bun 3 (Vulpkanin)" icon_state = "bunhead3" /datum/sprite_accessory/hair/vulpkanin/hair_ponytailalt - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Ponytail alt." icon_state = "ponytailalt" /datum/sprite_accessory/hair/vulpkanin/hair_emolong - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Emolong" icon_state = "emolong" /datum/sprite_accessory/hair/vulpkanin/hair_volajupompless - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Volajupompless" icon_state = "volajupompless" /datum/sprite_accessory/hair/vulpkanin/hair_bunhead4 - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Bun 4 (Vulpkanin)" icon_state = "bunhead4" /datum/sprite_accessory/hair/vulpkanin/hair_toriyama - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Toriyama" icon_state = "toriyama" /datum/sprite_accessory/hair/vulpkanin/hair_unkempt - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Unkempt (Vulpkanin)" icon_state = "unkempt" /datum/sprite_accessory/hair/vulpkanin/hair_nia - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Nia (Vulpkanin)" icon_state = "nia" /datum/sprite_accessory/hair/vulpkanin/hair_twintail_floor - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Twintail floor" icon_state = "twintail_floor" /datum/sprite_accessory/hair/vulpkanin/hair_nia_alt - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Nia Alt." icon_state = "nia_alt" /datum/sprite_accessory/hair/vulpkanin/hair_fluffy_short - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Fluffy Short" icon_state = "fluffy_short" /datum/sprite_accessory/hair/vulpkanin/hair_simple_ponytail - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Simple Ponytail" icon_state = "simple_ponytail" /datum/sprite_accessory/hair/vulpkanin/hair_halfshave_snout - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Halfshave" icon_state = "halfshave_snout" /datum/sprite_accessory/hair/vulpkanin/hair_bluntbangs - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Bluntbangs" icon_state = "bluntbangs" /datum/sprite_accessory/hair/vulpkanin/hair_bluntbangs_alt - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Bluntbangs Alt." icon_state = "bluntbangs_alt" /datum/sprite_accessory/hair/vulpkanin/hair_slightymessy - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Slightymessy" icon_state = "slightymessy" /datum/sprite_accessory/hair/vulpkanin/hair_loghair5 - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Loghair 5" icon_state = "loghair5" /datum/sprite_accessory/hair/vulpkanin/hair_halfshaved - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Halfshaved" icon_state = "halfshaved" /datum/sprite_accessory/hair/vulpkanin/hair_geisha - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Geisha" icon_state = "geisha" /datum/sprite_accessory/hair/vulpkanin/hair_cotton - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Cotton" icon_state = "cotton" /datum/sprite_accessory/hair/vulpkanin/hair_africanpigtails - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "African pigtails" icon_state = "africanpigtails" /datum/sprite_accessory/hair/vulpkanin/hair_froofylong - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Froofylong" icon_state = "froofylong" /datum/sprite_accessory/hair/vulpkanin/hair_glammetal - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Glammetal" icon_state = "glammetal" /datum/sprite_accessory/hair/vulpkanin/hair_astolfo - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Astolfo" icon_state = "astolfo" /datum/sprite_accessory/hair/vulpkanin/hair_newyou - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "New you" icon_state = "newyou" /datum/sprite_accessory/hair/vulpkanin/hair_sabitsuki - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Sabitsuki" icon_state = "sabitsuki" /datum/sprite_accessory/hair/vulpkanin/hair_jessica - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Jessica" icon_state = "jessica" /datum/sprite_accessory/hair/vulpkanin/hair_country - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Country (Vulpkanin)" icon_state = "country" /datum/sprite_accessory/hair/vulpkanin/hair_beachwave - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Beachwave" icon_state = "beachwave" /datum/sprite_accessory/hair/vulpkanin/hair_emoshort - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Emoshort" icon_state = "emoshort" /datum/sprite_accessory/hair/vulpkanin/hair_shortovereyealt - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Short over eye" icon_state = "shortovereyealt" /datum/sprite_accessory/hair/vulpkanin/hair_spicy - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Spicy" icon_state = "spicy" /datum/sprite_accessory/hair/vulpkanin/disheveled - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Disheveled" icon_state = "disheveled" /datum/sprite_accessory/hair/vulpkanin/braids - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Braids" icon_state = "braids" /datum/sprite_accessory/hair/vulpkanin/long_bedhead - icon = 'modular_ss220/hairs/icons/vulpkanin_hair.dmi' + icon = 'modular_ss220/char_customize/icons/vulpkanin_hair.dmi' name = "Long Bedhead" icon_state = "long_bedhead" diff --git a/modular_ss220/char_customize/icons/human_body_markings.dmi b/modular_ss220/char_customize/icons/human_body_markings.dmi new file mode 100644 index 000000000000..bf0a6fc5827f Binary files /dev/null and b/modular_ss220/char_customize/icons/human_body_markings.dmi differ diff --git a/modular_ss220/hairs/icons/human_hair.dmi b/modular_ss220/char_customize/icons/human_hair.dmi similarity index 100% rename from modular_ss220/hairs/icons/human_hair.dmi rename to modular_ss220/char_customize/icons/human_hair.dmi diff --git a/modular_ss220/hairs/icons/unathi_facial_hair.dmi b/modular_ss220/char_customize/icons/unathi_facial_hair.dmi similarity index 100% rename from modular_ss220/hairs/icons/unathi_facial_hair.dmi rename to modular_ss220/char_customize/icons/unathi_facial_hair.dmi diff --git a/modular_ss220/hairs/icons/unathi_hair.dmi b/modular_ss220/char_customize/icons/unathi_hair.dmi similarity index 100% rename from modular_ss220/hairs/icons/unathi_hair.dmi rename to modular_ss220/char_customize/icons/unathi_hair.dmi diff --git a/modular_ss220/hairs/icons/vulpkanin_hair.dmi b/modular_ss220/char_customize/icons/vulpkanin_hair.dmi similarity index 100% rename from modular_ss220/hairs/icons/vulpkanin_hair.dmi rename to modular_ss220/char_customize/icons/vulpkanin_hair.dmi diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme index 7e2626f94768..c4b7aeb012cb 100644 --- a/modular_ss220/modular_ss220.dme +++ b/modular_ss220/modular_ss220.dme @@ -16,7 +16,7 @@ #ifdef MODPACK_CHAT_BADGES #include "chat_badges/_chat_badges.dme" #endif -#include "hairs/_hairs.dme" +#include "char_customize/_char_customize.dme" // --- OBJECTS --- // #include "awaymission_gun/_awaymission_gun.dme"