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

Космические торговцы!!!!! #13391

Merged
merged 55 commits into from
Sep 29, 2024
Merged

Космические торговцы!!!!! #13391

merged 55 commits into from
Sep 29, 2024

Commits on Jul 29, 2024

  1. космические торговцы

    @Tap0r
    Tap0r committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    3e382af View commit details
    Browse the repository at this point in the history

  2. фикусы

    @Tap0r
    Tap0r committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    b419ffb View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. суммари

    @Tap0r
    Tap0r committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    67e8cf5 View commit details
    Browse the repository at this point in the history

  2. ещё

    @Tap0r
    Tap0r committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    fbe5556 View commit details
    Browse the repository at this point in the history

  3. ладно у них не будет кучи мусора в трюме

    @Tap0r
    Tap0r committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    5e93708 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. переделываем под айтемс рандом

    @Tap0r
    Tap0r committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    dbe08b9 View commit details
    Browse the repository at this point in the history

  2. обошёл всё что есть в билде чтобы составить эти списки ахуеть можно

    @Tap0r
    Tap0r committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    f58727e View commit details
    Browse the repository at this point in the history

  3. проебал две запятые

    @Tap0r
    Tap0r committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    c22c343 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. !!!!

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

  2. всякое

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

  3. Merge remote-tracking branch 'upstream/master' into space_traders

    @Tap0r
    Tap0r committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    7326ebc View commit details
    Browse the repository at this point in the history

  4. щас буду мапдиф править

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

  5. готов к полёту

    @Tap0r
    Tap0r committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    29fd77a View commit details
    Browse the repository at this point in the history

  6. Update trader_shuttle.dm

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

  7. копипаст копипаст!!!!!

    @Tap0r
    Tap0r committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    060e595 View commit details
    Browse the repository at this point in the history

  8. в пизду этот копипаст я своё напишу

    @Tap0r
    Tap0r committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    7e04c11 View commit details
    Browse the repository at this point in the history

  9. добавляем им худ

    @Tap0r
    Tap0r committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    17aafbb View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. вот щас работает почти как надо

    @Tap0r
    Tap0r committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    a797ef3 View commit details
    Browse the repository at this point in the history

  2. должно быть всё

    @Tap0r
    Tap0r committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    88ee15d View commit details
    Browse the repository at this point in the history

  3. Update objects.dm

    @Tap0r
    Tap0r committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    ea4c388 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into space_traders

    @Tap0r
    Tap0r committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    832c89b View commit details
    Browse the repository at this point in the history

  5. фух бля

    @Tap0r
    Tap0r committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    8635efd View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. исправил док тэги

    @Tap0r
    Tap0r committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    6bfb928 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into space_traders

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

  3. минус труба

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

  4. Update gamma.dmm

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

  5. Update gamma.dmm

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

Commits on Aug 4, 2024

  1. космобайк пока

    @Tap0r
    Tap0r committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    281b01d View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. перенёс анонс

    @Tap0r
    Tap0r committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    4b3cddb View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into space_traders

    @Tap0r
    Tap0r committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    a2e36b8 View commit details
    Browse the repository at this point in the history

  3. Update spawners.dm

    @Tap0r
    Tap0r committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    20268a9 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Update code/datums/spawners_menu/spawners.dm 

    Co-authored-by: Alexander V. <[email protected]>
    @Tap0r @volas
    Tap0r and volas committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    dbdc230 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2024

  1. саммари

    @Tap0r
    Tap0r committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    e69c310 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into space_traders

    @Tap0r
    Tap0r committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    4e6710a View commit details
    Browse the repository at this point in the history

  3. мапконфликты пока

    @Tap0r
    Tap0r committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    42037ee View commit details
    Browse the repository at this point in the history

  4. вроде перенёс но меня пугает что никакие изменения ко мне не подтянулись

    @Tap0r
    Tap0r committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    dd6ce22 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master' into space_traders

    @Tap0r
    Tap0r committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    d4e7db6 View commit details
    Browse the repository at this point in the history

  6. Update gamma.dmm

    @Tap0r
    Tap0r committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    d07c9bf View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2024

  1. Merge remote-tracking branch 'upstream/master' into space_traders

    @Tap0r
    Tap0r committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    4986484 View commit details
    Browse the repository at this point in the history

  2. исправляем конфликты

    @Tap0r
    Tap0r committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    9e421c6 View commit details
    Browse the repository at this point in the history

  3. Update code/game/gamemodes/objectives/traders_objectives.dm 

    ладно

Co-authored-by: KIBORG04 <[email protected]>
    @Tap0r @KIBORG04
    Tap0r and KIBORG04 committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    da49e84 View commit details
    Browse the repository at this point in the history

  4. Update traders_objectives.dm

    @Tap0r
    Tap0r committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    8bc7067 View commit details
    Browse the repository at this point in the history

  5. сумари

    @Tap0r
    Tap0r committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    e51da86 View commit details
    Browse the repository at this point in the history

  6. всё

    @Tap0r
    Tap0r committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    08b6ab3 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. Update code/game/machinery/computer/trader_shuttle.dm 

    Co-authored-by: KIBORG04 <[email protected]>
    @Tap0r @KIBORG04
    Tap0r and KIBORG04 committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    a8eb96d View commit details
    Browse the repository at this point in the history

  2. Update code/game/gamemodes/objectives/traders_objectives.dm 

    Co-authored-by: KIBORG04 <[email protected]>
    @Tap0r @KIBORG04
    Tap0r and KIBORG04 committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    5c2a411 View commit details
    Browse the repository at this point in the history

  3. Update boxstation.dmm

    @Tap0r
    Tap0r committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    bb23fb3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'space_traders' of https://github.com/Tap0r/TauCetiClassic… 

    … into space_traders
    @Tap0r
    Tap0r committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    54737bd View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master' into space_traders

    @Tap0r
    Tap0r committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    a8e69e0 View commit details
    Browse the repository at this point in the history

  6. конфликты офф

    @Tap0r
    Tap0r committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    20951b9 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. исправления

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

  2. ну пусть будет цель на 20к бачей

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

  3. твики

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

  4. девайс

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

Commits on Sep 28, 2024

  1. gamma fix

    @Tap0r
    Tap0r committed Sep 28, 2024
    Configuration menu
    Copy the full SHA
    090c2ea View commit details
    Browse the repository at this point in the history