Merge branch 'space-wizards:master' into FoodSizeAdjustment

author 5tickman <98989226+5tickman@users.noreply.github.com>

Thu, 24 Jul 2025 22:30:32 +0000 (17:30 -0500)

committer GitHub <noreply@github.com>

Thu, 24 Jul 2025 22:30:32 +0000 (17:30 -0500)
author 5tickman <98989226+5tickman@users.noreply.github.com>
Thu, 24 Jul 2025 22:30:32 +0000 (17:30 -0500)
committer GitHub <noreply@github.com>
Thu, 24 Jul 2025 22:30:32 +0000 (17:30 -0500)
diff --cc Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
Simple merge
author	5tickman <98989226+5tickman@users.noreply.github.com>
	Thu, 24 Jul 2025 22:30:32 +0000 (17:30 -0500)
committer	GitHub <noreply@github.com>
	Thu, 24 Jul 2025 22:30:32 +0000 (17:30 -0500)