diff --git a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm index afe97c858cff..c39eaf4ef499 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm @@ -47,23 +47,23 @@ return L /datum/sprite_accessory - var/icon //the icon file the accessory is located in - var/icon_state //the icon_state of the accessory - var/name //the preview name of the accessory - var/gender = NEUTER //Determines if the accessory will be skipped or included in random hair generations - var/gender_specific //Something that can be worn by either gender, but looks different on each - var/use_static //determines if the accessory will be skipped by color preferences - var/color_src = MUTCOLORS //Currently only used by mutantparts so don't worry about hair and stuff. This is the source that this accessory will get its color from. Default is MUTCOLOR, but can also be HAIR, FACEHAIR, EYECOLOR and 0 if none. - var/secondary_color //Decides if this sprite has a secondary color in use. - var/locked = FALSE //Is this part locked from roundstart selection? Used for parts that apply effects - var/center = FALSE //Should we center the sprite? - var/limbs_id //The limbs id supplied for full-body replacing features. - var/image_alpha = 255 //The alpha for the accessory to use. + var/icon //the icon file the accessory is located in + var/icon_state //the icon_state of the accessory + var/name //the preview name of the accessory + var/gender = NEUTER //Determines if the accessory will be skipped or included in random hair generations + var/gender_specific //Something that can be worn by either gender, but looks different on each + var/use_static //determines if the accessory will be skipped by color preferences + var/color_src = MUTCOLORS //Currently only used by mutantparts so don't worry about hair and stuff. This is the source that this accessory will get its color from. Default is MUTCOLOR, but can also be HAIR, FACEHAIR, EYECOLOR and 0 if none. + var/secondary_color //Decides if this sprite has a secondary color in use. + var/locked = FALSE //Is this part locked from roundstart selection? Used for parts that apply effects + var/center = FALSE //Should we center the sprite? + var/limbs_id //The limbs id supplied for full-body replacing features. + var/image_alpha = 255 //The alpha for the accessory to use. var/dimension_x = 32 var/dimension_y = 32 - var/body_zone = BODY_ZONE_CHEST //!The body zone this accessory affects - var/synthetic_icon_state //!The icon_state to use when the bodypart it's attached to is synthetic - var/synthetic_color_src //!The color src to use instead of the normal src when synthetic, leave blank to use the normal src + var/body_zone = BODY_ZONE_CHEST //The body zone this accessory affects + var/synthetic_icon_state //The icon_state to use when the bodypart it's attached to is synthetic + var/synthetic_color_src //The color src to use instead of the normal src when synthetic, leave blank to use the normal src //Squids AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA whyyyy /datum/sprite_accessory/squid_face diff --git a/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm b/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm index ce536a403e48..3309212c4852 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/lizard.dm @@ -20,68 +20,62 @@ name = "Light Belly" icon_state = "lbelly" +/datum/sprite_accessory/body_markings/cracks + name = "Cracks" + icon_state = "cracks" + //Start tails /datum/sprite_accessory/tails icon = 'icons/mob/species/lizard/tails.dmi' body_zone = BODY_ZONE_CHEST - synthetic_icon_state = "synth" + secondary_color = TRUE /datum/sprite_accessory/tails_animated icon = 'icons/mob/species/lizard/tails.dmi' + secondary_color = TRUE body_zone = BODY_ZONE_CHEST /datum/sprite_accessory/tails/lizard/smooth - name = "Smooth" + name = "Smooth (Two color)" icon_state = "smooth" /datum/sprite_accessory/tails_animated/lizard/smooth - name = "Smooth" + name = "Smooth (Two color)" icon_state = "smooth" -/datum/sprite_accessory/tails/lizard/dtiger - name = "Dark Tiger" - icon_state = "dtiger" +/datum/sprite_accessory/tails/lizard/smooth_onecolor + name = "Smooth (One color)" + icon_state = "smooth2" + secondary_color = FALSE -/datum/sprite_accessory/tails_animated/lizard/dtiger - name = "Dark Tiger" - icon_state = "dtiger" +/datum/sprite_accessory/tails_animated/lizard/smooth_onecolor + name = "Smooth (One color)" + icon_state = "smooth2" -/datum/sprite_accessory/tails/lizard/ltiger - name = "Light Tiger" - icon_state = "ltiger" +/datum/sprite_accessory/tails/lizard/prosthetic + name = "Prosthetic" + icon_state = "synth" -/datum/sprite_accessory/tails_animated/lizard/ltiger - name = "Light Tiger" - icon_state = "ltiger" - -/datum/sprite_accessory/tails/lizard/spikes - name = "Spikes" - icon_state = "spikes" - -/datum/sprite_accessory/tails_animated/lizard/spikes - name = "Spikes" - icon_state = "spikes" +/datum/sprite_accessory/tails_animated/lizard/prosthetic + name = "Prosthetic" + icon_state = "synth" /datum/sprite_accessory/tails/lizard/large name = "Large" icon_state = "large" - synthetic_icon_state = "large" //fight me /datum/sprite_accessory/tails_animated/lizard/large name = "Large" icon_state = "large" - synthetic_icon_state = "large" /datum/sprite_accessory/tails/lizard/small name = "Small" icon_state = "small" - synthetic_icon_state = "none" /datum/sprite_accessory/tails_animated/lizard/small name = "Small" icon_state = "small" - synthetic_icon_state = "none" //Start Face markings @@ -107,6 +101,10 @@ name = "Alligator Skink" icon_state = "eye" +/datum/sprite_accessory/face_markings/dome + name = "Dome" + icon_state = "dome" + //Start Horns /datum/sprite_accessory/horns @@ -164,36 +162,32 @@ /datum/sprite_accessory/frills icon = 'icons/mob/species/lizard/frills.dmi' + secondary_color = TRUE /datum/sprite_accessory/frills/none name = "None" icon_state = "none" -//Ears are here because having frills+ears would overlap and be weird. -/datum/sprite_accessory/frills/ears - name = "Normal ears" - icon_state = "ears" - secondary_color = TRUE -//End ears -/datum/sprite_accessory/frills/simple - name = "Simple" - icon_state = "simple" -/datum/sprite_accessory/frills/short - name = "Short" - icon_state = "short" +//Ears are here because having frills+ears would overlap and be weird. /datum/sprite_accessory/frills/aquatic name = "Aquatic" icon_state = "aqua" -/datum/sprite_accessory/frills/frillhawk - name = "Frillhawk" - icon_state = "frillhawk" - /datum/sprite_accessory/frills/droopy name = "Droopy" icon_state = "droopy" +/datum/sprite_accessory/frills/ears + name = "Normal ears" + icon_state = "ears" + +//End ears + +/datum/sprite_accessory/frills/frillhawk + name = "Frillhawk" + icon_state = "frillhawk" + /datum/sprite_accessory/frills/neck name = "Neck" icon_state = "neck" @@ -202,13 +196,21 @@ name = "Frilled Dragon" icon_state = "neckbig" +/datum/sprite_accessory/frills/short + name = "Short" + icon_state = "short" + +/datum/sprite_accessory/frills/simple + name = "Simple" + icon_state = "simple" + //Start Spines /datum/sprite_accessory/spines - icon = 'icons/mob/species/lizard/tails.dmi' + icon = 'icons/mob/species/lizard/spines.dmi' /datum/sprite_accessory/spines_animated - icon = 'icons/mob/species/lizard/tails.dmi' + icon = 'icons/mob/species/lizard/spines.dmi' /datum/sprite_accessory/spines/none name = "None" diff --git a/icons/mob/clothing/underwear/underwear_legs.dmi b/icons/mob/clothing/underwear/underwear_legs.dmi index a3a60ccfc2a7..054daef8c0d1 100644 Binary files a/icons/mob/clothing/underwear/underwear_legs.dmi and b/icons/mob/clothing/underwear/underwear_legs.dmi differ diff --git a/icons/mob/species/lizard/bodyparts.dmi b/icons/mob/species/lizard/bodyparts.dmi index ce88a8ba93da..9f7a7ca89b50 100644 Binary files a/icons/mob/species/lizard/bodyparts.dmi and b/icons/mob/species/lizard/bodyparts.dmi differ diff --git a/icons/mob/species/lizard/frills.dmi b/icons/mob/species/lizard/frills.dmi index b8587a7bd8e2..beeb7887b8b5 100644 Binary files a/icons/mob/species/lizard/frills.dmi and b/icons/mob/species/lizard/frills.dmi differ diff --git a/icons/mob/species/lizard/markings.dmi b/icons/mob/species/lizard/markings.dmi index d2950ac19bbc..7a43feeda795 100644 Binary files a/icons/mob/species/lizard/markings.dmi and b/icons/mob/species/lizard/markings.dmi differ diff --git a/icons/mob/species/lizard/spines.dmi b/icons/mob/species/lizard/spines.dmi new file mode 100644 index 000000000000..eaadb820ebc1 Binary files /dev/null and b/icons/mob/species/lizard/spines.dmi differ diff --git a/icons/mob/species/lizard/tails.dmi b/icons/mob/species/lizard/tails.dmi index 16a7dc0b00ed..aea38b93e9ac 100644 Binary files a/icons/mob/species/lizard/tails.dmi and b/icons/mob/species/lizard/tails.dmi differ