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

[MIRROR] basic cats and mini kitchen helpers #929

Merged
merged 5 commits into from
Dec 4, 2023
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#25330
Original PR: tgstation/tgstation#79800

About The Pull Request

this pr transforms cats into basic pets! cats now have some new behavior. they can carry fish and hunted mice in their mouths to deliver it to kittens, and kittens will eat them.

catmouse
catfish

if a kitten sees you holding food, it will point at you and meow loudly until u give it the food.
becareful when putting male cats near each other, there is a small chance they get into a heated argument and meow loudly at each other until one of them flees.
also added a new small cat house for cats. cats will use these homes if u build one near them (using 5 wood planks)

cathouse

Chefs can craft the cake cat and breadcat. these are useful cats because they can help the chef around in the kitchen. they will turn stoves and grills off when food is ready, so they dont burn. and the cake cat will help the chef decorate his donuts

Why It's Good For The Game

refactors cats into basic mobs and gives them a deeper ai

Changelog

🆑 Ben10Omintrix
refactor: cats are now basic pets. please report any bugs.
add: the cake cat and bread cat can now help the chef around in the kitchen
/:cl:

* basic cats and mini kitchen helpers (#79800)

this pr transforms cats into basic pets! cats now have some new
behavior. they can carry fish and hunted mice in their mouths to deliver
it to kittens, and kittens will eat them.

![catmouse](https://github.com/tgstation/tgstation/assets/138636438/8f146be4-c7b2-41d3-8301-734be49b5efc)

![catfish](https://github.com/tgstation/tgstation/assets/138636438/f8df54f2-9183-406d-afbd-f90f415f7f3d)

if a kitten sees you holding food, it will point at you and meow loudly
until u give it the food.
becareful when putting male cats near each other, there is a small
chance they get into a heated argument and meow loudly at each other
until one of them flees.
also added a new small cat house for cats. cats will use these homes if
u build one near them (using 5 wood planks)

![cathouse](https://github.com/tgstation/tgstation/assets/138636438/9515a78c-fdfe-461b-bad2-6b497117c694)

Chefs can craft the cake cat and breadcat. these are useful cats because
they can help the chef around in the kitchen. they will turn stoves and
grills off when food is ready, so they dont burn. and the cake cat will
help the chef decorate his donuts

refactors cats into basic mobs and gives them a deeper ai

:cl:
refactor: cats are now basic pets. please report any bugs.
add: the cake cat and bread cat can now help the chef around in the
kitchen
/:cl:

* basic cats and mini kitchen helpers

* Modular

---------

Co-authored-by: Ben10Omintrix <[email protected]>
Co-authored-by: Giz <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror Feature Refactoring labels Dec 3, 2023
@Iajret Iajret merged commit 954536d into master Dec 4, 2023
22 checks passed
@Iajret Iajret deleted the upstream-mirror-25330 branch December 4, 2023 20:39
AnywayFarus added a commit that referenced this pull request Dec 4, 2023
Iajret pushed a commit that referenced this pull request Feb 13, 2024
ReezeBL pushed a commit that referenced this pull request Feb 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Map Modification Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота Refactoring Sprites TG Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants