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.

Sign up for GitHub

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

Jump to bottom

[modular] adds a fox tail organ sprite, adds fox tails to limbgrowers #113

Merged
merged 12 commits into from
Nov 10, 2021
Merged

[modular] adds a fox tail organ sprite, adds fox tails to limbgrowers #113

merged 12 commits into from
Nov 10, 2021

Conversation

Gofawful5
Copy link
Contributor

@Gofawful5 Gofawful5 commented Nov 9, 2021 •
edited
Loading

this adds a unique fox tail organ sprite that can be seen when it's cut off / grown
and also adds onto the limbgrower's Other category when xeno organs are researched

changes dependent on hair color because yknow:

image

image

Gofawful5 and others added 10 commits November 7, 2021 03:16
@Gofawful5
Adds fox tails to felinids
a223e7b 
literally adds fox tails to felinids. tracy NEEDS this
@Gofawful5
Update mutant_bodyparts.dmi
b2626ad
@Gofawful5
Merge branch 'Jolly-66:master' into fox-tail-addition
e976691
@Gofawful5
Revert "Update mutant_bodyparts.dmi"
3373014 
This reverts commit b2626ad.
@Gofawful5
Merge branch 'fox-tail-addition' of https://github.com/Gofawful5/Joll…
c2dd13e 
…yStationCode into fox-tail-addition
@Gofawful5
Revert "Merge branch 'fox-tail-addition' of https://github.com/Gofawf…
cd7bedd 
…ul5/JollyStationCode into fox-tail-addition"

This reverts commit c2dd13e, reversing
changes made to 3373014.
@Gofawful5
IT'S REWIND TIME
ef09b64 
reduce the filesize akjasdklasjd
@Gofawful5
Revert "Revert "Merge branch 'fox-tail-addition' of https://github.co…
b4beb29 
…m/Gofawful5/JollyStationCode into fox-tail-addition""

This reverts commit cd7bedd.
@Gofawful5
adds a fox tail organ sprite, adds fox tails to limbgrowers
9a5cea8 
actual reason: grow fox tail in the rare one-off instance that it is deleted since it only spawns with felinids that have it
also, fox tail organ sprite good
@Gofawful5
Update limbgrower_designs.dm
c180f52 
its not initial
@Gofawful5 Gofawful5 requested a review from doshMobile as a code owner November 9, 2021 11:51
Jolly-66
Jolly-66 reviewed Nov 9, 2021
View reviewed changes
Copy link
Contributor

@Jolly-66 Jolly-66 left a comment

Choose a reason for hiding this comment

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

Conflicts + you should really just gags this if you're gonna make a strictly orange one

@Jolly-66
Copy link
Contributor

Jolly-66 commented Nov 9, 2021

I'm going to close future PRs if I see captracy

@Gofawful5
Copy link
Contributor Author

I'm going to close future PRs if I see captracy

cry

MrMelbert
MrMelbert reviewed Nov 10, 2021
View reviewed changes
Copy link
Owner

@MrMelbert MrMelbert left a comment

Choose a reason for hiding this comment

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

Maybe just add the fox tails to the felinid design disk instead of its own disk? Unless you plan on adding more organs to the disk later

@Gofawful5
Copy link
Contributor Author

Maybe just add the fox tails to the felinid design disk instead of its own disk? Unless you plan on adding more organs to the disk later

i was thinking about making fox ears a thing at some point, yeah
I'll add it onto the felinid disk for now though

@Jolly-66 Jolly-66 merged commit 048f71d into MrMelbert:master Nov 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MrMelbert MrMelbert MrMelbert left review comments

@Jolly-66 Jolly-66 Jolly-66 left review comments

@doshMobile doshMobile Awaiting requested review from doshMobile

Assignees
No one assigned
Labels
Feature Its a bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Gofawful5 @Jolly-66 @MrMelbert