Repository navigation
adds lizard animids, plus a few refactors - #931
Merged
Merged
Conversation
github-actions
Bot
added
Sprites
MrMelbert
reviewed
Jul 24, 2026
MrMelbert
reviewed
Jul 24, 2026
MrMelbert
reviewed
Jul 24, 2026
MrMelbert
reviewed
Jul 24, 2026
MrMelbert
reviewed
Jul 24, 2026
MrMelbert
reviewed
Jul 24, 2026
MrMelbert
reviewed
Jul 24, 2026
as per the norm, these are verbatim changes that don't require much more than just adding them to a batch, credits to melbert Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
…ailcolor's new color setting
…plestationcode into lizard_animids
MrMelbert
reviewed
Jul 30, 2026
Comment on lines
+163
to
+167
| @@ -164,14 +164,7 @@ Unlike normal organs, we're actually inside a persons limbs at all times | |||
| // prioritize a specific color they have set | |||
| if(bodypart_owner?.owner?.dna?.features["lizard_frill_color"]) | |||
| return bodypart_owner.owner.dna.features["lizard_frill_color"] | |||
| // then use body color if we should be mutant colored | |||
| if(isnull(bodypart_owner.owner) || HAS_TRAIT(bodypart_owner.owner, TRAIT_MUTANT_COLORS) || HAS_TRAIT(bodypart_owner, TRAIT_MUTANT_COLORS)) | |||
| return bodypart_owner.draw_color | |||
| // then use forced color - for non-mutant-colored species, like piscinids | |||
| if(bodypart_owner?.owner?.dna?.features["forced_fish_color"]) | |||
| return bodypart_owner.owner.dna.features["forced_fish_color"] | |||
| // then default to body color - though this will probably be skin color, some forced color, or pure white | |||
| return bodypart_owner.draw_color | |||
| return mutant_override_color(bodypart_owner) | |||
Owner
There was a problem hiding this comment.
I think frills should be ORGAN_COLOR_MUTANT_OVERRIDE and should implement mutant_override_color instead of override_color:
/datum/bodypart_overlay/mutant/frills/mutant_override_color(obj/item/bodypart/bodypart_owner)
return bodypart_owner?.owner?.dna?.features["lizard_frill_color"] || ..()
MrMelbert
reviewed
Jul 30, 2026
MrMelbert
left a comment
MrMelbert
left a comment
Owner
There was a problem hiding this comment.
Gotta regen map preview icons
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
…plestationcode into lizard_animids
…plestationcode into lizard_animids
github-actions
Bot
removed
the
Modularity Suggested
MrMelbert
enabled auto-merge (squash)
August 1, 2026 01:07
auto-merge was automatically disabled
August 1, 2026 02:24
Head branch was pushed to by a user without write access
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
title
I also refactored a few things:
lizard drawlength pref accessibility is no longer hard coded and will autocheck if a species has liz tongues (or a subtype of) by default
there is now a generic
forced_mut_colorfeature & behavior for parts such as lizard tails, spines, and fish tails, adapted from piscinidforced_fish_colorthere is also now
ORGAN_COLOR_MUTANT_OVERRIDEwhich can be used to auto apply a new bodypart overlay base proc,mutant_override_colorwhich does the behavior abovei also found out that functional wings are in need of a refactor to color from
bodypart_overlayand not their sprite accessory, i only did it for the wing thing because thats an upstream issue and i can't be bothered for now (something abotu "out of scope")lizard animids, called reptilids ingame, are basically humans able to apply lizard special parts
they have the option of whether or not they'll have lizard speech gimmicks (but will still use their SFX and sayverbs) alongside having scales like piscinids
no digitigrade option because i don't want to incur the wrath of melbert
oh and pisicinids now have access to both angel wings and dragon wings