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

Send in the nyarines #452

Closed
wants to merge 13 commits into from

Conversation

BonniePandora
Copy link
Contributor

About the pull request

Adds a new helmet cosmetic; attachable cat-ears.

Explain why it's good for the game

Allows marines to be kbitty :3
(Honestly this is mostly a shitpost code-project I had, not gonna be overly bothered if this is shit-canned for being too goofy)

Testing Photographs and Procedure

Compiled and ran fine on a local instance

Screenshots & Videos

image

Changelog

🆑
add: Adds a new helmet cosmetic to the loadout menu
/:cl:

@Ediblebomb
Copy link
Contributor

based

Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

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

Cat ears won't be merged.

In the interest in teaching it does have an issue, where you're removing/adding/changing icons besides the kitty ears: https://github.com/cmss13-devs/cmss13-pve/pull/452/checks?check_run_id=30152395454

Other than that, everything is done correctly.

@BonniePandora
Copy link
Contributor Author

Cat ears won't be merged.

In the interest in teaching it does have an issue, where you're removing/adding/changing icons besides the kitty ears: https://github.com/cmss13-devs/cmss13-pve/pull/452/checks?check_run_id=30152395454

Other than that, everything is done correctly.

Oooooh, that'll be 'cause I forgot to update my local before starting on this
Thanks for pointing it out!
Also yeah I didn't expect this to be merged like I said so, no great loss on my part.

@KoishiVibe
Copy link
Contributor

i think it's at least good for TM as a laugh
:3

@BonniePandora
Copy link
Contributor Author

Cat ears won't be merged.

In the interest in teaching it does have an issue, where you're removing/adding/changing icons besides the kitty ears: https://github.com/cmss13-devs/cmss13-pve/pull/452/checks?check_run_id=30152395454

Other than that, everything is done correctly.

This has been addressed and fixed in the latest commit

@Doubleumc Doubleumc dismissed their stale review September 22, 2024 19:58

issue corrected

@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github
Copy link
Contributor

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

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.

5 participants