Skip to content

Commit

Permalink
Multi-Color tails, small tail, and a new marking (#2542)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Updates lizard frills to use secondary colors, as well as tails.
Animations included.
new update: touches up leg sprites.

![2023-11-29_01-41-02](https://github.com/shiptest-ss13/Shiptest/assets/81882910/24bb7f43-ead2-40cd-90b2-6ab97ec21b25)![2023-11-29_01-02-14](https://github.com/shiptest-ss13/Shiptest/assets/81882910/e4172a7e-b51b-47d5-b8ac-bb8510f5debd)

![image](https://github.com/shiptest-ss13/Shiptest/assets/81882910/95c293aa-bf8b-4d58-83c6-bf3d33904720)

Ports tgstation/tgstation#79990
Small tail by [whataboutism-alos](https://github.com/whataboutism-alos)
in that pr, minor modifications

## Changelog

:cl:
add: Another Sarathi head marking, "Dome"
add: Sarathi frills now use secondary colors.
add: Sarathi tails now use secondary colors.
add: Added "Cracks" body marking for Sarathi
del: Removed dark tiger, light tiger, and spike Sarathi tails.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
thgvr authored Dec 12, 2023
1 parent 3a655cf commit de5deab
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 60 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
92 changes: 47 additions & 45 deletions code/modules/mob/dead/new_player/sprite_accessories/lizard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
Binary file modified icons/mob/clothing/underwear/underwear_legs.dmi
Binary file not shown.
Binary file modified icons/mob/species/lizard/bodyparts.dmi
Binary file not shown.
Binary file modified icons/mob/species/lizard/frills.dmi
Binary file not shown.
Binary file modified icons/mob/species/lizard/markings.dmi
Binary file not shown.
Binary file added icons/mob/species/lizard/spines.dmi
Binary file not shown.
Binary file modified icons/mob/species/lizard/tails.dmi
Binary file not shown.

0 comments on commit de5deab

Please sign in to comment.