diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm index 364626c0dff..66837d994f9 100644 --- a/code/modules/mob/living/carbon/human/body_accessories.dm +++ b/code/modules/mob/living/carbon/human/body_accessories.dm @@ -123,6 +123,47 @@ GLOBAL_LIST_EMPTY(body_accessory_by_species) animated_icon_state = "straightbushy_a" allowed_species = list("Vulpkanin") +// Skrell +/datum/body_accessory/tail/skrell_short + name = "Short Skrell Tail" + icon_state = "skrell_tail_short" + allowed_species = list("Skrell") + +/datum/body_accessory/tail/skrell + name = "Skrell Tail" + icon_state = "skrell_tail" + allowed_species = list("Skrell") + +/datum/body_accessory/tail/skrell_long + name = "Long Skrell Tail" + icon_state = "skrell_tail_long" + allowed_species = list("Skrell") + +/datum/body_accessory/tail/skrell_xlong + name = "Extra Long Skrell Tail" + icon_state = "skrell_tail_xlong" + allowed_species = list("Skrell") + +/datum/body_accessory/tail/skrell_short_fringed + name = "Short Fringed Skrell Tail" + icon_state = "skrell_fringetail_short" + allowed_species = list("Skrell") + +/datum/body_accessory/tail/skrell_fringed + name = "Fringed Skrell Tail" + icon_state = "skrell_fringetail" + allowed_species = list("Skrell") + +/datum/body_accessory/tail/skrell_long_fringed + name = "Long Fringed Skrell Tail" + icon_state = "skrell_fringetail_long" + allowed_species = list("Skrell") + +/datum/body_accessory/tail/skrell_xlong_fringed + name = "Extra Long Fringed Skrell Tail" + icon_state = "skrell_fringetail_xlong" + allowed_species = list("Skrell") + //Moth wings /datum/body_accessory/wing icon = 'icons/mob/sprite_accessories/moth/moth_wings.dmi' diff --git a/code/modules/mob/living/carbon/human/species/skrell.dm b/code/modules/mob/living/carbon/human/species/skrell.dm index 310ae63e7cc..ae149336b3b 100644 --- a/code/modules/mob/living/carbon/human/species/skrell.dm +++ b/code/modules/mob/living/carbon/human/species/skrell.dm @@ -13,7 +13,7 @@ species_traits = list(LIPS, NO_HAIR) inherent_traits = list(TRAIT_NOFAT, TRAIT_WATERBREATH) clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS - bodyflags = HAS_SKIN_COLOR | HAS_BODY_MARKINGS | SHAVED + bodyflags = HAS_SKIN_COLOR | HAS_BODY_MARKINGS | HAS_TAIL | TAIL_OVERLAPPED dietflags = DIET_HERB taste_sensitivity = TASTE_SENSITIVITY_DULL flesh_color = "#8CD7A3" diff --git a/code/modules/mob/new_player/sprite_accessories/skrell/skrell_body_markings.dm b/code/modules/mob/new_player/sprite_accessories/skrell/skrell_body_markings.dm new file mode 100644 index 00000000000..afcb7982061 --- /dev/null +++ b/code/modules/mob/new_player/sprite_accessories/skrell/skrell_body_markings.dm @@ -0,0 +1,7 @@ +/datum/sprite_accessory/body_markings/tattoo/skrell + icon = 'icons/mob/sprite_accessories/skrell/skrell_body_markings.dmi' + species_allowed = list("Skrell") + +/datum/sprite_accessory/body_markings/tattoo/skrell/skrell_splotches + name = "Skrell Splotches" + icon_state = "splotches" diff --git a/code/modules/mob/new_player/sprite_accessories/skrell/skrell_face.dm b/code/modules/mob/new_player/sprite_accessories/skrell/skrell_face.dm index cdb4c487806..512d02bb62f 100644 --- a/code/modules/mob/new_player/sprite_accessories/skrell/skrell_face.dm +++ b/code/modules/mob/new_player/sprite_accessories/skrell/skrell_face.dm @@ -50,6 +50,26 @@ icon_state = "female" secondary_theme = "gradient" +/datum/sprite_accessory/hair/skrell/splotched_tentacle_m + name = "Splotched Skrell Male Tentacles" + icon_state = "male" + secondary_theme = "splotches" + +/datum/sprite_accessory/hair/skrell/splotched_tentacle_f + name = "Splotched Skrell Female Tentacles" + icon_state = "female" + secondary_theme = "splotches" + +/datum/sprite_accessory/hair/skrell/splotched_tentacle_long + name = "Splotched Long Skrell Tentacles" + icon_state = "verylong" + secondary_theme = "splotches" + +/datum/sprite_accessory/hair/skrell/splotched_tentacle_short + name = "Splotched Short Skrell Tentacles" + icon_state = "veryshort" + secondary_theme = "splotches" + /datum/sprite_accessory/hair/skrell/skr_gclothtentacleslong name = "Ombre Dye, Long Skrell Tentacles" icon_state = "verylong" diff --git a/code/modules/mob/new_player/sprite_accessories/skrell/skrell_facial_hair.dm b/code/modules/mob/new_player/sprite_accessories/skrell/skrell_facial_hair.dm new file mode 100644 index 00000000000..7854414cb61 --- /dev/null +++ b/code/modules/mob/new_player/sprite_accessories/skrell/skrell_facial_hair.dm @@ -0,0 +1,79 @@ +/datum/sprite_accessory/facial_hair/skrell + icon = 'icons/mob/sprite_accessories/skrell/skrell_facial_hair.dmi' + species_allowed = list("Skrell") + +/datum/sprite_accessory/facial_hair/skrell/patch + name = "Skrell Patch" + icon_state = "patch" + +/datum/sprite_accessory/facial_hair/skrell/goatee + name = "Skrell Goatee" + icon_state = "goatee" + +/datum/sprite_accessory/facial_hair/skrell/tripoint + name = "Skrell Tri-Point" + icon_state = "tri-point" + +/datum/sprite_accessory/facial_hair/skrell/strap + name = "Skrell Strap" + icon_state = "strap" + +/datum/sprite_accessory/facial_hair/skrell/full + name = "Skrell Full Beard" + icon_state = "full" + +/datum/sprite_accessory/facial_hair/skrell/chops + name = "Skrell Chops" + icon_state = "chops" + +/datum/sprite_accessory/facial_hair/skrell/chops_l + name = "Skrell Thick Chops" + icon_state = "chops_big" + +/datum/sprite_accessory/facial_hair/skrell/monotail + name = "Skrell Monotail" + icon_state = "monotail" + +/datum/sprite_accessory/facial_hair/skrell/monotail_l + name = "Skrell Long Monotail" + icon_state = "monotail_long" + +/datum/sprite_accessory/facial_hair/skrell/adorns + name = "Skrell Adornments" + icon_state = "adorns" + +/datum/sprite_accessory/facial_hair/skrell/handlebar + name = "Skrell Handlebar" + icon_state = "handlebar" + +/datum/sprite_accessory/facial_hair/skrell/fumanchu + name = "Skrell Fu-Man-Chu" + icon_state = "fumanchu" + +/datum/sprite_accessory/facial_hair/skrell/mustache + name = "Skrell Mustache" + icon_state = "mustache" + +/datum/sprite_accessory/facial_hair/skrell/overgrown + name = "Skrell Overgrown" + icon_state = "overgrown" + +/datum/sprite_accessory/facial_hair/skrell/braid + name = "Skrell Braided" + icon_state = "braided" + +/datum/sprite_accessory/facial_hair/skrell/braid_l + name = "Skrell Long Braided" + icon_state = "braided_long" + +/datum/sprite_accessory/facial_hair/skrell/braid_d + name = "Skrell Double Braided" + icon_state = "double_braided" + +/datum/sprite_accessory/facial_hair/skrell/whiskers + name = "Skrell Whiskers" + icon_state = "whiskers" + +/datum/sprite_accessory/facial_hair/skrell/whiskers_c + name = "Skrell Chin Whiskers" + icon_state = "whiskers_chin" diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi index 2999d29e8c3..4434735ceda 100644 Binary files a/icons/mob/body_accessory.dmi and b/icons/mob/body_accessory.dmi differ diff --git a/icons/mob/sprite_accessories/skrell/skrell_body_markings.dmi b/icons/mob/sprite_accessories/skrell/skrell_body_markings.dmi new file mode 100644 index 00000000000..cd80e15f1f0 Binary files /dev/null and b/icons/mob/sprite_accessories/skrell/skrell_body_markings.dmi differ diff --git a/icons/mob/sprite_accessories/skrell/skrell_facial_hair.dmi b/icons/mob/sprite_accessories/skrell/skrell_facial_hair.dmi new file mode 100644 index 00000000000..08bfbecf9ae Binary files /dev/null and b/icons/mob/sprite_accessories/skrell/skrell_facial_hair.dmi differ diff --git a/icons/mob/sprite_accessories/skrell/skrell_hair.dmi b/icons/mob/sprite_accessories/skrell/skrell_hair.dmi index d9f97cdd716..ddcf3d8a49a 100644 Binary files a/icons/mob/sprite_accessories/skrell/skrell_hair.dmi and b/icons/mob/sprite_accessories/skrell/skrell_hair.dmi differ diff --git a/paradise.dme b/paradise.dme index 4dc1d20908d..a4a18400f65 100644 --- a/paradise.dme +++ b/paradise.dme @@ -2653,7 +2653,9 @@ #include "code\modules\mob\new_player\sprite_accessories\moth\moth_head_accessories.dm" #include "code\modules\mob\new_player\sprite_accessories\moth\moth_head_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\shared\shared_tail_markings.dm" +#include "code\modules\mob\new_player\sprite_accessories\skrell\skrell_body_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\skrell\skrell_face.dm" +#include "code\modules\mob\new_player\sprite_accessories\skrell\skrell_facial_hair.dm" #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_body_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_facial_hair.dm" #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_hair.dm"