161 Commits

Author SHA1 Message Date
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
55a225f574 [Fix] Потенциальный фикс ТТС (#413)
* fix: possible tts fix??

* style: не втыкай
2024-07-02 18:56:53 +03:00
Jabak
8b2fbf6168 Merge remote-tracking branch 'upstream/master' 2024-07-01 00:53:56 +03:00
ThereDrD0
e9232e638c Another fixes and features (#392)
* fix: doorlights supports emagging now + fix emergency light

* add todo to PointLightAirlockSystem.cs

* tweak: reduce captain armor size

* fix: fix wt550 magazine stored rotation

* add: new lobby songs

* fix: fix lobby music rotation
2024-06-29 09:49:43 +03:00
Jabak
8de3924481 Merge remote-tracking branch 'upstream/master' 2024-06-28 11:45:35 +03:00
Aviu00
649ded64d6 Разное (#385)
* - add: Meatspike changes.

* - fix: Fix socks.

* - remove: No light status.

* - tweak: Raptor tweak.

* - fix: Fix exception.

* - remove: Remove unsexed.

* - tweak: Crossbow tweak.

* - add: More meatspike.

* - tweak: Nerf buff rune.

* - tweak: No throwing during incorporeal.

* - add: Incorporeal magic cooldown.
2024-06-26 14:56:29 +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
Jabak
56784ca0dc Merge remote-tracking branch 'upstream/master' 2024-06-13 09:07:23 +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
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
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
9d1c014938 Вернуть трейлы от пуль (#270)
* - add: Bring back bullet trails.

* - add: Cvar, thinner trails.

* - add: Add option.
2024-06-04 14:00:48 +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
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
Remuchi
d4be4d3445 [Feat] Внешний вид и название канистр можно изменить прямо в игре (#317)
* feat: Теперь можно менять внешний вид канистр газов

* fix: русский язык (я его не знаю)
2024-05-30 17:28:53 +03:00
Remuchi
28b714a318 fix: теперь в лобби можно прослушать голос 2024-04-20 12:38:13 +07:00
Remuchi
e2b6002076 Merge remote-tracking branch 'origin/master' into upstream
# Conflicts:
#	Content.Server/Antag/AntagSelectionSystem.cs
#	Content.Server/Changeling/ChangelingRuleSystem.cs
#	Content.Server/Changeling/ChangelingSystem.Abilities.cs
#	Content.Server/Doors/Systems/DoorSystem.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
#	Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
#	Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
#	Content.Server/Holosign/HolosignSystem.cs
#	Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
#	Content.Server/_White/Cult/GameRule/CultRuleComponent.cs
#	Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
#	Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs
#	Content.Server/_White/Keyhole/KeyholeSystem.cs
#	Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Content.Shared/_White/Keyhole/Components/KeyBaseComponent.cs
#	Resources/Locale/ru-RU/White/stuff.ftl/runes-entities.ftl
#	Resources/Locale/ru-RU/_white/cult/blood-spear.ftl
#	Resources/Locale/ru-RU/_white/cult/bolt-barrage.ftl
#	Resources/Locale/ru-RU/_white/cult/cult.ftl
#	Resources/Locale/ru-RU/_white/cult/gui.ftl
#	Resources/Locale/ru-RU/cult/cult-structure.ftl
#	Resources/Locale/ru-RU/cult/pylon.ftl
#	Resources/Maps/White/Scoupidia.yml
#	Resources/Maps/White/Void.yml
#	Resources/Maps/White/WonderBox.yml
#	Resources/Prototypes/Actions/types.yml
#	Resources/Prototypes/Atmospherics/gases.yml
#	Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
#	Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
#	Resources/Prototypes/Catalog/uplink_catalog.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
#	Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
#	Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
#	Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
#	Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
#	Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
#	Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
#	Resources/Prototypes/Entities/Structures/Walls/grille.yml
#	Resources/Prototypes/Entities/Structures/Walls/walls.yml
#	Resources/Prototypes/Entities/Structures/stairs.yml
#	Resources/Prototypes/_White/Entities/Objects/Misc/books.yml
2024-04-13 13:59:00 +07:00
Aviu00
4dc14d2105 - fix: Telescope works correctly maybe. (#277) 2024-04-07 21:22:25 +03:00
Aviu00
d8570b8bda - add: TelescopeSystem. (#273) 2024-04-06 15:31:51 +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
CaypenNow
b635d4efaf [Feat] Interactive Board (#258)
* interactive board

* change2

* fixes
2024-04-02 17:17:43 +03:00
Remuchi
fa18556a8f Я скучаю так очень, забери меня срочно 2024-03-28 00:13:47 +07:00
Remuchi
96238b0fb8 И твой сорванный голос мне напомнит о прошлом 2024-03-27 21:23:18 +07:00
CaYpeN1
afc0d5f713 fix 2024-03-25 21:18:12 +05:00
CaYpeN1
1cb4c29d15 new methods 2024-03-24 16:00:19 +05:00
CaYpeN1
ce98d8157c fix 2024-03-24 14:35:45 +05:00
CaYpeN1
a9b67840c0 Merge remote-tracking branch 'origin/master' into weapon-modules 2024-03-24 14:03:24 +05:00
CaYpeN1
4b79f1e2e0 change components, remake system 2024-03-22 16:27:51 +05:00
Aviu00
74ef19d6a6 Cult update (#220)
* - tweak: Cult door not bump openable.

* - tweak: Better summoning and Narsie

* - tweak: Construct update.

* - tweak: Eldrich blade fits in suit storage.

* - tweak: More spell limit.

* - fix: Fix pylon desc.

* - tweak: Teleport works on cuffed targets.

* - tweak: More popups if target is holy.

* - fix: No rune drawing using fingers.

* - tweak: Better pylon placement & less pylon healing range.

* - tweak: More blood rites charge.

* - fix: Fix max spell amount.

* - tweak: Less cult door and wall health.

* - fix: Constructs are dead IC.

* - add: Revive rune now notifies player.

* - add: Narsie summon rune eui.

* - fix: Fix narsie summon sound not playing for reapers.

* - tweak: Whatever.

* - add: Conceal presence spell.

* - tweak: Tweakz.

* - add: Blood spear.

* - add: Blood boil barrage.

* - tweak: Artificer flies.

* - tweak: Blood bolt color tweaks.

* - tweak: Runic door is bump openable again.

* - fix: Fix concealed door outline.

* - add: Update concealable name and desc.

* - tweak: Remove the unremoveable.

* - tweak: Gift ignore.

* - add: Organs regenerate on rejuvenate.

* - tweak: Brainless cultist is fine.

* - add: Added more fun.

* - add: Add rune descriptions.

* - fix: Fixes.

* - tweak: Blood rites now uses verb.

* - tweak: Bring it back.
2024-03-22 08:23:33 +00:00
CaYpeN1
731eb640bc Merge remote-tracking branch 'origin/master' into weapon-modules
# Conflicts:
#	Resources/Prototypes/Recipes/Lathes/security.yml
2024-03-21 11:01:20 +05:00
Valtos
f6b107353a - add: OldNeoInterface (#108)
* ebal

* setup gui

* AAAAAAAAAA EBLAN
2024-03-20 22:54:45 +03:00
CaYpeN1
796a1f3d5d add: new modules, sprite visuals, client and shared logic 2024-03-20 21:07:17 +05:00
CaYpeN1
ff681c54d8 add: try add sprite module. attemp 1 2024-03-19 18:58:24 +05:00
Aviu00
c05a1d09c2 Ling update (#183)
* - add: Augmented Eyesight.

* - add: Dissonant Shriek.

* - tweak: Nuke use delays.

* - tweak: Tweak chemical regeneration and chemical costs.

* - add: Add chitinous helmet.

* - fix: Fix chem regeneration while dead.

* - tweak: Faster fleshmend.

* - add: Void Adaptation.

* - tweak: No lesser form delay.

* - tweak: Lesser form tweaks.

* - tweak: Stasis doafter is hidden now.

* - add: Refund after absorbing.

* - tweak: Some tweaks.
2024-03-13 19:19:30 +03:00
rhailrake
c08cdeb84d Залью спеллы потестить, мне похуй ПР НОМЕР 156
* refactor CheZaHuetaMagicSystem

* эщкере

* alt-spells system. lmb, rmb, alt-click

* fix

* ChargeSpellsIndicator + Visual(CheZaHueta)

* Custom charge effect for spell

* Custom MaxChargeLevel

* Finally. Alt spells seems to work!! Need to start do spells and gamerule

* fuckkk

* fix crash, actually burn scroll..

* some fixes blyat

* ArcSpell

* очередная CheZaHuetaSystem, ForceSpell

* ONI'SOMA!

* mraow

* prepare this LMAO

* Yebanyy rot etogo kazino blyat! - CardsSpell

* forcewall

* nig

* blink

* Ethereal Jaunt

* игра говно

* Блядина

* ну на еще спеллов

* blyadina

* да иди ты нахуй БЛЯДЬ

* кто прочитал, тот сдохнет. сделай 5 репостов чтобы выжить....

* icons

* та ваще поебать

* одежда
2024-03-07 16:01:54 +00:00
Remuchi
477dedc014 [Feat] Mindslave - имплант подчинения (#152)
* tweak: стандартизация названий имплантеров

* add: mindslave implant

* add: briefing, uplink listing, overlay icons

* add: new mindslave overlay icons by JustNemo

* remove: ненужный файлик удалён

* fix: фикс доставания импланта подчинения
2024-03-02 21:17:52 +07:00
Aviu00
71ca698a7c Spells stuff (#153)
* -add: Create and remove blood spells using verbs.

* - add: Blood spells now have charges and disappear.

* - add: Localize spells.

* - add: New blood spells.
2024-03-01 15:44:27 +07: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
Remuchi
fe82255139 [Fix]: Исправлено отображение урона в УИ анализатора здоровья (#77)
* fix: возвращено отображение урона в сканере здоровья

* add: сканер здоровья только те группы, где есть урон
2024-02-15 18:08:30 +00:00
Aviu00
e1554aca28 - fix: Night vision fix. (#33) 2024-02-07 10:30:49 +00:00
rhailrake
551133a07d - tweak: we white dream again 2024-02-07 02:12:50 +06:00
Aviu00
1105109152 - add: Toggleable night vision (#31)
* - add: Toggleable night vision

* - add: Add death squad huds & night vision
2024-02-06 15:40:41 +00:00