]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
projects / space-station-14.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a80333 2b8145c)
Merge remote-tracking branch 'upstream/master' into up/drinks-yml
authoriaada <iaada@users.noreply.github.com>
Fri, 8 Aug 2025 20:17:10 +0000 (15:17 -0500)
committeriaada <iaada@users.noreply.github.com>
Fri, 8 Aug 2025 20:17:10 +0000 (15:17 -0500)
# Conflicts:
# Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml


Trivial merge
Форк Space Station 14 с переводами на русский