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

27488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BIGZi0348
6d48de5dd8 Попытка починить дилдо... 2024-11-30 18:13:42 +03:00
keslik
3d9593f9a4 Fix: Shinamo grenades aren't trash 2024-11-30 17:32:13 +03:00
BIGZi0348
0c7118094a Merge pull request #193 from frosty-dev/BoxesUpdate 
Обновление коробок
 2024-11-30 16:55:47 +03:00
BIGZi0348
f9da905213 Обновление коробок 2024-11-30 16:53:47 +03:00
BIGZi0348
7ae2994c87 Для мапперов 2024-11-30 15:42:03 +03:00
BIGZi0348
445fe48c3d Merge pull request #192 from frosty-dev/MapsUpdate 
Замапил кум... ой.. то есть снег
 2024-11-30 00:06:20 +03:00
BIGZi0348
06933d8603 Игральные карты 2024-11-29 23:03:40 +03:00
BIGZi0348
0a1054e21a бомба 2024-11-29 19:35:52 +03:00
BIGZi0348
a146410ecd Merge pull request #191 from frosty-dev/ImOnlyHumanAfterAll 
Инспектор больше не может быть ксеносом
 2024-11-29 00:01:42 +03:00
BIGZi0348
ee8330e857 Merge pull request #190 from frosty-dev/AMEinCargo 
Дам в карго, но какой ценой...
 2024-11-29 00:01:32 +03:00
BIGZi0348
2e05dffa93 Merge pull request #189 from frosty-dev/cleanShit 
Clean shit
 2024-11-29 00:01:22 +03:00
BIGZi0348
8fe6798dc1 Дадададдаа 2024-11-28 23:59:11 +03:00
BIGZi0348
36266df074 Всё на своих местах 2024-11-28 23:50:12 +03:00
BIGZi0348
b2fe504af3 Дам в карго, но какой ценой... 2024-11-28 23:42:55 +03:00
BIGZi0348
a07859bf18 наборы 2024-11-28 23:20:13 +03:00
BIGZi0348
8d0a72dfdd Revert "Reapply "Reapply "тест""" 
This reverts commit 5d99600102.
 2024-11-28 20:22:00 +03:00
BIGZi0348
d101601596 Revert "Merge pull request #188 from frosty-dev/test" 
This reverts commit f7890e9378, reversing
changes made to af410cb46e.
 2024-11-28 20:21:48 +03:00
BIGZi0348
f7890e9378 Merge pull request #188 from frosty-dev/test 
Test
 2024-11-27 23:13:47 +03:00
BIGZi0348
cc3d5b24ca Merge branch 'master' into test 2024-11-27 23:12:23 +03:00
BIGZi0348
397913e66b большой тест 2024-11-27 23:11:53 +03:00
BIGZi0348
af410cb46e Merge pull request #187 from frosty-dev/test_test 
Test test
 2024-11-27 23:08:04 +03:00
BIGZi0348
5d99600102 Reapply "Reapply "тест"" 
This reverts commit 191aa167cf.
 2024-11-27 23:06:08 +03:00
BIGZi0348
191aa167cf Revert "Reapply "тест"" 
This reverts commit a3d8ca2998.
 2024-11-27 23:05:38 +03:00
BIGZi0348
a3d8ca2998 Reapply "тест" 
This reverts commit 7545f76c15.
 2024-11-27 23:05:15 +03:00
BIGZi0348
1127a699a8 Merge branch 'test_test' of https://github.com/frosty-dev/ss14-honk into test_test 2024-11-27 23:04:31 +03:00
BIGZi0348
7545f76c15 Revert "тест" 
This reverts commit 6618a83a80.
 2024-11-27 23:04:21 +03:00
BIGZi0348
4f230d454a Revert "тест" 
This reverts commit 6618a83a80.
 2024-11-27 23:04:05 +03:00
BIGZi0348
6618a83a80 тест 2024-11-27 22:58:54 +03:00
RavmorganButOnCocaine
68647fbf8e Automatic changelog update 2024-11-27 02:26:40 +00: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
b1a69ebbcc Merge pull request #186 from frosty-dev/EngiTransfer 
Engi transfer
 2024-11-27 01:03:05 +03:00
BIGZi0348
23820ef1fe Перенос Енги + Возврат Амура 2024-11-27 00:57:55 +03:00
BIGZi0348
9b70488194 Merge branch 'Transfer/Engi' into EngiTransfer 2024-11-27 00:13:01 +03:00
BIGZi0348
133cfb0080 Merge pull request #185 from frosty-dev/SuharikiFromEngi 
from dust we came to dust we shall return
 2024-11-24 22:58:26 +03:00
BIGZi0348
4f6b392136 unused 2024-11-24 22:38:08 +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
4af9112264 Merge pull request #184 from frosty-dev/FoldedClothingHonkSpecialEdition 
Очень важный момент для курток
 2024-11-24 19:02:11 +03:00
BIGZi0348
8339fd5672 Очень важный момент для курток 2024-11-24 18:58:00 +03:00
BIGZi0348
30180b2e2a Merge pull request #183 from frosty-dev/smallfix 
Smallfix
 2024-11-24 15:17:29 +03:00
BIGZi0348
19b7e927fe Merge remote-tracking branch 'WD-core/HOTFIX' into smallfix 2024-11-24 14:39:02 +03:00
BIGZi0348
7cac9875e1 Переводы 2024-11-24 14:36:44 +03:00
BIGZi0348
d9afa72964 Merge pull request #182 from frosty-dev/upstream-5 
Upstream 5
 2024-11-23 18:53:47 +03:00
BIGZi0348
ce7cadf4df Music for events 
(cherry picked from commit 4a7214634b3e77caefd011bf5900f581055a0ac8)
 2024-11-23 18:49:39 +03:00
BIGZi0348
32e3f064f1 Больше целей 
(cherry picked from commit c3d34d6a4e000d8af66c8f53d60a898cfae0a454)
 2024-11-23 18:49:31 +03:00
BIGZi0348
5654c92678 Команда для отправки цели для станции (#21) 
* Команда для отправки цели для станции

* Правки

(cherry picked from commit 93a79c4952e3a75c32ff5cc4d07df4018a9bf7db)
 2024-11-23 18:49:25 +03:00
BIGZi0348
ee48b35f33 Small refactor 
(cherry picked from commit b38ad7e7b8afa35a22c84c2fb8836bf13736dfb3)
 2024-11-23 18:49:16 +03:00
BIGZi0348
92444a46ec Добавил админ логирование PacifiedOnChaplainActionSystem (#19) 
Update PacifiedOnChaplainActionSystem.cs

(cherry picked from commit f6aa42eab7cce294336aec14f7dfb6f0671267cf)
 2024-11-23 18:49:09 +03:00
BIGZi0348
85ea507f53 funny hammer 
(cherry picked from commit 1e58eaa146cc95f34358d97d6c436ba4705d09a1)
 2024-11-23 18:48:33 +03:00