Resomi #27

pofitlo-Git · 2024-11-08T12:02:42Z

Описание PR

Добавление новой расы - Резоми

Технические детали

Имеют примерно следующие функции

Они получают на 30% больше любого урона, кроме обморожения
у них есть переключаемая способность, которая позволяет им перепрыгивать через столы и незначительно ускоряться, но взамен тратит значительное количество выносливости
Вспышки действуют на них в 2 рааа дольше из за чувствительных глаз
Они не могут использовать крупнокалиберное оружие, в виду того, что у них всегда будет высокий разброс с ним
Слышат шепот на 4 тайла

Медиа

Требования

Я прочитал(а) и следую Рекомендациям по оформлению Pull Request и Changelog.
Я добавил(а) медиафайлы к этому PR или он не требует демонстрации в игре.

Критические изменения

Добавление к FlashSystem модификатора для продления действия вспышки

Список изменений

Переместить мой ПР с репозитория оффов
полностью закончить с локализацией
Добавить дисплейсмент карты для одежды (нужно будет проверить)
Добавить способность для переключения "ловкости"
Добавить запрет на использование КК оружия
Добавить уникальный дефект речи
Улучшить слух, увеличив радиус слышимости шепота
Добавить недостающие спрайты + протестить на баланс/баги/дизайн/артефакты
ЧЕЙНДЖЛОГЕРУ Пока что доступно только админам - By AwareFoxy
🆑
add: добавлена новая игровая раса - Резоми!

github-actions · 2024-11-08T12:03:28Z

RSI Diff Bot; head commit 7daaf2d merging into eeb5f18
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/bone_armor.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/cult_armour.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/heavy.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/heavygreen.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/heavyred.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/magusblue.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/magusred.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/security.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-light-resomi			Added
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Bio/cmo.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Bio/general.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Bio/janitor.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Bio/scientist.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Bio/security.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Bio/virology.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/bomber.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/brigmedic.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/clownpriest.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/dogi.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_rd.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_physician.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_senior_researcher.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/pirate.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/trenchcoat.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Coats/windbreaker_paramedic.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/mime.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/apron.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/apronbar.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/apronbotanist.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/apronchef.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/chaplain_hoodie.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/chef.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/classicponcho.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/cultrobes.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/flannel_jacket.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added
open-equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/hospitalgown.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/judge.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/poncho.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/santa.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi

State	Old	New	Status
body-overlay-2-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/ancient_voidsuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/carpsuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/chicken.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/iansuit.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/shrine-maiden.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Resources/Textures/Clothing/OuterClothing/Suits/witchrobe.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-resomi			Added

Edit: diff updated after 7daaf2d

kosticia · 2024-11-08T17:14:01Z

Здоровье не меняй, молю. На серверах где есть сранные фелиниды их лечат по полтора часа так как на автомате бьют дефибом когда у них 200 урона

Content.Server/_CorvaxNext/Resomi/Abilities/ResomiSkillSystem.cs

Content.Server/_CorvaxNext/Resomi/Abilities/ResomiSkillComponent.cs

PuroSlavKing · 2024-11-10T08:10:20Z

KFC UPDATE, легенда 🙏

Tornado-Technology · 2024-11-10T09:46:56Z

No way. кажись надо будит шутить про open blance PR

AwareFoxy · 2024-11-10T15:00:09Z

No way. кажись надо будит шутить про open blance PR

про диздок PR

pofitlo-Git · 2024-11-19T11:46:23Z

@Tornado-Technology
@AwareFoxy

Прошу ревью кода и прототипов. На ошибки я открою его, когда доделаю спрайты

FireNameFN · 2024-11-19T12:17:51Z

@Tornado-Technology @AwareFoxy

Прошу ревью кода и прототипов. На ошибки я открою его, когда доделаю спрайты

Ну да, ну да, пошёл я нафиг.

Я тебе сейчас такой разгромный ревью напишу.

FireNameFN

Для начала.

Content.Server/Flash/FlashSystem.cs

Content.Shared/_CorvaxNext/Flash/Components/FlashModifierComponent.cs

Content.Server/_CorvaxNext/Speech/Components/ResomiAccentComponent.cs

Content.Shared/_CorvaxNext/Resomi/Abilities/WeaponsUseInabilityComponent.cs

Content.Shared/_CorvaxNext/Resomi/Abilities/SharedAgillitySkillSystem.cs

Content.Server/_CorvaxNext/Resomi/Abilities/AgillitySkillSystem.cs

AwareFoxy

норм

Content.Server/_CorvaxNext/Resomi/Abilities/ResomiSkillComponent.cs

Content.Server/Chat/ChatComponent.cs

github-actions · 2024-11-22T22:17:36Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

pofitlo-Git · 2024-11-23T00:42:32Z

что?... у меня... нет компонента абилки со стороны сервера.... только в шейреде.....

github-actions · 2024-11-24T12:43:19Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Resources/Locale/ru-RU/species/species.ftl

Content.Server/Chat/Systems/ChatSystem.cs

Content.Server/Chat/ChatComponent.cs

Content.Shared/_CorvaxNext/Resomi/Abilities/SharedAgillitySkillSystem.cs

Content.Shared/_CorvaxNext/Resomi/Abilities/WeaponsUseInabilityComponent.cs

Content.Shared/_CorvaxNext/Resomi/Abilities/SharedAgillitySkillSystem.cs

FireNameFN · 2024-11-25T23:04:24Z

Да не слушай его. Обратно разбивай.

do not spam IFs

resomi

07f5191

pofitlo-Git requested a review from Morb0 as a code owner November 8, 2024 12:02

github-actions bot added Status: Needs Review Changes: Sprites Changes: Localization Изменяет локализацию and removed Status: Needs Review labels Nov 8, 2024

pofitlo-Git marked this pull request as draft November 8, 2024 12:03

locale + fix sprites

449e489

AwareFoxy requested review from AwareFoxy and FireNameFN November 9, 2024 00:54

github-actions bot added the Status: Needs Review label Nov 9, 2024

FireNameFN requested changes Nov 9, 2024

View reviewed changes

Content.Server/_CorvaxNext/Resomi/Abilities/ResomiSkillSystem.cs Outdated Show resolved Hide resolved

Content.Server/_CorvaxNext/Resomi/Abilities/ResomiSkillComponent.cs Outdated Show resolved Hide resolved

pofitlo-Git added 3 commits November 12, 2024 12:53

displacements

5e67096

add sprites (not full (need to check up)) + agillity skill

b5c1492

some stuff

0a3536c

AwareFoxy requested review from Tornado-Technology and Vonsant and removed request for Morb0 November 18, 2024 19:37

FireNameFN requested changes Nov 19, 2024

View reviewed changes

pofitlo-Git marked this pull request as ready for review November 20, 2024 12:22

pofitlo-Git added 2 commits November 20, 2024 16:25

-_-

c71ec36

фыф

5d6a8bb

AwareFoxy previously approved these changes Nov 22, 2024

View reviewed changes

github-actions bot added the Merge Conflict МерджКонфликт label Nov 22, 2024

Merge branch 'master' into Resomi

7205105

AwareFoxy dismissed their stale review via 7205105 November 23, 2024 13:10

github-actions bot removed the Merge Conflict МерджКонфликт label Nov 23, 2024

add

f7564d1

github-actions bot added the S: Merge Conflict У ПРа есть мердж конфликт label Nov 24, 2024

fix

2d2280a

github-actions bot added the size/XL label Nov 24, 2024

Merge branch 'master' into Resomi

f232347

github-actions bot removed the S: Merge Conflict У ПРа есть мердж конфликт label Nov 24, 2024

pofitlo-Git added 2 commits November 25, 2024 08:38

Add sprites

475f791

localisation

a0e1528

github-actions bot added size/L and removed size/XL labels Nov 25, 2024

FireNameFN previously requested changes Nov 25, 2024

View reviewed changes

fix

6d52602

AwareFoxy reviewed Nov 25, 2024

View reviewed changes

Content.Shared/_CorvaxNext/Resomi/Abilities/SharedAgillitySkillSystem.cs Outdated Show resolved Hide resolved

вы нахуй меня дрочите?!!

7daaf2d

AwareFoxy merged commit 46bb84e into space-syndicate:master Nov 25, 2024
4 checks passed

This comment was marked as outdated.

Sign in to view

Hyrmik mentioned this pull request Dec 9, 2024

Big Fucking Universe Update AdventureTimeSS14/space_station_ADT#741

Draft

14 tasks

PuroSlavKing mentioned this pull request Dec 18, 2024

[Port] Resomi WWhiteDreamProject/wwdpublic#172

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Resomi #27

Resomi #27

pofitlo-Git commented Nov 8, 2024 •

edited by AwareFoxy

Loading

github-actions bot commented Nov 8, 2024 •

edited

Loading

kosticia commented Nov 8, 2024

PuroSlavKing commented Nov 10, 2024

Tornado-Technology commented Nov 10, 2024

AwareFoxy commented Nov 10, 2024

pofitlo-Git commented Nov 19, 2024 •

edited

Loading

FireNameFN commented Nov 19, 2024

FireNameFN left a comment

AwareFoxy left a comment

github-actions bot commented Nov 22, 2024

pofitlo-Git commented Nov 23, 2024

github-actions bot commented Nov 24, 2024

FireNameFN commented Nov 25, 2024

This comment was marked as outdated.

Resomi #27

Resomi #27

Conversation

pofitlo-Git commented Nov 8, 2024 • edited by AwareFoxy Loading

Описание PR

Технические детали

Медиа

Требования

Критические изменения

github-actions bot commented Nov 8, 2024 • edited Loading

kosticia commented Nov 8, 2024

PuroSlavKing commented Nov 10, 2024

Tornado-Technology commented Nov 10, 2024

AwareFoxy commented Nov 10, 2024

pofitlo-Git commented Nov 19, 2024 • edited Loading

FireNameFN commented Nov 19, 2024

FireNameFN left a comment

Choose a reason for hiding this comment

AwareFoxy left a comment

Choose a reason for hiding this comment

github-actions bot commented Nov 22, 2024

pofitlo-Git commented Nov 23, 2024

github-actions bot commented Nov 24, 2024

FireNameFN commented Nov 25, 2024

This comment was marked as outdated.

pofitlo-Git commented Nov 8, 2024 •

edited by AwareFoxy

Loading

github-actions bot commented Nov 8, 2024 •

edited

Loading

pofitlo-Git commented Nov 19, 2024 •

edited

Loading