From: iaada Date: Wed, 6 Aug 2025 16:17: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=765db2e065c73744419fca6dd1ecd913166ae0fc;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-cartons.yml # Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml # Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml # Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml # Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml # Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml # Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml --- 765db2e065c73744419fca6dd1ecd913166ae0fc