Been working on various things for over a week for the merge its been very much a heads down work work work time. Most important perhaps, combat is working again, at least the melee combat.

Adding things to the player inventory by dropping them in the inventory is working again.

Adding things to the player inventory by dropping them on the inventory bags is working again.

Fixed a new regression bug that was causing the player to not be able to pull items off the shelf.

Player armor equipping kind of works again