]> git.smokeofanarchy.ru Git - space-station-14.git/commit
fixed conflicts
authoriaada <iaada@users.noreply.github.com>
Wed, 6 Aug 2025 17:52:18 +0000 (12:52 -0500)
committeriaada <iaada@users.noreply.github.com>
Wed, 6 Aug 2025 17:52:18 +0000 (12:52 -0500)
commit0bd8ad43ab2f364053d83a272412a6e261061412
tree3916b2b102442e79571c41943c1c1631b60656ab
parent48dcf8a4741f6d6dbf8f7e80cbce92590f479ff8
fixed conflicts
Resources/Locale/en-US/nutrition/components/sealable-component.ftl
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml