]> 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>
Fri, 5 Sep 2025 22:07:09 +0000 (17:07 -0500)
committeriaada <iaada@users.noreply.github.com>
Fri, 5 Sep 2025 22:07:09 +0000 (17:07 -0500)
commit29dda7949f2ce09b4d99f6bca203c9872e11e90b
treeeb74686e5fd551be4345770b8916fec870ccbf3f
parent63b5f37c1bdb97180f550c56f0bb5d38bf5c1047
parentd8400c65205bee5fd86246b0a9aa1ffec4e86495
Merge remote-tracking branch 'upstream/master' into up/drinks-yml

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