-
Notifications
You must be signed in to change notification settings - Fork 70
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upstream1902 #1123
Merged
Merged
Upstream1902 #1123
Conversation
This file contains 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
* Create a Armor CoeffientQuery - add Armor Coefficent Query Event for InventoryRelay system * CR - cleanup, comments and fix typos * CR - Remove Whitespace * typos * on't --------- Co-authored-by: ScarKy0 <[email protected]>
* Test Vulture server config * skreee * weh * color! * comment * Update Resources/ConfigPresets/WizardsDen/vulture.toml Co-authored-by: Hannah Giovanna Dawson <[email protected]> * Update Resources/ConfigPresets/WizardsDen/vulture.toml Co-authored-by: Hannah Giovanna Dawson <[email protected]> --------- Co-authored-by: Hannah Giovanna Dawson <[email protected]>
* Upped cyborgs from 2 to 5, updated armory stock, did some button QOL, gave warden a enforcer. * Fixed a few more buttons
…imation fix (#34421) * flashbang resprite * emp grenade resprite * smoke grenade resprite * tear gas resprite * stinger grenade resprite * adds missing animations for projectile grenades
* Initial commit * Updated sprites * Updated base.png and base_shadow.png * Updated meta file
Increased vendomat Wirecutter stock from 1 to 2. Increased vendomat Screwdriver stock from 0 to 2.
…ерез метод TryLoadGrid. все шаттлы ERT переделаны из мап в гриды.
…иратов через TryLoadGrid.
давай тестик завершись |
…tBlue, убран BaseRestrictedContraband из parent:
т-т |
…хранена как карта
Ладно мелочь уже на проде дочиним |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: Audio
Changes: Localization
Изменение локализации
Changes: Map
Изменение карт
Changes: Sprites
Изменение спрайтов
Changes: UI
Изменение интерфейса
S: Untriaged
size/M
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.
Описание PR
Warning
Content.Shared\Projectiles\SharedProjectileSystem.cs
Warning
Content.Server\Doors\Systems\AirlockSystem.cs
Warning
Content.Server\Procedural\DungeonSystem.Rooms.cs
тут новые проверки от оффоф выбраны, старые от крысы закоменченные убраны
Warning
Content.Server\ADT\GameTicking\Rules\PiratesRuleSystem.cs
f92f071Content.Server\ADT\Administration\Commands\SendERTCommand.cs
1a95fb7Content.Server\ADT\Administration\Systems\AdminTestArenaVariableSystem.cs
47bb999Content.Server\ADT\AdditionalMapLoader\AdditionalMapLoaderSystem.cs
ae854eaContent.Server\ADT\Planet\PlanetSystem.cs
6c21fcf477f993
Content.Server\ADT\Ghostbar\Systems\GhostBarSystem.cs
45e540b(ВСЁ ПЕРЕПИСЫВАТЬ К ХЕРАМ Документация тут https://github.com/space-wizards/RobustToolbox/blob/master/RELEASE-NOTES.md?plain=1)
Warning
ADT/Clothing/Head/Hardsuits/paramedic_hardsuithead.rsi
# ADT tweak респрайт от празатаClothingHeadHardsuitBase было от корвакса в parent
Warning
Resources\Prototypes\Entities\Clothing\Head\hardsuit-helmets.yml
принял от визов
id: ClothingHeadHelmetHardsuitCap
стр 325
для себя
Требования
Критические изменения
Чейнджлог
🆑 Шрёдька