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

Friend Shaped #131

Closed
wants to merge 15 commits into from
Closed

Friend Shaped #131

wants to merge 15 commits into from

Conversation

fenndragon
Copy link
Contributor

Description

did some minor tweaks to the sprites for Friendshaped/rounis, added friend as an actual entity that can be spawned, modified Centcomm's map slightly to add Xeno enclosures, added a crit state to most of the different Xeno types, and fixed the unrevivable bug.

Changelog

🆑

  • add: Added Friend Shaped entity
  • add: Added a crit state to most Xenos including: Friend, Rouny, Praetorian, Drone, and Ravager.
  • tweak: Tweaked the layout of Centcomm to add Xeno enclosures for their Xeno domestication program
  • fix: fixed Friend being unrevivable

all around Update to fix a few bugs with the xenos that have been present for a while, adding back their critical state and fixing some of the inconsistency brought about by the new combat rework.
Attempted fix for an error thrown due to multiple different methods used to set "crit" state
Reverting changes to the Xeno file to try and reset to attempt fixes again.
Attempting smallest change to allow critstate
reattempting the Critical changes
Friend-shaped add
attempt at making friend Shaped 2
revert changes to pets
xeno update to add friendshaped as an entity
friendshaped scale change
scale fix2
scale fix 3
scale edit revert
shifting the placement of the Rouny sprite
Copy link
Contributor

Thank you for contributing to our repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow the git usage documentation.

You can move your current work from the master branch to another branch by branching from and resetting the master branch.

@github-actions github-actions bot added the Status: Needs Review Someone please review this label Aug 22, 2024
@github-actions github-actions bot closed this Aug 22, 2024
@github-actions github-actions bot added Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 22, 2024
Copy link
Contributor

RSI Diff Bot; head commit 7c30f26 merging into 280d3a8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi

State Old New Status
running Modified

@ShatteredSwords
Copy link
Contributor

It's an easy thing to forget or not do when you don't use github a lot but please make a separate branch for changes aaaa

@fenndragon
Copy link
Contributor Author

sorry, I- am not sure what you mean, I have my own fork that I use for- oh so the modifications don't show up here?

@ShatteredSwords
Copy link
Contributor

sorry, I- am not sure what you mean, I have my own fork that I use for- oh so the modifications don't show up here?

They do show up but rule 1 of github is never ever make commits to the master branch

@fenndragon
Copy link
Contributor Author

oh, I didn't realize I was- I thought a fork would mean it wasn't the master branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants