Merge branch 'master' into pr/39203

author Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

Thu, 7 Aug 2025 18:43:56 +0000 (11:43 -0700)

committer Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

Thu, 7 Aug 2025 18:43:56 +0000 (11:43 -0700)
author Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Thu, 7 Aug 2025 18:43:56 +0000 (11:43 -0700)
committer Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Thu, 7 Aug 2025 18:43:56 +0000 (11:43 -0700)
diff --cc Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
Simple merge
diff --cc Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
Simple merge
author	Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
	Thu, 7 Aug 2025 18:43:56 +0000 (11:43 -0700)
committer	Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
	Thu, 7 Aug 2025 18:43:56 +0000 (11:43 -0700)
		1	2
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml	patch \|	diff1 \|	diff2 \|	blob \| history
Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml	patch \|	diff1 \|	diff2 \|	blob \| history