From: iaada <iaada@users.noreply.github.com>
Date: Wed, 6 Aug 2025 17:45:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master' into up/drinks-yml
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=48dcf8a4741f6d6dbf8f7e80cbce92590f479ff8;p=space-station-14.git

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
---

48dcf8a4741f6d6dbf8f7e80cbce92590f479ff8