diff --git a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs index 1d9534883e..db229f7d14 100644 --- a/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs +++ b/Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs @@ -410,14 +410,15 @@ public sealed partial class CultSystem : EntitySystem if (state.CurrentState != MobState.Dead) { - var canBeConverted = _entityManager.TryGetComponent(victim.Value, out var mind) && mind.HasMind; + var canBeConverted = _entityManager.TryGetComponent(victim.Value, out var mind) && + mind is {Mind: { }}; // Проверка, является ли жертва целью _entityManager.TryGetComponent(target?.CurrentEntity, out var targetMind); - var isTarget = mind != null && mind.Mind!.Value == targetMind?.Mind!.Value; + var isTarget = mind!.Mind!.Value == targetMind?.Mind!.Value; var jobAllowConvert = true; - if(_jobSystem.MindTryGetJob(mind!.Mind!.Value, out var _, out var prototype)) + if(_jobSystem.MindTryGetJob(mind.Mind!.Value, out var _, out var prototype)) { jobAllowConvert = prototype.CanBeAntag; } diff --git a/Resources/Locale/ru-RU/cult/shuttle-curse.ftl b/Resources/Locale/ru-RU/cult/shuttle-curse.ftl index f9f0254fac..d2900cc6be 100644 --- a/Resources/Locale/ru-RU/cult/shuttle-curse.ftl +++ b/Resources/Locale/ru-RU/cult/shuttle-curse.ftl @@ -6,3 +6,4 @@ shuttle-curse-shuttle-arrived = Сфера доносит, что уже сли shuttle-curse-shuttle-delayed = Сфера доносит, что прокльяте наложено ent-CultShuttleCurse = сфера проклятия .desc = Cтранная каменная сфера, пульсирующая красным светом. +round-end-system-shuttle-curse-delayed-announcement = По определённым причинам, шаттл был задержан на некоторое время. diff --git a/Resources/Prototypes/_White/Entities/Cult/Items/forge_craft.yml b/Resources/Prototypes/_White/Entities/Cult/Items/forge_craft.yml index ec78d99194..0be75f4972 100644 --- a/Resources/Prototypes/_White/Entities/Cult/Items/forge_craft.yml +++ b/Resources/Prototypes/_White/Entities/Cult/Items/forge_craft.yml @@ -23,13 +23,12 @@ thresholds: - trigger: !type:DamageTrigger - damage: 300 + damage: 150 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - type: Reflect reflectProb: 0.5 - passiveReflect: true reflects: - Energy - type: ReturnItemOnThrow