Merge branch 'main' of github.com:PiotrusWatson/OutOfOrder

# Conflicts:
#	prefabs/player.gd
#
# It looks like you may be committing a merge.
# If this is not correct, please run
#	git update-ref -d MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch main
# Your branch and 'origin/main' have diverged,
# and have 2 and 4 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	new file:   basic_scripts/NPC_2.png
#	new file:   basic_scripts/NPC_2.png.import
#	new file:   basic_scripts/NPC_2_ALT.png
#	new file:   basic_scripts/NPC_2_ALT.png.import
#	modified:   node.gd
#	modified:   prefabs/buble_tea.tscn
#	modified:   prefabs/player.gd
#	modified:   prefabs/yapper.tscn
#	new file:   textures/Vendor.png
#	new file:   textures/Vendor.png.import
#	modified:   worlds/countdown.tscn
#	modified:   worlds/instructions.tscn
#	modified:   worlds/outside_world.tscn
#
