From: iaada <iaada@users.noreply.github.com>
Date: Fri, 5 Sep 2025 22:07:09 +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=29dda7949f2ce09b4d99f6bca203c9872e11e90b;p=space-station-14.git

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

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

29dda7949f2ce09b4d99f6bca203c9872e11e90b