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

Felinids #18

Merged
merged 14 commits into from
Sep 20, 2023
Merged

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Sep 15, 2023

About the PR

Ports the felinids, including their ability to get stuffed in duffel bags, eat mice and throwup hairball.

Why / Balance

Funny small cat people.

Technical details

Definitely check the C# just in case but it works in dev and doesn't error so it's probably good :clueless:

Media

ss (2023-09-18 at 11 55 40)
ss (2023-09-18 at 11 57 07)

Breaking changes

Changelog

🆑

  • add: Felinids have been reintegrated to the crew.

Pretty much copy pasted everything that was easily nyano stuff
Should work, maybe, perhaps
@github-actions
Copy link
Contributor

github-actions bot commented Sep 15, 2023

RSI Diff Bot; head commit 898d8b4 merging into 303884d
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Nyanotrasen/Mobs/Customization/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/Nyanotrasen/Mobs/Customization/felinid_tails.rsi

State Old New Status
basic_bell Added
basic_bow Added
basic_tail_stripes_even Added
basic_tail_stripes_odd Added
basic_tail_tip Added

Resources/Textures/Nyanotrasen/Objects/Specific/Species/felinid.rsi

State Old New Status
icon Added

Edit: diff updated after 898d8b4

@FluffiestFloof FluffiestFloof marked this pull request as ready for review September 15, 2023 19:00
@Colin-Tel
Copy link
Contributor

image
lil kitty people :3

@Colin-Tel
Copy link
Contributor

This touches code so I'll let Debug make the call.

@github-actions
Copy link
Contributor

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

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label Sep 16, 2023
@Colin-Tel
Copy link
Contributor

Colin-Tel commented Sep 20, 2023

YOLO (Tests passed, and have been passing for at least a week)

@Colin-Tel Colin-Tel merged commit 9e06de6 into DeltaV-Station:master Sep 20, 2023
14 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Sep 20, 2023
@FluffiestFloof FluffiestFloof deleted the funnysmallcatpeople branch October 1, 2023 14:42
TypoChel1 pushed a commit to TypoChel1/Ifi07 that referenced this pull request Jul 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants