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

# Conflicts:
#	Resources/Locale/en-US/nutrition/components/drink-component.ftl
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml

diff --cc Resources/Prototypes/Damage/modifier_sets.yml
Simple merge