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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add an armadillo #21553

Closed
wants to merge 7 commits into from
Closed

Add an armadillo #21553

wants to merge 7 commits into from

Conversation

IProduceWidgets
Copy link
Contributor

@IProduceWidgets IProduceWidgets commented Nov 9, 2023 •
edited

About the PR

Sprites by imasleeping

add an armadillo
image

It turns into a ball when it goes into crit.
It makes a funny noise.
It has some slight armor to slash and pierce, and a slight vulverability to heat.

Also fixed some small mistakes in the naming of other cargo livestock crate entities.

Why / Balance

More zookeeper content real.

Technical details

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

馃啈 imasleeping, IProduceWidgets

  • add: an Armadillo!

@github-actions github-actions bot added Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# For things that don't need code. labels Nov 9, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 9, 2023 •
edited

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

Resources/Textures/Mobs/Animals/armadillo.rsi

State Old New Status
armadillo Added
ball Added
dead Added

Edit: diff updated after 12516a7

@EmoGarbage404 EmoGarbage404 added the Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. label Nov 10, 2023
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged. and removed Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. labels Nov 10, 2023
@HerCoyote23
Copy link
Contributor

HerCoyote23 commented Nov 10, 2023 •
edited

I say give it more armor! It's got almost none. I know that's realistic, but I think it'd be cooler to have a properly armored armadillo.
That, or I'd add a rare variant of it called an "Armordillo" that has like 95% resist to everything.

@lzk228
Copy link
Contributor

lzk228 commented Nov 10, 2023

what is it? a minecraft? :trollface:

TheShuEd
TheShuEd requested changes Nov 12, 2023
View reviewed changes
Resources/Audio/Animals/attributions.yml Outdated

- files: ["armadillo_scream.ogg"]
license: "CC-BY-3.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure if youtube videos have a free license. It's worth double-checking.

Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml Show resolved Hide resolved
Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl Outdated Show resolved Hide resolved
Resources/Textures/Mobs/Animals/armadillo.rsi/meta.json Outdated Show resolved Hide resolved
Resources/Textures/Mobs/Animals/armadillo.rsi/meta.json Outdated Show resolved Hide resolved
Resources/Textures/Mobs/Animals/armadillo.rsi/meta.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Nov 12, 2023
@github-actions GitHub Actions
Copy link
Contributor

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

@IProduceWidgets IProduceWidgets marked this pull request as draft January 7, 2024 01:14
@IProduceWidgets
Copy link
Contributor Author

Converted to draft because I want to use the new functionality for walking sprites

@IProduceWidgets
Merge branch 'master' into armadillo
d27b891 
# Conflicts:
#	Resources/Audio/Animals/attributions.yml
#	Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl
#	Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
#	Resources/Prototypes/Catalog/Fills/Crates/npc.yml
#	Resources/Prototypes/Damage/modifier_sets.yml
@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Jan 14, 2024
@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Jan 16, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@metalgearsloth
Copy link
Contributor

Does this mob offer any gameplay or is it just a reskin?

@metalgearsloth metalgearsloth mentioned this pull request Jan 29, 2024
Closed
1 task
@IProduceWidgets
Copy link
Contributor Author

IProduceWidgets commented Jan 29, 2024 •
edited

It's slightly armored, and once I find time will roll when it moves thanks to movement sprites

@AJCM-git
Copy link
Contributor

AJCM-git commented Mar 4, 2024

New fluff animals ordered from cargo or spawned in the station have been added to the freeze list #8524 with new requirements for they to be approved (tldr is that they must have something cool going on apart from being cute and having sprites, like new AI behaviors or being spawned in proc gens maps), feel free to re-open if you meet them.

@AJCM-git AJCM-git closed this Mar 4, 2024
@UbaserB UbaserB added the Status: Frozen This PR can't be merged, because of a current freeze. label Mar 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deltanedas deltanedas deltanedas left review comments

@TheShuEd TheShuEd TheShuEd requested changes

@EmoGarbage404 EmoGarbage404 Awaiting requested review from EmoGarbage404

Assignees
No one assigned
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. Merge Conflict This PR currently has conflicts that need to be addressed. No C# For things that don't need code. Status: Frozen This PR can't be merged, because of a current freeze. Status: Needs Review This PR requires new reviews before it can be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@IProduceWidgets @HerCoyote23 @lzk228 @metalgearsloth @AJCM-git @deltanedas @TheShuEd @EmoGarbage404 @UbaserB