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

ScugCats! #31

Merged
merged 7 commits into from
Jul 22, 2024
Merged

ScugCats! #31

merged 7 commits into from
Jul 22, 2024

Conversation

FoxxoTrystan
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan commented Jul 16, 2024 •
edited
Loading

Description

REQUIRE: #48

Adds the ScugCats! From "Rain World/Slugcats", Those devious critters were requested and so why not! They spawn with a gamerule, "VentCritters" they have the same spawn weight as Mice or Mothroach.

Scugcats are devious little creatures with their own SIGN LANGUAGE! (The ScugSign), they are mostly hungry a lot and walk in parks, soo peoples on the station please dont harm them and they... wont hunt you!

image

TODO

  • ScugCat Mob
  • ScugSign
  • GameRule Annoncement

Media

image
image

Changelog

🆑 FoxxoTrystan

  • add: ScugCats! Wawa!

@FoxxoTrystan FoxxoTrystan added Status: Do Not Merge Do not merge Status: Requires This requires something else to be done before being resolved Priority: 3-Low Should be resolved at some point labels Jul 16, 2024
@FoxxoTrystan FoxxoTrystan self-assigned this Jul 16, 2024
@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Jul 16, 2024
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jul 16, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 16, 2024 •
edited
Loading

RSI Diff Bot; head commit 9f1e343 merging into edb9bba
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Floof/Mobs/Animals/scugcat.rsi

State Old New Status
scugcat Added
scugcat_crit Added
scugcat_dead Added
scugcat_sleep Added

Edit: diff updated after 9f1e343

@FoxxoTrystan FoxxoTrystan added Priority: 2-Medium Needs to be resolved at some point and removed Priority: 3-Low Should be resolved at some point labels Jul 19, 2024
@FoxxoTrystan FoxxoTrystan mentioned this pull request Jul 20, 2024
Merged
@FoxxoTrystan FoxxoTrystan removed the Status: Do Not Merge Do not merge label Jul 20, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 22, 2024
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 22, 2024
@FoxxoTrystan FoxxoTrystan merged commit f92ae7d into Fansana:master Jul 22, 2024
11 of 12 checks passed
Floof-Station-Bot added a commit that referenced this pull request Jul 22, 2024
@Floof-Station-Bot
Automatic Changelog Update (#31)
ab3d537
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fansana Fansana Fansana approved these changes

Assignees

@FoxxoTrystan FoxxoTrystan

Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point Status: Needs Review Someone please review this Status: Requires This requires something else to be done before being resolved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FoxxoTrystan @Fansana