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

мердж с оффами #113

Closed
wants to merge 286 commits into from
Closed

мердж с оффами #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
286 commits
Select commit Hold shift + click to select a range
a9ab19b
Merge pull request #7 from CricketPop/master
MysticalFaceLesS Sep 16, 2023
1a360ca
возвращает утраченное оборудование на гиену
ILTSP Sep 17, 2023
3842e4a
Merge https://github.com/ChocoSS13/Shiptest
ILTSP Sep 17, 2023
1e552c7
Merge pull request #6 from StecemDamce/abc
MysticalFaceLesS Sep 18, 2023
253029c
Merge branch 'ChocoSS13:master' into master
ILTSP Sep 19, 2023
2ef0a69
Merge pull request #8 from ILTSP/master
MysticalFaceLesS Sep 19, 2023
3036c12
Бот-Утюг inteq
Mirag1993 Sep 19, 2023
e3ed549
Merge pull request #9 from Mirag1993/master
MysticalFaceLesS Sep 19, 2023
e8b2842
Revert "Merge pull request #8 from ILTSP/master"
Kiritsugu-tech Sep 19, 2023
9d60840
Update syndicate_gorlex_hyena.dmm
Mirag1993 Sep 20, 2023
1708af6
Ремора , синди шип от бобра и меня
Mirag1993 Sep 20, 2023
94a9e4c
Кораблик нейтралов Рамо
Mirag1993 Sep 20, 2023
fef13a4
Небольшой ремонт шлюза колоссуса
Mirag1993 Sep 20, 2023
aa86f4f
Небольшой апдейт корабля класса Рейнджер
Mirag1993 Sep 21, 2023
b5ebf9c
Бонг
RoyaltyRat Sep 22, 2023
67b9d13
Ящик конопли
RoyaltyRat Sep 22, 2023
9df17d5
Merge pull request #11 from Mirag1993/not_mastermind
RoyaltyRat Sep 22, 2023
d934142
Merge pull request #12 from Mirag1993/not_master_2
RoyaltyRat Sep 22, 2023
1077936
Merge pull request #13 from Mirag1993/not_master3
RoyaltyRat Sep 22, 2023
6cb8e56
Merge pull request #14 from Mirag1993/not_master5
RoyaltyRat Sep 22, 2023
a02f18e
Merge pull request #15 from warsaids/Test
MysticalFaceLesS Sep 22, 2023
99c4906
Новый корабль ЕРТ синдиката
Mirag1993 Sep 22, 2023
3c914ad
Обновление оутпостов
Mirag1993 Sep 22, 2023
092bd48
Фикс Твинклшайна
Mirag1993 Sep 22, 2023
a08e4dc
Merge pull request #18 from Mirag1993/not_master5
MysticalFaceLesS Sep 22, 2023
4da3f73
Merge pull request #17 from Mirag1993/not_master3
MysticalFaceLesS Sep 22, 2023
3d5b7df
Merge pull request #16 from Mirag1993/not_master_2
MysticalFaceLesS Sep 22, 2023
b7b4ba6
test
MysticalFaceLesS Sep 23, 2023
a731a70
Апдейт Ремора , Каас
Mirag1993 Sep 23, 2023
6b828ed
Изменена система оповещений.
MysticalFaceLesS Sep 23, 2023
f9a7205
Merge pull request #19 from Mirag1993/not_master1
RoyaltyRat Sep 23, 2023
f9909da
fix
MysticalFaceLesS Sep 23, 2023
f318606
Исправлен Readme
MysticalFaceLesS Sep 23, 2023
389f3b5
Апдейт корабля Лагуна
Mirag1993 Sep 23, 2023
706b621
Исправление дюпа реагентов у бонга.
RoyaltyRat Sep 24, 2023
bd4b5f2
Merge pull request #20 from Mirag1993/not_master2
RoyaltyRat Sep 24, 2023
e60c875
hub, изменение ссылок дис + гит
Kiritsugu-tech Sep 24, 2023
3846fa8
Merge commit 'e60c87559e9c85987ad751131d5772c057fe5918' into change-h…
Kiritsugu-tech Sep 24, 2023
d8522b1
Merge pull request #21 from warsaids/master
MysticalFaceLesS Sep 24, 2023
bdc7ad8
Merge pull request #22 from MysticalFaceLesS/change-hub-links
MysticalFaceLesS Sep 24, 2023
0f4d08a
Маленькие правки для ОСТОвского корабля KAAS-Class
ExTaZeR Sep 24, 2023
7e94214
tgs status выводит ckey игроков на сервере
Kiritsugu-tech Sep 24, 2023
bca8a28
Merge pull request #24 from MysticalFaceLesS/tgs-status-update
MysticalFaceLesS Sep 24, 2023
8036d4c
Merge pull request #23 from ExTaZeR/ExTaZeR-patch-1
MysticalFaceLesS Sep 24, 2023
4114684
LP Hardsuit Buff
Anonyhaze Sep 25, 2023
53511fd
Merge pull request #25 from yoursofthero/master
RoyaltyRat Sep 25, 2023
0130592
Апдейт конфига рамо , исправление багулины.
Mirag1993 Sep 25, 2023
74261ec
Ремонт реморы
Mirag1993 Sep 25, 2023
0eabd6b
Апдейт Рамо
Mirag1993 Sep 25, 2023
3b528d6
Апдейт Вела класс
Mirag1993 Sep 25, 2023
1d25571
Апдейт дельта - класс
Mirag1993 Sep 25, 2023
b93e498
Небольшой ремонт рейнджера по заявкам.
Mirag1993 Sep 25, 2023
befaffd
Merge pull request #26 from Mirag1993/Рамо
RoyaltyRat Sep 26, 2023
8943704
Merge pull request #27 from Mirag1993/Ремора
RoyaltyRat Sep 26, 2023
8aa1fc4
Merge pull request #28 from Mirag1993/Вела-класс
RoyaltyRat Sep 26, 2023
d2e7912
Merge pull request #29 from Mirag1993/Дельта-класс
RoyaltyRat Sep 26, 2023
faeb4d3
Merge pull request #30 from Mirag1993/Рейнджер---класс
RoyaltyRat Sep 26, 2023
6b305d1
port mime hardsuit
DuckNeMyDuck Sep 26, 2023
ad9338b
Обновление Реморы , заменены местами консоль камер и консоль связи с …
Mirag1993 Sep 26, 2023
b4e459e
Апдейт реморы
Mirag1993 Sep 26, 2023
730d090
Роли и маленькие правки
ExTaZeR Sep 26, 2023
de09239
Новый корабль Сантана
Mirag1993 Sep 26, 2023
10bdcf4
Merge pull request #31 from DuckNeMyDuck/port-mime-hardsuit
RoyaltyRat Sep 27, 2023
36d67ae
Merge pull request #32 from Mirag1993/Ремора-финал
ChocoSS13 Sep 27, 2023
b9b293c
Merge pull request #34 from Mirag1993/Сантина
ChocoSS13 Sep 27, 2023
2d2e830
Исправление проблем со спрайтами
RoyaltyRat Sep 28, 2023
56b629c
Новый кораблик Мимос
Mirag1993 Sep 28, 2023
97c1206
Починен синди и old крашеры
RoyaltyRat Sep 29, 2023
d1c9755
Merge pull request #36 from Mirag1993/Mimos
RoyaltyRat Sep 29, 2023
45c2deb
Merge pull request #35 from warsaids/Test
ChocoSS13 Sep 29, 2023
655c4d7
Merge branch 'master' of https://github.com/ExTaZeR/Shiptest into ExT…
Kiritsugu-tech Oct 1, 2023
a9726b2
Апдейт Мимоса
Mirag1993 Oct 1, 2023
06a61d4
Обновление Реморы
Mirag1993 Oct 1, 2023
d5664e9
Добавление двух новых пушек . Модификация кода , добавлены сигналы от…
Mirag1993 Oct 2, 2023
8b8bf69
Починка конфликта
RoyaltyRat Oct 3, 2023
c4d5965
Обновление сантианы
Mirag1993 Oct 3, 2023
7578a4c
Merge pull request #39 from Mirag1993/not_master1
RoyaltyRat Oct 4, 2023
2622272
Merge pull request #38 from Mirag1993/not_master2
RoyaltyRat Oct 4, 2023
c580809
Merge pull request #41 from Mirag1993/Сантина
RoyaltyRat Oct 4, 2023
4117451
Merge pull request #37 from MysticalFaceLesS/ExTaZeR-master
RoyaltyRat Oct 4, 2023
25b12f7
Попытка исправить конфликт номер 2
RoyaltyRat Oct 4, 2023
ecc5917
Merge branch 'g36sh' of https://github.com/Mirag1993/Shiptest-masterm…
Mirag1993 Oct 5, 2023
315f2f5
Merge pull request #40 from Mirag1993/g36sh
RoyaltyRat Oct 5, 2023
6a1d6dd
Добавление шахтерского шаттла класса Вентура
Mirag1993 Oct 5, 2023
2272aaa
Добавление щитспавн корабля Курк
Mirag1993 Oct 5, 2023
20ccdc5
WE GET POWER OF RESET
DuckNeMyDuck Oct 6, 2023
272f489
Merge pull request #44 from DuckNeMyDuck/a_raskladku_pomenyat
RoyaltyRat Oct 6, 2023
8590e81
Merge pull request #43 from Mirag1993/Курк
RoyaltyRat Oct 7, 2023
95c5789
Merge pull request #42 from Mirag1993/Вентура
RoyaltyRat Oct 7, 2023
1723cf5
Логи вайдбанда + фикс ошибок крашера
Mirag1993 Oct 8, 2023
b7a265c
Крафт выключателя света
Mirag1993 Oct 8, 2023
95c2aef
Merge pull request #45 from Mirag1993/Логи-вайдбанда
MysticalFaceLesS Oct 8, 2023
3912f69
Merge pull request #46 from Mirag1993/Крафт-выключателей-света
MysticalFaceLesS Oct 8, 2023
73eb423
Руины с оффов
Mirag1993 Oct 8, 2023
ffaf31a
intoTheSunset
DuckNeMyDuck Oct 8, 2023
33f98c6
Добавляем новый шип
Heavens-Fury Oct 9, 2023
581bfe5
Обновление Курка
Mirag1993 Oct 9, 2023
5b5827b
Фиксим ошибки маппинга
Heavens-Fury Oct 9, 2023
4e63b50
Merge pull request #47 from Mirag1993/Новые-руины-Красной-планеты-
MysticalFaceLesS Oct 10, 2023
11c7ced
Merge pull request #50 from Mirag1993/Курк
MysticalFaceLesS Oct 10, 2023
0d99236
Merge pull request #49 from Heavens-Fury/master
MysticalFaceLesS Oct 10, 2023
59b12cd
Merge pull request #48 from DuckNeMyDuck/intoTheSunset
MysticalFaceLesS Oct 10, 2023
451d69d
Proteus hotfix
Heavens-Fury Oct 11, 2023
77baef6
Merge branch 'master' of https://github.com/Heavens-Fury/Shiptest
Heavens-Fury Oct 11, 2023
15b0a02
Revert "Proteus hotfix"
Heavens-Fury Oct 11, 2023
cda05aa
Escape pod Arrival
Heavens-Fury Oct 11, 2023
1f5480e
Merge pull request #52 from Heavens-Fury/master
MysticalFaceLesS Oct 11, 2023
fee852f
Merge branch 'master' of https://github.com/Heavens-Fury/Shiptest
Heavens-Fury Oct 11, 2023
3367d17
Hot fix of escapepod
Heavens-Fury Oct 11, 2023
b1e4ebd
Merge pull request #53 from Heavens-Fury/master
RoyaltyRat Oct 11, 2023
4c72051
Revert "intoTheSunset"
MysticalFaceLesS Oct 12, 2023
c04267e
Новый корабль НТ
Burbonchik Oct 12, 2023
73f186b
Escapepod Update
Heavens-Fury Oct 12, 2023
705762d
Merge branch 'master' of https://github.com/Heavens-Fury/Shiptest
Heavens-Fury Oct 12, 2023
12c0a6c
Revert "Escapepod Update"
Heavens-Fury Oct 12, 2023
377f45f
Escape pod update
Heavens-Fury Oct 12, 2023
2e8701e
Merge pull request #54 from Heavens-Fury/master
MysticalFaceLesS Oct 12, 2023
dada644
Merge branch 'master' of https://github.com/MysticalFaceLesS/Shiptest
MysticalFaceLesS Oct 12, 2023
e50f625
Изменены права на команду Restart
MysticalFaceLesS Oct 12, 2023
5a700bb
Another Fix
Heavens-Fury Oct 13, 2023
c9bd79c
Merge branch 'MysticalFaceLesS:master' into master
Heavens-Fury Oct 13, 2023
0863d31
Merge pull request #56 from Heavens-Fury/master
RoyaltyRat Oct 13, 2023
201e151
Починка Рамо
Mirag1993 Oct 13, 2023
7ccbc8c
Merge branch 'MysticalFaceLesS:master' into Рамо
Mirag1993 Oct 13, 2023
6b631ca
Guardian beacon fix?
Heavens-Fury Oct 14, 2023
0a67050
Merge branch 'master' of https://github.com/Heavens-Fury/Shiptest
Heavens-Fury Oct 14, 2023
6c773d4
Merge pull request #58 from Heavens-Fury/master
RoyaltyRat Oct 14, 2023
2b09c6f
Merge pull request #57 from Mirag1993/Рамо
MysticalFaceLesS Oct 14, 2023
dcc8b84
Добавление 2 рескин пушки для интеков (г36 , г36сх) , пехотная винтов…
Mirag1993 Oct 15, 2023
7f91d35
Merge pull request #59 from Mirag1993/Morita-MK.I
RoyaltyRat Oct 15, 2023
261e225
Now escapepod is neutral ship
Heavens-Fury Oct 15, 2023
5941493
Merge branch 'MysticalFaceLesS:master' into master
Heavens-Fury Oct 15, 2023
85bb927
Merge pull request #60 from Heavens-Fury/master
MysticalFaceLesS Oct 15, 2023
28cf609
Добавление в карго разного барахла
Mirag1993 Oct 15, 2023
5e8a354
Быстрый багфикс текста
Mirag1993 Oct 15, 2023
cc94893
Включаем Цент-Ком
MrSamu99 Oct 15, 2023
16b0da4
Merge pull request #63 from Heavens-Fury/MrSamu99-master
MysticalFaceLesS Oct 15, 2023
22e8a04
Merge pull request #61 from Mirag1993/Cargo-changes
MysticalFaceLesS Oct 15, 2023
dfc7505
Revert "Revert "intoTheSunset""
MysticalFaceLesS Oct 15, 2023
519f0df
Кораблик "Исполнитель"
Rochehendson Oct 15, 2023
b454a4f
Merge pull request #65 from Rochehendson/master
MysticalFaceLesS Oct 15, 2023
5911583
Merge pull request #64 from Burbonchik/Savior-NT-med-ship
MysticalFaceLesS Oct 15, 2023
bd392ef
hotfix-executor
Rochehendson Oct 15, 2023
7ddffdb
Merge pull request #66 from Rochehendson/master
MysticalFaceLesS Oct 15, 2023
a6bc38a
Добавление звуков удушения , фикс ошибки удушения с пустым баллоном
Mirag1993 Oct 16, 2023
2435864
hotfix2-executor
Rochehendson Oct 16, 2023
0034561
Добавление пропорций на гекко
Rochehendson Oct 16, 2023
76f8b38
Merge pull request #67 from Mirag1993/Emouts
MysticalFaceLesS Oct 16, 2023
5e6ca04
Merge pull request #68 from Rochehendson/master
MysticalFaceLesS Oct 16, 2023
15b9dad
Добавление джанк крейсера
Mirag1993 Oct 17, 2023
34de297
Очередной раз шатаем баланс
Mirag1993 Oct 17, 2023
29d98ff
Merge pull request #69 from Mirag1993/Джанк-крейсер
MysticalFaceLesS Oct 18, 2023
cbf2499
Merge pull request #70 from Mirag1993/Cargo-changes
MysticalFaceLesS Oct 18, 2023
4c1534b
Lets you take rounds out of a pocket ammo box (#2387)
Auris456852 Oct 17, 2023
3b4973e
Merge pull request #71 from Mirag1993/Мердж-с-оффами
MysticalFaceLesS Oct 18, 2023
691351c
Мердж с оффоф outpost tweaks & fixes: Vengeance (#2250)
goober3 Oct 18, 2023
ecfef3e
Merge branch 'MysticalFaceLesS:master' into Мердж-с-оффами
Mirag1993 Oct 19, 2023
b8cfccc
Мердж Various Assorted Fixes (#2403)
Mirag1993 Oct 19, 2023
2ce9feb
Небольшой ремонт лагуны , теперь кнопки не крашат сервер
Mirag1993 Oct 19, 2023
b9698c8
Merge pull request #72 from Mirag1993/Мердж-с-оффами
RoyaltyRat Oct 19, 2023
48c3a7f
Фикс русиша на законы ИИ
Mirag1993 Oct 19, 2023
a6331e8
Merge pull request #73 from Mirag1993/Лагуна
MysticalFaceLesS Oct 20, 2023
1e05f13
Merge pull request #74 from Mirag1993/Мердж-с-оффами
MysticalFaceLesS Oct 20, 2023
e40b0af
Merge branch 'master' of https://github.com/MysticalFaceLesS/Shiptest
MysticalFaceLesS Oct 20, 2023
f07c639
Распределение шипов по папкам
Maybe-Anton Oct 21, 2023
bbdafdb
Merge pull request #75 from Maybe-Anton/master
RoyaltyRat Oct 22, 2023
8dbda45
Добавление тяжелого крейсера Интек Молотоглав
Mirag1993 Oct 22, 2023
4d842fd
Апдейт Молотоглава в догонку
Mirag1993 Oct 22, 2023
ea4fe22
И еще одна обнова на Молотоглав
Mirag1993 Oct 22, 2023
540ba72
Нерф реморы , ПР экстазера
Mirag1993 Oct 22, 2023
9042baf
Убираем в щитспавн Джанк крейсер
Mirag1993 Oct 22, 2023
7e94929
Merge pull request #76 from Mirag1993/Молотоглав---крейсер-интеков
MysticalFaceLesS Oct 22, 2023
39cf074
Merge pull request #78 from Mirag1993/Джанк-крейсер
MysticalFaceLesS Oct 22, 2023
c5dd562
Merge pull request #77 from Mirag1993/Ремора-финал
MysticalFaceLesS Oct 22, 2023
7727150
Ограничение на Ремору
Mirag1993 Oct 22, 2023
99aec45
Вывод твинклшайн в щитспавн
Mirag1993 Oct 22, 2023
03d0126
Merge pull request #81 from Mirag1993/Твинклшайн
MysticalFaceLesS Oct 22, 2023
5bf79ef
Починка жукбокса
Mirag1993 Oct 22, 2023
35715ed
Merge pull request #82 from Mirag1993/Твинклшайн
MysticalFaceLesS Oct 22, 2023
83a893d
Merge pull request #80 from Mirag1993/Ремора-финал
MysticalFaceLesS Oct 23, 2023
dcf41f3
Квик фикс реморы
Mirag1993 Oct 23, 2023
a6474c2
Merge pull request #83 from Mirag1993/Ремора-финал
MysticalFaceLesS Oct 23, 2023
48aeee3
Изменение оповещения о завершении раунда.
MysticalFaceLesS Oct 24, 2023
5b56166
Апдейт хаммерхеда
Mirag1993 Oct 24, 2023
9318e96
Merge pull request #84 from Mirag1993/Молотоглав---крейсер-интеков
MysticalFaceLesS Oct 24, 2023
c4802a4
Rations! (#2260)
FalloutFalcon Sep 14, 2023
4540a6c
Rations 2 Electric Boogalo (#2373)
FalloutFalcon Oct 10, 2023
c34cd09
Фикс пакетиков для кетчука и маслонеза
Mirag1993 Oct 25, 2023
57a727c
Добавление рационов в карго
Mirag1993 Oct 25, 2023
c4c3022
Merge pull request #85 from Mirag1993/Молотоглав---крейсер-интеков
MysticalFaceLesS Oct 26, 2023
77420c9
Добавление нового эмоута Warcry
Mirag1993 Oct 26, 2023
27e18c5
Добавляет Acron-class
StecemDamce Oct 26, 2023
e7b2bba
Hotfix
StecemDamce Oct 26, 2023
35e4f3c
Hotfix2
StecemDamce Oct 26, 2023
6c8140b
Merge pull request #87 from Mirag1993/Варкрай
MysticalFaceLesS Oct 27, 2023
ed7a130
Merge pull request #88 from Nokia2Student/susus
MysticalFaceLesS Oct 27, 2023
63a2cb0
Final hotfix?
StecemDamce Oct 27, 2023
abd2cd6
Merge pull request #89 from Nokia2Student/susus
MysticalFaceLesS Oct 27, 2023
78484e7
Сабтлер для поебулек
Mirag1993 Oct 27, 2023
df3809f
Сабтлер
Mirag1993 Oct 27, 2023
399f015
Merge pull request #90 from Mirag1993/Сабтлер
MysticalFaceLesS Oct 27, 2023
aee57e7
Revert "Сабтлер"
MysticalFaceLesS Oct 27, 2023
d2287fa
Merge pull request #91 from MysticalFaceLesS/revert-90-Сабтлер
MysticalFaceLesS Oct 27, 2023
4d3ec3e
Merge branch 'master' into Сабтлер
Mirag1993 Oct 27, 2023
4b72740
Merge pull request #92 from Mirag1993/Сабтлер
MysticalFaceLesS Oct 27, 2023
f1cab72
Изменение Acron-class
StecemDamce Oct 27, 2023
c829ae6
Merge branch 'master' into ae
Nokia2Student Oct 27, 2023
3251a0f
Merge pull request #94 from Nokia2Student/ae
MysticalFaceLesS Oct 27, 2023
3ae09d0
Revert "Изменение Acron-class"
MysticalFaceLesS Oct 27, 2023
537475a
Merge pull request #95 from MysticalFaceLesS/revert-94-ae
MysticalFaceLesS Oct 27, 2023
3dd34c3
Изменение Acron-class
StecemDamce Oct 27, 2023
2bdfaae
Merge branch 'master' into ab
Nokia2Student Oct 27, 2023
5d8a8f0
Merge pull request #96 from Nokia2Student/ab
MysticalFaceLesS Oct 27, 2023
abacbbc
Фигня
StecemDamce Oct 28, 2023
0392a1d
Merge branch 'ab' of https://github.com/Nokia2Student/Shiptest into ab
StecemDamce Oct 28, 2023
40038c6
Сабтлер версия 2.0
Mirag1993 Oct 28, 2023
cb27aa4
Merge pull request #97 from Mirag1993/Сабтлер
MysticalFaceLesS Oct 28, 2023
a3862c8
Апдейт молотоглава
Mirag1993 Oct 28, 2023
92bb7a5
Фикс севиора
Mirag1993 Oct 28, 2023
bf2dec5
Merge pull request #84 from Mirag1993/Молотоглав---крейсер-интеков
Mirag1993 Oct 28, 2023
59782ed
Перевод миссий и 1 вкладки карго
Mirag1993 Oct 28, 2023
b4f8e81
Merge pull request #99 from Mirag1993/Мелкие-фиксы
MysticalFaceLesS Oct 28, 2023
3e016f2
Merge pull request #98 from Mirag1993/Молотоглав---крейсер-интеков
MysticalFaceLesS Oct 28, 2023
caf2b14
Merge pull request #100 from Nokia2Student/ninja
MysticalFaceLesS Oct 28, 2023
c62086d
Изменение Acron-class и фикс Space Ninja
StecemDamce Oct 28, 2023
b2fa89d
Revert "Изменение Acron-Class и Acron Ninja"
MysticalFaceLesS Oct 28, 2023
9730b2a
Merge pull request #102 from MysticalFaceLesS/revert-100-ninja
MysticalFaceLesS Oct 28, 2023
6d8ebbc
Merge pull request #101 from Nokia2Student/ninjus
MysticalFaceLesS Oct 28, 2023
b52b97d
Небольшой фикс Acron-class
StecemDamce Oct 28, 2023
626db0c
Merge pull request #103 from Nokia2Student/ninjus2
MysticalFaceLesS Oct 28, 2023
8fc8096
Поправки Space Ninja
StecemDamce Oct 28, 2023
d85d700
Merge pull request #104 from Nokia2Student/ninja3
MysticalFaceLesS Oct 29, 2023
c4f20ed
Фиксик Space Ninja
StecemDamce Oct 29, 2023
231c3e8
Merge pull request #105 from Nokia2Student/ninja4
MysticalFaceLesS Oct 29, 2023
9631e03
Изменение спрайтов сумки и дефиба на Acron-class
StecemDamce Oct 29, 2023
b19ca01
Merge pull request #106 from Nokia2Student/ninjadrip
MysticalFaceLesS Oct 29, 2023
1efdac3
Подправка спрайтов сумки и дефиба на Acron-class
StecemDamce Oct 29, 2023
d3345b4
Merge pull request #107 from Nokia2Student/ninjadrip2
MysticalFaceLesS Oct 29, 2023
3738700
Добавление лимита на количество Acron-class
StecemDamce Oct 29, 2023
26f4664
Изменение целей Space Ninja на Acron-class
StecemDamce Oct 29, 2023
48b5269
Merge pull request #109 from Nokia2Student/ninjaobj
MysticalFaceLesS Oct 30, 2023
c0cc727
Revert "Изменение целей Space Ninja на Acron-class"
MysticalFaceLesS Oct 30, 2023
0e3fb30
Merge pull request #110 from MysticalFaceLesS/revert-109-ninjaobj
MysticalFaceLesS Oct 30, 2023
f99480f
Изменение целей Space Ninja на Acron-class
StecemDamce Oct 30, 2023
8b04f70
Merge pull request #111 from Nokia2Student/ninjaobj2
MysticalFaceLesS Oct 30, 2023
81cf04b
Добавление несколько солошипов, а так же не большие правки интеков.
Maybe-Anton Oct 31, 2023
0934358
Merge pull request #112 from Maybe-Anton/master
MysticalFaceLesS Nov 1, 2023
5006f4c
Переезд на новый билд
Mirag1993 Nov 1, 2023
20bd172
Обновление кодовнера
Mirag1993 Nov 1, 2023
0c7ce10
Merge branch 'Мердж-с-оффами' of https://github.com/Mirag1993/Shiptes…
Mirag1993 Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 8 additions & 8 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
# to the same file or dir, add them to the end under Multiple Owners

# MarkSuckerberg
/code/controllers/subsystem/shuttle.dm @MarkSuckerberg
/code/modules/shuttle/ @MarkSuckerberg
/code/modules/overmap/ @MarkSuckerberg
/code/controllers/subsystem/shuttle.dm @MysticalFaceLesS
/code/modules/shuttle/ @MysticalFaceLesS
/code/modules/overmap/ @MysticalFaceLesS

# Teams

# Map Maintainers
/_maps/ @shiptest-ss13/maptainers
/_maps/ @MysticalFaceLesS

# Sprite Maintainers
/icons/ @shiptest-ss13/spritetainers
/whitesands/icons/ @shiptest-ss13/spritetainers
/icons/ @MysticalFaceLesS
/whitesands/icons/ @MysticalFaceLesS

# CI and tool chains
/tools/ @shiptest-ss13/admins
/tools/ @MysticalFaceLesS

#SIC SEMPER TYRANNIS
/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @MarkSuckerberg
/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @MysticalFaceLesS
Loading