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

add: Customat #5849

Merged
merged 42 commits into from
Oct 5, 2024
Merged

add: Customat #5849

merged 42 commits into from
Oct 5, 2024

Conversation

Anorak2024
Copy link
Contributor

@Anorak2024 Anorak2024 commented Sep 2, 2024

Описание

Добавление Кастоматов - торговых автоматов с кастомным содержимым. Решил что будет проще не делать кастоматы потомками вендоматов и менять половину функций и переменных, а сделать их отдельным похожим классом.

Ссылка на предложение

https://discord.com/channels/617003227182792704/755125334097133628/1278225797471014963

Демонстрация изменений

image

Тесты

Распечатал канистру в протолате.
Сбросил привязанные счета.
Добавил к канистре счет станции.
Добавил счет своей куклы с другим весом. Доли расчитались правильно.
Поменял тип платы автомата на кастомат.
Собрал кастомат
Разобрал
Раскрутил, попробовал запихать предмет отрицательной цены. Цена поставилась 0.
Попробовал запихать предмет цены больше миллиона. Цена поставилась 1000000
Попробовал купить без денег и с деньгами. Ничего не продалась т.к. панель открыта.
Совершил покупку, кредиты начислились на нужный счет.
Попереключал быстрый режим, по запихивал разные предметы в разных состояниях.
Побил предметами с разным дамагом. Громкость пиликанья при ударе отличается.
Заблокировал кастомат, попробовал разобрать ломом и вставить предмет. Провально.
Разблокировал.
Емагнул, все стало бесплатным.
Вставил новый предмет в емагнутый автомат, цена 0.
Бахнул эми, кастомат отрубился.
Разобрал, содержимое выпало.
Сломал, содержимое выпало.

@github-actions github-actions bot added Merge Conflict This doesn't seem right DMI Affects DMI files TGUI Affects TGUI javascript Pull requests that update Javascript code and removed Merge Conflict This doesn't seem right labels Sep 2, 2024
@Anorak2024 Anorak2024 marked this pull request as ready for review September 3, 2024 14:15
Bizzonium added a commit that referenced this pull request Sep 14, 2024
commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
Bizzonium added a commit that referenced this pull request Sep 15, 2024
commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
@Anorak2024
Copy link
Contributor Author

QA Михаил снова на звязи Всё тестилось в ветке TestMerge:

  1. Если открыто меню настройки привязанных счетов и из рук выбили/клоун заробастил и т.д. меню остаётся активным и можно силой разума с другой части станции установить нужный счёт.
  2. По ТЗ : "Добавить 2 те кубические фигни в ассистентскую раундстартом. " - не увидел в коммитах этого и на самой карте
  3. По ТЗ : " Добавить в карго, в разделе Vending заказ "Custommate resupply canister" с двумя кубичискими фигнями для автоматов. Цена - 30 каргопоинтов." - аналогично нет
  4. Отрицательный вес доли можем добавить. Работает как положительный, но всё равно бы ограничить(если сложно, то игнорируй, по мне так не критично)
  5. С звуком при ударе:
    При кидании предметов - 0 реакции
    При расстреле с винтовки - 0 реакции
    При ударе с руки/вещью в ближнем бое- АЛЯРМ
    5.1 При множественном ударе звуки накладываются друг на друга, получается какофония (если так и задумывалось, то скип)
  6. Доёб до названий, в протолате - "Customat Caniter", в руке "Торговый автомат с уникальным содержимым restocking unit", выглядит так себе. По мне так должно быть хотяб "Customat restocking unit"
  7. Infinite money glitch - Делаем доли равными, продаём за 1, и получается, что на оба аккаунта перешло по 1(1 = 2 🤔).
  8. Не понял как работает доставка по трубам, сетап на картинке:
    изображение
    По итогу вещи просто выплёвываются (пингануть с объяснением, мб что-то не так сделал), под автоматом "Disposal trunk that goes up" В автомате продаётся 1 лист метала, 1 фонарик закидывал по 1 листу и фонарику(по отдельности и вместе)
  9. Минорные вещи:
    У открытого кастомата не видно продающиеся вещи(ожидал окно побольше, чтобы было видно хотяб 5 позиций), не видно юзера и баланс, как у других автоматов
    изображение
    изображение
    При настройке канистры, в названии окна не видно "счетов", обрываем на "привязанных"
    изображение

Общее впечатление - отличная вещь 👍 , но нужны доработки

2 - Я мапить не умею, как пр зальют найду кого-то конкретно для этого.
4 - Там норм, ограничения выставляются. При введении числа ниже, оно ставится на минимум, числа больше - на максимум.
8 - Все правильно, забыл доделать когда заливал. :) Щас работает.

Остальное вроде исправил.

@DefaultMihail
Copy link

DefaultMihail commented Sep 16, 2024

QA Михаил на связи, обеденный просмотр(тестил на ветке Anorak2024:Customate)

  1. Трубы:
    Продаём 25 кабеля за 1 рубль
    В трубы пихаем 30 кабеля
    В автомате видим прибавление, пытаемся купить
    Runtime:
    изображение

  2. Непонятка с стакающимися вещами.(выглядит сложно, можно забить)
    Я засунул на продажу 5 ед кабеля за 1, докинул 25 кабеля. Показывает 2 in stock
    Покупаю оба за одну цену, получаю обратно 30 кабеля(5+25)
    Тут вопрос, должно ли как-то пересчитываться кол-во in stock для стакающихся итемов или похуй(выглядит как похуй)

Ранее указанное пофикшено

@Anorak2024
Copy link
Contributor Author

QA Михаил на связи, обеденный просмотр(тестил на ветке Anorak2024:Customate)

  1. Трубы:
    Продаём 25 кабеля за 1 рубль
    В трубы пихаем 30 кабеля
    В автомате видим прибавление, пытаемся купить
    Runtime:
    изображение
  2. Непонятка с стакающимися вещами.(выглядит сложно, можно забить)
    Я засунул на продажу 5 ед кабеля за 1, докинул 25 кабеля. Показывает 2 in stock
    Покупаю оба за одну цену, получаю обратно 30 кабеля(5+25)
    Тут вопрос, должно ли как-то пересчитываться кол-во in stock для стакающихся итемов или похуй(выглядит как похуй)

Ранее указанное пофикшено

  1. Хз, сам рантайм не смог вызвать делая те же действия, но нашел другую багу при таком наборе действий. Возможно она как-то неявно вызывала рантайм.
  2. Фича. По ТЗ предметы пихаются в одну стопку при одинаковом названии и одинаковой цене. Типо если тулбокс назвать проводом, он запихнется в стопку к проводам.

@Anorak2024
Copy link
Contributor Author

@Bizzonium, тут пара багфиксов готовы. Их же тоже надо потестмержить? Ну, на всякий случай пингую.

Bizzonium added a commit that referenced this pull request Sep 17, 2024
commit 7fa5fb5
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 21:08:05 2024 +0300

    bugfix 3

commit 261b192
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:06:38 2024 +0300

    rebuild tgui

commit 0432132
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:02:49 2024 +0300

    codestyle tgui

commit 6543f8f
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:00:22 2024 +0300

    forgot tgui.but

commit f719655
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 10:52:33 2024 +0300

    bugfix 2

commit d27d11b
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 15 10:05:18 2024 +0300

    bugfix 1

commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
@Anorak2024
Copy link
Contributor Author

Bizzonium added a commit that referenced this pull request Sep 22, 2024
commit 213f9c7
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 14:07:21 2024 +0300

    fsdfs

commit 7fa5fb5
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 21:08:05 2024 +0300

    bugfix 3

commit 261b192
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:06:38 2024 +0300

    rebuild tgui

commit 0432132
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:02:49 2024 +0300

    codestyle tgui

commit 6543f8f
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:00:22 2024 +0300

    forgot tgui.but

commit f719655
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 10:52:33 2024 +0300

    bugfix 2

commit d27d11b
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 15 10:05:18 2024 +0300

    bugfix 1

commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
@Anorak2024
Copy link
Contributor Author

@Bizzonium, оверлеи починил, повысил слоты до 60.

Bizzonium added a commit that referenced this pull request Sep 23, 2024
commit 12b1f39
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 23:04:19 2024 +0300

    overlays

commit a123535
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 20:58:55 2024 +0300

    fdsfds

commit 213f9c7
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 14:07:21 2024 +0300

    fsdfs

commit 7fa5fb5
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 21:08:05 2024 +0300

    bugfix 3

commit 261b192
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:06:38 2024 +0300

    rebuild tgui

commit 0432132
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:02:49 2024 +0300

    codestyle tgui

commit 6543f8f
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:00:22 2024 +0300

    forgot tgui.but

commit f719655
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 10:52:33 2024 +0300

    bugfix 2

commit d27d11b
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 15 10:05:18 2024 +0300

    bugfix 1

commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
Bizzonium added a commit that referenced this pull request Sep 25, 2024
commit 12b1f39
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 23:04:19 2024 +0300

    overlays

commit a123535
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 20:58:55 2024 +0300

    fdsfds

commit 213f9c7
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 14:07:21 2024 +0300

    fsdfs

commit 7fa5fb5
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 21:08:05 2024 +0300

    bugfix 3

commit 261b192
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:06:38 2024 +0300

    rebuild tgui

commit 0432132
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:02:49 2024 +0300

    codestyle tgui

commit 6543f8f
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:00:22 2024 +0300

    forgot tgui.but

commit f719655
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 10:52:33 2024 +0300

    bugfix 2

commit d27d11b
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 15 10:05:18 2024 +0300

    bugfix 1

commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
Bizzonium added a commit that referenced this pull request Sep 28, 2024
commit 12b1f39
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 23:04:19 2024 +0300

    overlays

commit a123535
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 20:58:55 2024 +0300

    fdsfds

commit 213f9c7
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 14:07:21 2024 +0300

    fsdfs

commit 7fa5fb5
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 21:08:05 2024 +0300

    bugfix 3

commit 261b192
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:06:38 2024 +0300

    rebuild tgui

commit 0432132
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:02:49 2024 +0300

    codestyle tgui

commit 6543f8f
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:00:22 2024 +0300

    forgot tgui.but

commit f719655
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 10:52:33 2024 +0300

    bugfix 2

commit d27d11b
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 15 10:05:18 2024 +0300

    bugfix 1

commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
Bizzonium added a commit that referenced this pull request Sep 29, 2024
commit 12b1f39
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 23:04:19 2024 +0300

    overlays

commit a123535
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 20:58:55 2024 +0300

    fdsfds

commit 213f9c7
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 14:07:21 2024 +0300

    fsdfs

commit 7fa5fb5
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 21:08:05 2024 +0300

    bugfix 3

commit 261b192
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:06:38 2024 +0300

    rebuild tgui

commit 0432132
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:02:49 2024 +0300

    codestyle tgui

commit 6543f8f
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:00:22 2024 +0300

    forgot tgui.but

commit f719655
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 10:52:33 2024 +0300

    bugfix 2

commit d27d11b
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 15 10:05:18 2024 +0300

    bugfix 1

commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
Bizzonium added a commit that referenced this pull request Sep 29, 2024
commit 12b1f39
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 23:04:19 2024 +0300

    overlays

commit a123535
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 20:58:55 2024 +0300

    fdsfds

commit 213f9c7
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 14:07:21 2024 +0300

    fsdfs

commit 7fa5fb5
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 21:08:05 2024 +0300

    bugfix 3

commit 261b192
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:06:38 2024 +0300

    rebuild tgui

commit 0432132
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:02:49 2024 +0300

    codestyle tgui

commit 6543f8f
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:00:22 2024 +0300

    forgot tgui.but

commit f719655
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 10:52:33 2024 +0300

    bugfix 2

commit d27d11b
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 15 10:05:18 2024 +0300

    bugfix 1

commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
Bizzonium added a commit that referenced this pull request Oct 1, 2024
commit 12b1f39
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 23:04:19 2024 +0300

    overlays

commit a123535
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 20:58:55 2024 +0300

    fdsfds

commit 213f9c7
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 14:07:21 2024 +0300

    fsdfs

commit 7fa5fb5
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 21:08:05 2024 +0300

    bugfix 3

commit 261b192
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:06:38 2024 +0300

    rebuild tgui

commit 0432132
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:02:49 2024 +0300

    codestyle tgui

commit 6543f8f
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:00:22 2024 +0300

    forgot tgui.but

commit f719655
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 10:52:33 2024 +0300

    bugfix 2

commit d27d11b
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 15 10:05:18 2024 +0300

    bugfix 1

commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
Bizzonium added a commit that referenced this pull request Oct 1, 2024
commit 12b1f39
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 23:04:19 2024 +0300

    overlays

commit a123535
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 20:58:55 2024 +0300

    fdsfds

commit 213f9c7
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 14:07:21 2024 +0300

    fsdfs

commit 7fa5fb5
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 21:08:05 2024 +0300

    bugfix 3

commit 261b192
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:06:38 2024 +0300

    rebuild tgui

commit 0432132
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:02:49 2024 +0300

    codestyle tgui

commit 6543f8f
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:00:22 2024 +0300

    forgot tgui.but

commit f719655
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 10:52:33 2024 +0300

    bugfix 2

commit d27d11b
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 15 10:05:18 2024 +0300

    bugfix 1

commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
Bizzonium added a commit that referenced this pull request Oct 3, 2024
commit 12b1f39
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 23:04:19 2024 +0300

    overlays

commit a123535
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 20:58:55 2024 +0300

    fdsfds

commit 213f9c7
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 14:07:21 2024 +0300

    fsdfs

commit 7fa5fb5
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 21:08:05 2024 +0300

    bugfix 3

commit 261b192
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:06:38 2024 +0300

    rebuild tgui

commit 0432132
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:02:49 2024 +0300

    codestyle tgui

commit 6543f8f
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:00:22 2024 +0300

    forgot tgui.but

commit f719655
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 10:52:33 2024 +0300

    bugfix 2

commit d27d11b
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 15 10:05:18 2024 +0300

    bugfix 1

commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
Bizzonium added a commit that referenced this pull request Oct 3, 2024
commit 12b1f39
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 23:04:19 2024 +0300

    overlays

commit a123535
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 20:58:55 2024 +0300

    fdsfds

commit 213f9c7
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 22 14:07:21 2024 +0300

    fsdfs

commit 7fa5fb5
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 21:08:05 2024 +0300

    bugfix 3

commit 261b192
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:06:38 2024 +0300

    rebuild tgui

commit 0432132
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:02:49 2024 +0300

    codestyle tgui

commit 6543f8f
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 11:00:22 2024 +0300

    forgot tgui.but

commit f719655
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 16 10:52:33 2024 +0300

    bugfix 2

commit d27d11b
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 15 10:05:18 2024 +0300

    bugfix 1

commit df021ab
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 10 17:16:21 2024 +0300

    max 50 -> 30 items inside

commit 2fecdad
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:28:35 2024 +0300

    bugfix

commit 1aee12c
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:09:10 2024 +0300

    icon2base64 out of "[   ]"

commit e6c3dde
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 23:06:59 2024 +0300

    comments

commit 844c53d
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:08:21 2024 +0300

    del outdate comments

commit 13be4c9
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:05:18 2024 +0300

    rodeon2

commit 1f188a0
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 22:00:13 2024 +0300

    rodeon

commit e4b8849
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:07:48 2024 +0300

    bugfix

commit cfa28ae
Author: Anorak2024 <[email protected]>
Date:   Wed Sep 4 15:05:08 2024 +0300

    bugfix

commit 5071b5d
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 18:48:12 2024 +0300

    baloon -> russian

commit efb581d
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:21:00 2024 +0300

    bundle

commit db6ab38
Merge: 3a5cf87 d5523e9
Author: ROdenFL <[email protected]>
Date:   Tue Sep 3 17:20:04 2024 +0300

    Merge branch 'master220' into Customate

commit 3a5cf87
Author: Anorak2024 <[email protected]>
Date:   Tue Sep 3 17:14:25 2024 +0300

    похуй, реди фор ревью

commit e13f9c2
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:43:58 2024 +0300

    lhu8hlhhui

commit f89b766
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 23:27:20 2024 +0300

    mnbmbmnb

commit 3b159ff
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 21:26:32 2024 +0300

    hdkfhjkhjk

commit fac0c2c
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 20:35:01 2024 +0300

    смчсчмсч

commit bf1f081
Author: Anorak2024 <[email protected]>
Date:   Mon Sep 2 16:57:59 2024 +0300

    dsfsds

commit 9acf0d0
Author: Anorak2024 <[email protected]>
Date:   Sun Sep 1 09:53:55 2024 +0300

    вывыывы

commit 9f382a2
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:58:41 2024 +0300

    jhgkjmkhmgk

commit 2e82e74
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:54:54 2024 +0300

    выыавыаывав

commit 2e12b3d
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:51:33 2024 +0300

    add:customat

commit e39ff30
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 23:38:47 2024 +0300

    аывпавпы

commit b45189a
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 30 11:23:11 2024 +0300

    asfdasdfsdaf

commit ed51def
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 29 11:19:11 2024 +0300

    врвапрваыап

commit b2f0c36
Author: Anorak2024 <[email protected]>
Date:   Mon Aug 26 17:05:18 2024 +0300

    213

commit 68fb23b
Author: Anorak2024 <[email protected]>
Date:   Sat Aug 24 10:08:40 2024 +0300

    1232123

commit 3c70f80
Author: Anorak2024 <[email protected]>
Date:   Fri Aug 23 10:27:01 2024 +0300

    123

commit b4b0f0b
Merge: 651ab16 a21eb2b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 22:42:49 2024 +0300

    Merge branch 'master220' of https://github.com/Anorak2024/Paradise into master220

commit 651ab16
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:18:43 2024 +0300

    Revert "bugfix"

    This reverts commit 790176b.

commit fd908fd
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 11:17:30 2024 +0300

    Revert "12312321"

    This reverts commit 1d87a2f.

commit 1d87a2f
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:49:05 2024 +0300

    12312321

commit 790176b
Author: Anorak2024 <[email protected]>
Date:   Thu Aug 22 10:47:11 2024 +0300

    bugfix
@Bizzonium Bizzonium merged commit 4db3542 into ss220-space:master220 Oct 5, 2024
11 checks passed
@Bizzonium Bizzonium removed the testmerge This PR is being tested right now on live test servers. label Oct 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DMI Affects DMI files javascript Pull requests that update Javascript code TGUI Affects TGUI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants