Better weapon smart equip

[Alwayswannahunt]

About the PR

Adds new component SmartEquipPickupStorageComponent
Adds better smart equip handling for weapons

Check mark for test:

• PR tested

Why / Balance

It's strange to take out gun's ammo instead of a gun, so now guns knows what you want and jump in your hand!

Technical details

Adds SmartEquipPickupStorageComponent
Adds Check for SmartEquipPickupStorageComponent on slot item to try pick up item instead of piciking from its storage
Adds SmartEquipPickupStorageComponent to weapons prototypes

Media

2025-11-27.223339.mp4

Requirements

• I have read and am following the Pull Request and Changelog Guidelines.
• I have added media to this PR or it does not require an ingame showcase.

Breaking changes

🆑 AlwyAnri

• tweak: Changed smart equip behavior! Now it takes out weapons instead of items in weapon storage

[slarticodefast]

I don't think it makes sense to have a cvar for this. Just make it the normal behaviour.

[Alwayswannahunt]

I don't think it makes sense to have a cvar for this. Just make it the normal behaviour.

About pocket slots. Afaik you can put chem or plant bag in it, they should also have same behavior as suit storage or like normal slots?

[arenaconspiracy]

I've been contemplating this on and off for a while, and made some conclusions.
My first thought was that this should extend to pocket smartequip too, as pulling the pistol magazine instead of your Mk58 is less than ideal. I then recalled having gripes with this when holding weapons in my belt/back slot, it has the same issue of pulling the magazine instead of the weapon. Leaving the issue on those 2 slots would be Not Great. Initially I thought about making it explicitly only affect non-gridinv storage smart equip, but that runs into a problem with the backpack water tank & portable recharger.

I think a much cleaner solution would be to use a simplistic NoRecursiveSmartEquip marker component to be added to entities with item slots, and modify the smart equip system to grab the marked entity instead of it's container contents if it has the component. This way firearms with magazines can get the marker component and be explicitly defined to always be grabbed instead of their magazine/chamber, while other entities with item slots can still have the desired function.

[arenaconspiracy]

❤️

[arenaconspiracy]

You might want to request a review.

[arenaconspiracy]

The component should probably also be added to items like flashlights and PDAs, among other things.