Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
27,488 Commits 1 Branch 0 Tags
master
Commit Graph

2905 Commits

Author SHA1 Message Date
BIGZi0348
4b078f50ad Гирлянды 2024-12-21 14:19:09 +03:00
BIGZi0348
9502300c93 Merge pull request #220 from frosty-dev/RobesUpdate 
Халатики
 2024-12-16 21:33:55 +03:00
BIGZi0348
4b0a933d12 Халатики 2024-12-16 21:32:33 +03:00
BIGZi0348
c09ab4a126 Merge remote-tracking branch 'WD-core/master' into upstream-core 2024-12-15 23:09:05 +03:00
BIGZi0348
3ebab5ebc7 Починка 2024-12-15 23:06:03 +03:00
BIGZi0348
a0c3fd180f Merge remote-tracking branch 'WD-core/master' into upstream-core 2024-12-15 22:50:37 +03:00
BIGZi0348
c115bfac2f Oopsie 2024-12-15 22:48:25 +03:00
BIGZi0348
677098e858 Merge remote-tracking branch 'WD-core/master' into upstream-core 2024-12-15 21:38:21 +03:00
BIGZi0348
583e159c06 Очепятка 2024-12-15 21:28:25 +03:00
BIGZi0348
0350afe3a4 Merge remote-tracking branch 'WD-core/master' into upstream-core 2024-12-15 19:58:42 +03:00
keslik
a5587e4a7e Feda_Plevajecki fluff 2024-12-15 19:50:15 +03:00
BIGZi0348
cbe2236d1f Merge branch 'master' into NewItems 2024-12-15 16:52:04 +03:00
BIGZi0348
7d2dff704f Merge remote-tracking branch 'WD-core/master' into upstream-core 2024-12-15 16:44:18 +03:00
BIGZi0348
c3d63c3548 Повязки 2024-12-15 16:29:42 +03:00
BIGZi0348
9546417c0d Пиксель (#824) 2024-12-15 14:08:43 +03:00
BIGZi0348
0c563185ba Вещи, правки и дополнения 2024-12-15 13:51:57 +03:00
BIGZi0348
94647d7500 Пиксель 2024-12-15 12:19:19 +03:00
BIGZi0348
a45e85ebe4 Merge remote-tracking branch 'WD-core/master' into upstream-core 2024-12-14 22:13:35 +03:00
BIGZi0348
9fff4f22e4 Чертежи 2024-12-14 13:02:28 +03:00
Іван Оніщенко
b7b858579e - fix textures path 2024-12-13 23:39:10 +03:00
Іван Оніщенко
707dec71ab - added Adidas sport outfit 2024-12-13 23:29:35 +03:00
BIGZi0348
811394a215 очепятка 2024-12-13 21:31:18 +03:00
BIGZi0348
ac6cf1040e Новая заставка 2024-12-13 20:04:18 +03:00
BIGZi0348
048fad1c26 Merge remote-tracking branch 'WD-core/master' into upstream-11 2024-12-12 23:35:26 +03:00
BIGZi0348
9d9b578420 Причёсочки 2024-12-12 23:28:11 +03:00
BIGZi0348
e6120db6ff Merge remote-tracking branch 'WD-core/master' into Upstream-10 2024-12-12 00:09:10 +03:00
BIGZi0348
bc659c1ca0 Улиточки 2024-12-11 23:48:49 +03:00
BIGZi0348
2c9c7b527e Правки 2024-12-08 19:12:37 +03:00
BIGZi0348
8971c65065 Merge remote-tracking branch 'WD-core/master' into upstream-8 2024-12-08 19:06:37 +03:00
BIGZi0348
f29ba4c800 Модули, Батареи, Баффы и Дебаффы 2024-12-08 17:33:08 +03:00
BIGZi0348
249f755a95 РПК 2024-12-07 21:34:17 +03:00
BIGZi0348
ee4a258450 Merge remote-tracking branch 'WD-core/master' into upstream-6 2024-12-02 00:11:52 +03:00
BIGZi0348
425f91b201 Мясной крюк 2024-12-01 18:49:29 +03:00
BIGZi0348
8f6741f748 Merge remote-tracking branch 'WD-core/master' into Upstream 2024-12-01 00:03:59 +03:00
BIGZi0348
1e31b42cd1 [Fix] Shinamo grenades aren't trash (#794) 2024-11-30 23:57:53 +03:00
BIGZi0348
dea823079f Флафф для serafim547 (#789) 2024-11-30 23:57:40 +03:00
BIGZi0348
e9c4e561e8 правочки 2024-11-30 20:33:03 +03:00
keslik
92dd279988 [Transfer] Engi (#790) 
* Suhariki (#4)

* init

* Porting is complete

Still WIP

* small stuff

* SmallStuff

* awawawa

* Нас рано

* Engi

* More luck

* removed some shit

(cherry picked from commit e1d745655b0e7253ea4e4814b82dd56e90153514)

* Самодельные отражайки (#6)

* Ghetto Mirror Shield

* Protorypes for ghetto mirrors

* locale

* idk, works fine on my machine

* forsenPls

(cherry picked from commit 4505739fd9430bcc578da3dec932d9aa7ca933ca)

* Шлем из ведра (#7)

* Bucket Helmet

* Code cleanup

* Squashed commit of the following:

commit 4505739fd9430bcc578da3dec932d9aa7ca933ca
Author: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date:   Sat Sep 21 17:10:02 2024 +0300

    Самодельные отражайки (#6)

    * Ghetto Mirror Shield

    * Protorypes for ghetto mirrors

    * locale

    * idk, works fine on my machine

    * forsenPls

commit 1f066876508dec8d3f21ad753dab9fcc13dc8d1a
Author: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date:   Sat Sep 21 14:57:30 2024 +0300

    Агрессивный вор (#5)

    * AggressiveThief

    * Попытка насрать обратно

commit e1d745655b0e7253ea4e4814b82dd56e90153514
Author: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date:   Sat Sep 21 14:46:38 2024 +0300

    Suhariki (#4)

    * init

    * Porting is complete

    Still WIP

    * small stuff

    * SmallStuff

    * awawawa

    * Нас рано

    * Engi

    * More luck

    * removed some shit

commit 08061b4f1fbbfd521e3a40ef53d9bc86fa140087
Author: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date:   Sat Sep 21 14:30:31 2024 +0300

    Engi rise up (#3)

commit 00e2f5c45ca7abfeff1f85d4893352d8875f8560
Author: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date:   Thu Sep 19 19:42:30 2024 +0300

    Bigzi upstream1 (#2)

    * init

    * Porting is complete

    Still WIP

    * Мелочи - Король крыс, диски, правки перевода и респрайт одеяния культа (#686)

    * Большой Крыс Отдыхает

    * Фикс размера фейк диска

    * Доработка диска очков РНД

    * Скоро перейду на райдер

    * Переводы

    * Диски одного размера

    * Респрайт робы и капюшона культа

    * Automatic changelog update

    * fix (#687)

    * Automatic changelog update

    * govno HD (#688)

    * Automatic changelog update

    * Hotfix loadouts (#689)

    * govno HD

    * hotfix loadouts

    * fuck

    * Automatic changelog update

    * Update PULL_REQUEST_TEMPLATE.md

    * Even smaller stuff (#690)

    * 45 to 44

    * Фикс ошибки перевода

    * Voice mask translate

    * Automatic changelog update

    * small stuff

    * SmallStuff

    * awawawa

    * Локализация шепелявости (#691)

    * БУМ!!!!!!!! (#692)

    * Automatic changelog update

    * Большой ребаланс милишки (#681)

    * MeleeThrowOnHit rework

    * buff baseball bat

    * better mjolnir

    * telebaton system unhardcode + refactor + transform TelescopicBatonComponent to KnockDownOnHitComponent

    * fix telebaton prototype

    * darova

    * fix KnockDownOnHitSystem

    * chaplain weapons rebalance

    * fix nullrod hit sound

    * BloodstreamSystem cleanup

    * bleeding rebalance

    * damage rebalance

    * small baseball bat fix

    * Automatic changelog update

    * Chaplain armor fix (#693)

    * Фикс описания (#696)

    * No passengers on this military complex (#695)

    * Automatic changelog update

    * Переводы (#698)

    * Пепеводы

    * Очепятки

    * Фикс прожектора и открутка цифр (#697)

    * Melochi

    * Фикс хамелеона

    * Переводы денег мне на карту

    * Automatic changelog update

    * Нас рано

    * Фикс пополнения зарядов РЦД используя стаки ресурсов (#699)

    * Фиксики

    * Спасли Валеру от банкротства

    * Very hot man (#700)

    * Automatic changelog update

    * reverted illegal code added by oniks

    ---------

    Co-authored-by: RavmorganButOnCocaine <valtos@nextmail.ru>
    Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
    Co-authored-by: Valtos <valtos@spaces.ru>
    Co-authored-by: Jabak <163307958+Jabaks@users.noreply.github.com>
    Co-authored-by: ThereDrD <88589686+ThereDrD0@users.noreply.github.com>

* ВЕДРО!!!

* Funny

* Oppsie

(cherry picked from commit 92ce631b0c0187678b6d1eea34d3c0830b9b0fac)

* Yes (#8)

(cherry picked from commit 3d083befca212455cffcae56b84ee55050ad62be)

* Small Fix

То чувство, когда можешь срать прямо в мэйн

(cherry picked from commit 8fa7cfb678711a55bf6704ced30f7ed9b4b1e8c4)

* bababooey (#9)

(cherry picked from commit f7ed9d287f6798c7d39ac437a2f969ec0dc10309)

* GoodLooking (#10)

(cherry picked from commit 1617dce502b71db22a6b736ac879c04c07ec54a0)

* Dadka scazal (#11)

(cherry picked from commit 50da866354952628185bb396f359c2f533d57340)

* Сортировка эксклюзива енги + респрайт деревянных столов и дверей (#12)

* Massive

* Чейндлок

(cherry picked from commit 4dc165e4c1aa75e8fd22f14db95ac72bf50c77f5)

* Big Zi bucket helmet fix

* Опять насрал в мастер

(cherry picked from commit bd866e0cd87770b1509885f66ec5c562dda3fd91)

* Боевые Молоты (#14)

(cherry picked from commit 64df6b4b91050273218007365cf81a45c3ea74a8)

* хотфикс сухариков

(cherry picked from commit a98265c22dc7de467693f501cf3a5d8577e94a54)

* funny sword (#15)

(cherry picked from commit 231aaa1b33b7e4edf00506c6ebdbd389257cf1ca)

* funny hammer

(cherry picked from commit 1e58eaa146cc95f34358d97d6c436ba4705d09a1)

* Добавил админ логирование PacifiedOnChaplainActionSystem (#19)

Update PacifiedOnChaplainActionSystem.cs

(cherry picked from commit f6aa42eab7cce294336aec14f7dfb6f0671267cf)

* Small refactor

(cherry picked from commit b38ad7e7b8afa35a22c84c2fb8836bf13736dfb3)

* Команда для отправки цели для станции (#21)

* Команда для отправки цели для станции

* Правки

(cherry picked from commit 93a79c4952e3a75c32ff5cc4d07df4018a9bf7db)

* Больше целей

(cherry picked from commit c3d34d6a4e000d8af66c8f53d60a898cfae0a454)

* Music for events

(cherry picked from commit 4a7214634b3e77caefd011bf5900f581055a0ac8)

* Санитизация

* unused

---------

Co-authored-by: BIGZi0348 <118811750+bigzi0348@users.noreply.github.com>
Co-authored-by: BIGZi0348 <svalker0348@gmail.com>
 2024-11-27 05:25:36 +03:00
BIGZi0348
9b70488194 Merge branch 'Transfer/Engi' into EngiTransfer 2024-11-27 00:13:01 +03:00
BIGZi0348
d160fe08d3 changelog 2024-11-24 22:33:00 +03:00
BIGZi0348
7340f36489 from dust we came to dust we shall return 2024-11-24 22:12:50 +03:00
BIGZi0348
85a42c3638 Санитизация 2024-11-24 21:44:35 +03:00
BIGZi0348
e478b9768e Опять насрал в мастер 
(cherry picked from commit bd866e0cd87770b1509885f66ec5c562dda3fd91)
 2024-11-23 18:46:57 +03:00
BIGZi0348
c4ede23c77 Merge remote-tracking branch 'WD-core/serafimFluffChange' into upstream-5 2024-11-23 18:45:15 +03:00
BIGZi0348
ca3cb97bbd Merge remote-tracking branch 'WD-core/master' into upstream-5 2024-11-23 18:44:29 +03:00
BIGZi0348
3b8cb7a398 Сортировка эксклюзива енги + респрайт деревянных столов и дверей (#12) 
* Massive

* Чейндлок

(cherry picked from commit 4dc165e4c1aa75e8fd22f14db95ac72bf50c77f5)
 2024-11-23 18:43:23 +03:00
BIGZi0348
c6dde1628f монетка 2024-11-23 18:41:21 +03:00
BIGZi0348
31d223f48c GoodLooking (#10) 
(cherry picked from commit 1617dce502b71db22a6b736ac879c04c07ec54a0)
 2024-11-23 18:39:08 +03:00
BIGZi0348
128b7cebd6 bababooey (#9) 
(cherry picked from commit f7ed9d287f6798c7d39ac437a2f969ec0dc10309)
 2024-11-23 18:38:55 +03:00
BIGZi0348
bd1e379903 Шлем из ведра (#7) 
* Bucket Helmet

* Code cleanup

* Squashed commit of the following:

commit 4505739fd9430bcc578da3dec932d9aa7ca933ca
Author: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date:   Sat Sep 21 17:10:02 2024 +0300

    Самодельные отражайки (#6)

    * Ghetto Mirror Shield

    * Protorypes for ghetto mirrors

    * locale

    * idk, works fine on my machine

    * forsenPls

commit 1f066876508dec8d3f21ad753dab9fcc13dc8d1a
Author: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date:   Sat Sep 21 14:57:30 2024 +0300

    Агрессивный вор (#5)

    * AggressiveThief

    * Попытка насрать обратно

commit e1d745655b0e7253ea4e4814b82dd56e90153514
Author: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date:   Sat Sep 21 14:46:38 2024 +0300

    Suhariki (#4)

    * init

    * Porting is complete

    Still WIP

    * small stuff

    * SmallStuff

    * awawawa

    * Нас рано

    * Engi

    * More luck

    * removed some shit

commit 08061b4f1fbbfd521e3a40ef53d9bc86fa140087
Author: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date:   Sat Sep 21 14:30:31 2024 +0300

    Engi rise up (#3)

commit 00e2f5c45ca7abfeff1f85d4893352d8875f8560
Author: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date:   Thu Sep 19 19:42:30 2024 +0300

    Bigzi upstream1 (#2)

    * init

    * Porting is complete

    Still WIP

    * Мелочи - Король крыс, диски, правки перевода и респрайт одеяния культа (#686)

    * Большой Крыс Отдыхает

    * Фикс размера фейк диска

    * Доработка диска очков РНД

    * Скоро перейду на райдер

    * Переводы

    * Диски одного размера

    * Респрайт робы и капюшона культа

    * Automatic changelog update

    * fix (#687)

    * Automatic changelog update

    * govno HD (#688)

    * Automatic changelog update

    * Hotfix loadouts (#689)

    * govno HD

    * hotfix loadouts

    * fuck

    * Automatic changelog update

    * Update PULL_REQUEST_TEMPLATE.md

    * Even smaller stuff (#690)

    * 45 to 44

    * Фикс ошибки перевода

    * Voice mask translate

    * Automatic changelog update

    * small stuff

    * SmallStuff

    * awawawa

    * Локализация шепелявости (#691)

    * БУМ!!!!!!!! (#692)

    * Automatic changelog update

    * Большой ребаланс милишки (#681)

    * MeleeThrowOnHit rework

    * buff baseball bat

    * better mjolnir

    * telebaton system unhardcode + refactor + transform TelescopicBatonComponent to KnockDownOnHitComponent

    * fix telebaton prototype

    * darova

    * fix KnockDownOnHitSystem

    * chaplain weapons rebalance

    * fix nullrod hit sound

    * BloodstreamSystem cleanup

    * bleeding rebalance

    * damage rebalance

    * small baseball bat fix

    * Automatic changelog update

    * Chaplain armor fix (#693)

    * Фикс описания (#696)

    * No passengers on this military complex (#695)

    * Automatic changelog update

    * Переводы (#698)

    * Пепеводы

    * Очепятки

    * Фикс прожектора и открутка цифр (#697)

    * Melochi

    * Фикс хамелеона

    * Переводы денег мне на карту

    * Automatic changelog update

    * Нас рано

    * Фикс пополнения зарядов РЦД используя стаки ресурсов (#699)

    * Фиксики

    * Спасли Валеру от банкротства

    * Very hot man (#700)

    * Automatic changelog update

    * reverted illegal code added by oniks

    ---------

    Co-authored-by: RavmorganButOnCocaine <valtos@nextmail.ru>
    Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
    Co-authored-by: Valtos <valtos@spaces.ru>
    Co-authored-by: Jabak <163307958+Jabaks@users.noreply.github.com>
    Co-authored-by: ThereDrD <88589686+ThereDrD0@users.noreply.github.com>

* ВЕДРО!!!

* Funny

* Oppsie

(cherry picked from commit 92ce631b0c0187678b6d1eea34d3c0830b9b0fac)
 2024-11-23 18:38:11 +03:00