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

Tajara #1647

Merged
merged 41 commits into from
Jan 26, 2025
Merged

Tajara #1647

merged 41 commits into from
Jan 26, 2025

Conversation

SX-7
Copy link
Contributor

@SX-7 SX-7 commented Jan 23, 2025

Description

On user end Felinids are removed and replaced with Tajara, mostly inspired by the ParadiseStation sprites.

Most things from Felinids are ported over, either being untouched (in which case they're left in the nyanotrasen directory), or somewhat modified and copied to tajara directories. This is done because both shadowkin and humans reference these files quite a bit, so we don't want to break anything forwards/backwards,

Under the hood, felinid components are untouched, just simply set to abstract: true and roundstart: false, once again to prevent any breakage.

There's been like 50 changes all the ways, but basically, felinids are staying, tajara get a few languages, they also are more "specialized" than felinids due to big upsides and downsides (funny :)


TODO

  • Add tajara
    - [X] Hide felinids
    - [x] Analyze and find now-orphaned felinid protorypes/textures/references and remove them (optional)
  • Fix graphical bugs (if any)
  • Ensure the code structure is compliant with repo practices

Media

In captain attire
{3169C46E-BABB-466F-BD75-D8A00D8F9105}
Testing emotes and languages
{7EE18197-E788-46BF-9DA3-97B0718A2F0B}
Emotes still working, same with hairballs
{346EB863-EF92-4D82-8E72-409437372DC3}
Few character selector pictures

  • The previously shown off tajaran
    {559C39A8-5333-4787-A3B7-2F882EB6B5E2}
  • Markingless male body
    {9D762061-C1F8-40A5-9F14-5809E803820C}
    {98AFAEF1-D49A-4951-A18E-5E55ACC05A26}
  • Markingless female body
    {8F42252C-DDC4-43FD-8B8F-BFF0FBD971CD}
    {EE2B152D-97AD-4C39-B51E-8D89E4C4B097}
  • Traits are updated, as is the case with other texts
    {6F1E0309-7262-48BA-ABF6-C2048E087437}
    - And a neon colored specimen to show off some markings No longer the case, fur hue is clamped to some reasonable colors
    {381F7D38-1ABE-4434-8F29-95908E8F1A4B}


Changelog

🆑

  • add: Added Tajara and related content

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Jan 23, 2025
@SimpleStation14 SimpleStation14 changed the title Replace felinids with tajaran Replace Felinids with Tajaran Jan 23, 2025
Copy link
Contributor

github-actions bot commented Jan 23, 2025

RSI Diff Bot; head commit 9b64319 merging into 8eafa7a
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_EE/Mobs/Customization/Tajaran/ears.rsi

State Old New Status
ears Added
ears_near Added
inears Added
inears_near Added
outears Added
outears_near Added
patch Added
patch_near Added

Resources/Textures/_EE/Mobs/Customization/Tajaran/felinid_ears.rsi

State Old New Status
basic_inner Added
basic_outer Added
curled_inner Added
curled_outer Added
droopy_inner Added
droopy_outer Added
fuzzy_inner Added
stubby_inner Added
stubby_outer Added
tall_fuzz Added
tall_inner Added
tall_outer Added
torn_inner Added
torn_outer Added
wide_inner Added
wide_outer Added

Resources/Textures/_EE/Mobs/Customization/Tajaran/foxtail.rsi

State Old New Status
base_fox_tail Added
base_fox_tail_tip Added

Resources/Textures/_EE/Mobs/Customization/Tajaran/head.rsi

State Old New Status
muzzle Added
muzzle_large Added
nose Added
patch Added
points Added
tiger_face Added
tiger_head Added

Resources/Textures/_EE/Mobs/Customization/Tajaran/overlays.rsi

State Old New Status
patch Added
points Added

Resources/Textures/_EE/Mobs/Customization/Tajaran/tail_markings.rsi

State Old New Status
tail_anim_rings Added
tail_rings Added

Resources/Textures/_EE/Mobs/Customization/Tajaran/tails.rsi

State Old New Status
tail Added
tail_anim Added

Resources/Textures/_EE/Mobs/Customization/Tajaran/torso.rsi

State Old New Status
belly Added
crest Added
fullbelly Added

Resources/Textures/_EE/Mobs/Species/Tajaran/parts.rsi

State Old New Status
head_f Added
head_m Added
l_arm Added
l_foot Added
l_hand Added
l_leg Added
r_arm Added
r_foot Added
r_hand Added
r_leg Added
torso_f Added
torso_m Added

Edit: diff updated after 9b64319

@SX-7 SX-7 changed the title Replace Felinids with Tajaran Replace Felinids with Tajara Jan 23, 2025
Copy link
Member

@angelofallars angelofallars left a comment

Choose a reason for hiding this comment

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

Make all Felinid markings in Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/felinid.yml available to humans so that the felinid characters who will be resetted into humans won't lose any of the markings. They can be considered Kemonomimi markings like the already-existing ear/tail markings for humans.

@SX-7
Copy link
Contributor Author

SX-7 commented Jan 23, 2025

{D5A691A6-FDA9-4B65-9DBB-BD439446B8B1}
done👍

@SX-7
Copy link
Contributor Author

SX-7 commented Jan 23, 2025

Alright, so I basically did everything I could think of, or at least in as much capacity as I possibly could, undrafting this. Feel free to nitpick

@SX-7 SX-7 marked this pull request as ready for review January 23, 2025 19:56
@SX-7 SX-7 requested a review from angelofallars January 23, 2025 19:56
@github-actions github-actions bot added Status: Needs Review Someone please review this labels Jan 23, 2025
Copy link
Contributor

@BasedUser BasedUser left a comment

Choose a reason for hiding this comment

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

Do you want me to claw you out?

Resources/Locale/en-US/chat/managers/chat-manager.ftl Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Mobs/Species/tajaran.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Species/tajaran.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Nyanotrasen/Species/felinid.yml Outdated Show resolved Hide resolved
@SX-7
Copy link
Contributor Author

SX-7 commented Jan 24, 2025

Do you want me to claw you out?

If this results in more reviews, sure 😊

Big thanks, I'll do the draft-fix-undraft or just make a commit or two to address the issues

@sleepyyapril
Copy link
Contributor

Please put all custom EE code in a _EE folder

@SX-7
Copy link
Contributor Author

SX-7 commented Jan 25, 2025

image on god

missed it lol. kinda still wip anyways since I have to cook up that guidebook entry (and rework parenting, in light of recent news)

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 25, 2025
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 25, 2025
@SX-7 SX-7 changed the title Replace Felinids with Tajara Tajara Jan 25, 2025
@sleepyyapril
Copy link
Contributor

linter fail :c

@bruhmogus
Copy link

wait so
why?

@SX-7
Copy link
Contributor Author

SX-7 commented Jan 25, 2025

linter fail :c

was working on it without checking, should've checked before pushing to origin ig

I blame the plasmamen merge for duping the entries, didn't check it while resolving it in online editor

@SX-7 SX-7 requested a review from sleepyyapril January 25, 2025 23:44
@SX-7
Copy link
Contributor Author

SX-7 commented Jan 25, 2025

And as usual, should be fine, but feel encouraged to nitpick/lmk if I missed something 😸

@sleepyyapril sleepyyapril merged commit b7660b9 into Simple-Station:master Jan 26, 2025
12 of 13 checks passed
SimpleStation14 added a commit that referenced this pull request Jan 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants