41 Commits

Author SHA1 Message Date
keslik
b45689812f Apka and protolathe recipes 2025-03-05 06:55:04 +03:00
BIGZi0348
ed93de6a84 Reapply "больше"
This reverts commit 5fdf0dbece.
2025-01-13 23:58:37 +03:00
BIGZi0348
5fdf0dbece Revert "больше"
This reverts commit 92cdac2c46.
2025-01-13 23:57:33 +03:00
BIGZi0348
92cdac2c46 больше 2025-01-13 23:56:47 +03:00
BIGZi0348
f29ba4c800 Модули, Батареи, Баффы и Дебаффы 2024-12-08 17:33:08 +03:00
BIGZi0348
e9c4e561e8 правочки 2024-11-30 20:33:03 +03:00
BIGZi0348
86c6b156b9 Переводы и мелочь в текстурках (#785)
* Как всегда переводы

* правочки

* мне лень делать отдельный PR ради этого

* герасы

* никотин
2024-11-19 16:00:22 +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
4a7217acf5 Спрайты (#704) 2024-09-22 15:56:43 +03:00
ThereDrD
3a6b3ee1f4 Шейдер ударной волны для взрывов (#633)
* Adds shock wave shader (#2631)

Co-authored-by: DOOM <N/A>
Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>

* add explosive shockwave

* add shockwave to fireball

* wd edit

* cleanup

* remove exgreande beeping sound

---------

Co-authored-by: Vero <73014819+vero5123@users.noreply.github.com>
Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
2024-08-17 23:59:11 +03: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
Aviu00
00fbdead77 Modules update (#596)
* - add: Update module sprites.

* - add: Modules update.
2024-08-09 15:36:35 +03:00
Aviu00
27268d4e28 Better melee combat (#542)
* - add: NextMobAttack, EquipCooldown.

* - fix: Some combat fixes.

* - add: Telebaton.

* - add: Stun baton rework.

* - tweak: Reduce melee range.

* - add: Rework melee block system.

* - add: ExaminedEvent.
2024-08-02 14:50:26 +03:00
ThereDrD0
f00e0a6fb5 Глобальный респрайт оружия 2 (#522)
* its literally brainkilling

* нихуя не понял, но работает
2024-08-01 05:15:03 +03:00
Spatison
85d4e4dc0d Add: Krait (#523) 2024-08-01 03:36:17 +03:00
Spatison
6aa5544bdb Гранатомет СБ (#483)
* tweak: Гранатомет СБ

* Синано
2024-07-24 02:19:31 +03:00
ThereDrD0
d9b8325fa7 Фиксы и фичи еще раз (#426)
* fix: constructs are cultists now

* rename: announcementPrototype -> arrivalNotificationPrototype

* fix: fix naming

* fix: hop became head

* resprite: cult bola looks like cult stuff now

* add: repsrite files

* translation: translation for cult bola

* tweak: now bola fits in belt

* refactor: refactor KnockDownOnCollideSystem

* tweak: bolas knockdown on hit

* add: energy bola

* cleanup: less components
2024-07-06 09:34:29 +03:00
ThereDrD0
36ab40ada7 Глобальный респрайт оружия (#387)
* resprite: part 1

* total brainfucken

* fixes

* uplink icons + ammunition resprite
2024-06-27 23:54:09 +03:00
Aviu00
dccd8aab1a Magic 8 (#376)
* - add: Flash protection for wiz hardsuit helmet.

* - tweak: Cheaper wiz melee weapons.

* - add: Rework alt lightning.

* - fix: Timestop fixes.

* - add: Don't end round on midround wizard death.

* - tweak: Better shield.

* - fix: Some fixes.

* - fix: Fix wizard teleport pulling.

* - add: Improve arc.

* - add: Update knock.

* - add: Update knock desc.

* - add: Arcane Barrage.
2024-06-22 15:55:50 +03:00
CaypenNow
fa348657f9 Обновление модулей (#365)
* base aim module

* sprites, prototypes

* more prototypes

* fix

* fix

* fix2
2024-06-21 13:24:13 +03:00
Aviu00
e9b634c6c9 - add: Mjolnir. (#350) 2024-06-14 02:56:59 +03:00
Aviu00
e72db9d701 Stunprod fixes & add new sprites (#334)
* - tweak: Cleanup snatcherprod and tentacle gun.

* - fix: Cleanup StunprodSystem.

* - add: Snatcherprod on inhand sprites.
2024-06-06 14:30:00 +03:00
CaypenNow
4938553945 [Feat] Modules Update (#268)
* add new module slot

* update priority

* sprites + changes in system

* sprites on SMGs + fix examine

* sprite fix
2024-04-04 16:44:55 +03:00
CaYpeN1
be493ef753 Merge remote-tracking branch 'origin/master' into weapon-modules 2024-03-24 14:38:53 +05:00
ThereDrD0
2ba2612c4e Респрайты (#235)
* add: experimental stunbaton resprite.

* add: galoshes resprite

* add: sofa resprite

* fix: outer grey sofa

* fix: experimental stunbaton sprite
2024-03-24 12:04:31 +03:00
CaYpeN1
796a1f3d5d add: new modules, sprite visuals, client and shared logic 2024-03-20 21:07:17 +05:00
CaYpeN1
9e3a16429f tweak: meta.json + add sprite 2024-03-19 10:09:23 +05:00
CaYpeN1
47741932ed add: laser, flamehider and silencer module for rifles 2024-03-19 10:08:18 +05:00
CaYpeN1
407427b31b add: base system + light module 2024-03-18 01:25:09 +05:00
Aviu00
382188d2d2 Предательский нож (#112)
* - add: Add betrayal knife.

* - tweak: Small size.
2024-02-23 22:59:03 +00:00
rhailrake
3bdf8417f9 - add: seniors (#100)
* seniors base

* second one

* fuck

* remove this one

* fixes

* waggier ghost

* waggier fluff
2024-02-20 12:57:00 +00:00
Aviu00
03fed0caa7 Chaplain stuff (#98)
* - add: Null rod.

* - add: Only chaplain can use holy weapons.

* - add: Chaplain is cult immune.

* - fix: Fix component granting.

* - add: Only chaplain can use null rod.

* - add: Armaments beacon.

* - add: Chaplain playtime requirement.
2024-02-20 10:28:44 +00:00
Aviu00
9caa5a408b Температурные пушки (#90)
* - add: Temperature guns.

* - tweak: Change cryo sting slowdown.

* - tweak: Tempgun tweaks.

* - add: Hardsuit temperature adjustment system.
2024-02-18 08:28:18 +00:00
Aviu00
b48584379d - add: Energy battle axe. (#76) 2024-02-15 18:09:02 +00:00
Aviu00
27d4cf977f Hardlight spear tweaks (#3)
* - tweak: Increased hardlight spear throw force and use delay

* - fix: Hardlight spear can now hit holocarps when thrown

* - add: New sprites for hardlight spear

* - fix: Fix duping hardlight spears by inserting them into containers
2024-01-31 12:47:18 +00:00
Aviu00
4304673fd6 Add hardlight spear implant (#587)
* Add hardlight spear implant

* Small fixes

* Fix collision layer
2024-01-26 08:44:34 +03:00
REBOLUTION228-a11
568c2e5eff Респрайт капитанского лазера (#546)
* antique lasergun resprite lol

* лицуха
2024-01-25 15:32:07 +03:00
Aviu00
0cc831cb18 Add snatcherprod (#422) 2024-01-23 14:59:44 +03:00
Aviu00
d0431ee61e Crossbow (#327)
* Add powered crossbow

* Add spear embedding (#18578)

* Add spear embedding

* fuck this copy-paste

* Juicier

* the river

* Add crossbow embedding

* Fix crossbow construction

* Finish crossbow

* Remove unused

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-01-21 07:04:30 +03:00
Aviu00
93be8a0c97 Add flamethrower (#253)
* Add flamethrower

* Fix RSI

* Add GasAmmoProvider

* Add hidden crafting

* Remove DoubleSwordCraft

* Fix yml
2024-01-20 08:37:37 +03:00