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

Фантом, ревенант и вообще всякая паранормальщина #644

Open
wants to merge 544 commits into
base: master
Choose a base branch
from
Open

Фантом, ревенант и вообще всякая паранормальщина #644

wants to merge 544 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on May 21, 2024

  1. Merge pull request AdventureTimeSS14#717 from xtray85/remove_gamma_ar… 

    …mory

remove_gamma_armory
    @Schrodinger71
    Schrodinger71 authored May 21, 2024
    Configuration menu
    Copy the full SHA
    c283887 View commit details
    Browse the repository at this point in the history

  2. Merge pull request AdventureTimeSS14#710 from Lonkuk/unsleepyEnemies 

    Удаление мобам "Мерзости" c экспедиции возможности сна
    @Schrodinger71
    Schrodinger71 authored May 21, 2024
    Configuration menu
    Copy the full SHA
    56027fc View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Merge pull request AdventureTimeSS14#714 from Us3rn4me228/learned_spells 

    Добавление системы сразу изученных спеллов
    @Schrodinger71
    Schrodinger71 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    8c8fd3b View commit details
    Browse the repository at this point in the history

  2. resolve stupid things

    @1Stepka1
    1Stepka1 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    b78d285 View commit details
    Browse the repository at this point in the history

  3. resolve stupid things

    @1Stepka1
    1Stepka1 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    e5a6b36 View commit details
    Browse the repository at this point in the history

  4. да вы заебали

    @1Stepka1
    1Stepka1 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    bbe52d8 View commit details
    Browse the repository at this point in the history

  5. pon

    @1Stepka1
    1Stepka1 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    422ae8b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into EntitiesSort

    @1Stepka1
    1Stepka1 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    88cce66 View commit details
    Browse the repository at this point in the history

  7. fucking abomination

    @1Stepka1
    1Stepka1 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    f623524 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'EntitiesSort' of https://github.com/1Stepka1/space_stat… 

    …ion_14 into EntitiesSort
    @1Stepka1
    1Stepka1 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    d881091 View commit details
    Browse the repository at this point in the history

  9. Merge pull request AdventureTimeSS14#704 from Ratyyy/resprites 

    Resprites
    @modern-nm
    modern-nm authored May 22, 2024
    Configuration menu
    Copy the full SHA
    694c165 View commit details
    Browse the repository at this point in the history

  10. resolve stupid things

    @1Stepka1
    1Stepka1 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    442b674 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into EntitiesSort

    @1Stepka1
    1Stepka1 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    cfaec44 View commit details
    Browse the repository at this point in the history

  12. resolve stupid thing

    @1Stepka1
    1Stepka1 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    384ca8d View commit details
    Browse the repository at this point in the history

  13. Merge branch 'EntitiesSort' of https://github.com/1Stepka1/space_stat… 

    …ion_14 into EntitiesSort
    @1Stepka1
    1Stepka1 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    e2cc24e View commit details
    Browse the repository at this point in the history

  14. Merge pull request AdventureTimeSS14#713 from 1Stepka1/EntitiesSort 

    Сортировка папки Entities
    @Schrodinger71
    Schrodinger71 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    390a720 View commit details
    Browse the repository at this point in the history

  15. с ума сойти можно, я надеюсь всё нормально.

    @JustKekc
    JustKekc committed May 22, 2024
    Configuration menu
    Copy the full SHA
    e0f147a View commit details
    Browse the repository at this point in the history

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

    @JustKekc
    JustKekc committed May 22, 2024
    Configuration menu
    Copy the full SHA
    3aa9d3f View commit details
    Browse the repository at this point in the history

  17. [add/tweak] Изменение и добавление новых кристаллов (AdventureTimeSS1… 

    …4#291)

Респрайт новых кристаллов и добавление кулоннов. Основная работа сделана Malanisa

- [x] Этот запрос был полностью завершён и мне **не** нужна помощь чтобы его закончить.
- [x] Я запускал локальный сервер со своими изменениями и внимательно всё протестировал.
- [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл.
- [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует.

![image](/attachments/2d60a3bc-e775-4c98-b38a-dcecb73d820d)
![image](/attachments/26b15d70-ba8f-4d56-adc9-e5001695051b)
![image](/attachments/7b29c983-539d-4cc4-99d0-9c1309a4bc8f)
![image](/attachments/dabf755f-cbb7-4d56-ae28-c9283e6ee022)
![image](/attachments/098b6958-f8fa-4525-9403-4d279c7c8b95)

:cl: Main work by Malanisa and fix's by NekoDar
- add: Добавлены средние кристаллы
- add: Добавлены маленькие кристаллы
- add: Добавлены осколки кристаллов
- add: Добавлены кулоны из кристаллов
- add: Добавлены сталагмиты
- tweak: Изменен спрайт обычных кристаллов

Reviewed-on: https://codeberg.org/Sirena/SS14-Sirena/pulls/291
    @Us3rn4me228
    Neko Dar authored and Us3rn4me228 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    6575da2 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'xtray85:master' into crystal

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    c762f46 View commit details
    Browse the repository at this point in the history

  19. fix_wintercoats

    @Schrodinger71
    Schrodinger71 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    bdae5ed View commit details
    Browse the repository at this point in the history

  20. ыаааааааааав

    @JustKekc
    JustKekc committed May 22, 2024
    Configuration menu
    Copy the full SHA
    7196eb7 View commit details
    Browse the repository at this point in the history

  21. Update meta.json

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    5be7294 View commit details
    Browse the repository at this point in the history

  22. Update meta.json

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    5201a7f View commit details
    Browse the repository at this point in the history

  23. Update meta.json

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    3abcaa1 View commit details
    Browse the repository at this point in the history

  24. Update meta.json

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    f35008f View commit details
    Browse the repository at this point in the history

  25. fix_map

    @Schrodinger71
    Schrodinger71 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    a6e6d64 View commit details
    Browse the repository at this point in the history

  26. Update meta.json

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    641d38e View commit details
    Browse the repository at this point in the history

  27. Update meta.json

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    cbd9e0e View commit details
    Browse the repository at this point in the history

  28. Update meta.json

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    1a42315 View commit details
    Browse the repository at this point in the history

  29. Update meta.json

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    34d43e0 View commit details
    Browse the repository at this point in the history

  30. Update meta.json

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    f4bb584 View commit details
    Browse the repository at this point in the history

  31. Update meta.json

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    f594301 View commit details
    Browse the repository at this point in the history

  32. Update meta.json

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    dd39e7c View commit details
    Browse the repository at this point in the history

  33. новый костюм горничной

    @Darkiich
    Darkiich committed May 22, 2024
    Configuration menu
    Copy the full SHA
    83b7b59 View commit details
    Browse the repository at this point in the history

  34. маленькие правки

    @Darkiich
    Darkiich committed May 22, 2024
    Configuration menu
    Copy the full SHA
    06a9a90 View commit details
    Browse the repository at this point in the history

  35. еще правки

    @Darkiich
    Darkiich committed May 22, 2024
    Configuration menu
    Copy the full SHA
    f933d0d View commit details
    Browse the repository at this point in the history

  36. Update meta.json

    @Darkiich
    Darkiich authored May 22, 2024
    Configuration menu
    Copy the full SHA
    6514e72 View commit details
    Browse the repository at this point in the history

  37. Merge branch 'gornichaya' of https://github.com/Darki255/wpfork into … 

    …gornichaya
    @Darkiich
    Darkiich committed May 22, 2024
    Configuration menu
    Copy the full SHA
    13b94c8 View commit details
    Browse the repository at this point in the history

  38. Revert "fix_map" 

    This reverts commit a6e6d64.
    @Schrodinger71
    Schrodinger71 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    a562a2e View commit details
    Browse the repository at this point in the history

  39. решен конфликт RSI Validator'a

    @Darkiich
    Darkiich committed May 22, 2024
    Configuration menu
    Copy the full SHA
    9f2bd04 View commit details
    Browse the repository at this point in the history

  40. нахер пустные папки с закоменченными файлами

    @Schrodinger71
    Schrodinger71 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    18d48f7 View commit details
    Browse the repository at this point in the history

  41. Merge pull request AdventureTimeSS14#723 from Darki255/gornichaya 

    новый костюм горничной
    @Schrodinger71
    Schrodinger71 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    7f3bb7c View commit details
    Browse the repository at this point in the history

  42. увеличил стату бензопилы

    @Darkiich
    Darkiich committed May 22, 2024
    Configuration menu
    Copy the full SHA
    950f610 View commit details
    Browse the repository at this point in the history

  43. бензопила в аплинке

    @Darkiich
    Darkiich committed May 22, 2024
    Configuration menu
    Copy the full SHA
    c6ea428 View commit details
    Browse the repository at this point in the history

  44. чейнжлог

    @Darkiich
    Darkiich committed May 22, 2024
    Configuration menu
    Copy the full SHA
    9293e94 View commit details
    Browse the repository at this point in the history

  45. old crystal shards 1984 

    Чтобы не мешались
    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    2cb2801 View commit details
    Browse the repository at this point in the history

  46. Merge branch 'master' into benz

    @Darkiich
    Darkiich authored May 22, 2024
    Configuration menu
    Copy the full SHA
    a04989c View commit details
    Browse the repository at this point in the history

  47. Update ChangelogADT.yml

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    2dfc910 View commit details
    Browse the repository at this point in the history

  48. Merge branch 'master' into crystal

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    16039f7 View commit details
    Browse the repository at this point in the history

  49. Update crystal_shard.yml

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    0b786e1 View commit details
    Browse the repository at this point in the history

  50. Update crystals.yml

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    ed38138 View commit details
    Browse the repository at this point in the history

  51. Update blue.yml

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    2116600 View commit details
    Browse the repository at this point in the history

  52. Update cyan.yml

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    d33240b View commit details
    Browse the repository at this point in the history

  53. Update blue.yml

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    22edb3c View commit details
    Browse the repository at this point in the history

  54. Update green.yml

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    a65dce7 View commit details
    Browse the repository at this point in the history

  55. Update grey.yml

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    939f892 View commit details
    Browse the repository at this point in the history

  56. Update orange.yml

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    cce86b9 View commit details
    Browse the repository at this point in the history

  57. Update pink.yml

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    8a9fb99 View commit details
    Browse the repository at this point in the history

  58. Update red.yml

    @Us3rn4me228
    Us3rn4me228 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    6535675 View commit details
    Browse the repository at this point in the history

  59. shards buff

    @Us3rn4me228
    Us3rn4me228 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    72191bc View commit details
    Browse the repository at this point in the history

  60. locale and changelog fix

    @Us3rn4me228
    Us3rn4me228 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    f26e32b View commit details
    Browse the repository at this point in the history

  61. mewps

    @Ratyyy @Schrodinger71
    Ratyyy authored and Schrodinger71 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    a95cfdb View commit details
    Browse the repository at this point in the history

  62. FIX

    @Us3rn4me228
    Us3rn4me228 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    3a36708 View commit details
    Browse the repository at this point in the history

  63. Новая антаг вещь

    @Darkiich
    Darkiich committed May 22, 2024
    Configuration menu
    Copy the full SHA
    e5fbe36 View commit details
    Browse the repository at this point in the history

  64. Merge branch 'master' into podnos

    @Darkiich
    Darkiich authored May 22, 2024
    Configuration menu
    Copy the full SHA
    8153d71 View commit details
    Browse the repository at this point in the history

  65. Merge branch 'BSH' of https://github.com/ITamiokiI/space_station into… 

    … blue_sheald
    @Schrodinger71
    Schrodinger71 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    e294563 View commit details
    Browse the repository at this point in the history

  66. Носки ОСЩ

    @Schrodinger71
    Schrodinger71 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    ce13057 View commit details
    Browse the repository at this point in the history

  67. Merge pull request AdventureTimeSS14#1 from Schrodinger71/blue_sheald 

    Blue sheald
    @ITamiokiI
    ITamiokiI authored May 22, 2024
    Configuration menu
    Copy the full SHA
    8c99479 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Merge pull request AdventureTimeSS14#720 from Us3rn4me228/crystal 

    Порт кристаллов с Сирены
    @Schrodinger71
    Schrodinger71 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    61707fe View commit details
    Browse the repository at this point in the history

  2. Фикс дубликата id: ADTClothingBeltAssault

    @Schrodinger71
    Schrodinger71 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    413d3b2 View commit details
    Browse the repository at this point in the history

  3. и ещё один дубликат..

    @Schrodinger71
    Schrodinger71 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    9150f1c View commit details
    Browse the repository at this point in the history

  4. id: JobADTBlueShieldOfficer дубликат

    @Schrodinger71
    Schrodinger71 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    6a8fb3b View commit details
    Browse the repository at this point in the history

  5. Update satchels.yml

    @Schrodinger71
    Schrodinger71 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    85875f8 View commit details
    Browse the repository at this point in the history

  6. роль юриста на картах

    @Darkiich
    Darkiich committed May 23, 2024
    Configuration menu
    Copy the full SHA
    177c8d6 View commit details
    Browse the repository at this point in the history

  7. Фикс невозможнгости получить красные кристаллы без щитспавна

    @Us3rn4me228
    Us3rn4me228 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    0f8a2e0 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'xtray85:master' into crystal

    @Us3rn4me228
    Us3rn4me228 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    67bcfa1 View commit details
    Browse the repository at this point in the history

  9. Merge pull request AdventureTimeSS14#727 from Us3rn4me228/crystal 

    Фикс красных кристаллов
    @Schrodinger71
    Schrodinger71 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    ba4e266 View commit details
    Browse the repository at this point in the history

  10. Вернул текстуры

    @Schrodinger71
    Schrodinger71 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    dd52a35 View commit details
    Browse the repository at this point in the history

  11. Майор РХБЗЗ

    @Darkiich
    Darkiich committed May 23, 2024
    Configuration menu
    Copy the full SHA
    b59b439 View commit details
    Browse the repository at this point in the history

  12. немного переместил лодаут

    @Darkiich
    Darkiich committed May 23, 2024
    Configuration menu
    Copy the full SHA
    30cd30a View commit details
    Browse the repository at this point in the history

  13. fix

    @Schrodinger71
    Schrodinger71 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    e9ad072 View commit details
    Browse the repository at this point in the history

  14. Added Manual Anomaly Finder (AdventureTimeSS14#40) 

    Добавлен Р.П.А. - ручной поисковик аномалий (by That_is_not_Sloni122). Пинпоинтер, что указывает на все сущности с компонентом `Anomaly`. Также он добавлен в шкаф научрука. А ещё добавлена триторская цель на него.

*P.S. сборка не проверялась. Тесты не проводились.*

Co-authored-by: kingmonkeyx <kingmonkeyx@email>
Reviewed-on: https://codeberg.org/NekoDar/SS14-Sirena/pulls/40
Co-authored-by: kingmonkeyx <kingmonkeyx@noreply.codeberg.org>
Co-committed-by: kingmonkeyx <kingmonkeyx@noreply.codeberg.org>
    @Us3rn4me228
    2 people authored and Us3rn4me228 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    d5129af View commit details
    Browse the repository at this point in the history

  15. не используйте - type: BasicEntityAmmoProvider

    @Schrodinger71
    Schrodinger71 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    81d2340 View commit details
    Browse the repository at this point in the history

  16. Merge pull request AdventureTimeSS14#722 from Schrodinger71/fix_test 

    Fix build tests
    @Schrodinger71
    Schrodinger71 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    47b94ed View commit details
    Browse the repository at this point in the history

  17. фикс РПА и его респрайт

    @Us3rn4me228
    Us3rn4me228 committed May 23, 2024
    Configuration menu
    Copy the full SHA
    e5b62b6 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. fixes

    @Us3rn4me228
    Us3rn4me228 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    d8e1a01 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'xtray85:master' into anomaly_pinpointer

    @Us3rn4me228
    Us3rn4me228 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    e66a3a6 View commit details
    Browse the repository at this point in the history

  3. Update ChangelogADT.yml

    @Us3rn4me228
    Us3rn4me228 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    b4c3abc View commit details
    Browse the repository at this point in the history

  4. Update ChangelogADT.yml

    @Us3rn4me228
    Us3rn4me228 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    df9702e View commit details
    Browse the repository at this point in the history

  5. fix

    @Us3rn4me228
    Us3rn4me228 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    6b259ca View commit details
    Browse the repository at this point in the history

  6. Merge branch 'anomaly_pinpointer' of https://github.com/Us3rn4me228/s… 

    …pace_station into anomaly_pinpointer
    @Us3rn4me228
    Us3rn4me228 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    8c07687 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into podnos

    @Schrodinger71
    Schrodinger71 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    c8bbb27 View commit details
    Browse the repository at this point in the history

  8. Merge pull request AdventureTimeSS14#726 from Darki255/karta 

    роль юриста на картах
    @Schrodinger71
    Schrodinger71 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    d32f377 View commit details
    Browse the repository at this point in the history

  9. Update ChangelogADT.yml

    @Schrodinger71
    Schrodinger71 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    09e15c7 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into benz

    @Schrodinger71
    Schrodinger71 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    bf3acfb View commit details
    Browse the repository at this point in the history

  11. Fix YAMLiner

    @Schrodinger71
    Schrodinger71 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    ecac7ac View commit details
    Browse the repository at this point in the history

  12. Сортировка Entities

    @Schrodinger71
    Schrodinger71 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    43d2c9e View commit details
    Browse the repository at this point in the history

  13. Delete Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/iron_t… 

    …ray_knife.yml
    @Schrodinger71
    Schrodinger71 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    c518f42 View commit details
    Browse the repository at this point in the history

  14. Merge pull request AdventureTimeSS14#728 from Darki255/maiorcburn 

    ERT роль Майор РХБЗЗ
    @Schrodinger71
    Schrodinger71 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    203f0bf View commit details
    Browse the repository at this point in the history

  15. Merge pull request AdventureTimeSS14#724 from Darki255/benz 

    [ЗАКАЗ] Даем бензопиле новую жизнь
    @Schrodinger71
    Schrodinger71 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    4f561d6 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' into podnos

    @Schrodinger71
    Schrodinger71 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    eb3b97e View commit details
    Browse the repository at this point in the history

  17. Merge pull request AdventureTimeSS14#725 from Darki255/podnos 

    Новая антаг вещь
    @Schrodinger71
    Schrodinger71 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    2e3746e View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' into anomaly_pinpointer

    @Schrodinger71
    Schrodinger71 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    7b58e96 View commit details
    Browse the repository at this point in the history

  19. исправляем ошибку с uid 0 на картах

    @Schrodinger71
    Schrodinger71 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    3ff3c21 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2024

  1. conflict fix

    @Us3rn4me228
    Us3rn4me228 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    7bfa966 View commit details
    Browse the repository at this point in the history

  2. Brigmedic rofls (Not finished)

    @ITamiokiI
    ITamiokiI committed May 25, 2024
    Configuration menu
    Copy the full SHA
    c732890 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2024

  1. Merge pull request AdventureTimeSS14#729 from Us3rn4me228/anomaly_pin… 

    …pointer

Порт Р.П.А. с Сирены
    @Schrodinger71
    Schrodinger71 authored May 26, 2024
    Configuration menu
    Copy the full SHA
    967b996 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Merge pull request AdventureTimeSS14#730 from Schrodinger71/fix_map 

    [Fix] Исправляем ошибку с uid 0 на картах
    @Schrodinger71
    Schrodinger71 authored May 27, 2024
    Configuration menu
    Copy the full SHA
    2f231a4 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Добавление противогаза старшего инженера, изменение локализации, соде… 

    …ржания шкафа СИ, заданий вора.
    @Alazell
    Alazell committed May 28, 2024
    Configuration menu
    Copy the full SHA
    7de9fe1 View commit details
    Browse the repository at this point in the history

  2. ПАТЧ (теперь работает задача вора на кражу маски)

    @Alazell
    Alazell committed May 28, 2024
    Configuration menu
    Copy the full SHA
    e26c82d View commit details
    Browse the repository at this point in the history

  3. ПАТЧ (теперь в принципе работает противогаз-защита)

    @Alazell
    Alazell committed May 28, 2024
    Configuration menu
    Copy the full SHA
    3614523 View commit details
    Browse the repository at this point in the history

  4. Ещё немного поправил у маски СИ защиту

    @Alazell
    Alazell committed May 28, 2024
    Configuration menu
    Copy the full SHA
    1e22eef View commit details
    Browse the repository at this point in the history

  5. Да, я торопливый огузок..

    @Alazell
    Alazell committed May 28, 2024
    Configuration menu
    Copy the full SHA
    a6fff42 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. добавляем контрибьютеров и попытка фикса визора 

    Signed-off-by: Schrodinger71 <sanya.podshibyakin@mail.ru>
    @Schrodinger71
    Schrodinger71 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    5a21fdc View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Merge branch 'уааааааааааааааааааа' of https://github.com/JustKekc/sp… 

    …ace_station-like-third into уааааааааааааааааааа
    @JustKekc
    JustKekc committed May 30, 2024
    Configuration menu
    Copy the full SHA
    ba86a90 View commit details
    Browse the repository at this point in the history

  2. ываваываыв. ЫВ.

    @JustKekc
    JustKekc committed May 30, 2024
    Configuration menu
    Copy the full SHA
    dadeae2 View commit details
    Browse the repository at this point in the history

  3. убрал мщ у парамеда и атмоса, км и НР не будут антагами. парамед и ат… 

    …мос будут антагами
    @Darkiich
    Darkiich committed May 30, 2024
    Configuration menu
    Copy the full SHA
    b54383e View commit details
    Browse the repository at this point in the history

  4. чейнджлог

    @Darkiich
    Darkiich committed May 30, 2024
    Configuration menu
    Copy the full SHA
    a44ed5a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into msh

    @Darkiich
    Darkiich authored May 30, 2024
    Configuration menu
    Copy the full SHA
    4590c57 View commit details
    Browse the repository at this point in the history

  6. Update ChangelogADT.yml

    @Darkiich
    Darkiich authored May 30, 2024
    Configuration menu
    Copy the full SHA
    61c6cc5 View commit details
    Browse the repository at this point in the history

  7. localisation

    @Lonkuk
    Lonkuk committed May 30, 2024
    Configuration menu
    Copy the full SHA
    c5d5c1a View commit details
    Browse the repository at this point in the history

  8. bag

    @Lonkuk
    Lonkuk committed May 30, 2024
    Configuration menu
    Copy the full SHA
    c5e65c5 View commit details
    Browse the repository at this point in the history

  9. A

    @Lonkuk
    Lonkuk committed May 30, 2024
    Configuration menu
    Copy the full SHA
    f121575 View commit details
    Browse the repository at this point in the history

  10. Атмос с МШ и без антажки

    @Schrodinger71
    Schrodinger71 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    1abede1 View commit details
    Browse the repository at this point in the history

  11. #- id: JawsOfLife # Парамед теперь без МЩ и может быть антагом

    @Schrodinger71
    Schrodinger71 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    c63e370 View commit details
    Browse the repository at this point in the history

  12. Update duffelbag.yml

    @Schrodinger71
    Schrodinger71 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    3353571 View commit details
    Browse the repository at this point in the history

  13. Update satchel.yml

    @Schrodinger71
    Schrodinger71 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    d4d00dc View commit details
    Browse the repository at this point in the history

  14. Update atmospheric_technician.yml

    @Schrodinger71
    Schrodinger71 authored May 30, 2024
    Configuration menu
    Copy the full SHA
    95ed12d View commit details
    Browse the repository at this point in the history

  15. Новая заставка png во время загрузки клиента

    @Schrodinger71
    Schrodinger71 committed May 30, 2024
    Configuration menu
    Copy the full SHA
    80b3ced View commit details
    Browse the repository at this point in the history

  16. lobbyScreens

    @Lonkuk
    Lonkuk committed May 30, 2024
    Configuration menu
    Copy the full SHA
    250a29a View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Changelog correction

    @jungarikjan
    jungarikjan authored May 31, 2024
    Configuration menu
    Copy the full SHA
    c17a080 View commit details
    Browse the repository at this point in the history

  2. Update backpack - paramedic

    @jungarikjan
    jungarikjan authored May 31, 2024
    Configuration menu
    Copy the full SHA
    8902292 View commit details
    Browse the repository at this point in the history

  3. Update duffelbag - paramedic.yml

    @jungarikjan
    jungarikjan authored May 31, 2024
    Configuration menu
    Copy the full SHA
    93075ec View commit details
    Browse the repository at this point in the history

  4. Update paramedic - mindshield and noantag.yml

    @jungarikjan
    jungarikjan authored May 31, 2024
    Configuration menu
    Copy the full SHA
    0e4b1e9 View commit details
    Browse the repository at this point in the history

  5. Update satchel - paramed-jaws.yml

    @jungarikjan
    jungarikjan authored May 31, 2024
    Configuration menu
    Copy the full SHA
    752fbb1 View commit details
    Browse the repository at this point in the history

  6. Fixes

    @ITamiokiI
    ITamiokiI committed May 31, 2024
    Configuration menu
    Copy the full SHA
    74c35da View commit details
    Browse the repository at this point in the history

  7. Update EntityHealthBarOverlay.cs

    @Schrodinger71
    Schrodinger71 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    661f95b View commit details
    Browse the repository at this point in the history

  8. забыл using

    @Schrodinger71
    Schrodinger71 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    e8645d4 View commit details
    Browse the repository at this point in the history

  9. Fix

    @Schrodinger71
    Schrodinger71 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    5283e9b View commit details
    Browse the repository at this point in the history

  10. Merge branch 'fix_visor' of https://github.com/Schrodinger71/space_st… 

    …ation_ADT into fix_visor
    @Schrodinger71
    Schrodinger71 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    053195e View commit details
    Browse the repository at this point in the history

  11. briigigigigigimeidik

    @Ratyyy
    Ratyyy committed May 31, 2024
    Configuration menu
    Copy the full SHA
    850c3b5 View commit details
    Browse the repository at this point in the history

  12. Merge pull request AdventureTimeSS14#738 from Lonkuk/lobbyArts 

    Лобби экраны
    @Schrodinger71
    Schrodinger71 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    1aee3af View commit details
    Browse the repository at this point in the history

  13. Merge pull request AdventureTimeSS14#736 from Darki255/msh 

    Изменения МЩ и Изменения глав
    @Schrodinger71
    Schrodinger71 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    65c8994 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. MicroRoflFixes

    @ITamiokiI
    ITamiokiI committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    501536c View commit details
    Browse the repository at this point in the history

  2. Dmgfix

    @ITamiokiI
    ITamiokiI committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    3feec85 View commit details
    Browse the repository at this point in the history

  3. Texture changes

    @ITamiokiI
    ITamiokiI committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    13502af View commit details
    Browse the repository at this point in the history

  4. Fixes

    @ITamiokiI
    ITamiokiI committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    72b0cab View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into Brigmedic

    @ITamiokiI
    ITamiokiI authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    997fc28 View commit details
    Browse the repository at this point in the history

  6. Fixes

    @ITamiokiI
    ITamiokiI committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    20f0084 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'Brigmedic' of https://github.com/ITamiokiI/space_station … 

    …into Brigmedic
    @ITamiokiI
    ITamiokiI committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    debff4e View commit details
    Browse the repository at this point in the history

  8. Лютое изменение с одним словом

    @ITamiokiI
    ITamiokiI committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    d592ba9 View commit details
    Browse the repository at this point in the history

  9. sghj

    @ITamiokiI
    ITamiokiI committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    9ae9612 View commit details
    Browse the repository at this point in the history

  10. Ещё миграция

    @ITamiokiI
    ITamiokiI committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    6709029 View commit details
    Browse the repository at this point in the history

  11. перенос states меты плюшевая мио в ADT

    @Darkiich
    Darkiich committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    887bbd0 View commit details
    Browse the repository at this point in the history

  12. ГРЁБАНЫЕ КОРВАКСЫ

    @ITamiokiI
    ITamiokiI committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    f535155 View commit details
    Browse the repository at this point in the history

  13. ДА БЛЯЯЯЯЯЯТЬ

    @ITamiokiI
    ITamiokiI committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    bd72e8d View commit details
    Browse the repository at this point in the history

  14. перенос states меты и картинки шарика НТ в ADT

    @Darkiich
    Darkiich committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    40e8bc8 View commit details
    Browse the repository at this point in the history

  15. перенос states меты плюшевого голокарпа в ADT

    @Darkiich
    Darkiich committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    936308f View commit details
    Browse the repository at this point in the history

  16. пеоенос стейт меты и иконки меджик карпа в ADT

    @Darkiich
    Darkiich committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    e5b5043 View commit details
    Browse the repository at this point in the history

  17. перенос стейт меты и иконки шарика НТ в руках в ADT

    @Darkiich
    Darkiich committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    2775f23 View commit details
    Browse the repository at this point in the history

  18. перенос стейт меты и иконки радужного карпа в ADT

    @Darkiich
    Darkiich committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    9a9307e View commit details
    Browse the repository at this point in the history

  19. добавил к пути шарика НТ папку ADT и убрал не нужные states не в ADT

    @Darkiich
    Darkiich committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    d7c2bee View commit details
    Browse the repository at this point in the history

  20. фикс

    @Darkiich
    Darkiich committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    63ef9c5 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' into BSH

    @Schrodinger71
    Schrodinger71 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    3268721 View commit details
    Browse the repository at this point in the history

  22. Убрал дубликат в meta.json

    @Schrodinger71
    Schrodinger71 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    2a5a805 View commit details
    Browse the repository at this point in the history

  23. возможный фикс yaml лайнтер

    @Darkiich
    Darkiich committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    eaa7051 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'issue' of https://github.com/Darki255/wpfork into issue

    @Darkiich
    Darkiich committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    878dc2e View commit details
    Browse the repository at this point in the history

  25. тоже фикс

    @Darkiich
    Darkiich committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    19cc529 View commit details
    Browse the repository at this point in the history

  26. еще фиксик

    @Darkiich
    Darkiich committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    804c520 View commit details
    Browse the repository at this point in the history

  27. Merge pull request AdventureTimeSS14#741 from Darki255/issue 

    Issue
    @Schrodinger71
    Schrodinger71 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    f719964 View commit details
    Browse the repository at this point in the history

  28. Merge pull request AdventureTimeSS14#740 from ITamiokiI/Brigmedic 

    Rework Бригмедика. (Небольшой, не знаю можно ли это назвать реворком.)
    @Schrodinger71
    Schrodinger71 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    da554a1 View commit details
    Browse the repository at this point in the history

  29. Merge branch 'master' into уааааааааааааааааааа

    @Schrodinger71
    Schrodinger71 authored Jun 1, 2024
    Configuration menu
    Copy the full SHA
    5fd85b2 View commit details
    Browse the repository at this point in the history

  30. Пытаемся фиксить билд тест

    @Schrodinger71
    Schrodinger71 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    77d39c1 View commit details
    Browse the repository at this point in the history

  31. А если так?

    @Schrodinger71
    Schrodinger71 committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    7fd5a3f View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Правим

    @Schrodinger71
    Schrodinger71 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    7f81fd3 View commit details
    Browse the repository at this point in the history

  2. Правка имени в construction name`s

    @Schrodinger71
    Schrodinger71 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    438665e View commit details
    Browse the repository at this point in the history

  3. Fix YAMLiner

    @Schrodinger71
    Schrodinger71 authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    18fe63a View commit details
    Browse the repository at this point in the history

  4. слова закончились, закончились слова

    @JustKekc
    JustKekc committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    1b9ec9e View commit details
    Browse the repository at this point in the history

  5. Merge pull request AdventureTimeSS14#734 from Schrodinger71/fix_visor 

    Попытка фикса визора
    @Schrodinger71
    Schrodinger71 authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    624291b View commit details
    Browse the repository at this point in the history

  6. Merge pull request AdventureTimeSS14#739 from Schrodinger71/new_logo 

    Новая заставка png во время загрузки клиента
    @Schrodinger71
    Schrodinger71 authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    843ec8b View commit details
    Browse the repository at this point in the history

  7. Merge pull request AdventureTimeSS14#735 from JustKekc/уааааааааааааа… 

    …аааааа

уааааааааааааааааааа (конец конца маленького сервисного апдейта™)
    @Schrodinger71
    Schrodinger71 authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    7ab7562 View commit details
    Browse the repository at this point in the history

  8. Merge pull request AdventureTimeSS14#733 from Alazell/Chief-Engineer'… 

    …s-gas-mask

Chief engineer's gas mask
    @Schrodinger71
    Schrodinger71 authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    58d2b41 View commit details
    Browse the repository at this point in the history

  9. оно живое

    @JustKekc
    JustKekc committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    abd56d5 View commit details
    Browse the repository at this point in the history

  10. Merge pull request AdventureTimeSS14#742 from JustKekc/уааааааааааааа… 

    …аааааа

конечное дополнение к концу конца сервисного апдейта™
    @Schrodinger71
    Schrodinger71 authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    fb812fc View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Merge branch 'master' into BSH

    @ITamiokiI
    ITamiokiI authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    e65162b View commit details
    Browse the repository at this point in the history

  2. добавил строку - type: entity

    @Schrodinger71
    Schrodinger71 authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    41db3c7 View commit details
    Browse the repository at this point in the history

  3. Rofls

    @ITamiokiI
    ITamiokiI committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    4b5df39 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Merge branch 'BSH' of https://github.com/ITamiokiI/space_station into… 

    … BSH
    @ITamiokiI
    ITamiokiI committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    a3f3acf View commit details
    Browse the repository at this point in the history

  2. Fix impact effect

    @ITamiokiI
    ITamiokiI committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    7b98cbc View commit details
    Browse the repository at this point in the history

  3. Fuckoff

    @ITamiokiI
    ITamiokiI committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    5b77958 View commit details
    Browse the repository at this point in the history

  4. Lightfix

    @ITamiokiI
    ITamiokiI committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    ca1a4f4 View commit details
    Browse the repository at this point in the history

  5. Suka blyat

    @ITamiokiI
    ITamiokiI committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    99c846d View commit details
    Browse the repository at this point in the history

  6. Возвращаем крафт мех фабрикатора

    @Us3rn4me228
    Us3rn4me228 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    0a814f7 View commit details
    Browse the repository at this point in the history

  7. ТА ти заебав + Респрайт Чёрного берета.

    @ITamiokiI
    ITamiokiI committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    46d6e78 View commit details
    Browse the repository at this point in the history

  8. Suka

    @ITamiokiI
    ITamiokiI committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    4c40220 View commit details
    Browse the repository at this point in the history

  9. Merge pull request AdventureTimeSS14#744 from Us3rn4me228/mech-fix 

    Возвращаем крафт мех фабрикатора
    @Schrodinger71
    Schrodinger71 authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    2eb3b04 View commit details
    Browse the repository at this point in the history

  10. Revert "Возвращаем крафт мех фабрикатора"

    @Schrodinger71
    Schrodinger71 authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    3b2ea56 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Merge pull request AdventureTimeSS14#745 from xtray85/revert-744-mech… 

    …-fix

Revert "Возвращаем крафт мех фабрикатора"
    @Schrodinger71
    Schrodinger71 authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    6e9b012 View commit details
    Browse the repository at this point in the history

  2. Merge pull request AdventureTimeSS14#737 from Lonkuk/translator 

    Локализация аплинка и мелочей
    @Schrodinger71
    Schrodinger71 authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    1989675 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. fix

    @Ratyyy
    Ratyyy committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    c4064ef View commit details
    Browse the repository at this point in the history

  2. fix?

    @Ratyyy
    Ratyyy committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    314fddb View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. uhhh?

    @Ratyyy
    Ratyyy committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    00798fe View commit details
    Browse the repository at this point in the history

  2. Мммм... Попытка добавить книгу РНД

    @Bolper
    Bolper committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    be4fca7 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. uh?

    @Ratyyy
    Ratyyy committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    2ce8283 View commit details
    Browse the repository at this point in the history

  2. what if....

    @Ratyyy
    Ratyyy committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    b1c6be8 View commit details
    Browse the repository at this point in the history

  3. hmmm....

    @Ratyyy
    Ratyyy committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    89c0dd8 View commit details
    Browse the repository at this point in the history

  4. Update global.json

    @xtray85
    xtray85 authored Jun 9, 2024
    Configuration menu
    Copy the full SHA
    6c4c860 View commit details
    Browse the repository at this point in the history

  5. ADD changelog

    @ITamiokiI
    ITamiokiI committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    4e17bee View commit details
    Browse the repository at this point in the history

  6. Merge branch 'BSH' of https://github.com/ITamiokiI/space_station into… 

    … BSH
    @ITamiokiI
    ITamiokiI committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    c7c65a3 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. addded Mindshield for centcom and ert

    @nixsilvam404
    nixsilvam404 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    1ac7fbe View commit details
    Browse the repository at this point in the history

  2. added mindshied for ETR

    @nixsilvam404
    nixsilvam404 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    fcfb53c View commit details
    Browse the repository at this point in the history

  3. add plushie pochita

    @Schrodinger71
    Schrodinger71 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    5b629c3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'xtray85:master' into new_plushie

    @Schrodinger71
    Schrodinger71 authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    83fcfd2 View commit details
    Browse the repository at this point in the history

  5. minor Fix

    @Schrodinger71
    Schrodinger71 committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    eca67aa View commit details
    Browse the repository at this point in the history

  6. Merge pull request AdventureTimeSS14#748 from Schrodinger71/new_plushie 

    New plushie
    @Schrodinger71
    Schrodinger71 authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    6f8da30 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Merge pull request AdventureTimeSS14#747 from nixsilvam404/test_try 

    addded Mindshield for centcom and ert
    @Schrodinger71
    Schrodinger71 authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    3a71128 View commit details
    Browse the repository at this point in the history

  2. Merge pull request AdventureTimeSS14#705 from ITamiokiI/BSH 

    Rework Офицера Синего Щита
    @Schrodinger71
    Schrodinger71 authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    9a95663 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. еще конструкт добавил в секретку

    @Bolper
    Bolper committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    5b55f85 View commit details
    Browse the repository at this point in the history

  2. changed name of goal paper

    @nixsilvam404
    nixsilvam404 committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    fb58dcc View commit details
    Browse the repository at this point in the history

  3. changed colour of stamp on the goal paper

    @nixsilvam404
    nixsilvam404 committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    0083783 View commit details
    Browse the repository at this point in the history

  4. Merge pull request AdventureTimeSS14#2 from Bolper/bR 

    B r
    @Bolper
    Bolper authored Jun 16, 2024
    Configuration menu
    Copy the full SHA
    9c12b95 View commit details
    Browse the repository at this point in the history

  5. it`s okay

    @Bolper
    Bolper committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    e403b2f View commit details
    Browse the repository at this point in the history

  6. Merge pull request AdventureTimeSS14#753 from Bolper/Book 

    Book
    @Schrodinger71
    Schrodinger71 authored Jun 16, 2024
    Configuration menu
    Copy the full SHA
    b5fce97 View commit details
    Browse the repository at this point in the history

  7. Merge pull request AdventureTimeSS14#752 from nixsilvam404/goal_paper… 

    …_fix

fixed goal paper
    @Schrodinger71
    Schrodinger71 authored Jun 16, 2024
    Configuration menu
    Copy the full SHA
    795cc34 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. fix carpets lmao

    @Us3rn4me228
    Us3rn4me228 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    0f5baca View commit details
    Browse the repository at this point in the history

  2. Merge branch 'xtray85:master' into fix-carpets

    @Us3rn4me228
    Us3rn4me228 authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    9b5124d View commit details
    Browse the repository at this point in the history

  3. Merge pull request AdventureTimeSS14#756 from Us3rn4me228/fix-carpets 

    Fix carpets
    @Schrodinger71
    Schrodinger71 authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    37b13f0 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Добавление гемофилии

    @AnderFan
    AnderFan committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    dafc495 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. fix-beretCE

    @TORGOVEC471
    TORGOVEC471 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    3f1d2c6 View commit details
    Browse the repository at this point in the history

  2. Предпоследний апдейт ветки

    @FaDeOkno
    FaDeOkno committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    5e248d4 View commit details
    Browse the repository at this point in the history

  3. fix update console interface

    @modern-nm
    modern-nm committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    35ee45b View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2024

  1. new_posters

    @TORGOVEC471
    TORGOVEC471 committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    6e56ef6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request AdventureTimeSS14#762 from TORGOVEC471/bubgfix-eat… 

    …ing-SE-beret

fixed eating beret CE
    @modern-nm
    modern-nm authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    05da97e View commit details
    Browse the repository at this point in the history

  3. fixed my error

    @TORGOVEC471
    TORGOVEC471 committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    c1d8190 View commit details
    Browse the repository at this point in the history

  4. Merge pull request AdventureTimeSS14#764 from modern-nm/fix/update-co… 

    …nsole-interface

fix update console interface
    @modern-nm
    modern-nm authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    0422241 View commit details
    Browse the repository at this point in the history

  5. fixed the error with opened clockworck airlock

    @nixsilvam404
    nixsilvam404 committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    4b289d6 View commit details
    Browse the repository at this point in the history

  6. Merge pull request AdventureTimeSS14#766 from nixsilvam404/clockwork_… 

    …airlock_opened_err

fixed the error with opened clockworck airlock
    @modern-nm
    modern-nm authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    e31b8e3 View commit details
    Browse the repository at this point in the history

  7. "Документация" pt. 1

    @FaDeOkno
    FaDeOkno committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    00bc3ab View commit details
    Browse the repository at this point in the history

  8. fix

    @FaDeOkno
    FaDeOkno committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    76dd6b5 View commit details
    Browse the repository at this point in the history

  9. правка copyright в meta.json

    @Schrodinger71
    Schrodinger71 authored Jun 23, 2024
    Configuration menu
    Copy the full SHA
    75b5480 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Merge pull request AdventureTimeSS14#765 from TORGOVEC471/added_new_p… 

    …osters

added new posters
    @modern-nm
    modern-nm authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    d959d8a View commit details
    Browse the repository at this point in the history

  2. fix2

    @FaDeOkno
    FaDeOkno committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    066f294 View commit details
    Browse the repository at this point in the history

  3. Merge pull request AdventureTimeSS14#760 from AnderFan/hemophilia 

    Добавление гемофилии
    @Schrodinger71
    Schrodinger71 authored Jun 24, 2024
    Configuration menu
    Copy the full SHA
    5e361ed View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Merge branch 'phantom-and-revenant' of https://github.com/FaDeOkno/AD… 

    …T_main into help_kote_phantom
    @Schrodinger71
    Schrodinger71 committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    b44166d View commit details
    Browse the repository at this point in the history

  2. Fix YAMl validator, delete dublicate id

    @Schrodinger71
    Schrodinger71 authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    056e4a0 View commit details
    Browse the repository at this point in the history

  3. Update changeling.yml

    @Schrodinger71
    Schrodinger71 authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    5b8e994 View commit details
    Browse the repository at this point in the history

  4. Delete dublicate, fix yaml

    @Schrodinger71
    Schrodinger71 authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    f901ab0 View commit details
    Browse the repository at this point in the history

  5. ОПЯть чистим дубликаты

    @Schrodinger71
    Schrodinger71 authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    78ee83d View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Фикс Меты

    @Schrodinger71
    Schrodinger71 authored Jun 26, 2024
    Configuration menu
    Copy the full SHA
    7f6c71d View commit details
    Browse the repository at this point in the history