Merge remote-tracking branch 'upstream/master' into up/drinks-yml

author iaada <iaada@users.noreply.github.com>

Fri, 5 Sep 2025 22:07:09 +0000 (17:07 -0500)

committer iaada <iaada@users.noreply.github.com>

Fri, 5 Sep 2025 22:07:09 +0000 (17:07 -0500)
author iaada <iaada@users.noreply.github.com>
Fri, 5 Sep 2025 22:07:09 +0000 (17:07 -0500)
committer iaada <iaada@users.noreply.github.com>
Fri, 5 Sep 2025 22:07:09 +0000 (17:07 -0500)
diff --cc Resources/Prototypes/Damage/modifier_sets.yml
Simple merge
author	iaada <iaada@users.noreply.github.com>
	Fri, 5 Sep 2025 22:07:09 +0000 (17:07 -0500)
committer	iaada <iaada@users.noreply.github.com>
	Fri, 5 Sep 2025 22:07:09 +0000 (17:07 -0500)