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 #132

Merged
merged 28 commits into from
Aug 24, 2024
Merged

Friend Shaped #132

merged 28 commits into from
Aug 24, 2024

Conversation

fenndragon
Copy link
Contributor

@fenndragon fenndragon commented Aug 22, 2024

Description

did some minor tweaks to the sprites for Friendshaped/rounis, added friend as an actual entity that can be spawned, 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.
  • 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
@github-actions github-actions bot added Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this labels Aug 22, 2024
@Floof-Station-Bot Floof-Station-Bot changed the title Friend shaped Friend Shaped Aug 22, 2024
Copy link
Contributor

github-actions bot commented Aug 22, 2024

RSI Diff Bot; head commit ee19a3e merging into 2fbea60
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

Edit: diff updated after ee19a3e

removed space
@fenndragon
Copy link
Contributor Author

alright, I did another update, hoping this works. I removed a space on the pets tab

@FoxxoTrystan FoxxoTrystan added the Priority: 2-Medium Needs to be resolved at some point label Aug 22, 2024
sticking friend shaped into correct file location
removing friend shaped and reverting change to tool speed
@fenndragon
Copy link
Contributor Author

aaaand it's failing the same checks, I don't even know what's wrong, I'm able to run these changes in my own dev environment with no issue.

@FoxxoTrystan FoxxoTrystan self-requested a review August 23, 2024 00:34
@FoxxoTrystan FoxxoTrystan added Priority: 3-Low Should be resolved at some point and removed Priority: 2-Medium Needs to be resolved at some point labels Aug 23, 2024
@fenndragon
Copy link
Contributor Author

WOOO

@FoxxoTrystan FoxxoTrystan added Status: Awaiting Changes Do not merge due to requested changes and removed Status: Needs Review Someone please review this labels Aug 23, 2024
fenndragon and others added 3 commits August 22, 2024 21:32
fixed the parent of friendshaped to the Rouny instead of the runner
@github-actions github-actions bot added Status: Needs Review Someone please review this and removed Status: Awaiting Changes Do not merge due to requested changes labels Aug 23, 2024
@fenndragon
Copy link
Contributor Author

the tester is fuckin borked again

@Memeji Memeji merged commit e0ee75d into Fansana:master Aug 24, 2024
13 checks passed
Floof-Station-Bot added a commit that referenced this pull request Aug 24, 2024
@fenndragon fenndragon deleted the friend-shaped branch November 2, 2024 21:28
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 Priority: 3-Low Should be resolved at some point Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants