Фикс апстрима - #614
Merged
Merged
Conversation
* upstream: (393 commits) Fix vulps eyes and head not found in textures return vulpkanin to _corvax folders some other fixes... some species and gamerule fixes client fixes nubody fixes Remove humanoidBaseSprite markingsGroup and organ visuals prototypes remove markingCategory and replace speciesRestriction with groupWhitelist rebase me later: upstream prototype Fix compile time errors Ensure profile loading only returns valid species (#42842) [Stable] Fix metabolism shuffle (#42795) [STAGING] Fix having to /ghost as spacemobs when you die. (#42709) [STAGING] Fix Hardsuit Helmets dropping on being gibbed. (#42703) [STAGING] Fix Diona not transferring their minds to their nymphs when gibbing. (#42699) hhhng [Admin] Made admin log be high if the buyer is not from expected faction for a store. (#42687) Add fontconfig and pipewire to shell.nix (#42700) Automatic changelog update ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Подправил расы под новые стандарты. Устранил возникшие конфликты.
Далее идет описание от c4llv07e
Fix vulps eyes and head not found in textures
return vulpkanin to _corvax folders
some other fixes...
some species and gamerule fixes
client fixes
nubody fixes
Remove humanoidBaseSprite
markingsGroup and organ visuals prototypes
remove markingCategory and replace speciesRestriction with groupWhitelist
rebase me later: upstream prototype
Fix compile time errors
Ensure profile loading only returns valid species (#42842)
[Stable] Fix metabolism shuffle (#42795)
[STAGING] Fix having to /ghost as spacemobs when you die. (#42709)
[STAGING] Fix Hardsuit Helmets dropping on being gibbed. (#42703)
[STAGING] Fix Diona not transferring their minds to their nymphs when gibbing. (#42699)
hhhng
[Admin] Made admin log be high if the buyer is not from expected faction for a store. (#42687)
Add fontconfig and pipewire to shell.nix (#42700)
Automatic changelog update
...