92 Commits

Author SHA1 Message Date
withoutcode333
b12ef96868 Upstream core (#285)
* Map Updates (#951)

* new maps / new versions

* add to map pool

(cherry picked from commit c5f6416818691ebf7a5f6af0aa41e7e354dccd4e)

* Automatic changelog update

(cherry picked from commit f0aee716b95c886edfdb02131282e6631aa8582c)

---------

Co-authored-by: RavmorganButOnCocaine <valtos@nextmail.ru>
2025-05-01 02:59:42 +05:00
BIGZi0348
322220f1a9 stuff 2025-04-03 22:27:58 +03:00
BIGZi0348
ceba35b32c stuff 2025-04-02 21:12:15 +03:00
BIGZi0348
2b6ac23956 Maps 2025-04-01 21:27:58 +03:00
BIGZi0348
4459224b45 more stuff 2025-03-30 22:35:12 +03:00
BIGZi0348
b0cf8c1b50 Update omega.yml 2025-03-30 21:33:57 +03:00
BIGZi0348
4d8f487642 Демократично удалили демократию 2025-03-30 18:22:24 +03:00
BIGZi0348
f4c46200b1 Бокс 2025-03-22 19:11:21 +03:00
BIGZi0348
86b854c582 fix 2025-03-22 18:41:51 +03:00
BIGZi0348
24bd8bd050 Update centcomm.yml 2025-03-18 07:33:44 +03:00
BIGZi0348
458f4d7633 Merge branch 'master' into Stuff 2025-03-17 23:12:38 +03:00
BIGZi0348
986bc9d096 и тебя тоже 2025-03-17 23:11:08 +03:00
BIGZi0348
656f7f544e Stuff (#924) 2025-03-17 23:03:03 +03:00
BIGZi0348
6d478deed4 БелаяКоробка (#923) 2025-03-17 23:00:22 +03:00
BIGZi0348
dba33c0013 БелаяКоробка 2025-03-17 22:54:34 +03:00
BIGZi0348
1fe270e270 Update centcomm.yml 2025-03-17 22:05:40 +03:00
BIGZi0348
86b07c4e54 Stuff (#922) 2025-03-16 22:35:42 +03:00
BIGZi0348
88030a7a29 станции 2025-03-15 17:15:45 +03:00
BIGZi0348
5ef99ebd3e Maybe? 2025-03-14 20:13:26 +03:00
BIGZi0348
9f08a9a8e6 Revert "ЧудоБокс (#916)"
This reverts commit ce50fb8bde, reversing
changes made to d96bc9b357.
2025-03-14 20:11:29 +03:00
BIGZi0348
78c0553414 ЧудоБокс 2025-03-13 23:34:41 +03:00
BIGZi0348
2cfcf72f77 Ещё шаттлы 2025-03-13 23:25:26 +03:00
BIGZi0348
a877f1e3c6 Шаттлы 2025-03-12 23:34:42 +03:00
keslik
90428b40da update 2025-03-07 10:58:32 +03:00
BIGZi0348
0c47897e12 Удаление зимних карт 2025-03-03 19:17:01 +03:00
keslik
f1979cc029 fix 2025-03-03 17:42:32 +03:00
keslik
4861ba905a some edit 2025-03-03 16:55:52 +03:00
keslik
92154d13a0 Map update 2025-03-02 19:33:14 +03:00
BIGZi0348
0a06167f78 Зима прошла 2025-02-09 21:22:06 +03:00
BIGZi0348
b30606ed1b карты 2025-01-08 22:25:11 +03:00
BIGZi0348
5e8c9f435d ForFuture 2024-12-29 18:24:28 +03:00
BIGZi0348
807dc555aa Speakers 2024-12-29 18:22:46 +03:00
BIGZi0348
7d103834d2 MoreJollyStuff 2024-12-29 15:26:09 +03:00
BIGZi0348
ac09a07e5b Карты 2024-12-28 17:18:41 +03:00
BIGZi0348
7605aecd07 Факс синдиката 2024-12-23 00:01:19 +03:00
BIGZi0348
a63691f925 Обновка карт 2024-12-09 21:20:16 +03:00
Jabak
61fcd22301 хонки рулят (#764)
* Инспектор и травматический дробовик

Дайте деняг

* Йоу

* Фикс: уменьшен стан дамаг для травматического дробовика

* из Honk в White

* ди нах

* ыые

* Почистил говно

---------

Co-authored-by: Bombinos <Egorsergeev8@yandex.ru>
Co-authored-by: BIGZi0348 <svalker0348@gmail.com>
2024-11-16 22:55:09 +03:00
BIGZi0348
ddc6dd3a9f Переводы (#698)
* Пепеводы

* Очепятки
2024-09-15 15:22:04 +03:00
Valtos
83c07e420e Fix Possible Crash 2024-09-07 09:58:35 +03:00
PointPNG
6c1336be2f maps update (#673) 2024-08-28 18:18:51 +03:00
PointPNG
2f11618fbf Обновление карт (#647) 2024-08-20 07:29:23 +03:00
PointPNG
6d3f8c73ae Maps update (#614) 2024-08-12 22:22:33 +03:00
PointPNG
a0b3e3fecd Maps-update 2024-08-11 15:52:20 +03:00
RedBurningPhoenix
9344f7783f MapFixes and spawns 2024-08-11 15:48:23 +05:00
ThereDrD
8e4ebf02aa Revert "Goida revert (#600)" (#601)
This reverts commit a95fe131
2024-08-09 21:08:34 +03:00
MJSailor
a95fe13180 Goida revert (#600)
* Revert "- fix: YAML linter fixes. (#598)"

This reverts commit 012bf3c357.

* Revert "Automatic changelog update"

This reverts commit cf1c3a9af5.

* Revert "[Fix] Base Layer Prototype (#597)"

This reverts commit b000423999.

* Revert "Modules update (#596)"

This reverts commit 00fbdead77.

* Revert "Automatic changelog update"

This reverts commit 0d7a12b2a2.

* Revert "Fixes (#593)"

This reverts commit 943c77031c.

* Revert "minor loadout fixes (#594)"

This reverts commit 143c010a89.

* Revert "Update DryDock.yml (#595)"

This reverts commit 4cd0100ac7.

* Revert "Automatic changelog update"

This reverts commit 08eadc690f.

* Revert "fix: Maximum message size (#591)"

This reverts commit 343f3612eb.

* Revert "Черри пики 7 (#592)"

This reverts commit 3f97bdce2f.

* Revert "Automatic changelog update"

This reverts commit 0678eca250.

* Revert "Рандомфиксы (#590)"

This reverts commit 2b9e5e2437.

* Revert "Нижнее бельё в лодауты (#580)"

This reverts commit e01a47b089.

* Revert "add lathe sounds (#588)"

This reverts commit c80a2985f2.

* Revert "Добавил параметр группы для некоторых реагентов (#585)"

This reverts commit 713b16bb98.

* Revert "add hrp ++++ aspect (#587)"

This reverts commit a6a69cc60f.

* Revert "Новые амбиенты и пару песен (#586)"

This reverts commit 48c86bd846.

* Revert "Сообщения в ПДА 2 (#583)"

This reverts commit cced3cc98b.

* Revert "Automatic changelog update"

This reverts commit abf435b11d.

* Revert "Chem stuff and more (#584)"

This reverts commit 3608960f5c.

* Revert "JobRequiremet refactor (#579)"

This reverts commit 9a9c9598e0.

* Revert "Revert "Reapply "Нижнее бельё в лодауты"""

This reverts commit 44447d573f.

* Revert "Reapply "Нижнее бельё в лодауты""

This reverts commit 0c4d082ad3.

* Revert "Revert "Нижнее бельё в лодауты""

This reverts commit 56473c5492.

* Revert "Нижнее бельё в лодауты"

This reverts commit d1cb0cb364.

* Revert "DryDock and WhiteMoose update (#578)"

This reverts commit 14755808af.

* Revert "Automatic changelog update"

This reverts commit 0133f82722.

* Revert "Fixes (#576)"

This reverts commit b7cc49896c.

* Revert "порт системы регенерации солюшена цинки (#574)"

This reverts commit a22cf3d50b.

* Revert "Воровские перчатки (#573)"

This reverts commit bb7140f3d4.

* Revert "mood resprite (#572)"

This reverts commit 4db96dc569.

* Revert "fix missing letter (#571)"

This reverts commit 94ea756794.

* Revert "Сообщения в ПДА (#564)"

This reverts commit d023d29e54.

* Revert "- fix: No visible aghost."

This reverts commit 27e7f25f7e.

* Revert "- tweak: Nerf cult shield."

This reverts commit 6a384246b8.
2024-08-09 19:09:22 +03:00
PointPNG
4cd0100ac7 Update DryDock.yml (#595) 2024-08-09 14:23:56 +03:00
PointPNG
14755808af DryDock and WhiteMoose update (#578) 2024-08-07 15:49:28 +03:00
ThereDrD0
d19932073a Выпиливание говно-флаффа (#560)
* remove centurion fluff

* remove gusmopsik fluff

* remove oleg tinkoff fluff

* remove omntns fluff

* remove sprites and transform omntns hammer to judge hammer
2024-08-04 16:42:06 +03:00
PointPNG
6a72ce65ce Maps update (#558)
* Maps update

* Update terminal.yml

* Update DryDock.yml
2024-08-04 13:42:22 +03:00