 Zekins
|
ec49f83ea1
|
MODSuits - Модульные Скафандры (#357)
* modsuits
* fixrecipe
* newup
* Крафты/изучения (#354)
* Удалить запрет на вынос садовых инструментов (#3516)
* Астронав пилоту! (#3514)
* Localе med upstream (#3512)
* TTSMenu Up (#3517)
* СРП шахтёра (#3518)
* [Wiki] генерация страниц сущностей (#3523)
* Некоторые фиксы СРП (#3524)
* [Wiki] fix update-wiki (part 99) (#3525)
* Lkp obr fix (#3498)
* Pearl_update_10.03.2026 (#3527)
* SecApartment (#3526)
* TTS fix(#3528)
* Глобальное реформатирование локализации (#3515)
Co-authored-by: MetalSage <metalsage.official@gmail.com>
* Исправления (#3532)
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
* Fixed box sprites and iaa/Pilot ID cards(#3531)
* ftltraveltimeset command (#3530)
* Цель станции в новости (#3529)
* [Wiki] hot fix entities (#3534)
* Исправление опечаток (#3535)
* [Wiki] пометка страниц дубликатов (#3537)
* [Wiki] Оптимизация Actions (#3538)
* [Wiki] Оптимизация Actions 2 (#3539)
* Mbcult (#326)
* .
* сука забыл, на телефоне доделываю
* сука забыл, на телефоне доделываю
* Update Content.Server/_Wega/BloodCult/BloodCultSystem.Equipment.cs
Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com>
* Update Content.Server/_Wega/BloodCult/BloodCultSystem.cs
Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com>
* add
---------
Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com>
* святая святых [part 1] (#337)
* all_in
* Update stacks.ftl
* Update organic.yml
* Update organic.yml
* Update materials.yml
* Изменение автоматов одежды + изменение лодаутов (#338)
* Revert "commit2"
This reverts commit 47e4a1291e.
# Conflicts:
# Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml
* Revert "fix-translate"
This reverts commit 65cd54a703.
# Conflicts:
# Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sabre.yml
# Conflicts:
# Resources/Locale/ru-RU/_wega/ghost/roles/ghost-role-component.ftl
# Conflicts:
# Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/vehicles/buckleable.ftl
* Reapply "fix-translate"
This reverts commit ab4df3441e.
* Reapply "commit2"
This reverts commit caaab7eb62.
* loadout
* timer_warfen
* fix_file
* More Hair (#340)
* Фикс тэгов и руки сервисного борга (#342)
* Revert "commit2"
This reverts commit 47e4a1291e.
# Conflicts:
# Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml
* Revert "fix-translate"
This reverts commit 65cd54a703.
# Conflicts:
# Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sabre.yml
# Conflicts:
# Resources/Locale/ru-RU/_wega/ghost/roles/ghost-role-component.ftl
# Conflicts:
# Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/vehicles/buckleable.ftl
* Reapply "fix-translate"
This reverts commit ab4df3441e.
* Reapply "commit2"
This reverts commit caaab7eb62.
* fix-tag
* fix_linter
* Вампы сабантаг (#344)
* Revert "commit2"
This reverts commit 47e4a1291e.
# Conflicts:
# Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml
* Revert "fix-translate"
This reverts commit 65cd54a703.
# Conflicts:
# Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sabre.yml
# Conflicts:
# Resources/Locale/ru-RU/_wega/ghost/roles/ghost-role-component.ftl
# Conflicts:
# Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/vehicles/buckleable.ftl
* Reapply "fix-translate"
This reverts commit ab4df3441e.
* Reapply "commit2"
This reverts commit caaab7eb62.
* vamp
* delete xenoborg
* Голопроектор ящиков + некоторые рофлы (#339)
* Revert "commit2"
This reverts commit 47e4a1291e.
# Conflicts:
# Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml
* Revert "fix-translate"
This reverts commit 65cd54a703.
# Conflicts:
# Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sabre.yml
# Conflicts:
# Resources/Locale/ru-RU/_wega/ghost/roles/ghost-role-component.ftl
# Conflicts:
# Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/vehicles/buckleable.ftl
* Reapply "fix-translate"
This reverts commit ab4df3441e.
* Reapply "commit2"
This reverts commit caaab7eb62.
* coolpr
* minichange
* РукаБогаПрикурила.exe (#343)
Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com>
* fixes
* Revert "commit2"
This reverts commit 47e4a1291e.
# Conflicts:
# Resources/Prototypes/_Wega/Entities/Mobs/Species/android.yml
* Revert "fix-translate"
This reverts commit 65cd54a703.
# Conflicts:
# Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/sabre.yml
# Conflicts:
# Resources/Locale/ru-RU/_wega/ghost/roles/ghost-role-component.ftl
# Conflicts:
# Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/vehicles/buckleable.ftl
# Conflicts:
# Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/items/belts.ftl
* Reapply "fix-translate"
This reverts commit ab4df3441e.
* Reapply "commit2"
This reverts commit caaab7eb62.
* fixdisplacements
* Взаимодяшки #349
Нежданно, негадано
* Update NanoChatCartridgeSystem.cs (#350)
* fix ARAction
* reach and craft
* Revert "Merge branch 'wega-team:master' into test"
This reverts commit 30cbe9e1506e7d5d0ae2b2ab7bb78e9583a2d8a6, reversing
changes made to 5c7e664674.
# Conflicts:
# Resources/Prototypes/Research/industrial.yml
# Resources/Prototypes/_Wega/Research/biochemical.yml
* Revert "Взаимодяшки #349"
This reverts commit abe2be7d21.
# Conflicts:
# Resources/Prototypes/_Wega/Interactions/specificinteractions.yml
* Revert "fixdisplacements"
This reverts commit 93efc9c05d.
* fix
* Revert "fix ARAction"
This reverts commit 7a35511f18.
* Revert "Update NanoChatCartridgeSystem.cs (#350)"
This reverts commit c58a7173ee.
* del
---------
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: _Svist_ <148935188+Svist666s@users.noreply.github.com>
Co-authored-by: Elusive <elusivedrake@gmail.com>
Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com>
Co-authored-by: exo4ka <toxicalex.7757@gmail.com>
Co-authored-by: exo4ka <193421410+exo4ka@users.noreply.github.com>
Co-authored-by: Dmitry <57028746+DIMMoon1@users.noreply.github.com>
Co-authored-by: MetalSage <74924875+MetalSage@users.noreply.github.com>
Co-authored-by: MetalSage <metalsage.official@gmail.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
Co-authored-by: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Co-authored-by: MartynDew <aminobust3@gmail.com>
Co-authored-by: liegend <2008.morozov.ri@gmail.com>
Co-authored-by: Vovock <vovock176@gmail.com>
Co-authored-by: Zekins3366 <zekins3366@gmail.com>
Co-authored-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com>
* fixes
* rascymar
* maintenance
---------
Co-authored-by: Gamewar360 <136398521+GaMEWAR360@users.noreply.github.com>
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
Co-authored-by: _Svist_ <148935188+Svist666s@users.noreply.github.com>
Co-authored-by: Elusive <elusivedrake@gmail.com>
Co-authored-by: exo4ka <toxicalex.7757@gmail.com>
Co-authored-by: exo4ka <193421410+exo4ka@users.noreply.github.com>
Co-authored-by: Dmitry <57028746+DIMMoon1@users.noreply.github.com>
Co-authored-by: MetalSage <74924875+MetalSage@users.noreply.github.com>
Co-authored-by: MetalSage <metalsage.official@gmail.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
Co-authored-by: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Co-authored-by: MartynDew <aminobust3@gmail.com>
Co-authored-by: liegend <2008.morozov.ri@gmail.com>
Co-authored-by: Vovock <vovock176@gmail.com>
Co-authored-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com>
|
2026-03-25 09:42:40 +03:00 |
|