Merge branch 'master' of https://github.com/space-wizards/space-station-14 into FoodS...

author 5tickman <5tick@comcast.net>

Sat, 26 Jul 2025 02:36:15 +0000 (21:36 -0500)

committer 5tickman <5tick@comcast.net>

Sat, 26 Jul 2025 02:36:15 +0000 (21:36 -0500)
author 5tickman <5tick@comcast.net>
Sat, 26 Jul 2025 02:36:15 +0000 (21:36 -0500)
committer 5tickman <5tick@comcast.net>
Sat, 26 Jul 2025 02:36:15 +0000 (21:36 -0500)
diff --cc Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
Simple merge
author	5tickman <5tick@comcast.net>
	Sat, 26 Jul 2025 02:36:15 +0000 (21:36 -0500)
committer	5tickman <5tick@comcast.net>
	Sat, 26 Jul 2025 02:36:15 +0000 (21:36 -0500)