diff --git a/Content.Shared/ADT/Crawling/CrawlerComponent.cs b/Content.Shared/ADT/Crawling/CrawlerComponent.cs index 9f0c176fdc2..7b06924f64f 100644 --- a/Content.Shared/ADT/Crawling/CrawlerComponent.cs +++ b/Content.Shared/ADT/Crawling/CrawlerComponent.cs @@ -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 diff --git a/Content.Shared/ADT/Crawling/CrawlingComponent.cs b/Content.Shared/ADT/Crawling/CrawlingComponent.cs index cdf60b394b5..76176040131 100644 --- a/Content.Shared/ADT/Crawling/CrawlingComponent.cs +++ b/Content.Shared/ADT/Crawling/CrawlingComponent.cs @@ -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 diff --git a/Content.Shared/ADT/Crawling/CrawlingSystem.cs b/Content.Shared/ADT/Crawling/CrawlingSystem.cs index 72259399543..284aedd23b4 100644 --- a/Content.Shared/ADT/Crawling/CrawlingSystem.cs +++ b/Content.Shared/ADT/Crawling/CrawlingSystem.cs @@ -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!; diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs index 906ed2dd124..8c2ffad818b 100644 --- a/Content.Shared/Stunnable/SharedStunSystem.cs +++ b/Content.Shared/Stunnable/SharedStunSystem.cs @@ -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; @@ -112,7 +112,7 @@ private void OnKnockInit(EntityUid uid, KnockedDownComponent component, Componen private void OnKnockShutdown(EntityUid uid, KnockedDownComponent component, ComponentShutdown args) { - if (HasComp(uid)) + if (HasComp(uid)) // ADT crawling return; _standingState.Stand(uid); } diff --git a/Resources/Locale/ru-RU/ADT/alerts/alerts.ftl b/Resources/Locale/ru-RU/ADT/alerts/alerts.ftl new file mode 100644 index 00000000000..de6b88eb5b8 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/alerts/alerts.ftl @@ -0,0 +1,2 @@ +alerts-crawling-name = Ползание +alerts-crawling-desc = Вы ползёте, нажмите С чтобы встать. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/alerts/alerts.ftl b/Resources/Locale/ru-RU/alerts/alerts.ftl index 6f0c3295726..19270c3f1a0 100644 --- a/Resources/Locale/ru-RU/alerts/alerts.ftl +++ b/Resources/Locale/ru-RU/alerts/alerts.ftl @@ -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 = Вы ползёте, нажмите С чтобы встать. \ No newline at end of file +#alerts-revenant-corporeal-desc = Вы физически воплотились. Окружающие могут видеть и наносить вам вред. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl index c72e7b4b081..dd507b44ed6 100644 --- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl @@ -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 diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/sponsor.yml b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/sponsor.yml index c714c9103d9..2ecece6fadb 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/sponsor.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Customization/Markings/sponsor.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/Resources/Prototypes/Alerts/Alerts.lnk b/Resources/Prototypes/Alerts/Alerts.lnk deleted file mode 100644 index 569e23e036d..00000000000 Binary files a/Resources/Prototypes/Alerts/Alerts.lnk and /dev/null differ diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/durak.png b/Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/durak.png similarity index 100% rename from Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/durak.png rename to Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/durak.png diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn1.png b/Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/horn1.png similarity index 100% rename from Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn1.png rename to Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/horn1.png diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn2.png b/Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/horn2.png similarity index 100% rename from Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn2.png rename to Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/horn2.png diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn3.png b/Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/horn3.png similarity index 100% rename from Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn3.png rename to Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/horn3.png diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn4.png b/Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/horn4.png similarity index 100% rename from Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn4.png rename to Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/horn4.png diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn5.png b/Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/horn5.png similarity index 100% rename from Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn5.png rename to Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/horn5.png diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn6.png b/Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/horn6.png similarity index 100% rename from Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/horn6.png rename to Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/horn6.png diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/lord.png b/Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/lord.png similarity index 100% rename from Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/lord.png rename to Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/lord.png diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/meta.json b/Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/meta.json rename to Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/meta.json diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/oldpain.png b/Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/oldpain.png similarity index 100% rename from Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/oldpain.png rename to Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/oldpain.png diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/tavrhorn.png b/Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/tavrhorn.png similarity index 100% rename from Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/tavrhorn.png rename to Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/tavrhorn.png diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/telehorn.png b/Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/telehorn.png similarity index 100% rename from Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/telehorn.png rename to Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/telehorn.png diff --git a/Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/vampirehorn.png b/Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/vampirehorn.png similarity index 100% rename from Resources/Textures/ADT/Entities/Mobs/Customization/Markings/horns/head.rsi/vampirehorn.png rename to Resources/Textures/ADT/Mobs/Customization/Sponsor/horns.rsi/vampirehorn.png