diff --git a/Content.Client/SS220/CultYogg/Cultists/CleansingVisualizerSystem.cs b/Content.Client/SS220/CultYogg/Cultists/PurifyingVisualizerSystem.cs
similarity index 59%
rename from Content.Client/SS220/CultYogg/Cultists/CleansingVisualizerSystem.cs
rename to Content.Client/SS220/CultYogg/Cultists/PurifyingVisualizerSystem.cs
index 6e19d8b5f76555..00d839f4833077 100644
--- a/Content.Client/SS220/CultYogg/Cultists/CleansingVisualizerSystem.cs
+++ b/Content.Client/SS220/CultYogg/Cultists/PurifyingVisualizerSystem.cs
@@ -6,45 +6,45 @@ namespace Content.Client.SS220.CultYogg.Cultists;
///
///
-public sealed class CleansingVisualizerSystem : VisualizerSystem
+public sealed class PurifyingVisualizerSystem : VisualizerSystem
{
public override void Initialize()
{
base.Initialize();
- SubscribeLocalEvent(OnComponentInit);
- SubscribeLocalEvent(OnShutdown);
+ SubscribeLocalEvent(OnComponentInit);
+ SubscribeLocalEvent(OnShutdown);
}
- private void OnShutdown(Entity uid, ref ComponentShutdown args)
+ private void OnShutdown(Entity uid, ref ComponentShutdown args)
{
// Need LayerMapTryGet because Init fails if there's no existing sprite / appearancecomp
// which means in some setups (most frequently no AppearanceComp) the layer never exists.
if (TryComp(uid, out var sprite) &&
- sprite.LayerMapTryGet(CleansingVisualLayers.Particles, out var layer))
+ sprite.LayerMapTryGet(PurifyingVisualLayers.Particles, out var layer))
{
sprite.RemoveLayer(layer);
}
}
- private void OnComponentInit(Entity uid, ref ComponentInit args)
+ private void OnComponentInit(Entity uid, ref ComponentInit args)
{
if (!TryComp(uid, out var sprite) || !TryComp(uid, out AppearanceComponent? appearance))
return;
- sprite.LayerMapReserveBlank(CleansingVisualLayers.Particles);
- sprite.LayerSetVisible(CleansingVisualLayers.Particles, true);
- sprite.LayerSetShader(CleansingVisualLayers.Particles, "unshaded");
+ sprite.LayerMapReserveBlank(PurifyingVisualLayers.Particles);
+ sprite.LayerSetVisible(PurifyingVisualLayers.Particles, true);
+ sprite.LayerSetShader(PurifyingVisualLayers.Particles, "unshaded");
if (uid.Comp.Sprite != null)
{
- sprite.LayerSetRSI(CleansingVisualLayers.Particles, uid.Comp.Sprite.RsiPath);
- sprite.LayerSetState(CleansingVisualLayers.Particles, uid.Comp.Sprite.RsiState);
+ sprite.LayerSetRSI(PurifyingVisualLayers.Particles, uid.Comp.Sprite.RsiPath);
+ sprite.LayerSetState(PurifyingVisualLayers.Particles, uid.Comp.Sprite.RsiState);
}
}
}
-public enum CleansingVisualLayers : byte
+public enum PurifyingVisualLayers : byte
{
Particles
}
diff --git a/Content.Client/SS220/CultYogg/DeCultReminder/DeCultReminderEui.cs b/Content.Client/SS220/CultYogg/DeCultReminder/DeCultReminderEui.cs
new file mode 100644
index 00000000000000..454495b2c1c3fc
--- /dev/null
+++ b/Content.Client/SS220/CultYogg/DeCultReminder/DeCultReminderEui.cs
@@ -0,0 +1,32 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+using Content.Client.Eui;
+using JetBrains.Annotations;
+using Robust.Client.Graphics;
+
+namespace Content.Client.SS220.CultYogg.DeCultReminder
+{
+ [UsedImplicitly]
+ public sealed class DeCultReminderEui : BaseEui
+ {
+ private readonly DeCultReminderWindow _window;
+
+ public DeCultReminderEui()
+ {
+ _window = new();
+
+ _window.AcceptButton.OnPressed += _ => _window.Close();
+ }
+
+ public override void Opened()
+ {
+ IoCManager.Resolve().RequestWindowAttention();
+ _window.OpenCentered();
+ }
+
+ public override void Closed()
+ {
+ _window.Close();
+ }
+ }
+}
diff --git a/Content.Client/SS220/CultYogg/DeCultReminder/DeCultReminderWindow.cs b/Content.Client/SS220/CultYogg/DeCultReminder/DeCultReminderWindow.cs
new file mode 100644
index 00000000000000..3f61bb54a7e29e
--- /dev/null
+++ b/Content.Client/SS220/CultYogg/DeCultReminder/DeCultReminderWindow.cs
@@ -0,0 +1,57 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.CustomControls;
+using static Robust.Client.UserInterface.Controls.BoxContainer;
+using System.Numerics;
+
+
+namespace Content.Client.SS220.CultYogg.DeCultReminder
+{
+ public sealed class DeCultReminderWindow : DefaultWindow
+ {
+ public readonly Button AcceptButton;
+
+ public DeCultReminderWindow()
+ {
+ Title = Loc.GetString("decult-reminder-window-title");
+
+ Contents.AddChild(new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical,
+ Children =
+ {
+ new BoxContainer
+ {
+ Orientation = LayoutOrientation.Vertical,
+ Children =
+ {
+ (new Label()
+ {
+ Text = Loc.GetString("decult-reminder-window-text")
+ }),
+ new BoxContainer
+ {
+ Orientation = LayoutOrientation.Horizontal,
+ Align = AlignMode.Center,
+ Children =
+ {
+ (AcceptButton = new Button
+ {
+ Text = Loc.GetString("decult-reminder-window-accept-button"),
+ }),
+
+ (new Control()
+ {
+ MinSize = new Vector2(20, 0)
+ }),
+ }
+ },
+ }
+ },
+ }
+ });
+ }
+ }
+}
diff --git a/Content.Server/SS220/CultYogg/Cultists/CultYoggCleansedSystem.cs b/Content.Server/SS220/CultYogg/Cultists/CultYoggPurifiedSystem.cs
similarity index 68%
rename from Content.Server/SS220/CultYogg/Cultists/CultYoggCleansedSystem.cs
rename to Content.Server/SS220/CultYogg/Cultists/CultYoggPurifiedSystem.cs
index 84fc646b67d6cc..e0639873341b0c 100644
--- a/Content.Server/SS220/CultYogg/Cultists/CultYoggCleansedSystem.cs
+++ b/Content.Server/SS220/CultYogg/Cultists/CultYoggPurifiedSystem.cs
@@ -1,29 +1,28 @@
// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
-using Content.Shared.Atmos;
using Content.Shared.SS220.CultYogg.Cultists;
-using Robust.Shared.Map;
using Robust.Shared.Timing;
namespace Content.Server.SS220.CultYogg.Cultists;
-public sealed class CultYoggCleansedSystem : EntitySystem
+public sealed class CultYoggPurifiedSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _timing = default!;
public override void Initialize()
{
base.Initialize();
}
+
public override void Update(float frameTime)
{
base.Update(frameTime);
- var query = EntityQueryEnumerator();
+ var query = EntityQueryEnumerator();
while (query.MoveNext(out var uid, out var cleansedComp))
{
- if (_timing.CurTime < cleansedComp.CleansingDecayEventTime)
+ if (_timing.CurTime < cleansedComp.PurifyingDecayEventTime)
continue;
- RemComp(uid);
+ RemComp(uid);
}
}
}
diff --git a/Content.Server/SS220/CultYogg/Cultists/CultYoggSystem.cs b/Content.Server/SS220/CultYogg/Cultists/CultYoggSystem.cs
index 3d30e9e378b237..4683568942892d 100644
--- a/Content.Server/SS220/CultYogg/Cultists/CultYoggSystem.cs
+++ b/Content.Server/SS220/CultYogg/Cultists/CultYoggSystem.cs
@@ -22,6 +22,8 @@
using Robust.Shared.Audio.Systems;
using Content.Shared.Mobs.Components;
using Content.Shared.Mobs;
+using Robust.Shared.Network;
+using Content.Shared.SS220.Roles;
namespace Content.Server.SS220.CultYogg.Cultists;
@@ -295,7 +297,7 @@ public bool TryStartAscensionByReagent(EntityUid uid, CultYoggComponent comp)
private bool AvaliableMiGoCheck()
{
//Check number of MiGo in gamerule
- _cultRule.GetCultGameRule(out var ruleComp);
+ var ruleComp = _cultRule.GetCultGameRule();
if (ruleComp is null)
return false;
@@ -343,23 +345,26 @@ private bool TryReplaceMiGo()
return true;
}
#endregion
- private void OnSaintWaterDrinked(Entity uid, ref OnSaintWaterDrinkEvent args)
+
+ #region Purifying
+ private void OnSaintWaterDrinked(Entity entity, ref OnSaintWaterDrinkEvent args)
{
- EnsureComp(uid, out var cleansedComp);
- cleansedComp.AmountOfHolyWater += args.SaintWaterAmount;
+ EnsureComp(entity, out var purifyedComp);
+ purifyedComp.TotalAmountOfHolyWater += args.SaintWaterAmount;
- if (cleansedComp.AmountOfHolyWater >= cleansedComp.AmountToCleance)
+ if (purifyedComp.TotalAmountOfHolyWater >= purifyedComp.AmountToPurify)
{
- //After cleansing effect
- _audio.PlayEntity(cleansedComp.CleansingCollection, uid, uid);
+ //After purifying effect
+ _audio.PlayEntity(purifyedComp.PurifyingCollection, entity, entity);
//Removing stage visuals, cause later component will be removed
var ev = new CultYoggDeleteVisualsEvent();
- RaiseLocalEvent(uid, ref ev);
+ RaiseLocalEvent(entity, ref ev);
- RemComp(uid);
+ RemComp(entity);
}
- cleansedComp.CleansingDecayEventTime = _timing.CurTime + cleansedComp.BeforeDeclinesTime; //setting timer, when cleansing will be removed
+ purifyedComp.PurifyingDecayEventTime = _timing.CurTime + purifyedComp.BeforeDeclinesTime; //setting timer, when purifying will be removed
}
+ #endregion
}
diff --git a/Content.Server/SS220/CultYogg/DeCultReminder/DeCultReminderEui.cs b/Content.Server/SS220/CultYogg/DeCultReminder/DeCultReminderEui.cs
new file mode 100644
index 00000000000000..3507ed142b0c7c
--- /dev/null
+++ b/Content.Server/SS220/CultYogg/DeCultReminder/DeCultReminderEui.cs
@@ -0,0 +1,10 @@
+// © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+
+using Content.Server.EUI;
+
+namespace Content.Server.SS220.CultYogg.DeCultReminder
+{
+ public sealed class DeCultReminderEui : BaseEui
+ {
+ }
+}
diff --git a/Content.Server/SS220/EntityEffects/Effects/ChemMiGomicelium.cs b/Content.Server/SS220/EntityEffects/Effects/ChemMiGomicelium.cs
index e237f11101ec42..e1f05577109811 100644
--- a/Content.Server/SS220/EntityEffects/Effects/ChemMiGomicelium.cs
+++ b/Content.Server/SS220/EntityEffects/Effects/ChemMiGomicelium.cs
@@ -24,7 +24,7 @@ public override void Effect(EntityEffectBaseArgs args)
{
if (entityManager.TryGetComponent(args.TargetEntity, out var comp))
{
- entityManager.RemoveComponent(args.TargetEntity);
+ entityManager.RemoveComponent(args.TargetEntity);
comp.ConsumedAscensionReagent += reagentArgs.Quantity.Float();
entityManager.System().TryStartAscensionByReagent(args.TargetEntity, comp);
diff --git a/Content.Server/SS220/GameTicking/Rules/CultYoggRuleSystem.cs b/Content.Server/SS220/GameTicking/Rules/CultYoggRuleSystem.cs
index 1c1ae1a6660f7e..93f03f8fe5dafe 100644
--- a/Content.Server/SS220/GameTicking/Rules/CultYoggRuleSystem.cs
+++ b/Content.Server/SS220/GameTicking/Rules/CultYoggRuleSystem.cs
@@ -41,6 +41,9 @@
using Content.Server.AlertLevel;
using Robust.Shared.Player;
using Robust.Shared.Map;
+using Content.Server.EUI;
+using Robust.Server.Player;
+using Content.Server.SS220.CultYogg.DeCultReminder;
namespace Content.Server.SS220.GameTicking.Rules;
@@ -62,6 +65,8 @@ public sealed class CultYoggRuleSystem : GameRuleSystem
[Dependency] private readonly ServerGlobalSoundSystem _sound = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly AlertLevelSystem _alertLevel = default!;
+ [Dependency] private readonly EuiManager _euiManager = default!;
+ [Dependency] private readonly IPlayerManager _playerManager = default!;
private List> _sacraficialTiers = [];
public TimeSpan DefaultShuttleArriving { get; set; } = TimeSpan.FromSeconds(85);
@@ -280,7 +285,7 @@ private void OnTargetSacrificed(Entity entity, ref CultYo
private void SacraficialReplacement(ref SacraficialReplacementEvent args)
{
- GetCultGameRule(out var cultRuleComp);
+ var cultRuleComp = GetCultGameRule();
if (cultRuleComp == null)
return;
@@ -330,7 +335,7 @@ private void MiGoEnslave(ref CultYoggEnslavedEvent args)
if (args.Target == null)
return;
- GetCultGameRule(out var cultRuleComp);
+ var cultRuleComp = GetCultGameRule();
if (cultRuleComp == null)
return;
@@ -386,22 +391,29 @@ public void MakeCultist(EntityUid uid, CultYoggRuleComponent comp, bool initial
private void DeCult(ref CultYoggDeCultingEvent args)
{
- GetCultGameRule(out var cultRuleComp);//ToDo bug potentialy if somebody will make cultist without gamerule, ask head dev
+ var cultRuleComp = GetCultGameRule();//ToDo bug potentialy if somebody will make cultist without gamerule, ask head dev
if (cultRuleComp == null)
return;
DeMakeCultist(args.Entity, cultRuleComp);
}
+
public void DeMakeCultist(EntityUid uid, CultYoggRuleComponent component)
{
if (!_mind.TryGetMind(uid, out var mindId, out var mindComp))
return;
- if (!_role.MindHasRole(mindId, out var mindSlave))
+ if (!_role.MindHasRole(mindId, out var cultRoleEnt))
return;
- // _mind.TryRemoveObjective(mindId, mindComp, objective.Value);
+ foreach (var obj in component.ListofObjectives)
+ {
+ if (!_mind.TryFindObjective(mindId, obj, out var objUid))
+ continue;
+
+ _mind.TryRemoveObjective(mindId, mindComp, objUid.Value);
+ }
_role.MindRemoveRole(mindId);
@@ -418,6 +430,12 @@ public void DeMakeCultist(EntityUid uid, CultYoggRuleComponent component)
RemComp(uid);
RemComp(uid);
+
+ if (mindComp.UserId != null &&
+ _playerManager.TryGetSessionById(mindComp.UserId.Value, out var session))
+ {
+ _euiManager.OpenEui(new DeCultReminderEui(), session);
+ }
}
#endregion
@@ -528,14 +546,17 @@ private float GetCultistsFraction()
}
#endregion
- public void GetCultGameRule(out CultYoggRuleComponent? comp)
+ public CultYoggRuleComponent? GetCultGameRule()
{
- comp = null;
- var query = QueryActiveRules();
- while (query.MoveNext(out _, out _, out var cultComp, out _))
+ CultYoggRuleComponent? comp = null;
+
+ var query = QueryAllRules();
+ while (query.MoveNext(out _, out var cultComp, out _))
{
comp = cultComp;
}
+
+ return comp;
}
}
diff --git a/Content.Server/SS220/Objectives/Systems/CultYoggSummonConditionSystem.cs b/Content.Server/SS220/Objectives/Systems/CultYoggSummonConditionSystem.cs
index 8d7c26118fe40e..ee77864cb3fcc0 100644
--- a/Content.Server/SS220/Objectives/Systems/CultYoggSummonConditionSystem.cs
+++ b/Content.Server/SS220/Objectives/Systems/CultYoggSummonConditionSystem.cs
@@ -52,7 +52,7 @@ private void OnGetProgress(Entity ent, ref Obj
{
args.Progress = 0;
- _cultRule.GetCultGameRule(out var ruleComp);
+ var ruleComp = _cultRule.GetCultGameRule();
if (ruleComp is null)
return;
@@ -62,7 +62,7 @@ private void OnGetProgress(Entity ent, ref Obj
private void TaskNumberUpdate(Entity ent)
{
- _cultRule.GetCultGameRule(out var ruleComp);
+ var ruleComp = _cultRule.GetCultGameRule();
if (ruleComp is null)
return;
diff --git a/Content.Server/SS220/Objectives/Systems/MiGoAliveConditionSystem.cs b/Content.Server/SS220/Objectives/Systems/MiGoAliveConditionSystem.cs
index b03184f7ce3462..1ef573420331d2 100644
--- a/Content.Server/SS220/Objectives/Systems/MiGoAliveConditionSystem.cs
+++ b/Content.Server/SS220/Objectives/Systems/MiGoAliveConditionSystem.cs
@@ -25,7 +25,7 @@ public override void Initialize()
//check if gamerule was rewritten
private void OnInit(Entity ent, ref ComponentInit args)
{
- _cultRule.GetCultGameRule(out var ruleComp);
+ var ruleComp = _cultRule.GetCultGameRule();
if (ruleComp is null)
return;
diff --git a/Content.Shared/SS220/CultYogg/Cultists/CultYoggCleansedComponent.cs b/Content.Shared/SS220/CultYogg/Cultists/CultYoggPurifiedComponent.cs
similarity index 56%
rename from Content.Shared/SS220/CultYogg/Cultists/CultYoggCleansedComponent.cs
rename to Content.Shared/SS220/CultYogg/Cultists/CultYoggPurifiedComponent.cs
index 6d875951129a5c..87fc56a41b96e2 100644
--- a/Content.Shared/SS220/CultYogg/Cultists/CultYoggCleansedComponent.cs
+++ b/Content.Shared/SS220/CultYogg/Cultists/CultYoggPurifiedComponent.cs
@@ -2,41 +2,44 @@
using Content.Shared.FixedPoint;
using Robust.Shared.GameStates;
using Robust.Shared.Utility;
-using System.Numerics;
using Robust.Shared.Audio;
+using Content.Shared.Destructible.Thresholds;
namespace Content.Shared.SS220.CultYogg.Cultists;
[RegisterComponent, NetworkedComponent]
-public sealed partial class CultYoggCleansedComponent : Component
+[AutoGenerateComponentState]
+public sealed partial class CultYoggPurifiedComponent : Component
{
+ [ViewVariables, AutoNetworkedField]
+ public FixedPoint2 TotalAmountOfHolyWater = 0;
+
+ [DataField]
+ public FixedPoint2 AmountToPurify = 10;
+
///
/// The random time between incidents, (min, max).
///
- public Vector2 TimeBetweenIncidents = new Vector2(0, 5); //ToDo maybe add some damage or screams? should discuss
+ public MinMax TimeBetweenIncidents = new(0, 5); //ToDo maybe add some damage or screams? should discuss
///
/// Buffer to markup when time has come
///
[DataField]
- public TimeSpan? CleansingDecayEventTime;
+ public TimeSpan? PurifyingDecayEventTime;
///
- /// Contains special sounds which be played when entity will be cleased
+ /// Contains special sounds which be played when entity will be purified
///
[DataField]
- public SoundSpecifier CleansingCollection = new SoundCollectionSpecifier("CultYoggCleansingSounds");
+ public SoundSpecifier PurifyingCollection = new SoundCollectionSpecifier("CultYoggPurifyingSounds");
[DataField("sprite")]
- public SpriteSpecifier.Rsi Sprite = new(new("SS220/Effects/cult_yogg_cleansing.rsi"), "cleansingEffect");
+ public SpriteSpecifier.Rsi Sprite = new(new("SS220/Effects/cult_yogg_purifying.rsi"), "purifyingEffect");
///
- /// Amount of time requierd to requied for cleansind removal
+ /// Amount of time requierd to requied for purifying removal
///
[DataField]
public TimeSpan BeforeDeclinesTime = TimeSpan.FromSeconds(500);
-
- public FixedPoint2 AmountOfHolyWater = 0;
-
- public FixedPoint2 AmountToCleance = 10;
}
diff --git a/Content.Shared/SS220/CultYogg/Cultists/SharedCultYoggSystem.cs b/Content.Shared/SS220/CultYogg/Cultists/SharedCultYoggSystem.cs
index 4304334f6b9537..2f3ebbf1fdbd71 100644
--- a/Content.Shared/SS220/CultYogg/Cultists/SharedCultYoggSystem.cs
+++ b/Content.Shared/SS220/CultYogg/Cultists/SharedCultYoggSystem.cs
@@ -131,7 +131,7 @@ private void CorruptItemInHandAction(Entity uid, ref CultYogg
protected void OnRemove(Entity uid, ref ComponentRemove args)
{
- RemComp(uid);
+ RemComp(uid);
//remove all actions cause they won't disappear with component
_actions.RemoveAction(uid.Comp.CorruptItemActionEntity);
diff --git a/Resources/Locale/ru-RU/ss220/cultYogg/decult_reminder_window.ftl b/Resources/Locale/ru-RU/ss220/cultYogg/decult_reminder_window.ftl
new file mode 100644
index 00000000000000..ce9f04a5149a25
--- /dev/null
+++ b/Resources/Locale/ru-RU/ss220/cultYogg/decult_reminder_window.ftl
@@ -0,0 +1,5 @@
+decult-reminder-window-title = Потеря памяти
+decult-reminder-window-text =
+ Все ваши воспоминания о служении Ньярлатотепу развеяны.
+ Вы теперь обычный сотрудник станции.
+decult-reminder-window-accept-button = Воспоминания улетучиваются...
diff --git a/Resources/Locale/ru-RU/ss220/game-ticking/game-presets/preset-cult.ftl b/Resources/Locale/ru-RU/ss220/game-ticking/game-presets/preset-cult.ftl
index a8e4bfa162dcea..4afee957d57ff8 100644
--- a/Resources/Locale/ru-RU/ss220/game-ticking/game-presets/preset-cult.ftl
+++ b/Resources/Locale/ru-RU/ss220/game-ticking/game-presets/preset-cult.ftl
@@ -2,7 +2,7 @@ cult-yogg-title = Культ Йог-Сотот
cult-yogg-description = На станции была замечена активность вражеского культа.
cult-yogg-not-enough-ready-players = Недостаточно игроков готовы к игре! { $readyPlayersCount } игроков из необходимых { $minimumPlayers } готовы. Нельзя запустить пресет Культ.
cult-yogg-no-one-ready = Нет готовых игроков! Нельзя запустить пресет Культ.
-cult-yogg-role-greeting = "Время настало! Вы были избраны, вам было открыто знание и вы были присланы сюда, что бы возвыситься, и призвать нашего учителя [color=darkgreen]Ньярлататепа[/color]! Найдите своих братьев, возвысьте одного из вас, расширяйте культ и создайте логово, где будут принесены жертвы для нашего Бога [color=peru]Йог-Сотота[/color]! Ia c-chtenff!"
+cult-yogg-role-greeting = "Время настало! Вы были избраны, вам было открыто знание и вы были присланы сюда, что бы возвыситься, и призвать нашего учителя [color=darkgreen]Ньярлатотепа[/color]! Найдите своих братьев, возвысьте одного из вас, расширяйте культ и создайте логово, где будут принесены жертвы для нашего Бога [color=peru]Йог-Сотота[/color]! Ia c-chtenff!"
cult-yogg-round-end-initial-count = Стартовых культистов было { $initialCount }, ими были:
cult-yogg-round-end-user-was-initial = - [color=plum]{ $name }[/color] ([color=gray]{ $username }[/color]) был одним из стартовых прислужников.
diff --git a/Resources/Prototypes/SS220/SoundCollections/cultYogg.yml b/Resources/Prototypes/SS220/SoundCollections/cultYogg.yml
index ff337a7770b280..2f11f10793b4c6 100644
--- a/Resources/Prototypes/SS220/SoundCollections/cultYogg.yml
+++ b/Resources/Prototypes/SS220/SoundCollections/cultYogg.yml
@@ -22,7 +22,7 @@
- /Audio/SS220/CultYogg/nyarlathotep_voice3.ogg
- type: soundCollection
- id: CultYoggCleansingSounds
+ id: CultYoggPurifyingSounds
files:
- /Audio/SS220/CultYogg/inhale_scream_1.ogg
- /Audio/SS220/CultYogg/inhale_scream_2.ogg
diff --git a/Resources/Textures/SS220/Effects/cult_yogg_cleansing.rsi/meta.json b/Resources/Textures/SS220/Effects/cult_yogg_purifying.rsi/meta.json
similarity index 96%
rename from Resources/Textures/SS220/Effects/cult_yogg_cleansing.rsi/meta.json
rename to Resources/Textures/SS220/Effects/cult_yogg_purifying.rsi/meta.json
index 6b9c0357e6bbcf..6e67d229ec73ce 100644
--- a/Resources/Textures/SS220/Effects/cult_yogg_cleansing.rsi/meta.json
+++ b/Resources/Textures/SS220/Effects/cult_yogg_purifying.rsi/meta.json
@@ -8,7 +8,7 @@
},
"states": [
{
- "name": "cleansingEffect",
+ "name": "purifyingEffect",
"delays": [
[
0.15,
diff --git a/Resources/Textures/SS220/Effects/cult_yogg_cleansing.rsi/cleansingEffect.png b/Resources/Textures/SS220/Effects/cult_yogg_purifying.rsi/purifyingEffect.png
similarity index 100%
rename from Resources/Textures/SS220/Effects/cult_yogg_cleansing.rsi/cleansingEffect.png
rename to Resources/Textures/SS220/Effects/cult_yogg_purifying.rsi/purifyingEffect.png