From: iaada <iaada@users.noreply.github.com>
Date: Fri, 8 Aug 2025 20:17:10 +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=856bbb373af6aa1bcc2df17992689739dec2b32a;p=space-station-14.git

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

# Conflicts:
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
---

856bbb373af6aa1bcc2df17992689739dec2b32a