460 Commits

Author SHA1 Message Date
ThereDrD0
d627758826 Баффы (#510)
* Moodsystem cleanups

* remove overhydrated and overfed mood debuffs

* admins now join game deadmined + new player timers

* faster arrivals

* recharging rcd with metal, glass, plastic or cable coils

* better timings and costs + building apc and camera

* preparing for rpd

* RPD + make RCD more generic

* add rpd to atmos lockers, rcd to engivend

* rcd and rpd to technologies

* dont deadmin me in debug

* rcd ammo buff

* add ChargeCountModifier logic for non stackable items

* increase time to become experienced player

* Dynamic Radial Menus (#29678)

* fix

* Clean Some Code

* Some Commentaries

* Update Content.Client/UserInterface/Controls/RadialContainer.cs

* Update Content.Client/UserInterface/Controls/RadialContainer.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* more dynamically parameters

---------

Co-authored-by: Rinary <72972221+Rinary1@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-07-29 06:04:21 +03:00
Aviu00
edf9f243a1 Blood (#507)
* - tweak: Nerf spear.

* - tweak: Blood bolt barrage.

* - add: Cult stuff.

* - fix: Cult fixes.

* - remove: Garbage.

* - fix: Multiple pylons.

* - fix: Pylon placement fix.

* - add: Lots of cult stuff.
2024-07-28 19:54:32 +03:00
Jabak
decd47769b Merge remote-tracking branch 'upstream/master' 2024-07-28 15:08:05 +03:00
PuroSlavKing
a1f562d181 [Feature] Wide Glass Airlocks (#504)
* [Feature] Double Airlock

* up1

* [Feature] Threeple Airlock
2024-07-27 18:46:53 +03:00
Jabak
5dbbf68af8 Merge remote-tracking branch 'upstream/master' 2024-07-26 23:28:33 +03:00
ThereDrD0
85b86f2026 Revert gersoon (#502)
* Revert "Изменено"

This reverts commit 985048acc6.

* fix naser
2024-07-26 22:06:15 +03:00
Jabak
53e4d2bfe5 Merge remote-tracking branch 'upstream/master' into ups 2024-07-26 21:32:42 +03:00
Gersoon
2e0704bb13 Изменено (#500)
Ээээааа. Я не туда насрал
2024-07-26 19:40:56 +03:00
Gersoon
985048acc6 Изменено
Тайлы, декали, спрайты
Добавлено
Ебаные горршки и всё ыыа
2024-07-26 18:38:36 +02:00
Jabak
68a4d06490 Merge remote-tracking branch 'upstream/master' into ups 2024-07-24 19:13:19 +03:00
Spatison
6aa5544bdb Гранатомет СБ (#483)
* tweak: Гранатомет СБ

* Синано
2024-07-24 02:19:31 +03:00
Jabak
af04e7e75f Merge remote-tracking branch 'upstream/master' into UPS 2024-07-22 19:24:10 +03:00
Aviu00
f82eee75b0 Thief stuff (#480)
* - add: Thief stuff.

* - fix: Implants.

* - add: Jammer.
2024-07-22 17:20:05 +03:00
Jabak
69256bcb6d Merge remote-tracking branch 'upstream/master' into UPS 2024-07-21 20:30:35 +03:00
PuroSlavKing
f2733e6e0c [Feature] Gondola (#475) 2024-07-21 19:53:20 +03:00
Jabak
06405f8c62 Merge remote-tracking branch 'upstream/master' into ups 2024-07-20 18:45:46 +03:00
ThereDrD0
0dff5a3f79 Респрайты канистр и плащей Капитана, СЕ и РД (#469)
* canisters resprite

* captain, research director and chief engineer cloaks resprite
2024-07-20 05:32:31 +03:00
ThereDrD0
9c4126d3a2 Всякие твики (#467)
* tomato juice no longer slippery

* flashbang rework

* add starting gear support for flashbang rework

* flash size and charges tweak

* night and thermal vision tweaks

* night vision is turned off by default

* some size tweaks

* cleanup

* sunglasses and hardsuits tweak
2024-07-20 05:08:01 +03:00
Jabak
3921e01f29 Merge remote-tracking branch 'upstream/master' into ups 2024-07-19 16:41:41 +03:00
Spatison
d32eb158d4 Теперь предметы можно передавать из рук в руки (#462)
* add: Теперь предеты можно передовать из рук в руки

* Кудато не туда уехало
2024-07-18 01:33:28 +03:00
Jabak
14e413b38a Merge remote-tracking branch 'upstream/master' 2024-07-07 22:09:11 +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
Jabak
8d635232d7 Merge remote-tracking branch 'upstream/master' 2024-07-05 21:22:42 +03:00
rhailrake
eced84e98e master 2024-07-05 23:14:06 +05:00
Jabak
35edf6460a Merge remote-tracking branch 'upstream/master' 2024-07-02 21:26:29 +03:00
Remuchi
d63d3521ee feat: гост рейдера (#414) 2024-07-02 23:33:16 +07:00
Jabak
8de3924481 Merge remote-tracking branch 'upstream/master' 2024-06-28 11:45:35 +03:00
ThereDrD0
36ab40ada7 Глобальный респрайт оружия (#387)
* resprite: part 1

* total brainfucken

* fixes

* uplink icons + ammunition resprite
2024-06-27 23:54:09 +03:00
Jabak
6dfda3629d blyat 2024-06-25 00:18:48 +03:00
Jabak
6c0bf75d21 Amirka Ghost 2024-06-25 00:12:32 +03:00
Jabak
37fe791fd7 Merge remote-tracking branch 'upstream/master' 2024-06-24 00:05:53 +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
Jabak
5ac7ca6faa Merge remote-tracking branch 'upstream/master' into ups 2024-06-21 21:53:12 +03:00
CaypenNow
fa348657f9 Обновление модулей (#365)
* base aim module

* sprites, prototypes

* more prototypes

* fix

* fix

* fix2
2024-06-21 13:24:13 +03:00
Aviu00
6a7ad10d72 Timestop spell (#370)
* - tweak: Tweak mindswap.

* - fix: Mindswap and cult fixes.

* - add: Timestop v1.

* - add: Timestop spell.

* - remove: What?

* - fix: Fixes.
2024-06-20 19:24:10 +03:00
Jabak
da298741e4 Merge remote-tracking branch 'upstream/master' 2024-06-15 19:29:46 +03:00
ThereDrD0
41c6d99b93 add: scroll resprite (#358) 2024-06-15 16:37:17 +03:00
Aviu00
e9b634c6c9 - add: Mjolnir. (#350) 2024-06-14 02:56:59 +03:00
Jabak
77234ff343 Кушать хочу 2024-06-09 20:49:07 +03:00
Aviu00
0c34a1fd9b Magic 3 (#340)
* - add: Some tweaks and localization.

* - add: Teleport spell.

* - tweak: Tweak wizard hardsuit.

* - add: Turn off shield on cast.

* - add: New wizard clothes & update wizard shuttle,

* - remove: Remove old clothes from shuttle.

* - fix: No teleporting to centcomm.
2024-06-09 19:26:27 +03:00
Jabak
4624ef7cf0 Пу пу пу пу 2024-06-08 23:44:25 +03:00
Jabak
38ae317e71 Merge remote-tracking branch 'upstream/master' 2024-06-08 22:36:55 +03:00
Jabak
7847041671 customGhost Krahankit 2024-06-08 22:31:34 +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
Jabak
91abaa0f6e Sosal 2024-06-05 17:19:10 +03:00
Jabak
4827bd5701 - fix: runamius CustomGhost 2024-06-05 16:48:08 +03:00
Jabak
fa0258b34e vorge CustomGhost 2024-06-04 19:58:17 +03:00
Jabak
bcf4074eca Merge remote-tracking branch 'upstream/master' 2024-06-04 14:07:10 +03:00
Jabak
cfd9b19da0 runamius CustomGhost 2024-06-03 23:40:55 +03:00
Jabak
d2b24c049d Merge remote-tracking branch 'upstream/master' 2024-06-03 19:54:40 +03:00