Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Legally Distinct Orange Cat + capybara fix #159

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

leonardo-dabepis
Copy link
Contributor

About the PR

Adds a Legally Distinct orange cat, makes capybaras available to order from cargo, adds sprites for breath masks and 02 tanks for both creatures. Mappers can also place spawn points for capybaras and orange cats, and the cat crate probably has a small chance of spawning an orange cat unless I coded it wrong but I am so tired

Media

1

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

Changelog

🆑

  • add: Added orange cat, capybara crate, 02/tank sprites for orange cat and capybara, orange cat and capybara spawners.
  • remove: Removed a brain cell

…crate for cargo, capybara and orange cat spawners, small chance of cat crate to spawn orange cat

in pain
@github-actions github-actions bot added Changes: Sprite Changes any png or json in an rsi No C# labels Aug 31, 2023
@github-actions
Copy link

github-actions bot commented Aug 31, 2023

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

Resources/Textures/Clothing/Mask/breath.rsi

State Old New Status
equipped-MASK-capybara Added
equipped-MASK-catorange Added

Resources/Textures/DeltaV/Clothing/Mask/breath.rsi

State Old New Status
equipped-MASK-capybara Added
equipped-MASK-catorange Added

Resources/Textures/DeltaV/Mobs/Animals/orange_cat.rsi

State Old New Status
orange Added
orange_crit Added
orange_dead Added

Resources/Textures/DeltaV/Objects/Tanks/emergency.rsi

State Old New Status
equipped-SUITSTORAGE-capybara Added
equipped-SUITSTORAGE-catorange Added

Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi

State Old New Status
lit-equipped-MASK-catorange Added
unlit-equipped-MASK-catorange Added

Resources/Textures/Objects/Tanks/emergency.rsi

State Old New Status
equipped-SUITSTORAGE-capybara Added
equipped-SUITSTORAGE-catorange Added

Edit: diff updated after f36b516

@toasterpm87
Copy link
Contributor

Strange I been seeing that rsi error on my prs too

Copy link
Contributor

@FluffiestFloof FluffiestFloof left a comment

Choose a reason for hiding this comment

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

The RSI validator is mainly not happy about things you haven't touched and those two issues.
Pretty much replacing those two line with just a simple closing bracket.

It's also not happy about things that are unrelated, like cluwne???

tldr, you added a closing bracket that doesn't close any other open bracket and you added a comma that tells the file "hey I have something else for you" without having something else

Comment on lines 19 to 20
},
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove the additional bracket at line 20 and the comma after the bracket of line 19.

Comment on lines 17 to 18
},
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove the additional bracket at line 18 and the comma after the bracket of line 17.

@DebugOk
Copy link
Contributor

DebugOk commented Aug 31, 2023

I put out a quick fix for the rsi validator, if you update your branch, it should now only show errors relating to your changes

@leonardo-dabepis
Copy link
Contributor Author

The RSI validator is mainly not happy about things you haven't touched and those two issues. Pretty much replacing those two line with just a simple closing bracket.

It's also not happy about things that are unrelated, like cluwne???

tldr, you added a closing bracket that doesn't close any other open bracket and you added a comma that tells the file "hey I have something else for you" without having something else

oh, those two files in particular I think I forgot to delete because I ended up just modifying the preexisting breath mask and gas tank from wizden to fit on my creatures. I figured that's probably the way to go since I'm just making it so my creatures can use an already existing item, rather than making a new item for them entirely. I fixed the files but I will still keep the ones in the DeltaV folder until told otherwise. But those ones in the DeltaV folder are probably redundant at this point. This whole thing has given me a headache :)

@github-actions
Copy link

github-actions bot commented Sep 9, 2023

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 Sep 9, 2023
@github-actions
Copy link

github-actions bot commented Oct 2, 2023

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Changes: Sprite Changes any png or json in an rsi Merge Conflict Status: Merge Conflict FIX YOUR PR AAAGH
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants