From 470c940832678a3994695197141ea5720953b723 Mon Sep 17 00:00:00 2001 From: pofitlo Date: Wed, 1 Jan 2025 18:32:36 +0400 Subject: [PATCH] fix --- .../_CorvaxNext/Overlays/ListenUpOverlay.cs | 2 +- .../_CorvaxNext/Overlays/ListenUpSystem.cs | 4 ++-- .../Resomi/Abilities/ListenUpSkillSystem.cs | 1 - .../Resomi/Abilities/ListenUpSystem.cs | 1 - .../Abilities/Hearing/ListenUpComponent.cs | 2 +- .../Entities/Mobs/Player/humanoid.yml | 2 +- .../Specific/Anomaly/anomaly_injectors.yml | 20 +++++++++---------- Resources/Prototypes/Traits/speech.yml | 2 +- 8 files changed, 16 insertions(+), 18 deletions(-) diff --git a/Content.Client/_CorvaxNext/Overlays/ListenUpOverlay.cs b/Content.Client/_CorvaxNext/Overlays/ListenUpOverlay.cs index d19bd87876c..880894ef789 100644 --- a/Content.Client/_CorvaxNext/Overlays/ListenUpOverlay.cs +++ b/Content.Client/_CorvaxNext/Overlays/ListenUpOverlay.cs @@ -30,7 +30,7 @@ public sealed class ListenUpOverlay : Overlay public override bool RequestScreenTexture => true; public override OverlaySpace Space => OverlaySpace.WorldSpace; - public ListenUpOverlay(float radius, SpriteSpecifier.Rsi sprite) + public ListenUpOverlay(float radius, SpriteSpecifier sprite) { IoCManager.InjectDependencies(this); diff --git a/Content.Client/_CorvaxNext/Overlays/ListenUpSystem.cs b/Content.Client/_CorvaxNext/Overlays/ListenUpSystem.cs index e3950cfb300..de00569f9bc 100644 --- a/Content.Client/_CorvaxNext/Overlays/ListenUpSystem.cs +++ b/Content.Client/_CorvaxNext/Overlays/ListenUpSystem.cs @@ -68,8 +68,8 @@ private void SwithOverlay(Entity ent, bool active) UpdateOverlay(active, overlay); } - private Overlay ListenUp(float radius, SpriteSpecifier.Rsi sprite) + private Overlay ListenUp(float radius, SpriteSpecifier sprite) { - return _listenUpOverlay = new ListenUpOverlay(radius, sprite); + return _listenUpOverlay = new(radius, sprite); } } diff --git a/Content.Server/_CorvaxNext/Resomi/Abilities/ListenUpSkillSystem.cs b/Content.Server/_CorvaxNext/Resomi/Abilities/ListenUpSkillSystem.cs index e50dd36e23a..166768edfda 100644 --- a/Content.Server/_CorvaxNext/Resomi/Abilities/ListenUpSkillSystem.cs +++ b/Content.Server/_CorvaxNext/Resomi/Abilities/ListenUpSkillSystem.cs @@ -12,6 +12,5 @@ public override void Initialize() private void OnComponentInit(Entity ent, ref ComponentInit args) { _actionsSystem.AddAction(ent.Owner, ref ent.Comp.SwitchListenUpActionEntity, ent.Comp.SwitchListenUpAction, ent.Owner); - } } diff --git a/Content.Server/_CorvaxNext/Resomi/Abilities/ListenUpSystem.cs b/Content.Server/_CorvaxNext/Resomi/Abilities/ListenUpSystem.cs index 186030b411e..203bc388e08 100644 --- a/Content.Server/_CorvaxNext/Resomi/Abilities/ListenUpSystem.cs +++ b/Content.Server/_CorvaxNext/Resomi/Abilities/ListenUpSystem.cs @@ -12,7 +12,6 @@ public sealed class ListenUpSystem : EntitySystem [Dependency] protected readonly SharedPopupSystem _popup = default!; public override void Initialize() { - base.Initialize(); SubscribeLocalEvent(OnListenStartup); } private void OnListenStartup(Entity ent, ref ComponentStartup args) diff --git a/Content.Shared/_CorvaxNext/Resomi/Abilities/Hearing/ListenUpComponent.cs b/Content.Shared/_CorvaxNext/Resomi/Abilities/Hearing/ListenUpComponent.cs index 5b78cf102ff..981c15c20bc 100644 --- a/Content.Shared/_CorvaxNext/Resomi/Abilities/Hearing/ListenUpComponent.cs +++ b/Content.Shared/_CorvaxNext/Resomi/Abilities/Hearing/ListenUpComponent.cs @@ -9,5 +9,5 @@ public sealed partial class ListenUpComponent : Component public float radius = 8f; [DataField] - public SpriteSpecifier.Rsi Sprite = new SpriteSpecifier.Rsi(new("/Textures/_CorvaxNext/Mobs/Species/Resomi/Abilities/noise_effect.rsi"), "noise"); + public SpriteSpecifier Sprite = new SpriteSpecifier.Rsi(new("/Textures/_CorvaxNext/Mobs/Species/Resomi/Abilities/noise_effect.rsi"), "noise"); } diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 88a5e1170e0..23eae8985eb 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -4,7 +4,7 @@ id: EventHumanoid # start-backmen: species speciesBlacklist: - - Resomi + - Resomi # Corvax-Next-Resomi - Monkey - Kobold # end-backmen: species diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml index 2ddb718b9f0..4f78985dea0 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml @@ -56,7 +56,7 @@ Vox: sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi state: fire_VOX - Resomi: #Corvax-Next-Resomi + Resomi: # Corvax-Next-Resomi sprite: _CorvaxNext/Structures/Specific/Anomalies/inner_anom_layer.rsi state: fire_RESOMI @@ -88,7 +88,7 @@ Vox: sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi state: shock_VOX - Resomi: #Corvax-Next-Resomi + Resomi: # Corvax-Next-Resomi sprite: _CorvaxNext/Structures/Specific/Anomalies/inner_anom_layer.rsi state: shock_RESOMI @@ -120,7 +120,7 @@ Vox: sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi state: shadow_VOX - Resomi: #Corvax-Next-Resomi + Resomi: # Corvax-Next-Resomi sprite: _CorvaxNext/Structures/Specific/Anomalies/inner_anom_layer.rsi state: shadow_RESOMI @@ -152,7 +152,7 @@ Vox: sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi state: frost_VOX - Resomi: #Corvax-Next-Resomi + Resomi: # Corvax-Next-Resomi sprite: _CorvaxNext/Structures/Specific/Anomalies/inner_anom_layer.rsi state: frost_RESOMI @@ -184,7 +184,7 @@ Vox: sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi state: flora_VOX - Resomi: #Corvax-Next-Resomi + Resomi: # Corvax-Next-Resomi sprite: _CorvaxNext/Structures/Specific/Anomalies/inner_anom_layer.rsi state: flora_RESOMI @@ -216,7 +216,7 @@ Vox: sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi state: bluespace_VOX - Resomi: #Corvax-Next-Resomi + Resomi: # Corvax-Next-Resomi sprite: _CorvaxNext/Structures/Specific/Anomalies/inner_anom_layer.rsi state: bluespace_RESOMI @@ -248,7 +248,7 @@ Vox: sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi state: flesh_VOX - Resomi: #Corvax-Next-Resomi + Resomi: # Corvax-Next-Resomi sprite: _CorvaxNext/Structures/Specific/Anomalies/inner_anom_layer.rsi state: flesh_RESOMI @@ -280,7 +280,7 @@ Vox: sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi state: grav_VOX - Resomi: #Corvax-Next-Resomi + Resomi: # Corvax-Next-Resomi sprite: _CorvaxNext/Structures/Specific/Anomalies/inner_anom_layer.rsi state: grav_RESOMI @@ -312,7 +312,7 @@ Vox: sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi state: tech_VOX - Resomi: #Corvax-Next-Resomi + Resomi: # Corvax-Next-Resomi sprite: _CorvaxNext/Structures/Specific/Anomalies/inner_anom_layer.rsi state: tech_RESOMI @@ -345,7 +345,7 @@ Vox: sprite: Structures/Specific/Anomalies/inner_anom_layer.rsi state: rock_VOX - Resomi: #Corvax-Next-Resomi + Resomi: # Corvax-Next-Resomi sprite: _CorvaxNext/Structures/Specific/Anomalies/inner_anom_layer.rsi state: rock_RESOMI diff --git a/Resources/Prototypes/Traits/speech.yml b/Resources/Prototypes/Traits/speech.yml index a88108bf7dc..73c19825a8f 100644 --- a/Resources/Prototypes/Traits/speech.yml +++ b/Resources/Prototypes/Traits/speech.yml @@ -13,7 +13,7 @@ - type: MothAccent - type: ReplacementAccent accent: dwarf - - type: ResomiAccent #Corvax-Next-Resomi + - type: ResomiAccent # Corvax-Next-Resomi # 1 Cost