diff --git a/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/code/modules/mob/living/silicon/robot/sprites/civilian.dm index f621a9360a..c9b553a46b 100644 --- a/code/modules/mob/living/silicon/robot/sprites/civilian.dm +++ b/code/modules/mob/living/silicon/robot/sprites/civilian.dm @@ -274,14 +274,13 @@ has_vore_belly_sprites = FALSE rest_sprite_options = list("Default", "Sit") -/* //CHOMPRemove - we dont use the old sprites so this is useless /datum/robot_sprite/dogborg/tall/service/newmeka name = "MEKA v2" sprite_icon_state = "newmeka" has_eye_light_sprites = TRUE has_custom_open_sprites = TRUE rest_sprite_options = list("Default", "Sit") -*/ + /datum/robot_sprite/dogborg/tall/service/mmeka name = "NIKO" sprite_icon_state = "mmeka" diff --git a/code/modules/mob/living/silicon/robot/sprites/engineering.dm b/code/modules/mob/living/silicon/robot/sprites/engineering.dm index b201ef0a91..34450c0a22 100644 --- a/code/modules/mob/living/silicon/robot/sprites/engineering.dm +++ b/code/modules/mob/living/silicon/robot/sprites/engineering.dm @@ -180,14 +180,13 @@ has_vore_belly_sprites = FALSE rest_sprite_options = list("Default", "Sit") -/* //CHOMPRemoval Start - we dont use the old sprites /datum/robot_sprite/dogborg/tall/engineering/newmeka name = "MEKA v2" sprite_icon_state = "newmeka" has_eye_light_sprites = TRUE has_custom_open_sprites = TRUE rest_sprite_options = list("Default", "Sit") -*/ //CHOMPRemoval End + /datum/robot_sprite/dogborg/tall/engineering/mmeka name = "NIKO" sprite_icon_state = "mmeka" diff --git a/code/modules/mob/living/silicon/robot/sprites/janitor.dm b/code/modules/mob/living/silicon/robot/sprites/janitor.dm index d9f52b8404..d6a5d2a875 100644 --- a/code/modules/mob/living/silicon/robot/sprites/janitor.dm +++ b/code/modules/mob/living/silicon/robot/sprites/janitor.dm @@ -162,7 +162,6 @@ has_vore_belly_sprites = FALSE rest_sprite_options = list("Default", "Sit") -/* //CHOMPRemoval Start - we dont use the old sprites /datum/robot_sprite/dogborg/tall/janitor/newmeka name = "MEKA v2" sprite_icon_state = "newmeka" @@ -170,7 +169,6 @@ has_custom_open_sprites = TRUE has_vore_belly_sprites = FALSE rest_sprite_options = list("Default", "Sit") -*/ //CHOMPEdit End /datum/robot_sprite/dogborg/tall/janitor/mmeka name = "NIKO" diff --git a/code/modules/mob/living/silicon/robot/sprites/medical.dm b/code/modules/mob/living/silicon/robot/sprites/medical.dm index 490d012041..351248ab3c 100644 --- a/code/modules/mob/living/silicon/robot/sprites/medical.dm +++ b/code/modules/mob/living/silicon/robot/sprites/medical.dm @@ -103,14 +103,12 @@ has_vore_belly_sprites = FALSE rest_sprite_options = list("Default", "Sit") -/* //CHOMPRemoval Start - we dont use the old sprites /datum/robot_sprite/dogborg/tall/medical/newmeka name = "MEKA v2" sprite_icon_state = "newmeka" has_eye_light_sprites = TRUE has_custom_open_sprites = TRUE rest_sprite_options = list("Default", "Sit") -*/ //CHOMPRemoval End /datum/robot_sprite/dogborg/tall/medical/mmeka name = "NIKO" diff --git a/code/modules/mob/living/silicon/robot/sprites/mining.dm b/code/modules/mob/living/silicon/robot/sprites/mining.dm index 60efd3f4e8..2a9d2f8253 100644 --- a/code/modules/mob/living/silicon/robot/sprites/mining.dm +++ b/code/modules/mob/living/silicon/robot/sprites/mining.dm @@ -150,14 +150,12 @@ has_vore_belly_sprites = FALSE rest_sprite_options = list("Default", "Sit") -/* //CHOMPRemoval Start - we dont use the old sprites /datum/robot_sprite/dogborg/tall/mining/newmeka name = "MEKA v2" sprite_icon_state = "newmeka" has_eye_light_sprites = TRUE has_custom_open_sprites = TRUE rest_sprite_options = list("Default", "Sit") -*/ //CHOMPRemoval End /datum/robot_sprite/dogborg/tall/mining/mmeka name = "NIKO" diff --git a/code/modules/mob/living/silicon/robot/sprites/science.dm b/code/modules/mob/living/silicon/robot/sprites/science.dm index f6f58b639f..d86c9d706a 100644 --- a/code/modules/mob/living/silicon/robot/sprites/science.dm +++ b/code/modules/mob/living/silicon/robot/sprites/science.dm @@ -184,14 +184,12 @@ has_vore_belly_sprites = FALSE rest_sprite_options = list("Default", "Sit") -/* //CHOMPRemoval Start - we dont use the old sprites /datum/robot_sprite/dogborg/tall/science/newmeka name = "MEKA v2" sprite_icon_state = "newmeka" has_eye_light_sprites = TRUE has_custom_open_sprites = TRUE rest_sprite_options = list("Default", "Sit") -*/ //CHOMPRemoval End /datum/robot_sprite/dogborg/tall/science/mmeka name = "NIKO" diff --git a/code/modules/mob/living/silicon/robot/sprites/security.dm b/code/modules/mob/living/silicon/robot/sprites/security.dm index 149693fea5..f4397ca340 100644 --- a/code/modules/mob/living/silicon/robot/sprites/security.dm +++ b/code/modules/mob/living/silicon/robot/sprites/security.dm @@ -210,14 +210,13 @@ has_vore_belly_sprites = FALSE rest_sprite_options = list("Default", "Sit") -/* //CHOMPRemoval Start - we dont use the old sprites + /datum/robot_sprite/dogborg/tall/security/newmeka name = "MEKA v2" sprite_icon_state = "newmeka" has_eye_light_sprites = TRUE has_custom_open_sprites = TRUE rest_sprite_options = list("Default", "Sit") -*/ //CHOMPRemoval End /datum/robot_sprite/dogborg/tall/security/mmeka name = "NIKO" diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/civilian.dm b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/civilian.dm index 1eb70a68e8..7b21bafe1b 100644 --- a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/civilian.dm +++ b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/civilian.dm @@ -20,43 +20,6 @@ has_vore_belly_sprites = TRUE has_dead_sprite = TRUE -/*Upstream implemented -/datum/robot_sprite/dogborg/tall/service - sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi' - -/datum/robot_sprite/dogborg/raptor/service - module_type = "Service" - sprite_icon = 'modular_chomp/icons/mob/raptorborg/raptor.dmi' - -/datum/robot_sprite/dogborg/raptor/service/raptor - sprite_icon_state = "serviraptor" - -/datum/robot_sprite/dogborg/raptor/service/fancyraptor - sprite_icon_state = "fancyraptor" - -/datum/robot_sprite/dogborg/tall/service/meka - sprite_icon_state = "mekaserve" - has_vore_belly_sprites = TRUE - -/datum/robot_sprite/dogborg/tall/service/mmeka - sprite_icon_state = "mmekaserv" - has_vore_belly_sprites = TRUE - has_sleeper_light_indicator = TRUE - -/datum/robot_sprite/dogborg/tall/service/fmeka - sprite_icon_state = "fmekaserv" - has_vore_belly_sprites = TRUE - has_sleeper_light_indicator = TRUE - -/datum/robot_sprite/dogborg/tall/service/k4t - sprite_icon_state = "k4tserve" - has_vore_belly_sprites = FALSE - -/datum/robot_sprite/dogborg/tall/service/k4t_alt1 - sprite_icon_state = "k4tserve_alt1" - has_vore_belly_sprites = FALSE -*/ - /datum/robot_sprite/dogborg/tall/service/mekaserve_alt sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi' name = "MEKA Alt" diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/engineering.dm b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/engineering.dm index 92de37f9b9..ea1c75a104 100644 --- a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/engineering.dm +++ b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/engineering.dm @@ -4,36 +4,3 @@ sprite_icon_state = "vixengi" has_eye_light_sprites = TRUE has_vore_belly_resting_sprites = TRUE - -/*Upstream implemented -/datum/robot_sprite/dogborg/tall/engineering - sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi' - -/datum/robot_sprite/dogborg/raptor/engineering - module_type = "Engineering" - sprite_icon = 'modular_chomp/icons/mob/raptorborg/raptor.dmi' - -/datum/robot_sprite/dogborg/raptor/engineering/raptor - sprite_icon_state = "engiraptor" - -/datum/robot_sprite/dogborg/tall/engineering/meka - sprite_icon_state = "mekaengi" - has_vore_belly_sprites = TRUE - has_sleeper_light_indicator = TRUE - -/datum/robot_sprite/dogborg/tall/engineering/mmeka - sprite_icon_state = "mmekaeng" - has_vore_belly_sprites = TRUE - -/datum/robot_sprite/dogborg/tall/engineering/fmeka - sprite_icon_state = "fmekaeng" - has_vore_belly_sprites = TRUE - -/datum/robot_sprite/dogborg/tall/engineering/k4t - sprite_icon_state = "k4tengi" - has_vore_belly_sprites = FALSE - -/datum/robot_sprite/dogborg/tall/engineering/k4t_alt1 - sprite_icon_state = "k4tengi_alt1" - has_vore_belly_sprites = FALSE -*/ diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/janitor.dm b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/janitor.dm index 134e9caa04..4090560db6 100644 --- a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/janitor.dm +++ b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/janitor.dm @@ -10,36 +10,3 @@ sprite_icon_state = "vixjani" has_vore_belly_resting_sprites = TRUE has_eye_light_sprites = TRUE - -// Tall sprites -/*Upstream implemented -/datum/robot_sprite/dogborg/tall/janitor - sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi' - -/datum/robot_sprite/dogborg/raptor/janitor - module_type = "Janitor" - sprite_icon = 'modular_chomp/icons/mob/raptorborg/raptor.dmi' - -/datum/robot_sprite/dogborg/raptor/janitor/raptor - sprite_icon_state = "janiraptor" - -/datum/robot_sprite/dogborg/tall/janitor/meka - sprite_icon_state = "mekajani" - has_vore_belly_sprites = FALSE //These three oddly dont have sleeper sprites. -Reo - -/datum/robot_sprite/dogborg/tall/janitor/mmeka - sprite_icon_state = "mmekajani" - has_vore_belly_sprites = FALSE //Second without - -/datum/robot_sprite/dogborg/tall/janitor/fmeka - sprite_icon_state = "fmekajani" - has_vore_belly_sprites = FALSE //Third without - -/datum/robot_sprite/dogborg/tall/janitor/k4t - sprite_icon_state = "k4tjani" - has_vore_belly_sprites = FALSE - -/datum/robot_sprite/dogborg/tall/janitor/k4t_alt1 - sprite_icon_state = "k4tjani_alt1" - has_vore_belly_sprites = FALSE -*/ diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/medical.dm b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/medical.dm index bbfa7239c6..558e63cb91 100644 --- a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/medical.dm +++ b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/medical.dm @@ -1,39 +1,3 @@ -//probably have alot of duplicated sprites with my lazy way of moving the surgeon sprites into crisis -/*Upstream implemented -/datum/robot_sprite/medical - module_type = list("Crisis", "Surgeon") - sprite_icon = 'icons/mob/robot/medical.dmi' - - -/datum/robot_sprite/dogborg/tall/medical - module_type = list("Crisis", "Surgeon") - sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi' - -/datum/robot_sprite/dogborg/tall/medical/meka - sprite_icon_state = "mekamed" - has_vore_belly_sprites = TRUE // These have R/G belly icons, but they're the same. Im adding them in as colored because - has_sleeper_light_indicator = TRUE // they were the only meka icons to not have a belly icon without the red/green color system. - // Maybe someone plans to come back later and add them? This will give that support I guess. -Reo -/datum/robot_sprite/dogborg/tall/medical/mmeka - sprite_icon_state = "mmekamed" - has_vore_belly_sprites = TRUE - has_sleeper_light_indicator = TRUE - -/datum/robot_sprite/dogborg/tall/medical/fmeka - sprite_icon_state = "fmekamed" - has_vore_belly_sprites = TRUE - has_sleeper_light_indicator = TRUE - -/datum/robot_sprite/dogborg/tall/medical/k4t - sprite_icon_state = "k4tmed" - has_vore_belly_sprites = FALSE - -/datum/robot_sprite/dogborg/tall/medical/k4t_alt1 - sprite_icon_state = "k4tmed_alt1" - has_vore_belly_sprites = FALSE - -*/ - //Medical into Crisis type merge /datum/robot_sprite/surgical module_type = "Crisis" diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/mining.dm b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/mining.dm index 0cd9d135fb..19c9fa232c 100644 --- a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/mining.dm +++ b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/mining.dm @@ -12,25 +12,13 @@ has_vore_belly_resting_sprites = TRUE has_eye_light_sprites = TRUE -/*Upstream implemented -/datum/robot_sprite/dogborg/tall/mining - sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi' - -/datum/robot_sprite/dogborg/raptor/mining - module_type = "Miner" - sprite_icon = 'modular_chomp/icons/mob/raptorborg/raptor.dmi' - -/datum/robot_sprite/dogborg/raptor/mining/raptor - name = "Raptor V-4" - sprite_icon_state = "mineraptor" - has_custom_equipment_sprites = TRUE - rest_sprite_options = list("Default", "Bellyup") -*/ - //sprite name overwrites /datum/robot_sprite/dogborg/tall/mining/meka name = "MEKA - Mining" +/datum/robot_sprite/dogborg/tall/mining/newmeka + name = "MEKA v2 - Mining" + /datum/robot_sprite/dogborg/tall/mining/mmeka name = "NIKO - Mining" diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/science.dm b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/science.dm index 9c5c698065..61ae050b5c 100644 --- a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/science.dm +++ b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/science.dm @@ -7,36 +7,3 @@ sprite_hud_icon_state = "sci-borg" has_vore_belly_resting_sprites = TRUE has_eye_light_sprites = TRUE - -// Tall sprites -/*Upstream implemented -/datum/robot_sprite/dogborg/tall/science - sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi' - -/datum/robot_sprite/dogborg/raptor/science - module_type = "Research" - sprite_icon = 'modular_chomp/icons/mob/raptorborg/raptor.dmi' - -/datum/robot_sprite/dogborg/raptor/science/raptor - sprite_icon_state = "sciraptor" - -/datum/robot_sprite/dogborg/tall/science/meka - sprite_icon_state = "mekastandard" //placeholder because i think virgo did that too and i dont want to reoverride the dmi just for this - has_vore_belly_sprites = TRUE - has_sleeper_light_indicator = TRUE - -/datum/robot_sprite/dogborg/tall/science/mmeka - sprite_icon_state = "mmekasci" - has_vore_belly_sprites = TRUE - has_sleeper_light_indicator = TRUE - -/datum/robot_sprite/dogborg/tall/science/fmeka - sprite_icon_state = "fmekasci" - has_vore_belly_sprites = TRUE - has_sleeper_light_indicator = TRUE - -/datum/robot_sprite/dogborg/tall/science/k4t - sprite_icon_state = "k4tsci" - has_vore_belly_sprites = TRUE - has_sleeper_light_indicator = TRUE -*/ diff --git a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/security.dm b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/security.dm index e73ca4200b..929f350424 100644 --- a/modular_chomp/code/modules/mob/living/silicon/robot/sprites/security.dm +++ b/modular_chomp/code/modules/mob/living/silicon/robot/sprites/security.dm @@ -15,36 +15,3 @@ has_eye_light_sprites = TRUE has_laser_sprite = FALSE //Missing from the dmi has_taser_sprite = FALSE //ditto - -// Tall sprites -/*Upstream implemented -/datum/robot_sprite/dogborg/tall/security - module_type = "Security" - sprite_icon = 'modular_chomp/icons/mob/tallborg/tallrobots.dmi' - -/datum/robot_sprite/dogborg/raptor/security - module_type = "Security" - sprite_icon = 'modular_chomp/icons/mob/raptorborg/raptor.dmi' - -/datum/robot_sprite/dogborg/raptor/security/raptor - sprite_icon_state = "secraptor" - -/datum/robot_sprite/dogborg/tall/security/meka - sprite_icon_state = "mekasec" - has_vore_belly_sprites = TRUE - has_sleeper_light_indicator = TRUE - -/datum/robot_sprite/dogborg/tall/security/mmeka - sprite_icon_state = "mmekasec" - has_vore_belly_sprites = TRUE - has_sleeper_light_indicator = TRUE - -/datum/robot_sprite/dogborg/tall/security/fmeka - sprite_icon_state = "fmekasec" - has_vore_belly_sprites = TRUE - has_sleeper_light_indicator = TRUE - -/datum/robot_sprite/dogborg/tall/security/k4t - sprite_icon_state = "k4tsec" - has_vore_belly_sprites = FALSE -*/ diff --git a/modular_chomp/code/modules/mob/new_player/sprite_accessories.dm b/modular_chomp/code/modules/mob/new_player/sprite_accessories.dm index aaed193525..322bb66145 100644 --- a/modular_chomp/code/modules/mob/new_player/sprite_accessories.dm +++ b/modular_chomp/code/modules/mob/new_player/sprite_accessories.dm @@ -7,9 +7,487 @@ icon_state = "vox_underbeak" body_parts = list(BP_HEAD) -/datum/sprite_accessory/hair +//human hair override with shading +/datum/sprite_accessory/hair/longbraidalt icon_add = 'modular_chomp/icons/mob/human_face.dmi' +/datum/sprite_accessory/hair/front_braid + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/vegeta + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/beehive + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/sideponytail6 + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/protagonist + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/antenna + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/bigcurls + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/glammetal + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/feferi + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/mulder + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/kanaya + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/sharpponytail + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/midb + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/topknot + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/rockandroll + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/poofy2 + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/business2 + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/froofy_long + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/halfshavedlong + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/crono + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/mohawkunshaven + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/band + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/wisp + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/joestar + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/longbraid + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/vriska + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/zieglertail + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/dirk + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/elize + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/short2 + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/bun3 + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/cia + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/bieber + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/longundercut + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/gamzee + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/fabio + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/terezi + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/bedheadlongest + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/rosa + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/dandypomp + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/mahdrills + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/shyold + name = "Shy old" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "hair_shy_old" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/country + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/shy + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/nepeta + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/belenko + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/judge + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/rose + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/short3 + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/rowbraid + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/scully + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/mia + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/aradia + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/emoleft + name = "Emo Left" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "hair_emoleft" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/equius + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/mialong + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/belenkotied + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/poofy + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/emoright + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/sideponytail5 + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/roxy + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/manbun + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/doll + name = "Doll" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "hair_doll" + flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/keanu + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/spikyponytail + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/glossy + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/bun2 + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/ronin + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/bedheadlong + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/nitori + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/familyman + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/afropuffright + icon_add = 'modular_chomp/icons/mob/human_face.dmi' // offset by 1 px on upstream file + +//taj hair override with shading +/datum/sprite_accessory/hair/taj/sidepartedright + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/shoulderparted + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/shoulderpartedlong + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/fringeup + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/shaggy + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/cascadingalt + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/plait + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/shoulderlengthalt + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/rattail + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/_sidepony + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/bangs_alt + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/shoulderpartedsmall + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/bob + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/braid + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/spiky + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/long + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/shoulderlength + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/clean + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/mohawk + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/bun + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/bunlow + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/straight + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/greaser + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/bangs + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/tresses + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/short_fringe + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/mane + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/cascading + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/messy + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/bunsmall + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/chomp + name = "Tajaran Ch. Ears" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "ears_plain" + +/datum/sprite_accessory/hair/taj/curlsalt + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/sidepartedleft + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/_wedge + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/gman + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/taj/bunlowsmall + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +//tesahri hair override with shading +/datum/sprite_accessory/hair/teshari/backstrafe + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/tree + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/tallmohawk + name = "Teshari Tall Mohawk" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_tallmohawk" + +/datum/sprite_accessory/hair/teshari/aerodynamic + name = "Teshari Aerodynamic" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_aerodynamic" + +/datum/sprite_accessory/hair/teshari/pointy + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/crowned + name = "Teshari Crowned" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_crowned" + +/datum/sprite_accessory/hair/teshari/tight + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/bun + name = "Teshari Bun" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_bun" + +/datum/sprite_accessory/hair/teshari/droopy + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/burst + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/excited + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/shortburst + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/_longway + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/chomp + name = "Teshari Ch. Default" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_default" + +/datum/sprite_accessory/hair/teshari/peel + name = "Teshari Peel" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_peel" + +/datum/sprite_accessory/hair/teshari/altdefault + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/sleek + name = "Teshari Sleek" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_sleek" + +/datum/sprite_accessory/hair/teshari/ponytail + name = "Teshari Ponytail" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_ponytail" + +/datum/sprite_accessory/hair/teshari/sweep + name = "Teshari Sweep" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_sweep" + +/datum/sprite_accessory/hair/teshari/spike + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/mohawk + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/spiky2 + name = "Teshari Alt. Spiky" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_spiky2" + +/datum/sprite_accessory/hair/teshari/mane + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/fluffymohawk + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/twies + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/mushroom + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/upright + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/long + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/hair/teshari/crest + name = "Teshari Crest" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_crest" + +/datum/sprite_accessory/hair/teshari/soap + name = "Teshari Soap" + icon_add = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_soap" + +/datum/sprite_accessory/facial_hair/teshari/scraggly + icon = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/facial_hair/teshari/chomp + name = "Teshari Ch. Beard" + icon = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_chin" + +/datum/sprite_accessory/facial_hair/teshari/cowlick + name = "Teshari Cowlick" + icon = 'modular_chomp/icons/mob/human_face.dmi' + icon_state = "teshari_cowlick" + +/datum/sprite_accessory/facial_hair/teshari/chops + icon = 'modular_chomp/icons/mob/human_face.dmi' + +//una hair override with shading +/datum/sprite_accessory/facial_hair/una/hornadorns + icon = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/facial_hair/una/spinespikes + icon = 'modular_chomp/icons/mob/human_face.dmi' + +/datum/sprite_accessory/facial_hair/una/dorsalfrill + icon = 'modular_chomp/icons/mob/human_face.dmi' + /datum/sprite_accessory/hair/braid icon_add = 'modular_chomp/icons/mob/human_face_alt_add.dmi' @@ -102,6 +580,3 @@ /datum/sprite_accessory/hair/shadekin_hair_long icon_add = 'modular_chomp/icons/mob/human_face_alt_add.dmi' - -/datum/sprite_accessory/hair/teshari - icon_add = 'modular_chomp/icons/mob/human_face.dmi' \ No newline at end of file diff --git a/modular_chomp/icons/mob/human_face.dmi b/modular_chomp/icons/mob/human_face.dmi index 63de7adddd..dbb2b17ed6 100644 Binary files a/modular_chomp/icons/mob/human_face.dmi and b/modular_chomp/icons/mob/human_face.dmi differ diff --git a/modular_chomp/icons/mob/human_face_alt.dmi b/modular_chomp/icons/mob/human_face_alt.dmi index 6687b27fe3..c00dbd7b30 100644 Binary files a/modular_chomp/icons/mob/human_face_alt.dmi and b/modular_chomp/icons/mob/human_face_alt.dmi differ diff --git a/modular_chomp/icons/mob/human_face_alt_add.dmi b/modular_chomp/icons/mob/human_face_alt_add.dmi index 66464fa6a6..6d8df8a805 100644 Binary files a/modular_chomp/icons/mob/human_face_alt_add.dmi and b/modular_chomp/icons/mob/human_face_alt_add.dmi differ diff --git a/modular_chomp/icons/mob/human_face_ch.dmi b/modular_chomp/icons/mob/human_face_ch.dmi index a5d75655f9..b2d4dc6e04 100644 Binary files a/modular_chomp/icons/mob/human_face_ch.dmi and b/modular_chomp/icons/mob/human_face_ch.dmi differ