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

Crushers And Axes - Back Slots Go #2945

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

Crushers And Axes - Back Slots Go #2945

wants to merge 6 commits into from
+87 −43

Conversation

Avalon-Proto
Copy link
Contributor

@Avalon-Proto Avalon-Proto commented Feb 9, 2025 •
edited
Loading

About the PR

I have modified Fireaxes, And crushers, to be able to go on your back, at the request of direction

Why / Balance

It simply makes sense to be able to pack them into bags, but with some weird shapes. Especially considering that many hardsuits and larger items can fit into bags
Now changed to fit into suit storage Slots, textures ported from Imp

Technical details

Gave Fireaxe a unique shape to fit into bags, as well as crushers, both varieties
Needs storage sprites but tada
Now fits on suit storage and back slot, due to direciton request. Sprites ported from Imp

Media

image
image
image
image
image
image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog

🆑

  • tweak: Crushers can now be stashed on your back or suit storage slot, and Axes can also go on suit storage!

@Avalon-Proto Avalon-Proto marked this pull request as ready for review February 9, 2025 22:34
@Avalon-Proto Avalon-Proto requested a review from a team as a code owner February 9, 2025 22:34
@github-actions github-actions bot added size/XS Under 16 lines Changes: YML Changes any yml files S: Needs Review labels Feb 9, 2025
Lyndomen
Lyndomen requested changes Feb 11, 2025
View reviewed changes
Copy link
Contributor

@Lyndomen Lyndomen left a comment

Choose a reason for hiding this comment

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

Requesting an update to make these suit storage, not bag storage.

@Avalon-Proto
Copy link
Contributor Author

Requesting an update to make these suit storage, not bag storage.

Humm.. can try that. Gonna be slightly annoying as salvage but it's better than needing to carry the thing everywhere

@fow111
Copy link

fow111 commented Feb 11, 2025

hey crushers on Imp can be put into your suit slot, could take a look at that

@Avalon-Proto
Copy link
Contributor Author

hey crushers on Imp can be put into your suit slot, could take a look at that

Can you link me that PR I can't fid it xd

@Avalon-Proto Avalon-Proto changed the title Crushers And Axes - Now bag sized! Crushers And Axes - Back Slots Go Feb 12, 2025
@Avalon-Proto Avalon-Proto requested a review from a team as a code owner February 12, 2025 17:47
@github-actions github-actions bot added size/M 64-255 lines size/XS Under 16 lines Changes: Sprite Changes any png or json in an rsi and removed size/XS Under 16 lines labels Feb 12, 2025
@Avalon-Proto
Copy link
Contributor Author

@Lyndomen All done and dusted, ported the textures from Imp

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 12, 2025 •
edited
Loading

RSI Diff Bot; head commit 3db0efc merging into 2464fd0
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Weapons/Melee/crusher.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi

State Old New Status
equipped-BACKPACK Added
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi

State Old New Status
equipped-SUITSTORAGE Added

Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi

State Old New Status
equipped-SUITSTORAGE Added

Edit: diff updated after 3db0efc

@github-actions github-actions bot removed the size/XS Under 16 lines label Feb 12, 2025
@fow111
Copy link

fow111 commented Feb 12, 2025

hey crushers on Imp can be put into your suit slot, could take a look at that

Can you link me that PR I can't fid it xd

sorry for the late (and pointless) responce but no, nuh uh, sowry

Lyndomen
Lyndomen previously approved these changes Feb 12, 2025
View reviewed changes
@Lyndomen Lyndomen requested a review from deltanedas February 12, 2025 18:28
@Avalon-Proto
Copy link
Contributor Author

Okay all fixed

@Avalon-Proto
Copy link
Contributor Author

Now fixed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lyndomen Lyndomen Lyndomen left review comments

@deltanedas deltanedas deltanedas requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/M 64-255 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Avalon-Proto @fow111 @deltanedas @Lyndomen