4914 Commits

Author SHA1 Message Date
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
ce87e33237 Merge remote-tracking branch 'upstream/master' 2024-06-22 15:40:08 +03:00
ThereDrD0
77696fa638 Реврайт освещения от дверей на клиент (#375)
* fix: doors no longer light up without power

* rework: rewrite PointLightAirlockSystem on client

* public to private

* cleanup
2024-06-22 13:53:37 +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
ThereDrD0
4419931172 Мягкий свет для всякого (#316)
* add: add small soft light to laser weapon + fix the bluest blue energy shield

* git commit

* boltlights done

* add: HuetaSystem

* add: Doorlights finally done

* add: small light to lockers

* add: small light to multitool

* fix: fix naming

* hui pizde

* fix: fix parasha

* add: small light to powercells

* zabil

* add: code light to welders

* tweak: better energy and radius

* add: better color parameters

* add: less radius and energy for guns

* add: better lights for vending machines

* add: better light to consoles

* add: better light for apc

* shut up

* fix: thank you neuro colleague
2024-06-21 06:15:55 +03:00
ThereDrD0
a76ed60f6c fix: quartermaster back again (#372) 2024-06-21 00:18:50 +03:00
RinKeeper
e32403a26c synthflesh nerf (#343)
* synthflesh nerf

* sky-blue carpet

* vaporSystem tweak

* throwSystem tweaks

* Revert "throwSystem tweaks"

This reverts commit a8820ab703ba3008bddeafbe7933ae94e88db3c8.

* Revert "vaporSystem tweak"

This reverts commit da5a7ef1db42033ee115467295882323f9d58ce6.

* prevent double collision rework

* showmanifest command

* client issue
2024-06-20 22:29:43 +03:00
ThereDrD0
cb37ba5714 QoL для ХоПа (#369)
* add: nice job icons ui for HoP console

* Ebanniy rot

* add: Changing id visuals with HoP console

* cleanup

* add: remove drop down list and replace it with icon-buttons

* add: colored and sorted by department buttons

* add: columns

* tweak: nicer colors

* cleanup
2024-06-20 22:29:26 +03:00
Aviu00
3bfc442f7b Cherrypicks 2 (#371)
* Handheld teleporter portals now must start on the same grid. (#28423)

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

* hand teleport portals now may start in the same grid. (#28556)

* Implement vital chef's hat functionality (#25950)

* Implement crucial chef's hat functionality

* Unified stopping code and added events.

* Added documentation to events

* Rerun tests

* Made review changes, and fixed potential desync bug.

* Update whitelist

* Make Hamlet a valid chef's hat pilot (#29191)

* Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709)

* Update DevourSystem.cs

* Update DevourSystem.cs

* Update Content.Server/Devour/DevourSystem.cs

---------

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

* Treatment of blood loss in the Rat King (#26887)

Bloodloss-RatKing

* - fix: Fix error.

---------

Co-authored-by: Moony <moony@hellomouse.net>
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: IlyaElDunaev <154531074+IlyaElDunaev@users.noreply.github.com>
2024-06-20 19:24:36 +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
1db0a1d60d Merge remote-tracking branch 'upstream/master' 2024-06-18 22:37:29 +03:00
Aviu00
f25ad286b9 Magic and gamerule tweaks (#363)
* - tweak: Wiz hardsuit tweaks.

* - tweak: Gamemode tweaks.

* - add: Mindswap spell.

* - add: Transfer wizard component on mindswap.

* - add: Wizard is blight immune.
2024-06-18 17:55:21 +03:00
Aviu00
881574a829 Nerfs (#361)
* - tweak: Nerfs mostly.

* - tweak: Less tc.

* - tweak: Ebow tweak.

* - tweak: More nerfs.

* - fix: firerate.
2024-06-17 20:12:02 +03:00
Jabak
c88050b109 Merge remote-tracking branch 'upstream/master' 2024-06-17 00:04:36 +03:00
Aviu00
3353440a99 Реворк экспедиций (#360)
* - add: Expedition rework.

* - tweak: Hardsuit tweak.
2024-06-16 18:33:26 +03:00
Jabak
da298741e4 Merge remote-tracking branch 'upstream/master' 2024-06-15 19:29:46 +03:00
Aviu00
894af847cd Cherrypicks (#356)
* Katana Dash checks based on vision rather than collision (#27793)

* Fix dash check

* unused

* obsolete function

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

* Fix StepTrigger blacklist not working (#26968)

* Make cuff default range again (#28576)

* Make cuff default range again

* uncuff distance

* how about ONE

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

---------

Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
2024-06-14 17:01:02 +03:00
Aviu00
e9b634c6c9 - add: Mjolnir. (#350) 2024-06-14 02:56:59 +03:00
Jabak
86dedada53 ЧЗХ 2024-06-13 09:10:21 +03:00
Jabak
56784ca0dc Merge remote-tracking branch 'upstream/master' 2024-06-13 09:07:23 +03:00
Aviu00
af99df5ae0 Cult stuff (#348)
* - add: Cult buff protects against spacing.

* - add: Predict RunicDoor.

* - add: Loc.

* - fix: Missing includes.

* - add: Revive rune popups.

* - tweak: Buff rune.

* - fix: Buff rune.
2024-06-12 19:00:45 +03:00
Aviu00
d75fcd40ea Ling tweak 2 (#347)
* - tweak: NOT THE BEES.

* - tweak: More chems.

* - fix: Ling abilities & alert.

* - fix: Locale.
2024-06-12 13:56:44 +03:00
Aviu00
4d09ed9245 Spellblade update (#346)
* - tweak: Don't close eui too quickly.

* - add: Spellblade update.

* - fix: Cult teleport spell.
2024-06-11 23:07:47 +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
38ae317e71 Merge remote-tracking branch 'upstream/master' 2024-06-08 22:36:55 +03:00
Aviu00
d838e850c6 Ling tweak & faction cleanup (#337)
* - tweak: Ling tweaks.

* - fix: Faction cleanup.
2024-06-08 16:03:20 +03:00
Aviu00
4fde7aedee Маг (#336)
* GameRule, a lot of prototypes and FTL pending

* some protos

* - add: Magic additions, tweaks and bugfixes.

* - add: Wizard gamerule.

* - tweak: Do not call shuttle.

---------

Co-authored-by: melano <92106367+melanoTurbo@users.noreply.github.com>
2024-06-07 16:02:23 +00: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
Aviu00
152c9546a4 - add: TelefragSystem. (#333) 2024-06-06 13:23:00 +03:00
Aviu00
ad65bd1e58 Фиксы (#332)
* - fix: Fix desword flipping on server.

* - fix: Fix invalid cult target.

* - fix: Fix narsie summon.

* - tweak: Weaker heavy attack.

* - tweak: Less toy desword stamina damage.

* - fix: FrameUpdate.

* - tweak: Less blunt bleed.
2024-06-06 13:22:49 +03:00
Aviu00
a60d4eec45 Selectively revert PullController (#28126) (#330)
I am leaving the issues open and have updated #26547 with more info on what we should do long-term. This is just to bandaid the short-term complaining.

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-06-05 17:31:32 +03:00
Aviu00
2978834228 Esword stuff (#329)
* - fix: Fix black RGB.

* - add: Toy sword update.

* - add: FlipOnHitSystem.

* - tweak: Price reduction.
2024-06-05 17:31:21 +03:00
Aviu00
37e783174a - fix: YAML linter fixes. (#327) 2024-06-04 14:24:17 +03:00
Jabak
bcf4074eca Merge remote-tracking branch 'upstream/master' 2024-06-04 14:07:10 +03:00
Aviu00
9d1c014938 Вернуть трейлы от пуль (#270)
* - add: Bring back bullet trails.

* - add: Cvar, thinner trails.

* - add: Add option.
2024-06-04 14:00:48 +03:00
Jabak
d2b24c049d Merge remote-tracking branch 'upstream/master' 2024-06-03 19:54:40 +03:00
Aviu00
ad72eea8a1 - add: Cleanup TelescopeSystem. (#325) 2024-06-02 20:50:04 +03:00
Aviu00
231927a577 Security update (#323)
* add: security hud update

* access & fix names

* translates

* fix

* - fix: Fixes.

* - fix: Условно-досрочно.

---------

Co-authored-by: CaYpeN1 <artem7771art@gmail.com>
2024-06-01 16:28:21 +03:00
Aviu00
959b061da3 - tweak: Tweak sleep timer. (#322) 2024-06-01 15:42:16 +03:00
ThereDrD0
5a705ac195 Revert "[Feat] Обновление для визора СБ (#274)" (#320)
This reverts commit 3a5fcf35a5.
2024-06-01 14:12:12 +03:00
CaypenNow
3a5fcf35a5 [Feat] Обновление для визора СБ (#274)
* add: security hud update

* access & fix names

* translates

* fix
2024-06-01 10:30:21 +03:00
Jabak
d35247adc5 Merge remote-tracking branch 'upstream/master' 2024-05-31 23:12:21 +03:00
Remuchi
d4be4d3445 [Feat] Внешний вид и название канистр можно изменить прямо в игре (#317)
* feat: Теперь можно менять внешний вид канистр газов

* fix: русский язык (я его не знаю)
2024-05-30 17:28:53 +03:00
Aviu00
7f1825b713 Фиксы (#314)
* - fix: Fix surplus discount.

* - fix: Fix clumsy bolt barrage.

* - fix: Bookshelf fix error.

* - fix: Fix lying.

* - add: Monkeys can lie down.

* Revert "- fix: Fix surplus discount."

This reverts commit b89f9dc75fa7908198cfe054a7623d4effbe63d6.

* - remove: No shuttle wall reflect.
2024-05-30 15:12:24 +03:00
Jabkas
7282ac2471 Merge remote-tracking branch 'upstream/master' 2024-05-27 08:43:42 +03:00
ThereDrD0
5c89e83ca7 fix: literally autonetworkeed (#305) 2024-05-14 21:44:14 +03:00
Jabkas
2f47e707ea fix: fix popup 2024-05-14 17:53:11 +03:00