Skip to content
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

Upstream sync #4355

Closed
wants to merge 212 commits into from
Closed

Upstream sync #4355

wants to merge 212 commits into from

Commits on Aug 5, 2023

  1. Configuration menu
    Copy the full SHA
    5ec0626 View commit details
    Browse the repository at this point in the history
  2. Fix ru in IC chat

    Dedlain committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    5fb3c68 View commit details
    Browse the repository at this point in the history
  3. Xenobots base

    Polion1232 committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    34fb331 View commit details
    Browse the repository at this point in the history
  4. Some basic defines

    Polion1232 committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    debdcbe View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    562defb View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c1339c5 View commit details
    Browse the repository at this point in the history
  7. colonialmarines.dme

    Polion1232 committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    bdab02f View commit details
    Browse the repository at this point in the history
  8. add tearer

    Polion1232 committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    03675a4 View commit details
    Browse the repository at this point in the history
  9. big icons

    Polion1232 committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    a0a000f View commit details
    Browse the repository at this point in the history
  10. Adjustments for code

    Polion1232 committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    349b580 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    644a46c View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. Merge pull request #1 from DeadLineSS13/master

    Fix ru in IC chat
    Fray2 committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    f0e8540 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    da37eae View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Fixes

    Dedlain committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    1305f6f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2d3fae7 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Almayer rework

    Rihards committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    95dc3ec View commit details
    Browse the repository at this point in the history
  2. Speed and priority changes

    Polion1232 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    3649f22 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f8d328d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6cab5e1 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #4 from poleno1232/master

    Xenobots
    Fray2 committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    4e7a264 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Configuration menu
    Copy the full SHA
    b5491a6 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'pr/3'

    Fray2 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    19d63c4 View commit details
    Browse the repository at this point in the history
  3. Возвращение отрядов альфа-дельта

    - Возвращены альфа и дельта как временное решение для конфликта карты
    - количество медиков в отряде уменьшено с 5 до 4
    Fray2 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    a31caee View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2023

  1. Configuration menu
    Copy the full SHA
    9615681 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    48e3041 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2023

  1. Configuration menu
    Copy the full SHA
    75fea9c View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. Update .gitignore

    Fray2 committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    6e76219 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c68c5a2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3550ab5 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2023

  1. Configuration menu
    Copy the full SHA
    d81b4a4 View commit details
    Browse the repository at this point in the history
  2. Merge upstream

    Fray2 committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    91289f3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1cd9edf View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2023

  1. Configuration menu
    Copy the full SHA
    366e6ae View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. Эксперимент со скейлингом

    Требования на разблокировку дополнительного слота уменьшены в два раза для всех ролей, кроме смартганнера и спека. Больно видеть на онлайн 30 человек смартганнеров и специалистов больше, чем обычных мариков.
    Fray2 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    028d0f7 View commit details
    Browse the repository at this point in the history
  2. Change xenobots' sprites

    Polion1232 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    cef3121 View commit details
    Browse the repository at this point in the history
  3. Sunken Colony

    Polion1232 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    cfdadbd View commit details
    Browse the repository at this point in the history
  4. Update dme

    Polion1232 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    5215fdc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9f0ca3b View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. Телефон в каждый дом

    Добавил телефонный пак фаертим лидеру в изначальный эквип. Добавил возможность покупать пак в карго в разделе "Gear". Возможность покупики за 5 очков у фаертима оставлена.
    Rocky0558 committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    22cdea3 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #9 from Rocky0558/Rocky

    Телефон в каждый дом
    Fray2 committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    6090f98 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    46ada31 View commit details
    Browse the repository at this point in the history
  4. Revert "Vehicles are removed. (No longer spawnable unless via admin v…

    …ariable editing for events) (cmss13-devs#2320)"
    
    This reverts commit 7fb07e3.
    4310V343k committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    209eacc View commit details
    Browse the repository at this point in the history
  5. fixes off-cm tiny brains

    4310V343k committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    2b1b6cb View commit details
    Browse the repository at this point in the history
  6. half-revert the revert

    wtf
    4310V343k committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    795c1ce View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Merge pull request #10 from poleno1232/master

    Пачки новых вещей ксенам
    Fray2 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    6eeb0b4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8073b20 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #11 from 4310V343k/tank!1

    машинки
    Fray2 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    08e90e6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cf4413f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9e3f8f6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4827474 View commit details
    Browse the repository at this point in the history
  7. Дофиксы алмаера

    Пофикшен кабинет танкистов, убран аномальный дождь в препах дельты
    Fray2 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    e69fae3 View commit details
    Browse the repository at this point in the history
  8. master

    Rocky0558 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    88eff94 View commit details
    Browse the repository at this point in the history
  9. master

    Rocky0558 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    8fe6725 View commit details
    Browse the repository at this point in the history
  10. we've got tanks!1

    4310V343k committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    de28121 View commit details
    Browse the repository at this point in the history
  11. tank by default

    4310V343k committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    22719a6 View commit details
    Browse the repository at this point in the history
  12. Merge pull request #12 from Rocky0558/master

    Восстановление былых сил Автодока
    Fray2 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    edb07f0 View commit details
    Browse the repository at this point in the history
  13. cmss13-devs#441 is so cool

    4310V343k committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    c00a624 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    b9976f1 View commit details
    Browse the repository at this point in the history
  15. map fixes

    4310V343k committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    ef77c48 View commit details
    Browse the repository at this point in the history
  16. uhh

    4310V343k committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    13c2438 View commit details
    Browse the repository at this point in the history
  17. Merge pull request #13 from 4310V343k/tank!1

    we've got tanks!1
    Fray2 committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    a6bd337 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    f39fba3 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    d0bffdf View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. Configuration menu
    Copy the full SHA
    84d2457 View commit details
    Browse the repository at this point in the history
  2. Комплексные фиксы алмаера

    (XDinka)
    - Спаренный преп альфа-дельта отрядов;
    - офис ASO над ангаром Аламо;
    - мехбей и пустые препы в нижней части корабля для дальнейших нововведений
    Fray2 committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    b78b5da View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    502ddb0 View commit details
    Browse the repository at this point in the history
  4. Очередные фиксы алмаера (да сколько же можно?)

    Зафикшены трубы, доступы, поправлено расположение вендоматов, добавлены мелкие правки, поправлены дверки - XDinka
    Fray2 committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    3065bed View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. Запоздатый Патч первого дня.

    Фиксы основных поломочек говна и палок, доступа, света, мелкие правки мехбея, мелкие правки препов.
    XDinka committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    aaccc89 View commit details
    Browse the repository at this point in the history
  2. Update USS_Almayer.dmm

    XDinka committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    79761eb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8a31cff View commit details
    Browse the repository at this point in the history
  4. Update USS_Almayer.dmm

    XDinka committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    cc2e556 View commit details
    Browse the repository at this point in the history
  5. Снова трогается Алмайер

    Ептать
    XDinka committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    5535398 View commit details
    Browse the repository at this point in the history
  6. Конфликты?

    XDinka committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    706b0dd View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c98e4ca View commit details
    Browse the repository at this point in the history
  8. Финал фикс

    XDinka committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    76da50e View commit details
    Browse the repository at this point in the history
  9. Fix layers tonk

    Dedlain committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    e5388b2 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #15 from DeadLineSS13/master

    Fix layers tonk
    DeadLineSS13 committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    9927f64 View commit details
    Browse the repository at this point in the history
  11. ошибка не критична...

    Просмотрев все изменения моего ПРа, могу с уверенностью сказать, что ошибка не на моей стороне. Ни один VV не пострадал... Чудеса прямо какие-то...
    XDinka committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    0efaede View commit details
    Browse the repository at this point in the history
  12. Mech incoming

    Dedlain committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    9f144a6 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #16 from DeadLineSS13/master

    Mech incoming
    DeadLineSS13 committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    6d34e61 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    9258ded View commit details
    Browse the repository at this point in the history
  15. Merge pull request #17 from DeadLineSS13/master

    Add tank points in tier 2 defcon
    DeadLineSS13 committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    af7f508 View commit details
    Browse the repository at this point in the history
  16. Merge pull request #14 from XDinka/master

    Hotfix ФраеАлмайер 1.1 (26.08.23)
    Fray2 committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    0904f1e View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    db38fcb View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    9e0b89b View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    399c87c View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    3d59787 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    1a7f285 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    a7ecda5 View commit details
    Browse the repository at this point in the history
  23. Фикс таблицы в преференсах

    ХакерРус сука
    Fray2 committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    c812184 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    6292179 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2023

  1. Вайтлист на оператора мехи.

    Временное решение, пока меха находится на стадии доработки.
    Fray2 committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    12342e5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cf7e619 View commit details
    Browse the repository at this point in the history
  3. Фикс (Ы18)

    Боже храни дину
    Fray2 committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    3db657d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8ee9488 View commit details
    Browse the repository at this point in the history
  5. Papers, please!

    Rocky0558 committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    986029f View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Configuration menu
    Copy the full SHA
    7e451c0 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #19 from Rocky0558/StormTrooper-Revive

    Некоторые мелкие фиксы
    Fray2 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    de01335 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. Configuration menu
    Copy the full SHA
    6e1095b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #20 from Rocky0558/StormTrooper-Revive

    Knock-knock, bitches! Breacher is here!
    Fray2 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    9d9bde1 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Configuration menu
    Copy the full SHA
    4e60d94 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0bcf779 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f218d1f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9128cc2 View commit details
    Browse the repository at this point in the history
  5. Фиксы

    Wyderar committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    b20a6df View commit details
    Browse the repository at this point in the history
  6. Update .tgs.yml

    Wyderar committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    7077cbd View commit details
    Browse the repository at this point in the history
  7. Updated sprites

    Polion1232 committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    7cc294f View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6d3172b View commit details
    Browse the repository at this point in the history
  9. Merge pull request #23 from Rocky0558/hotfix

    Фиксы спрайтов
    Wyderar committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    bc5a02e View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    523977a View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    9bc6b99 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    0a4affc View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    71ac8fd View commit details
    Browse the repository at this point in the history
  14. Merge pull request #24 from poleno1232/master

    Санкен, но красивее
    Wyderar committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    da24c18 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    0201565 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    3b63053 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2023

  1. Configuration menu
    Copy the full SHA
    e221f82 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a329042 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c6103e8 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #25 from Rocky0558/hotfix

    Поправки в конституции СТ
    Fray2 committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    fec4147 View commit details
    Browse the repository at this point in the history
  5. Map fixes

    Wyderar committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    1655f2e View commit details
    Browse the repository at this point in the history
  6. Merge pull request #26 from Wyderar/mapfixes

    Map fixes
    Wyderar committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    070f6da View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    158d92e View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    07937bb View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    8191c3c View commit details
    Browse the repository at this point in the history
  10. Merge pull request #27 from Rocky0558/hotfix

    Вторые правки в конституцию СТшника
    Wyderar committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    b9b6527 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    6e60839 View commit details
    Browse the repository at this point in the history
  12. Обновление конфига мапы

    В ротацию добавлена призонка, убраны шива и солярис (из за поломанного света)
    Fray2 committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    32b844f View commit details
    Browse the repository at this point in the history
  13. Лобби музыка

    Fray2 committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    00e7215 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    ab92d92 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2023

  1. Configuration menu
    Copy the full SHA
    5b27660 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #28 from Rocky0558/hotfix

    Добавление музыки к Ходящий Мужчина
    Wyderar committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    f7a975c View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. танк фанни

    xDanilcusx committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    4de313a View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Merge pull request #30 from xDanilcusx/master

    Танкофиксы и фары
    Fray2 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    f79465e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1ec778b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    054599f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ad58a51 View commit details
    Browse the repository at this point in the history
  5. Вернул в мап пулл школярис

    Маркус заставил
    Fray2 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    a738b25 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b967097 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    4c266f7 View commit details
    Browse the repository at this point in the history
  8. Update autoreply.dm

    xDanilcusx committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    dd23c19 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #32 from xDanilcusx/Regurgitate

    Проглатывание За Ксеноморфа
    Fray2 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    f64c0bc View commit details
    Browse the repository at this point in the history
  10. Tweaks to Sunken

    poleno1232 committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    fde3c48 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. русское радио

    круто
    carrotman2013 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    f61a993 View commit details
    Browse the repository at this point in the history
  2. говорит

    шипит
    carrotman2013 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    32ab8af View commit details
    Browse the repository at this point in the history
  3. Update hear_say.dm

    опечатка
    carrotman2013 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    f5eadf2 View commit details
    Browse the repository at this point in the history
  4. Update hear_say.dm

    опечатка
    carrotman2013 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    1f11e18 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #33 from poleno1232/master

    Sunken Update
    Fray2 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    74f95dd View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3bd407b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    4060ca7 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #34 from carrotman2013/master

    русское радио
    Fray2 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    ae2830f View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    ffc348a View commit details
    Browse the repository at this point in the history
  10. ксеноту на черный рынок

    сочные органы
    carrotman2013 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    2983c70 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    43f25ac View commit details
    Browse the repository at this point in the history
  12. Merge pull request #35 from carrotman2013/master

    Продажа ксен на черном рынке (почему он черный?)
    Fray2 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    f9d5460 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    da5726e View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    60dccbb View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    65a777c View commit details
    Browse the repository at this point in the history
  16. Changes to sunken

    poleno1232 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    6bf8a27 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    9da4589 View commit details
    Browse the repository at this point in the history
  18. Merge pull request #37 from poleno1232/master

    Update sunken
    Wyderar committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    7802097 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    c8cee8b View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    479ca5b View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    d3ff87b View commit details
    Browse the repository at this point in the history
  22. Deleting tags from map

    Wyderar committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    c0d0ee4 View commit details
    Browse the repository at this point in the history
  23. Map fixes v2

    Wyderar committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    26c34d3 View commit details
    Browse the repository at this point in the history
  24. Merge pull request #38 from Wyderar/tempfixtest

    Tests fixes
    Wyderar committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    b4bf027 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    ebec079 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    be8a11b View commit details
    Browse the repository at this point in the history
  27. Weaken Sunken Colony

    poleno1232 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    ab927e9 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    a2bafe8 View commit details
    Browse the repository at this point in the history
  29. Timelocks change

    Wyderar committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    add401f View commit details
    Browse the repository at this point in the history
  30. Sunken only on hive weed

    poleno1232 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    62e7026 View commit details
    Browse the repository at this point in the history
  31. Return old min distance

    poleno1232 committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    dec3b52 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    12ae237 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    1d90bf1 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. Configuration menu
    Copy the full SHA
    e40de82 View commit details
    Browse the repository at this point in the history
  2. Cman

    krut
    carrotman2013 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    0f38956 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c23a6fc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e49be69 View commit details
    Browse the repository at this point in the history
  5. changelog

    haha
    carrotman2013 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    eea71ae View commit details
    Browse the repository at this point in the history
  6. переводим переводим

    вуху
    carrotman2013 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    23abfc2 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    7d9bd3a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    90704c3 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #40 from Wyderar/timelocks

    Timelocks change
    Fray2 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    85441c0 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    c5d317a View commit details
    Browse the repository at this point in the history
  11. Merge pull request #43 from carrotman2013/perevod

    Ошибочка: Ты не админ, дружище.
    Fray2 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    15661cc View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    ea57929 View commit details
    Browse the repository at this point in the history
  13. Merge pull request #39 from poleno1232/master

    Weaken Sunken Colony
    Fray2 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    f5a4716 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    5c87ab4 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    84ccd19 View commit details
    Browse the repository at this point in the history
  16. Merge pull request #41 from xDanilcusx/хаха-молоток

    Реворк (освежение механа) молотоспека
    Fray2 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    3b40b7f View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    ddff68c View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    c522c23 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    771ba13 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    3692476 View commit details
    Browse the repository at this point in the history
  21. Update kit_boxes.dm

    xDanilcusx committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    7ef41b2 View commit details
    Browse the repository at this point in the history
  22. Merge pull request #46 from xDanilcusx/кит-молотоспека

    Обнова набора молотоспека
    Fray2 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    c14af1e View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    0996818 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    ca7f9fe View commit details
    Browse the repository at this point in the history
  25. фикс переводов

    статистика важна (кому? все забывают раунды через 5 минут)
    carrotman2013 committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    547125e View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    cdb5c54 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Configuration menu
    Copy the full SHA
    fd4c813 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    59ef979 View commit details
    Browse the repository at this point in the history
  3. а

    carrotman2013 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    e3995b1 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #45 from xDanilcusx/master

    виу виу виу срочный фикс света на танке
    Fray2 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    5d864cd View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ed9ad4e View commit details
    Browse the repository at this point in the history
  6. Merge pull request #47 from carrotman2013/master

    переводы
    Fray2 committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    b32fced View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    faf3ab3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6da1056 View commit details
    Browse the repository at this point in the history
  9. Upstream sync

    Wyderar committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    f5ff1aa View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    0f3f121 View commit details
    Browse the repository at this point in the history