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

Горохострел (вместо револьверного дерева) #13498

Merged
merged 44 commits into from
Sep 8, 2024
Merged

Горохострел (вместо револьверного дерева) #13498

merged 44 commits into from
Sep 8, 2024

Commits on Jul 26, 2024

  1. dasda

    @maleyvich
    maleyvich committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    1c4060d View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. mmm

    @maleyvich
    maleyvich committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    75d1e5c View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. Update iv_drip.dm 

    Фикс бага с капельницей
    @Danistans2
    Danistans2 committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    8a6a592 View commit details
    Browse the repository at this point in the history

  2. Update iv_drip.dm

    @Danistans2
    Danistans2 committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    68d4f6d View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Merge branch 'TauCetiStation:master' into master

    @Danistans2
    Danistans2 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    79ab1dc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from maleyvich/goroxovi-pistolet 

    Goroxovi pistolet
    @Danistans2
    Danistans2 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    ca2b56c View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Update pistol.dm 

    Добавляем горохострел в пушки
    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    d8e4a17 View commit details
    Browse the repository at this point in the history

  2. Update bullets.dm 

    Добавляем пулю
    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    e708eac View commit details
    Browse the repository at this point in the history

  3. Update bullets.dm 

    Еще раз добавляем пулю
    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    56d1bf7 View commit details
    Browse the repository at this point in the history

  4. Создаем магазин с горохом

    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    324067e View commit details
    Browse the repository at this point in the history

  5. Запрещаем вынимать магазин из горохострела

    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    fc8e2d0 View commit details
    Browse the repository at this point in the history

  6. иконочки (названия заменены)

    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    857bd1a View commit details
    Browse the repository at this point in the history

  7. Иконочки переименованы по количеству патрон

    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    250bc37 View commit details
    Browse the repository at this point in the history

  8. Update bullets.dm

    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    edfae8e View commit details
    Browse the repository at this point in the history

  9. Update magazines.dm

    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    3e35e7f View commit details
    Browse the repository at this point in the history

  10. Add files via upload

    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    d33f17d View commit details
    Browse the repository at this point in the history

  11. Update hydro.dm

    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    af1ab45 View commit details
    Browse the repository at this point in the history

  12. Update grown.dm

    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    10d3aff View commit details
    Browse the repository at this point in the history

  13. Спрайты на горох

    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    1b7a053 View commit details
    Browse the repository at this point in the history

  14. Обновляем тайпы и

    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    8c0b9ef View commit details
    Browse the repository at this point in the history

  15. Опять фиксим тайпы

    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    3038b5d View commit details
    Browse the repository at this point in the history

  16. Еще раз фиксим тайпы, но теперь еще и комменты, и немножк иконки

    @Danistans2
    Danistans2 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    09ec7fd View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Update pistol.dm

    @Danistans2
    Danistans2 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    336010d View commit details
    Browse the repository at this point in the history

  2. Update projectile.dm

    @Danistans2
    Danistans2 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    ac2b4f9 View commit details
    Browse the repository at this point in the history

  3. Update bullets.dm

    @Danistans2
    Danistans2 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    c3ca725 View commit details
    Browse the repository at this point in the history

  4. Update magazines.dm

    @Danistans2
    Danistans2 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    a6b9707 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Изменение описания и добавление кейсов

    @Danistans2
    Danistans2 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    5a3abc6 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Удалил лишний gun.dmi из корня

    @Danistans2
    Danistans2 committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    60415d2 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2024

  1. Update code/modules/projectiles/guns/projectile/pistol.dm 

    Co-authored-by: Kiroma <[email protected]>
    @Danistans2 @Kiromaka
    Danistans2 and Kiromaka committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    05026a7 View commit details
    Browse the repository at this point in the history

  2. Update code/modules/projectiles/ammunition/bullets.dm 

    Co-authored-by: Kiroma <[email protected]>
    @Danistans2 @Kiromaka
    Danistans2 and Kiromaka committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    b292338 View commit details
    Browse the repository at this point in the history

  3. Update code/defines/obj/hydro.dm 

    Co-authored-by: Kiroma <[email protected]>
    @Danistans2 @Kiromaka
    Danistans2 and Kiromaka committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    8e32196 View commit details
    Browse the repository at this point in the history

  4. Update code/defines/obj/hydro.dm 

    Co-authored-by: Kiroma <[email protected]>
    @Danistans2 @Kiromaka
    Danistans2 and Kiromaka committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    fa8dddc View commit details
    Browse the repository at this point in the history

  5. Update code/modules/projectiles/guns/projectile/pistol.dm 

    Co-authored-by: NinjaPikachuska <[email protected]>
    @Danistans2 @NinjaPikachuska
    Danistans2 and NinjaPikachuska committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    0318b95 View commit details
    Browse the repository at this point in the history

  6. Выпилил перевод

    @Danistans2
    Danistans2 committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    397f943 View commit details
    Browse the repository at this point in the history

  7. Выпилил лишнюю проверку, в том числе проверку падежей

    @Danistans2
    Danistans2 committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    8cb293c View commit details
    Browse the repository at this point in the history

  8. Выпилил перевод и падежи

    @Danistans2
    Danistans2 committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    489d8cc View commit details
    Browse the repository at this point in the history

  9. Выпилил падежи. Минимальный перевод как у остальных патрон

    @Danistans2
    Danistans2 committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    05b2b67 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2024

  1. Возвращаем на базу украденные русские буквы

    @Danistans2
    Danistans2 committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    89759dc View commit details
    Browse the repository at this point in the history

  2. Буквы вернулись и сюда

    @Danistans2
    Danistans2 committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    9712cc4 View commit details
    Browse the repository at this point in the history

  3. Никто не читает коммиты, но тут тоже вернулось как было

    @Danistans2
    Danistans2 committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    59837d3 View commit details
    Browse the repository at this point in the history

  4. Падежи, перевод

    @Danistans2
    Danistans2 committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    1c5fc7f View commit details
    Browse the repository at this point in the history

  5. Добавил падежи самому пишутеру

    @Danistans2
    Danistans2 committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    4f41034 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Update code/defines/obj/hydro.dm 

    Co-authored-by: Azzy <[email protected]>
    @Danistans2 @AzzyDreemurr13
    Danistans2 and AzzyDreemurr13 committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    fe876af View commit details
    Browse the repository at this point in the history

  2. Update code/modules/projectiles/ammunition/magazines.dm 

    Co-authored-by: Azzy <[email protected]>
    @Danistans2 @AzzyDreemurr13
    Danistans2 and AzzyDreemurr13 committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    f2d5800 View commit details
    Browse the repository at this point in the history