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

DRAFT: Ремап Сьерры | Ребейз 21/08/23 #870

Merged
merged 159 commits into from
Oct 27, 2023
Merged

DRAFT: Ремап Сьерры | Ребейз 21/08/23 #870

Show file tree
Hide file tree
Changes from 135 commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
a50bedb
Ребейз 21/08/23 12:50
YegorKandziuba Aug 21, 2023
09159b1
21.08.23 18:24
YegorKandziuba Aug 21, 2023
be84a7f
Revet game breaking changes
SuhEugene Aug 21, 2023
693c4c0
24.08.23 16:07 Saferoom
LordNest Aug 24, 2023
205d841
24.08.23 21:55 AI Core fixes
LordNest Aug 24, 2023
47da41b
27.08.23 11:44
LordNest Aug 27, 2023
982181f
27.08.23 13:21
LordNest Aug 27, 2023
9778446
27.08.23 16:11 IAA
LordNest Aug 27, 2023
3998283
12345
YegorKandziuba Aug 27, 2023
fa42446
28.08.23 12.04
YegorKandziuba Aug 28, 2023
a1de48e
28.08.23 17:22
LordNest Aug 28, 2023
370129b
28.08.23 18:39
YegorKandziuba Aug 28, 2023
978e27e
Merge branch 'SierraBay:dev-sierra' into KandJX-Sierra-Full-Remap-Wor…
YegorKandziuba Aug 28, 2023
66d6b43
Merge branch 'dev-sierra' into KandJX-Sierra-Full-Remap-Workplace-Draft
YegorKandziuba Aug 28, 2023
60a4be3
Merge branch 'KandJX-Sierra-Full-Remap-Workplace-Draft' of https://gi…
YegorKandziuba Aug 28, 2023
6fc2550
ПОШЕЛ НАХУЙ
YegorKandziuba Aug 28, 2023
6af04f5
29/08/23 17:03
YegorKandziuba Aug 29, 2023
d6ea593
29.08.23 18:39 OFD
LordNest Aug 29, 2023
a8650e3
30.08.23 00:07
YegorKandziuba Aug 29, 2023
ccfc144
30.08,23 16:43 Ref hangar deck
LordNest Aug 30, 2023
adad8cf
30.08.23 22:38 НЕСТ, Я ДОБАВИЛ С ВНЕШНЕЙ ОБШИВКИ ПОМОСТЫ !!! ОБРАТИ В…
YegorKandziuba Aug 30, 2023
d520d6b
Revert "30.08.23 22:38 НЕСТ, Я ДОБАВИЛ С ВНЕШНЕЙ ОБШИВКИ ПОМОСТЫ !!! …
YegorKandziuba Aug 30, 2023
605c464
Merge branch 'KandJX-Sierra-Full-Remap-Workplace-Draft' of https://gi…
YegorKandziuba Aug 30, 2023
2ba274e
Сука, я ебал конфликты из-за говна
YegorKandziuba Aug 30, 2023
453172f
Merge branch 'dev-sierra' into KandJX-Sierra-Full-Remap-Workplace-Draft
YegorKandziuba Aug 31, 2023
9da2578
31.08.23 10:47
YegorKandziuba Aug 31, 2023
07bf83a
31.08.23 22:53
YegorKandziuba Aug 31, 2023
9fb9990
02.09.23 20:52
YegorKandziuba Sep 2, 2023
1d33cd4
Merge branch 'dev-sierra' into KandJX-Sierra-Full-Remap-Workplace-Draft
YegorKandziuba Sep 2, 2023
4f43ef9
ЮЖИК НЕ ТРОГАЙ БРАНЧ БЕЗ ВЕДОМА БЛЯДЬ
YegorKandziuba Sep 3, 2023
f9a5352
Фикс говна по просьбе Южика
YegorKandziuba Sep 3, 2023
8c55379
MapDiff, открывайся
YegorKandziuba Sep 3, 2023
2950bdd
АХАХАХАХАХ, тупые юнит тесты
YegorKandziuba Sep 3, 2023
ffd3fda
QM office 04.09.23 9:30
YegorKandziuba Sep 4, 2023
12904e6
Ну да, я же еблан, не мог сделать коммит сразу и по этом сразу добавл…
YegorKandziuba Sep 4, 2023
a559e53
хуй залупа
YegorKandziuba Sep 4, 2023
f7d3606
Merge branch 'dev-sierra' into KandJX-Sierra-Full-Remap-Workplace-Draft
YegorKandziuba Sep 4, 2023
42cbc1c
Нест, лови
YegorKandziuba Sep 4, 2023
169d5b0
04.09.23 11:45
YegorKandziuba Sep 4, 2023
8827bdc
Я устал. Я спать
YegorKandziuba Sep 4, 2023
b03279f
+ кнопка
YegorKandziuba Sep 4, 2023
13c4aae
Утренний мапинг в ангаре
YegorKandziuba Sep 5, 2023
3110e0a
05.09.23 21:31
YegorKandziuba Sep 5, 2023
0c36f49
06.09.23
YegorKandziuba Sep 6, 2023
8e72305
09.09.23 Сад на прошлом месте мостика
YegorKandziuba Sep 9, 2023
194bd36
пошел нахуй \
YegorKandziuba Sep 9, 2023
1678b71
13.09.23 10:12
YegorKandziuba Sep 13, 2023
0039f5f
чорт вызьмы пэдык
YegorKandziuba Sep 14, 2023
5bf1e18
HoS xyecoc
YegorKandziuba Sep 14, 2023
5bae726
мда
YegorKandziuba Sep 14, 2023
8ade067
Merge branch 'dev-sierra' into KandJX-Sierra-Full-Remap-Workplace-Draft
YegorKandziuba Sep 15, 2023
cc3fbcc
оффы заебали
YegorKandziuba Sep 15, 2023
276f8ef
Трубы говна в говне
YegorKandziuba Sep 15, 2023
2aff971
Я ебал, ебал ебал
YegorKandziuba Sep 15, 2023
0a78395
мостовая палуба почти готова
YegorKandziuba Sep 16, 2023
19b21aa
Начал делать трубы мусорные и заебался
YegorKandziuba Sep 16, 2023
fdb932f
Немного техов, немного Петрова
YegorKandziuba Sep 17, 2023
af84674
Петров
YegorKandziuba Sep 18, 2023
c32bce3
тык
YegorKandziuba Sep 18, 2023
87a641e
Кафетерий
YegorKandziuba Sep 20, 2023
899cefb
02.10 22:04
LordNest Oct 2, 2023
a2fc91b
хуй с ним, немного поделал, но сомневаюсь в этом
YegorKandziuba Oct 5, 2023
c0f8807
хуй говна говна хуй
YegorKandziuba Oct 7, 2023
6908530
09.10.23 Robo Remap. Also some wires
LordNest Oct 9, 2023
15e82cf
10.10.23 10:55 Prefab fixes
LordNest Oct 10, 2023
2c0e00e
11.10.23
YegorKandziuba Oct 11, 2023
bbd09dc
хуй залупа
YegorKandziuba Oct 12, 2023
9446a9b
Merge branch 'dev-sierra' into pr/870
LordNest Oct 16, 2023
a1e4937
Merge branch 'KandJX-Sierra-Full-Remap-Workplace-Draft' of https://gi…
LordNest Oct 16, 2023
7ad060a
16.10.23 17:50 Spook incident
LordNest Oct 16, 2023
799d907
16.10.23 21:33 Зоны. Тяжёлый WIP. Я заебался.
LordNest Oct 16, 2023
a38c47e
17.10.23 9:39 Убить маппера
LordNest Oct 17, 2023
6a9327f
17.10.23 13:15 Симулятор англичанина
LordNest Oct 17, 2023
ac521c2
17.10.23 13:52 Я убью тебя, лодочник
LordNest Oct 17, 2023
a266ecf
17.10.23 16:43 Убей в себе лодочника
LordNest Oct 17, 2023
4cf10e3
17.10.23 23:21 КАРАСИК
LordNest Oct 17, 2023
30065da
Диспоузал трубы вроде сделаны
YegorKandziuba Oct 18, 2023
5d8ad2f
Ещё немного успел с трубами повозиться
YegorKandziuba Oct 18, 2023
45ec4e8
18.10.23 Лифты и атмосвенты
LordNest Oct 18, 2023
0e56268
Нест займись завтра трубами
YegorKandziuba Oct 18, 2023
56cca27
18.10.23 22:30 Петров
LordNest Oct 18, 2023
6f414fb
Revert maps.dm return
SuhEugene Oct 18, 2023
2bee53a
Remove barricade layers
SuhEugene Oct 18, 2023
a4afae5
Add door logging
SuhEugene Oct 18, 2023
cfcc01c
Remove catwalks under catwalks
SuhEugene Oct 18, 2023
3faf321
19.10.23 10:30 Сектор Газа
LordNest Oct 19, 2023
b04eac1
Газовая атака продолжается
LordNest Oct 19, 2023
4fe985a
Разрывая круг
LordNest Oct 19, 2023
b2f5ab1
Trying to stroke the flames
LordNest Oct 19, 2023
e904be5
19.10.23 19:20 Tests Cleanup
LordNest Oct 19, 2023
584f9af
Р Е З Н Я
LordNest Oct 19, 2023
130df30
landmarks
LordNest Oct 19, 2023
42c729a
Мелкоправки
YegorKandziuba Oct 20, 2023
5329c77
Чиф стюард + стюарды
YegorKandziuba Oct 20, 2023
09933c7
фикс говна
YegorKandziuba Oct 20, 2023
02279e5
супер фикс говна
YegorKandziuba Oct 20, 2023
0b5ff1e
Пук среньк сру праведно
YegorKandziuba Oct 20, 2023
2135e06
хуйня
YegorKandziuba Oct 21, 2023
ff785b1
фиксим под юниттесты
YegorKandziuba Oct 21, 2023
62e8875
фиксим под FFFIRE
YegorKandziuba Oct 21, 2023
1e5b79e
FFFFFFFFFFFFFIRE
YegorKandziuba Oct 21, 2023
6acddaf
улетел
YegorKandziuba Oct 21, 2023
04a915e
21.10.23 Area fixes
LordNest Oct 21, 2023
3ca4a4c
One ticket to unit tests pass
LordNest Oct 21, 2023
b930fdf
one way ticket
LordNest Oct 21, 2023
e4373bb
The Prophecy was written. The tests will fall!
LordNest Oct 21, 2023
31c49c5
Apocalypse 2023
LordNest Oct 21, 2023
0c27385
Testing-testing-testing
LordNest Oct 21, 2023
6c717e1
Stairway to нахуй
LordNest Oct 21, 2023
a420f9a
Test
LordNest Oct 21, 2023
03677f4
Убили принтер
LordNest Oct 21, 2023
feb0bf8
last resort
LordNest Oct 21, 2023
623a9f3
**ХУУУУУУУУУУУУУУУУУУУУУУУУУУУЙ**
SuhEugene Oct 21, 2023
ac9e3ca
ХУУУУУУУУУУУУУУУУУУУУУУУУУУУУУЙ 2
SuhEugene Oct 21, 2023
4a09092
Я карта, я карта
LordNest Oct 21, 2023
9b5c350
БЛЯ ПАЦАНЫ, ПОГНАЛИ НА ТЕСТ
YegorKandziuba Oct 21, 2023
df93bb6
так, поехали
YegorKandziuba Oct 21, 2023
104ea7c
Последний бой за ТВкамеру
YegorKandziuba Oct 21, 2023
96c069d
Revert "ХУУУУУУУУУУУУУУУУУУУУУУУУУУУУУЙ 2"
SuhEugene Oct 21, 2023
fa48f8c
Revert "**ХУУУУУУУУУУУУУУУУУУУУУУУУУУУЙ**"
SuhEugene Oct 21, 2023
741345f
Merge branch 'KandJX-Sierra-Full-Remap-Workplace-Draft' of https://gi…
SuhEugene Oct 21, 2023
4fd613e
Прощайте юнит-тесты
YegorKandziuba Oct 21, 2023
3e9f5c3
Merge branch 'KandJX-Sierra-Full-Remap-Workplace-Draft' of https://gi…
YegorKandziuba Oct 21, 2023
05bf39d
Прощайте Юнит-тесры 2.0
YegorKandziuba Oct 21, 2023
b53bc90
ПОШЕЛ НАХУЙ РАНТАЙМ
YegorKandziuba Oct 21, 2023
17def55
БОЖЕ МИЛОВОСТИВЫЙ, СНИЗОШЛИ СМЕРТЬ РАНТАЙМАМ
YegorKandziuba Oct 21, 2023
894093c
Merge branch 'dev-sierra' into KandJX-Sierra-Full-Remap-Workplace-Draft
YegorKandziuba Oct 21, 2023
911be63
Merge branch 'dev-sierra' into KandJX-Sierra-Full-Remap-Workplace-Draft
YegorKandziuba Oct 22, 2023
5c33df1
Немного подмапил ошибки
YegorKandziuba Oct 22, 2023
7a8b7a6
Пулл
YegorKandziuba Oct 23, 2023
f78a50e
23.10.23 Инициализация лодочника
LordNest Oct 23, 2023
5f63f23
Немного подправил челнок ЕРТ, з4 и з5 уровни
YegorKandziuba Oct 23, 2023
db3a5da
24.10.23 Шаттлы
LordNest Oct 24, 2023
47799a8
Фиксы дубликата жабошипа
LordNest Oct 24, 2023
33a7e48
Merge branch 'dev-sierra' into KandJX-Sierra-Full-Remap-Workplace-Draft
YegorKandziuba Oct 24, 2023
c7b763d
фиксы раста
YegorKandziuba Oct 25, 2023
8be5e9c
Remove custom logging
SuhEugene Oct 25, 2023
f8265cd
Add enter
SuhEugene Oct 25, 2023
2ea2cc2
Повор спрашивает повора
SuhEugene Oct 25, 2023
04acced
Make job service nice
SuhEugene Oct 25, 2023
88e8050
tab
SuhEugene Oct 25, 2023
12c79ac
Мостик
SuhEugene Oct 25, 2023
7e23163
Нест удалил этот дизайн из кода
SuhEugene Oct 25, 2023
0ed50f3
Revert "Нест удалил этот дизайн из кода"
SuhEugene Oct 25, 2023
3926086
Возвращение красивого ящика дека
SuhEugene Oct 25, 2023
ac5ffa3
Crucian Fix
MiKoJ1a Oct 26, 2023
61a9776
Merge pull request #1 from MiKoJ1a/pr/870
YegorKandziuba Oct 26, 2023
fc7513c
Merge branch 'dev-sierra' into KandJX-Sierra-Full-Remap-Workplace-Draft
YegorKandziuba Oct 26, 2023
681eccf
Попытка разкомментить
SuhEugene Oct 27, 2023
4ea1946
Merge branch 'dev-sierra' into KandJX-Sierra-Full-Remap-Workplace-Draft
SuhEugene Oct 27, 2023
f33e700
Update map files
SuhEugene Oct 27, 2023
9a3b9e6
Update welcome message
SuhEugene Oct 27, 2023
57c8081
Update beraing
SuhEugene Oct 27, 2023
e96d4ca
remove "warning" icon states
SuhEugene Oct 27, 2023
7cf74ea
Fix multiple turfs in the tile
SuhEugene Oct 27, 2023
ca2b905
Update blast doors
SuhEugene Oct 27, 2023
5d0538e
Really update blastdoors
SuhEugene Oct 27, 2023
3ad5d2d
Remove uncecessary injector iconstate
SuhEugene Oct 27, 2023
5b015b6
UwU
SuhEugene Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/game/machinery/doors/door.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
if(autoset_access)
#ifdef UNIT_TEST
if(length(req_access))
log_unit_test("Door [src] ([x], [y], [z])")
crash_with("A door with mapped access restrictions was set to autoinitialize access.")
#endif
return INITIALIZE_HINT_LATELOAD
Expand Down
Loading
Loading