Merge branch 'main' of https://github.com/Enedyx2/SR-B

# Conflicts:
#	scripts/items/artifacts/socks.js
