Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Фикс недоработок предыдуших пров #267

Merged
merged 2 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Shared/ADT/Crawling/CrawlerComponent.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Content.Shared.Alert;
using Robust.Shared.Prototypes;

namespace Content.Shared.Crawling;
namespace Content.Shared.ADT.Crawling;

[RegisterComponent]
public sealed partial class CrawlerComponent : Component
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/ADT/Crawling/CrawlingComponent.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Robust.Shared.GameStates;
using Robust.Shared.Serialization;

namespace Content.Shared.Crawling;
namespace Content.Shared.ADT.Crawling;

[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(CrawlingSystem))]
public sealed partial class CrawlingComponent : Component
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/ADT/Crawling/CrawlingSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using Content.Shared.Movement.Systems;
using Content.Shared.Alert;

namespace Content.Shared.Crawling;
namespace Content.Shared.ADT.Crawling;
public sealed partial class CrawlingSystem : EntitySystem
{
[Dependency] private readonly StandingStateSystem _standing = default!;
Expand Down
4 changes: 2 additions & 2 deletions Content.Shared/Stunnable/SharedStunSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
using Content.Shared.StatusEffect;
using Content.Shared.Throwing;
using Robust.Shared.Audio.Systems;
using Content.Shared.Crawling;
using Content.Shared.ADT.Crawling;

namespace Content.Shared.Stunnable;

Expand Down Expand Up @@ -112,7 +112,7 @@ private void OnKnockInit(EntityUid uid, KnockedDownComponent component, Componen

private void OnKnockShutdown(EntityUid uid, KnockedDownComponent component, ComponentShutdown args)
{
if (HasComp<CrawlerComponent>(uid))
if (HasComp<CrawlerComponent>(uid)) // ADT crawling
return;
_standingState.Stand(uid);
}
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ADT/alerts/alerts.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
alerts-crawling-name = Ползание
alerts-crawling-desc = Вы ползёте, нажмите С чтобы встать.
4 changes: 1 addition & 3 deletions Resources/Locale/ru-RU/alerts/alerts.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,4 @@ alerts-magboots-desc = Вы невосприимчивы к потокам ве
#alerts-revenant-essence-name = Эссенция
#alerts-revenant-essence-desc = Сила душ. Поддерживает вас и используется при использовании способностей. Медленно восстанавливается с течением времени.
#alerts-revenant-corporeal-name = Материальность
#alerts-revenant-corporeal-desc = Вы физически воплотились. Окружающие могут видеть и наносить вам вред.
alerts-crawling-name = Ползание
alerts-crawling-desc = Вы ползёте, нажмите С чтобы встать.
#alerts-revenant-corporeal-desc = Вы физически воплотились. Окружающие могут видеть и наносить вам вред.
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ ui-options-parallax-low-quality = Низкокачественный парал
ui-options-fps-counter = Показать счётчик FPS
ui-options-vp-width = Ширина окна игры:
ui-options-hud-layout = Тип HUD:
ui-options-function-toggle-crawling = Переключить ползание
ui-options-function-toggle-crawling = Переключить ползание #ADT Crawling

## Controls menu

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
markingCategory: HeadTop
sponsorOnly: true
sprites:
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi
- sprite: ADT/Mobs/Customization/Sponsor/horns.rsi
state: durak

- type: marking
Expand All @@ -13,7 +13,7 @@
markingCategory: HeadTop
sponsorOnly: true
sprites:
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi
- sprite: ADT/Mobs/Customization/Sponsor/horns.rsi
state: horn1

- type: marking
Expand All @@ -22,7 +22,7 @@
markingCategory: HeadTop
sponsorOnly: true
sprites:
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi
- sprite: ADT/Mobs/Customization/Sponsor/horns.rsi
state: horn2

- type: marking
Expand All @@ -31,7 +31,7 @@
markingCategory: HeadTop
sponsorOnly: true
sprites:
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi
- sprite: ADT/Mobs/Customization/Sponsor/horns.rsi
state: horn3

- type: marking
Expand All @@ -40,7 +40,7 @@
markingCategory: HeadTop
sponsorOnly: true
sprites:
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi
- sprite: ADT/Mobs/Customization/Sponsor/horns.rsi
state: horn4

- type: marking
Expand All @@ -49,7 +49,7 @@
markingCategory: HeadTop
sponsorOnly: true
sprites:
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi
- sprite: ADT/Mobs/Customization/Sponsor/horns.rsi
state: horn5

- type: marking
Expand All @@ -58,7 +58,7 @@
markingCategory: HeadTop
sponsorOnly: true
sprites:
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi
- sprite: ADT/Mobs/Customization/Sponsor/horns.rsi
state: horn6

- type: marking
Expand All @@ -67,7 +67,7 @@
markingCategory: HeadTop
sponsorOnly: true
sprites:
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi
- sprite: ADT/Mobs/Customization/Sponsor/horns.rsi
state: lord

- type: marking
Expand All @@ -76,7 +76,7 @@
markingCategory: HeadTop
sponsorOnly: true
sprites:
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi
- sprite: ADT/Mobs/Customization/Sponsor/horns.rsi
state: oldpain

- type: marking
Expand All @@ -85,7 +85,7 @@
markingCategory: HeadTop
sponsorOnly: true
sprites:
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi
- sprite: ADT/Mobs/Customization/Sponsor/horns.rsi
state: tavrhorn

- type: marking
Expand All @@ -94,7 +94,7 @@
markingCategory: HeadTop
sponsorOnly: true
sprites:
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi
- sprite: ADT/Mobs/Customization/Sponsor/horns.rsi
state: telehorn

- type: marking
Expand All @@ -103,5 +103,5 @@
markingCategory: HeadTop
sponsorOnly: true
sprites:
- sprite: ADT/Entities/Mobs/Customization/Markings/horns/head.rsi
- sprite: ADT/Mobs/Customization/Sponsor/horns.rsi
state: vampirehorn
Binary file removed Resources/Prototypes/Alerts/Alerts.lnk
Binary file not shown.
Loading