]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Merge remote-tracking branch 'upstream/master' into up/drinks-yml
authoriaada <iaada@users.noreply.github.com>
Wed, 6 Aug 2025 17:45:41 +0000 (12:45 -0500)
committeriaada <iaada@users.noreply.github.com>
Wed, 6 Aug 2025 17:45:41 +0000 (12:45 -0500)
commit48dcf8a4741f6d6dbf8f7e80cbce92590f479ff8
treec5bd6ffa2e1b2f96a64c8710c81a6875c1a62941
parent26509b879b19f11500e5b328c027939a6248fc5e
parentffccef2358100a88ad476adee8655a21bea9b6b4
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
Resources/Prototypes/Damage/modifier_sets.yml