Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

💅🏻 Lamia Markings + ♂️ Male Lamia #1440

Merged
merged 4 commits into from
Jan 5, 2025

Conversation

angelofallars
Copy link
Contributor

@angelofallars angelofallars commented Jan 5, 2025

Description

Adds male Lamia with facial hair. Also makes dozens of markings available to Lamiae, including reptilian markings and pointy ears.

Also adds locale strings for the Lamia tail marking.

Media

Mermaid

image

Face: Lips, Blush
Head: Left Eye
Head (Top): Lizard Horns (Ayrshire)
Head (Side): Thin Ears, Drop Earrings (Left/Right)
Chest: Lizard Chest (Tiger)
Right Arm: Right Arm Bracelet
Right Hand: Right Bracelet, Right Nail Polish
Left Hand: Left Bracelet, Left Nail Polish

Male

image

image

Face: Eyelash (Left/Right), Eye Corner (Left/Right)
Head (Top): Lizard Horns (Angler)
Head (Side): Lizard Frills (Short)
Chest: Lizard Chest (Tiger)
Right Arm: Lizard Right Arm (Tiger)
Right Hand: Right Watch (Colorable)
Left Arm: Lizard Right Arm (Tiger)
Overlay: Gauze Handwrap

Red

image

Face: Lips
Head (Top): Lizard Horns
Head (Side): Upward Ears
Right Hand: Right Robotic Hand from Bishop Cybernetics
Left Hand: Left Robotic Hand from Bishop Cybernetics, Left Gold Watch

Lamia locale

image
image

Changelog

🆑 Skubman

  • add: Lamiae can now be male, no longer being a female-only species. They can now wear facial hair as well.
  • add: The Lamia species can now select markings above the leg, including cybernetics, makeup, tattoos, noses, earrings, heterochromia, bracelets, reptilian horns and frills, pointy ears, and more!
  • fix: Added text for the Lamia tail marking.

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: YML Changes any yml files labels Jan 5, 2025
Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As always, incredibly based.

@VMSolidus VMSolidus merged commit 1e1e36c into Simple-Station:master Jan 5, 2025
12 of 13 checks passed
SimpleStation14 added a commit that referenced this pull request Jan 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants