-
Notifications
You must be signed in to change notification settings - Fork 349
Domain expansion, CATastrophe! #4807
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
base: master
Are you sure you want to change the base?
Conversation
I am aware not all icons have been done even before the test ran and finished. |
We have a bunch of merge conflicts that will need to be resolve before we can do a TM |
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
…estation2.0; branch 'master' of https://github.com/monkestation/Monkestation2.0 into poobas_dismay
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
About The Pull Request
Pooba is going to lynch me, but here I am still adding more cats because WHY CAN YOU BUY 4 DIFFERENT DOGS BUT NOT A SINGLE DIFFERENT CAT!
So I am adding more cats, and make it so you can buy said cats.
Why It's Good For The Game
BALANCE, if you can buy 4 different dogs but only 1 cat it becomes unbalanced.
We need to make sure the scale goes back to normal and thus... CATS
CATS IN VARIOUS COLORS! Not as many as the exotic corgi, but who would want a green cat? any case I made some cute cats. and the kittens will also be changed.
Changelog
🆑
add: Added more cats
image: Added more cat icons
qol: Kittens now look like their male parent! (I can not fix the male cat gregnancy)
qol: Made livestock cheaper so even assistants can buy some!
balance: Adjusted the scale back to balance between dogs and cats by adding cats.
fix: Fixed cat impotency, they can make kitten again.
/:cl: