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.

Sign up for GitHub

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

Jump to bottom

Новые вещи в лодаут #1544

Merged
merged 31 commits into from
Oct 2, 2024
Merged

Новые вещи в лодаут #1544

merged 31 commits into from
Oct 2, 2024

Commits on Sep 23, 2024

  1. Новые вещи в лодаут

    @Dekupich
    Dekupich committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    f47ecdf View commit details
    Browse the repository at this point in the history

  2. Update modular_ss220/clothing/_clothing.dm 

    Co-authored-by: Aylong <[email protected]>
    @Dekupich @AyIong
    Dekupich and AyIong authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    5704e61 View commit details
    Browse the repository at this point in the history

  3. Update modular_ss220/clothing/code/shoes.dm 

    Co-authored-by: Aylong <[email protected]>
    @Dekupich @AyIong
    Dekupich and AyIong authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    df6379d View commit details
    Browse the repository at this point in the history

  4. Лодаут перекинут в модуль лодаута

    @Dekupich
    Dekupich committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    8100e55 View commit details
    Browse the repository at this point in the history

  5. Забыл убрать инклюд

    @Dekupich
    Dekupich committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    f4fb47c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into New-clothes

    @Dekupich
    Dekupich authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    ac78ee5 View commit details
    Browse the repository at this point in the history

  7. MARK 

    Тут все в целом вперемешку, но новое отделю
    @Dekupich
    Dekupich committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    4ee9763 View commit details
    Browse the repository at this point in the history

  8. Update modular_ss220/clothing/code/suits.dm 

    Co-authored-by: Mikhail Dzianishchyts <[email protected]>
    @Dekupich @m-dzianishchyts
    Dekupich and m-dzianishchyts authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    4277a91 View commit details
    Browse the repository at this point in the history

  9. Update modular_ss220/clothing/code/suits.dm 

    Co-authored-by: Mikhail Dzianishchyts <[email protected]>
    @Dekupich @m-dzianishchyts
    Dekupich and m-dzianishchyts authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    fa52d87 View commit details
    Browse the repository at this point in the history

  10. Update modular_ss220/clothing/code/suits.dm 

    Co-authored-by: Mikhail Dzianishchyts <[email protected]>
    @Dekupich @m-dzianishchyts
    Dekupich and m-dzianishchyts authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    132abd6 View commit details
    Browse the repository at this point in the history

  11. Правки 

    Пиксели добавлены, имена с маленькой буквы, корпа стандартизирована
    @Dekupich
    Dekupich committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    84b308f View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into New-clothes

    @Dekupich
    Dekupich authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    6e40d66 View commit details
    Browse the repository at this point in the history

  13. Я не знаю что это было и зачем

    @Dekupich
    Dekupich committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    c0affce View commit details
    Browse the repository at this point in the history

  14. Update modular_ss220/loadout/code/donor.dm

    @m-dzianishchyts
    m-dzianishchyts authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    fca630e View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Merge branch 'ss220club:master' into New-clothes

    @Dekupich
    Dekupich authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    5eac11e View commit details
    Browse the repository at this point in the history

  2. Правки описаний и MARK

    @Dekupich
    Dekupich committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    c78ce1e View commit details
    Browse the repository at this point in the history

  3. Фикс капитанской мантии

    @Dekupich
    Dekupich committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    b5051c2 View commit details
    Browse the repository at this point in the history

  4. Фикс фикса капитанской мантии

    @Dekupich
    Dekupich committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    abeb790 View commit details
    Browse the repository at this point in the history

  5. Адаптация маски для унати

    @Dekupich
    Dekupich committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    6d18c2d View commit details
    Browse the repository at this point in the history

  6. Улучшение спрайтов юбок

    @Dekupich
    Dekupich committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    0694e91 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Merge branch 'master' into New-clothes

    @Dekupich
    Dekupich committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    5ee33f7 View commit details
    Browse the repository at this point in the history

  2. Нормальный фикс конфликта

    @Dekupich
    Dekupich committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    7dbd02c View commit details
    Browse the repository at this point in the history

  3. Адаптация маски для воксов, маска теперь доступна всем расам

    @Dekupich
    Dekupich committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    827fefe View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Merge branch 'master' into New-clothes

    @Dekupich
    Dekupich authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    8a17ac2 View commit details
    Browse the repository at this point in the history

  2. Вещи киданов адаптированы под их новые спрайты

    @Dekupich
    Dekupich committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    6b094ca View commit details
    Browse the repository at this point in the history

  3. Добавлены забытые ботинки для киданов и исправлены пиксели штанов

    @Dekupich
    Dekupich committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    5220809 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Merge branch 'master' into New-clothes

    @Dekupich
    Dekupich authored Sep 30, 2024
    Configuration menu
    Copy the full SHA
    f331965 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'ss220_1/master' into New-clothes

    @Dekupich
    Dekupich committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    972993c View commit details
    Browse the repository at this point in the history

  3. conflict fix

    @Dekupich
    Dekupich committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    126b3dd View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Возвращение спрайтов киданов к нынешнему виду 

    После респрайта всей одежды - залью патч с новой.
    @Dekupich
    Dekupich committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    4969b9a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into New-clothes

    @Dekupich
    Dekupich authored Oct 2, 2024
    Configuration menu
    Copy the full SHA
    2bf81bc View commit details
    Browse the repository at this point in the history